summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Gagneraud <chgans@gna.org>2017-02-22 12:15:41 +1300
committerChristian Gagneraud <chgans@gna.org>2017-03-03 10:26:02 +0000
commit6891d2377993f189863688271fc7db0a06e2dc69 (patch)
tree08f45bc5166e266d769cc726d95ac9abb5df69f0
parent951ead089dcb45510a19f5b309d67c4cbe3de956 (diff)
Fix documentation typos
This patch fixes 2 simple typos in QGraphicsItem and QPainter documentation and a copy/paste error between QAbstractItemModel's beginRemoveColumns and beginRemoveRows documentation. Change-Id: I32bdc4dc69154a40fe30a5b8c08d0c3a001853f8 Reviewed-by: Harri Porten <porten@froglogic.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> (cherry picked from commit e3bcab935c9fe37b344394c3ee8afd6773a8cd7e)
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.cpp2
-rw-r--r--src/gui/painting/qpainter.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index 630cdcae98..e35454346b 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -2986,7 +2986,7 @@ void QAbstractItemModel::endRemoveColumns()
When reimplementing a subclass, this method simplifies moving
entities in your model. This method is responsible for moving
persistent indexes in the model, which you would otherwise be
- required to do yourself. Using beginMoveRows and endMoveRows
+ required to do yourself. Using beginMoveColumns and endMoveColumns
is an alternative to emitting layoutAboutToBeChanged and
layoutChanged directly along with changePersistentIndex.
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 24856e225f..c593c8a681 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5964,7 +5964,7 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br
\snippet code/src_gui_painting_qpainter.cpp 17
\endtable
- The \a boundingRect (if not null) is set to the what the bounding rectangle
+ The \a boundingRect (if not null) is set to what the bounding rectangle
should be in order to enclose the whole text. For example, in the following
image, the dotted line represents \a boundingRect as calculated by the
function, and the dashed line represents \a rectangle:
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 5f5c402a4a..54d97d20ee 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -4430,7 +4430,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine)
otherwise, \a matrix \e replaces the current matrix. \a combine is false
by default.
- To simplify interation with items using a transformed view, QGraphicsItem
+ To simplify interaction with items using a transformed view, QGraphicsItem
provides mapTo... and mapFrom... functions that can translate between
items' and the scene's coordinates. For example, you can call mapToScene()
to map an item coordiate to a scene coordinate, or mapFromScene() to map