Move some other examples around in the docs.

Change-Id: Ib50600ff9fd3d807b82a152abd7d587196d5b5e3
Reviewed-on: http://codereview.qt.nokia.com/932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie

3 files changed, 16 insertions, 16 deletions

diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 79c4c4e4e4..8599cb1d75 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -1307,7 +1307,7 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
     {coordinate mode} use coordinateMode().
 
 
-    \sa {demos/gradients}{The Gradients Demo}, QBrush
+    \sa {painting/gradients}{The Gradients Example}, QBrush
 */
 
 /*!
@@ -1617,8 +1617,8 @@ bool QGradient::operator==(const QGradient &gradient)
     returns the final stop point of the gradient, and the start()
     function returning the start point of the gradient.
 
-    \sa QRadialGradient, QConicalGradient, {demos/gradients}{The
-    Gradients Demo}
+    \sa QRadialGradient, QConicalGradient, {painting/gradients}{The
+    Gradients Example}
 */
 
 
@@ -1803,8 +1803,8 @@ void QLinearGradient::setFinalStop(const QPointF &stop)
     radius() functions returning the gradient's center, focal point
     and radius respectively.
 
-    \sa QLinearGradient, QConicalGradient, {demos/gradients}{The
-    Gradients Demo}
+    \sa QLinearGradient, QConicalGradient, {painting/gradients}{The
+    Gradients Example}
 */
 
 static QPointF qt_radial_gradient_adapt_focal_point(const QPointF &center,
@@ -2173,8 +2173,8 @@ void QRadialGradient::setFocalPoint(const QPointF &focalPoint)
     gradient can be specified through its radius or final stop points,
     respectively.
 
-    \sa QLinearGradient, QRadialGradient, {demos/gradients}{The
-    Gradients Demo}
+    \sa QLinearGradient, QRadialGradient, {painting/gradients}{The
+    Gradients Example}
 */
 
 
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index b57f6d77d7..d5a0dd7f40 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1119,9 +1119,9 @@ void QPainterPrivate::updateState(QPainterState *newState)
     function that draws the outline of the given path (i.e. strokes
     the path).
 
-    See also the \l {demos/deform}{Vector Deformation} demo which
+    See also the \l {painting/deform}{Vector Deformation} example which
     shows how to use advanced vector techniques to draw text using a
-    QPainterPath, the \l {demos/gradients}{Gradients} demo which shows
+    QPainterPath, the \l {painting/gradients}{Gradients} example which shows
     the different types of gradients that are available in Qt, and the \l
     {demos/pathstroke}{Path Stroking} demo which shows Qt's built-in
     dash patterns and shows how custom patterns can be used to extend
@@ -1129,8 +1129,8 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table
     \header
-    \o \l {demos/deform}{Vector Deformation}
-    \o \l {demos/gradients}{Gradients}
+    \o \l {painting/deform}{Vector Deformation}
+    \o \l {painting/gradients}{Gradients}
     \o \l {demos/pathstroke}{Path Stroking}
     \row
     \o \inlineimage qpainter-vectordeformation.png
@@ -3413,7 +3413,7 @@ void QPainter::fillPath(const QPainterPath &path, const QBrush &brush)
     \endtable
 
     \sa {painting/painterpaths}{the Painter Paths
-    example},{demos/deform}{the Vector Deformation demo}
+    example},{painting/deform}{the Vector Deformation example}
 */
 void QPainter::drawPath(const QPainterPath &path)
 {
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index c238578199..8bb599f9f0 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -305,19 +305,19 @@ static void qt_debug_path(const QPainterPath &path)
     \section1 Examples
 
     Qt provides the \l {painting/painterpaths}{Painter Paths Example}
-    and the \l {demos/deform}{Vector Deformation Demo} which are
-    located in Qt's example and demo directories respectively.
+    and the \l {painting/deform}{Vector Deformation example} which are
+    located in Qt's example directory.
 
     The \l {painting/painterpaths}{Painter Paths Example} shows how
     painter paths can be used to build complex shapes for rendering
     and lets the user experiment with the filling and stroking.  The
-    \l {demos/deform}{Vector Deformation Demo} shows how to use
+    \l {painting/deform}{Vector Deformation Example} shows how to use
     QPainterPath to draw text.
 
     \table
     \header
     \o \l {painting/painterpaths}{Painter Paths Example}
-    \o \l {demos/deform}{Vector Deformation Demo}
+    \o \l {painting/deform}{Vector Deformation Example}
     \row
     \o \inlineimage qpainterpath-example.png
     \o \inlineimage qpainterpath-demo.png