Change Quick docs to refer to "types" rather than "elements"

Task-number: QTBUG-24785
Change-Id: I223479b879514abaacb123852323c1cfada7a5e1
Reviewed-by: Bea Lam <bea.lam@nokia.com>

13 files changed, 29 insertions, 29 deletions

diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 5d7e21d42c..46180cb421 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -75,10 +75,10 @@ QT_BEGIN_NAMESPACE
     \ingroup qtquick-transitions-animations
     \brief Is the base of all QML animations
 
-    The Animation element cannot be used directly in a QML file.  It exists
+    The Animation type cannot be used directly in a QML file.  It exists
     to provide a set of common properties and methods, available across all the
     other animation types that inherit from it.  Attempting to use the Animation
-    element directly will result in an error.
+    type directly will result in an error.
 */
 
 QQuickAbstractAnimation::QQuickAbstractAnimation(QObject *parent)
@@ -125,7 +125,7 @@ QAbstractAnimationJob* QQuickAbstractAnimation::qtAnimation()
     \endcode
 
     Likewise, the \c running property can be read to determine if the animation
-    is running.  In the following example the text element will indicate whether
+    is running.  In the following example the Text item will indicate whether
     or not the animation is running.
 
     \code
@@ -728,7 +728,7 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti
 
     \snippet qml/coloranimation.qml 0
 
-    Like any other animation element, a ColorAnimation can be applied in a
+    Like any other animation type, a ColorAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
@@ -1250,7 +1250,7 @@ QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &acti
 
     \snippet qml/numberanimation.qml 0
 
-    Like any other animation element, a NumberAnimation can be applied in a
+    Like any other animation type, a NumberAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
@@ -1356,7 +1356,7 @@ void QQuickNumberAnimation::setTo(qreal t)
     Vector3dAnimation is a specialized PropertyAnimation that defines an
     animation to be applied when a Vector3d value changes.
 
-    Like any other animation element, a Vector3dAnimation can be applied in a
+    Like any other animation type, a Vector3dAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
@@ -1455,7 +1455,7 @@ void QQuickVector3dAnimation::setTo(QVector3D t)
     the change at the start of the animation using PropertyAction. See the
     PropertyAction documentation for more details.
 
-    Like any other animation element, a RotationAnimation can be applied in a
+    Like any other animation type, a RotationAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
@@ -1669,7 +1669,7 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
     \inherits Animation
     \brief Allows animations to be run sequentially
 
-    The SequentialAnimation and ParallelAnimation elements allow multiple
+    The SequentialAnimation and ParallelAnimation types allow multiple
     animations to be run together. Animations defined in a SequentialAnimation
     are run one after the other, while animations defined in a ParallelAnimation
     are run at the same time.
@@ -1683,7 +1683,7 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
     so SequentialAnimation can be used to enclose the animations in a \l Transition
     if this is the preferred behavior.
 
-    Like any other animation element, a SequentialAnimation can be applied in a
+    Like any other animation type, a SequentialAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
@@ -1742,7 +1742,7 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions
     \inherits Animation
     \brief Enables animations to be run in parallel
 
-    The SequentialAnimation and ParallelAnimation elements allow multiple
+    The SequentialAnimation and ParallelAnimation types allow multiple
     animations to be run together. Animations defined in a SequentialAnimation
     are run one after the other, while animations defined in a ParallelAnimation
     are run at the same time.
@@ -1752,7 +1752,7 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions
 
     \snippet qml/parallelanimation.qml 0
 
-    Like any other animation element, a ParallelAnimation can be applied in a
+    Like any other animation type, a ParallelAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
@@ -1917,7 +1917,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
     different. For more information see the individual property documentation, as well
     as the \l{QML Animation and Transitions} introduction.
 
-    Note that PropertyAnimation inherits the abstract \l Animation element.
+    Note that PropertyAnimation inherits the abstract \l Animation type.
     This includes additional properties and methods for controlling the animation.
 
     \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
