Doc: in QML use "real" and "enumeration", not "qreal" and "enum"

12 files changed, 23 insertions, 28 deletions

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index ce3a6e3..355c0f4 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -46,8 +46,6 @@
 
 The following table lists the QML elements provided by the Qt Declarative module.
 
-\bold {Standard Qt Declarative Elements}
-
 \table 80%
 \header
 \o \bold {States}
@@ -81,6 +79,7 @@ The following table lists the QML elements provided by the Qt Declarative module
 \o \l PropertyAction
 \o \l ScriptAction
 \o \l Transition
+\o \l SmoothedFollow
 \o \l SpringFollow
 \o \l Behavior
 \endlist
@@ -109,11 +108,7 @@ The following table lists the QML elements provided by the Qt Declarative module
 \o \l QtObject
 \o \l WorkerScript
 \endlist
-\endtable
 
-\bold {QML Items}
-
-\table 80%
 \header
 \o \bold {Basic Visual Items}
 \o \bold {Basic Interaction Items}
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index be9d8bd..7858a7a 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -82,7 +82,7 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
         QDeclarativePixmapCache::cancel(d->sciurl, this);
 }
 /*!
-    \qmlproperty enum BorderImage::status
+    \qmlproperty enumeration BorderImage::status
 
     This property holds the status of image loading.  It can be one of:
     \list
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp
index a181071..4425c97 100644
--- a/src/declarative/graphicsitems/qdeclarativeevents.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp
@@ -145,7 +145,7 @@ Item {
 */
 
 /*!
-    \qmlproperty enum MouseEvent::button
+    \qmlproperty enumeration MouseEvent::button
 
     This property holds the button that caused the event.  It can be one of:
     \list
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index ca86637..37b07bf 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -221,7 +221,7 @@ qreal QDeclarativeImage::paintedHeight() const
 }
 
 /*!
-    \qmlproperty enum Image::status
+    \qmlproperty enumeration Image::status
 
     This property holds the status of image loading.  It can be one of:
     \list
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 0e4e327..843dfdc 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1415,7 +1415,7 @@ QDeclarativeItem::~QDeclarativeItem()
 }
 
 /*!
-    \qmlproperty enum Item::transformOrigin
+    \qmlproperty enumeration Item::transformOrigin
     This property holds the origin point around which scale and rotation transform.
 
     Nine transform origins are available, as shown in the image below.
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 409c228..8cf8235 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -325,7 +325,7 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
 }
 
 /*!
-    \qmlproperty enum Loader::status
+    \qmlproperty enumeration Loader::status
 
     This property holds the status of QML loading.  It can be one of:
     \list
@@ -383,7 +383,7 @@ qreal QDeclarativeLoader::progress() const
 }
 
 /*!
-    \qmlproperty enum Loader::resizeMode
+    \qmlproperty enumeration Loader::resizeMode
 
     This property determines how the Loader or item are resized:
     \list
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 7e20428..fd85d91 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1316,7 +1316,7 @@ void QDeclarativeRotationAnimation::setTo(qreal t)
 }
 
 /*!
-    \qmlproperty enum RotationAnimation::direction
+    \qmlproperty enumeration RotationAnimation::direction
     The direction in which to rotate.
     Possible values are Numerical, Clockwise, Counterclockwise,
     or Shortest.
@@ -1741,7 +1741,7 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
 }
 
 /*!
-    \qmlproperty enum PropertyAnimation::easing.type
+    \qmlproperty enumeration PropertyAnimation::easing.type
     \qmlproperty real PropertyAnimation::easing.amplitude
     \qmlproperty real PropertyAnimation::easing.overshoot
     \qmlproperty real PropertyAnimation::easing.period
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index b577b81..41740a8 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -181,7 +181,7 @@ void QDeclarativeFontLoader::setName(const QString &name)
 }
 
 /*!
-    \qmlproperty enum FontLoader::status
+    \qmlproperty enumeration FontLoader::status
 
     This property holds the status of font loading.  It can be one of:
     \list
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 48a7583..19a00ee 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -438,7 +438,7 @@ qreal QDeclarativeSmoothedAnimation::velocity() const
 }
 
 /*!
-    \qmlproperty qreal SmoothedAnimation::velocity
+    \qmlproperty real SmoothedAnimation::velocity
 
     This property holds the average velocity allowed when tracking the 'to' value.
 
@@ -457,7 +457,7 @@ void QDeclarativeSmoothedAnimation::setVelocity(qreal v)
 }
 
 /*!
-    \qmlproperty qreal SmoothedAnimation::maximumEasingTime
+    \qmlproperty int SmoothedAnimation::maximumEasingTime
 
     This property specifies the maximum time, in msecs, an "eases" during the follow should take.
     Setting this property causes the velocity to "level out" after at a time.  Setting
diff --git a/src/declarative/util/qdeclarativesmoothedfollow.cpp b/src/declarative/util/qdeclarativesmoothedfollow.cpp
index 9f155fc..3ed9257 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow.cpp
+++ b/src/declarative/util/qdeclarativesmoothedfollow.cpp
@@ -195,7 +195,7 @@ qreal QDeclarativeSmoothedFollow::velocity() const
 }
 
 /*!
-    \qmlproperty qreal SmoothedFollow::velocity
+    \qmlproperty real SmoothedFollow::velocity
 
     This property holds the average velocity allowed when tracking the 'to' value.
 
@@ -214,7 +214,7 @@ void QDeclarativeSmoothedFollow::setVelocity(qreal v)
 }
 
 /*!
-    \qmlproperty qreal SmoothedFollow::maximumEasingTime
+    \qmlproperty int SmoothedFollow::maximumEasingTime
 
     This property specifies the maximum time, in msecs, an "eases" during the follow should take.
     Setting this property causes the velocity to "level out" after at a time.  Setting
diff --git a/src/declarative/util/qdeclarativespringfollow.cpp b/src/declarative/util/qdeclarativespringfollow.cpp
index 7921735..70077f3 100644
--- a/src/declarative/util/qdeclarativespringfollow.cpp
+++ b/src/declarative/util/qdeclarativespringfollow.cpp
@@ -267,7 +267,7 @@ qreal QDeclarativeSpringFollow::to() const
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::to
+    \qmlproperty real SpringFollow::to
     This property holds the target value which will be tracked.
 
     Bind to a property in order to track its changes.
@@ -284,7 +284,7 @@ void QDeclarativeSpringFollow::setTo(qreal value)
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::velocity
+    \qmlproperty real SpringFollow::velocity
     This property holds the maximum velocity allowed when tracking the source.
 */
 
