git.iko.soy/unity8
on xenial help sign in
fix some review notes
commita8d28980c53de2852b63973f08702812ceab37c0 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 8 Oct 2015, 16:01 (11 years ago) parent1498123
2 files changed+9−9
compare with xenial
unifiedsplit
plugins/Utils/windowstatestorage.cpp+6−6 plugins/Utils/windowstatestorage.h+3−3
plugins/Utils/windowstatestorage.cpp+6−6
@@ -49,16 +49,16 @@ WindowStateStorage::~WindowStateStorage()
4949
5050void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
5151{
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');")
5353 .arg(windowId)
5454 .arg((int)state);
5555
5656 saveValue(queryString);
5757}
5858
59−WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue)
59+WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
6060{
61− QString queryString = QString("SELECT * FROM state WHERE windowId = '%1';")
61+ const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
6262 .arg(windowId);
6363
6464 QSqlQuery query = getValue(queryString);
@@ -71,7 +71,7 @@ WindowStateStorage::WindowState WindowStateStorage::getState(const QString &wind
7171
7272void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)
7373{
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');")
7575 .arg(windowId)
7676 .arg(rect.x())
7777 .arg(rect.y())
@@ -94,7 +94,7 @@ void WindowStateStorage::executeAsyncQuery(const QString &queryString)
9494 }
9595}
9696
97−QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue)
97+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const
9898{
9999 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
100100 .arg(windowId);
@@ -141,7 +141,7 @@ void WindowStateStorage::saveValue(const QString &queryString)
141141 futureWatcher->deleteLater(); });
142142}
143143
144−QSqlQuery WindowStateStorage::getValue(const QString &queryString)
144+QSqlQuery WindowStateStorage::getValue(const QString &queryString) const
145145{
146146 QMutexLocker l(&s_mutex);
147147 QSqlQuery query;
plugins/Utils/windowstatestorage.h+3−3
@@ -33,16 +33,16 @@ public:
3333 virtual ~WindowStateStorage();
3434
3535 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;
3737
3838 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;
4040
4141private:
4242 void initdb();
4343
4444 void saveValue(const QString &queryString);
45− QSqlQuery getValue(const QString &queryString);
45+ QSqlQuery getValue(const QString &queryString) const;
4646
4747 static void executeAsyncQuery(const QString &queryString);
4848 static QMutex s_mutex;