diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp index 49546074d6f673e45fe76e02fd8107bfe2977b53..f279012f3333fe10f538d4112c36e3dfa4016308 100644 --- a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp +++ b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp @@ -12,7 +12,7 @@ Core::NavigationView DirNavigationFactory::createWidget() { Core::NavigationView view; - // Create FileSystemModel and set the defauls path as home path + // Create FileSystemModel and set the default path as home path FileSystemModel* model = new FileSystemModel; model->setRootPath(QDir::homePath()); diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp index d5cfdfd61d94fd121ffaa418d73e7dad6a694de1..2797ced5425cdb36042be8b02915e605167bf041 100644 --- a/src/libs/extensionsystem/iplugin.cpp +++ b/src/libs/extensionsystem/iplugin.cpp @@ -262,7 +262,7 @@ IPlugin::SynchronousShutdown. Returns IPlugin::AsynchronousShutdown if the plugin needs to perform - asynchonous actions before performing the shutdown. + asynchronous actions before performing the shutdown. \sa asynchronousShutdownFinished() */ diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 74858486b5d37f32d62a6ce00bd4c68e5484df5f..8288d7871c45655992c5a233392b95f5f500d2c6 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -871,7 +871,7 @@ public: LibraryImport, FileImport, DirectoryImport, - UnknownFileImport // refers a file/directoy that wasn't found + UnknownFileImport // refers a file/directory that wasn't found }; ImportInfo(); diff --git a/src/libs/qmljsdebugclient/qpacketprotocol.cpp b/src/libs/qmljsdebugclient/qpacketprotocol.cpp index 270a67c9ba72aed7d100fb3252ac7e43cc1c071b..c35453e084dc5f5e9672aeef8a6593321e2ca791 100644 --- a/src/libs/qmljsdebugclient/qpacketprotocol.cpp +++ b/src/libs/qmljsdebugclient/qpacketprotocol.cpp @@ -422,7 +422,7 @@ QPacket::~QPacket() /*! Creates a copy of \a other. The initial stream positions are shared, but the - two packets are otherwise independant. + two packets are otherwise independent. */ QPacket::QPacket(const QPacket & other) : QDataStream(), b(other.b), buf(0) diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index c4eafb99de53340c298e6abb98d1431e074d51a7..b5b12e2d3cfd8fc5255c8716cbe2b4fb21eefc75 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -146,7 +146,7 @@ void Manager::initialize() // internal manager state is changed connect(this, SIGNAL(stateChanged(bool)), SLOT(onStateChanged(bool)), Qt::QueuedConnection); - // connections to enable/disbale navi widget factory + // connections to enable/disable navi widget factory ProjectExplorer::SessionManager *sessionManager = ProjectExplorer::ProjectExplorerPlugin::instance()->session(); connect(sessionManager, SIGNAL(projectAdded(ProjectExplorer::Project*)), diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp index 42d9f3cc00ed41f1fefdc9b3fbe1c52892f68a21..3fd171503215ff3318ffe38c04266a6d38eee40c 100644 --- a/src/plugins/classview/classviewparser.cpp +++ b/src/plugins/classview/classviewparser.cpp @@ -573,7 +573,7 @@ void Parser::resetDataToCurrentState() void Parser::onResetDataDone() { - // internal data is resetted, update a tree and send it back + // internal data is reset, update a tree and send it back emitCurrentTree(); } diff --git a/src/plugins/classview/classviewparsertreeitem.cpp b/src/plugins/classview/classviewparsertreeitem.cpp index 16e1a66573318367561fae628b30dcf043610df6..7a17c76d71467a831756d002dc3d9219186d1300 100644 --- a/src/plugins/classview/classviewparsertreeitem.cpp +++ b/src/plugins/classview/classviewparsertreeitem.cpp @@ -58,7 +58,7 @@ struct ParserTreeItemPrivate //! symbol locations QSet<SymbolLocation> symbolLocations; - //! symbol informations + //! symbol information QHash<SymbolInformation, ParserTreeItem::Ptr> symbolInformations; //! An icon @@ -190,7 +190,7 @@ void ParserTreeItem::add(const ParserTreeItem::ConstPtr &target) // add locations d_ptr->symbolLocations = d_ptr->symbolLocations.unite(target->d_ptr->symbolLocations); - // add childs + // add children // every target child QHash<SymbolInformation, ParserTreeItem::Ptr>::const_iterator cur = target->d_ptr->symbolInformations.constBegin(); diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 5589fe567fc1b4f4191057067e0d932820c81ac8..15008a72cc5a13a8fa7e86c75720d77bf6e9a21f 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1284,7 +1284,7 @@ QStringList EditorManager::getOpenFileNames() const void EditorManager::switchToPreferedMode() { QString preferedMode; - // Figure out prefered mode for editor + // Figure out preferred mode for editor if (m_d->m_currentEditor) preferedMode = m_d->m_currentEditor->preferredModeType(); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 7d8a0a804dcb2ef86b159a66aee60befc07b5c4d..68494ffec0b03e25acceaeef0824758273ab9870 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -185,7 +185,7 @@ // `-+-+-+-+-+-+-+-+-+-+-+>-+ // + // + -// #Interupt@InferiorRunOk# + +// #Interrupt@InferiorRunOk# + // + + // InferiorStopRequested + // #SpontaneousStop + + @@ -2492,7 +2492,7 @@ void DebuggerPluginPrivate::sessionLoaded() void DebuggerPluginPrivate::aboutToUnloadSession() { // Stop debugging the active project when switching sessions. - // Note that at startup, session switches may occur, which interfer + // Note that at startup, session switches may occur, which interfere // with command-line debugging startup. // FIXME ABC: Still wanted? Iterate? //if (d->m_engine && state() != DebuggerNotReady diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 231b0cee2c33045b2de223434f58a50fea57b185..b122edfce4aff525b14009d9aa999cccdb928082 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4203,7 +4203,7 @@ void GdbEngine::handleGdbError(QProcess::ProcessError error) { const QString msg = errorMessage(error); showMessage(_("HANDLE GDB ERROR: ") + msg); - // Show a message box for asynchroneously reported issues. + // Show a message box for asynchronously reported issues. switch (error) { case QProcess::FailedToStart: // This should be handled by the code trying to start the process. diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 3c857fbf461d89ce0108eeefa2c4a93193e3d342..2afdbdb429eaa152c641eae2d86ce23240d7a33e 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -167,7 +167,7 @@ void PdbEngine::setupEngine() connect(this, SIGNAL(outputReady(QByteArray)), SLOT(handleOutput2(QByteArray)), Qt::QueuedConnection); - // We will stop immediatly, so setup a proper callback. + // We will stop immediately, so setup a proper callback. PdbCommand cmd; cmd.callback = &PdbEngine::handleFirstCommand; m_commands.enqueue(cmd); diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 0011abcee122f2f5f2fb8a9b22ff1d1178258f8b..26b40bbb5c5f93843af66ca39fbfd4f78c3baabb 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -568,7 +568,7 @@ void QmlCppEngine::masterEngineStateChanged(const DebuggerState &newState) break; // here, we shut down the qml engine first. - // but due to everything being asyncronous, we cannot guarantee + // but due to everything being asynchronous, we cannot guarantee // that it is shut down completely before gdb engine is shut down. case InferiorShutdownRequested: if (d->m_activeEngine == d->m_qmlEngine) { diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h index 051861953c0381e04c1a26ae83bd14b522a8d133..4316909495630cf49c31692ee589752ba564d72d 100644 --- a/src/plugins/debugger/watchdata.h +++ b/src/plugins/debugger/watchdata.h @@ -126,7 +126,7 @@ public: quint64 address; // Displayed address qint32 generation; // When updated? bool hasChildren; - bool valueEnabled; // Value will be greyed out or not + bool valueEnabled; // Value will be enabled or not bool valueEditable; // Value will be editable bool error; bool changed; diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 314881d333572bf8916af1c0d1485cd34b48e007..afdcf758b5adf1c1823ea610ac542958dab90e60 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -3690,7 +3690,7 @@ void FakeVimHandler::Private::search(const SearchData &sd) } // Set Cursor. In contrast to the main editor we have the cursor - // position befor the anchor position. + // position before the anchor position. setAnchorAndPosition(tc.position(), tc.anchor()); // Making this unconditional feels better, but is not "vim like". diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index d07fc0669830d7bb26cf067c30f8d5d15e3725bc..ce06e3ae4fc8296af28741270122403be3941036 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -582,7 +582,7 @@ void MiniProjectTargetSelector::updateAction() QIcon targetIcon = style()->standardIcon(QStyle::SP_ComputerIcon); const int extrawidth = 110; // Size of margins + icon width - // Some fudge numbers to ensure the menu doesnt grow unbounded + // Some fudge numbers to ensure the menu does not grow unbounded int maxLength = fontMetrics().averageCharWidth() * 140; if (project) { diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp index 69ed6f52c75d35ba1a4261d4b0ccf454aa751308..e307f12109cb1710f54cac353ca5dcb2a12c3e6d 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp @@ -390,7 +390,7 @@ void MetaInfoPrivate::parseQmlTypes() if (m_q->hasNodeMetaInfo(qmlType->qmlTypeName(), qmlType->majorVersion(), qmlType->minorVersion())) continue; - // we ignore the depricated Qt/ namespace + // we ignore the deprecated Qt/ namespace if (isDepricatedQtType(qmlType->qmlTypeName())) continue; diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp index 191114bf1b7fcdf2aed65099d05fe70e7f3d63a1..646c945598428927febbc3e9e8ab127b53330645 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp @@ -391,7 +391,7 @@ void QmlModelView::activateState(const QmlModelState &state) m_state = state; //This is hacky. m_state should be controlled by the instances //### todo: If the state thumbnail code gets refactored. - // this is not neccessary anymore. + // this is not necessary anymore. NodeInstance newStateInstance = instanceForModelNode(state.modelNode()); diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h index 0da121abf226b2db92755ffc9d85f75ced36e3a9..88273adc1cb776ef419d591c83ed73bc882a5328 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.h +++ b/src/plugins/qmljseditor/qmloutlinemodel.h @@ -51,7 +51,7 @@ public: enum ItemTypes { ElementType, - ElementBindingType, // might contain elements as childs + ElementBindingType, // might contain elements as children NonElementBindingType // can be filtered out }; diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 5670cc939d8e0b0e7cf161d20665cb2e34ec6bb3..a6bfb711fca0acac2c3041beb5079fc56d47e188 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1476,7 +1476,7 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async) // probably all subfiles/projects have changed anyway ... clear(); m_projectType = projectType; - // really emit here? or at the end? Noone is connected to this signal at the moment + // really emit here? or at the end? Nobody is connected to this signal at the moment // so we kind of can ignore that question for now foreach (NodesWatcher *watcher, watchers()) if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher)) @@ -1540,7 +1540,7 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async) if (existingAtEnd && newExactAtEnd && newCumlativeAtEnd) break; // we are done, hurray! - // So this is one giant loop comparing 3 lists at once and sorting the comparision + // So this is one giant loop comparing 3 lists at once and sorting the comparison // into mainly 2 buckets: toAdd and toRemove // We need to distinguish between nodes that came from exact and cumalative // parsing, since the update call is diffrent for them @@ -1851,7 +1851,7 @@ QStringList Qt4ProFileNode::includePaths(ProFileReader *reader) const paths.append(reader->absolutePathValues(QLatin1String("INCLUDEPATH"), m_projectDir)); // paths already contains moc dir and ui dir, due to corrrectly parsing uic.prf and moc.prf // except if those directories don't exist at the time of parsing - // thus we add those directories manually (without checking for existance) + // thus we add those directories manually (without checking for existence) paths << mocDirPath(reader) << uiDirPath(reader); paths.removeDuplicates(); return paths; diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 7daee0592f754b491731660f0701e4ee21aabead..293b8348a15deb3c7470fe7adb0733a11cc455ba 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -770,7 +770,7 @@ void Qt4Project::decrementPendingEvaluateFutures() qDebug()<<" Oh update is pending start the timer"; m_asyncUpdateTimer.start(); } else if (m_asyncUpdateState != ShuttingDown){ - // After beeing done, we need to call: + // After being done, we need to call: updateFileList(); updateCodeModels(); if (debug) diff --git a/src/plugins/qt4projectmanager/qtoutputformatter.cpp b/src/plugins/qt4projectmanager/qtoutputformatter.cpp index ea1cd16314786d93de3dd699fcc9057c806f250b..4917a93762819bdf9eb3549d17814e85a50818c7 100644 --- a/src/plugins/qt4projectmanager/qtoutputformatter.cpp +++ b/src/plugins/qt4projectmanager/qtoutputformatter.cpp @@ -210,7 +210,7 @@ void QtOutputFormatter::handleLink(const QString &href) if (!fileName.isEmpty()) { QFileInfo fi(fileName); if (fi.isRelative()) { - // Yeah fileName is relative, no suprise + // Yeah fileName is relative, no surprise ProjectExplorer::Project *pro = m_project.data(); if (pro) { QString baseName = fi.fileName(); diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp index ec68c52a4c5234d6508b42e12d8c0c117d97c392..1fe8bbf591c5bbc39f04e7ad6b00f0ec09265121 100644 --- a/tests/auto/debugger/tst_gdb.cpp +++ b/tests/auto/debugger/tst_gdb.cpp @@ -456,9 +456,9 @@ void Thread::readStandardOutput() return; //qWarning() << "WAKE UP: " << m_output; - //qDebug() << "\n2 ABOUT TO AQUIRE FREE "; + //qDebug() << "\n2 ABOUT TO ACQUIRE FREE "; freeBytes.acquire(); - //qDebug() << "\n2 AQUIRED FREE "; + //qDebug() << "\n2 ACQUIRED FREE "; buffer = m_output; m_output.clear(); //m_waitCondition.wakeAll(); @@ -571,9 +571,9 @@ void tst_Gdb::check(const QByteArray &label, const QByteArray &expected0, options += ",fancy"; writeToGdb("bb " + options + " " + expanded); - //qDebug() << "\n1 ABOUT TO AQUIRE USED "; + //qDebug() << "\n1 ABOUT TO ACQUIRE USED "; usedBytes.acquire(); - //qDebug() << "\n1 AQUIRED USED "; + //qDebug() << "\n1 ACQUIRED USED "; QByteArray ba = buffer; buffer.clear(); //qDebug() << "\n1 ABOUT TO RELEASE FREE "; diff --git a/tests/auto/icheckbuild/parsemanager.h b/tests/auto/icheckbuild/parsemanager.h index 13692625beff8f1eec13bbb7a2947bb433444f55..9e80391133a6fd80009e884de960e5b3d6bf7b28 100644 --- a/tests/auto/icheckbuild/parsemanager.h +++ b/tests/auto/icheckbuild/parsemanager.h @@ -45,7 +45,7 @@ ** chParseManager->parse(chFilelist); ** ** if(!chParseManager->checkAllMetadatas(iParseManager)){ -** cout << "Folowing interface items are missing:" << endl; +** cout << "Following interface items are missing:" << endl; ** QStringList errorlist = chParseManager->getErrorMsg(); ** foreach(QString msg, errorlist){ ** cout << (const char *)msg.toLatin1() << endl; diff --git a/tests/auto/qml/qmldesigner/common/statichelpers.cpp b/tests/auto/qml/qmldesigner/common/statichelpers.cpp index dfa7c57db8d79a26b163d686b6d39fa963298c7d..cc7efc309c79a6f2f43545e787bfb9757becb30b 100644 --- a/tests/auto/qml/qmldesigner/common/statichelpers.cpp +++ b/tests/auto/qml/qmldesigner/common/statichelpers.cpp @@ -119,7 +119,7 @@ static bool compareTree(const ModelNode &node1, const ModelNode &node2) return false; } - // Compare list of childs + // Compare list of children { const QList<ModelNode> childList1 = node1.allDirectSubModelNodes(); const QList<ModelNode> childList2 = node2.allDirectSubModelNodes(); diff --git a/tests/manual/cppquickfix/convertnumericliteral.cpp b/tests/manual/cppquickfix/convertnumericliteral.cpp index 6d64c98e7f90c36bd6fcce798796e28bb0eadc65..38bee62303925949dccbf74e87a55bdcd0456419 100644 --- a/tests/manual/cppquickfix/convertnumericliteral.cpp +++ b/tests/manual/cppquickfix/convertnumericliteral.cpp @@ -10,7 +10,7 @@ int main() 0xFA0Bu; // uppercase X 0X856A; - // negativ values + // negative values -199; -017; // not integer, do nothing diff --git a/tests/manual/qml-ast2dot/main.cpp b/tests/manual/qml-ast2dot/main.cpp index f3f5315088deb2cb5ea1f42f74e40432787f8b0e..72eb584cb6109886f1731de292bd4d0b274d45bd 100644 --- a/tests/manual/qml-ast2dot/main.cpp +++ b/tests/manual/qml-ast2dot/main.cpp @@ -219,7 +219,7 @@ protected: // visiting methods: } virtual bool visit(UiPublicMember *ast) { - // TODO: place the paramters... + // TODO: place the parameters... // UiParameterList *parameters; terminal(ast->defaultToken); diff --git a/tests/manual/trk/trkolddevice.h b/tests/manual/trk/trkolddevice.h index 7a68a9e854c1c1a10b3b6b7f273ededa259142f6..5b8a6cb799f02b0586795ab01529974708637fd6 100644 --- a/tests/manual/trk/trkolddevice.h +++ b/tests/manual/trk/trkolddevice.h @@ -103,7 +103,7 @@ private: /* TrkWriteQueueDevice: Extends TrkDevice by write message queue allowing * for queueing messages with a notification callback. If the message receives * an ACK, the callback is invoked. - * The special message TRK_WRITE_QUEUE_NOOP_CODE code can be used for synchronisation. + * The special message TRK_WRITE_QUEUE_NOOP_CODE code can be used for synchronization. * The respective message will not be sent, the callback is just invoked. */ enum { TRK_WRITE_QUEUE_NOOP_CODE = 0x7f };