diff options
Diffstat (limited to 'examples/declarative')
31 files changed, 86 insertions, 86 deletions
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp index 7caeaf9471..e8ccdb7e36 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp @@ -44,7 +44,7 @@ #include <QDeclarativeEngine> #include <QDeclarativeNetworkAccessManagerFactory> -#include <QSGView> +#include <QQuickView> /* @@ -97,7 +97,7 @@ int main(int argc, char ** argv) } } - QSGView view; + QQuickView view; view.engine()->setNetworkAccessManagerFactory(new MyNetworkAccessManagerFactory); view.setSource(source); diff --git a/examples/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp index 2ae2cc0558..205835a9c0 100644 --- a/examples/declarative/minehunt/main.cpp +++ b/examples/declarative/minehunt/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtGui/QGuiApplication> -#include <qsgview.h> +#include <qquickview.h> #include <QtDeclarative/QDeclarativeContext> #include <QtDeclarative/QDeclarativeEngine> @@ -49,12 +49,12 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - QSGView canvas; + QQuickView canvas; qmlRegisterType<TileData>(); MinehuntGame* game = new MinehuntGame(); - canvas.setResizeMode(QSGView::SizeRootObjectToView); + canvas.setResizeMode(QQuickView::SizeRootObjectToView); canvas.engine()->rootContext()->setContextObject(game); canvas.setSource(QString("qrc:minehunt.qml")); QObject::connect(canvas.engine(), SIGNAL(quit()), &app, SLOT(quit())); diff --git a/examples/declarative/modelviews/abstractitemmodel/main.cpp b/examples/declarative/modelviews/abstractitemmodel/main.cpp index 3c78608295..dd726611a1 100644 --- a/examples/declarative/modelviews/abstractitemmodel/main.cpp +++ b/examples/declarative/modelviews/abstractitemmodel/main.cpp @@ -43,8 +43,8 @@ #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> #include <qdeclarative.h> -#include <qsgitem.h> -#include <qsgview.h> +#include <qquickitem.h> +#include <qquickview.h> //![0] int main(int argc, char ** argv) @@ -56,8 +56,8 @@ int main(int argc, char ** argv) model.addAnimal(Animal("Polar bear", "Large")); model.addAnimal(Animal("Quoll", "Small")); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", &model); //![0] diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp index ba37e17d18..67ffb946c0 100644 --- a/examples/declarative/modelviews/objectlistmodel/main.cpp +++ b/examples/declarative/modelviews/objectlistmodel/main.cpp @@ -43,8 +43,8 @@ #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> #include <qdeclarative.h> -#include <qsgitem.h> -#include <qsgview.h> +#include <qquickitem.h> +#include <qquickview.h> #include "dataobject.h" @@ -64,8 +64,8 @@ int main(int argc, char ** argv) dataList.append(new DataObject("Item 3", "blue")); dataList.append(new DataObject("Item 4", "yellow")); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(dataList)); //![0] diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp index 5d01c6fae8..ebd3c59307 100644 --- a/examples/declarative/modelviews/stringlistmodel/main.cpp +++ b/examples/declarative/modelviews/stringlistmodel/main.cpp @@ -44,8 +44,8 @@ #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> #include <qdeclarative.h> -#include <qsgitem.h> -#include <qsgview.h> +#include <qquickitem.h> +#include <qquickview.h> /* @@ -64,7 +64,7 @@ int main(int argc, char ** argv) dataList.append("Item 3"); dataList.append("Item 4"); - QSGView view; + QQuickView view; QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(dataList)); //![0] diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/declarative/painteditem/smile/main.cpp index 423ff295c9..1f0b3a3cb8 100644 --- a/examples/declarative/painteditem/smile/main.cpp +++ b/examples/declarative/painteditem/smile/main.cpp @@ -41,14 +41,14 @@ #include <QGuiApplication> #include <QPainter> #include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qsgview.h> -#include <QtDeclarative/qsgpainteditem.h> +#include <QtDeclarative/qquickview.h> +#include <QtDeclarative/qquickpainteditem.h> -class MyPaintItem : public QSGPaintedItem +class MyPaintItem : public QQuickPaintedItem { Q_OBJECT public: - MyPaintItem() : QSGPaintedItem() + MyPaintItem() : QQuickPaintedItem() { setAntialiasing(true); } @@ -72,8 +72,8 @@ int main(int argc, char ** argv) qmlRegisterType<MyPaintItem>("MyModule", 1, 0, "MyPaintItem"); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl::fromLocalFile("smile.qml")); view.show(); view.raise(); diff --git a/examples/declarative/painteditem/textballoons/textballoon.cpp b/examples/declarative/painteditem/textballoons/textballoon.cpp index 185cea71fb..c90118ca65 100644 --- a/examples/declarative/painteditem/textballoons/textballoon.cpp +++ b/examples/declarative/painteditem/textballoons/textballoon.cpp @@ -42,8 +42,8 @@ #include "textballoon.h" //! [0] -TextBalloon::TextBalloon(QSGItem *parent) - : QSGPaintedItem(parent) +TextBalloon::TextBalloon(QQuickItem *parent) + : QQuickPaintedItem(parent) , rightAligned(false) { } diff --git a/examples/declarative/painteditem/textballoons/textballoon.h b/examples/declarative/painteditem/textballoons/textballoon.h index 272e5f51c1..064d20bd7e 100644 --- a/examples/declarative/painteditem/textballoons/textballoon.h +++ b/examples/declarative/painteditem/textballoons/textballoon.h @@ -45,13 +45,13 @@ #include <QtDeclarative> //! [0] -class TextBalloon : public QSGPaintedItem +class TextBalloon : public QQuickPaintedItem { Q_OBJECT Q_PROPERTY(bool rightAligned READ isRightAligned WRITE setRightAligned NOTIFY rightAlignedChanged) public: - TextBalloon(QSGItem *parent = 0); + TextBalloon(QQuickItem *parent = 0); void paint(QPainter *painter); bool isRightAligned(); diff --git a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp index ca6a97e0c7..2670871e61 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp +++ b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include <QSGView> +#include <QQuickView> #include <QGuiApplication> int main(int argc, char *argv[]) @@ -48,8 +48,8 @@ int main(int argc, char *argv[]) qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart"); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl::fromLocalFile("app.qml")); view.show(); return app.exec(); diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp b/examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp index 5820c5626c..06d9892d6b 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp +++ b/examples/declarative/tutorials/extending/chapter1-basics/piechart.cpp @@ -41,8 +41,8 @@ #include <QPainter> //![0] -PieChart::PieChart(QSGItem *parent) - : QSGPaintedItem(parent) +PieChart::PieChart(QQuickItem *parent) + : QQuickPaintedItem(parent) { } //![0] diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h b/examples/declarative/tutorials/extending/chapter1-basics/piechart.h index a5afec5252..d1beb71545 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h +++ b/examples/declarative/tutorials/extending/chapter1-basics/piechart.h @@ -41,17 +41,17 @@ #define PIECHART_H //![0] -#include <QtDeclarative/QSGPaintedItem> +#include <QtDeclarative/QQuickPaintedItem> #include <QColor> -class PieChart : public QSGPaintedItem +class PieChart : public QQuickPaintedItem { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QColor color READ color WRITE setColor) public: - PieChart(QSGItem *parent = 0); + PieChart(QQuickItem *parent = 0); QString name() const; void setName(const QString &name); diff --git a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp index ca6a97e0c7..2670871e61 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp +++ b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include <QSGView> +#include <QQuickView> #include <QGuiApplication> int main(int argc, char *argv[]) @@ -48,8 +48,8 @@ int main(int argc, char *argv[]) qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart"); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl::fromLocalFile("app.qml")); view.show(); return app.exec(); diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp b/examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp index 86407f1f17..ca25474aee 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp +++ b/examples/declarative/tutorials/extending/chapter2-methods/piechart.cpp @@ -40,8 +40,8 @@ #include "piechart.h" #include <QPainter> -PieChart::PieChart(QSGItem *parent) - : QSGPaintedItem(parent) +PieChart::PieChart(QQuickItem *parent) + : QQuickPaintedItem(parent) { } diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h b/examples/declarative/tutorials/extending/chapter2-methods/piechart.h index 38f5c0553f..5205151a0a 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h +++ b/examples/declarative/tutorials/extending/chapter2-methods/piechart.h @@ -40,11 +40,11 @@ #ifndef PIECHART_H #define PIECHART_H -#include <QtDeclarative/QSGPaintedItem> +#include <QtDeclarative/QQuickPaintedItem> #include <QColor> //![0] -class PieChart : public QSGPaintedItem +class PieChart : public QQuickPaintedItem { //![0] Q_OBJECT @@ -55,7 +55,7 @@ class PieChart : public QSGPaintedItem public: //![1] - PieChart(QSGItem *parent = 0); + PieChart(QQuickItem *parent = 0); QString name() const; void setName(const QString &name); diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp index ca6a97e0c7..2670871e61 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp +++ b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include <QSGView> +#include <QQuickView> #include <QGuiApplication> int main(int argc, char *argv[]) @@ -48,8 +48,8 @@ int main(int argc, char *argv[]) qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart"); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl::fromLocalFile("app.qml")); view.show(); return app.exec(); diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp index 86ad6a7fe0..5819088962 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp +++ b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.cpp @@ -40,8 +40,8 @@ #include "piechart.h" #include <QPainter> -PieChart::PieChart(QSGItem *parent) - : QSGPaintedItem(parent) +PieChart::PieChart(QQuickItem *parent) + : QQuickPaintedItem(parent) { } diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h index 5208f81d27..55be2a493f 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h +++ b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h @@ -41,10 +41,10 @@ #define PIECHART_H #include <QColor> -#include <QtDeclarative/QSGPaintedItem> +#include <QtDeclarative/QQuickPaintedItem> //![0] -class PieChart : public QSGPaintedItem +class PieChart : public QQuickPaintedItem { //![0] Q_OBJECT @@ -55,7 +55,7 @@ class PieChart : public QSGPaintedItem public: //![1] - PieChart(QSGItem *parent = 0); + PieChart(QQuickItem *parent = 0); QString name() const; void setName(const QString &name); diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp index d2812767cf..c9b9a0b5aa 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp @@ -40,7 +40,7 @@ #include "piechart.h" #include "pieslice.h" -#include <QSGView> +#include <QQuickView> #include <QGuiApplication> //![0] @@ -55,8 +55,8 @@ int main(int argc, char *argv[]) qmlRegisterType<PieSlice>("Charts", 1, 0, "PieSlice"); //![1] - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl::fromLocalFile("app.qml")); view.show(); return app.exec(); diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp index 5911f4dd49..f032887ce8 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp @@ -40,8 +40,8 @@ #include "piechart.h" #include "pieslice.h" -PieChart::PieChart(QSGItem *parent) - : QSGItem(parent) +PieChart::PieChart(QQuickItem *parent) + : QQuickItem(parent) { } diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h index 9e8139846b..c1cdf30805 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h @@ -40,12 +40,12 @@ #ifndef PIECHART_H #define PIECHART_H -#include <QtDeclarative/QSGItem> +#include <QtDeclarative/QQuickItem> class PieSlice; //![0] -class PieChart : public QSGItem +class PieChart : public QQuickItem { Q_OBJECT Q_PROPERTY(PieSlice* pieSlice READ pieSlice WRITE setPieSlice) @@ -56,7 +56,7 @@ class PieChart : public QSGItem public: //![1] - PieChart(QSGItem *parent = 0); + PieChart(QQuickItem *parent = 0); QString name() const; void setName(const QString &name); diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp index 764ef23944..176ca1eac4 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp @@ -41,8 +41,8 @@ #include <QPainter> -PieSlice::PieSlice(QSGItem *parent) - : QSGPaintedItem(parent) +PieSlice::PieSlice(QQuickItem *parent) + : QQuickPaintedItem(parent) { } diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h index 7163864fac..59606486a4 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h @@ -40,17 +40,17 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include <QtDeclarative/QSGPaintedItem> +#include <QtDeclarative/QQuickPaintedItem> #include <QColor> //![0] -class PieSlice : public QSGPaintedItem +class PieSlice : public QQuickPaintedItem { Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor) public: - PieSlice(QSGItem *parent = 0); + PieSlice(QQuickItem *parent = 0); QColor color() const; void setColor(const QColor &color); diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp index 64c18f74bc..78f6f25485 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp @@ -40,7 +40,7 @@ #include "piechart.h" #include "pieslice.h" -#include <QSGView> +#include <QQuickView> #include <QGuiApplication> int main(int argc, char *argv[]) @@ -50,8 +50,8 @@ int main(int argc, char *argv[]) qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart"); qmlRegisterType<PieSlice>("Charts", 1, 0, "PieSlice"); - QSGView view; - view.setResizeMode(QSGView::SizeRootObjectToView); + QQuickView view; + view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl::fromLocalFile("app.qml")); view.show(); return app.exec(); diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp index 248f4a2096..876ef54026 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp @@ -40,8 +40,8 @@ #include "piechart.h" #include "pieslice.h" -PieChart::PieChart(QSGItem *parent) - : QSGItem(parent) +PieChart::PieChart(QQuickItem *parent) + : QQuickItem(parent) { } diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h index e95b02f38c..feea3d2789 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h @@ -40,12 +40,12 @@ #ifndef PIECHART_H #define PIECHART_H -#include <QSGItem> +#include <QQuickItem> class PieSlice; //![0] -class PieChart : public QSGItem +class PieChart : public QQuickItem { Q_OBJECT Q_PROPERTY(QDeclarativeListProperty<PieSlice> slices READ slices) @@ -55,7 +55,7 @@ class PieChart : public QSGItem //![1] public: //![1] - PieChart(QSGItem *parent = 0); + PieChart(QQuickItem *parent = 0); QString name() const; void setName(const QString &name); diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp index 70338f08a0..839d153926 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp @@ -41,8 +41,8 @@ #include <QPainter> -PieSlice::PieSlice(QSGItem *parent) - : QSGPaintedItem(parent) +PieSlice::PieSlice(QQuickItem *parent) + : QQuickPaintedItem(parent) { } diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h index 1204f9adf2..157e9cda77 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h @@ -40,11 +40,11 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include <QtDeclarative/QSGPaintedItem> +#include <QtDeclarative/QQuickPaintedItem> #include <QColor> //![0] -class PieSlice : public QSGPaintedItem +class PieSlice : public QQuickPaintedItem { Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor) @@ -53,7 +53,7 @@ class PieSlice : public QSGPaintedItem //![0] public: - PieSlice(QSGItem *parent = 0); + PieSlice(QQuickItem *parent = 0); QColor color() const; void setColor(const QColor &color); diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp index 5aa4a78035..b9a6442acd 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp +++ b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp @@ -40,8 +40,8 @@ #include "piechart.h" #include "pieslice.h" -PieChart::PieChart(QSGItem *parent) - : QSGItem(parent) +PieChart::PieChart(QQuickItem *parent) + : QQuickItem(parent) { } diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h index 1e4f1226dc..2d58360245 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h +++ b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h @@ -40,18 +40,18 @@ #ifndef PIECHART_H #define PIECHART_H -#include <QSGItem> +#include <QQuickItem> class PieSlice; -class PieChart : public QSGItem +class PieChart : public QQuickItem { Q_OBJECT Q_PROPERTY(QDeclarativeListProperty<PieSlice> slices READ slices) Q_PROPERTY(QString name READ name WRITE setName) public: - PieChart(QSGItem *parent = 0); + PieChart(QQuickItem *parent = 0); QString name() const; void setName(const QString &name); diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp index 70338f08a0..839d153926 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp +++ b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.cpp @@ -41,8 +41,8 @@ #include <QPainter> -PieSlice::PieSlice(QSGItem *parent) - : QSGPaintedItem(parent) +PieSlice::PieSlice(QQuickItem *parent) + : QQuickPaintedItem(parent) { } diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h index 3096ee6570..4251e49396 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h @@ -40,10 +40,10 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include <QtDeclarative/QSGPaintedItem> +#include <QtDeclarative/QQuickPaintedItem> #include <QColor> -class PieSlice : public QSGPaintedItem +class PieSlice : public QQuickPaintedItem { Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor) @@ -51,7 +51,7 @@ class PieSlice : public QSGPaintedItem Q_PROPERTY(int angleSpan READ angleSpan WRITE setAngleSpan) public: - PieSlice(QSGItem *parent = 0); + PieSlice(QQuickItem *parent = 0); QColor color() const; void setColor(const QColor &color); |