Rename QDeclarativeNdefRecord -> QQmlNdefRecord

The QDeclarative* class prefix is associated with the now-deprecated
Qt Declarative module (a.k.a. Qt Quick 1). In Qt Quick 2, all
QDeclarative* classes have been renamed to QQml* or QQuick*

Also rename the example, QDeclarativeNdefFooRecord -> QQmlNdefFooRecord

Change-Id: Ie81a9ea2fdda145ad749afb07ef758f791b278d0
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

12 files changed, 42 insertions, 42 deletions

diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp
index dd97e296..6be71c73 100644
--- a/src/imports/nfc/plugin.cpp
+++ b/src/imports/nfc/plugin.cpp
@@ -42,7 +42,7 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
-#include "qdeclarativendefrecord.h"
+#include "qqmlndefrecord.h"
 //#include "qdeclarativenearfieldsocket_p.h"
 #include "qdeclarativenearfield_p.h"
 #include "qdeclarativendeffilter_p.h"
@@ -71,7 +71,7 @@ public:
 
         qmlRegisterType<QDeclarativeNearField>(uri, major, minor, "NearField");
         qmlRegisterType<QDeclarativeNdefFilter>(uri, major, minor, "NdefFilter");
-        qmlRegisterType<QDeclarativeNdefRecord>(uri, major, minor, "NdefRecord");
+        qmlRegisterType<QQmlNdefRecord>(uri, major, minor, "NdefRecord");
         qmlRegisterType<QDeclarativeNdefTextRecord>(uri, major, minor, "NdefTextRecord");
         qmlRegisterType<QDeclarativeNdefUriRecord>(uri, major, minor, "NdefUriRecord");
         qmlRegisterType<QDeclarativeNdefMimeRecord>(uri, major, minor, "NdefMimeRecord");
diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes
index 2d8eef8e..3e7cb4e4 100644
--- a/src/imports/nfc/plugins.qmltypes
+++ b/src/imports/nfc/plugins.qmltypes
@@ -18,13 +18,13 @@ Module {
     }
     Component {
         name: "QDeclarativeNdefMimeRecord"
-        prototype: "QDeclarativeNdefRecord"
+        prototype: "QQmlNdefRecord"
         exports: ["QtNfc/NdefMimeRecord 5.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "uri"; type: "string"; isReadonly: true }
     }
     Component {
-        name: "QDeclarativeNdefRecord"
+        name: "QQmlNdefRecord"
         prototype: "QObject"
         exports: ["QtNfc/NdefRecord 5.0"]
         exportMetaObjectRevisions: [0]
@@ -33,7 +33,7 @@ Module {
     }
     Component {
         name: "QDeclarativeNdefTextRecord"
-        prototype: "QDeclarativeNdefRecord"
+        prototype: "QQmlNdefRecord"
         exports: ["QtNfc/NdefTextRecord 5.0"]
         exportMetaObjectRevisions: [0]
         Enum {
@@ -51,7 +51,7 @@ Module {
     }
     Component {
         name: "QDeclarativeNdefUriRecord"
-        prototype: "QDeclarativeNdefRecord"
+        prototype: "QQmlNdefRecord"
         exports: ["QtNfc/NdefUriRecord 5.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "uri"; type: "string" }
@@ -63,7 +63,7 @@ Module {
         exportMetaObjectRevisions: [0]
         Property {
             name: "messageRecords"
-            type: "QDeclarativeNdefRecord"
+            type: "QQmlNdefRecord"
             isList: true
             isReadonly: true
         }
diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp
index ae551774..b1c2f74c 100644
--- a/src/imports/nfc/qdeclarativendeffilter.cpp
+++ b/src/imports/nfc/qdeclarativendeffilter.cpp
@@ -119,12 +119,12 @@ void QDeclarativeNdefFilter::setType(const QString &t)
     emit typeChanged();
 }
 
-QDeclarativeNdefRecord::TypeNameFormat QDeclarativeNdefFilter::typeNameFormat() const
+QQmlNdefRecord::TypeNameFormat QDeclarativeNdefFilter::typeNameFormat() const
 {
     return m_typeNameFormat;
 }
 
-void QDeclarativeNdefFilter::setTypeNameFormat(QDeclarativeNdefRecord::TypeNameFormat format)
+void QDeclarativeNdefFilter::setTypeNameFormat(QQmlNdefRecord::TypeNameFormat format)
 {
     if (m_typeNameFormat == format)
         return;
diff --git a/src/imports/nfc/qdeclarativendeffilter_p.h b/src/imports/nfc/qdeclarativendeffilter_p.h
index 8622aece..2ff8e8e2 100644
--- a/src/imports/nfc/qdeclarativendeffilter_p.h
+++ b/src/imports/nfc/qdeclarativendeffilter_p.h
@@ -43,14 +43,14 @@
 #define QDECLARATIVENDEFFILTER_P_H
 
 #include <QtCore/QObject>
-#include <qdeclarativendefrecord.h>
+#include <qqmlndefrecord.h>
 
 class QDeclarativeNdefFilter : public QObject
 {
     Q_OBJECT
 
     Q_PROPERTY(QString type READ type WRITE setType NOTIFY typeChanged)
-    Q_PROPERTY(QDeclarativeNdefRecord::TypeNameFormat typeNameFormat READ typeNameFormat WRITE setTypeNameFormat NOTIFY typeNameFormatChanged)
+    Q_PROPERTY(QQmlNdefRecord::TypeNameFormat typeNameFormat READ typeNameFormat WRITE setTypeNameFormat NOTIFY typeNameFormatChanged)
     Q_PROPERTY(int minimum READ minimum WRITE setMinimum NOTIFY minimumChanged)
     Q_PROPERTY(int maximum READ maximum WRITE setMaximum NOTIFY maximumChanged)
 public:
@@ -59,8 +59,8 @@ public:
     QString type() const;
     void setType(const QString &t);
 
-    QDeclarativeNdefRecord::TypeNameFormat typeNameFormat() const;
-    void setTypeNameFormat(QDeclarativeNdefRecord::TypeNameFormat format);
+    QQmlNdefRecord::TypeNameFormat typeNameFormat() const;
+    void setTypeNameFormat(QQmlNdefRecord::TypeNameFormat format);
 
     int minimum() const;
     void setMinimum(int value);
@@ -78,7 +78,7 @@ private:
     QString m_type;
     int m_minimum;
     int m_maximum;
-    QDeclarativeNdefRecord::TypeNameFormat m_typeNameFormat;
+    QQmlNdefRecord::TypeNameFormat m_typeNameFormat;
 };
 
 #endif // QDECLARATIVENDEFFILTER_P_H
diff --git a/src/imports/nfc/qdeclarativendefmimerecord.cpp b/src/imports/nfc/qdeclarativendefmimerecord.cpp
index b1c49bde..9468c01a 100644
--- a/src/imports/nfc/qdeclarativendefmimerecord.cpp
+++ b/src/imports/nfc/qdeclarativendefmimerecord.cpp
@@ -80,12 +80,12 @@ static inline QNdefRecord castToMimeRecord(const QNdefRecord &record)
 }
 
 QDeclarativeNdefMimeRecord::QDeclarativeNdefMimeRecord(QObject *parent)
-:   QDeclarativeNdefRecord(createMimeRecord(), parent)
+:   QQmlNdefRecord(createMimeRecord(), parent)
 {
 }
 
 QDeclarativeNdefMimeRecord::QDeclarativeNdefMimeRecord(const QNdefRecord &record, QObject *parent)
-:   QDeclarativeNdefRecord(castToMimeRecord(record), parent)
+:   QQmlNdefRecord(castToMimeRecord(record), parent)
 {
 }
 
diff --git a/src/imports/nfc/qdeclarativendefmimerecord_p.h b/src/imports/nfc/qdeclarativendefmimerecord_p.h
index bad83235..3338fcc6 100644
--- a/src/imports/nfc/qdeclarativendefmimerecord_p.h
+++ b/src/imports/nfc/qdeclarativendefmimerecord_p.h
@@ -42,11 +42,11 @@
 #ifndef QDECLARATIVENDEFMIMERECORD_P_H
 #define QDECLARATIVENDEFMIMERECORD_P_H
 
-#include <qdeclarativendefrecord.h>
+#include <qqmlndefrecord.h>
 
 QT_USE_NAMESPACE
 
-class QDeclarativeNdefMimeRecord : public QDeclarativeNdefRecord
+class QDeclarativeNdefMimeRecord : public QQmlNdefRecord
 {
     Q_OBJECT
 
diff --git a/src/imports/nfc/qdeclarativendeftextrecord.cpp b/src/imports/nfc/qdeclarativendeftextrecord.cpp
index ad3cda6a..d487c351 100644
--- a/src/imports/nfc/qdeclarativendeftextrecord.cpp
+++ b/src/imports/nfc/qdeclarativendeftextrecord.cpp
@@ -108,12 +108,12 @@
 Q_DECLARE_NDEFRECORD(QDeclarativeNdefTextRecord, QNdefRecord::NfcRtd, "T")
 
 QDeclarativeNdefTextRecord::QDeclarativeNdefTextRecord(QObject *parent)
-:   QDeclarativeNdefRecord(QNdefNfcTextRecord(), parent)
+:   QQmlNdefRecord(QNdefNfcTextRecord(), parent)
 {
 }
 
 QDeclarativeNdefTextRecord::QDeclarativeNdefTextRecord(const QNdefRecord &record, QObject *parent)
-:   QDeclarativeNdefRecord(QNdefNfcTextRecord(record), parent)
+:   QQmlNdefRecord(QNdefNfcTextRecord(record), parent)
 {
 }
 
diff --git a/src/imports/nfc/qdeclarativendeftextrecord_p.h b/src/imports/nfc/qdeclarativendeftextrecord_p.h
index 8701ab17..946e1fb4 100644
--- a/src/imports/nfc/qdeclarativendeftextrecord_p.h
+++ b/src/imports/nfc/qdeclarativendeftextrecord_p.h
@@ -42,13 +42,13 @@
 #ifndef QDECLARATIVENDEFTEXTRECORD_P_H
 #define QDECLARATIVENDEFTEXTRECORD_P_H
 
-#include <qdeclarativendefrecord.h>
+#include <qqmlndefrecord.h>
 
 #include <qndefnfctextrecord.h>
 
 QT_USE_NAMESPACE
 
-class QDeclarativeNdefTextRecord : public QDeclarativeNdefRecord
+class QDeclarativeNdefTextRecord : public QQmlNdefRecord
 {
     Q_OBJECT
 
diff --git a/src/imports/nfc/qdeclarativendefurirecord.cpp b/src/imports/nfc/qdeclarativendefurirecord.cpp
index 47a65cfa..069472e5 100644
--- a/src/imports/nfc/qdeclarativendefurirecord.cpp
+++ b/src/imports/nfc/qdeclarativendefurirecord.cpp
@@ -66,12 +66,12 @@
 Q_DECLARE_NDEFRECORD(QDeclarativeNdefUriRecord, QNdefRecord::NfcRtd, "U")
 
 QDeclarativeNdefUriRecord::QDeclarativeNdefUriRecord(QObject *parent)
-:   QDeclarativeNdefRecord(QNdefNfcUriRecord(), parent)
+:   QQmlNdefRecord(QNdefNfcUriRecord(), parent)
 {
 }
 
 QDeclarativeNdefUriRecord::QDeclarativeNdefUriRecord(const QNdefRecord &record, QObject *parent)
-:   QDeclarativeNdefRecord(QNdefNfcUriRecord(record), parent)
+:   QQmlNdefRecord(QNdefNfcUriRecord(record), parent)
 {
 }
 
diff --git a/src/imports/nfc/qdeclarativendefurirecord_p.h b/src/imports/nfc/qdeclarativendefurirecord_p.h
index b935a55b..67718c7f 100644
--- a/src/imports/nfc/qdeclarativendefurirecord_p.h
+++ b/src/imports/nfc/qdeclarativendefurirecord_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVENDEFURIRECORD_P_H
 #define QDECLARATIVENDEFURIRECORD_P_H
 
-#include <qdeclarativendefrecord.h>
+#include <qqmlndefrecord.h>
 
 #include <qndefnfcurirecord.h>
 
@@ -50,7 +50,7 @@
 
 QT_USE_NAMESPACE
 
-class QDeclarativeNdefUriRecord : public QDeclarativeNdefRecord
+class QDeclarativeNdefUriRecord : public QQmlNdefRecord
 {
     Q_OBJECT
 
diff --git a/src/imports/nfc/qdeclarativenearfield.cpp b/src/imports/nfc/qdeclarativenearfield.cpp
index ed907292..9c871319 100644
--- a/src/imports/nfc/qdeclarativenearfield.cpp
+++ b/src/imports/nfc/qdeclarativenearfield.cpp
@@ -109,9 +109,9 @@ QDeclarativeNearField::QDeclarativeNearField(QObject *parent)
 {
 }
 
-QQmlListProperty<QDeclarativeNdefRecord> QDeclarativeNearField::messageRecords()
+QQmlListProperty<QQmlNdefRecord> QDeclarativeNearField::messageRecords()
 {
-    return QQmlListProperty<QDeclarativeNdefRecord>(this, 0,
+    return QQmlListProperty<QQmlNdefRecord>(this, 0,
                                                     &QDeclarativeNearField::append_messageRecord,
                                                     &QDeclarativeNearField::count_messageRecords,
                                                     &QDeclarativeNearField::at_messageRecord,
@@ -186,8 +186,8 @@ void QDeclarativeNearField::_q_handleNdefMessage(const QNdefMessage &message)
     emit messageRecordsChanged();
 }
 
-void QDeclarativeNearField::append_messageRecord(QQmlListProperty<QDeclarativeNdefRecord> *list,
-                                                 QDeclarativeNdefRecord *record)
+void QDeclarativeNearField::append_messageRecord(QQmlListProperty<QQmlNdefRecord> *list,
+                                                 QQmlNdefRecord *record)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
@@ -199,7 +199,7 @@ void QDeclarativeNearField::append_messageRecord(QQmlListProperty<QDeclarativeNd
         emit nearField->messageRecordsChanged();
 }
 
-int QDeclarativeNearField::count_messageRecords(QQmlListProperty<QDeclarativeNdefRecord> *list)
+int QDeclarativeNearField::count_messageRecords(QQmlListProperty<QQmlNdefRecord> *list)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (!nearField)
@@ -208,7 +208,7 @@ int QDeclarativeNearField::count_messageRecords(QQmlListProperty<QDeclarativeNde
     return nearField->m_message.count();
 }
 
-QDeclarativeNdefRecord *QDeclarativeNearField::at_messageRecord(QQmlListProperty<QDeclarativeNdefRecord> *list,
+QQmlNdefRecord *QDeclarativeNearField::at_messageRecord(QQmlListProperty<QQmlNdefRecord> *list,
                                                                 int index)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
@@ -218,7 +218,7 @@ QDeclarativeNdefRecord *QDeclarativeNearField::at_messageRecord(QQmlListProperty
     return nearField->m_message.at(index);
 }
 
-void QDeclarativeNearField::clear_messageRecords(QQmlListProperty<QDeclarativeNdefRecord> *list)
+void QDeclarativeNearField::clear_messageRecords(QQmlListProperty<QQmlNdefRecord> *list)
 {
     QDeclarativeNearField *nearField = qobject_cast<QDeclarativeNearField *>(list->object);
     if (nearField) {
diff --git a/src/imports/nfc/qdeclarativenearfield_p.h b/src/imports/nfc/qdeclarativenearfield_p.h
index ad551308..14a6d986 100644
--- a/src/imports/nfc/qdeclarativenearfield_p.h
+++ b/src/imports/nfc/qdeclarativenearfield_p.h
@@ -47,7 +47,7 @@
 #include <QtQml/QQmlParserStatus>
 #include <QtNfc/QNearFieldManager>
 
-#include "qdeclarativendefrecord.h"
+#include "qqmlndefrecord.h"
 
 
 QT_USE_NAMESPACE
@@ -57,7 +57,7 @@ class QDeclarativeNearField : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
 
-    Q_PROPERTY(QQmlListProperty<QDeclarativeNdefRecord> messageRecords READ messageRecords NOTIFY messageRecordsChanged)
+    Q_PROPERTY(QQmlListProperty<QQmlNdefRecord> messageRecords READ messageRecords NOTIFY messageRecordsChanged)
     Q_PROPERTY(QQmlListProperty<QDeclarativeNdefFilter> filter READ filter NOTIFY filterChanged)
     Q_PROPERTY(bool orderMatch READ orderMatch WRITE setOrderMatch NOTIFY orderMatchChanged)
 
@@ -66,7 +66,7 @@ class QDeclarativeNearField : public QObject, public QQmlParserStatus
 public:
     explicit QDeclarativeNearField(QObject *parent = 0);
 
-    QQmlListProperty<QDeclarativeNdefRecord> messageRecords();
+    QQmlListProperty<QQmlNdefRecord> messageRecords();
 
     QQmlListProperty<QDeclarativeNdefFilter> filter();
 
@@ -86,7 +86,7 @@ private slots:
     void _q_handleNdefMessage(const QNdefMessage &message);
 
 private:
-    QList<QDeclarativeNdefRecord *> m_message;
+    QList<QQmlNdefRecord *> m_message;
     QList<QDeclarativeNdefFilter *> m_filterList;
     bool m_orderMatch;
     bool m_componentCompleted;
@@ -97,12 +97,12 @@ private:
 
     void registerMessageHandler();
 
-    static void append_messageRecord(QQmlListProperty<QDeclarativeNdefRecord> *list,
-                                     QDeclarativeNdefRecord *record);
-    static int count_messageRecords(QQmlListProperty<QDeclarativeNdefRecord> *list);
-    static QDeclarativeNdefRecord *at_messageRecord(QQmlListProperty<QDeclarativeNdefRecord> *list,
+    static void append_messageRecord(QQmlListProperty<QQmlNdefRecord> *list,
+                                     QQmlNdefRecord *record);
+    static int count_messageRecords(QQmlListProperty<QQmlNdefRecord> *list);
+    static QQmlNdefRecord *at_messageRecord(QQmlListProperty<QQmlNdefRecord> *list,
                                                     int index);
-    static void clear_messageRecords(QQmlListProperty<QDeclarativeNdefRecord> *list);
+    static void clear_messageRecords(QQmlListProperty<QQmlNdefRecord> *list);
 
     static void append_filter(QQmlListProperty<QDeclarativeNdefFilter> *list,
                               QDeclarativeNdefFilter *filter);