@@ -244,24 +244,33 @@ public Q_SLOTS:
244244 }
245245
246246private:
247− const QString m_connectionName = QStringLiteral("WindowStateStorage");
248− const QString m_getStateQuery = QStringLiteral("SELECT state FROM state WHERE windowId = :windowId");
249− const QString m_saveStateQuery = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values (:windowId, :state)");
250− const QString m_getGeometryQuery = QStringLiteral("SELECT * FROM geometry WHERE windowId = :windowId");
251− const QString m_saveGeometryQuery = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values (:windowId, :x, :y, :width, :height)");
252− const QString m_getStageQuery = QStringLiteral("SELECT stage FROM stage WHERE appId = :appId");
253− const QString m_saveStageQuery = QStringLiteral("INSERT OR REPLACE INTO stage (appId, stage) values (:appId, :stage)");
254− QString m_dbName;
255− bool m_ok = false;
256−
257− void logSqlError(const QSqlQuery query) const
247+ static const QString m_connectionName;
248+ static const QString m_getStateQuery;
249+ static const QString m_saveStateQuery;
250+ static const QString m_getGeometryQuery;
251+ static const QString m_saveGeometryQuery;
252+ static const QString m_getStageQuery;
253+ static const QString m_saveStageQuery;
254+
255+ static void logSqlError(const QSqlQuery query)
258256 {
259257 qWarning() << "Error executing query" << query.lastQuery()
260258 << "Driver error:" << query.lastError().driverText()
261259 << "Database error:" << query.lastError().databaseText();
262260 }
261+
262+ QString m_dbName;
263+ bool m_ok = false;
263264};
264265
266+const QString AsyncQuery::m_connectionName = QStringLiteral("WindowStateStorage");
267+const QString AsyncQuery::m_getStateQuery = QStringLiteral("SELECT state FROM state WHERE windowId = :windowId");
268+const QString AsyncQuery::m_saveStateQuery = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values (:windowId, :state)");
269+const QString AsyncQuery::m_getGeometryQuery = QStringLiteral("SELECT * FROM geometry WHERE windowId = :windowId");
270+const QString AsyncQuery::m_saveGeometryQuery = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values (:windowId, :x, :y, :width, :height)");
271+const QString AsyncQuery::m_getStageQuery = QStringLiteral("SELECT stage FROM stage WHERE appId = :appId");
272+const QString AsyncQuery::m_saveStageQuery = QStringLiteral("INSERT OR REPLACE INTO stage (appId, stage) values (:appId, :stage)");
273+
265274WindowStateStorage::WindowStateStorage(const QString& dbName, QObject *parent):
266275 QObject(parent),
267276 m_thread()