f20cd94 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Connect saveState as a signal instead of invoking

f20cd94Dalton Durst6 years ago

plugins/Utils/windowstatestorage.cpp+4−16

compare with xenial

unifiedsplit

@@ -179,13 +179,13 @@ public:

179

180public Q_SLOTS:

181

182− void saveState(const QString &windowId, int state)

182+ void saveState(const QString &windowId, WindowStateStorage::WindowState state)

183 {

184 QSqlDatabase connection = QSqlDatabase::database(m_connectionName);

185 QSqlQuery query(connection);

186 query.prepare(m_saveStateQuery);

187 query.bindValue(":windowId", windowId);

188− query.bindValue(":state", state);

188+ query.bindValue(":state", (int)state);

189 if (!query.exec()) {

190 logSqlError(query);

191 }

@@ -240,6 +240,7 @@ WindowStateStorage::WindowStateStorage(const QString& dbName, QObject *parent):

240 QObject(parent),

241 m_thread()

242{

243+ qRegisterMetaType<WindowStateStorage::WindowState>("WindowStateStorage::WindowState");

243 QString dbFile;

244 QString dbFile;

244 if (dbName == nullptr) {

245 if (dbName == nullptr) {

245 const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/unity8/");

246 const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/unity8/");

@@ -262,6 +263,7 @@ WindowStateStorage::WindowStateStorage(const QString& dbName, QObject *parent):

262 m_asyncOk = false;

263 m_asyncOk = false;

263 m_thread.quit();

264 m_thread.quit();

264 } else {

265 } else {

266+ connect(this, &WindowStateStorage::saveState, m_asyncQuery, &AsyncQuery::saveState);

265 connect(this, &WindowStateStorage::saveGeometry, m_asyncQuery, &AsyncQuery::saveGeometry);

267 connect(this, &WindowStateStorage::saveGeometry, m_asyncQuery, &AsyncQuery::saveGeometry);

266 connect(this, &WindowStateStorage::saveStage, m_asyncQuery, &AsyncQuery::saveStage);

268 connect(this, &WindowStateStorage::saveStage, m_asyncQuery, &AsyncQuery::saveStage);

267 m_asyncOk = true;

269 m_asyncOk = true;

@@ -274,20 +276,6 @@ WindowStateStorage::~WindowStateStorage()

274 m_thread.wait();

276 m_thread.wait();

275}

277}

276

278

277−void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState windowState)

278−{

279− if (!m_asyncOk) {

280− return;

281− }

282− // This could be a simple connection like all the other save* methods

283− // on AsyncQuery, but WindowStateStorage::WindowState can't be used

284− // on it directly.

285− QMetaObject::invokeMethod(m_asyncQuery, "saveState", Qt::QueuedConnection,

286− Q_ARG(const QString&, windowId),

287− Q_ARG(int, (int)windowState)

288− );

289−}

290−

291WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const

279WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const

292{

280{

293 if (!m_asyncOk) {

281 if (!m_asyncOk) {

plugins/Utils/windowstatestorage.h+1−1

@@ -53,7 +53,6 @@ public:

53 WindowStateStorage(const QString& dbName = nullptr, QObject *parent = nullptr);

54 virtual ~WindowStateStorage();

56− Q_INVOKABLE void saveState(const QString &windowId, WindowStateStorage::WindowState state);

57 Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;

56 Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;

59 Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;

58 Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;

@@ -69,6 +68,7 @@ public:

69Q_SIGNALS:

68Q_SIGNALS:

70 void saveStage(const QString &appId, int stage);

69 void saveStage(const QString &appId, int stage);

71 void saveGeometry(const QString &windowId, const QRect &rect);

70 void saveGeometry(const QString &windowId, const QRect &rect);

71+ void saveState(const QString &windowId, WindowStateStorage::WindowState state);

73private:

74 QThread m_thread;