← Back to branch summary

~mterry/+junk/u8.2

« back to all changes in this revision

Viewing changes to plugins/Unity/Launcher/gsettings.cpp

  • Committer: Michael Terry
  • Date: 2014-11-17 14:56:04 UTC
  • mfrom: (1317.1.118 unity8)
  • Revision ID: michael.terry@canonical.com-20141117145604-96dn9p5nwkifq2f4
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Unity/Launcher/gsettings.cpp
19
19
 
20
20
#include "gsettings.h"
21
21
 
22
 
#include <QGSettings>
23
22
#include <QVariant>
24
23
 
25
24
GSettings::GSettings(QObject *parent):
26
25
    QObject(parent)
27
26
{
28
 
 
 
27
    m_gSettings = new QGSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/", this);
 
28
    connect(m_gSettings, &QGSettings::changed, this, &GSettings::onSettingsChanged);
29
29
}
30
30
 
31
31
QStringList GSettings::storedApplications() const
32
32
{
33
33
    QStringList storedApps;
34
34
 
35
 
    QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
36
 
 
37
 
    Q_FOREACH(const QString &entry, gSettings.get("items").toStringList()) {
 
35
    Q_FOREACH(const QString &entry, m_gSettings->get("items").toStringList()) {
38
36
        if (entry.startsWith("application:///")) {
39
37
            // convert legacy entries to new world appids
40
38
            QString appId = entry;
57
55
 
58
56
void GSettings::setStoredApplications(const QStringList &storedApplications)
59
57
{
60
 
    QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
61
58
    QStringList gSettingsList;
62
59
    Q_FOREACH(const QString &entry, storedApplications) {
63
60
        gSettingsList << QString("appid://%1").arg(entry);
64
61
    }
65
 
    gSettings.set("items", gSettingsList);
 
62
    m_gSettings->set("items", gSettingsList);
 
63
}
 
64
 
 
65
void GSettings::onSettingsChanged(const QString &key)
 
66
{
 
67
    if (key == "items") {
 
68
        Q_EMIT changed();
 
69
    }
66
70
}