diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-05 13:32:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 12:44:29 +0200 |
| commit | e21b666856fe89a13c2c8c1eb7ef6fb18275f9b4 (patch) | |
| tree | 3f5f6075a783fe4afe1b201faa591fa8dacc4238 /src/nfc/qnfcglobal.h | |
| parent | a589ae4f2f525686efa9f031a82390433b0e606d (diff) | |
Remove QtBluetooth and QtNfc namespace.
This is based on namespace discussions on the Qt project dev mailing list.
We continue to use the Qt namespace.
Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/nfc/qnfcglobal.h')
| -rw-r--r-- | src/nfc/qnfcglobal.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/nfc/qnfcglobal.h b/src/nfc/qnfcglobal.h index bd1f0674..de659590 100644 --- a/src/nfc/qnfcglobal.h +++ b/src/nfc/qnfcglobal.h @@ -44,17 +44,7 @@ #include <QtCore/qglobal.h> -#if defined(QT_NAMESPACE) -# define QT_PREPEND_NAMESPACE_NFC(name) ::QT_NAMESPACE::QtNfc::name -# define QT_BEGIN_NAMESPACE_NFC namespace QT_NAMESPACE { namespace QtNfc { -# define QT_END_NAMESPACE_NFC } } -# define QT_USE_NAMESPACE_NFC using namespace QT_NAMESPACE; using namespace QtNfc; -#else -# define QT_PREPEND_NAMESPACE_NFC(name) ::QtNfc::name -# define QT_BEGIN_NAMESPACE_NFC namespace QtNfc { -# define QT_END_NAMESPACE_NFC } -# define QT_USE_NAMESPACE_NFC using namespace QtNfc; -#endif +QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QT_BUILD_NFC_LIB) @@ -66,4 +56,6 @@ # define Q_NFC_EXPORT #endif +QT_END_NAMESPACE + #endif // QTNFC_H |