@Victor, what you proposed and what charles said both work. I tested it on the utopic phone emulator. I think however we should stick to charles's solution since this way we do not change the function signature. So can you please change that to,
=== modified file 'backend/modules/Alarm/Settings/alarmsettings.cpp' --- backend/modules/Alarm/Settings/alarmsettings.cpp 2014-07-27 22:18:23 +0000 +++ backend/modules/Alarm/Settings/alarmsettings.cpp 2014-07-28 15:52:41 +0000 @@ -34,11 +34,12 @@ "org.freedesktop.DBus.Properties", "PropertiesChanged", this, - SLOT(onSettingsChanged(QString, QVariantMap))); + SLOT(onSettingsChanged(QString, QVariantMap, QStringList))); }
void AlarmSettings::onSettingsChanged(const QString &interface, - const QVariantMap &properties) + const QVariantMap &properties, + const QStringList /*&valid*/) { if(interface != "com.canonical.indicator.datetime.AlarmProperties") { // Check if the properties changed are in the correct interface
=== modified file 'backend/modules/Alarm/Settings/alarmsettings.h' --- backend/modules/Alarm/Settings/alarmsettings.h 2014-07-27 22:18:23 +0000 +++ backend/modules/Alarm/Settings/alarmsettings.h 2014-07-28 15:51:29 +0000 @@ -79,7 +79,8 @@ settings values are changed on dBus side */ void onSettingsChanged(const QString &interface, - const QVariantMap &properties); + const QVariantMap &properties, + const QStringList /*invalidated_properties*/); };
« Back to merge proposal
@Victor, what you proposed and what charles said both work. I tested it on the utopic phone emulator. I think however we should stick to charles's solution since this way we do not change the function signature. So can you please change that to,
=== modified file 'backend/ modules/ Alarm/Settings/ alarmsettings. cpp' modules/ Alarm/Settings/ alarmsettings. cpp 2014-07-27 22:18:23 +0000 modules/ Alarm/Settings/ alarmsettings. cpp 2014-07-28 15:52:41 +0000
"org. freedesktop. DBus.Properties ",
"PropertiesC hanged" ,
this, Changed( QString, QVariantMap))); Changed( QString, QVariantMap, QStringList)));
--- backend/
+++ backend/
@@ -34,11 +34,12 @@
- SLOT(onSettings
+ SLOT(onSettings
}
void AlarmSettings: :onSettingsChan ged(const QString &interface, indicator. datetime. AlarmProperties ") {
- const QVariantMap &properties)
+ const QVariantMap &properties,
+ const QStringList /*&valid*/)
{
if(interface != "com.canonical.
// Check if the properties changed are in the correct interface
=== modified file 'backend/ modules/ Alarm/Settings/ alarmsettings. h' modules/ Alarm/Settings/ alarmsettings. h 2014-07-27 22:18:23 +0000 modules/ Alarm/Settings/ alarmsettings. h 2014-07-28 15:51:29 +0000 ed(const QString &interface, properties* /);
--- backend/
+++ backend/
@@ -79,7 +79,8 @@
settings values are changed on dBus side
*/
void onSettingsChang
- const QVariantMap &properties);
+ const QVariantMap &properties,
+ const QStringList /*invalidated_
};