aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2014-08-11 15:34:21 +0200
committerErik Verbruggen <erik.verbruggen@digia.com>2014-08-12 10:47:35 +0200
commitbfce837c3d9a6e3ad850436b954f9a447e80d4d6 (patch)
treeb202bd9c7d0defb1ae7cf104e4d7f189cf6fa445
parent109abdb061263c28ae97424729e979cd0ff8289a (diff)
Doc: Remove duplicated words
Removes duplicated (repeated) words and fixes other minor documentation issues. Change-Id: I891f2b3e60194b207737425c1dcc1d35a5bd921a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
-rw-r--r--examples/quick/demos/maroon/doc/src/maroon.qdoc6
-rw-r--r--examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc2
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.cpp2
-rw-r--r--src/particles/qquickgravity.cpp2
-rw-r--r--src/qml/doc/src/cppintegration/definetypes.qdoc2
-rw-r--r--src/qml/doc/src/cppintegration/exposecppattributes.qdoc2
-rw-r--r--src/qml/doc/src/cppintegration/extending-tutorial.qdoc2
-rw-r--r--src/qml/doc/src/javascript/expressions.qdoc2
-rw-r--r--src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc2
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/directoryimports.qdoc2
-rw-r--r--src/qml/doc/src/qmltypereference.qdoc2
-rw-r--r--src/qml/qml/qqmlabstracturlinterceptor.cpp2
-rw-r--r--src/qml/types/qqmldelegatemodel.cpp2
-rw-r--r--src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc6
-rw-r--r--src/quick/doc/src/concepts/positioning/righttoleft.qdoc2
-rw-r--r--src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc2
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp2
-rw-r--r--src/quick/items/qquickitem.cpp2
-rw-r--r--src/quick/items/qquicktextinput.cpp2
-rw-r--r--src/quick/items/qquickwindow.cpp4
-rw-r--r--src/quick/scenegraph/util/qsgtexture.cpp2
21 files changed, 26 insertions, 26 deletions
diff --git a/examples/quick/demos/maroon/doc/src/maroon.qdoc b/examples/quick/demos/maroon/doc/src/maroon.qdoc
index 4b364397c1..eb1b736562 100644
--- a/examples/quick/demos/maroon/doc/src/maroon.qdoc
+++ b/examples/quick/demos/maroon/doc/src/maroon.qdoc
@@ -320,7 +320,7 @@
\printuntil }
The \c onTriggered signal handler is called when the timer is triggered to
- increment the value of the the \c countdown custom property.
+ increment the value of the \c countdown custom property.
We set the \c repeat property to \c true to specify that the timer is
triggered at the interval of 1 second as long as the value of \c countdown
@@ -408,7 +408,7 @@
We use anchoring to position the help button at the bottom center of the
game canvas.
- We use another \l{Image} type to to display the help image:
+ We use another \l{Image} type to display the help image:
\printuntil }
\printuntil }
@@ -668,7 +668,7 @@
opaque, otherwise their opacity is set to \c 0.4.
We use a \l{Text} type to display the cost of each tower item, as specified
- by the the \c towerData variable, depending on \c towerType:
+ by the \c towerData variable, depending on \c towerType:
\skipto Text
\printuntil }
diff --git a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
index 56dcf6f396..ad37df7576 100644
--- a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
+++ b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
@@ -137,7 +137,7 @@
\snippet scenegraph/customgeometry/beziercurve.cpp 6
- The scene graph API provides a few commonly used used material
+ The scene graph API provides a few commonly used material
implementations. In this example we use the QSGFlatColorMaterial
which will fill the shape defined by the geometry with a solid
color. Again we pass the ownership of the material to the node, so
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 1f28d8009e..5d84d7e5ba 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -479,7 +479,7 @@ void QQuickFolderListModel::setRootFolder(const QUrl &path)
/*!
\qmlproperty url FolderListModel::parentFolder
- Returns the URL of the parent of of the current \l folder.
+ Returns the URL of the parent of the current \l folder.
*/
QUrl QQuickFolderListModel::parentFolder() const
{
diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp
index d316422ca0..581bccc80f 100644
--- a/src/particles/qquickgravity.cpp
+++ b/src/particles/qquickgravity.cpp
@@ -49,7 +49,7 @@ const qreal CONV = 0.017453292520444443;
\inqmlmodule QtQuick.Particles 2
\ingroup qtquick-particles
\inherits Affector
- \brief For applying accleration in an angle
+ \brief For applying acceleration in an angle
This element will accelerate all affected particles to a vector of
the specified magnitude in the specified angle. If the angle and acceleration do
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index ac1a303ab0..6aed2f1339 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -700,7 +700,7 @@ initialization is costly, or if the initialization should not be performed until
all property values have been initialized.
The \l {Qt QML} module provides the QQmlParserStatus to be subclassed for these
-purposes. It defines a number of virtual methods that are invoked invoked at
+purposes. It defines a number of virtual methods that are invoked at
various stages during component instantiation. To receive these notifications, a
C++ class should inherit QQmlParserStatus and also notify the Qt meta system
using the Q_INTERFACES() macro.
diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
index 8f883d9f42..8f6836558a 100644
--- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
+++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
@@ -52,7 +52,7 @@ for more details.)
In general, these are accessible from QML regardless of whether a
QObject-derived class has been \l{Registering C++ types with the QML type
-system}{registered with the QML type system}. However, if if a class is to be
+system}{registered with the QML type system}. However, if a class is to be
used in a way that requires the engine to access additional type information
— for example, if the class itself is to be used as a method parameter or
property, or if one of its enum types is to be used in this way — then the
diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
index ecfcf8f106..aab729656b 100644
--- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
+++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
@@ -185,7 +185,7 @@ to our C++ class:
The use of Q_INVOKABLE makes the \c clearChart() method available to the
Qt Meta-Object system, and in turn, to QML. Note that it could have
-been declared as as a Qt slot instead of using Q_INVOKABLE, as
+been declared as a Qt slot instead of using Q_INVOKABLE, as
slots are also callable from QML. Both of these approaches are valid.
The \c clearChart() method simply changes the color to Qt::transparent,
diff --git a/src/qml/doc/src/javascript/expressions.qdoc b/src/qml/doc/src/javascript/expressions.qdoc
index 37baa49c52..4e969f05a7 100644
--- a/src/qml/doc/src/javascript/expressions.qdoc
+++ b/src/qml/doc/src/javascript/expressions.qdoc
@@ -299,7 +299,7 @@ A QML object will emit the \c{Component.completed} \l{Signal and Handler Event
System#Attached Signal Handlers}{attached signal} when its instantiation is
complete. JavaScript code in the corresponding \c{Component.onCompleted} handler
runs after the object is instantiated. Thus, the best place to write application
-startup code is in the \c{Component.onCompleted} handler of the top-level level
+startup code is in the \c{Component.onCompleted} handler of the top-level
object, because this object emits \c{Component.completed} when the QML environment
is fully established.
diff --git a/src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc b/src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc
index 34d4b864a8..63267420e2 100644
--- a/src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc
+++ b/src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc
@@ -162,7 +162,7 @@ object types defined in the module will behave as the module author documented.
An identified module has several restrictions upon it:
\list
-\li an identified module must must be installed into the
+\li an identified module must be installed into the
\l{qtqml-syntax-imports.html#qml-import-path}{QML import path}
\li the module identifier specified in the \l{qtqml-modules-qmldir.html}
{module identifier directive} must match the install path of the module
diff --git a/src/qml/doc/src/qmllanguageref/syntax/directoryimports.qdoc b/src/qml/doc/src/qmllanguageref/syntax/directoryimports.qdoc
index 7a6fb58c27..e45b371e88 100644
--- a/src/qml/doc/src/qmllanguageref/syntax/directoryimports.qdoc
+++ b/src/qml/doc/src/qmllanguageref/syntax/directoryimports.qdoc
@@ -97,7 +97,7 @@ MyComponents.DialogBox {
The ability to import a local directory is convenient for cases such as
in-application component sets and application prototyping, although any code
-that imports such modules must must update their relevant \c import statements
+that imports such modules must update their relevant \c import statements
if the module directory moves to another location. This can be avoided if
\l{qtqml-modules-identifiedmodules.html}{QML modules} are used instead,
as an installed module is imported with a unique identifier string rather than
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc
index 0f98773b70..5d04a8a637 100644
--- a/src/qml/doc/src/qmltypereference.qdoc
+++ b/src/qml/doc/src/qmltypereference.qdoc
@@ -185,7 +185,7 @@ is automatically converted into a QSizeF value.
The \c rect type refers to a value with \c x, \c y, \c width and \c height attributes.
For example, to read the \c width and \c height values of the \l Item
-\l {Item::childrenRect.x}{childrenRect} rect-type type property:
+\l {Item::childrenRect.x}{childrenRect} rect-type property:
\qml
Rectangle {
diff --git a/src/qml/qml/qqmlabstracturlinterceptor.cpp b/src/qml/qml/qqmlabstracturlinterceptor.cpp
index 3aea9c83cc..0a67de812d 100644
--- a/src/qml/qml/qqmlabstracturlinterceptor.cpp
+++ b/src/qml/qml/qqmlabstracturlinterceptor.cpp
@@ -69,7 +69,7 @@
/*
\enum QQmlAbstractUrlInterceptor::DataType
- Specifies where URL interception is taking place place.
+ Specifies where URL interception is taking place.
Because QML loads qmldir files for locating types, there are two URLs involved in loading a QML type. The URL of the (possibly implicit) qmldir used for locating the type and the URL of the file which defines the type. Intercepting
both leads to either complex URL replacement or double URL replacements for the same file.
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 91ddcf57e5..aec1fe596c 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -2322,7 +2322,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package)
placeholder items that are later \l {resolve()}{resolved} to real model data when it becomes
available.
- Delegate items can also be be instantiated directly from a DelegateModelGroup using the
+ Delegate items can also be instantiated directly from a DelegateModelGroup using the
create() function, making it possible to use DelegateModel without an accompanying view
type or to cherry-pick specific items that should be instantiated irregardless of whether
they're currently within a view's visible area.
diff --git a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
index 1a539f56ed..85d34e5376 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
@@ -117,9 +117,9 @@ To visualize data, bind the view's \c model property to a model and the
The ListView type has the \c section
\l{qtqml-syntax-objectattributes.html#Attached-properties-and-attached-signal-handlers}
{attached property} that can combine adjacent and related types into a
- section. The section's \c property property is for selecting which list
- type property to use as sections. The \c criteria can dictate how the
- section names are displayed and the \c delegate is similar to the views'
+ section. The \c section.property determines which list
+ type property to use as sections. The \c section.criteria can dictate how the
+ section names are displayed and the \c section.delegate is similar to the views'
\l {qml-view-delegate}{delegate} property.
\snippet qml/listview-sections.qml section
\image listview-section.png
diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
index c90aa3af22..8f55cc8dd7 100644
--- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
+++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
@@ -42,7 +42,7 @@ from the right to left. The general rule of thumb is that content (like photos,
mirrored, but positioning of the content (like application layouts and the flow of visual elements) is
mirrored. For example, photos shown in chronological order should flow from right to left, the
low end range of the horizontal sliders should be located at the right side of the slider, and
-text lines should should be aligned to the right side of the available text area. The location of visual
+text lines should be aligned to the right side of the available text area. The location of visual
elements should not be mirrored when the position is related to a content; for example, when a
position marker is shown to indicate a location on a map. Also, there are some special cases you may
need to take into account where right-to-left language speakers are used to left-to-right
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
index f07d981e5f..046c23f8f0 100644
--- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
+++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
@@ -294,7 +294,7 @@ when to call the signals and this is the only time the OpenGL
application is allowed to draw.
The \l {Scene Graph - OpenGL Under QML} example gives an example on
-how to use use these signals.
+how to use these signals.
The other alternative is to create a QQuickFramebufferObject, render
into it, and let it be displayed in the scene graph as a texture.
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 57c7bd4a00..b153fc25b2 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -2416,7 +2416,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_moveTo(QV4::CallContext *c
Adds a quadratic bezier curve between the current point and the endpoint (\c x, \c y) with the control point specified by (\c cpx, \c cpy).
- See \l{http://www.w3.org/TR/2dcontext/#dom-context-2d-quadraticcurveto}{W3C 2d context standard for for quadraticCurveTo}
+ See \l{http://www.w3.org/TR/2dcontext/#dom-context-2d-quadraticcurveto}{W3C 2d context standard for quadraticCurveTo}
*/
QV4::ReturnedValue QQuickJSContext2DPrototype::method_quadraticCurveTo(QV4::CallContext *ctx)
{
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 4f1bd8f4a2..9a8243ead5 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -5902,7 +5902,7 @@ void QQuickItem::setFlags(Flags flags)
/*!
\fn void QQuickItem::sceneGraphInitialized()
- This signal is emitted when the scene graph is is initialized for
+ This signal is emitted when the scene graph is initialized for
items that have the ItemHasContents flag set.
When the scene graph is using a dedicated render thread, this
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 37e94cddc0..f2cf89c1b9 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1411,7 +1411,7 @@ QRectF QQuickTextInput::positionToRectangle(int pos) const
This means that for all x values before the first character this function returns 0,
and for all x values after the last character this function returns text.length. If
the y value is above the text the position will be that of the nearest character on
- the first line line and if it is below the text the position of the nearest character
+ the first line and if it is below the text the position of the nearest character
on the last line will be returned.
The cursor position type specifies how the cursor position should be resolved.
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index d3b0dc05d0..1971c0a14e 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -190,7 +190,7 @@ having no effect if an item is removed from a window.
When an item is moved into a new focus scope (either being added to a window
for the first time, or having its parent changed), if the focus scope already has
a scope focused item that takes precedence over the item being added. Otherwise,
-the focus of the added tree is used. In the case of of a tree of items being
+the focus of the added tree is used. In the case of a tree of items being
added to a window for the first time, which may have a conflicted focus state (two
or more items in one scope having focus set), the same rule is applied item by item -
thus the first item that has focus will get it (assuming the scope doesn't already
@@ -3811,7 +3811,7 @@ bool QQuickWindow::glslIsCoreProfile() const
\qmlattachedproperty QWindow::Visibility Window::visibility
\since 5.4
- This attached property holds whether whether the window is currently shown
+ This attached property holds whether the window is currently shown
in the windowing system as normal, minimized, maximized, fullscreen or
hidden. The Window attached property can be attached to any Item. If the
item is not shown in any window, the value will be \l {QWindow::}{Hidden}.
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index 02dd2efae3..69edfab379 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -208,7 +208,7 @@ static void qt_debug_remove_texture(QSGTexture* texture)
arbitrary input textures, such as YUV video frames or 8 bit alpha
masks. The scene graph backend provides a default implementation
of normal color textures. As the implementation of these may be
- hardware specific, they are are constructed via the factory
+ hardware specific, they are constructed via the factory
function QQuickWindow::createTextureFromImage().
The texture is a wrapper around an OpenGL texture, which texture