Renamed the values in the Qt::TileRule enum.

Stretch, Repeat and Round are too generic. Renamed to StretchTile,
RepeatTile and RoundTile.

Reviewed-by: Gunnar

2 files changed, 14 insertions, 14 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index a440606..9d76dcc 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -194,9 +194,9 @@ public:
     };
 
     enum TileRule {
-        Stretch,
-        Repeat,
-        Round
+        StretchTile,
+        RepeatTile,
+        RoundTile
     };
 
     // Text formatting flags for QPainter::drawText and QLabel.
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 9106fa8..482beed 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -612,7 +612,7 @@
 */
 
 /*!
-  \enum Qt::CoordinateSystem 
+  \enum Qt::CoordinateSystem
   \value DeviceCoordinates
   \value LogicalCoordinates
  */
@@ -1220,7 +1220,7 @@
     touch device will be sent as mouse events.
 
     \value WA_TouchPadAcceptSingleTouchEvents Allows touchpad single
-    touch events to be sent to the widget. 
+    touch events to be sent to the widget.
 
     \value WA_DontUseStandardGestures Disables standard gestures on Qt widgets.
 
@@ -1241,7 +1241,7 @@
     \omitvalue WA_PendingUpdate
     \omitvalue WA_LaidOut
     \omitvalue WA_GrabbedShortcut
-    \omitvalue WA_DontShowOnScreen 
+    \omitvalue WA_DontShowOnScreen
     \omitvalue WA_InvalidSize
     \omitvalue WA_ForceUpdatesDisabled
     \omitvalue WA_NoX11EventCompression
@@ -1259,7 +1259,7 @@
 /*! \typedef Qt::HANDLE
 
     Platform-specific handle type for system objects. This is
-    equivalent to \c{void *} on Mac OS X and embedded Linux, 
+    equivalent to \c{void *} on Mac OS X and embedded Linux,
     and to \c{unsigned long} on X11. On Windows it is the
     DWORD returned by the Win32 function getCurrentThreadId().
 
@@ -2762,13 +2762,13 @@
   This enum describes how to repeat or stretch the parts of an image
   when drawing.
 
-  \value Stretch   Scale the image to fit to the available area.
+  \value StretchTile  Scale the image to fit to the available area.
 
-  \value Repeat    Tile the image until there is no more space. May crop
-  the last image.
+  \value RepeatTile   Repeat the image until there is no more space. May
+  crop the last image.
 
-  \value Round 	   Like Repeat, but scales the images down to ensure that
-  the last image is not cropped.
+  \value RoundTile    Similar to Repeat, but scales the image down to
+  ensure that the last tile is not cropped.
 */
 
 /*!
@@ -2812,13 +2812,13 @@
     \value NavigationModeNone                Only the touch screen is used.
     \value NavigationModeKeypadTabOrder      Qt::Key_Up and Qt::Key_Down are used to change focus.
     \value NavigationModeKeypadDirectional   Qt::Key_Up, Qt::Key_Down, Qt::Key_Left and Qt::Key_Right are used to change focus.
-    \value NavigationModeCursorAuto          The mouse cursor is used to change focus, 
+    \value NavigationModeCursorAuto          The mouse cursor is used to change focus,
                                              it is displayed only on non touchscreen devices.
                                              The keypad is used to implement a virtual cursor, unless
                                              the device has an analog mouse type of input device (e.g. touchpad).
                                              This is the recommended setting for an application such as a web browser that
                                              needs pointer control on both touch and non-touch devices.
-    \value NavigationModeCursorForceVisible  The mouse cursor is used to change focus, 
+    \value NavigationModeCursorForceVisible  The mouse cursor is used to change focus,
                                              it is displayed regardless of device type.
                                              The keypad is used to implement a virtual cursor, unless
                                              the device has an analog mouse type of input device (e.g. touchpad)