aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-09-06 23:44:08 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-07 13:59:27 +0200
commit1578f745bf94f9522f0805019becf10c146a67de (patch)
tree506aa016864d65dde1c60939ba57fe040120af97 /src/qml
parent5b47966f5c7910e29f456d9a809f120a99c10ee4 (diff)
doc: fix some typos in .cpp files
Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/qml')
-rw-r--r--src/qml/qml/ftw/qhashedstring.cpp2
-rw-r--r--src/qml/qml/qqmlincubator.cpp4
-rw-r--r--src/qml/qml/qqmltypeloader.cpp2
-rw-r--r--src/qml/qml/qqmlvmemetaobject.cpp2
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/ftw/qhashedstring.cpp b/src/qml/qml/ftw/qhashedstring.cpp
index d5098fc9e6..56fd38dfc0 100644
--- a/src/qml/qml/ftw/qhashedstring.cpp
+++ b/src/qml/qml/ftw/qhashedstring.cpp
@@ -42,7 +42,7 @@
#include "qhashedstring_p.h"
// This is a reimplementation of V8's string hash algorithm. It is significantly
-// faster to do it here than call into V8, but it adds the maintainence burden of
+// faster to do it here than call into V8, but it adds the maintenance burden of
// ensuring that the two hashes are identical. We Q_ASSERT() that the two return
// the same value. If these asserts start to fail, the hash code needs to be
// synced with V8.
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index a21f5e08ef..6cf7774bd4 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -406,9 +406,9 @@ void QQmlIncubationController::incubateWhile(volatile bool *flag, int msecs)
\inmodule QtQml
Creating QML objects - like delegates in a view, or a new page in an application - can take
-a noticable amount of time, especially on resource constrained mobile devices. When an
+a noticeable amount of time, especially on resource constrained mobile devices. When an
application uses QQmlComponent::create() directly, the QML object instance is created
-synchronously which, depending on the complexity of the object, can cause noticable pauses or
+synchronously which, depending on the complexity of the object, can cause noticeable pauses or
stutters in the application.
The use of QQmlIncubator gives more control over the creation of a QML object,
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 2f9b2cbb8f..10eeb78582 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1627,7 +1627,7 @@ Returns a empty string if the path does not exist.
Why a directory cache? QML checks for files in many paths with
invalid directories. By caching whether a directory exists
-we avoid many stats. We also cache the files' existance in the
+we avoid many stats. We also cache the files' existence in the
directory, for the same reason.
*/
QString QQmlTypeLoader::absoluteFilePath(const QString &path)
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 2ebb4526df..416bb2598a 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -1265,7 +1265,7 @@ void QQmlVMEMetaObject::GcPrologueCallback(QV8GCCallback::Node *node)
// add references created by VMEVariant properties
int maxDataIdx = vmemo->metaData->propertyCount - vmemo->metaData->varPropertyCount;
- for (int ii = 0; ii < maxDataIdx; ++ii) { // XXX TODO: optimise?
+ for (int ii = 0; ii < maxDataIdx; ++ii) { // XXX TODO: optimize?
if (vmemo->data[ii].dataType() == QMetaType::QObjectStar) {
// possible QObject reference.
QObject *ref = vmemo->data[ii].asQObject();
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp
index d6e0190a9e..0ba2b35eba 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp
@@ -978,7 +978,7 @@ v8::Local<v8::Object> QQmlPropertyCache::newQObject(QObject *object, QV8Engine *
// XXX TODO: Enables fast property accessors. These more than double the property access
// performance, but the cost of setting up this structure hasn't been measured so
- // its not guarenteed that this is a win overall. We need to try and measure the cost.
+ // its not guaranteed that this is a win overall. We need to try and measure the cost.
for (StringCache::ConstIterator iter = stringCache.begin(); iter != stringCache.end(); ++iter) {
if (iter.equals(toString) || iter.equals(destroy))
continue;