diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
commit | ce9519593a0b3deb99d1dd2529770f7e9fffef92 (patch) | |
tree | c9bca05230dd68f49494240ae930bad1fe0c5956 /src/plugins/bearer/connman | |
parent | 509f77cca28aa3edea5523c5869bae4412ed2ccc (diff) | |
parent | 7baaec17edb06634f1d6235a55c7adbd112cba3e (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
mkspecs/android-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
src/gui/image/qimage_conversions.cpp
Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
Diffstat (limited to 'src/plugins/bearer/connman')
-rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index 3029d42ca1..155e6970fa 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -67,8 +67,8 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanMap &map) } QConnmanManagerInterface::QConnmanManagerInterface( QObject *parent) - : QDBusAbstractInterface(QStringLiteral(CONNMAN_SERVICE), - QStringLiteral(CONNMAN_MANAGER_PATH), + : QDBusAbstractInterface(QLatin1String(CONNMAN_SERVICE), + QLatin1String(CONNMAN_MANAGER_PATH), CONNMAN_MANAGER_INTERFACE, QDBusConnection::systemBus(), parent) { @@ -82,23 +82,23 @@ QConnmanManagerInterface::QConnmanManagerInterface( QObject *parent) QObject::connect(watcher,SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(propertiesReply(QDBusPendingCallWatcher*))); - QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE), - QStringLiteral(CONNMAN_MANAGER_PATH), - QStringLiteral(CONNMAN_SERVICE_INTERFACE), - QStringLiteral("PropertyChanged"), + QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE), + QLatin1String(CONNMAN_MANAGER_PATH), + QLatin1String(CONNMAN_SERVICE_INTERFACE), + QLatin1String("PropertyChanged"), this,SLOT(changedProperty(QString,QDBusVariant))); - QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE), - QStringLiteral(CONNMAN_MANAGER_PATH), - QStringLiteral(CONNMAN_SERVICE_INTERFACE), - QStringLiteral("TechnologyAdded"), + QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE), + QLatin1String(CONNMAN_MANAGER_PATH), + QLatin1String(CONNMAN_SERVICE_INTERFACE), + QLatin1String("TechnologyAdded"), this,SLOT(technologyAdded(QDBusObjectPath,QVariantMap))); - QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE), - QStringLiteral(CONNMAN_MANAGER_PATH), - QStringLiteral(CONNMAN_SERVICE_INTERFACE), - QStringLiteral("TechnologyRemoved"), + QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE), + QLatin1String(CONNMAN_MANAGER_PATH), + QLatin1String(CONNMAN_SERVICE_INTERFACE), + QLatin1String("TechnologyRemoved"), this,SLOT(technologyRemoved(QDBusObjectPath))); QList<QVariant> argumentList2; @@ -152,10 +152,10 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal) { static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QConnmanManagerInterface::propertyChanged); if (signal == propertyChangedSignal) { - if (!connection().connect(QStringLiteral(CONNMAN_SERVICE), - QStringLiteral(CONNMAN_MANAGER_PATH), - QStringLiteral(CONNMAN_MANAGER_INTERFACE), - QStringLiteral("PropertyChanged"), + if (!connection().connect(QLatin1String(CONNMAN_SERVICE), + QLatin1String(CONNMAN_MANAGER_PATH), + QLatin1String(CONNMAN_MANAGER_INTERFACE), + QLatin1String("PropertyChanged"), this,SIGNAL(propertyChanged(QString,QDBusVariant)))) { qWarning() << "PropertyChanged not connected"; } @@ -163,10 +163,10 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal) static const QMetaMethod servicesChangedSignal = QMetaMethod::fromSignal(&QConnmanManagerInterface::servicesChanged); if (signal == servicesChangedSignal) { - if (!connection().connect(QStringLiteral(CONNMAN_SERVICE), - QStringLiteral(CONNMAN_MANAGER_PATH), - QStringLiteral(CONNMAN_MANAGER_INTERFACE), - QStringLiteral("ServicesChanged"), + if (!connection().connect(QLatin1String(CONNMAN_SERVICE), + QLatin1String(CONNMAN_MANAGER_PATH), + QLatin1String(CONNMAN_MANAGER_INTERFACE), + QLatin1String("ServicesChanged"), this,SLOT(onServicesChanged(ConnmanMapList, QList<QDBusObjectPath>)))) { qWarning() << "servicesChanged not connected"; } @@ -275,7 +275,7 @@ void QConnmanManagerInterface::technologyRemoved(const QDBusObjectPath &path) } QConnmanServiceInterface::QConnmanServiceInterface(const QString &dbusPathName,QObject *parent) - : QDBusAbstractInterface(QStringLiteral(CONNMAN_SERVICE), + : QDBusAbstractInterface(QLatin1String(CONNMAN_SERVICE), dbusPathName, CONNMAN_SERVICE_INTERFACE, QDBusConnection::systemBus(), parent) @@ -288,10 +288,10 @@ QConnmanServiceInterface::QConnmanServiceInterface(const QString &dbusPathName,Q QObject::connect(watcher,SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(propertiesReply(QDBusPendingCallWatcher*))); - QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE), + QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE), path(), - QStringLiteral(CONNMAN_SERVICE_INTERFACE), - QStringLiteral("PropertyChanged"), + QLatin1String(CONNMAN_SERVICE_INTERFACE), + QLatin1String("PropertyChanged"), this,SLOT(changedProperty(QString,QDBusVariant))); } @@ -327,10 +327,10 @@ void QConnmanServiceInterface::connectNotify(const QMetaMethod &signal) { static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QConnmanServiceInterface::propertyChanged); if (signal == propertyChangedSignal) { - QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE), + QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE), path(), - QStringLiteral(CONNMAN_SERVICE_INTERFACE), - QStringLiteral("PropertyChanged"), + QLatin1String(CONNMAN_SERVICE_INTERFACE), + QLatin1String("PropertyChanged"), this,SIGNAL(propertyChanged(QString,QDBusVariant))); } } @@ -440,7 +440,7 @@ QStringList QConnmanServiceInterface::services() ////////////////////////// QConnmanTechnologyInterface::QConnmanTechnologyInterface(const QString &dbusPathName,QObject *parent) - : QDBusAbstractInterface(QStringLiteral(CONNMAN_SERVICE), + : QDBusAbstractInterface(QLatin1String(CONNMAN_SERVICE), dbusPathName, CONNMAN_TECHNOLOGY_INTERFACE, QDBusConnection::systemBus(), parent) @@ -455,10 +455,10 @@ void QConnmanTechnologyInterface::connectNotify(const QMetaMethod &signal) { static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QConnmanTechnologyInterface::propertyChanged); if (signal == propertyChangedSignal) { - QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE), + QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE), path(), - QStringLiteral(CONNMAN_TECHNOLOGY_INTERFACE), - QStringLiteral("PropertyChanged"), + QLatin1String(CONNMAN_TECHNOLOGY_INTERFACE), + QLatin1String("PropertyChanged"), this,SIGNAL(propertyChanged(QString,QDBusVariant))); } } |