git.iko.soy/unity8
on xenial help sign in
Revert change signal rework, we're not using it
commitf95cefb175ad837f3bfb88a82e4961006540a4fe authorMichael Terry <michael.terry@canonical.com> dateWed 19 Aug 2015, 19:41 (11 years ago) parentf87f818
2 files changed+18−11
compare with xenial
unifiedsplit
tests/mocks/GSettings.1.0/fake_gsettings.cpp+9−5 tests/mocks/GSettings.1.0/fake_gsettings.h+9−6
tests/mocks/GSettings.1.0/fake_gsettings.cpp+9−5
@@ -45,7 +45,7 @@ void GSettingsControllerQml::setPictureUri(const QString &str)
4545{
4646 if (str != m_pictureUri) {
4747 m_pictureUri = str;
48− Q_EMIT changed("picture-uri", QVariant(m_pictureUri));
48+ Q_EMIT pictureUriChanged(m_pictureUri);
4949 }
5050}
5151
@@ -58,7 +58,7 @@ void GSettingsControllerQml::setUsageMode(const QString &usageMode)
5858{
5959 if (usageMode != m_usageMode) {
6060 m_usageMode = usageMode;
61− Q_EMIT changed("usage-mode", QVariant(m_usageMode));
61+ Q_EMIT usageModeChanged(m_usageMode);
6262 }
6363}
6464
@@ -71,7 +71,7 @@ void GSettingsControllerQml::setLockedOutTime(qint64 timestamp)
7171{
7272 if (m_lockedOutTime != timestamp) {
7373 m_lockedOutTime = timestamp;
74− Q_EMIT changed("locked-out-time", QVariant(m_lockedOutTime));
74+ Q_EMIT lockedOutTimeChanged(m_lockedOutTime);
7575 }
7676}
7777
@@ -108,8 +108,12 @@ GSettingsQml::GSettingsQml(QObject *parent)
108108 : QObject(parent)
109109{
110110 m_schema = new GSettingsSchemaQml(this);
111− connect(GSettingsControllerQml::instance(), SIGNAL(changed(const QString &, const QVariant &)),
112− this, SIGNAL(changed(const QString &, const QVariant &)));
111+ connect(GSettingsControllerQml::instance(), SIGNAL(pictureUriChanged(const QString &)),
112+ this, SIGNAL(pictureUriChanged(const QString &)));
113+ connect(GSettingsControllerQml::instance(), SIGNAL(usageModeChanged(const QString &)),
114+ this, SIGNAL(usageModeChanged(const QString &)));
115+ connect(GSettingsControllerQml::instance(), SIGNAL(lockedOutTimeChanged(qint64)),
116+ this, SIGNAL(lockedOutTimeChanged(qint64)));
113117}
114118
115119GSettingsSchemaQml * GSettingsQml::schema() const {
tests/mocks/GSettings.1.0/fake_gsettings.h+9−6
@@ -19,7 +19,6 @@
1919
2020#include <QList>
2121#include <QObject>
22−#include <QVariant>
2322
2423class GSettingsSchemaQml: public QObject
2524{
@@ -46,9 +45,9 @@ class GSettingsQml: public QObject
4645 Q_OBJECT
4746
4847 Q_PROPERTY(GSettingsSchemaQml* schema READ schema NOTIFY schemaChanged)
49− Q_PROPERTY(QString pictureUri READ pictureUri WRITE setPictureUri NOTIFY changed)
50− Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY changed)
51− Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY changed)
48+ Q_PROPERTY(QString pictureUri READ pictureUri WRITE setPictureUri NOTIFY pictureUriChanged)
49+ Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)
50+ Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)
5251
5352public:
5453 GSettingsQml(QObject *parent = nullptr);
@@ -64,7 +63,9 @@ public:
6463
6564Q_SIGNALS:
6665 void schemaChanged();
67− void changed(const QString &key, const QVariant &value);
66+ void pictureUriChanged(const QString&);
67+ void usageModeChanged(const QString&);
68+ void lockedOutTimeChanged(qint64);
6869
6970private:
7071 GSettingsSchemaQml* m_schema;
@@ -90,7 +91,9 @@ public:
9091 Q_INVOKABLE void setLockedOutTime(qint64 timestamp);
9192
9293Q_SIGNALS:
93− void changed(const QString&, const QVariant&);
94+ void pictureUriChanged(const QString&);
95+ void usageModeChanged(const QString&);
96+ void lockedOutTimeChanged(qint64 timestamp);
9497
9598private:
9699 GSettingsControllerQml();