summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeff Tranter <jtranter@ics.com>2013-12-24 11:44:39 -0500
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-02 17:21:09 +0100
commit2e8c3f744407607a522abe25abd21ec733365793 (patch)
treeaa37ab17790ae754b38e48bc32704619ee6e5e16 /src
parent97c1b2d32ed06a186ce2f0f342c8d056ddb987a2 (diff)
Fix some typos in documentation.
Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: I2e946fda0bd9a2117f8e9b2fb300df9bf0a98a6c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qalgorithms.qdoc2
-rw-r--r--src/corelib/tools/qtimezone.cpp4
-rw-r--r--src/gui/image/qimage.cpp2
-rw-r--r--src/gui/image/qpixmap.cpp2
-rw-r--r--src/widgets/doc/src/modelview.qdoc4
-rw-r--r--src/widgets/graphicsview/qgraphicssceneevent.cpp4
-rw-r--r--src/widgets/styles/qstyleoption.cpp2
7 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc
index 412b9cf3b2..40eb2ed41d 100644
--- a/src/corelib/tools/qalgorithms.qdoc
+++ b/src/corelib/tools/qalgorithms.qdoc
@@ -534,7 +534,7 @@
Use std::lower_bound instead.
Performs a binary search of the range [\a begin, \a end) and
- returns the position of the first ocurrence of \a value. If no
+ returns the position of the first occurrence of \a value. If no
such item is found, returns the position where it should be
inserted.
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp
index 5fec06b30a..a8ed8739c3 100644
--- a/src/corelib/tools/qtimezone.cpp
+++ b/src/corelib/tools/qtimezone.cpp
@@ -185,7 +185,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz);
The method systemTimeZoneId() returns the current system IANA time zone
ID which on OSX and Linux will always be correct. On Windows this ID is
- translated from the the Windows system ID using an internal translation
+ translated from the Windows system ID using an internal translation
table and the user's selected country. As a consequence there is a small
chance any Windows install may have IDs not known by Qt, in which case
"UTC" will be returned.
@@ -771,7 +771,7 @@ QTimeZone::OffsetDataList QTimeZone::transitions(const QDateTime &fromDateTime,
/*!
Returns the current system time zone IANA ID.
- On Windows this ID is translated from the the Windows ID using an internal
+ On Windows this ID is translated from the Windows ID using an internal
translation table and the user's selected country. As a consequence there
is a small chance any Windows install may have IDs not known by Qt, in
which case "UTC" will be returned.
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 0916826529..12ab5eaffa 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -1426,7 +1426,7 @@ qreal QImage::devicePixelRatio() const
}
/*!
- Sets the the device pixel ratio for the image. This is the
+ Sets the device pixel ratio for the image. This is the
ratio between image pixels and device-independent pixels.
The default \a scaleFactor is 1.0. Setting it to something else has
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index a620d34553..6dced54d20 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -665,7 +665,7 @@ qreal QPixmap::devicePixelRatio() const
}
/*!
- Sets the the device pixel ratio for the pixmap. This is the
+ Sets the device pixel ratio for the pixmap. This is the
ratio between image pixels and device-independent pixels.
The default \a scaleFactor is 1.0. Setting it to something else has
diff --git a/src/widgets/doc/src/modelview.qdoc b/src/widgets/doc/src/modelview.qdoc
index b2f9da9563..f094a58a91 100644
--- a/src/widgets/doc/src/modelview.qdoc
+++ b/src/widgets/doc/src/modelview.qdoc
@@ -463,7 +463,7 @@
We get the model index that corresponds to the selection by calling
\l{QItemSelectionModel::currentIndex()}{treeView->selectionModel()->currentIndex()}
- and we get the the field's string by using the model index. Then we just
+ and we get the field's string by using the model index. Then we just
calculate the item's \c hierarchyLevel. Top level items do not have parents
and the \l{QAbstractItemModel::}{parent()} method will return a default
constructed \l{QModelIndex}{QModelIndex()}. This is why we use the
@@ -548,7 +548,7 @@
the underlying data. The data can be looked up by calling
\l{QModelIndex::data()}{index.data()}. The delegate's
\l{QAbstractItemDelegate::}{sizeHint()} method is used to obtain each
- star's dimensions, so the the cell will provide enough height and width to
+ star's dimensions, so the cell will provide enough height and width to
accommodate the stars.
Writing custom delegates is the right choice if you want to show your data
diff --git a/src/widgets/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp
index 8eb1395a45..631aa7bf19 100644
--- a/src/widgets/graphicsview/qgraphicssceneevent.cpp
+++ b/src/widgets/graphicsview/qgraphicssceneevent.cpp
@@ -874,7 +874,7 @@ void QGraphicsSceneContextMenuEvent::setPos(const QPointF &pos)
/*!
Returns the position of the mouse cursor in scene coordinates at the moment the
- the context menu was requested.
+ context menu was requested.
\sa pos(), screenPos()
*/
@@ -899,7 +899,7 @@ void QGraphicsSceneContextMenuEvent::setScenePos(const QPointF &pos)
/*!
Returns the position of the mouse cursor in screen coordinates at the moment the
- the context menu was requested.
+ context menu was requested.
\sa pos(), scenePos()
*/
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 5fe071087e..5913b2f261 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -1116,7 +1116,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
The order of the positions within a line starts at the top of a
vertical line, and from the left within a horizontal line. The
- order of the positions for the lines is always from the the
+ order of the positions for the lines is always from the
parent widget's boundary edges.
\value Beginning The toolbar is located at the beginning of the line,