summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-07-11 14:44:38 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-11 14:52:37 +0200
commit59339941e0e6e2b8648c2e128284de188a65714b (patch)
treed2f19ebbac24dfc5872509cb74262375cd3e8962 /src/corelib
parent62e6608f6932c6d871d17b0ccce0c7b388866458 (diff)
Fix some spelling errors
Change-Id: I19d3b2e9a5180b13deb828b55195404ef20be295 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/animation/qabstractanimation.cpp4
-rw-r--r--src/corelib/arch/qatomic_msvc.h2
-rw-r--r--src/corelib/global/qglobal.cpp2
-rw-r--r--src/corelib/io/qurlquery.cpp2
-rw-r--r--src/corelib/json/qjsonparser.cpp2
-rw-r--r--src/corelib/json/qjsonvalue.cpp2
-rw-r--r--src/corelib/plugin/qlibrary.cpp2
-rw-r--r--src/corelib/thread/qmutex.cpp8
-rw-r--r--src/corelib/tools/qdatetime.cpp2
-rw-r--r--src/corelib/tools/qregularexpression.cpp8
10 files changed, 17 insertions, 17 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index e56d1e26d3..296d583365 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -856,7 +856,7 @@ qint64 QAnimationDriver::elapsed() const
\fn QAnimationDriver::started()
This signal is emitted by the animation framework to notify the driver
- that continous animation has started.
+ that continuous animation has started.
\internal
*/
@@ -865,7 +865,7 @@ qint64 QAnimationDriver::elapsed() const
\fn QAnimationDriver::stopped()
This signal is emitted by the animation framework to notify the driver
- that continous animation has stopped.
+ that continuous animation has stopped.
\internal
*/
diff --git a/src/corelib/arch/qatomic_msvc.h b/src/corelib/arch/qatomic_msvc.h
index 4f7f971ec8..3e0923b0be 100644
--- a/src/corelib/arch/qatomic_msvc.h
+++ b/src/corelib/arch/qatomic_msvc.h
@@ -273,7 +273,7 @@ template <int N> struct QAtomicOpsBySize;
template <>
struct QAtomicOpsBySize<4> : QGenericAtomicOps<QAtomicOpsBySize<4> >
{
- // The 32-bit Interlocked*() API takes paramters as longs.
+ // The 32-bit Interlocked*() API takes parameters as longs.
typedef long Type;
static inline bool isReferenceCountingNative() { return true; }
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index caf88be3ba..ada95fcaf5 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1825,7 +1825,7 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
\since 5.0
Tells the compiler that the current point cannot be reached by any
- execution, so it may optimise any code paths leading here as dead code, as
+ execution, so it may optimize any code paths leading here as dead code, as
well as code continuing from here.
This macro is useful to mark impossible conditions. For example, given the
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index 24742e4390..3a23e9748d 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -442,7 +442,7 @@ static void recodeAndAppend(QString &to, const QString &input,
Returns the reconstructed query string, formed from the key-value pairs
currently stored in this QUrlQuery object and separated by the query
delimiters chosen for this object. The keys and values are encoded using
- the options given by the \a encoding paramter.
+ the options given by the \a encoding parameter.
For this function, the only ambiguous delimiter is the hash ("#"), as in
URLs it is used to separate the query string from the fragment that may
diff --git a/src/corelib/json/qjsonparser.cpp b/src/corelib/json/qjsonparser.cpp
index 5372bc0a7a..4bec3fdd82 100644
--- a/src/corelib/json/qjsonparser.cpp
+++ b/src/corelib/json/qjsonparser.cpp
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
This enum describes the type of error that occurred during the parsing of a JSON document.
- \value NoError No error occured
+ \value NoError No error occurred
\value UnterminatedObject An object is not correctly terminated with a closing curly bracket
\value MissingNameSeparator A comma separating different items is missing
\value UnterminatedArray The array is not correctly terminated with a closing square bracket
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp
index 409865155d..bde3323fa0 100644
--- a/src/corelib/json/qjsonvalue.cpp
+++ b/src/corelib/json/qjsonvalue.cpp
@@ -353,7 +353,7 @@ QVariant QJsonValue::toVariant() const
\value Object An object. Use toObject() to convert to a QJsonObject.
\value Undefined The value is undefined. This is usually returned as an
error condition, when trying to read an out of bounds value
- in an array or a non existant key in an object.
+ in an array or a non existent key in an object.
*/
/*!
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 160356f9cc..8e69960c93 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -652,7 +652,7 @@ bool QLibraryPrivate::isPlugin()
// An exception was thrown when calling qt_plugin_query_verification_data().
// This usually happens when plugin is compiled with the /clr compiler flag,
// & will only work if the dependencies are loaded & DLLMain() is called.
- // LoadLibrary() will do this, try once with this & if it fails dont load.
+ // LoadLibrary() will do this, try once with this & if it fails don't load.
retryLoadLibrary = !retryLoadLibrary;
}
#endif
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp
index d310f56798..f54d896b74 100644
--- a/src/corelib/thread/qmutex.cpp
+++ b/src/corelib/thread/qmutex.cpp
@@ -369,9 +369,9 @@ bool QBasicMutex::lockInternal(int timeout)
old_waiters = d->waiters.load();
if (old_waiters == -QMutexPrivate::BigNumber) {
// we are unlocking, and the thread that unlocks is about to change d to 0
- // we try to aquire the mutex by changing to dummyLocked()
+ // we try to acquire the mutex by changing to dummyLocked()
if (d_ptr.testAndSetAcquire(d, dummyLocked())) {
- // Mutex aquired
+ // Mutex acquired
Q_ASSERT(d->waiters.load() == -QMutexPrivate::BigNumber || d->waiters.load() == 0);
d->waiters.store(0);
d->deref();
@@ -450,7 +450,7 @@ void QBasicMutex::unlockInternal()
d->deref();
}
-//The freelist managment
+//The freelist management
namespace {
struct FreeListConstants : QFreeListDefaultConstants {
enum { BlockCount = 4, MaxIndex=0xffff };
@@ -489,7 +489,7 @@ void QMutexPrivate::release()
freelist()->release(id);
}
-// atomically substract "value" to the waiters, and remove the QMutexPrivate::BigNumber flag
+// atomically subtract "value" to the waiters, and remove the QMutexPrivate::BigNumber flag
void QMutexPrivate::derefWaiters(int value)
{
int old_waiters;
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index b76f4e3493..6c3836e0dc 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -1767,7 +1767,7 @@ int QTime::msecsTo(const QTime &t) const
#ifndef QT_NO_DATESTRING
// These anonymous functions tidy up QDateTime::fromString()
-// and avoid confusion of reponsibility between it and QTime::fromString().
+// and avoid confusion of responsibility between it and QTime::fromString().
namespace {
inline bool isMidnight(int hour, int minute, int second, int msec)
{
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
index 74349f62a5..e138fd543b 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/tools/qregularexpression.cpp
@@ -309,7 +309,7 @@ QT_BEGIN_NAMESPACE
\li the input cannot possibly match the regular expression;
\li the input does match the regular expression;
\li the input does not match the regular expression right now,
- but it will if more charaters will be added to it.
+ but it will if more characters will be added to it.
\endlist
Note that these three cases represent exactly the possible states of a
@@ -461,7 +461,7 @@ QT_BEGIN_NAMESPACE
string, but also at a newline character right before the end of the string;
that is, the previous pattern matches against the string "this pattern must
match exactly\\n". Also, the behaviour of both the \c{^} and the \c{$}
- anchors changes if the MultiLineOption is set either explicitely (as a
+ anchors changes if the MultiLineOption is set either explicitly (as a
pattern option) or implicitly (as a directive inside the pattern string).
Therefore, in the most general case, you should wrap the pattern between
@@ -688,7 +688,7 @@ QT_BEGIN_NAMESPACE
\value UseUnicodePropertiesOption
The meaning of the \c{\w}, \c{\d}, etc., character classes, as well as
the meaning of their counterparts (\c{\W}, \c{\D}, etc.), is changed
- from matching ASCII charaters only to matching any character with the
+ from matching ASCII characters only to matching any character with the
corresponding Unicode property. For instance, \c{\d} is changed to
match any character with the Unicode Nd (decimal digit) property;
\c{\w} to match any character with either the Unicode L (letter) or N
@@ -1950,7 +1950,7 @@ bool QRegularExpressionMatch::hasMatch() const
Returns true if the regular expression partially matched against the
subject string, or false otherwise.
- \note Only a match that explicitely used the one of the partial match types
+ \note Only a match that explicitly used the one of the partial match types
can yield a partial match. Still, if such a match succeeds totally, this
function will return false, while hasMatch() will return true.