aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/cppintegration
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2012-07-18 14:39:20 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-20 03:46:56 +0200
commit6742d20581a7b05461b2c1662b39fcc68e84b4e2 (patch)
treed5f6a65d3cc8f2fd29ac14497430fcee17f02bcf /src/qml/doc/src/cppintegration
parentb8c80243abc4f96e31243bf04dc29318fae61864 (diff)
Make title capitalization more consistent in QML documentation.
Change-Id: Iec8168135676e0e9e130bd2245ef33fd780829d5 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration')
-rw-r--r--src/qml/doc/src/cppintegration/data.qdoc6
-rw-r--r--src/qml/doc/src/cppintegration/functions.qdoc6
-rw-r--r--src/qml/doc/src/cppintegration/reverse.qdoc12
-rw-r--r--src/qml/doc/src/cppintegration/topic.qdoc18
4 files changed, 21 insertions, 21 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index ef388a1ed5..7429a1d2bf 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\page qtqml-cppintegration-data.html
-\title Exposing Data From C++ To QML
+\title Exposing Data from C++ to QML
\brief Description of how to expose data from C++ to QML
@@ -87,7 +87,7 @@ on using Qt properties with QML.
-\section1 Supported data types
+\section1 Supported Data Types
Any C++ data that is used from QML - whether as custom properties, or parameters for signals or
functions - must be of a type that is recognizable by QML.
@@ -263,7 +263,7 @@ a QColor-type property or to call a C++ function that requires a QColor paramete
-\section1 Data Returned From Instance Method Invocation
+\section1 Data Returned from Instance Method Invocation
A registered C++ type may have functions flagged with the
Q_INVOKABLE flag defined. Those functions of an instance of
diff --git a/src/qml/doc/src/cppintegration/functions.qdoc b/src/qml/doc/src/cppintegration/functions.qdoc
index d32dd7722f..19dff3cd10 100644
--- a/src/qml/doc/src/cppintegration/functions.qdoc
+++ b/src/qml/doc/src/cppintegration/functions.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\page qtqml-cppintegration-functions.html
-\title Exposing C++ Functionality To QML
+\title Exposing C++ Functionality to QML
\brief Description of how to expose functionality defined in C++ to QML
@@ -36,7 +36,7 @@
-\section1 Properties Of Types Defined In C++
+\section1 Properties of Types Defined in C++
Any \l {The Property System}{Qt properties} - that is, those declared with the Q_PROPERTY()
macro - are accessible from QML. Here is a modified version of the \l {Embedding C++ objects into
@@ -55,7 +55,7 @@ the property cannot be used for \l{Property Binding}, as the QML engine would no
notified when the value changes. If you are using custom types in QML, make sure their
properties have NOTIFY signals so that they can be used in property bindings.
-\section1 Signals And Slots
+\section1 Signals and Slots
QML integrates with the normal Qt C++ signals and slots system.
Signal handlers may be defined in a QML object, to handle signals
diff --git a/src/qml/doc/src/cppintegration/reverse.qdoc b/src/qml/doc/src/cppintegration/reverse.qdoc
index e9948ee112..a4b4c8c543 100644
--- a/src/qml/doc/src/cppintegration/reverse.qdoc
+++ b/src/qml/doc/src/cppintegration/reverse.qdoc
@@ -26,16 +26,16 @@
****************************************************************************/
/*!
\page qtqml-cppintegration-reverse.html
-\title Interacting With QML Objects From C++
+\title Interacting with QML Objects from C++
\brief Description of how to interact with QML objects from C++
-\section1 QML Objects, QObject And QMetaObject
+\section1 QML Objects, QObject and QMetaObject
QML object types are, internally, QObject-derived types. Each type has an
associated QMetaObject, and all functions, properties and signals of an
instance of a QML object type can be accessed through the QMetaObject.
-\section1 Accessing QML Objects From C++
+\section1 Accessing QML Objects from C++
Once you have a pointer to a QML object in C++, you can access its properties,
invoke its functions, and connect to its signals. To get such a pointer, a
@@ -89,7 +89,7 @@ below for further details.
-\section2 Object Name And findChild
+\section2 Object Name and findChild
NOTE: this is only applicable to QML object types provided by the Qt Quick
module.
@@ -121,7 +121,7 @@ to, for example, swap a QML view component for another view, if the new componen
required \c objectName. It is better for the C++ implementation to know as little as possible about
the QML user interface implementation and the composition of the QML object tree.
-\section2 Passed As Arguments
+\section2 Passed as Arguments
Any QML object may be passed as an argument to a Q_INVOKABLE C++ function
if that function has a pointer to a QObject as a parameter. The object
@@ -192,7 +192,7 @@ QML supports the calling of overloaded C++ functions. If there are multiple C++
same name but different arguments, the correct function will be called according to the number and
the types of arguments that are provided.
-\section1 Signals And Slots
+\section1 Signals and Slots
All QML signals are automatically available to C++, and can be connected to using QObject::connect()
like any ordinary Qt C++ signal. In return, any C++ signal can be received by a QML object using
diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc
index 1fd0cd7df4..3b88c50099 100644
--- a/src/qml/doc/src/cppintegration/topic.qdoc
+++ b/src/qml/doc/src/cppintegration/topic.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\page qtqml-cppintegration-topic.html
-\title Integrating QML And C++
+\title Integrating QML and C++
\brief Description of how to integrate QML and C++ code
QML was designed to allow tight integration with C++ code. This allows hybrid
@@ -62,13 +62,13 @@ QML code
\endlist
-\section1 Exposing C++ Types To QML
+\section1 Exposing C++ Types to QML
QML types may be implemented in C++ and then exposed to the QML type system via
plugins or type registration. This is covered in more detail elsewhere in the
documentation; see the documentation regarding
\l{qtqml-cppintegration-registercpptypes.html}
-{Registering C++ Types With The QML Type System} for more information on that
+{Registering C++ Types with the QML Type System} for more information on that
topic.
For more information on the specifics of how to define C++ types for use in QML
@@ -76,23 +76,23 @@ For more information on the specifics of how to define C++ types for use in QML
about defining \l{qtqml-modules-cppplugins.html#creating-a-plugin}
{C++ types for use in QML}.
-\section1 Exposing C++ Data To QML
+\section1 Exposing C++ Data to QML
Data from C++ may be exposed to QML via context properties, instance
properties, or by returning data from Q_INVOKABLE methods. For more
information about each of these approaches, and the ownership semantics
applicable to each, see the documentation on \l{qtqml-cppintegration-data.html}
-{Exposing C++ Data To QML}.
+{Exposing C++ Data to QML}.
-\section1 Exposing C++ Functions To QML
+\section1 Exposing C++ Functions to QML
Functions from C++ may be exposed to QML via signals and slots, by tagging a
function declaration with the Q_INVOKABLE macro, or by registering the C++ type
as a module API and installing that module API into a particular namespace.
For more information about these approaches, see the documentation on
-\l{qtqml-cppintegration-functions.html}{Exposing C++ Functionality To QML}.
+\l{qtqml-cppintegration-functions.html}{Exposing C++ Functionality to QML}.
-\section1 Interacting With Objects Defined In QML From C++
+\section1 Interacting with Objects Defined in QML from C++
Most properties of an object defined in QML may be accessed via
QQmlProperty::read() or QObject::property(). If the property is a list
@@ -104,6 +104,6 @@ handlers.
For more information about accessing QML objects from C++, see the
documentation on \l{qtqml-cppintegration-reverse.html}
-{Interacting With Objects Defined In QML From C++}.
+{Interacting with Objects Defined in QML from C++}.
*/