@@ -303,7 +303,7 @@ void QDeclarativeSpringFollow::setVelocity(qreal velocity)
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::spring
+    \qmlproperty real SpringFollow::spring
     This property holds the spring constant
 
     The spring constant describes how strongly the target is pulled towards the
@@ -326,7 +326,7 @@ void QDeclarativeSpringFollow::setSpring(qreal spring)
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::damping
+    \qmlproperty real SpringFollow::damping
     This property holds the spring damping constant
 
     The damping constant describes how quickly a sprung follower comes to rest.
@@ -349,7 +349,7 @@ void QDeclarativeSpringFollow::setDamping(qreal damping)
 
 
 /*!
-    \qmlproperty qreal SpringFollow::epsilon
+    \qmlproperty real SpringFollow::epsilon
     This property holds the spring epsilon
 
     The epsilon is the rate and amount of change in the value which is close enough
@@ -371,7 +371,7 @@ void QDeclarativeSpringFollow::setEpsilon(qreal epsilon)
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::modulus
+    \qmlproperty real SpringFollow::modulus
     This property holds the modulus value.
 
     Setting a \a modulus forces the target value to "wrap around" at the modulus.
@@ -394,7 +394,7 @@ void QDeclarativeSpringFollow::setModulus(qreal modulus)
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::mass
+    \qmlproperty real SpringFollow::mass
     This property holds the "mass" of the property being moved.
 
     mass is 1.0 by default.  Setting a different mass changes the dynamics of
@@ -452,7 +452,7 @@ bool QDeclarativeSpringFollow::inSync() const
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::value
+    \qmlproperty real SpringFollow::value
     The current value.
 */
 qreal QDeclarativeSpringFollow::value() const
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 7f8b962..55e768e 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -667,7 +667,7 @@ void QDeclarativeXmlListModel::setNamespaceDeclarations(const QString &declarati
 }
 
 /*!
-    \qmlproperty enum XmlListModel::status
+    \qmlproperty enumeration XmlListModel::status
     Specifies the model loading status, which can be one of the following:
 
     \list