summaryrefslogtreecommitdiffstats
path: root/src/networksettings/connman/connmancommon.h
diff options
context:
space:
mode:
authorKimmo Ollila <kimmo.ollila@theqtcompany.com>2016-06-07 16:03:38 +0300
committerKimmo Ollila <kimmo.ollila@theqtcompany.com>2016-06-07 13:17:10 +0000
commitd911547fa765cfccbdc2e5389e795681ee7c9c3a (patch)
tree6a808ec49e2a0fff0c19fbc8fcc834e35b041f36 /src/networksettings/connman/connmancommon.h
parent1b7c6ed208ef553f99ad7eb185a9abffeb30455c (diff)
Fixed connman backend crashes and changed it as default.
Change-Id: I65c6f4bf1e89c8f26b7c83a0d911813e7941c5a1 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/networksettings/connman/connmancommon.h')
-rw-r--r--src/networksettings/connman/connmancommon.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/networksettings/connman/connmancommon.h b/src/networksettings/connman/connmancommon.h
index 7748455..b50a11d 100644
--- a/src/networksettings/connman/connmancommon.h
+++ b/src/networksettings/connman/connmancommon.h
@@ -50,21 +50,21 @@
#define AttributeDisconnect QStringLiteral("disconnect")
#define AttributeOneline QStringLiteral("online")
-struct ConnmanMap {
+struct ConnmanMapStruct {
QDBusObjectPath objectPath;
QVariantMap propertyMap;
};
-QDBusArgument &operator<<(QDBusArgument &argument, const ConnmanMap &obj);
-const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanMap &obj);
+QDBusArgument &operator<<(QDBusArgument &argument, const ConnmanMapStruct &obj);
+const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanMapStruct &obj);
const QString &operator>>(const QString &argument, QNetworkSettingsType &obj);
const QString &operator>>(const QString &argument, QNetworkSettingsState &obj);
-typedef QList<ConnmanMap> ConnmanMapList;
+typedef QList<ConnmanMapStruct> ConnmanMapStructList;
-Q_DECLARE_METATYPE( ConnmanMap )
-Q_DECLARE_METATYPE( ConnmanMapList )
+Q_DECLARE_METATYPE( ConnmanMapStruct )
+Q_DECLARE_METATYPE( ConnmanMapStructList )
#endif // CONNMANCOMMON_H