diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/items/qquicktext_p_p.h | |
parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) |
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>
Diffstat (limited to 'src/quick/items/qquicktext_p_p.h')
-rw-r--r-- | src/quick/items/qquicktext_p_p.h | 16 |
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; |