diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-16 13:27:45 (GMT) |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-17 13:42:45 (GMT) |
commit | 9e88a2f1468b9a4f500b878f514db7f7a1f5eadc (patch) | |
tree | 589dd5fa9d8f3dc0171b4021c6a60e2d5cd27a64 /src | |
parent | 3be7f871f07041477b5bca0182623b36afd2b3e6 (diff) | |
download | Qt-9e88a2f1468b9a4f500b878f514db7f7a1f5eadc.zip Qt-9e88a2f1468b9a4f500b878f514db7f7a1f5eadc.tar.gz Qt-9e88a2f1468b9a4f500b878f514db7f7a1f5eadc.tar.bz2 |
Doc: Fixing typo
Reducing the amount of spelling errors from NBN.
Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86
Reviewed-by: Rohan McGovern
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qbackingstore.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qgl_qpa.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 2 | ||||
-rw-r--r-- | src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp | 2 | ||||
-rw-r--r-- | src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/qopenkodewindow.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 2 | ||||
-rw-r--r-- | src/testlib/3rdparty/valgrind_p.h | 4 | ||||
-rw-r--r-- | src/xml/dom/qdom.cpp | 6 |
10 files changed, 13 insertions, 13 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 314ccd7..02c2a11 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -784,7 +784,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings) // 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/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 6fbb59f..d79be41 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -1625,7 +1625,7 @@ void QWidgetPrivate::repaint_sys(const QRegion &rgn) extra->staticContentsSize = data.crect.size(); } -#ifdef Q_WS_QPA //Dont even call q->p +#ifdef Q_WS_QPA //Don't even call q->p QPaintEngine *engine = 0; #else QPaintEngine *engine = q->paintEngine(); diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 518c860..b31833a 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -404,7 +404,7 @@ QGLContext *QGLContext::fromPlatformGLContext(QPlatformGLContext *platformContex return reinterpret_cast<QGLContext *>(platformContext->qGLContextHandle()); } QGLContext *glContext = new QGLContext(platformContext); - //Dont call create on context. This can cause the platformFormat to be set on the widget, which + //Don't call create on context. This can cause the platformFormat to be set on the widget, which //will cause the platformWindow to be recreated. return glContext; } diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index d93efb4..7d16b30 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -354,7 +354,7 @@ QGLWindowSurface::~QGLWindowSurface() { if (d_ptr->ctx) glDeleteTextures(1, &d_ptr->tex_id); -#ifndef Q_WS_QPA // Dont delete the contexts. Destroying the window does that for us +#ifndef Q_WS_QPA // Don't delete the contexts. Destroying the window does that for us foreach(QGLContext **ctx, d_ptr->contexts) { delete *ctx; *ctx = 0; diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp index 258d586..25abe17 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -46,7 +46,7 @@ ** Copyright (C) 2004 immodule for Qt Project. All rights reserved. ** ** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own -** licence. You may use this file under your Qt license. Following +** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are ** not clear to you. diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h index 5d311b3..cc1b1f0 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h @@ -46,7 +46,7 @@ ** Copyright (C) 2004 immodule for Qt Project. All rights reserved. ** ** This file is written to contribute to Nokia Corporation and/or its subsidiary(-ies) under their own -** licence. You may use this file under your Qt license. Following +** license. You may use this file under your Qt license. Following ** description is copied from their original file headers. Contact ** immodule-qt@freedesktop.org if any conditions of this licensing are ** not clear to you. diff --git a/src/plugins/platforms/openkode/qopenkodewindow.cpp b/src/plugins/platforms/openkode/qopenkodewindow.cpp index c6fe6d0..dedd2d5 100644 --- a/src/plugins/platforms/openkode/qopenkodewindow.cpp +++ b/src/plugins/platforms/openkode/qopenkodewindow.cpp @@ -283,7 +283,7 @@ void QOpenKODEWindow::processKeyEvents(const KDEvent *event) QEvent::Type keyPressed = QEvent::KeyRelease; if (event->data.keyboardInputKey.flags) keyPressed = QEvent::KeyPress; -//KD_KEY_LOCATION_LEFT_ATX // dont care for now +//KD_KEY_LOCATION_LEFT_ATX // don't care for now //KD_KEY_LOCATION_RIGHT_ATX //KD_KEY_LOCATION_NUMPAD_ATX Qt::KeyboardModifiers mod = Qt::NoModifier; diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 80a1624..4f3021e 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -59,7 +59,7 @@ #include <X11/Xlib-xcb.h> #endif -#ifdef XCB_USE_EGL //dont pull in eglext prototypes +#ifdef XCB_USE_EGL //don't pull in eglext prototypes #include <EGL/egl.h> #endif diff --git a/src/testlib/3rdparty/valgrind_p.h b/src/testlib/3rdparty/valgrind_p.h index 6380a9f..70ba371 100644 --- a/src/testlib/3rdparty/valgrind_p.h +++ b/src/testlib/3rdparty/valgrind_p.h @@ -3703,8 +3703,8 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) /* These requests allow control to move from the simulated CPU to the - real CPU, calling an arbitary function. - + real CPU, calling an arbitrary function. + Note that the current ThreadId is inserted as the first argument. So this call: diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 7c7cafc..ccc6e8b 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -3487,10 +3487,10 @@ QDomDocumentTypePrivate::QDomDocumentTypePrivate(QDomDocumentTypePrivate* n, boo QDomNodePrivate* p = first; while (p) { if (p->isEntity()) - // Dont use normal insert function since we would create infinite recursion + // Don't use normal insert function since we would create infinite recursion entities->map.insertMulti(p->nodeName(), p); if (p->isNotation()) - // Dont use normal insert function since we would create infinite recursion + // Don't use normal insert function since we would create infinite recursion notations->map.insertMulti(p->nodeName(), p); p = p->next; } @@ -5725,7 +5725,7 @@ static QByteArray encodeEntity(const QByteArray& str) len += 4; i += 5; } else if (d[i] == '&' && i + 1 < len && d[i+1] == '#') { - // Dont encode < or " or &custom;. + // Don't encode < or " or &custom;. // Only encode character references tmp.replace(i, 1, "&"); d = tmp; |