From be456a3b976ed1f2b74cf5cf35200689bd29f893 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Fri, 11 Jan 2013 12:40:19 +0100 Subject: [PATCH] Doc: correcting typo "the the" Task-number: QTBUG-28756 Spurious repetition of the definite article Doc: corrected trailing space issue. Change-Id: I95c1c5773dc4b25dd0a3625343a67975783435fd Reviewed-by: Geir Vattekar --- examples/quick/doc/src/qml-extending.qdoc | 48 ++++++++++---------- .../slideswitch/doc/src/example-slideswitch.qdoc | 2 +- src/particles/qquickspritegoal.cpp | 2 +- src/qml/doc/src/modules/legacymodules.qdoc | 2 +- src/qml/qml/qqmlcomponent.cpp | 2 +- src/quick/doc/src/appdevguide/qtquicktest.qdoc | 2 +- src/quick/items/context2d/qquickcontext2d.cpp | 10 ++-- src/quick/items/qquickitemviewtransition.cpp | 2 +- src/quick/util/qquickanimation.cpp | 2 +- src/quick/util/qquicklistcompositor.cpp | 2 +- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/examples/quick/doc/src/qml-extending.qdoc b/examples/quick/doc/src/qml-extending.qdoc index 49de282..2920398 100644 --- a/examples/quick/doc/src/qml-extending.qdoc +++ b/examples/quick/doc/src/qml-extending.qdoc @@ -38,9 +38,9 @@ The \c Person type can be used from QML like this: \section1 Declare the Person class -All QML elements map to C++ types. Here we declare a basic C++ Person class +All QML elements map to C++ types. Here we declare a basic C++ Person class with the two properties we want accessible on the QML type - name and shoeSize. -Although in this example we use the same name for the C++ class as the QML +Although in this example we use the same name for the C++ class as the QML element, the C++ class can be named differently, or appear in a namespace. \snippet qml/referenceexamples/adding/person.h 0 @@ -58,8 +58,8 @@ and defines the mapping between the C++ and QML class names. \section1 Running the example -The main.cpp file in the example includes a simple shell application that -loads and runs the QML snippet shown at the beginning of this page. +The main.cpp file in the example includes a simple shell application that +loads and runs the QML snippet shown at the beginning of this page. */ /*! @@ -89,12 +89,12 @@ The BirthdayParty class is declared like this: \snippet qml/referenceexamples/properties/birthdayparty.h 2 \snippet qml/referenceexamples/properties/birthdayparty.h 3 -The class contains a member to store the celebrant object, and also a -QList member. +The class contains a member to store the celebrant object, and also a +QList member. -In QML, the type of a list properties - and the guests property is a list of +In QML, the type of a list properties - and the guests property is a list of people - are all of type QDeclarativeListProperty. QDeclarativeListProperty is simple value -type that contains a set of function pointers. QML calls these function +type that contains a set of function pointers. QML calls these function pointers whenever it needs to read from, write to or otherwise interact with the list. In addition to concrete lists like the people list used in this example, the use of QDeclarativeListProperty allows for "virtual lists" and other advanced @@ -108,8 +108,8 @@ The implementation of BirthdayParty property accessors is straight forward. \section1 Running the example -The main.cpp file in the example includes a simple shell application that -loads and runs the QML snippet shown at the beginning of this page. +The main.cpp file in the example includes a simple shell application that +loads and runs the QML snippet shown at the beginning of this page. */ /*! @@ -134,15 +134,15 @@ developed in the previous examples into two elements - a \c Boy and a \c Girl. \snippet qml/referenceexamples/coercion/person.h 0 -The Person class remains unaltered in this example and the Boy and Girl C++ +The Person class remains unaltered in this example and the Boy and Girl C++ classes are trivial extensions of it. As an example, the inheritance used here is a little contrived, but in real applications it is likely that the two -extensions would add additional properties or modify the Person classes +extensions would add additional properties or modify the Person classes behavior. \section2 Define People as a base class -The implementation of the People class itself has not changed since the the +The implementation of the People class itself has not changed since the previous example. However, as we have repurposed the People class as a common base for Boy and Girl, we want to prevent it from being instantiated from QML directly - an explicit Boy or Girl should be instantiated instead. @@ -164,8 +164,8 @@ and their QML name with the QML engine. \section1 Running the example -The BirthdayParty element has not changed since the previous example. The -celebrant and guests property still use the People type. +The BirthdayParty element has not changed since the previous example. The +celebrant and guests property still use the People type. \snippet qml/referenceexamples/coercion/birthdayparty.h 0 @@ -173,8 +173,8 @@ However, as all three types, Person, Boy and Girl, have been registered with the QML system, on assignment QML automatically (and type-safely) converts the Boy and Girl objects into a Person. -The main.cpp file in the example includes a simple shell application that -loads and runs the QML snippet shown at the beginning of this page. +The main.cpp file in the example includes a simple shell application that +loads and runs the QML snippet shown at the beginning of this page. */ /*! @@ -190,8 +190,8 @@ This example builds on: \li \l {Extending QML - Adding Types Example} \endlist -The Default Property Example is a minor modification of the -\l {Extending QML - Inheritance and Coercion Example} that simplifies the +The Default Property Example is a minor modification of the +\l {Extending QML - Inheritance and Coercion Example} that simplifies the specification of a BirthdayParty through the use of a default property. \snippet qml/referenceexamples/default/example.qml 0 @@ -199,20 +199,20 @@ specification of a BirthdayParty through the use of a default property. \section1 Declaring the BirthdayParty class The only difference between this example and the last, is the addition of the -\c DefaultProperty class info annotation. +\c DefaultProperty class info annotation. \snippet qml/referenceexamples/default/birthdayparty.h 0 -The default property specifies the property to assign to whenever an explicit +The default property specifies the property to assign to whenever an explicit property is not specified, in the case of the BirthdayParty element the guest -property. It is purely a syntactic simplification, the behavior is identical +property. It is purely a syntactic simplification, the behavior is identical to specifying the property by name, but it can add a more natural feel in many situations. The default property must be either an object or list property. \section1 Running the example -The main.cpp file in the example includes a simple shell application that -loads and runs the QML snippet shown at the beginning of this page. +The main.cpp file in the example includes a simple shell application that +loads and runs the QML snippet shown at the beginning of this page. */ /*! diff --git a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc index 07d6068..6ec2360 100644 --- a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc +++ b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc @@ -122,7 +122,7 @@ For more information on scripts see \l{Using JavaScript Expressions in QML}. \snippet quick/ui-components/slideswitch/content/Switch.qml 7 At this point, when the switch toggles between the two states the knob will instantly change its \c x position between 1 and 78. -In order for the the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms. +In order for the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms. For more information on transitions see \l{Animation and Transitions in Qt Quick}. diff --git a/src/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp index ddb68ca..4e62de5 100644 --- a/src/particles/qquickspritegoal.cpp +++ b/src/particles/qquickspritegoal.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQuick.Particles 2 \ingroup qtquick-images-sprites \inherits Affector - \brief For changing the the state of a sprite particle + \brief For changing the state of a sprite particle */ /*! diff --git a/src/qml/doc/src/modules/legacymodules.qdoc b/src/qml/doc/src/modules/legacymodules.qdoc index e5ea830..2698133 100644 --- a/src/qml/doc/src/modules/legacymodules.qdoc +++ b/src/qml/doc/src/modules/legacymodules.qdoc @@ -75,7 +75,7 @@ following semantics apply to located legacy modules: the located legacy module \endlist -A located legacy module may reside on the the local file system or on the +A located legacy module may reside on the local file system or on the network and can be referred to by a URL that specifies the file system path or network URL. diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 8698530..1928bcb 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -794,7 +794,7 @@ QObject *QQmlComponent::create(QQmlContext *context) When QQmlComponent constructs an instance, it occurs in three steps: \list 1 \li The object hierarchy is created, and constant values are assigned. - \li Property bindings are evaluated for the the first time. + \li Property bindings are evaluated for the first time. \li If applicable, QQmlParserStatus::componentComplete() is called on objects. \endlist QQmlComponent::beginCreate() differs from QQmlComponent::create() in that it diff --git a/src/quick/doc/src/appdevguide/qtquicktest.qdoc b/src/quick/doc/src/appdevguide/qtquicktest.qdoc index 8198281..bf8ca86 100644 --- a/src/quick/doc/src/appdevguide/qtquicktest.qdoc +++ b/src/quick/doc/src/appdevguide/qtquicktest.qdoc @@ -96,7 +96,7 @@ \endcode If your test case needs QML imports, then you can add them as - \c{-import} options to the the test program command-line by adding + \c{-import} options to the test program command-line by adding the following line to your .pro file: \code diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index b4b622c..a46cd6a 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -714,7 +714,7 @@ static v8::Handle ctx2d_shear(const v8::Arguments &args) /*! \qmlproperty real QtQuick2::Context2D::globalAlpha - Holds the the current alpha value applied to rendering operations. + Holds the current alpha value applied to rendering operations. The value must be in the range from 0.0 (fully transparent) to 1.0 (fully opque). The default value is 1.0. */ @@ -744,7 +744,7 @@ static void ctx2d_globalAlpha_set(v8::Local, v8::Local va /*! \qmlproperty string QtQuick2::Context2D::globalCompositeOperation - Holds the the current the current composition operation, from the list below: + Holds the current the current composition operation, from the list below: \list \li source-atop - A atop B. Display the source image wherever both images are opaque. Display the destination image wherever the destination image is opaque but the source image is transparent. @@ -1239,7 +1239,7 @@ static v8::Handle ctx2d_createPattern(const v8::Arguments &args) // line styles /*! \qmlproperty string QtQuick2::Context2D::lineCap - Holds the the current line cap style. + Holds the current line cap style. The possible line cap styles are: \list \li butt - the end of each line has a flat edge perpendicular to the direction of the line, this is the default line cap value. @@ -1294,7 +1294,7 @@ static void ctx2d_lineCap_set(v8::Local, v8::Local value, /*! \qmlproperty string QtQuick2::Context2D::lineJoin - Holds the the current line join style. A join exists at any point in a subpath + Holds the current line join style. A join exists at any point in a subpath shared by two consecutive lines. When a subpath is closed, then a join also exists at its first point (equivalent to its last point) connecting the first and last lines in the subpath. @@ -1352,7 +1352,7 @@ static void ctx2d_lineJoin_set(v8::Local, v8::Local value /*! \qmlproperty real QtQuick2::Context2D::lineWidth - Holds the the current line width. Values that are not finite values greater than zero are ignored. + Holds the current line width. Values that are not finite values greater than zero are ignored. */ v8::Handle ctx2d_lineWidth(v8::Local, const v8::AccessorInfo &info) { diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp index 77c0f62..c1cc7c9 100644 --- a/src/quick/items/qquickitemviewtransition.cpp +++ b/src/quick/items/qquickitemviewtransition.cpp @@ -868,7 +868,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent) /*! \qmlattachedproperty list QtQuick2::ViewTransition::item - This attached property holds the the item that is being transitioned. + This attached property holds the item that is being transitioned. \warning This item should not be kept and referred to outside of the transition as it may become invalid as the view changes. diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index d341962..8bbd3a7 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -918,7 +918,7 @@ void QQuickScriptAction::setScript(const QQmlScriptString &script) /*! \qmlproperty string QtQuick2::ScriptAction::scriptName - This property holds the the name of the StateChangeScript to run. + This property holds the name of the StateChangeScript to run. This property is only valid when ScriptAction is used as part of a transition. If both script and scriptName are set, scriptName will be used. diff --git a/src/quick/util/qquicklistcompositor.cpp b/src/quick/util/qquicklistcompositor.cpp index 41c5d21..a9e9ace 100644 --- a/src/quick/util/qquicklistcompositor.cpp +++ b/src/quick/util/qquicklistcompositor.cpp @@ -336,7 +336,7 @@ inline QQuickListCompositor::Range *QQuickListCompositor::erase( } /*! - Sets the the number (\a count) of possible groups that items may belong to in a compositor. + Sets the number (\a count) of possible groups that items may belong to in a compositor. */ void QQuickListCompositor::setGroupCount(int count) -- 1.7.2.5