From 7706c31eaa686299d7e22da809fec00c0db47c86 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 21 Dec 2012 15:51:50 +0100 Subject: Fix some typos Change-Id: I4e8d9bd8ea66ec810e4f1fbfd8ddbf25c4b3d980 Reviewed-by: Mitch Curtis --- src/corelib/io/qurl.cpp | 2 +- src/corelib/kernel/qeventdispatcher_blackberry.cpp | 2 +- src/corelib/thread/qmutex.cpp | 4 ++-- src/corelib/tools/qelapsedtimer_unix.cpp | 2 +- src/plugins/platforms/directfb/qdirectfbblitter.cpp | 2 +- src/widgets/styles/qfusionstyle.cpp | 2 +- src/widgets/styles/qstylehelper.cpp | 2 +- tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 2 +- tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 2 +- tests/manual/dialogs/filedialogpanel.cpp | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index d231bdda61..cc907daa3a 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -114,7 +114,7 @@ QUrl is capable of detecting many errors in URLs while parsing it or when components of the URL are set with individual setter methods (like setScheme(), setHost() or setPath()). If the parsing or setter function is - succesful, any previously recorded error conditions will be discarded. + successful, any previously recorded error conditions will be discarded. By default, QUrl setter methods operate in QUrl::TolerantMode, which means they accept some common mistakes and mis-representation of data. An diff --git a/src/corelib/kernel/qeventdispatcher_blackberry.cpp b/src/corelib/kernel/qeventdispatcher_blackberry.cpp index 2252b73ad4..69b4a8b172 100644 --- a/src/corelib/kernel/qeventdispatcher_blackberry.cpp +++ b/src/corelib/kernel/qeventdispatcher_blackberry.cpp @@ -132,7 +132,7 @@ static int bpsIOHandler(int fd, int io_events, void *data) } // post unblock event to our thread; in this callback the bps channel is - // guarenteed to be the same that was active when bps_add_fd was called + // guaranteed to be the same that was active when bps_add_fd was called result = bps_push_event(event); if (result != BPS_SUCCESS) { qWarning("QEventDispatcherBlackberryPrivate::QEventDispatcherBlackberry: bps_push_event() failed"); diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp index 3815ce16a7..97a5e5738c 100644 --- a/src/corelib/thread/qmutex.cpp +++ b/src/corelib/thread/qmutex.cpp @@ -394,7 +394,7 @@ bool QBasicMutex::isRecursive() to wait on the mutex. There are two tricks to keep in mind: We don't want to increment waiters after we checked no threads are waiting (waiters == 0). That's why we atomically set the BigNumber flag on waiters when - we check waiters. Similarily, if waiters is decremented right after we checked, + we check waiters. Similarly, if waiters is decremented right after we checked, the mutex would be unlocked (d->wakeUp() has (or will) be called), but there is no thread waiting. This is only happening if there was a timeout in tryLock at the same time as the mutex is unlocked. So when there was a timeout, we set the @@ -531,7 +531,7 @@ void QBasicMutex::unlockInternal() Q_DECL_NOTHROW QMutexPrivate *d = reinterpret_cast(copy); - // If no one is waiting for the lock anymore, we shoud reset d to 0x0. + // If no one is waiting for the lock anymore, we should reset d to 0x0. // Using fetchAndAdd, we atomically check that waiters was equal to 0, and add a flag // to the waiters variable (BigNumber). That way, we avoid the race in which waiters is // incremented right after we checked, because we won't increment waiters if is diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp index 5dc18ce99f..b8f2180a5b 100644 --- a/src/corelib/tools/qelapsedtimer_unix.cpp +++ b/src/corelib/tools/qelapsedtimer_unix.cpp @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE * http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap02.html#tag_02_01_06 ) * * The macro _POSIX_MONOTONIC_CLOCK can therefore assume the following values: - * -1 monotonic clock is never supported on this sytem + * -1 monotonic clock is never supported on this system * 0 monotonic clock might be supported, runtime check is needed * >1 (such as 200809L) monotonic clock is always supported * diff --git a/src/plugins/platforms/directfb/qdirectfbblitter.cpp b/src/plugins/platforms/directfb/qdirectfbblitter.cpp index cac250fb9d..ec6ecd540c 100644 --- a/src/plugins/platforms/directfb/qdirectfbblitter.cpp +++ b/src/plugins/platforms/directfb/qdirectfbblitter.cpp @@ -133,7 +133,7 @@ void QDirectFbBlitter::alphaFillRect(const QRectF &rect, const QColor &color, QP int x, y, w, h; DFBResult result; - // check paramters + // check parameters rect.toRect().getRect(&x, &y ,&w, &h); if ((w <= 0) || (h <= 0)) return; diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 623cdb55b9..6450ab049b 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -2631,7 +2631,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption buttonOption.QStyleOption::operator=(*comboBox); buttonOption.rect = rect; buttonOption.state = (comboBox->state & (State_Enabled | State_MouseOver | State_HasFocus)) - | State_KeyboardFocusChange; // Allways show hig + | State_KeyboardFocusChange; // Always show hig if (sunken) { buttonOption.state |= State_Sunken; diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index c6e9a8d013..1630130de2 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -78,7 +78,7 @@ QString uniqueName(const QString &key, const QStyleOption *option, const QSize & qreal dpiScaled(qreal value) { #ifdef Q_OS_MAC - // On mac the DPI is allways 72 so we should not scale it + // On mac the DPI is always 72 so we should not scale it return value; #else static const qreal scale = qreal(qt_defaultDpiX()) / 96.0; diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index b3282beaf5..240a459fe4 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -6497,7 +6497,7 @@ void tst_QNetworkReply::qtbug27161httpHeaderMayBeDamaged_data(){ /* * Purpose of this test is to check whether a content from server is parsed correctly - * if it is splitted into two parts. + * if it is split into two parts. */ void tst_QNetworkReply::qtbug27161httpHeaderMayBeDamaged(){ QFETCH(QByteArray, firstPacket); diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 5cb7c27387..879396a5bf 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -579,7 +579,7 @@ void tst_QSqlQuery::mysqlOutValues() void tst_QSqlQuery::bindBool() { - // QTBUG-27763: bool value got converted to int 127 by mysql driver becuase sizeof(bool) < sizeof(int). + // QTBUG-27763: bool value got converted to int 127 by mysql driver because sizeof(bool) < sizeof(int). // The problem was the way the bool value from the application was handled. It doesn't matter // whether the table column type is BOOL or INT. Use INT here because all DBMSs have it and all // should pass this test. diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp index 4da3d6ee42..f33c27f502 100644 --- a/tests/manual/dialogs/filedialogpanel.cpp +++ b/tests/manual/dialogs/filedialogpanel.cpp @@ -105,9 +105,9 @@ inline void setComboBoxValue(QComboBox *c, int v) c->setCurrentIndex(c->findData(QVariant(v))); } -static inline void addButton(const QString &desription, QBoxLayout *layout, QObject *receiver, const char *slotFunc) +static inline void addButton(const QString &description, QBoxLayout *layout, QObject *receiver, const char *slotFunc) { - QPushButton *button = new QPushButton(desription); + QPushButton *button = new QPushButton(description); QObject::connect(button, SIGNAL(clicked()), receiver, slotFunc); layout->addWidget(button); } -- cgit v1.2.3