aboutsummaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
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 /doc/src/declarative
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 'doc/src/declarative')
-rw-r--r--doc/src/declarative/example-textballoons.qdoc14
-rw-r--r--doc/src/declarative/qmltest.qdoc2
-rw-r--r--doc/src/declarative/whatsnew.qdoc8
3 files changed, 12 insertions, 12 deletions
diff --git a/doc/src/declarative/example-textballoons.qdoc b/doc/src/declarative/example-textballoons.qdoc
index a8bed3a38c..489d8ac6e2 100644
--- a/doc/src/declarative/example-textballoons.qdoc
+++ b/doc/src/declarative/example-textballoons.qdoc
@@ -34,12 +34,12 @@
\image declarative-textballoons_example.png
- The QSGPaintedItem class is a class derived from QSGItem for implementing
+ The QQuickPaintedItem class is a class derived from QQuickItem for implementing
custom QML Scene Graph items using the QPainter interfaces.
The example consists of an item class, a plugin class and a QML file
to use this plugin. The \c TextBalloon class represents the individual
- text balloons extending QSGPaintedItem, the \c TextBalloonPlugin class
+ text balloons extending QQuickPaintedItem, the \c TextBalloonPlugin class
represents the skeleton code for a QtQuick plugin and the
\c textballoons.qml file is used to load the plugin and display the text
balloons.
@@ -51,14 +51,14 @@
\section1 TextBalloon Class Declaration
- The \c TextBalloon class inherits from QSGPaintedItem. QSGPaintedItem
+ The \c TextBalloon class inherits from QQuickPaintedItem. QQuickPaintedItem
is the base class for all QPainter based items in the QML Scene Graph
framework.
\snippet examples/declarative/painteditem/textballoons/textballoon.h 0
- To implement a QSGPaintedItem you must implement QSGPaintedIem's pure
- virtual function \l {QSGPaintedItem::}{paint()} which implements the
+ To implement a QQuickPaintedItem you must implement QQuickPaintedIem's pure
+ virtual function \l {QQuickPaintedItem::}{paint()} which implements the
painting of the element.
\section1 TextBalloon Class Definition
@@ -75,9 +75,9 @@
\snippet examples/declarative/painteditem/textballoons/textballoon.cpp 1
We start with setting the pen and brush on the item to define the look of
- the item. After that we start drawing. Note that the \l {QSGPaintedItem::}{boundingRect()}
+ the item. After that we start drawing. Note that the \l {QQuickPaintedItem::}{boundingRect()}
item is called to draw depending on the size of the item. The rectangle
- returned by the \l {QSGPaintedItem::}{boundingRect()} function is the size
+ returned by the \l {QQuickPaintedItem::}{boundingRect()} function is the size
of the item as defined in the QML file.
\section1 textballoons.qml file
diff --git a/doc/src/declarative/qmltest.qdoc b/doc/src/declarative/qmltest.qdoc
index 3421c16fae..102118d3c5 100644
--- a/doc/src/declarative/qmltest.qdoc
+++ b/doc/src/declarative/qmltest.qdoc
@@ -107,7 +107,7 @@
\section1 Running tests with QtQuick 1
The \c{-qtquick1} option can be passed to a test binary to run
- the tests using QDeclarativeView (QtQuick 1) rather than QSGView (QtQuick 2):
+ the tests using QDeclarativeView (QtQuick 1) rather than QQuickView (QtQuick 2):
\code
tst_example -qtquick1
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index 4c44166472..749392a143 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -39,10 +39,10 @@ QtQuick 2 is based on an OpenGL scenegraph. The following
classes replace their equivalents in QtQuick 1:
\list
-\o QSGView
-\o QSGCanvas
-\o QSGItem
-\o QSGPaintedItem
+\o QQuickView
+\o QQuickCanvas
+\o QQuickItem
+\o QQuickPaintedItem
\endlist
\section2 QML Engine/Language Improvements