diff options
Diffstat (limited to 'src/bluetooth/qbluetoothglobal.h')
| -rw-r--r-- | src/bluetooth/qbluetoothglobal.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/bluetooth/qbluetoothglobal.h b/src/bluetooth/qbluetoothglobal.h index 95fcfadf..c2184eb4 100644 --- a/src/bluetooth/qbluetoothglobal.h +++ b/src/bluetooth/qbluetoothglobal.h @@ -43,18 +43,7 @@ #include <QtCore/qglobal.h> -#if defined(QT_NAMESPACE) -# define QT_PREPEND_NAMESPACE_BLUETOOTH(name) ::QT_NAMESPACE::QtBluetooth::name -# define QT_BEGIN_NAMESPACE_BLUETOOTH namespace QT_NAMESPACE { namespace QtBluetooth { -# define QT_END_NAMESPACE_BLUETOOTH } } -# define QT_USE_NAMESPACE_BLUETOOTH using namespace QT_NAMESPACE; using namespace QtBluetooth; -#else -# define QT_PREPEND_NAMESPACE_BLUETOOTH(name) ::QtBluetooth::name -# define QT_BEGIN_NAMESPACE_BLUETOOTH namespace QtBluetooth { -# define QT_END_NAMESPACE_BLUETOOTH } -# define QT_USE_NAMESPACE_BLUETOOTH using namespace QtBluetooth; -#endif - +QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QT_BUILD_BLUETOOTH_LIB) @@ -66,4 +55,6 @@ # define Q_BLUETOOTH_EXPORT #endif +QT_END_NAMESPACE + #endif // QTBLUETOOTH_H |