d4c9eab · unity8 · git.iko.soy

git.iko.soy/unity8

Fixup paths for window state storage in snappy environment

Approved by: Albert Astals Cid, Unity8 CI Bot

commitd4c9eabd9a946fa759b6a8a463ceff62029b4808 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 10 Jan 2017, 14:46 (10 years ago) parent47b643a 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

@@ -45,7 +45,7 @@ public:

4545 Q_DECLARE_FLAGS(WindowStates, WindowState)

4646 Q_FLAG(WindowStates)

4747

48− WindowStateStorage(QObject *parent = 0);

48+ WindowStateStorage(QObject *parent = nullptr);

4949 virtual ~WindowStateStorage();

5050

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

@@ -71,5 +71,5 @@ private:

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

7272 QSqlDatabase m_db;

7373

74− QList< QFuture<void> > m_asyncQueries;

74+ QList<QFuture<void>> m_asyncQueries;

7575};

src/ShellApplication.cpp−1

@@ -35,7 +35,6 @@

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

3636 : QGuiApplication(argc, argv)

3737{

38−

3938 setApplicationName(QStringLiteral("unity8"));

4039 setOrganizationName(QStringLiteral("Canonical"));

4140