f20cd94 · unity8 · git.iko.soy

git.iko.soy/unity8

Connect saveState as a signal instead of invoking

By registering WindowStateStorage::WindowState as a metatype, we can skip jumping through the invokeMethod hoop for saveState.

commitf20cd94f8fa11e1a13945b058b2b8f940ddfeed6 authorDalton Durst <dalton@ubports.com> dateMon 18 Jan 2021, 11:46 (6 years ago) parentcac8384

2 files changed+5−17

compare with xenial

unifiedsplit

plugins/Utils/windowstatestorage.cpp+4−16 plugins/Utils/windowstatestorage.h+1−1

plugins/Utils/windowstatestorage.cpp+4−16

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

179179

180180public Q_SLOTS:

181181

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

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

183183 {

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

185185 QSqlQuery query(connection);

186186 query.prepare(m_saveStateQuery);

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

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

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

189189 if (!query.exec()) {

190190 logSqlError(query);

191191 }

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

240240 QObject(parent),

241241 m_thread()

242242{

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

243244 QString dbFile;

244245 if (dbName == nullptr) {

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

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

262263 m_asyncOk = false;

263264 m_thread.quit();

264265 } else {

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

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

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

267269 m_asyncOk = true;

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

274276 m_thread.wait();

275277}

276278

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−

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

292280{

293281 if (!m_asyncOk) {

plugins/Utils/windowstatestorage.h+1−1

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

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

5454 virtual ~WindowStateStorage();

5555

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

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

5857

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

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

6968Q_SIGNALS:

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

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

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

7272

7373private:

7474 QThread m_thread;