diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-10-19 15:12:54 +0200 |
|---|---|---|
| committer | Thomas Senyk <thomas.senyk@pelagicore.com> | 2016-10-19 15:03:57 +0000 |
| commit | 130be2e05e232a272b67675ce8c7cc19324bf3ab (patch) | |
| tree | c9d56d9d26538557e323cdd773e473c506fb30d2 /src/common-lib/dbus-utilities.cpp | |
| parent | 65fda800f10843e57f48dfe4fbe2b5e2f83c4f03 (diff) | |
Make the build warning free
Replaced all AM_*_NAMESPACE with the undocumented QT_*_NAMESPACE_<foo>
mechanism. Add dummy "we mean it" comments to _p.h headers, even though
all of the AM's C++ API is private anyway.
Change-Id: I45c1b7490f3d519e79350a19dab129ad20623d92
Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com>
Diffstat (limited to 'src/common-lib/dbus-utilities.cpp')
| -rw-r--r-- | src/common-lib/dbus-utilities.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common-lib/dbus-utilities.cpp b/src/common-lib/dbus-utilities.cpp index 72a0d451..46cc5aba 100644 --- a/src/common-lib/dbus-utilities.cpp +++ b/src/common-lib/dbus-utilities.cpp @@ -52,7 +52,7 @@ #include "dbus-utilities.h" -AM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_AM QVariant convertFromJSVariant(const QVariant &variant) { @@ -136,11 +136,11 @@ void registerDBusTypes() #if defined(QT_DBUS_LIB) qDBusRegisterMetaType<QUrl>(); qDBusRegisterMetaType<QMap<QString, QDBusUnixFileDescriptor>>(); - qDBusRegisterMetaType<AM_PREPEND_NAMESPACE(UnixFdMap)>(); + qDBusRegisterMetaType<QT_PREPEND_NAMESPACE_AM(UnixFdMap)>(); #endif } -AM_END_NAMESPACE +QT_END_NAMESPACE_AM #if defined(QT_DBUS_LIB) QT_BEGIN_NAMESPACE @@ -163,7 +163,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QUrl &url) return argument; } -QDBusArgument &operator<<(QDBusArgument &argument, const AM_PREPEND_NAMESPACE(UnixFdMap) &fdMap) +QDBusArgument &operator<<(QDBusArgument &argument, const QT_PREPEND_NAMESPACE_AM(UnixFdMap) &fdMap) { argument.beginMap(qMetaTypeId<QString>(), qMetaTypeId<QDBusUnixFileDescriptor>()); for (auto it = fdMap.cbegin(); it != fdMap.cend(); ++it) { @@ -176,7 +176,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const AM_PREPEND_NAMESPACE(Un return argument; } -const QDBusArgument &operator>>(const QDBusArgument &argument, AM_PREPEND_NAMESPACE(UnixFdMap) &fdMap) +const QDBusArgument &operator>>(const QDBusArgument &argument, QT_PREPEND_NAMESPACE_AM(UnixFdMap) &fdMap) { argument.beginMap(); fdMap.clear(); |