git.iko.soy/unity8
on xenial help sign in
Fixup paths for window state storage in snappy environment
d4c9eabLukáš Tinkl
plugins/Utils/windowstatestorage.cpp+4−4
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2015 Canonical Ltd.
2+ * Copyright 2015-2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -36,7 +36,7 @@ inline QString sanitiseString(QString string) {
36WindowStateStorage::WindowStateStorage(QObject *parent):
36WindowStateStorage::WindowStateStorage(QObject *parent):
37 QObject(parent)
37 QObject(parent)
38{
38{
39− QString dbPath = QDir::homePath() + "/.cache/unity8/";
39+ const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/unity8/");
40 m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"));
40 m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"));
41 QDir dir;
41 QDir dir;
42 dir.mkpath(dbPath);
42 dir.mkpath(dbPath);
@@ -65,7 +65,7 @@ void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::
65
65
66WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
66WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
67{
67{
68− const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
68+ const QString queryString = QStringLiteral("SELECT state FROM state WHERE windowId = '%1';")
69 .arg(sanitiseString(windowId));
69 .arg(sanitiseString(windowId));
70
70
71 QSqlQuery query = getValue(queryString);
71 QSqlQuery query = getValue(queryString);
@@ -99,7 +99,7 @@ void WindowStateStorage::saveStage(const QString &appId, int stage)
99
99
100int WindowStateStorage::getStage(const QString &appId, int defaultValue) const
100int WindowStateStorage::getStage(const QString &appId, int defaultValue) const
101{
101{
102− const QString queryString = QStringLiteral("SELECT * FROM stage WHERE appId = '%1';")
102+ const QString queryString = QStringLiteral("SELECT stage FROM stage WHERE appId = '%1';")
103 .arg(sanitiseString(appId));
103 .arg(sanitiseString(appId));
104
104
105 QSqlQuery query = getValue(queryString);
105 QSqlQuery query = getValue(queryString);
plugins/Utils/windowstatestorage.h+2−2
@@ -45,7 +45,7 @@ public:
45 Q_DECLARE_FLAGS(WindowStates, WindowState)
45 Q_DECLARE_FLAGS(WindowStates, WindowState)
46 Q_FLAG(WindowStates)
46 Q_FLAG(WindowStates)
47
47
48− WindowStateStorage(QObject *parent = 0);
48+ WindowStateStorage(QObject *parent = nullptr);
49 virtual ~WindowStateStorage();
49 virtual ~WindowStateStorage();
50
50
51 Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
51 Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
@@ -71,5 +71,5 @@ private:
71 // NB: This is accessed from threads. Make sure to mutex it.
71 // NB: This is accessed from threads. Make sure to mutex it.
72 QSqlDatabase m_db;
72 QSqlDatabase m_db;
73
73
74− QList< QFuture<void> > m_asyncQueries;
74+ QList<QFuture<void>> m_asyncQueries;
75};
75};
src/ShellApplication.cpp−1
@@ -35,7 +35,6 @@
35ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
35ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
36 : QGuiApplication(argc, argv)
36 : QGuiApplication(argc, argv)
37{
37{
38−
39 setApplicationName(QStringLiteral("unity8"));
38 setApplicationName(QStringLiteral("unity8"));
40 setOrganizationName(QStringLiteral("Canonical"));
39 setOrganizationName(QStringLiteral("Canonical"));
41
40