From a964e56228d147c1acf748e4fe69004593d38c2d Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 27 Jun 2011 13:34:46 +0200 Subject: [PATCH] Change references to affine example. Because of the merge of demos and examples all references to all demos have to be updated. This is the update for the affine example. Change-Id: I83f24010162a73e11786587365c6f10b51d4bf4b Reviewed-on: http://codereview.qt.nokia.com/774 Reviewed-by: Qt Sanity Bot Reviewed-by: David Boddie --- doc/src/demos/affine.qdoc | 2 +- doc/src/examples/transformations.qdoc | 4 ++-- doc/src/painting-and-printing/coordsys.qdoc | 6 +++--- src/gui/painting/qmatrix.cpp | 2 +- src/gui/painting/qpainter.cpp | 6 +++--- src/gui/painting/qtransform.cpp | 4 ++-- tests/auto/guiapplauncher/demos.txt | 1 - tests/auto/guiapplauncher/examples.txt | 1 + 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/src/demos/affine.qdoc b/doc/src/demos/affine.qdoc index adc1a78681f..c14a452849f 100644 --- a/doc/src/demos/affine.qdoc +++ b/doc/src/demos/affine.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example demos/affine + \example painting/affine \title Affine Transformations In this demo we show Qt's ability to perform affine transformations diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc index 26b558c15fd..660089c5449 100644 --- a/doc/src/examples/transformations.qdoc +++ b/doc/src/examples/transformations.qdoc @@ -364,8 +364,8 @@ QTransform documentation. The Qt reference documentation provides several painting - demos. Among these is the \l {demos/affine}{Affine - Transformations} demo that shows Qt's ability to perform + demos. Among these is the \l {painting/affine}{Affine + Transformations} example that shows Qt's ability to perform transformations on painting operations. The demo also allows the user to experiment with the various transformation operations. */ diff --git a/doc/src/painting-and-printing/coordsys.qdoc b/doc/src/painting-and-printing/coordsys.qdoc index 35702b97dac..96eebd01e04 100644 --- a/doc/src/painting-and-printing/coordsys.qdoc +++ b/doc/src/painting-and-printing/coordsys.qdoc @@ -195,8 +195,8 @@ \endtable You can also twist the coordinate system around the origin using - the QPainter::shear() function. See the \l {demos/affine}{Affine - Transformations} demo for a visualization of a sheared coordinate + the QPainter::shear() function. See the \l {painting/affine}{Affine + Transformations} example for a visualization of a sheared coordinate system. All the transformation operations operate on QPainter's transformation matrix that you can retrieve using the QPainter::worldTransform() function. A matrix transforms a point @@ -285,7 +285,7 @@ For a demonstation of Qt's ability to perform affine transformations on painting operations, see the \l - {demos/affine}{Affine Transformations} demo which allows the user + {painting/affine}{Affine Transformations} example which allows the user to experiment with the transformation operations. See also the \l {painting/transformations}{Transformations} example which shows how transformations influence the way that QPainter renders diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp index 6209e66a7bd..7bb2324a2f3 100644 --- a/src/gui/painting/qmatrix.cpp +++ b/src/gui/painting/qmatrix.cpp @@ -177,7 +177,7 @@ QT_BEGIN_NAMESPACE \endtable \sa QPainter, QTransform, {Coordinate System}, - {demos/affine}{Affine Transformations Demo}, {Transformations Example} + {painting/affine}{Affine Transformations Example}, {Transformations Example} */ diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index b13ca94b306..73addd2679a 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1223,7 +1223,7 @@ void QPainterPrivate::updateState(QPainterState *newState) rotate it clockwise and translate() to translate it (i.e. adding a given offset to the points). You can also twist the coordinate system around the origin using the shear() function. See the \l - {demos/affine}{Affine Transformations} demo for a visualization of + {painting/affine}{Affine Transformations} example for a visualization of a sheared coordinate system. See also the \l {painting/transformations}{Transformations} @@ -1234,9 +1234,9 @@ void QPainterPrivate::updateState(QPainterState *newState) \table 100% \row \o - \bold {Affine Transformations Demo} + \bold {Affine Transformations Example} - The \l {demos/affine}{Affine Transformations} demo show Qt's + The \l {painting/affine}{Affine Transformations} example shows Qt's ability to perform affine transformations on painting operations. The demo also allows the user to experiment with the transformation operations and see the results immediately. diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 4d7b3391a6f..e42eec6f96a 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -223,8 +223,8 @@ QT_BEGIN_NAMESPACE \snippet doc/src/snippets/transform/main.cpp 2 \endtable - \sa QPainter, {Coordinate System}, {demos/affine}{Affine - Transformations Demo}, {Transformations Example} + \sa QPainter, {Coordinate System}, {painting/affine}{Affine + Transformations Example}, {Transformations Example} */ /*! diff --git a/tests/auto/guiapplauncher/demos.txt b/tests/auto/guiapplauncher/demos.txt index 2835f09477a..8853c2644ea 100644 --- a/tests/auto/guiapplauncher/demos.txt +++ b/tests/auto/guiapplauncher/demos.txt @@ -1,4 +1,3 @@ -"Affine Demo", "demos/affine", "affine", 0, -1 "Books Demo", "demos/books", "books", 0, -1 "Chip Demo", "demos/chip", "chip", 0, -1 "Composition Demo", "demos/composition", "composition", 0, -1 diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt index fea7e543f0f..fac703a024c 100644 --- a/tests/auto/guiapplauncher/examples.txt +++ b/tests/auto/guiapplauncher/examples.txt @@ -61,6 +61,7 @@ "opengl/overpainting Example", "examples/opengl/overpainting", "overpainting", 10, -1 "opengl/samplebuffers Example", "examples/opengl/samplebuffers", "samplebuffers", 10, -1 "opengl/textures Example", "examples/opengl/textures", "textures", 10, -1 +"Affine Transformations Example", "examples/painting/affine", "affine", 0, -1 "painting/basicdrawing Example", "examples/painting/basicdrawing", "basicdrawing", 10, -1 "painting/concentriccircles Example", "examples/painting/concentriccircles", "concentriccircles", 0, -1 "painting/fontsampler Example", "examples/painting/fontsampler", "fontsampler", 0, -1