diff options
author | MÃ¥rten Nordheim <marten.nordheim@qt.io> | 2022-10-19 14:07:06 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-19 20:17:22 +0000 |
commit | a97bfaddc18b23324f57f434bdbdb3e85f1f2d87 (patch) | |
tree | 0b706e488f5377e4a1c24dcbec019681aa060285 | |
parent | 94379dd15802073ff9ab9f97b801a091088f612f (diff) | |
download | qtbase-a97bfaddc18b23324f57f434bdbdb3e85f1f2d87.tar.gz |
Fix duplicated words in documentation
Only did instances where two-and-two words are duplicated,
easy to see when wrong.
Task-number: QTBUG-107777
Change-Id: I11593728acc386e7ef9aba9b39a0a4d9c60a532f
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit b4ad658fa0a65a77961d53c1c6373dc83d1e30ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/corelib/global/qrandom.cpp | 4 | ||||
-rw-r--r-- | src/corelib/serialization/qcborcommon.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qevent.cpp | 4 | ||||
-rw-r--r-- | src/network/ssl/qsslserver.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp index b276f9445f..c1c2792736 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -647,7 +647,7 @@ inline QRandomGenerator::SystemGenerator &QRandomGenerator::SystemGenerator::sel \fn bool operator==(const QRandomGenerator &rng1, const QRandomGenerator &rng2) \relates QRandomGenerator - Returns true if the two the two engines \a rng1 and \a rng2 are at the same + Returns true if the two engines \a rng1 and \a rng2 are at the same state or if they are both reading from the operating system facilities, false otherwise. */ @@ -655,7 +655,7 @@ inline QRandomGenerator::SystemGenerator &QRandomGenerator::SystemGenerator::sel /*! \fn bool QRandomGenerator::operator!=(const QRandomGenerator &rng1, const QRandomGenerator &rng2) - Returns \c true if the two the two engines \a rng1 and \a rng2 are at + Returns \c true if the two engines \a rng1 and \a rng2 are at different states or if one of them is reading from the operating system facilities and the other is not, \c false otherwise. */ diff --git a/src/corelib/serialization/qcborcommon.cpp b/src/corelib/serialization/qcborcommon.cpp index 9168b8c520..844bcef4af 100644 --- a/src/corelib/serialization/qcborcommon.cpp +++ b/src/corelib/serialization/qcborcommon.cpp @@ -198,7 +198,7 @@ QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st) \value UnexpectedBreak The CBOR stream contains a Break where it is not allowed (data is corrupt and the error is not recoverable). \value UnknownType The CBOR stream contains an unknown/unparsable Type (data is corrupt - and the and the error is not recoverable). + and the error is not recoverable). \value IllegalType The CBOR stream contains a known type in a position it is not allowed to exist (data is corrupt and the error is not recoverable). \value IllegalNumber The CBOR stream appears to be encoding a number larger than 64-bit diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 0eda9250f9..81617114f6 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -2075,7 +2075,7 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos) has to be inserted to the widgets text directly before the preedit string. - If the commitString() should replace parts of the of the text in + If the commitString() should replace parts of the text in the editor, replacementLength() will contain the number of characters to be replaced. replacementStart() contains the position at which characters are to be replaced relative from the start of @@ -2241,7 +2241,7 @@ Q_IMPL_EVENT_COMMON(QInputMethodEvent) result of the input operations and has to be inserted to the widgets text directly before the preedit string. - If the commit string should replace parts of the of the text in + If the commit string should replace parts of the text in the editor, \a replaceLength specifies the number of characters to be replaced. \a replaceFrom specifies the position at which characters are to be replaced relative from the start of diff --git a/src/network/ssl/qsslserver.cpp b/src/network/ssl/qsslserver.cpp index 693b724bb7..967c478904 100644 --- a/src/network/ssl/qsslserver.cpp +++ b/src/network/ssl/qsslserver.cpp @@ -32,7 +32,7 @@ nextPendingConnection() function to fetch the next incoming connection and take it out of the pending connection queue. The QSslSocket is a child of the QSslServer and will be deleted when the QSslServer is deleted. It is - still a good a good idea to destroy the object explicitly when you are done + still a good idea to destroy the object explicitly when you are done with it, to avoid wasting memory. \sa QTcpServer, QSslConfiguration, QSslSocket |