diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-29 20:36:17 -0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-31 06:50:42 +0000 |
| commit | 26edd5a3b127c09ade9e75c45e5271113da81064 (patch) | |
| tree | 968421ab3b27c6fdb3448c79be3001b6c499cf0c /src/dbus/qdbusservicewatcher.cpp | |
| parent | 635f95846ee8eba25b36d0b83ad658ae56c63ed0 (diff) | |
Use QStringLiteral where applicable in QtDBus
Move to qdbusutil_p.h the string constants that are used often and in
multiple places; use QStringLiteral in qdbusintegrator.cpp for the
strings that are used often.
Change-Id: I8e1325b9ba015bda91bf01c42175d8032ea32f62
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/dbus/qdbusservicewatcher.cpp')
| -rw-r--r-- | src/dbus/qdbusservicewatcher.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp index a7832eb3ff..4adf049d17 100644 --- a/src/dbus/qdbusservicewatcher.cpp +++ b/src/dbus/qdbusservicewatcher.cpp @@ -33,7 +33,7 @@ #include "qdbusservicewatcher.h" #include "qdbusconnection.h" -#include "qdbus_symbols_p.h" +#include "qdbusutil_p.h" #include <QStringList> @@ -43,10 +43,6 @@ QT_BEGIN_NAMESPACE -Q_GLOBAL_STATIC_WITH_ARGS(QString, busService, (QLatin1String(DBUS_SERVICE_DBUS))) -Q_GLOBAL_STATIC_WITH_ARGS(QString, busInterface, (QLatin1String(DBUS_INTERFACE_DBUS))) -Q_GLOBAL_STATIC_WITH_ARGS(QString, signalName, (QLatin1String("NameOwnerChanged"))) - class QDBusServiceWatcherPrivate: public QObjectPrivate { Q_DECLARE_PUBLIC(QDBusServiceWatcher) @@ -120,7 +116,7 @@ QStringList QDBusServiceWatcherPrivate::matchArgsForService(const QString &servi void QDBusServiceWatcherPrivate::addService(const QString &service) { QStringList matchArgs = matchArgsForService(service); - connection.connect(*busService(), QString(), *busInterface(), *signalName(), + connection.connect(QDBusUtil::dbusService(), QString(), QDBusUtil::dbusInterface(), QDBusUtil::nameOwnerChanged(), matchArgs, QString(), q_func(), SLOT(_q_serviceOwnerChanged(QString,QString,QString))); } @@ -128,7 +124,7 @@ void QDBusServiceWatcherPrivate::addService(const QString &service) void QDBusServiceWatcherPrivate::removeService(const QString &service) { QStringList matchArgs = matchArgsForService(service); - connection.disconnect(*busService(), QString(), *busInterface(), *signalName(), + connection.disconnect(QDBusUtil::dbusService(), QString(), QDBusUtil::dbusInterface(), QDBusUtil::nameOwnerChanged(), matchArgs, QString(), q_func(), SLOT(_q_serviceOwnerChanged(QString,QString,QString))); } |