82ff2e1 · unity8 · git.iko.soy

git.iko.soy/unity8

merge lp:~lukas-kde/unity8/snappy-windowstatestorage-cleanups

commit82ff2e16681e3c57db295a898397ba506457f9df authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 3 Jan 2017, 14:32 (10 years ago) parentc73be7a a34fd9f

3 files changed+6−7

compare with xenial

unifiedsplit

plugins/Utils/windowstatestorage.cpp+4−4 plugins/Utils/windowstatestorage.h+2−2 src/ShellApplication.cpp−1

plugins/Utils/windowstatestorage.cpp+4−4

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU Lesser General Public License as published by

@@ -36,7 +36,7 @@ inline QString sanitiseString(QString string) {

3636WindowStateStorage::WindowStateStorage(QObject *parent):

3737 QObject(parent)

3838{

39− QString dbPath = QDir::homePath() + "/.cache/unity8/";

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

4040 m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"));

4141 QDir dir;

4242 dir.mkpath(dbPath);

@@ -65,7 +65,7 @@ void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::

6565

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

6767{

68− const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")

68+ const QString queryString = QStringLiteral("SELECT state FROM state WHERE windowId = '%1';")

6969 .arg(sanitiseString(windowId));

7070

7171 QSqlQuery query = getValue(queryString);

@@ -99,7 +99,7 @@ void WindowStateStorage::saveStage(const QString &appId, int stage)

9999

100100int WindowStateStorage::getStage(const QString &appId, int defaultValue) const

101101{

102− const QString queryString = QStringLiteral("SELECT * FROM stage WHERE appId = '%1';")

102+ const QString queryString = QStringLiteral("SELECT stage FROM stage WHERE appId = '%1';")

103103 .arg(sanitiseString(appId));

104104

105105 QSqlQuery query = getValue(queryString);

plugins/Utils/windowstatestorage.h+2−2

@@ -47,7 +47,7 @@ public:

4747 Q_FLAG(WindowStates)

4848#endif

4949

50− WindowStateStorage(QObject *parent = 0);

50+ WindowStateStorage(QObject *parent = nullptr);

5151 virtual ~WindowStateStorage();

5252

5353 Q_INVOKABLE void saveState(const QString &windowId, WindowState state);

@@ -73,5 +73,5 @@ private:

7373 // NB: This is accessed from threads. Make sure to mutex it.

7474 QSqlDatabase m_db;

7575

76− QList< QFuture<void> > m_asyncQueries;

76+ QList<QFuture<void>> m_asyncQueries;

7777};

src/ShellApplication.cpp−1

@@ -34,7 +34,6 @@

3434ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)

3535 : QGuiApplication(argc, argv)

3636{

37−

3837 setApplicationName(QStringLiteral("unity8"));

3938 setOrganizationName(QStringLiteral("Canonical"));

4039