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/qndefnfcsmartposterrecord.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/qndefnfcsmartposterrecord.h')
| -rw-r--r-- | src/nfc/qndefnfcsmartposterrecord.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nfc/qndefnfcsmartposterrecord.h b/src/nfc/qndefnfcsmartposterrecord.h index 82f26e36..c317c92f 100644 --- a/src/nfc/qndefnfcsmartposterrecord.h +++ b/src/nfc/qndefnfcsmartposterrecord.h @@ -50,17 +50,17 @@ QT_FORWARD_DECLARE_CLASS(QUrl) -QT_BEGIN_NAMESPACE_NFC +QT_BEGIN_NAMESPACE class QNdefNfcSmartPosterRecordPrivate; #define Q_DECLARE_ISRECORDTYPE_FOR_MIME_NDEF_RECORD(className) \ - QT_BEGIN_NAMESPACE_NFC \ + QT_BEGIN_NAMESPACE \ template<> inline bool QNdefRecord::isRecordType<className>() const\ { \ return (typeNameFormat() == QNdefRecord::Mime); \ } \ - QT_END_NAMESPACE_NFC + QT_END_NAMESPACE #define Q_DECLARE_MIME_NDEF_RECORD(className, initialPayload) \ className() : QNdefRecord(QNdefRecord::Mime, "") { setPayload(initialPayload); } \ @@ -145,7 +145,7 @@ private: void addIconInternal(const QNdefNfcIconRecord &icon); }; -QT_END_NAMESPACE_NFC +QT_END_NAMESPACE Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD(QNdefNfcSmartPosterRecord, QNdefRecord::NfcRtd, "Sp") Q_DECLARE_ISRECORDTYPE_FOR_MIME_NDEF_RECORD(QNdefNfcIconRecord) |