diff --git a/src/quick/util/qquickbind.cpp b/src/quick/util/qquickbind.cpp
index 0a1cd27a76..3ccd5222f9 100644
--- a/src/quick/util/qquickbind.cpp
+++ b/src/quick/util/qquickbind.cpp
@@ -111,7 +111,7 @@ public:
 
     The above example will produce a warning whenever we release the mouse, as the value
     of the binding is undefined when the mouse isn't pressed. We can use the Binding
-    element to rewrite the above code and avoid the warning.
+    type to rewrite the above code and avoid the warning.
 
     \qml
     Binding on value {
@@ -120,7 +120,7 @@ public:
     }
     \endqml
 
-    The Binding element will also restore any previously set direct bindings on
+    The Binding type will also restore any previously set direct bindings on
     the property. In that sense, it functions much like a simplified State.
 
     \qml
diff --git a/src/quick/util/qquickconnections.cpp b/src/quick/util/qquickconnections.cpp
index 9b086b9e03..654d0b7ae7 100644
--- a/src/quick/util/qquickconnections.cpp
+++ b/src/quick/util/qquickconnections.cpp
@@ -96,7 +96,7 @@ public:
         \li Connecting to targets not defined in QML
     \endlist
 
-    When any of these are needed, the Connections element can be used instead.
+    When any of these are needed, the Connections type can be used instead.
 
     For example, the above code can be changed to use a Connections object,
     like this:
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index 1d982ce14c..82f0468d99 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -151,7 +151,7 @@ QHash<QUrl, QQuickFontObject*> QQuickFontLoaderPrivate::fonts;
     \ingroup qtquick-text-utility
     \brief Allows fonts to be loaded by name or URL
 
-    The FontLoader element is used to load fonts by name or URL.
+    The FontLoader type is used to load fonts by name or URL.
 
     The \l status indicates when the font has been loaded, which is useful
     for fonts loaded from remote sources.
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp
index 42da519f58..c6ad5acaa3 100644
--- a/src/quick/util/qquickimageprovider.cpp
+++ b/src/quick/util/qquickimageprovider.cpp
@@ -277,7 +277,7 @@ QQuickImageProvider::Flags QQuickImageProvider::flags() const
     was "image://myprovider/icons/home", the given \a id would be "icons/home".
 
     The \a requestedSize corresponds to the \l {Image::sourceSize} requested by
-    an Image element. If \a requestedSize is a valid size, the image
+    an Image item. If \a requestedSize is a valid size, the image
     returned should be of that size.
 
     In all cases, \a size must be set to the original size of the image. This
