diff options
Diffstat (limited to 'src/networksettings/connman')
4 files changed, 11 insertions, 8 deletions
diff --git a/src/networksettings/connman/connmancommon.h b/src/networksettings/connman/connmancommon.h index 3c8aa67..4b792ce 100644 --- a/src/networksettings/connman/connmancommon.h +++ b/src/networksettings/connman/connmancommon.h @@ -33,7 +33,7 @@ #include <QtDBus> #include <QtNetworkSettings/qnetworksettings.h> -#define AgentPath "/ConnmanAgent" +#define PropertyAgentPath QStringLiteral("/ConnmanAgent") #define PropertyState QStringLiteral("State") #define PropertyName QStringLiteral("Name") #define PropertyType QStringLiteral("Type") diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index fe62bbe..7c65018 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -26,15 +26,17 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ +#include <QFile> +#include <QNetworkInterface> #include "qnetworksettingsmanager_p.h" -#include "connman_manager_interface.cpp" -#include "moc_connman_manager_interface.cpp" #include "qnetworksettingsinterface.h" #include "qnetworksettingsinterface_p.h" #include "qnetworksettingsservicemodel.h" #include "qnetworksettingsuseragent.h" -#include <QFile> -#include <QNetworkInterface> +#include "moc_connman_manager_interface.cpp" +#ifdef QMAKE_BUILD +#include "connman_manager_interface.cpp" +#endif QT_BEGIN_NAMESPACE @@ -53,6 +55,8 @@ QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsM , m_currentWiredConnection(Q_NULLPTR) , m_initialized(false) { + qRegisterMetaType<ConnmanMapStruct>("ConnmanMapStruct"); + qRegisterMetaType<ConnmanMapStructList>("ConnmanMapStructList"); qDBusRegisterMetaType<ConnmanMapStruct>(); qDBusRegisterMetaType<ConnmanMapStructList>(); @@ -99,7 +103,7 @@ bool QNetworkSettingsManagerPrivate::initialize() connect(m_manager, &NetConnmanManagerInterface::TechnologyAdded, this, &QNetworkSettingsManagerPrivate::onTechnologyAdded); connect(m_manager, &NetConnmanManagerInterface::TechnologyRemoved, this, &QNetworkSettingsManagerPrivate::onTechnologyRemoved); - m_manager->RegisterAgent(QDBusObjectPath(AgentPath)); + m_manager->RegisterAgent(QDBusObjectPath(PropertyAgentPath)); m_initialized = true; } else { delete m_manager; diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp index 5052b74..2c1e399 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp @@ -76,7 +76,7 @@ void QNetworkSettingsUserAgentPrivate::ReportError(const QDBusObjectPath &path, void QNetworkSettingsUserAgentPrivate::registerAgent() { Q_Q(QNetworkSettingsUserAgent); - QDBusConnection::systemBus().registerObject(QStringLiteral(AgentPath), q); + QDBusConnection::systemBus().registerObject(PropertyAgentPath, q); } QVariantMap QNetworkSettingsUserAgentPrivate::RequestInput(const QDBusObjectPath &path, const QVariantMap ¶ms, const QDBusMessage &msg) diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index 31170d3..b85ddd2 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.h +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h @@ -49,7 +49,6 @@ class QByteArray; template<class T> class QList; template<class Key, class Value> class QMap; class QString; -class QStringList; class QVariant; const QString AgentPath(QStringLiteral("/ConnmanAgent")); |