diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-12-06 13:27:22 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-06 06:51:54 +0100 |
| commit | 08ca0bb8dc6a115147899573ae18d42b200acf8f (patch) | |
| tree | 0a8ffe444b1b96d1c6196e5294488da97ce0eb6d /src/bluetooth | |
| parent | 4bc88e607e397008d789d9fff989d9f1a623b320 (diff) | |
Add namespace macros to QtBluetooth and QtNfc
Change-Id: If5f6d39c54fab406fac24c299bb1e647b0b6944e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qbluetoothglobal.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothglobal.h b/src/bluetooth/qbluetoothglobal.h index 0f069ccb..d4d4d0e6 100644 --- a/src/bluetooth/qbluetoothglobal.h +++ b/src/bluetooth/qbluetoothglobal.h @@ -43,10 +43,18 @@ #include <QtCore/qglobal.h> -#define QTBLUETOOTH_PREPEND_NAMESPACE(name) ::QtBluetooth::name -#define QTBLUETOOTH_BEGIN_NAMESPACE namespace QtBluetooth { -#define QTBLUETOOTH_END_NAMESPACE } -#define QTBLUETOOTH_USE_NAMESPACE using namespace QtBluetooth; +#if defined(QT_NAMESPACE) +# define QTBLUETOOTH_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::QtBluetooth::name +# define QTBLUETOOTH_BEGIN_NAMESPACE namespace QT_NAMESPACE { namespace QtBluetooth { +# define QTBLUETOOTH_END_NAMESPACE } } +# define QTBLUETOOTH_USE_NAMESPACE using namespace QT_NAMESPACE; using namespace QtBluetooth; +#else +# define QTBLUETOOTH_PREPEND_NAMESPACE(name) ::QtBluetooth::name +# define QTBLUETOOTH_BEGIN_NAMESPACE namespace QtBluetooth { +# define QTBLUETOOTH_END_NAMESPACE } +# define QTBLUETOOTH_USE_NAMESPACE using namespace QtBluetooth; +#endif + #if defined(Q_OS_WIN) # if defined(QT_NODLL) |