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>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h
index 555f41ff94..0f8c93a9e3 100644
--- a/src/quick/items/qquicktext_p_p.h
+++ b/src/quick/items/qquicktext_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -56,10 +56,10 @@
 #include "qquicktext_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtGui/qabstracttextdocumentlayout.h>
 #include <QtGui/qtextlayout.h>
-#include <private/qdeclarativestyledtext_p.h>
+#include <private/qquickstyledtext_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -93,8 +93,8 @@ public:
     QUrl baseUrl;
     QFont font;
     QFont sourceFont;
-    QList<QDeclarativeStyledTextImgTag*> imgTags;
-    QList<QDeclarativeStyledTextImgTag*> visibleImgTags;
+    QList<QQuickStyledTextImgTag*> imgTags;
+    QList<QQuickStyledTextImgTag*> visibleImgTags;
 
     QTextLayout layout;
     QTextLayout *elideLayout;
@@ -165,7 +165,7 @@ public:
     }
 };
 
-class QDeclarativePixmap;
+class QQuickPixmap;
 class QQuickTextDocumentWithImageResources : public QTextDocument, public QTextObjectInterface
 {
     Q_OBJECT
@@ -194,13 +194,13 @@ Q_SIGNALS:
 protected:
     QVariant loadResource(int type, const QUrl &name);
 
-    QDeclarativePixmap *loadPixmap(QDeclarativeContext *context, const QUrl &name);
+    QQuickPixmap *loadPixmap(QQmlContext *context, const QUrl &name);
 
 private slots:
     void requestFinished();
 
 private:
-    QHash<QUrl, QDeclarativePixmap *> m_resources;
+    QHash<QUrl, QQuickPixmap *> m_resources;
     QUrl m_baseUrl;
 
     int outstanding;