summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-11-09 16:14:20 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-11-09 16:14:20 (GMT)
commita8e0e5656f09130e68c10209429a0870b38248c4 (patch)
tree9f2c51be485c3f1e4afea821ebbe838a08c0ce2d /src/dbus
parent8fbdbd25015a4e5544dace3a77427861f0ca89f4 (diff)
parentb770abdd564f28a8d9dde816f72f73e6b15984af (diff)
downloadQt-a8e0e5656f09130e68c10209429a0870b38248c4.zip
Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.gz
Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.bz2
Merge branch '4.6' into core-4.6
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbusintegrator.cpp2
-rw-r--r--src/dbus/qdbusservicewatcher.cpp14
2 files changed, 10 insertions, 6 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 626d215..2d27668 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -1989,7 +1989,7 @@ void QDBusConnectionPrivate::connectSignal(const QString &key, const SignalHook
{
signalHooks.insertMulti(key, hook);
connect(hook.obj, SIGNAL(destroyed(QObject*)), SLOT(objectDestroyed(QObject*)),
- Qt::DirectConnection);
+ Qt::ConnectionType(Qt::DirectConnection | Qt::UniqueConnection));
MatchRefCountHash::iterator it = matchRefCounts.find(hook.matchRule);
diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp
index 4872732..1557b47 100644
--- a/src/dbus/qdbusservicewatcher.cpp
+++ b/src/dbus/qdbusservicewatcher.cpp
@@ -47,6 +47,8 @@
#include <private/qobject_p.h>
+QT_BEGIN_NAMESPACE
+
Q_GLOBAL_STATIC_WITH_ARGS(QString, busService, (QLatin1String(DBUS_SERVICE_DBUS)))
Q_GLOBAL_STATIC_WITH_ARGS(QString, busPath, (QLatin1String(DBUS_PATH_DBUS)))
Q_GLOBAL_STATIC_WITH_ARGS(QString, busInterface, (QLatin1String(DBUS_INTERFACE_DBUS)))
@@ -150,14 +152,14 @@ void QDBusServiceWatcherPrivate::removeService(const QString &service)
modes:
\list
- \o watching for service registration only
- \o watching for service unregistration only
- \o watching for any kind of service ownership change (the default mode)
+ \o Watching for service registration only.
+ \o Watching for service unregistration only.
+ \o Watching for any kind of service ownership change (the default mode).
\endlist
Besides being created or deleted, services may change owners without a
- unregister/register operation happening. So the \ref serviceRegistered()
- and \ref serviceUnregistered() signals may not be emitted if that
+ unregister/register operation happening. So the serviceRegistered()
+ and serviceUnregistered() signals may not be emitted if that
happens.
This class is more efficient than using the
@@ -371,4 +373,6 @@ void QDBusServiceWatcher::setConnection(const QDBusConnection &connection)
d->setConnection(d->servicesWatched, connection, d->watchMode);
}
+QT_END_NAMESPACE
+
#include "moc_qdbusservicewatcher.cpp"