git.iko.soy/unity8
on xenial help sign in
fix some review notes
a8d2898Michael Zanetti
plugins/Utils/windowstatestorage.cpp+6−6
compare with xenial
unifiedsplit
@@ -49,16 +49,16 @@ WindowStateStorage::~WindowStateStorage()
49
49
50void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
50void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
51{
51{
52− QString queryString = QString("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")
52+ const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")
53 .arg(windowId)
53 .arg(windowId)
54 .arg((int)state);
54 .arg((int)state);
55
55
56 saveValue(queryString);
56 saveValue(queryString);
57}
57}
58
58
59−WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue)
59+WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
60{
60{
61− QString queryString = QString("SELECT * FROM state WHERE windowId = '%1';")
61+ const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
62 .arg(windowId);
62 .arg(windowId);
63
63
64 QSqlQuery query = getValue(queryString);
64 QSqlQuery query = getValue(queryString);
@@ -71,7 +71,7 @@ WindowStateStorage::WindowState WindowStateStorage::getState(const QString &wind
71
71
72void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)
72void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)
73{
73{
74− QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
74+ const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
75 .arg(windowId)
75 .arg(windowId)
76 .arg(rect.x())
76 .arg(rect.x())
77 .arg(rect.y())
77 .arg(rect.y())
@@ -94,7 +94,7 @@ void WindowStateStorage::executeAsyncQuery(const QString &queryString)
94 }
94 }
95}
95}
96
96
97−QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue)
97+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const
98{
98{
99 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
99 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
100 .arg(windowId);
100 .arg(windowId);
@@ -141,7 +141,7 @@ void WindowStateStorage::saveValue(const QString &queryString)
141 futureWatcher->deleteLater(); });
141 futureWatcher->deleteLater(); });
142}
142}
143
143
144−QSqlQuery WindowStateStorage::getValue(const QString &queryString)
144+QSqlQuery WindowStateStorage::getValue(const QString &queryString) const
145{
145{
146 QMutexLocker l(&s_mutex);
146 QMutexLocker l(&s_mutex);
147 QSqlQuery query;
147 QSqlQuery query;
plugins/Utils/windowstatestorage.h+3−3
@@ -33,16 +33,16 @@ public:
33 virtual ~WindowStateStorage();
33 virtual ~WindowStateStorage();
34
34
35 Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
35 Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
36− Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue);
36+ Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;
37
37
38 Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
38 Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
39− Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);
39+ Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;
40
40
41private:
41private:
42 void initdb();
42 void initdb();
43
43
44 void saveValue(const QString &queryString);
44 void saveValue(const QString &queryString);
45− QSqlQuery getValue(const QString &queryString);
45+ QSqlQuery getValue(const QString &queryString) const;
46
46
47 static void executeAsyncQuery(const QString &queryString);
47 static void executeAsyncQuery(const QString &queryString);
48 static QMutex s_mutex;
48 static QMutex s_mutex;