aboutsummaryrefslogtreecommitdiffstats
path: root/examples/declarative/tutorials/extending/chapter5-listproperties
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-10-14 10:51:42 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-21 11:53:26 +0200
commitbfb3c424abc7c839dc44de0e36024ede99ece736 (patch)
treeb6814d0238bead8518b23c078beb818432de6ce4 /examples/declarative/tutorials/extending/chapter5-listproperties
parent2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (diff)
Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'examples/declarative/tutorials/extending/chapter5-listproperties')
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp6
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp4
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h6
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.cpp4
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h6
5 files changed, 13 insertions, 13 deletions
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);