diff options
| author | Alex <qt-info@nokia.com> | 2011-06-28 19:03:46 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2011-06-28 19:03:46 +1000 |
| commit | 3e6b81390e0e14844df6f102485a5208d88d3d13 (patch) | |
| tree | c481e9cb6fb05b462c8d45742a83aee8e3686136 /src/serviceframework/ipc/qservicemetaobject_dbus.cpp | |
| parent | 014c13ca8eb5acad844712bb5f12196c373c5947 (diff) | |
make compile with Qt namespace and library infix
Diffstat (limited to 'src/serviceframework/ipc/qservicemetaobject_dbus.cpp')
| -rw-r--r-- | src/serviceframework/ipc/qservicemetaobject_dbus.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/serviceframework/ipc/qservicemetaobject_dbus.cpp b/src/serviceframework/ipc/qservicemetaobject_dbus.cpp index 6dbb79c1..a48ef541 100644 --- a/src/serviceframework/ipc/qservicemetaobject_dbus.cpp +++ b/src/serviceframework/ipc/qservicemetaobject_dbus.cpp @@ -44,7 +44,7 @@ #include "qsignalintercepter_p.h" #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class ServiceMetaSignalIntercepter : public QSignalIntercepter { @@ -84,8 +84,8 @@ QServiceMetaObjectDBus::QServiceMetaObjectDBus(QObject* service, bool signalsObj : QDBusAbstractAdaptor(service) { // Register our DBus custom type object - qRegisterMetaType<QTM_PREPEND_NAMESPACE(QServiceUserTypeDBus)>(); - qDBusRegisterMetaType<QTM_PREPEND_NAMESPACE(QServiceUserTypeDBus)>(); + qRegisterMetaType<QServiceUserTypeDBus>(); + qDBusRegisterMetaType<QServiceUserTypeDBus>(); // Generate our DBus meta object d = new QServiceMetaObjectDBusPrivate(); @@ -577,4 +577,4 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QServiceUserTypeD return argument; } -QTM_END_NAMESPACE +QT_END_NAMESPACE |