Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

4 files changed, 4 insertions, 4 deletions

diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h
index 06ba004b1b..2af1d14e0c 100644
--- a/src/dbus/qdbusabstractadaptor.h
+++ b/src/dbus/qdbusabstractadaptor.h
@@ -66,7 +66,7 @@ protected:
     bool autoRelaySignals() const;
 
 private:
-    Q_DECLARE_PRIVATE(QDBusAbstractAdaptor)
+    Q_DECLARE_SCOPED_PRIVATE(QDBusAbstractAdaptor)
 };
 
 QT_END_NAMESPACE
diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h
index 6400b26844..331ce0edc7 100644
--- a/src/dbus/qdbusabstractinterface.h
+++ b/src/dbus/qdbusabstractinterface.h
@@ -135,7 +135,7 @@ protected:
                                    const QList<QVariant> &args = QList<QVariant>()) const;
 
 private:
-    Q_DECLARE_PRIVATE(QDBusAbstractInterface)
+    Q_DECLARE_SCOPED_PRIVATE(QDBusAbstractInterface)
     Q_PRIVATE_SLOT(d_func(), void _q_serviceOwnerChanged(QString,QString,QString))
 };
 
diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h
index 9cf36f8e54..9d0779bec5 100644
--- a/src/dbus/qdbusinterface.h
+++ b/src/dbus/qdbusinterface.h
@@ -69,7 +69,7 @@ public:
     virtual int qt_metacall(QMetaObject::Call, int, void **);
 
 private:
-    Q_DECLARE_PRIVATE(QDBusInterface)
+    Q_DECLARE_SCOPED_PRIVATE(QDBusInterface)
 };
 
 QT_END_NAMESPACE
diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h
index 8881920b0d..55a5bb202e 100644
--- a/src/dbus/qdbuspendingcall.h
+++ b/src/dbus/qdbuspendingcall.h
@@ -108,7 +108,7 @@ Q_SIGNALS:
     void finished(QDBusPendingCallWatcher *self);
 
 private:
-    Q_DECLARE_PRIVATE(QDBusPendingCallWatcher)
+    Q_DECLARE_SCOPED_PRIVATE(QDBusPendingCallWatcher)
     Q_PRIVATE_SLOT(d_func(), void _q_finished())
 };