From fed6c094bfed5dfb514741d34af55d9e070ac67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Wed, 30 Sep 2015 23:09:46 +0100 Subject: dbus: Port to new connect syntax Any connect requiring a lambda to be ported or function casts were not touched Change-Id: I1718121986ba6632b5754efa631f7b599358e186 Reviewed-by: Thiago Macieira --- src/dbus/qdbusconnection.cpp | 4 ++-- src/dbus/qdbusconnectioninterface.cpp | 8 ++++---- src/dbus/qdbusintegrator.cpp | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index e9196173ad..d0f5c06ee5 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -1177,8 +1177,8 @@ void QDBusConnectionPrivate::createBusService() ref.deref(); // busService has increased the refcounting to us // avoid cyclic refcounting - QObject::connect(this, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)), - busService, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)), + QObject::connect(this, &QDBusConnectionPrivate::callWithCallbackFailed, + busService, emit &QDBusConnectionInterface::callWithCallbackFailed, Qt::QueuedConnection); } diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp index ff923ba282..9dc0b3f9bd 100644 --- a/src/dbus/qdbusconnectioninterface.cpp +++ b/src/dbus/qdbusconnectioninterface.cpp @@ -158,10 +158,10 @@ QDBusConnectionInterface::QDBusConnectionInterface(const QDBusConnection &connec QDBusUtil::dbusPath(), DBUS_INTERFACE_DBUS, connection, parent) { - connect(this, SIGNAL(NameAcquired(QString)), this, SIGNAL(serviceRegistered(QString))); - connect(this, SIGNAL(NameLost(QString)), this, SIGNAL(serviceUnregistered(QString))); - connect(this, SIGNAL(NameOwnerChanged(QString,QString,QString)), - this, SIGNAL(serviceOwnerChanged(QString,QString,QString))); + connect(this, &QDBusConnectionInterface::NameAcquired, this, emit &QDBusConnectionInterface::serviceRegistered); + connect(this, &QDBusConnectionInterface::NameLost, this, emit &QDBusConnectionInterface::serviceUnregistered); + connect(this, &QDBusConnectionInterface::NameOwnerChanged, + this, emit &QDBusConnectionInterface::serviceOwnerChanged); } /*! diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index c465706913..d3f899676b 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -208,14 +208,14 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data) watcher.watch = watch; watcher.read = new QSocketNotifier(fd, QSocketNotifier::Read, d); watcher.read->setEnabled(q_dbus_watch_get_enabled(watch)); - d->connect(watcher.read, SIGNAL(activated(int)), SLOT(socketRead(int))); + d->connect(watcher.read, &QSocketNotifier::activated, d, &QDBusConnectionPrivate::socketRead); } if (flags & DBUS_WATCH_WRITABLE) { //qDebug("addWriteWatch %d", fd); watcher.watch = watch; watcher.write = new QSocketNotifier(fd, QSocketNotifier::Write, d); watcher.write->setEnabled(q_dbus_watch_get_enabled(watch)); - d->connect(watcher.write, SIGNAL(activated(int)), SLOT(socketWrite(int))); + d->connect(watcher.write, &QSocketNotifier::activated, d, &QDBusConnectionPrivate::socketWrite); } d->watchers.insertMulti(fd, watcher); @@ -1892,8 +1892,8 @@ QDBusMessage QDBusConnectionPrivate::sendWithReply(const QDBusMessage &message, if (sendMode == QDBus::BlockWithGui) { pcall->watcherHelper = new QDBusPendingCallWatcherHelper; QEventLoop loop; - loop.connect(pcall->watcherHelper, SIGNAL(reply(QDBusMessage)), SLOT(quit())); - loop.connect(pcall->watcherHelper, SIGNAL(error(QDBusError,QDBusMessage)), SLOT(quit())); + loop.connect(pcall->watcherHelper, &QDBusPendingCallWatcherHelper::reply, &loop, &QEventLoop::quit); + loop.connect(pcall->watcherHelper, &QDBusPendingCallWatcherHelper::error, &loop, &QEventLoop::quit); // enter the event loop and wait for a reply loop.exec(QEventLoop::ExcludeUserInputEvents | QEventLoop::WaitForMoreEvents); @@ -2078,7 +2078,7 @@ void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook } signalHooks.insertMulti(key, hook); - connect(hook.obj, SIGNAL(destroyed(QObject*)), SLOT(objectDestroyed(QObject*)), + connect(hook.obj, &QObject::destroyed, this, &QDBusConnectionPrivate::objectDestroyed, Qt::ConnectionType(Qt::BlockingQueuedConnection | Qt::UniqueConnection)); MatchRefCountHash::iterator mit = matchRefCounts.find(hook.matchRule); @@ -2204,7 +2204,7 @@ QDBusConnectionPrivate::removeSignalHookNoLock(SignalHookHash::Iterator it) void QDBusConnectionPrivate::registerObject(const ObjectTreeNode *node) { - connect(node->obj, SIGNAL(destroyed(QObject*)), SLOT(objectDestroyed(QObject*)), + connect(node->obj, &QObject::destroyed, this, &QDBusConnectionPrivate::objectDestroyed, Qt::ConnectionType(Qt::BlockingQueuedConnection | Qt::UniqueConnection)); if (node->flags & (QDBusConnection::ExportAdaptors -- cgit v1.2.3