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, 103 insertions, 0 deletions

diff --git a/src/quick/util/qquickstyledtext_p.h b/src/quick/util/qquickstyledtext_p.h
new file mode 100644
index 0000000000..bfc7ffe7ed
--- /dev/null
+++ b/src/quick/util/qquickstyledtext_p.h
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKSTYLEDTEXT_H
+#define QQUICKSTYLEDTEXT_H
+
+#include <QSize>
+#include <QPointF>
+#include <QList>
+#include <QUrl>
+#include <QtQuick/private/qquickpixmapcache_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickStyledTextImgTag;
+class QQuickStyledTextPrivate;
+class QString;
+class QQmlContext;
+
+class Q_AUTOTEST_EXPORT QQuickStyledTextImgTag
+{
+public:
+    QQuickStyledTextImgTag()
+        : position(0), align(QQuickStyledTextImgTag::Bottom), pix(0)
+    { }
+
+    ~QQuickStyledTextImgTag() { delete pix; }
+
+    enum Align {
+        Bottom,
+        Middle,
+        Top
+    };
+
+    QUrl url;
+    QPointF pos;
+    QSize size;
+    int position;
+    Align align;
+    QQuickPixmap *pix;
+};
+
+class Q_AUTOTEST_EXPORT QQuickStyledText
+{
+public:
+    static void parse(const QString &string, QTextLayout &layout,
+                      QList<QQuickStyledTextImgTag*> &imgTags,
+                      const QUrl &baseUrl,
+                      QQmlContext *context,
+                      bool preloadImages);
+
+private:
+    QQuickStyledText(const QString &string, QTextLayout &layout,
+                           QList<QQuickStyledTextImgTag*> &imgTags,
+                           const QUrl &baseUrl,
+                           QQmlContext *context,
+                           bool preloadImages);
+    ~QQuickStyledText();
+
+    QQuickStyledTextPrivate *d;
+};
+
+QT_END_NAMESPACE
+
+#endif