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/qquickloader_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/qquickloader_p_p.h')
-rw-r--r-- | src/quick/items/qquickloader_p_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h index 3ef0038493..1ad7756ed8 100644 --- a/src/quick/items/qquickloader_p_p.h +++ b/src/quick/items/qquickloader_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,7 +56,7 @@ #include "qquickloader_p.h" #include "qquickimplicitsizeitem_p_p.h" #include "qquickitemchangelistener_p.h" -#include <qdeclarativeincubator.h> +#include <qqmlincubator.h> #include <private/qv8_p.h> @@ -64,10 +64,10 @@ QT_BEGIN_NAMESPACE class QQuickLoaderPrivate; -class QQuickLoaderIncubator : public QDeclarativeIncubator +class QQuickLoaderIncubator : public QQmlIncubator { public: - QQuickLoaderIncubator(QQuickLoaderPrivate *l, IncubationMode mode) : QDeclarativeIncubator(mode), loader(l) {} + QQuickLoaderIncubator(QQuickLoaderPrivate *l, IncubationMode mode) : QQmlIncubator(mode), loader(l) {} protected: virtual void statusChanged(Status); @@ -77,7 +77,7 @@ private: QQuickLoaderPrivate *loader; }; -class QDeclarativeContext; +class QQmlContext; class QQuickLoaderPrivate : public QQuickImplicitSizeItemPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickLoader) @@ -91,16 +91,16 @@ public: void initResize(); void load(); - void incubatorStateChanged(QDeclarativeIncubator::Status status); + void incubatorStateChanged(QQmlIncubator::Status status); void setInitialState(QObject *o); void disposeInitialPropertyValues(); - QUrl resolveSourceUrl(QDeclarativeV8Function *args); - v8::Handle<v8::Object> extractInitialPropertyValues(QDeclarativeV8Function *args, QObject *loader, bool *error); + QUrl resolveSourceUrl(QQmlV8Function *args); + v8::Handle<v8::Object> extractInitialPropertyValues(QQmlV8Function *args, QObject *loader, bool *error); QUrl source; QQuickItem *item; - QDeclarativeComponent *component; - QDeclarativeContext *itemContext; + QQmlComponent *component; + QQmlContext *itemContext; QQuickLoaderIncubator *incubator; v8::Persistent<v8::Object> initialPropertyValues; v8::Persistent<v8::Object> qmlGlobalForIpv; |