diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-04-23 22:19:05 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-23 18:29:25 +0200 |
commit | 61b4e90a0fe3d864ac03be2a318d7eec74e3cf0a (patch) | |
tree | 4b511a6818a0487acb1ef5bc333c18cee70932e1 /src/qml | |
parent | 59f075df52f5e78b95b360fb0533c2249924e7a7 (diff) |
Doc: Qt Quick: Fix module name format (Pt 2/2)
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
Attempt to differentiate between the whole module ("Qt Quick") and the
QML import ("QtQuick") by encoding the latter with monospace font. There
are places in the text where both representations are valid.
Change-Id: If398304757e0a5106542c09099e1814084e54c5c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/doc/src/cppintegration/definetypes.qdoc | 4 | ||||
-rw-r--r-- | src/qml/doc/src/javascript/dynamicobjectcreation.qdoc | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlerror.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlextensionplugin.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlglobal_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmllist.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmllocale.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index af7aed251d..1aab159deb 100644 --- a/src/qml/doc/src/cppintegration/definetypes.qdoc +++ b/src/qml/doc/src/cppintegration/definetypes.qdoc @@ -675,7 +675,7 @@ to be declared for an item without explicitly assigning them to the \l{Item::}{children} property.) -\section2 Defining Visual Items with the QtQuick Module +\section2 Defining Visual Items with the Qt Quick Module When building user interfaces with the \l {Qt Quick} module, all QML objects that are to be visually rendered must derive from the \l Item type, as it is the base @@ -687,7 +687,7 @@ QML-based user interface. See the QQuickItem documentation for more information. Additionally, the \l{Writing QML Extensions with C++} tutorial demonstrates how a QQuickItem-based -visual item can be implemented in C++ and integrated into a QtQuick-based user +visual item can be implemented in C++ and integrated into a Qt Quick-based user interface. diff --git a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc index 27fcc7b39b..421b180f7b 100644 --- a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc +++ b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc @@ -109,7 +109,7 @@ the \c finishCreation() function and call \l {Component::createObject()} Notice in both instances, \l {Component::createObject()}{createObject()} is called with \c appWindow passed as the parent argument, since the dynamically -created object is a visual (QtQuick) object. The created object will become a +created object is a visual (Qt Quick) object. The created object will become a child of the \c appWindow object in \c main.qml, and appear in the scene. When using files with relative paths, the path should diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 2ad887a087..aadcbd0cd3 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -186,7 +186,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject) } \endcode - Note that the QtQuick 1 version is named QDeclarativeComponent. + Note that the Qt Quick 1 version is named QDeclarativeComponent. */ /*! diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 63f579ede7..5dda7ea430 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -800,7 +800,7 @@ QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine() In this case, the Text item will be created in the engine's \l {QQmlEngine::rootContext()}{root context}. - Note that the QtQuick 1 version is called QDeclarativeEngine. + Note that the Qt Quick 1 version is called QDeclarativeEngine. \sa QQmlComponent, QQmlContext */ diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp index 88129b7240..96e867d916 100644 --- a/src/qml/qml/qqmlerror.cpp +++ b/src/qml/qml/qqmlerror.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE ^ \endcode - Note that the QtQuick 1 version is named QDeclarativeError + Note that the Qt Quick 1 version is named QDeclarativeError \sa QQuickView::errors(), QQmlComponent::errors() */ diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index 3bc0c50ba4..c35a495025 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -162,7 +162,7 @@ QQmlExpressionPrivate::create(QQmlContextData *ctxt, QObject *object, int result = expr->evaluate().toInt(); // result = 400 \endcode - Note that the QtQuick 1 version is called QDeclarativeExpression. + Note that the Qt Quick 1 version is called QDeclarativeExpression. */ /*! diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp index edef5a91cd..827b9da159 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -121,7 +121,7 @@ QT_BEGIN_NAMESPACE The \l {Writing QML Extensions with C++} tutorial also contains a chapter on creating QML plugins. - Note that the QtQuick 1 version is called QDeclarativeExtensionPlugin. + Note that the Qt Quick 1 version is called QDeclarativeExtensionPlugin. \sa QQmlEngine::importPlugin(), {How to Create Qt Plugins} */ diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index 6ca54f65cd..19139ce920 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -317,7 +317,7 @@ class QQmlApplicationPrivate; class Q_QML_PRIVATE_EXPORT QQmlApplication : public QObject { - //Application level logic, subclassed by QtQuick if available via QQmlGuiProvider + //Application level logic, subclassed by Qt Quick if available via QQmlGuiProvider Q_OBJECT Q_PROPERTY(QStringList arguments READ args CONSTANT) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp index e6913f01a8..57f9577446 100644 --- a/src/qml/qml/qqmllist.cpp +++ b/src/qml/qml/qqmllist.cpp @@ -112,7 +112,7 @@ Attempting to add objects of the incorrect type to a list property will fail. Like with normal lists, when accessing a list element by index, it is the callers responsibility to ensure that it does not request an out of range element using the count() method before calling at(). -The QtQuick 1 version of this class is named QDeclarativeListReference. +The Qt Quick 1 version of this class is named QDeclarativeListReference. */ /*! @@ -369,7 +369,7 @@ Q_PROPERTY(QQmlListProperty<Fruit> fruit READ fruit); QML list properties are typesafe - in this case \c {Fruit} is a QObject type that \c {Apple}, \c {Orange} and \c {Banana} all derive from. -The QtQuick 1 version of this class is named QDeclarativeListProperty. +The Qt Quick 1 version of this class is named QDeclarativeListProperty. \note QQmlListProperty can only be used for lists of QObject-derived object pointers. */ diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 018c55a925..15ddcc7c29 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -812,7 +812,7 @@ V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data); } \endcode - QtQuick Locale's data is based on Common Locale Data Repository v1.8.1. + Qt Quick Locale's data is based on Common Locale Data Repository v1.8.1. \target FormatType diff --git a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp index 156c341158..02b22bef0c 100644 --- a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp +++ b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp @@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE For more information about signals and threads, see \l {Threads and QObjects} and \l {Signals and Slots Across Threads}. - The QtQuick 1 version of this class is named QDeclarativeNetworkAccessManagerFactory. + The Qt Quick 1 version of this class is named QDeclarativeNetworkAccessManagerFactory. \sa {qml/networkaccessmanagerfactory}{NetworkAccessManagerFactory example} */ diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index fa728fec0d..ee06d3b1d5 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -112,7 +112,7 @@ property.write(24); qWarning() << "Pixel size should now be 24:" << property.read().toInt(); \endcode -The QtQuick 1 version of this class was named QDeclarativeProperty. +The Qt Quick 1 version of this class was named QDeclarativeProperty. */ /*! |