diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-04 13:17:47 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-04 13:17:47 +0200 |
| commit | be212bf108e71ba3b5b75802b1f4de6613ba315c (patch) | |
| tree | c541ad12e8698f04e8fe386c2e1b94e8baca6c1b /src/dbus | |
| parent | 67ae1b0dac175f48875507f3187ed49276a29ddf (diff) | |
| parent | e6bb00250b321b149dd80259dc4f479088d5949b (diff) | |
Merge commit 'origin/master'
Conflicts:
src/corelib/global/qglobal.h
src/corelib/kernel/qmetatype.cpp
src/corelib/kernel/qobject.cpp
src/corelib/thread/qthread_unix.cpp
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/itemviews/qheaderview.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qgesture.h
src/gui/kernel/qgesturerecognizer.h
src/gui/painting/qpaintengine_raster.cpp
src/network/access/qhttpnetworkreply.cpp
src/network/access/qnetworkcookie.h
src/network/socket/qnativesocketengine_unix.cpp
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusabstractadaptor.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusabstractinterface.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusinterface.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbuspendingcall.h | 2 |
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 e525f77082..0d016a3360 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -151,7 +151,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 8dbbb3c1c5..182cff36d0 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -111,7 +111,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()) }; |