From c6de55a0bb7cc6bebb5dd896ee8edf806c571b96 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 13 Feb 2018 12:19:01 +0100 Subject: [PATCH] Fix typos Change-Id: Id625efea998f2b4dce9970b903830dc3b3efcd3d Reviewed-by: Leena Miettinen --- examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp | 2 +- examples/widgets/tools/completer/fsmodel.h | 2 +- src/corelib/kernel/qabstracteventdispatcher.cpp | 2 +- src/corelib/kernel/qobject.cpp | 2 +- src/corelib/kernel/qtimer.cpp | 2 +- src/gui/kernel/qguiapplication.cpp | 2 +- src/gui/opengl/qopenglpaintdevice.cpp | 2 +- src/gui/painting/qtriangulatingstroker.cpp | 2 +- src/network/access/qhttpnetworkconnection.cpp | 4 ++-- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 2 +- src/sql/doc/src/sql-driver.qdoc | 2 +- src/testlib/qtestcase.qdoc | 2 +- src/widgets/itemviews/qitemdelegate.cpp | 2 +- src/widgets/itemviews/qstyleditemdelegate.cpp | 2 +- src/widgets/kernel/qopenglwidget.cpp | 2 +- src/widgets/styles/qcommonstyle.cpp | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp index e9d5235ddc9..4c18fa82511 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp +++ b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp @@ -117,7 +117,7 @@ QVariant SpreadSheetItem::computeFormula(const QString &formula, const QTableWidget *widget, const QTableWidgetItem *self) { - // check if the s tring is actually a formula or not + // check if the string is actually a formula or not QStringList list = formula.split(' '); if (list.isEmpty() || !widget) return formula; // it is a normal string diff --git a/examples/widgets/tools/completer/fsmodel.h b/examples/widgets/tools/completer/fsmodel.h index a243c48b430..7b2e7b7dab3 100644 --- a/examples/widgets/tools/completer/fsmodel.h +++ b/examples/widgets/tools/completer/fsmodel.h @@ -55,7 +55,7 @@ // With a QFileSystemModel, set on a view, you will see "Program Files" in the view // But with this model, you will see "C:\Program Files" in the view. -// We acheive this, by having the data() return the entire file path for +// We achieve this, by having the data() return the entire file path for // the display role. Note that the Qt::EditRole over which the QCompleter // looks for matches is left unchanged //! [0] diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index 67c15d2f2c1..304a7bda082 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -484,7 +484,7 @@ bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, vo This pure virtual method exists on windows only and has to be reimplemented by a Windows specific event dispatcher implementation. \a notifier is the QWinEventNotifier instance to be registered. - The method should return true if the registration of \a notifier was sucessful, otherwise false. + The method should return true if the registration of \a notifier was successful, otherwise false. QWinEventNotifier calls this method in it's constructor and there should never be a need to call this method directly. diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 5b37945ae05..263c4019f7a 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -516,7 +516,7 @@ void QMetaCallEvent::placeMetaCall(QObject *object) \reentrant - QSignalBlocker can be used whereever you would otherwise use a + QSignalBlocker can be used wherever you would otherwise use a pair of calls to blockSignals(). It blocks signals in its constructor and in the destructor it resets the state to what it was before the constructor ran. diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 27d94e47d30..c3504943c46 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -108,7 +108,7 @@ QT_BEGIN_NAMESPACE in many real-world situations. The accuracy also depends on the \l{Qt::TimerType}{timer type}. For - Qt::PreciseTimer, QTimer will try to keep the accurance at 1 millisecond. + Qt::PreciseTimer, QTimer will try to keep the accuracy at 1 millisecond. Precise timers will also never time out earlier than expected. For Qt::CoarseTimer and Qt::VeryCoarseTimer types, QTimer may wake up diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 055347500bd..36c9b1a964d 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3459,7 +3459,7 @@ void QGuiApplication::setFallbackSessionManagementEnabled(bool enabled) You should never exit the application within this signal. Instead, the session manager may or may not do this afterwards, depending on the - context. Futhermore, most session managers will very likely request a saved + context. Furthermore, most session managers will very likely request a saved state immediately after the application has been started. This permits the session manager to learn about the application's restart policy. diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp index e539ee0e310..3a0c02feb01 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp @@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE When intermixing QPainter and OpenGL, it is important to notify QPainter that the OpenGL state may have been cluttered so it can - restore its internal state. This is acheived by calling \l + restore its internal state. This is achieved by calling \l QPainter::beginNativePainting() before starting the OpenGL rendering and calling \l QPainter::endNativePainting() after finishing. diff --git a/src/gui/painting/qtriangulatingstroker.cpp b/src/gui/painting/qtriangulatingstroker.cpp index 3f7b01ddbe5..b1b07f9699b 100644 --- a/src/gui/painting/qtriangulatingstroker.cpp +++ b/src/gui/painting/qtriangulatingstroker.cpp @@ -261,7 +261,7 @@ void QTriangulatingStroker::moveTo(const qreal *pts) normalVector(m_cx, m_cy, x2, y2, &m_nvx, &m_nvy); - // To acheive jumps we insert zero-area tringles. This is done by + // To achieve jumps we insert zero-area tringles. This is done by // adding two identical points in both the end of previous strip // and beginning of next strip bool invisibleJump = m_vertices.size(); diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index d24927b9221..517af326a89 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -646,8 +646,8 @@ QHttpNetworkReply* QHttpNetworkConnectionPrivate::queueRequest(const QHttpNetwor #ifndef Q_OS_WINRT // For Happy Eyeballs the networkLayerState is set to Unknown - // untill we have started the first connection attempt. So no - // request will be started untill we know if IPv4 or IPv6 + // until we have started the first connection attempt. So no + // request will be started until we know if IPv4 or IPv6 // should be used. if (networkLayerState == Unknown || networkLayerState == HostLookupPending) { startHostInfoLookup(); diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp index 0ab4c65c459..7b7649bc5c0 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp @@ -148,7 +148,7 @@ public: mutable QPointer m_screen; // Touch filtering and prediction are part of the same thing. The default - // prediction is 0ms, but sensible results can be acheived by setting it + // prediction is 0ms, but sensible results can be achieved by setting it // to, for instance, 16ms. // For filtering to work well, the QPA plugin should provide a dead-steady // implementation of QPlatformWindow::requestUpdate(). diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index dc8d52b5725..fd95e898128 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -449,7 +449,7 @@ \target QTDS \section2 QTDS for Sybase Adaptive Server - \note TDS is no longer used by MS Sql Server, and is superceded by + \note TDS is no longer used by MS Sql Server, and is superseded by \l{QODBC}{ODBC}. QTDS is obsolete from Qt 4.7. It is not possible to set the port with QSqlDatabase::setPort() due to limitations in the diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc index 0fb1cc6a8a8..9a3c770e319 100644 --- a/src/testlib/qtestcase.qdoc +++ b/src/testlib/qtestcase.qdoc @@ -103,7 +103,7 @@ to catch an exception thrown from the \a expression. If the \a expression throws an exception and its type is the same as \a exceptiontype or \a exceptiontype is substitutable with the type of thrown exception - (i.e. usually the type of thrown exception is publically derived + (i.e. usually the type of thrown exception is publicly derived from \a exceptiontype) then execution will be continued. If not-substitutable type of exception is thrown or the \a expression doesn't throw an exception at all, then a failure will be recorded in the test log and diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index 1ff51f9be26..91122283a4b 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -1090,7 +1090,7 @@ QRect QItemDelegate::textRectangle(QPainter * /*painter*/, const QRect &rect, \endlist In the case of \uicontrol Tab, \uicontrol Backtab, \uicontrol Enter and \uicontrol Return - key press events, the \a editor's data is comitted to the model + key press events, the \a editor's data is committed to the model and the editor is closed. If the \a event is a \uicontrol Tab key press the view will open an editor on the next item in the view. Likewise, if the \a event is a \uicontrol Backtab key press the diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index 43b640fd692..0f7566e8ecb 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -571,7 +571,7 @@ void QStyledItemDelegate::setItemEditorFactory(QItemEditorFactory *factory) \uicontrol Return keys are \e not handled. In the case of \uicontrol Tab, \uicontrol Backtab, \uicontrol Enter and \uicontrol Return - key press events, the \a editor's data is comitted to the model + key press events, the \a editor's data is committed to the model and the editor is closed. If the \a event is a \uicontrol Tab key press the view will open an editor on the next item in the view. Likewise, if the \a event is a \uicontrol Backtab key press the diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index c95be2dfe16..c96b6812c41 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -381,7 +381,7 @@ QT_BEGIN_NAMESPACE QOpenGLContext. By connecting a slot, using direct connection, to this signal, it is possible to perform cleanup whenever the the underlying native context handle, or the entire QOpenGLContext instance, is going to be released. The - following snippet is in principal equivalent to the previous one: + following snippet is in principle equivalent to the previous one: \snippet code/doc_gui_widgets_qopenglwidget.cpp 5 diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 670a23e78f7..557277b9e0a 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -6291,7 +6291,7 @@ QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &p // High intensity colors needs dark shifting in the color table, while // low intensity colors needs light shifting. This is to increase the - // percieved contrast. + // perceived contrast. if ((red - factor > green && red - factor > blue) || (green - factor > red && green - factor > blue) || (blue - factor > red && blue - factor > green))