@@ -306,7 +306,7 @@ QImage QQuickImageProvider::requestImage(const QString &id, QSize *size, const Q
     was "image://myprovider/icons/home", the given \a id would be "icons/home".
 
     The \a requestedSize corresponds to the \l {Image::sourceSize} requested by
-    an Image element. If \a requestedSize is a valid size, the image
+    an Image item. If \a requestedSize is a valid size, the image
     returned should be of that size.
 
     In all cases, \a size must be set to the original size of the image. This
@@ -333,7 +333,7 @@ QPixmap QQuickImageProvider::requestPixmap(const QString &id, QSize *size, const
     was "image://myprovider/icons/home", the given \a id would be "icons/home".
 
     The \a requestedSize corresponds to the \l {Image::sourceSize} requested by
-    an Image element. If \a requestedSize is a valid size, the image
+    an Image item. If \a requestedSize is a valid size, the image
     returned should be of that size.
 
     In all cases, \a size must be set to the original size of the image. This
diff --git a/src/quick/util/qquickpackage.cpp b/src/quick/util/qquickpackage.cpp
index 33632357e9..3ec28f31f1 100644
--- a/src/quick/util/qquickpackage.cpp
+++ b/src/quick/util/qquickpackage.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     \l{Package::name}{Package.name} attached property.
 
     The example below creates a Package containing two named items;
-    \e list and \e grid.  The third element in the package (the \l Rectangle) is parented to whichever
+    \e list and \e grid.  The third item in the package (the \l Rectangle) is parented to whichever
     delegate it should appear in.  This allows an item to move
     between views.
 
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index b51eefcd4e..68e5a0e247 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -123,7 +123,7 @@ QT_BEGIN_NAMESPACE
     state to those defined in the new state (as defined by PropertyChanges
     objects). However, it is sometimes desirable to set a property value
     \e immediately during a \l Transition, without animation; in these cases,
-    the PropertyAction element can be used to force an immediate property
+    the PropertyAction type can be used to force an immediate property
     change.
 
     See the PropertyAction documentation for more details.
diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 49dce04db3..7a7968472b 100644
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -345,7 +345,7 @@ void QSmoothedAnimation::init()
     set to a value such as 0.5 units/second.  Animating from 0 to 1.0 with a velocity
     of 0.5 will take 2000 ms to complete.
 
-    Like any other animation element, a SmoothedAnimation can be applied in a
+    Like any other animation type, a SmoothedAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index 413f95edb3..718eaf0bab 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -359,7 +359,7 @@ void QQuickSpringAnimationPrivate::updateMode()
 
     \snippet qml/springanimation.qml 0
 
-    Like any other animation element, a SpringAnimation can be applied in a
+    Like any other animation type, a SpringAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index f6802b1f43..98dbd6d30c 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -134,7 +134,7 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent)
     different scripts.
 
     The following example displays a single \l Rectangle. In the default state, the rectangle
-    is colored black. In the "clicked" state, a PropertyChanges element changes the
+    is colored black. In the "clicked" state, a PropertyChanges object changes the
     rectangle's color to red. Clicking within the MouseArea toggles the rectangle's state
     between the default state and the "clicked" state, thus toggling the color of the
     rectangle between black and red.
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
index 2d8ed951fb..9e0909b741 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -95,11 +95,11 @@ public:
    \qmlclass StateGroup QQuickStateGroup
     \inqmlmodule QtQuick 2
    \ingroup qtquick-states
-   \brief Provides built-in state support for non-Item elements
+   \brief Provides built-in state support for non-Item types
 
-   Item (and all derived elements) provides built in support for states and transitions
+   Item (and all derived types) provides built in support for states and transitions
    via its \l{Item::state}{state}, \l{Item::states}{states} and \l{Item::transitions}{transitions} properties. StateGroup provides an easy way to
-   use this support in other (non-Item-derived) elements.
+   use this support in other (non-Item-derived) types.
 
    \qml
    MyCustomObject {
diff --git a/src/quick/util/qquicksystempalette.cpp b/src/quick/util/qquicksystempalette.cpp
index b500f204f0..7c234a3264 100644
--- a/src/quick/util/qquicksystempalette.cpp
+++ b/src/quick/util/qquicksystempalette.cpp
@@ -62,7 +62,7 @@ public:
     \ingroup qtquick-visual-utility
     \brief Provides access to the Qt palettes
 
-    The SystemPalette element provides access to the Qt application
+    The SystemPalette type provides access to the Qt application
     palettes. This provides information about the standard colors used
     for application windows, buttons and other features. These colors
     are grouped into three \e {color groups}: \c Active, \c Inactive,
diff --git a/src/quick/util/qquicktimer.cpp b/src/quick/util/qquicktimer.cpp
index 88dc0790d9..7b747005e2 100644
--- a/src/quick/util/qquicktimer.cpp
+++ b/src/quick/util/qquicktimer.cpp
@@ -98,7 +98,7 @@ public:
     }
     \endqml
 
-    The Timer element is synchronized with the animation timer.  Since the animation
+    The Timer type is synchronized with the animation timer.  Since the animation
     timer is usually set to 60fps, the resolution of Timer will be
     at best 16ms.