diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-01-31 22:22:22 +1000 |
|---|---|---|
| committer | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-02-14 13:26:02 +0100 |
| commit | 1002efbb0c049b6958a495660014eece7189150a (patch) | |
| tree | 32843a1e213a083dfd2d2f4c2f45754e902a5fb3 /examples/nfc | |
| parent | 4c6ddcf21f4e6f332674e5be6e09751fbccc01d6 (diff) | |
Rename NFC and Bluetooth namespace macros.
Renamed to the namespace macros to follow what syncqt expects. This
fixes missing namespace macro warnings printed by syncqt.
Change-Id: I7be5a700e8435a559cb4c2e74938851233095887
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'examples/nfc')
| -rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.h | 6 | ||||
| -rw-r--r-- | examples/nfc/ndefeditor/mainwindow.h | 6 | ||||
| -rw-r--r-- | examples/nfc/ndefeditor/mimeimagerecordeditor.h | 2 | ||||
| -rw-r--r-- | examples/nfc/ndefeditor/textrecordeditor.h | 2 | ||||
| -rw-r--r-- | examples/nfc/ndefeditor/urirecordeditor.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/examples/nfc/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h index 490539a2..8f7939c6 100644 --- a/examples/nfc/annotatedurl/annotatedurl.h +++ b/examples/nfc/annotatedurl/annotatedurl.h @@ -48,12 +48,12 @@ QT_FORWARD_DECLARE_CLASS(QUrl) QT_FORWARD_DECLARE_CLASS(QPixmap) -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldTarget; class QNdefMessage; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class AnnotatedUrl : public QObject { diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h index 6be6be25..d7793b3c 100644 --- a/examples/nfc/ndefeditor/mainwindow.h +++ b/examples/nfc/ndefeditor/mainwindow.h @@ -47,12 +47,12 @@ #include <qnearfieldtarget.h> -QTNFC_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_NFC class QNearFieldManager; class QNdefMessage; -QTNFC_END_NAMESPACE +QT_END_NAMESPACE_NFC -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC namespace Ui { class MainWindow; diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h index 62330f2f..bfba282c 100644 --- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h +++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h @@ -48,7 +48,7 @@ #include <qndefrecord.h> -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC namespace Ui { class MimeImageRecordEditor; diff --git a/examples/nfc/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h index f692d0b7..3f45a94b 100644 --- a/examples/nfc/ndefeditor/textrecordeditor.h +++ b/examples/nfc/ndefeditor/textrecordeditor.h @@ -49,7 +49,7 @@ namespace Ui { class TextRecordEditor; } -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class TextRecordEditor : public QWidget { diff --git a/examples/nfc/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h index cf7af023..c4c17110 100644 --- a/examples/nfc/ndefeditor/urirecordeditor.h +++ b/examples/nfc/ndefeditor/urirecordeditor.h @@ -50,7 +50,7 @@ namespace Ui { class UriRecordEditor; } -QTNFC_USE_NAMESPACE +QT_USE_NAMESPACE_NFC class UriRecordEditor : public QWidget { |