diff options
author | Mitch Curtis <mitch.curtis@digia.com> | 2012-09-24 18:12:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-26 04:03:20 +0200 |
commit | 6b6fefad48abed28df69d0fa830accbb0c8dcb4d (patch) | |
tree | b62d78dd114839ec4890727e77ca2563cba11ca6 /src | |
parent | a798b956b9786240a06142de078f56c28962a535 (diff) |
Remove duplicate words and punctuation from documentation.
Change-Id: I5550c62d412510bc2c5acceb2cae7d2f2ef6a8d3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/global/qglobal.cpp | 2 | ||||
-rw-r--r-- | src/corelib/json/qjsonobject.cpp | 2 | ||||
-rw-r--r-- | src/corelib/kernel/qsystemerror.cpp | 2 | ||||
-rw-r--r-- | src/corelib/mimetypes/qmimetype.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformtheme.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qpainter.cpp | 3 | ||||
-rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 2 | ||||
-rw-r--r-- | src/network/socket/qudpsocket.cpp | 2 | ||||
-rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 2 | ||||
-rw-r--r-- | src/tools/qdoc/node.cpp | 2 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicsanchorlayout.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qboxlayout.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qgesture.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qmdiarea.cpp | 2 |
15 files changed, 17 insertions, 18 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 1c615dc95f..6580bfbf10 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1988,7 +1988,7 @@ namespace { // indicating success or not // b) the GNU version, which returns a char*, which may or may not // be the beginning of the buffer we used - // The GNU libc manpage for strerror_r says you should use the the XSI + // The GNU libc manpage for strerror_r says you should use the XSI // version in portable code. However, it's impossible to do that if // _GNU_SOURCE is defined so we use C++ overloading to decide what to do // depending on the return type diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp index c93a4f811d..728bbbd0ec 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/json/qjsonobject.cpp @@ -219,7 +219,7 @@ QStringList QJsonObject::keys() const } /*! - Returns the the number of (key, value) pairs stored in the object. + Returns the number of (key, value) pairs stored in the object. */ int QJsonObject::size() const { diff --git a/src/corelib/kernel/qsystemerror.cpp b/src/corelib/kernel/qsystemerror.cpp index 76cca16932..bf8121b1b3 100644 --- a/src/corelib/kernel/qsystemerror.cpp +++ b/src/corelib/kernel/qsystemerror.cpp @@ -65,7 +65,7 @@ namespace { // indicating success or not // b) the GNU version, which returns a char*, which may or may not // be the beginning of the buffer we used - // The GNU libc manpage for strerror_r says you should use the the XSI + // The GNU libc manpage for strerror_r says you should use the XSI // version in portable code. However, it's impossible to do that if // _GNU_SOURCE is defined so we use C++ overloading to decide what to do // depending on the return type diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index f14c32c1b1..9be613924e 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -359,7 +359,7 @@ QStringList QMimeType::suffixes() const QStringList result; foreach (const QString &pattern, d->globPatterns) { - // Not a simple suffix if if looks like: README or *. or *.* or *.JP*G or *.JP? + // Not a simple suffix if it looks like: README or *. or *.* or *.JP*G or *.JP? if (pattern.startsWith(QLatin1String("*.")) && pattern.length() > 2 && pattern.indexOf(QLatin1Char('*'), 2) < 0 && pattern.indexOf(QLatin1Char('?'), 2) < 0) { diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp index 8dba6edde6..c35b534473 100644 --- a/src/gui/kernel/qplatformtheme.cpp +++ b/src/gui/kernel/qplatformtheme.cpp @@ -75,13 +75,13 @@ QT_BEGIN_NAMESPACE \value StartDragDistance (int) Start drag distance, overriding QPlatformIntegration::styleHint. - \value StartDragTime (int) Start drag time in ms,, + \value StartDragTime (int) Start drag time in ms, overriding QPlatformIntegration::styleHint. \value KeyboardAutoRepeatRate (int) Keyboard auto repeat rate, overriding QPlatformIntegration::styleHint. - \value PasswordMaskDelay (int) Pass word mask delay in ms,, + \value PasswordMaskDelay (int) Pass word mask delay in ms, overriding QPlatformIntegration::styleHint. \value StartDragVelocity (int) Velocity of a drag, diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp index 167353309d..91c4e3528f 100644 --- a/src/gui/painting/qpaintengine.cpp +++ b/src/gui/painting/qpaintengine.cpp @@ -923,7 +923,7 @@ QPoint QPaintEngine::coordinateOffset() const Sets the system clip for this engine. The system clip defines the basis area that the engine has to draw in. All clips that are - set will be be an intersection with the system clip. + set will be an intersection with the system clip. Reset the systemclip to no clip by setting an empty region. */ diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index afe638c346..380a697ac3 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -4375,8 +4375,7 @@ void QPainter::drawArc(const QRectF &r, int a, int alen) /*! \fn void QPainter::drawPie(const QRectF &rectangle, int startAngle, int spanAngle) - Draws a pie defined by the given \a rectangle, \a startAngle and - and \a spanAngle. + Draws a pie defined by the given \a rectangle, \a startAngle and \a spanAngle. The pie is filled with the current brush(). diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index a31d5b8ca3..3dcb4b8730 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -346,7 +346,7 @@ static void ensureInitialized() \note To have the request not send credentials you must not call setUser() or setPassword() on the \a authenticator object. This - will result in the the \l finished() signal being emitted with a + will result in the \l finished() signal being emitted with a \l QNetworkReply with error \l AuthenticationRequiredError. \note It is not possible to use a QueuedConnection to connect to diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp index f4ce67ac40..e2669e33a1 100644 --- a/src/network/socket/qudpsocket.cpp +++ b/src/network/socket/qudpsocket.cpp @@ -174,7 +174,7 @@ QUdpSocket::~QUdpSocket() /*! \since 4.8 - Joins the the multicast group specified by \a groupAddress on the default + Joins the multicast group specified by \a groupAddress on the default interface chosen by the operating system. The socket must be in BoundState, otherwise an error occurs. diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index c15dd989da..74c487793b 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1432,7 +1432,7 @@ bool QSqlDatabase::isValid() const } /*! - Clones the database connection \a other and and stores it as \a + Clones the database connection \a other and stores it as \a connectionName. All the settings from the original database, e.g. databaseName(), hostName(), etc., are copied across. Does nothing if \a other is an invalid database. Returns the newly created diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp index d9a6ad6fd5..1d3cccb837 100644 --- a/src/tools/qdoc/node.cpp +++ b/src/tools/qdoc/node.cpp @@ -566,7 +566,7 @@ Node::ThreadSafeness Node::inheritedThreadSafeness() const #if 0 /*! Returns the sanitized file name without the path. - If the the file is an html file, the html suffix + If the file is an html file, the html suffix is removed. Why? */ QString Node::fileBase() const diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp index d248db47d0..137f90ffe3 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.cpp +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp @@ -250,7 +250,7 @@ QGraphicsAnchorLayout::~QGraphicsAnchorLayout() Creates an anchor between the edge \a firstEdge of item \a firstItem and the edge \a secondEdge of item \a secondItem. The spacing of the anchor is picked up from the style. Anchors between a layout edge and an item edge will have a size of 0. - If there is already an anchor between the edges, the the new anchor will replace the old one. + If there is already an anchor between the edges, the new anchor will replace the old one. \a firstItem and \a secondItem are automatically added to the layout if they are not part of the layout. This means that count() can increase by up to 2. diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index 8382964129..d05efaa5b0 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -384,7 +384,7 @@ void QBoxLayoutPrivate::setupGeom() } a[i].empty = empty; - a[i].spacing = 0; // might be be initialized with a non-zero value in a later iteration + a[i].spacing = 0; // might be initialized with a non-zero value in a later iteration hasHfw = hasHfw || box->item->hasHeightForWidth(); } diff --git a/src/widgets/kernel/qgesture.cpp b/src/widgets/kernel/qgesture.cpp index 4b0082bf9e..28e3213c83 100644 --- a/src/widgets/kernel/qgesture.cpp +++ b/src/widgets/kernel/qgesture.cpp @@ -782,7 +782,7 @@ void QTapAndHoldGesture::setPosition(const QPointF &value) /*! Set the timeout, in milliseconds, before the gesture triggers. - The recognizer will detect a touch down and and if \a msecs + The recognizer will detect a touch down and if \a msecs later the touch is still down, it will trigger the QTapAndHoldGesture. The default value is 700 milliseconds. */ @@ -795,7 +795,7 @@ void QTapAndHoldGesture::setTimeout(int msecs) /*! Gets the timeout, in milliseconds, before the gesture triggers. - The recognizer will detect a touch down and and if timeout() + The recognizer will detect a touch down and if timeout() later the touch is still down, it will trigger the QTapAndHoldGesture. The default value is 700 milliseconds. */ diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 42f9acf051..3b4f026130 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -2475,7 +2475,7 @@ bool QMdiArea::event(QEvent *event) switch (event->type()) { #ifdef Q_WS_WIN // QWidgetPrivate::hide_helper activates another sub-window when closing a - // modal dialog on Windows (see activateWindow() inside the the ifdef). + // modal dialog on Windows (see activateWindow() inside the ifdef). case QEvent::WindowUnblocked: d->activateCurrentWindow(); break; |