Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>

3 files changed, 29 insertions, 29 deletions

diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp
index 5a3d50f695..c015898ab7 100644
--- a/tests/auto/shared/util.cpp
+++ b/tests/auto/shared/util.cpp
@@ -41,19 +41,19 @@
 
 #include "util.h"
 
-#include <QtDeclarative/QDeclarativeComponent>
-#include <QtDeclarative/QDeclarativeError>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQml/QQmlComponent>
+#include <QtQml/QQmlError>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlEngine>
 #include <QtCore/QTextStream>
 
-QDeclarativeDataTest *QDeclarativeDataTest::m_instance = 0;
+QQmlDataTest *QQmlDataTest::m_instance = 0;
 
-QDeclarativeDataTest::QDeclarativeDataTest() :
+QQmlDataTest::QQmlDataTest() :
 #ifdef QT_TESTCASE_BUILDDIR
-    m_dataDirectory(QTest::qFindTestData("data", QT_DECLARATIVETEST_DATADIR, 0, QT_TESTCASE_BUILDDIR)),
+    m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0, QT_TESTCASE_BUILDDIR)),
 #else
-    m_dataDirectory(QTest::qFindTestData("data", QT_DECLARATIVETEST_DATADIR, 0)),
+    m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0)),
 #endif
 
     m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/')))
@@ -61,33 +61,33 @@ QDeclarativeDataTest::QDeclarativeDataTest() :
     m_instance = this;
 }
 
-QDeclarativeDataTest::~QDeclarativeDataTest()
+QQmlDataTest::~QQmlDataTest()
 {
     m_instance = 0;
 }
 
-void QDeclarativeDataTest::initTestCase()
+void QQmlDataTest::initTestCase()
 {
     QVERIFY2(!m_dataDirectory.isEmpty(), "'data' directory not found");
     m_directory = QFileInfo(m_dataDirectory).absolutePath();
     QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory));
 }
 
-QString QDeclarativeDataTest::testFile(const QString &fileName) const
+QString QQmlDataTest::testFile(const QString &fileName) const
 {
     if (m_directory.isEmpty())
-        qFatal("QDeclarativeDataTest::initTestCase() not called.");
+        qFatal("QQmlDataTest::initTestCase() not called.");
     QString result = m_dataDirectory;
     result += QLatin1Char('/');
     result += fileName;
     return result;
 }
 
-QByteArray QDeclarativeDataTest::msgComponentError(const QDeclarativeComponent &c,
-                                                   const QDeclarativeEngine *engine /* = 0 */)
+QByteArray QQmlDataTest::msgComponentError(const QQmlComponent &c,
+                                                   const QQmlEngine *engine /* = 0 */)
 {
     QString result;
-    const QList<QDeclarativeError> errors = c.errors();
+    const QList<QQmlError> errors = c.errors();
     QTextStream str(&result);
     str << "Component '" << c.url().toString() << "' has " << errors.size()
         << " errors: '";
@@ -98,7 +98,7 @@ QByteArray QDeclarativeDataTest::msgComponentError(const QDeclarativeComponent &
 
     }
     if (!engine)
-        if (QDeclarativeContext *context = c.creationContext())
+        if (QQmlContext *context = c.creationContext())
             engine = context->engine();
     if (engine) {
         str << " Import paths: (" << engine->importPathList().join(QStringLiteral(", "))
diff --git a/tests/auto/shared/util.h b/tests/auto/shared/util.h
index 9f73d9eb05..5a31ebd719 100644
--- a/tests/auto/shared/util.h
+++ b/tests/auto/shared/util.h
@@ -39,25 +39,25 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVETESTUTILS_H
-#define QDECLARATIVETESTUTILS_H
+#ifndef QQMLTESTUTILS_H
+#define QQMLTESTUTILS_H
 
 #include <QtCore/QDir>
 #include <QtCore/QUrl>
 #include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
-QT_FORWARD_DECLARE_CLASS(QDeclarativeComponent)
-QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine)
+QT_FORWARD_DECLARE_CLASS(QQmlComponent)
+QT_FORWARD_DECLARE_CLASS(QQmlEngine)
 
 /* Base class for tests with data that are located in a "data" subfolder. */
 
-class QDeclarativeDataTest : public QObject
+class QQmlDataTest : public QObject
 {
     Q_OBJECT
 public:
-    QDeclarativeDataTest();
-    virtual ~QDeclarativeDataTest();
+    QQmlDataTest();
+    virtual ~QQmlDataTest();
 
     QString testFile(const QString &fileName) const;
     inline QString testFile(const char *fileName) const
@@ -71,20 +71,20 @@ public:
     inline QUrl dataDirectoryUrl() const { return m_dataDirectoryUrl; }
     inline QString directory() const  { return m_directory; }
 
-    static inline QDeclarativeDataTest *instance() { return m_instance; }
+    static inline QQmlDataTest *instance() { return m_instance; }
 
-    static QByteArray msgComponentError(const QDeclarativeComponent &,
-                                        const QDeclarativeEngine *engine = 0);
+    static QByteArray msgComponentError(const QQmlComponent &,
+                                        const QQmlEngine *engine = 0);
 
 public slots:
     virtual void initTestCase();
 
 private:
-    static QDeclarativeDataTest *m_instance;
+    static QQmlDataTest *m_instance;
 
     const QString m_dataDirectory;
     const QUrl m_dataDirectoryUrl;
     QString m_directory;
 };
 
-#endif // QDECLARATIVETESTUTILS_H
+#endif // QQMLTESTUTILS_H
diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri
index 916e5fb32a..8e82dcb33b 100644
--- a/tests/auto/shared/util.pri
+++ b/tests/auto/shared/util.pri
@@ -2,4 +2,4 @@
 HEADERS += $$PWD/util.h
 SOURCES += $$PWD/util.cpp
 
-DEFINES += QT_DECLARATIVETEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\"
+DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\"