diff options
Diffstat (limited to 'src/dbus/qdbusintegrator.cpp')
-rw-r--r-- | src/dbus/qdbusintegrator.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 54418c213a..21bc3c8ac2 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -2187,20 +2187,16 @@ bool QDBusConnectionPrivate::connectSignal(const QString &service, // check the slot QDBusConnectionPrivate::SignalHook hook; QString key; - QString name2 = name; - if (name2.isNull()) - name2.detach(); hook.signature = signature; if (!prepareHook(hook, key, service, path, interface, name, argumentMatch, receiver, slot, 0, false)) return false; // don't connect Q_ASSERT(thread() != QThread::currentThread()); - emit signalNeedsConnecting(key, hook); - return true; + return emit signalNeedsConnecting(key, hook); } -void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook &hook) +bool QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook &hook) { QDBusWriteLocker locker(ConnectAction, this); @@ -2216,7 +2212,7 @@ void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook entry.midx == hook.midx && entry.argumentMatch == hook.argumentMatch) { // no need to compare the parameters if it's the same slot - return; // already there + return false; // already there } } @@ -2228,7 +2224,7 @@ void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook if (mit != matchRefCounts.end()) { // Match already present mit.value() = mit.value() + 1; - return; + return true; } matchRefCounts.insert(hook.matchRule, 1); @@ -2255,6 +2251,7 @@ void QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook } } } + return true; } bool QDBusConnectionPrivate::disconnectSignal(const QString &service, |