diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp index 0a18c7fb14e89038da8541d07bd29e7cb742c061..008249344c2c65be573b04a7eb53280556f5b50b 100644 --- a/src/libs/cplusplus/CppRewriter.cpp +++ b/src/libs/cplusplus/CppRewriter.cpp @@ -454,7 +454,7 @@ const Name *rewriteName(const Name *name, static QString chopConst(QString type) { - while (1) { + while (1) { if (type.startsWith(QLatin1String("const"))) type = type.mid(5); else if (type.startsWith(QLatin1Char(' '))) @@ -515,7 +515,7 @@ static inline QString fixNestedTemplates(QString s) && s.at(size - 1) == QLatin1Char('>') && s.at(size - 2) == QLatin1Char(' ') && s.at(size - 3) != QLatin1Char('>')) - s.remove(size - 2, 1); + s.remove(size - 2, 1); return s; } @@ -607,14 +607,14 @@ CPLUSPLUS_EXPORT QString simplifySTLType(const QString &typeIn) const QString value = inner.mid(pos, inner.size() - pos - 1).trimmed(); const QString valueEsc = QRegExp::escape(value); QRegExp mapRE1(QString::fromLatin1("map<%1, ?%2, ?std::less<%3 ?>, ?%4\\s*>") - .arg(keyEsc, valueEsc, keyEsc, allocEsc)); + .arg(keyEsc, valueEsc, keyEsc, allocEsc)); mapRE1.setMinimal(true); QTC_ASSERT(mapRE1.isValid(), return typeIn); if (mapRE1.indexIn(type) != -1) { type.replace(mapRE1.cap(0), QString::fromLatin1("map<%1, %2>").arg(key, value)); } else { QRegExp mapRE2(QString::fromLatin1("map<const %1, ?%2, ?std::less<const %3>, ?%4\\s*>") - .arg(keyEsc, valueEsc, keyEsc, allocEsc)); + .arg(keyEsc, valueEsc, keyEsc, allocEsc)); mapRE2.setMinimal(true); if (mapRE2.indexIn(type) != -1) type.replace(mapRE2.cap(0), QString::fromLatin1("map<const %1, %2>").arg(key, value)); diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 5cbd1d30e6c9e88a3645f6ff2e9258d4f7474fa4..84c60425c10791434867c79428b77f11fc20ea75 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -327,37 +327,37 @@ int numberOfClosedEditors = 0; /// Check if previous line is a CppStyle Doxygen Comment bool isPreviousLineCppStyleComment(const QTextCursor &cursor) { - const QTextBlock ¤tBlock = cursor.block(); - if (!currentBlock.isValid()) - return false; + const QTextBlock ¤tBlock = cursor.block(); + if (!currentBlock.isValid()) + return false; - const QTextBlock &actual = currentBlock.previous(); - if (!actual.isValid()) - return false; + const QTextBlock &actual = currentBlock.previous(); + if (!actual.isValid()) + return false; - const QString text = actual.text().trimmed(); - if (text.startsWith(QLatin1String("///")) || text.startsWith(QLatin1String("//!"))) - return true; + const QString text = actual.text().trimmed(); + if (text.startsWith(QLatin1String("///")) || text.startsWith(QLatin1String("//!"))) + return true; - return false; + return false; } /// Check if next line is a CppStyle Doxygen Comment bool isNextLineCppStyleComment(const QTextCursor &cursor) { - const QTextBlock ¤tBlock = cursor.block(); - if (!currentBlock.isValid()) - return false; + const QTextBlock ¤tBlock = cursor.block(); + if (!currentBlock.isValid()) + return false; - const QTextBlock &actual = currentBlock.next(); - if (!actual.isValid()) - return false; + const QTextBlock &actual = currentBlock.next(); + if (!actual.isValid()) + return false; - const QString text = actual.text().trimmed(); - if (text.startsWith(QLatin1String("///")) || text.startsWith(QLatin1String("//!"))) - return true; + const QString text = actual.text().trimmed(); + if (text.startsWith(QLatin1String("///")) || text.startsWith(QLatin1String("//!"))) + return true; - return false; + return false; } /// Check if line is a CppStyle Doxygen comment and the cursor is after the comment @@ -416,8 +416,9 @@ bool handleDoxygenCppStyleContinuation(QTextCursor &cursor, // consider it as a continuation. Handles situations like: // void d(); ///<enter> if (!(text.trimmed().startsWith(QLatin1String("///")) - || text.startsWith(QLatin1String("//!")))) - return false; + || text.startsWith(QLatin1String("//!")))) { + return false; + } QString newLine(QLatin1Char('\n')); newLine.append(QString(offset, QLatin1Char(' '))); // indent correctly @@ -1366,9 +1367,9 @@ CPPEditorWidget::Link CPPEditorWidget::findMacroLink(const QByteArray &name) con } CPPEditorWidget::Link CPPEditorWidget::findMacroLink(const QByteArray &name, - Document::Ptr doc, - const Snapshot &snapshot, - QSet<QString> *processed) const + Document::Ptr doc, + const Snapshot &snapshot, + QSet<QString> *processed) const { if (doc && ! name.startsWith('<') && ! processed->contains(doc->fileName())) { processed->insert(doc->fileName()); @@ -1836,7 +1837,7 @@ void CPPEditorWidget::keyPressEvent(QKeyEvent *e) startRename(); bool wantEditBlock = (cursor.position() >= m_currentRenameSelectionBegin.position() - && cursor.position() <= m_currentRenameSelectionEnd.position()); + && cursor.position() <= m_currentRenameSelectionEnd.position()); if (wantEditBlock) { // possible change inside rename selection @@ -1869,7 +1870,7 @@ bool CPPEditor::open(QString *errorString, const QString &fileName, const QStrin { bool b = TextEditor::BaseTextEditor::open(errorString, fileName, realFileName); editorWidget()->setMimeType( - Core::ICore::mimeDatabase()->findByFile(QFileInfo(fileName)).type()); + Core::ICore::mimeDatabase()->findByFile(QFileInfo(fileName)).type()); return b; } @@ -1882,7 +1883,7 @@ void CPPEditorWidget::setFontSettings(const TextEditor::FontSettings &fs) { TextEditor::BaseTextEditorWidget::setFontSettings(fs); CppHighlighter *highlighter - = qobject_cast<CppHighlighter*>(baseTextDocument()->syntaxHighlighter()); + = qobject_cast<CppHighlighter*>(baseTextDocument()->syntaxHighlighter()); if (!highlighter) return; diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 18c2bc591fdca8fe74767a70d7cda333366889d1..0074031490e3d57b36ce2f5660c2a3dec51f3b1e 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -438,7 +438,7 @@ void PdbEngine::handleListSymbols(const PdbResponse &response) symbol.name = _(item.findChild("name").data()); symbols.append(symbol); } - debuggerCore()->showModuleSymbols(moduleName, symbols); + debuggerCore()->showModuleSymbols(moduleName, symbols); } ////////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp index 24c9b9a4b9ee3035d9eebe7a4cf5a3f733f277ca..d1f755c062661f5132a14a75ae2a5ce466114cd9 100644 --- a/src/plugins/debugger/watchdata.cpp +++ b/src/plugins/debugger/watchdata.cpp @@ -109,7 +109,7 @@ bool isIntType(const QByteArray &type) bool isFloatType(const QByteArray &type) { - return type == "float" || type == "double" || type == "qreal"; + return type == "float" || type == "double" || type == "qreal"; } bool isIntOrFloatType(const QByteArray &type) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 3e30ab6e400b7b11b9cc86aed1af793b9d10022b..22e24743a00d6a2001a0c969347990d096d2b391 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -8000,7 +8000,7 @@ void FakeVimHandler::handleInput(const QString &keys) void FakeVimHandler::setCurrentFileName(const QString &fileName) { - d->m_currentFileName = fileName; + d->m_currentFileName = fileName; } QString FakeVimHandler::currentFileName() const @@ -8010,7 +8010,7 @@ QString FakeVimHandler::currentFileName() const void FakeVimHandler::showMessage(MessageLevel level, const QString &msg) { - d->showMessage(level, msg); + d->showMessage(level, msg); } QWidget *FakeVimHandler::widget() diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 8e006e029b27360f69ea9ceba87fd41d364c96e8..bf6d243e462916c536f3418c18ea2e4a7c298700 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -1717,8 +1717,7 @@ void FakeVimPluginPrivate::triggerCompletions() // CompletionSupport::instance()->complete(editor->editor(), TextCompletion, false); } -void FakeVimPluginPrivate::triggerSimpleCompletions(const QString &needle, - bool forward) +void FakeVimPluginPrivate::triggerSimpleCompletions(const QString &needle, bool forward) { // m_wordCompletion->setActive(needle, forward, qobject_cast<FakeVimHandler *>(sender())); m_wordProvider->setActive(needle, forward, qobject_cast<FakeVimHandler *>(sender())); diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp index 6cd7ffad7158f52cfd09bc77f38b822a2fc95bc1..ef62b1e3b5023b68a0bf3827e3ffd578f8c84e81 100644 --- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp +++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp @@ -90,7 +90,7 @@ QString ProjectFilesFactory::displayName() const ProjectFilesEditor::ProjectFilesEditor(ProjectFilesEditorWidget *editor) : BaseTextEditor(editor) { - setContext(Core::Context(Constants::C_FILESEDITOR)); + setContext(Core::Context(Constants::C_FILESEDITOR)); } Core::Id ProjectFilesEditor::id() const diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 3b8a0ac2f165e494c6fd059c427f855061e25662..0422da7f1c3bd5de441df2b60bb9166af1db09d5 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1285,7 +1285,7 @@ template <class NonModalDialog> void GitPlugin::branchList() { - showNonModalDialog(currentState().topLevel(), m_branchDialog); + showNonModalDialog(currentState().topLevel(), m_branchDialog); } void GitPlugin::remoteList() diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 2e81fd8b67f558c8e01ed57642719d86cf9cb1f8..a8fc55d02dccc38457c2e9db47a6cd12a1c5acb1 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -232,7 +232,7 @@ void GitSubmitEditorWidget::authorInformationChanged() m_gitSubmitPanelUi.invalidEmailLabel-> setVisible(!emailIsValid() && !bothEmpty); - updateSubmitAction(); + updateSubmitAction(); } bool GitSubmitEditorWidget::emailIsValid() const diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp index 104d277c058ac48c578880817d8a28b0008af013..92157de5a998631be273486eafc16b0b30c4f00a 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp @@ -198,7 +198,7 @@ void FormEditorItem::setFormEditorVisible(bool isVisible) FormEditorItem::~FormEditorItem() { - scene()->removeItemFromHash(this); + scene()->removeItemFromHash(this); } /* \brief returns the parent item skipping all proxyItem*/ diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index a3ef2a15ef93e95a084baff0333cf71909374607..f8bd74ab1e79688330389c9ae5399529f519398c 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -133,7 +133,7 @@ bool FormEditorScene::hasItemForQmlItemNode(const QmlItemNode &qmlItemNode) cons void FormEditorScene::removeItemFromHash(FormEditorItem *item) { - m_qmlItemNodeItemHash.remove(item->qmlItemNode()); + m_qmlItemNodeItemHash.remove(item->qmlItemNode()); } @@ -316,7 +316,7 @@ void FormEditorScene::keyReleaseEvent(QKeyEvent *keyEvent) FormEditorView *FormEditorScene::editorView() const { - return m_editorView; + return m_editorView; } LayerItem* FormEditorScene::manipulatorLayerItem() const diff --git a/src/plugins/qnx/blackberrydeployinformation.cpp b/src/plugins/qnx/blackberrydeployinformation.cpp index 7abc7a38308e29a2c57047bc40d4ccf7dd3574ae..251cdc237243cf2d27fc2e404246d727a776539c 100644 --- a/src/plugins/qnx/blackberrydeployinformation.cpp +++ b/src/plugins/qnx/blackberrydeployinformation.cpp @@ -56,10 +56,10 @@ const char SOURCE_KEY[] = "Qnx.BlackBerry.DeployInformation.Source"; QString BarPackageDeployInformation::appDescriptorPath() const { - if (userAppDescriptorPath.isEmpty()) - return sourceDir + QLatin1String("/bar-descriptor.xml"); + if (userAppDescriptorPath.isEmpty()) + return sourceDir + QLatin1String("/bar-descriptor.xml"); - return userAppDescriptorPath; + return userAppDescriptorPath; } QString BarPackageDeployInformation::packagePath() const diff --git a/src/plugins/qnx/blackberrykeyswidget.h b/src/plugins/qnx/blackberrykeyswidget.h index a6bc7f5ba709d86c518b48382c5b89d1922b1874..55c6c89c52629638304b0548e8ccb432ef0ff9c9 100644 --- a/src/plugins/qnx/blackberrykeyswidget.h +++ b/src/plugins/qnx/blackberrykeyswidget.h @@ -51,9 +51,9 @@ class BlackBerryKeysWidget : public QWidget { Q_OBJECT public: - explicit BlackBerryKeysWidget(QWidget *parent = 0); + explicit BlackBerryKeysWidget(QWidget *parent = 0); - void apply(); + void apply(); private slots: void registerKey(); diff --git a/src/plugins/qnx/blackberryndksettingswidget.h b/src/plugins/qnx/blackberryndksettingswidget.h index 211833898e35ed22e14c03d279bed5d73ce24aa0..9562b7da4da811b2e89b244d83b98dcd488bf6fc 100644 --- a/src/plugins/qnx/blackberryndksettingswidget.h +++ b/src/plugins/qnx/blackberryndksettingswidget.h @@ -48,7 +48,7 @@ class BlackBerryNDKSettingsWidget : public QWidget { Q_OBJECT public: - explicit BlackBerryNDKSettingsWidget(QWidget *parent = 0); + explicit BlackBerryNDKSettingsWidget(QWidget *parent = 0); signals: void sdkPathChanged(); diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index d144706bcad99d15bf35d3485bc876559f72c46b..4dd936288b68872df9e57619b65e9aeafe378b51 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -1183,7 +1183,7 @@ void Qt4Project::unwatchFolders(const QStringList &l, Qt4PriFileNode *node) // All the folder have a trailing slash! namespace { - bool debugCFW = false; + bool debugCFW = false; } CentralizedFolderWatcher::CentralizedFolderWatcher(QObject *parent) : QObject(parent)