diff options
author | Orgad Shaneh <[email protected]> | 2012-11-28 20:44:03 +0200 |
---|---|---|
committer | Orgad Shaneh <[email protected]> | 2012-11-28 20:20:46 +0100 |
commit | a44aa55502b1d9f548692e49ab7cea13d341c8ca (patch) | |
tree | 77f9fbfd583551839c4448c1b66de7c47dd7afc3 /src/plugins | |
parent | 3747e941ad79f64e28c78c83a840783eb3edfd6f (diff) |
Add whitespace after control keywords
find -name \*.cpp -o -name \*.h | \
xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'
Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins')
102 files changed, 237 insertions, 237 deletions
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp index 0731670a0b6..7c84631310e 100644 --- a/src/plugins/bazaar/bazaarclient.cpp +++ b/src/plugins/bazaar/bazaarclient.cpp @@ -124,7 +124,7 @@ void BazaarClient::view(const QString &source, const QString &id, const QStringL QString BazaarClient::vcsEditorKind(VcsCommand cmd) const { - switch(cmd) { + switch (cmd) { case AnnotateCommand: return QLatin1String(Constants::ANNOTATELOG); case DiffCommand: diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp index 5e0de8bd3d0..b8791d1f4d2 100644 --- a/src/plugins/classview/classviewparser.cpp +++ b/src/plugins/classview/classviewparser.cpp @@ -188,7 +188,7 @@ ParserTreeItem::ConstPtr Parser::findItemByRoot(const QStandardItem *item, bool // go item by item to the root QList<const QStandardItem *> uiList; const QStandardItem *cur = item; - while(cur) { + while (cur) { uiList.append(cur); cur = cur->parent(); } @@ -201,7 +201,7 @@ ParserTreeItem::ConstPtr Parser::findItemByRoot(const QStandardItem *item, bool // using internal root - search correct item ParserTreeItem::ConstPtr internal = d->rootItem; - while(uiList.count() > 0) { + while (uiList.count() > 0) { cur = uiList.last(); uiList.removeLast(); const SymbolInformation &inf = Utils::symbolInformationFromItem(cur); @@ -223,7 +223,7 @@ ParserTreeItem::ConstPtr Parser::parse() // check all projects QList<ProjectExplorer::Project *> projects = getProjectList(); - foreach(const ProjectExplorer::Project *prj, projects) { + foreach (const ProjectExplorer::Project *prj, projects) { if (!prj) continue; @@ -355,7 +355,7 @@ ParserTreeItem::Ptr Parser::createFlatTree(const QStringList &projectList) QReadLocker locker(&d->prjLocker); ParserTreeItem::Ptr item(new ParserTreeItem()); - foreach(const QString &project, projectList) { + foreach (const QString &project, projectList) { if (!d->cachedPrjTrees.contains(project)) continue; ParserTreeItem::ConstPtr list = d->cachedPrjTrees[project]; @@ -371,7 +371,7 @@ ParserTreeItem::Ptr Parser::getParseProjectTree(const QStringList &fileList, //! changed files only (old edition), and add curent editions ParserTreeItem::Ptr item(new ParserTreeItem()); unsigned revision = 0; - foreach(const QString &file, fileList) { + foreach (const QString &file, fileList) { // ? locker for document?.. const CPlusPlus::Document::Ptr &doc = d->document(file); if (doc.isNull()) @@ -406,7 +406,7 @@ ParserTreeItem::Ptr Parser::getCachedOrParseProjectTree(const QStringList &fileL if (!projectId.isEmpty() && d->cachedPrjTrees.contains(projectId)) { // calculate project's revision unsigned revision = 0; - foreach(const QString &file, fileList) { + foreach (const QString &file, fileList) { const CPlusPlus::Document::Ptr &doc = d->document(file); if (doc.isNull()) continue; @@ -610,14 +610,14 @@ QStringList Parser::projectNodeFileList(const ProjectExplorer::FolderNode *node) QList<ProjectExplorer::FileNode *> fileNodes = node->fileNodes(); QList<ProjectExplorer::FolderNode *> subFolderNodes = node->subFolderNodes(); - foreach(const ProjectExplorer::FileNode *file, fileNodes) { + foreach (const ProjectExplorer::FileNode *file, fileNodes) { if (file->isGenerated()) continue; list << file->path(); } - foreach(const ProjectExplorer::FolderNode *folder, subFolderNodes) { + foreach (const ProjectExplorer::FolderNode *folder, subFolderNodes) { if (folder->nodeType() != ProjectExplorer::FolderNodeType && folder->nodeType() != ProjectExplorer::VirtualFolderNodeType) continue; @@ -654,7 +654,7 @@ QStringList Parser::addProjectNode(const ParserTreeItem::Ptr &item, // subnodes QList<ProjectExplorer::ProjectNode *> projectNodes = node->subProjectNodes(); - foreach(const ProjectExplorer::ProjectNode *project, projectNodes) { + foreach (const ProjectExplorer::ProjectNode *project, projectNodes) { ParserTreeItem::Ptr itemPrj(new ParserTreeItem()); SymbolInformation information(project->displayName(), project->path()); diff --git a/src/plugins/classview/classviewparsertreeitem.cpp b/src/plugins/classview/classviewparsertreeitem.cpp index ea65074db00..d1338d3481c 100644 --- a/src/plugins/classview/classviewparsertreeitem.cpp +++ b/src/plugins/classview/classviewparsertreeitem.cpp @@ -198,7 +198,7 @@ void ParserTreeItem::add(const ParserTreeItem::ConstPtr &target) target->d->symbolInformations.constBegin(); QHash<SymbolInformation, ParserTreeItem::Ptr>::const_iterator end = target->d->symbolInformations.constEnd(); - while(cur != end) { + while (cur != end) { const SymbolInformation &inf = cur.key(); const ParserTreeItem::Ptr &targetChild = cur.value(); if (d->symbolInformations.contains(inf)) { @@ -231,7 +231,7 @@ void ParserTreeItem::subtract(const ParserTreeItem::ConstPtr &target) target->d->symbolInformations.constBegin(); QHash<SymbolInformation, ParserTreeItem::Ptr>::const_iterator end = target->d->symbolInformations.constEnd(); - while(cur != end) { + while (cur != end) { const SymbolInformation &inf = cur.key(); if (d->symbolInformations.contains(inf)) { // this item has the same child node @@ -258,7 +258,7 @@ void ParserTreeItem::convertTo(QStandardItem *item, bool recursive) const d->symbolInformations.constBegin(); QHash<SymbolInformation, ParserTreeItem::Ptr>::const_iterator endHash = d->symbolInformations.constEnd(); - while(curHash != endHash) { + while (curHash != endHash) { map.insert(curHash.key(), curHash.value()); ++curHash; } @@ -266,7 +266,7 @@ void ParserTreeItem::convertTo(QStandardItem *item, bool recursive) const // add to item QMap<SymbolInformation, ParserTreeItem::Ptr>::const_iterator cur = map.constBegin(); QMap<SymbolInformation, ParserTreeItem::Ptr>::const_iterator end = map.constEnd(); - while(cur != end) { + while (cur != end) { const SymbolInformation &inf = cur.key(); ParserTreeItem::Ptr ptr = cur.value(); @@ -310,7 +310,7 @@ bool ParserTreeItem::canFetchMore(QStandardItem *item) const d->symbolInformations.constBegin(); QHash<SymbolInformation, ParserTreeItem::Ptr>::const_iterator endHash = d->symbolInformations.constEnd(); - while(curHash != endHash) { + while (curHash != endHash) { const ParserTreeItem::Ptr &child = curHash.value(); if (!child.isNull()) { internalChildren += child->childCount(); @@ -321,7 +321,7 @@ bool ParserTreeItem::canFetchMore(QStandardItem *item) const ++curHash; } - if(storedChildren < internalChildren) + if (storedChildren < internalChildren) return true; return false; @@ -359,7 +359,7 @@ void ParserTreeItem::debugDump(int ident) const d->symbolInformations.constBegin(); QHash<SymbolInformation, ParserTreeItem::Ptr>::const_iterator endHash = d->symbolInformations.constEnd(); - while(curHash != endHash) { + while (curHash != endHash) { const SymbolInformation &inf = curHash.key(); qDebug() << QString(2*ident, QLatin1Char(' ')) << inf.iconType() << inf.name() << inf.type() << curHash.value().isNull(); diff --git a/src/plugins/classview/classviewutils.cpp b/src/plugins/classview/classviewutils.cpp index 60063bc5b33..6ccd6807a94 100644 --- a/src/plugins/classview/classviewutils.cpp +++ b/src/plugins/classview/classviewutils.cpp @@ -72,7 +72,7 @@ Utils::Utils() QList<QVariant> Utils::locationsToRole(const QSet<SymbolLocation> &locations) { QList<QVariant> locationsVar; - foreach(const SymbolLocation &loc, locations) + foreach (const SymbolLocation &loc, locations) locationsVar.append(QVariant::fromValue(loc)); return locationsVar; @@ -81,7 +81,7 @@ QList<QVariant> Utils::locationsToRole(const QSet<SymbolLocation> &locations) QSet<SymbolLocation> Utils::roleToLocations(const QList<QVariant> &locationsVar) { QSet<SymbolLocation> locations; - foreach(const QVariant &loc, locationsVar) { + foreach (const QVariant &loc, locationsVar) { if (loc.canConvert<SymbolLocation>()) { locations.insert(loc.value<SymbolLocation>()); } diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index 67422da8ea3..a5dec9f2c54 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -653,7 +653,7 @@ bool BaseFileWizard::postGenerateFiles(const QWizard *, const GeneratedFiles &l, bool BaseFileWizard::postGenerateOpenEditors(const GeneratedFiles &l, QString *errorMessage) { - foreach(const Core::GeneratedFile &file, l) { + foreach (const Core::GeneratedFile &file, l) { if (file.attributes() & Core::GeneratedFile::OpenEditorAttribute) { if (!Core::EditorManager::openEditor(file.path(), file.editorId(), Core::EditorManager::ModeSwitch )) { if (errorMessage) diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp index 318805bec2c..89d85c8ce0e 100644 --- a/src/plugins/coreplugin/designmode.cpp +++ b/src/plugins/coreplugin/designmode.cpp @@ -167,7 +167,7 @@ bool DesignMode::designModeIsRequired() const QStringList DesignMode::registeredMimeTypes() const { QStringList rc; - foreach(const DesignEditorInfo *i, d->m_editors) + foreach (const DesignEditorInfo *i, d->m_editors) rc += i->mimeTypes; return rc; } @@ -195,7 +195,7 @@ void DesignMode::registerDesignWidget(QWidget *widget, void DesignMode::unregisterDesignWidget(QWidget *widget) { d->m_stackWidget->removeWidget(widget); - foreach(DesignEditorInfo *info, d->m_editors) { + foreach (DesignEditorInfo *info, d->m_editors) { if (info->widget == widget) { d->m_editors.removeAll(info); break; diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index d7dec6ee203..8549416ce44 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -311,7 +311,7 @@ Core::IWizard *NewDialog::showDialog() QModelIndex idx; if (!lastCategory.isEmpty()) - foreach(QStandardItem* item, m_categoryItems) { + foreach (QStandardItem* item, m_categoryItems) { if (item->data(Qt::UserRole) == lastCategory) { idx = m_twoLevelProxyModel->mapToSource(m_model->indexFromItem(item)); } diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index afa16144146..98bc1c6fae9 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -833,7 +833,7 @@ bool EditorManager::closeEditors(const QList<IEditor*> &editorsToClose, bool ask // add duplicates QList<IEditor *> duplicates; - foreach(IEditor *editor, acceptedEditors) + foreach (IEditor *editor, acceptedEditors) duplicates += d->m_editorModel->duplicatesFor(editor); acceptedEditors += duplicates; @@ -915,7 +915,7 @@ void EditorManager::closeDuplicate(Core::IEditor *editor) emit editorAboutToClose(editor); - if(d->m_splitter->findView(editor)) { + if (d->m_splitter->findView(editor)) { EditorView *view = d->m_splitter->findView(editor)->view(); removeEditor(editor); view->removeEditor(editor); @@ -1107,7 +1107,7 @@ template <class EditorFactoryLike> EditorFactoryLike *findById(const Core::Id &id) { const QList<EditorFactoryLike *> factories = ExtensionSystem::PluginManager::getObjects<EditorFactoryLike>(); - foreach(EditorFactoryLike *efl, factories) + foreach (EditorFactoryLike *efl, factories) if (id == efl->id()) return efl; return 0; diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index eb4cdcdba18..be72af3dd8d 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -305,7 +305,7 @@ void EditorView::updateEditorHistory(IEditor *editor) location.id = editor->id(); location.state = QVariant(state); - for(int i = 0; i < m_editorHistory.size(); ++i) { + for (int i = 0; i < m_editorHistory.size(); ++i) { if (m_editorHistory.at(i).document == 0 || m_editorHistory.at(i).document == document ){ @@ -668,7 +668,7 @@ void SplitterOrView::split(Qt::Orientation orientation) SplitterOrView *otherView = 0; if (e) { - foreach(IEditor *editor, m_view->editors()) + foreach (IEditor *editor, m_view->editors()) m_view->removeEditor(editor); m_splitter->addWidget((view = new SplitterOrView(e))); diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp index 2b4a39c1b40..90a0319a9eb 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp @@ -250,7 +250,7 @@ bool OpenEditorsModel::isDuplicate(IEditor *editor) const IEditor *OpenEditorsModel::originalForDuplicate(IEditor *duplicate) const { IDocument *document = duplicate->document(); - foreach(const Entry &e, d->m_editors) + foreach (const Entry &e, d->m_editors) if (e.editor && e.editor->document() == document) return e.editor; return 0; @@ -260,7 +260,7 @@ QList<IEditor *> OpenEditorsModel::duplicatesFor(IEditor *editor) const { QList<IEditor *> result; IDocument *document = editor->document(); - foreach(IEditor *e, d->m_duplicateEditors) + foreach (IEditor *e, d->m_duplicateEditors) if (e->document() == document) result += e; return result; diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp index 6e37123abfe..55d27244e72 100644 --- a/src/plugins/coreplugin/fancyactionbar.cpp +++ b/src/plugins/coreplugin/fancyactionbar.cpp @@ -70,7 +70,7 @@ void FancyToolButton::forceVisible(bool visible) bool FancyToolButton::event(QEvent *e) { - switch(e->type()) { + switch (e->type()) { case QEvent::Enter: { QPropertyAnimation *animation = new QPropertyAnimation(this, "fader"); diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index bfa59d11b20..9b95681c0f9 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -113,7 +113,7 @@ void OutputPanePlaceHolder::maximizeOrMinimize(bool maximize) if (maximize) { d->m_lastNonMaxSize = sizes[idx]; int sum = 0; - foreach(int s, sizes) + foreach (int s, sizes) sum += s; for (int i = 0; i < sizes.count(); ++i) { sizes[i] = 32; diff --git a/src/plugins/coreplugin/progressmanager/progressbar.cpp b/src/plugins/coreplugin/progressmanager/progressbar.cpp index b13db3b8752..20a1a6abbf6 100644 --- a/src/plugins/coreplugin/progressmanager/progressbar.cpp +++ b/src/plugins/coreplugin/progressmanager/progressbar.cpp @@ -57,7 +57,7 @@ ProgressBar::~ProgressBar() bool ProgressBar::event(QEvent *e) { - switch(e->type()) { + switch (e->type()) { case QEvent::Enter: { QPropertyAnimation *animation = new QPropertyAnimation(this, "cancelButtonFader"); diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index 8b6d7c0689f..8b6cd645795 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -118,7 +118,7 @@ SideBar::~SideBar() QString SideBar::idForTitle(const QString &title) const { QMapIterator<QString, QPointer<SideBarItem> > iter(d->m_itemMap); - while(iter.hasNext()) { + while (iter.hasNext()) { iter.next(); if (iter.value().data()->title() == title) return iter.key(); @@ -173,7 +173,7 @@ void SideBar::makeItemAvailable(SideBarItem *item) void SideBar::setUnavailableItemIds(const QStringList &itemIds) { // re-enable previous items - foreach(const QString &id, d->m_unavailableItemIds) { + foreach (const QString &id, d->m_unavailableItemIds) { d->m_availableItemIds.append(id); d->m_availableItemTitles.append(d->m_itemMap.value(id).data()->title()); } diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp index edb60f51215..95e41c31dcc 100644 --- a/src/plugins/coreplugin/sidebarwidget.cpp +++ b/src/plugins/coreplugin/sidebarwidget.cpp @@ -94,7 +94,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id) qSort(titleList); QString t = id; if (titleList.count()) { - foreach(const QString &itemTitle, titleList) + foreach (const QString &itemTitle, titleList) m_comboBox->addItem(itemTitle, m_sideBar->idForTitle(itemTitle)); m_comboBox->setCurrentIndex(0); @@ -160,7 +160,7 @@ void SideBarWidget::updateAvailableItems() titleList.append(currentTitle); qSort(titleList); - foreach(const QString &itemTitle, titleList) + foreach (const QString &itemTitle, titleList) m_comboBox->addItem(itemTitle, m_sideBar->idForTitle(itemTitle)); int idx = m_comboBox->findText(currentTitle); diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index 0418014f27d..00771837468 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -132,7 +132,7 @@ public: VcsInfo *newInfo = new VcsInfo(vc, topLevel); bool createdNewInfo(true); // Do we have a matching VcsInfo already? - foreach(VcsInfo *i, m_vcsInfoList) { + foreach (VcsInfo *i, m_vcsInfoList) { if (*i == *newInfo) { delete newInfo; newInfo = i; diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 72350319bcb..2594c52a9ac 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -142,7 +142,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe new FileShareProtocol }; const int count = sizeof(protos) / sizeof(Protocol *); - for(int i = 0; i < count; ++i) { + for (int i = 0; i < count; ++i) { connect(protos[i], SIGNAL(pasteDone(QString)), this, SLOT(finishPost(QString))); connect(protos[i], SIGNAL(fetchDone(QString,QString,bool)), this, SLOT(finishFetch(QString,QString,bool))); @@ -202,7 +202,7 @@ void CodepasterPlugin::extensionsInitialized() ExtensionSystem::IPlugin::ShutdownFlag CodepasterPlugin::aboutToShutdown() { // Delete temporary, fetched files - foreach(const QString &fetchedSnippet, m_fetchedSnippets) { + foreach (const QString &fetchedSnippet, m_fetchedSnippets) { QFile file(fetchedSnippet); if (file.exists()) file.remove(); diff --git a/src/plugins/cpaster/pastebindotcaprotocol.cpp b/src/plugins/cpaster/pastebindotcaprotocol.cpp index e036c0b39a6..b4ae5920ef9 100644 --- a/src/plugins/cpaster/pastebindotcaprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcaprotocol.cpp @@ -193,7 +193,7 @@ static inline QStringList parseLists(QIODevice *io) QXmlStreamReader reader(data); State state = OutsideRecentLink; while (!reader.atEnd()) { - switch(reader.readNext()) { + switch (reader.readNext()) { case QXmlStreamReader::StartElement: // Inside a <div> of an entry: Anchor or description if (state == InsideRecentLink && reader.name() == anchorElement) { // Anchor diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp index dade4e201b3..1d5d77b9372 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp @@ -324,7 +324,7 @@ static inline QStringList parseLists(QIODevice *io) QString age; while (!reader.atEnd()) { - switch(reader.readNext()) { + switch (reader.readNext()) { case QXmlStreamReader::StartElement: state = nextOpeningState(state, reader); switch (state) { diff --git a/src/plugins/cpaster/pasteselectdialog.cpp b/src/plugins/cpaster/pasteselectdialog.cpp index d6774d71b3a..aee715fd709 100644 --- a/src/plugins/cpaster/pasteselectdialog.cpp +++ b/src/plugins/cpaster/pasteselectdialog.cpp @@ -44,7 +44,7 @@ PasteSelectDialog::PasteSelectDialog(const QList<Protocol*> &protocols, m_protocols(protocols) { m_ui.setupUi(this); - foreach(const Protocol *protocol, protocols) { + foreach (const Protocol *protocol, protocols) { m_ui.protocolBox->addItem(protocol->name()); connect(protocol, SIGNAL(listDone(QString,QStringList)), this, SLOT(listDone(QString,QStringList))); diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp index e346e94caa4..160d35de87b 100644 --- a/src/plugins/cpaster/pasteview.cpp +++ b/src/plugins/cpaster/pasteview.cpp @@ -59,7 +59,7 @@ PasteView::PasteView(const QList<Protocol *> protocols, m_ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Paste")); connect(m_ui.uiPatchList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(contentChanged())); - foreach(const Protocol *p, protocols) + foreach (const Protocol *p, protocols) m_ui.protocolBox->addItem(p->name()); connect(m_ui.protocolBox, SIGNAL(currentIndexChanged(int)), this, SLOT(protocolChanged(int))); diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp index ebc3d2b63d6..64f56d7c3bc 100644 --- a/src/plugins/cppeditor/cppclasswizard.cpp +++ b/src/plugins/cppeditor/cppclasswizard.cpp @@ -237,7 +237,7 @@ bool CppClassWizard::generateHeaderAndSource(const CppClassWizardParameters &par // class in case the user did not specify one. QString parentQObjectClass; bool defineQObjectMacro = false; - switch(params.classType) { + switch (params.classType) { case Utils::NewClassWidget::ClassInheritsQObject: parentQObjectClass = QLatin1String("QObject"); defineQObjectMacro = true; diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index ce00db2fb28..7b482882861 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -1240,7 +1240,7 @@ public: ClassOrNamespace *b = interface->context().lookupType(function); if (b) { // Do we have a tr method? - foreach(const LookupItem &r, b->find(trName)) { + foreach (const LookupItem &r, b->find(trName)) { Symbol *s = r.declaration(); if (s->type()->isFunctionType()) { // no context required for tr diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index a8d25753fb9..3e4eb5b8f29 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -477,7 +477,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block) case block_open: if (tryStatement()) break; - switch(kind) { + switch (kind) { case T_RBRACE: leave(true); break; } break; diff --git a/src/plugins/cvs/cvsutils.cpp b/src/plugins/cvs/cvsutils.cpp index f94da0dddf7..4f660fa0b69 100644 --- a/src/plugins/cvs/cvsutils.cpp +++ b/src/plugins/cvs/cvsutils.cpp @@ -50,7 +50,7 @@ QDebug operator<<(QDebug d, const CvsLogEntry &e) { QDebug nospace = d.nospace(); nospace << "File: " << e.file << e.revisions.size() << '\n'; - foreach(const CvsRevision &r, e.revisions) + foreach (const CvsRevision &r, e.revisions) nospace << " " << r.revision << ' ' << r.date << ' ' << r.commitId << '\n'; return d; } @@ -93,7 +93,7 @@ QList<CvsLogEntry> parseLogEntries(const QString &o, // Parse using a state enumeration and regular expressions as not to fall for weird // commit messages in state 'RevisionState' - foreach(const QString &line, lines) { + foreach (const QString &line, lines) { switch (state) { case FileState: if (line.startsWith(workingFilePrefix)) { diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp index 62a0476704d..7b4ad4cff31 100644 --- a/src/plugins/debugger/breakwindow.cpp +++ b/src/plugins/debugger/breakwindow.cpp @@ -523,7 +523,7 @@ void BreakpointDialog::typeChanged(int) const BreakpointType newType = type(); m_previousType = newType; // Save current state. - switch(previousType) { + switch (previousType) { case UnknownType: break; case BreakpointByFileAndLine: diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index e1d41052c6e..6b6c3b6f536 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -1472,7 +1472,7 @@ void CdbEngine::updateLocals(bool forNewStackFrame) if (!expanded.isEmpty()) { str << blankSeparator << "-e "; int i = 0; - foreach(const QByteArray &e, expanded) { + foreach (const QByteArray &e, expanded) { if (i++) str << ','; str << e; @@ -1488,7 +1488,7 @@ void CdbEngine::updateLocals(bool forNewStackFrame) if (!uninitializedVariables.isEmpty()) { str << blankSeparator << "-u \""; int i = 0; - foreach(const QString &u, uninitializedVariables) { + foreach (const QString &u, uninitializedVariables) { if (i++) str << ','; str << localsPrefixC << u; @@ -2135,7 +2135,7 @@ void CdbEngine::handleSessionIdle(const QByteArray &messageBA) m_specialStopMode = NoSpecialStop; - switch(specialStopMode) { + switch (specialStopMode) { case SpecialStopSynchronizeBreakpoints: if (debug) qDebug("attemptBreakpointSynchronization in special stop"); @@ -2259,7 +2259,7 @@ void CdbEngine::handleSessionAccessible(unsigned long cdbExState) qDebug("CdbEngine::handleSessionAccessible %dms in state '%s'/'%s', special mode %d", elapsedLogTime(), cdbStatusName(cdbExState), stateName(state()), m_specialStopMode); - switch(s) { + switch (s) { case EngineShutdownRequested: shutdownEngine(); break; @@ -2563,7 +2563,7 @@ static QByteArray multiBreakpointCommand(const char *cmdC, const Breakpoints &bp { QByteArray cmd(cmdC); ByteArrayInputStream str(cmd); - foreach(const BreakpointData *bp, bps) + foreach (const BreakpointData *bp, bps) str << ' ' << bp->bpNumber; return cmd; } diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 371c7f4d492..be967a921c6 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -159,7 +159,7 @@ //# define STATE_DEBUG(s) // do { QString msg; QTextStream ts(&msg); ts << s; // showMessage(msg, LogDebug); } while (0) -# define STATE_DEBUG(s) do { qDebug() << s; } while(0) +# define STATE_DEBUG(s) do { qDebug() << s; } while (0) #else # define STATE_DEBUG(s) #endif diff --git a/src/plugins/debugger/lldb/ipcenginehost.cpp b/src/plugins/debugger/lldb/ipcenginehost.cpp index 84ac83e0cc7..4357ab0f042 100644 --- a/src/plugins/debugger/lldb/ipcenginehost.cpp +++ b/src/plugins/debugger/lldb/ipcenginehost.cpp @@ -430,7 +430,7 @@ void IPCEngineHost::rpcCallback(quint64 f, QByteArray payload) gotoLocation(Location(sh->currentFrame(), true)); else if (!m_sourceAgents.contains(sh->currentFrame().file)) fetchFrameSource(token); - foreach(SourceAgent *agent, m_sourceAgents.values()) + foreach (SourceAgent *agent, m_sourceAgents.values()) agent->updateLocationMarker(); } break; diff --git a/src/plugins/debugger/lldb/lldbenginehost.cpp b/src/plugins/debugger/lldb/lldbenginehost.cpp index 00a83d82df8..3786cce6dcb 100644 --- a/src/plugins/debugger/lldb/lldbenginehost.cpp +++ b/src/plugins/debugger/lldb/lldbenginehost.cpp @@ -160,7 +160,7 @@ LldbEngineHost::LldbEngineHost(const DebuggerStartParameters &startParameters) QString a = Core::ICore::resourcePath() + QLatin1String("/qtcreator-lldb"); - if(getenv("QTC_LLDB_GUEST") != 0) + if (getenv("QTC_LLDB_GUEST") != 0) a = QString::fromLocal8Bit(getenv("QTC_LLDB_GUEST")); showStatusMessage(QString(QLatin1String("starting %1")).arg(a)); diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index 5ea054604d0..d7d804314f9 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -705,7 +705,7 @@ static inline QString msgDebugInsert(const WatchData &d0, const QList<WatchData> QString rc; QTextStream str(&rc); str << "INSERTING " << d0.toString() << '\n'; - foreach(const WatchData &c, children) + foreach (const WatchData &c, children) str << " " << c.toString() << '\n'; return rc; } diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp index 446dbc298b0..42778eb8742 100644 --- a/src/plugins/debugger/shared/peutils.cpp +++ b/src/plugins/debugger/shared/peutils.cpp @@ -261,7 +261,7 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString * if (debugSectionCount) collectPDBfiles(fileMemory, debugDir, debugSectionCount, rc); success = true; - } while(false); + } while (false); if (fileMemory) UnmapViewOfFile(fileMemory); diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp index ee88031c426..ceb4497d893 100644 --- a/src/plugins/designer/formeditorstack.cpp +++ b/src/plugins/designer/formeditorstack.cpp @@ -95,7 +95,7 @@ void FormEditorStack::add(const EditorData &data) int FormEditorStack::indexOfFormWindow(const QDesignerFormWindowInterface *fw) const { const int count = m_formEditors.size(); - for(int i = 0; i < count; ++i) + for (int i = 0; i < count; ++i) if (m_formEditors[i].widgetHost->formWindow() == fw) return i; return -1; @@ -104,7 +104,7 @@ int FormEditorStack::indexOfFormWindow(const QDesignerFormWindowInterface *fw) c int FormEditorStack::indexOfFormEditor(const QObject *xmlEditor) const { const int count = m_formEditors.size(); - for(int i = 0; i < count; ++i) + for (int i = 0; i < count; ++i) if (m_formEditors[i].formWindowEditor == xmlEditor) return i; return -1; @@ -158,7 +158,7 @@ void FormEditorStack::updateFormWindowSelectionHandles() if (Designer::Constants::Internal::debug) qDebug() << "updateFormWindowSelectionHandles"; QDesignerFormWindowInterface *activeFormWindow = m_designerCore->formWindowManager()->activeFormWindow(); - foreach(const EditorData &fdm, m_formEditors) { + foreach (const EditorData &fdm, m_formEditors) { const bool active = activeFormWindow == fdm.widgetHost->formWindow(); fdm.widgetHost->updateFormWindowSelectionHandles(active); } @@ -189,7 +189,7 @@ void FormEditorStack::modeAboutToChange(Core::IMode *m) // Sync the editor when entering edit mode if (m && m->id() == Core::Constants::MODE_EDIT) - foreach(const EditorData &data, m_formEditors) + foreach (const EditorData &data, m_formEditors) data.formWindowEditor->syncXmlEditor(); } diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index bf578715b54..17753e7b2e7 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -803,7 +803,7 @@ void FormEditorW::toolChanged(int t) void FormEditorW::closeFormEditorsForXmlEditors(QList<Core::IEditor*> editors) { - foreach(Core::IEditor *editor, editors) { + foreach (Core::IEditor *editor, editors) { m_editorWidget->removeFormWindowEditor(editor); } } diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index 62e52d29237..1a3f4649b5e 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -223,7 +223,7 @@ void GenericMakeStep::setBuildTarget(const QString &target, bool on) QStringList old = m_buildTargets; if (on && !old.contains(target)) old << target; - else if(!on && old.contains(target)) + else if (!on && old.contains(target)) old.removeOne(target); m_buildTargets = old; diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 4bdca7a1251..3cfee66deb8 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1358,7 +1358,7 @@ bool GitClient::cleanList(const QString &workingDirectory, const QString &flag, } // Filter files that git would remove const QString prefix = QLatin1String("Would remove "); - foreach(const QString &line, commandOutputLinesFromLocal8Bit(outputText)) + foreach (const QString &line, commandOutputLinesFromLocal8Bit(outputText)) if (line.startsWith(prefix)) files->push_back(line.mid(prefix.size())); return true; @@ -1605,7 +1605,7 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR QString headSha; if (resp.result == Utils::SynchronousProcessResponse::Finished) { // split "82bfad2f51d34e98b18982211c82220b8db049b<tab>refs/heads/master" - foreach(const QString &line, resp.stdOut.split(QLatin1Char('\n'))) { + foreach (const QString &line, resp.stdOut.split(QLatin1Char('\n'))) { if (line.endsWith(QLatin1String("\tHEAD"))) { QTC_CHECK(headSha.isNull()); headSha = line.left(line.indexOf(QLatin1Char('\t'))); @@ -2252,7 +2252,7 @@ bool GitClient::synchronousStashList(const QString &workingDirectory, return false; } Stash stash; - foreach(const QString &line, commandOutputLinesFromLocal8Bit(outputText)) + foreach (const QString &line, commandOutputLinesFromLocal8Bit(outputText)) if (stash.parseStashLine(line)) stashes->push_back(stash); return true; diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp index 18b5afbf240..a89ca8b6575 100644 --- a/src/plugins/git/gitorious/gitorious.cpp +++ b/src/plugins/git/gitorious/gitorious.cpp @@ -121,7 +121,7 @@ QDebug operator<<(QDebug d, const GitoriousProject &p) { QDebug nospace = d.nospace(); nospace << " project=" << p.name << " description=" << p.description << '\n'; - foreach(const GitoriousRepository &r, p.repositories) + foreach (const GitoriousRepository &r, p.repositories) nospace << " " << r << '\n'; return d; } @@ -136,9 +136,9 @@ QDebug operator<<(QDebug d, const GitoriousHost &h) { QDebug nospace = d.nospace(); nospace << " Host=" << h.hostName << " description=" << h.description << '\n'; - foreach(const QSharedPointer<GitoriousCategory> &c, h.categories) + foreach (const QSharedPointer<GitoriousCategory> &c, h.categories) nospace << *c; - foreach(const QSharedPointer<GitoriousProject> &p, h.projects) + foreach (const QSharedPointer<GitoriousProject> &p, h.projects) nospace << *p; return d; } @@ -568,7 +568,7 @@ void Gitorious::saveSettings(const QString &group, QSettings *s) { const QChar separator = QLatin1Char('|'); QStringList hosts; - foreach(const GitoriousHost &h, m_hosts) { + foreach (const GitoriousHost &h, m_hosts) { QString entry = h.hostName; if (!h.description.isEmpty()) { entry += separator; diff --git a/src/plugins/git/gitorious/gitorioushostwidget.cpp b/src/plugins/git/gitorious/gitorioushostwidget.cpp index 3ac06d51bc3..2042afc449a 100644 --- a/src/plugins/git/gitorious/gitorioushostwidget.cpp +++ b/src/plugins/git/gitorious/gitorioushostwidget.cpp @@ -105,7 +105,7 @@ GitoriousHostWidget::GitoriousHostWidget(QWidget *parent) : m_model->setHorizontalHeaderLabels(headers); Gitorious &gitorious = Gitorious::instance(); - foreach( const GitoriousHost &gh, gitorious.hosts()) + foreach (const GitoriousHost &gh, gitorious.hosts()) m_model->appendRow(hostEntry(gh)); appendNewDummyEntry(); connect(m_model, SIGNAL(itemChanged(QStandardItem*)), this, SLOT(slotItemEdited(QStandardItem*))); diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp index d91ac108928..992c594e82d 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp +++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp @@ -125,7 +125,7 @@ GitoriousProjectWidget *GitoriousProjectWizardPage::currentProjectWidget() const int GitoriousProjectWizardPage::stackIndexOf(const QString &hostName) const { const int count = m_stackedWidget->count(); - for(int i = 0; i < count; i++) + for (int i = 0; i < count; i++) if (projectWidgetAt(i)->hostName() == hostName) return i; return -1; diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp index f3f3c1791ff..85726adb473 100644 --- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp +++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp @@ -163,7 +163,7 @@ void GitoriousRepositoryWizardPage::initializePage() qStableSort(repositories.begin(), repositories.end(), gitRepoLessThanByType); const QString types[GitoriousRepository::PersonalRepository + 1] = { tr("Mainline Repositories"), tr("Clones"), tr("Baseline Repositories"), tr("Shared Project Repositories"), tr("Personal Repositories") }; - foreach(const GitoriousRepository &r, repositories) { + foreach (const GitoriousRepository &r, repositories) { // New Header? if (r.type != lastRepoType || !header) { lastRepoType = r.type; diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index 4e1b8a7eb06..873548e9753 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -188,7 +188,7 @@ QStringList GitVersionControl::vcsSnapshots(const QString &topLevel) return QStringList(); // Return the git stash 'message' as identifier, ignoring empty ones QStringList rc; - foreach(const Stash &s, stashes) + foreach (const Stash &s, stashes) if (!s.message.isEmpty()) rc.push_back(s.message); return rc; diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index 74bf2589479..d3a018ba431 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -95,7 +95,7 @@ void StashModel::setStashes(const QList<Stash> &stashes) m_stashes = stashes; if (const int rows = rowCount()) removeRows(0, rows); - foreach(const Stash &s, stashes) + foreach (const Stash &s, stashes) appendRow(stashModelRowItems(s)); } @@ -185,7 +185,7 @@ void StashDialog::refresh(const QString &repository, bool force) gitClient()->synchronousStashList(m_repository, &stashes); m_model->setStashes(stashes); if (!stashes.isEmpty()) { - for(int c = 0; c < ColumnCount; c++) + for (int c = 0; c < ColumnCount; c++) ui->stashView->resizeColumnToContents(c); } } @@ -379,7 +379,7 @@ int StashDialog::currentRow() const QList<int> StashDialog::selectedRows() const { QList<int> rc; - foreach(const QModelIndex &proxyIndex, ui->stashView->selectionModel()->selectedRows()) { + foreach (const QModelIndex &proxyIndex, ui->stashView->selectionModel()->selectedRows()) { const QModelIndex index = m_proxyModel->mapToSource(proxyIndex); if (index.isValid()) rc.push_back(index.row()); diff --git a/src/plugins/help/helpviewer_p.h b/src/plugins/help/helpviewer_p.h index 10e3a19a5e0..5e6937da883 100644 --- a/src/plugins/help/helpviewer_p.h +++ b/src/plugins/help/helpviewer_p.h @@ -69,7 +69,7 @@ public: void openLink(bool newPage) { - if(lastAnchor.isEmpty()) + if (lastAnchor.isEmpty()) return; if (newPage) OpenPagesManager::instance().createPage(lastAnchor); diff --git a/src/plugins/imageviewer/imagevieweractionhandler.cpp b/src/plugins/imageviewer/imagevieweractionhandler.cpp index fea931b58ca..e0e50f0ca7a 100644 --- a/src/plugins/imageviewer/imagevieweractionhandler.cpp +++ b/src/plugins/imageviewer/imagevieweractionhandler.cpp @@ -69,7 +69,7 @@ void ImageViewerActionHandler::actionTriggered(int supportedAction) return; SupportedActions action = static_cast<SupportedActions>(supportedAction); - switch(action) { + switch (action) { case ZoomIn: viewer->zoomIn(); break; diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 1f07a2eb90a..3335130d7d0 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -561,7 +561,7 @@ void PerforcePlugin::updateCheckout(const QString &workingDir, const QStringList perforceVersionControl()->emitRepositoryChanged(workingDir); } else { const QChar slash = QLatin1Char('/'); - foreach(const QString &dir, dirs) + foreach (const QString &dir, dirs) perforceVersionControl()->emitRepositoryChanged(workingDir + slash + dir); } } @@ -864,7 +864,7 @@ bool PerforcePlugin::managesDirectoryFstat(const QString &directory) RunFullySynchronous); managed = result.stdOut.contains(QLatin1String("depotFile")) || result.stdErr.contains(QLatin1String("... - no such file(s)")); - } while(false); + } while (false); m_managedDirectoryCache.insert(directory, managed); return managed; diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index c8d59f56097..11bf9232c8d 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -389,7 +389,7 @@ void AbstractProcessStep::taskAdded(const ProjectExplorer::Task &task) filePath.remove(0, 3); int count = 0; QString possibleFilePath; - foreach(const QFileInfo &fi, possibleFiles) { + foreach (const QFileInfo &fi, possibleFiles) { if (fi.filePath().endsWith(filePath)) { possibleFilePath = fi.filePath(); ++count; diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 8ada8659143..79af396f4f2 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -530,7 +530,7 @@ bool BuildManager::buildList(BuildStepList *bsl, const QString &stepListName) bool BuildManager::buildLists(QList<BuildStepList *> bsls, const QStringList &stepListNames, const QStringList &preambelMessage) { QList<BuildStep *> steps; - foreach(BuildStepList *list, bsls) + foreach (BuildStepList *list, bsls) steps.append(list->steps()); QStringList names; diff --git a/src/plugins/projectexplorer/buildsteplist.cpp b/src/plugins/projectexplorer/buildsteplist.cpp index 97ebdd8035d..c1b4a2ee13a 100644 --- a/src/plugins/projectexplorer/buildsteplist.cpp +++ b/src/plugins/projectexplorer/buildsteplist.cpp @@ -45,7 +45,7 @@ namespace { IBuildStepFactory *findCloneFactory(BuildStepList *parent, BuildStep *source) { QList<IBuildStepFactory *> factories = ExtensionSystem::PluginManager::getObjects<IBuildStepFactory>(); - foreach(IBuildStepFactory *factory, factories) + foreach (IBuildStepFactory *factory, factories) if (factory->canClone(parent, source)) return factory; return 0; @@ -54,7 +54,7 @@ IBuildStepFactory *findCloneFactory(BuildStepList *parent, BuildStep *source) IBuildStepFactory *findRestoreFactory(BuildStepList *parent, const QVariantMap &map) { QList<IBuildStepFactory *> factories = ExtensionSystem::PluginManager::getObjects<IBuildStepFactory>(); - foreach(IBuildStepFactory *factory, factories) + foreach (IBuildStepFactory *factory, factories) if (factory->canRestore(parent, map)) return factory; return 0; diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index e38806cb80c..0b94c7a8486 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -144,7 +144,7 @@ void CustomWizard::initWizardDialog(Utils::Wizard *wizard, const QString &defaul addWizardPage(wizard, customPage, parameters()->firstPageId); if (!parameters()->fieldPageTitle.isEmpty()) customPage->setTitle(parameters()->fieldPageTitle); - foreach(QWizardPage *ep, extensionPages) + foreach (QWizardPage *ep, extensionPages) BaseFileWizard::applyExtensionPageShortTitle(wizard, wizard->addPage(ep)); Core::BaseFileWizard::setupWizard(wizard); if (CustomWizardPrivate::verbose) @@ -314,7 +314,7 @@ Core::GeneratedFiles CustomWizard::generateWizardFiles(QString *errorMessage) co return rc; } // Add the template files specified by the <file> elements. - foreach(const Internal::CustomWizardFile &file, d->m_parameters->files) + foreach (const Internal::CustomWizardFile &file, d->m_parameters->files) if (!createFile(file, d->m_parameters->directory, ctx->targetPath, context()->replacements, &rc, errorMessage)) return Core::GeneratedFiles(); return rc; @@ -449,7 +449,7 @@ QList<CustomWizard*> CustomWizard::createWizards() const QString configFile = QLatin1String(configFileC); // Check and parse config file in each directory. - foreach(const QFileInfo &dirFi, dirs) { + foreach (const QFileInfo &dirFi, dirs) { const QDir dir(dirFi.absoluteFilePath()); if (CustomWizardPrivate::verbose) verboseLog += QString::fromLatin1("CustomWizard: Scanning %1\n").arg(dirFi.absoluteFilePath()); @@ -548,7 +548,7 @@ void CustomProjectWizard::initProjectWizardDialog(BaseProjectWizardDialog *w, if (!pa->fieldPageTitle.isEmpty()) cp->setTitle(pa->fieldPageTitle); } - foreach(QWizardPage *ep, extensionPages) + foreach (QWizardPage *ep, extensionPages) BaseFileWizard::applyExtensionPageShortTitle(w, w->addPage(ep)); w->setPath(defaultPath); w->setProjectName(BaseProjectWizardDialog::uniqueProjectName(defaultPath)); @@ -584,7 +584,7 @@ Core::GeneratedFiles CustomProjectWizard::generateFiles(const QWizard *w, QStrin bool CustomProjectWizard::postGenerateOpen(const Core::GeneratedFiles &l, QString *errorMessage) { // Post-Generate: Open the project and the editors as desired - foreach(const Core::GeneratedFile &file, l) { + foreach (const Core::GeneratedFile &file, l) { if (file.attributes() & Core::GeneratedFile::OpenProjectAttribute) { if (!ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(file.path(), errorMessage)) { return false; diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp index c0624032ea6..c954eab7c7d 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpage.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardpage.cpp @@ -181,7 +181,7 @@ CustomWizardFieldPage::CustomWizardFieldPage(const QSharedPointer<CustomWizardCo m_formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); if (debug) qDebug() << Q_FUNC_INFO << parameters->fields.size(); - foreach(const CustomWizardField &f, parameters->fields) + foreach (const CustomWizardField &f, parameters->fields) addField(f); vLayout->addLayout(m_formLayout); m_errorLabel->setVisible(false); @@ -362,7 +362,7 @@ void CustomWizardFieldPage::initializePage() { QWizardPage::initializePage(); clearError(); - foreach(const LineEditData &led, m_lineEdits) { + foreach (const LineEditData &led, m_lineEdits) { if (!led.userChange.isNull()) { led.lineEdit->setText(led.userChange); } else if (!led.defaultText.isEmpty()) { @@ -371,7 +371,7 @@ void CustomWizardFieldPage::initializePage() led.lineEdit->setText(defaultText); } } - foreach(const TextEditData &ted, m_textEdits) { + foreach (const TextEditData &ted, m_textEdits) { if (!ted.userChange.isNull()) { ted.textEdit->setText(ted.userChange); } else if (!ted.defaultText.isEmpty()) { @@ -428,7 +428,7 @@ bool CustomWizardFieldPage::validatePage() { clearError(); // Check line edits with validators - foreach(const LineEditData &led, m_lineEdits) { + foreach (const LineEditData &led, m_lineEdits) { if (const QValidator *val = led.lineEdit->validator()) { int pos = 0; QString text = led.lineEdit->text(); @@ -456,7 +456,7 @@ QMap<QString, QString> CustomWizardFieldPage::replacementMap(const QWizard *w, const FieldList &f) { QMap<QString, QString> fieldReplacementMap = ctx->baseReplacements; - foreach(const Internal::CustomWizardField &field, f) { + foreach (const Internal::CustomWizardField &field, f) { const QString value = w->field(field.name).toString(); fieldReplacementMap.insert(field.name, value); } diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp index 951ccbbde68..377375b230c 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp @@ -175,7 +175,7 @@ bool CustomWizardValidationRule::validateRules(const QList<CustomWizardValidatio if (rules.isEmpty()) return true; QScriptEngine engine; - foreach(const CustomWizardValidationRule &rule, rules) + foreach (const CustomWizardValidationRule &rule, rules) if (!rule.validate(engine, replacementMap)) { *errorMessage = rule.message; CustomWizardContext::replaceFields(replacementMap, errorMessage); @@ -334,7 +334,7 @@ static bool parseCustomProjectElement(QXmlStreamReader &reader, static inline QMap<QString, QString> attributesToStringMap(const QXmlStreamAttributes &attributes) { QMap<QString, QString> rc; - foreach(const QXmlStreamAttribute &attribute, attributes) + foreach (const QXmlStreamAttribute &attribute, attributes) rc.insert(attribute.name().toString(), attribute.value().toString()); return rc; } @@ -748,12 +748,12 @@ QString CustomWizardParameters::toString() const str << "Directory: " << directory << " Klass: '" << klass << "'\n"; if (!filesGeneratorScriptArguments.isEmpty()) { str << "Script:"; - foreach(const QString &a, filesGeneratorScript) + foreach (const QString &a, filesGeneratorScript) str << " '" << a << '\''; if (!filesGeneratorScriptWorkingDirectory.isEmpty()) str << "\nrun in '" << filesGeneratorScriptWorkingDirectory << '\''; str << "\nArguments: "; - foreach(const GeneratorScriptArgument &a, filesGeneratorScriptArguments) { + foreach (const GeneratorScriptArgument &a, filesGeneratorScriptArguments) { str << " '" << a.value << '\''; if (a.flags & GeneratorScriptArgument::OmitEmpty) str << " [omit empty]"; @@ -763,7 +763,7 @@ QString CustomWizardParameters::toString() const } str << '\n'; } - foreach(const CustomWizardFile &f, files) { + foreach (const CustomWizardFile &f, files) { str << " File source: " << f.source << " Target: " << f.target; if (f.openEditor) str << " [editor]"; @@ -773,7 +773,7 @@ QString CustomWizardParameters::toString() const str << " [binary]"; str << '\n'; } - foreach(const CustomWizardField &f, fields) { + foreach (const CustomWizardField &f, fields) { str << " Field name: " << f.name; if (f.mandatory) str << '*'; @@ -787,7 +787,7 @@ QString CustomWizardParameters::toString() const } str << '\n'; } - foreach(const CustomWizardValidationRule &r, rules) + foreach (const CustomWizardValidationRule &r, rules) str << " Rule: '" << r.condition << "'->'" << r.message << '\n'; return rc; } diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp index 5aeaa6fac47..6b7234cb40f 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp @@ -202,7 +202,7 @@ Core::GeneratedFiles if (CustomWizard::verbose()) { QDebug nospace = qDebug().nospace(); nospace << script << " generated:\n"; - foreach(const Core::GeneratedFile &f, files) + foreach (const Core::GeneratedFile &f, files) nospace << ' ' << f.path() << f.attributes() << '\n'; } return files; diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index e4a5faadca9..a0dca991742 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -368,7 +368,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing() QStringList searchDirs = childParser->searchDirectories(); // add extra directories: - foreach(const QString &dir, extraSearchDirs) + foreach (const QString &dir, extraSearchDirs) childParser->addDirectory(dir); testbench.testParsing(input, inputChannel, diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp index cb697fffa7c..44374cc6854 100644 --- a/src/plugins/projectexplorer/outputparser_test.cpp +++ b/src/plugins/projectexplorer/outputparser_test.cpp @@ -84,7 +84,7 @@ void OutputParserTester::testParsing(const QString &lines, QCOMPARE(m_receivedStdOutChildLine, childStdOutLines); QCOMPARE(m_receivedTasks.size(), tasks.size()); if (m_receivedTasks.size() == tasks.size()) { - for(int i = 0; i < tasks.size(); ++i) { + for (int i = 0; i < tasks.size(); ++i) { QCOMPARE(m_receivedTasks.at(i).category, tasks.at(i).category); QCOMPARE(m_receivedTasks.at(i).description, tasks.at(i).description); QCOMPARE(m_receivedTasks.at(i).file, tasks.at(i).file); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index a26be61a5d1..b5978d0b7aa 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1125,7 +1125,7 @@ void ProjectExplorerPlugin::loadCustomWizards() static bool firstTime = true; if (firstTime) { firstTime = false; - foreach(Core::IWizard *cpw, ProjectExplorer::CustomWizard::createWizards()) + foreach (Core::IWizard *cpw, ProjectExplorer::CustomWizard::createWizards()) addAutoReleasedObject(cpw); } } @@ -2114,7 +2114,7 @@ void ProjectExplorerPlugin::runProjectContextMenu() bool ProjectExplorerPlugin::hasBuildSettings(Project *pro) { const QList<Project *> & projects = d->m_session->projectOrder(pro); - foreach(Project *project, projects) + foreach (Project *project, projects) if (project && project->activeTarget() && project->activeTarget()->activeBuildConfiguration()) @@ -2140,7 +2140,7 @@ QPair<bool, QString> ProjectExplorerPlugin::buildSettingsEnabled(Project *pro) result.second = tr("Project has no build settings."); } else { const QList<Project *> & projects = d->m_session->projectOrder(pro); - foreach(Project *project, projects) { + foreach (Project *project, projects) { if (project && project->activeTarget() && project->activeTarget()->activeBuildConfiguration() @@ -2170,7 +2170,7 @@ QPair<bool, QString> ProjectExplorerPlugin::buildSettingsEnabledForSession() result.second = tr("Project has no build settings"); } else { const QList<Project *> & projects = d->m_session->projectOrder(0); - foreach(Project *project, projects) { + foreach (Project *project, projects) { if (project && project->activeTarget() && project->activeTarget()->activeBuildConfiguration() @@ -2207,7 +2207,7 @@ bool ProjectExplorerPlugin::coreAboutToClose() bool ProjectExplorerPlugin::hasDeploySettings(Project *pro) { const QList<Project *> & projects = d->m_session->projectOrder(pro); - foreach(Project *project, projects) + foreach (Project *project, projects) if (project->activeTarget() && project->activeTarget()->activeDeployConfiguration() && !project->activeTarget()->activeDeployConfiguration()->stepList()->isEmpty()) @@ -2508,7 +2508,7 @@ void ProjectExplorerPlugin::addToRecentProjects(const QString &fileName, const Q QString prettyFileName(QDir::toNativeSeparators(fileName)); QList<QPair<QString, QString> >::iterator it; - for(it = d->m_recentProjects.begin(); it != d->m_recentProjects.end();) + for (it = d->m_recentProjects.begin(); it != d->m_recentProjects.end();) if ((*it).first == prettyFileName) it = d->m_recentProjects.erase(it); else @@ -2973,9 +2973,9 @@ QStringList ProjectExplorerPlugin::projectFilePatterns() { QStringList patterns; const Core::MimeDatabase *mdb = Core::ICore::mimeDatabase(); - foreach(const IProjectManager *pm, allProjectManagers()) + foreach (const IProjectManager *pm, allProjectManagers()) if (const Core::MimeType mt = mdb->findByType(pm->mimeType())) - foreach(const Core::MimeGlobPattern &gp, mt.globPatterns()) + foreach (const Core::MimeGlobPattern &gp, mt.globPatterns()) patterns += gp.regExp().pattern(); return patterns; } diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index 6900eac0f37..519d53554f8 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -410,7 +410,7 @@ static inline void getProjectChoicesAndToolTips(QStringList *projectChoicesParam ProjectNode::ProjectAction projectAction = context->wizard->kind() == Core::IWizard::ProjectWizard ? ProjectNode::AddSubProject : ProjectNode::AddNewFile; - foreach(ProjectNode *n, AllProjectNodesVisitor::allProjects(projectAction)) { + foreach (ProjectNode *n, AllProjectNodesVisitor::allProjects(projectAction)) { if (projectAction == ProjectNode::AddNewFile || (projectAction == ProjectNode::AddSubProject && (generatedProjectFilePath.isEmpty() ? true : n->canAddSubProject(generatedProjectFilePath)))) diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 38c6afe2618..3221a6434ea 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -836,7 +836,7 @@ void FlatModel::filesAboutToBeRemoved(FolderNode *folder, const QList<FileNode*> FolderNode *folderNode = visibleFolderNode(folder); QSet<Node *> blackList; - foreach(Node *node, staleFiles) + foreach (Node *node, staleFiles) blackList.insert(node); // Now get the new List for that folder diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index a67de32c74c..1f89dc2d106 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -208,7 +208,7 @@ void ProjectTreeWidget::recursiveSaveExpandData(const QModelIndex &index, QStrin void ProjectTreeWidget::foldersAboutToBeRemoved(FolderNode *, const QList<FolderNode*> &list) { Node *n = m_explorer->currentNode(); - while(n) { + while (n) { if (FolderNode *fn = qobject_cast<FolderNode *>(n)) { if (list.contains(fn)) { ProjectNode *pn = n->projectNode(); diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp index be5d40bb8dd..68a97b63d62 100644 --- a/src/plugins/projectexplorer/sessiondialog.cpp +++ b/src/plugins/projectexplorer/sessiondialog.cpp @@ -170,7 +170,7 @@ void SessionDialog::addItems(bool setDefaultSession) } void SessionDialog::markItems() { - for(int i = 0; i < m_ui.sessionList->count(); ++i) { + for (int i = 0; i < m_ui.sessionList->count(); ++i) { QListWidgetItem *item = m_ui.sessionList->item(i); QFont f = item->font(); QString session = item->data(Qt::DisplayRole).toString(); diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 9b292827556..73de0c8f7af 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -1628,7 +1628,7 @@ QVariantMap Version4Handler::update(Project *, const QVariantMap &map) const QVariantMap &originalBc = targetIt.value().toMap(); QVariantMap newBc; QMapIterator<QString, QVariant> bcIt(originalBc); - while(bcIt.hasNext()) { + while (bcIt.hasNext()) { bcIt.next(); const QString &bcKey = bcIt.key(); if (!bcKey.startsWith(QLatin1String("ProjectExplorer.BuildConfiguration.BuildStep."))) { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index 3b455062cc9..e0b9453bc2e 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -86,7 +86,7 @@ void FormEditorScene::setupScene() void FormEditorScene::resetScene() { - foreach(QGraphicsItem *item, m_manipulatorLayerItem->childItems()) + foreach (QGraphicsItem *item, m_manipulatorLayerItem->childItems()) removeItem(item); setSceneRect(-canvasWidth()/2., -canvasHeight()/2., canvasWidth(), canvasHeight()); @@ -340,7 +340,7 @@ LayerItem* FormEditorScene::formLayerItem() const bool FormEditorScene::event(QEvent * event) { - switch(event->type()) + switch (event->type()) { case QEvent::GraphicsSceneHoverEnter : hoverEnterEvent(static_cast<QGraphicsSceneHoverEvent *>(event)); @@ -414,7 +414,7 @@ void FormEditorScene::clearFormEditorItems() void FormEditorScene::highlightBoundingRect(FormEditorItem *highlighItem) { - foreach(FormEditorItem *item, allFormEditorItems()) { + foreach (FormEditorItem *item, allFormEditorItems()) { if (item == highlighItem) item->setHighlightBoundingRect(true); else diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 55d0a55cde2..8d6b1f3cba7 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -215,12 +215,12 @@ void FormEditorView::nodeAboutToBeRemoved(const ModelNode &removedNode) void FormEditorView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) { - foreach(const AbstractProperty &property, propertyList) { + foreach (const AbstractProperty &property, propertyList) { if (property.isNodeAbstractProperty()) { NodeAbstractProperty nodeAbstractProperty = property.toNodeAbstractProperty(); QList<FormEditorItem*> removedItemList; - foreach(const ModelNode &modelNode, nodeAbstractProperty.allSubNodes()) { + foreach (const ModelNode &modelNode, nodeAbstractProperty.allSubNodes()) { QmlItemNode qmlItemNode(modelNode); if (qmlItemNode.isValid() && m_scene->hasItemForQmlItemNode(qmlItemNode)) { @@ -405,7 +405,7 @@ void FormEditorView::changeToTransformTools() void FormEditorView::nodeSlidedToIndex(const NodeListProperty &listProperty, int /*newIndex*/, int /*oldIndex*/) { QList<ModelNode> newOrderModelNodeList = listProperty.toModelNodeList(); - foreach(const ModelNode &node, newOrderModelNodeList) { + foreach (const ModelNode &node, newOrderModelNodeList) { FormEditorItem *item = m_scene->itemForQmlItemNode(QmlItemNode(node)); if (item) { FormEditorItem *oldParentItem = item->parentItem(); diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp index 0e0897ffd8c..aec70f8d40d 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp @@ -194,7 +194,7 @@ QPointF MoveManipulator::findSnappingOffset(const QHash<FormEditorItem*, QRectF> QMap<double, double> horizontalOffsetMap; QHashIterator<FormEditorItem*, QRectF> hashIterator(boundingRectHash); - while(hashIterator.hasNext()) { + while (hashIterator.hasNext()) { hashIterator.next(); FormEditorItem *formEditorItem = hashIterator.key(); QRectF boundingRect = hashIterator.value(); @@ -241,7 +241,7 @@ QHash<FormEditorItem*, QRectF> MoveManipulator::tanslatedBoundingRects(const QHa QHash<FormEditorItem*, QRectF> translatedBoundingRectHash; QHashIterator<FormEditorItem*, QRectF> hashIterator(boundingRectHash); - while(hashIterator.hasNext()) { + while (hashIterator.hasNext()) { QPointF alignedOffset(offsetVector); hashIterator.next(); FormEditorItem *formEditorItem = hashIterator.key(); diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp index a7559ad793a..b34c0240c82 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp @@ -143,7 +143,7 @@ void MoveTool::hoverMoveEvent(const QList<QGraphicsItem*> &itemList, void MoveTool::keyPressEvent(QKeyEvent *event) { - switch(event->key()) { + switch (event->key()) { case Qt::Key_Shift: case Qt::Key_Alt: case Qt::Key_Control: @@ -168,7 +168,7 @@ void MoveTool::keyPressEvent(QKeyEvent *event) m_moveManipulator.beginRewriterTransaction(); } - switch(event->key()) { + switch (event->key()) { case Qt::Key_Left: m_moveManipulator.moveBy(-moveStep, 0.0); break; case Qt::Key_Right: m_moveManipulator.moveBy(moveStep, 0.0); break; case Qt::Key_Up: m_moveManipulator.moveBy(0.0, -moveStep); break; @@ -183,7 +183,7 @@ void MoveTool::keyPressEvent(QKeyEvent *event) void MoveTool::keyReleaseEvent(QKeyEvent *keyEvent) { - switch(keyEvent->key()) { + switch (keyEvent->key()) { case Qt::Key_Shift: case Qt::Key_Alt: case Qt::Key_Control: diff --git a/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp b/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp index 8ff6f232487..6da1b0c63c2 100644 --- a/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp +++ b/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp @@ -36,7 +36,7 @@ namespace QmlDesigner { double sum(const QList<double> & list) { double sum = 0.0; - for(QList<double>::const_iterator iterator = list.constBegin(); iterator != list.constEnd(); ++iterator) + for (QList<double>::const_iterator iterator = list.constBegin(); iterator != list.constEnd(); ++iterator) { sum += *iterator; } diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp index 809d36241da..a301556af92 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp @@ -142,7 +142,7 @@ void ResizeTool::mouseDoubleClickEvent(const QList<QGraphicsItem*> & /*itemList* void ResizeTool::keyPressEvent(QKeyEvent * event) { - switch(event->key()) { + switch (event->key()) { case Qt::Key_Shift: case Qt::Key_Alt: case Qt::Key_Control: @@ -156,7 +156,7 @@ void ResizeTool::keyPressEvent(QKeyEvent * event) if (event->modifiers().testFlag(Qt::ShiftModifier)) moveStep = 10.0; - switch(event->key()) { + switch (event->key()) { case Qt::Key_Left: m_resizeManipulator.moveBy(-moveStep, 0.0); break; case Qt::Key_Right: m_resizeManipulator.moveBy(moveStep, 0.0); break; case Qt::Key_Up: m_resizeManipulator.moveBy(0.0, -moveStep); break; @@ -167,7 +167,7 @@ void ResizeTool::keyPressEvent(QKeyEvent * event) void ResizeTool::keyReleaseEvent(QKeyEvent * keyEvent) { - switch(keyEvent->key()) { + switch (keyEvent->key()) { case Qt::Key_Shift: case Qt::Key_Alt: case Qt::Key_Control: diff --git a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp index ab5914d3d1a..3d0c7d70e8d 100644 --- a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp @@ -118,7 +118,7 @@ void RubberBandSelectionManipulator::select(SelectionType selectionType) QList<QmlItemNode> nodeList; - switch(selectionType) { + switch (selectionType) { case AddToSelection: { nodeList.append(m_oldSelectionList); nodeList.append(newNodeList); diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp index 3a2d6302a51..d440b2bd2b7 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp @@ -144,7 +144,7 @@ void SelectionTool::hoverMoveEvent(const QList<QGraphicsItem*> &itemList, FormEditorItem *topSelectableItem = 0; - foreach(QGraphicsItem* item, itemList) + foreach (QGraphicsItem* item, itemList) { FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item); @@ -206,7 +206,7 @@ void SelectionTool::mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, void SelectionTool::keyPressEvent(QKeyEvent *event) { - switch(event->key()) { + switch (event->key()) { case Qt::Key_Left: case Qt::Key_Right: case Qt::Key_Up: diff --git a/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp index 0306e12c728..8e62d9908fd 100644 --- a/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp @@ -75,7 +75,7 @@ void SingleSelectionManipulator::select(SelectionType selectionType, bool select QmlItemNode selectedNode; - foreach(QGraphicsItem* item, itemList) + foreach (QGraphicsItem* item, itemList) { FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item); @@ -90,7 +90,7 @@ void SingleSelectionManipulator::select(SelectionType selectionType, bool select QList<QmlItemNode> nodeList; - switch(selectionType) { + switch (selectionType) { case AddToSelection: { nodeList.append(m_oldSelectionList); if (selectedNode.isValid()) diff --git a/src/plugins/qmldesigner/components/formeditor/snapper.cpp b/src/plugins/qmldesigner/components/formeditor/snapper.cpp index aaee6d2cfaa..30fdd7a5ce5 100644 --- a/src/plugins/qmldesigner/components/formeditor/snapper.cpp +++ b/src/plugins/qmldesigner/components/formeditor/snapper.cpp @@ -473,7 +473,7 @@ static QLineF mergedHorizontalLine(const QList<QLineF> &lineList) double minimumX = std::numeric_limits<double>::max(); double maximumX = std::numeric_limits<double>::min(); - foreach(const QLineF &line, lineList) { + foreach (const QLineF &line, lineList) { minimumX = qMin(minimumX, double(line.x1())); minimumX = qMin(minimumX, double(line.x2())); maximumX = qMax(maximumX, double(line.x1())); @@ -491,7 +491,7 @@ static QLineF mergedVerticalLine(const QList<QLineF> &lineList) double minimumY = std::numeric_limits<double>::max(); double maximumY = std::numeric_limits<double>::min(); - foreach(const QLineF &line, lineList) { + foreach (const QLineF &line, lineList) { minimumY = qMin(minimumY, double(line.y1())); minimumY = qMin(minimumY, double(line.y2())); maximumY = qMax(maximumY, double(line.y1())); @@ -585,13 +585,13 @@ QList<QGraphicsItem*> Snapper::generateSnappingLines(const QList<QRectF> &boundi { QList<QGraphicsItem*> graphicsItemList; QList<QLineF> lineList; - foreach(const QRectF &boundingRect, boundingRectList) { + foreach (const QRectF &boundingRect, boundingRectList) { QList<QRectF> snappedBoundingRectList; lineList += mergedHorizontalLines(horizontalSnappedLines(boundingRect, &snappedBoundingRectList)); lineList += mergedVerticalLines(verticalSnappedLines(boundingRect, &snappedBoundingRectList)); // snappedBoundingRectList.append(boundingRect); -// foreach(const QRectF &snappedBoundingRect, snappedBoundingRectList) { +// foreach (const QRectF &snappedBoundingRect, snappedBoundingRectList) { // QPolygonF rect = transform.map(snappedBoundingRect); // alignVertices(rect); // QGraphicsPolygonItem * item = new QGraphicsPolygonItem(rect, layerItem); @@ -607,7 +607,7 @@ QList<QGraphicsItem*> Snapper::generateSnappingLines(const QList<QRectF> &boundi // } } - foreach(const QLineF &line, lineList) { + foreach (const QLineF &line, lineList) { QLineF lineInTransformationSpace = transform.map(line); // alignLine(lineInTransformationSpace); QGraphicsLineItem * lineItem = new QGraphicsLineItem(lineInTransformationSpace, layerItem); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 1b2fd58bee6..54cb6c154cd 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -401,7 +401,7 @@ void NavigatorView::updateItemSelection() treeWidget()->scrollTo(m_treeModel->indexForNode(selectedModelNodes().first())); // make sure selected nodes a visible - foreach(const QModelIndex &selectedIndex, itemSelection.indexes()) { + foreach (const QModelIndex &selectedIndex, itemSelection.indexes()) { if (selectedIndex.column() == 0) expandRecursively(selectedIndex); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index bf74209e0ce..676c8aea0be 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -80,7 +80,7 @@ WindowsStyleSingleton* WindowsStyleSingleton::m_instance = 0; WindowsStyleSingleton* WindowsStyleSingleton::instance() { static WindowsWatcher w; - if( m_instance == 0 ) + if ( m_instance == 0 ) m_instance = new WindowsStyleSingleton(); return m_instance; } diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index ca5804700e4..ef62ad7ee8e 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -337,7 +337,7 @@ void StatesEditorView::instancesPreviewImageChanged(const QVector<ModelNode> &no { int minimumIndex = 10000; int maximumIndex = -1; - foreach(const ModelNode &node, nodeList) { + foreach (const ModelNode &node, nodeList) { if (node.isRootNode()) { minimumIndex = qMin(minimumIndex, 0); maximumIndex = qMax(maximumIndex, 0); diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp index 78a4c22d2c7..a43c057dee5 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.cpp @@ -104,7 +104,7 @@ bool QmlRefactoring::addToObjectMemberList(int parentLocation, const QString &co bool QmlRefactoring::addProperty(int parentLocation, const QString &name, const QString &value, PropertyType propertyType) { - if(parentLocation < 0) + if (parentLocation < 0) return false; AddPropertyVisitor visit(*textModifier, (quint32) parentLocation, name, value, propertyType, m_propertyOrder); diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index c7f372d39ed..e2a912dc48c 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -242,7 +242,7 @@ NodeInstanceServerProxy::~NodeInstanceServerProxy() if (m_secondSocket) m_secondSocket->close(); - if(m_thirdSocket) + if (m_thirdSocket) m_thirdSocket->close(); @@ -298,7 +298,7 @@ NodeInstanceClientInterface *NodeInstanceServerProxy::nodeInstanceClient() const static void writeCommandToSocket(const QVariant &command, QLocalSocket *socket, unsigned int commandCounter) { - if(socket) { + if (socket) { QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); out.setVersion(QDataStream::Qt_4_8); diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index bcb4c3ba731..e03b15db348 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -347,7 +347,7 @@ void NodeInstanceView::propertiesRemoved(const QList<AbstractProperty>& /*proper void NodeInstanceView::removeInstanceAndSubInstances(const ModelNode &node) { - foreach(const ModelNode &subNode, node.allSubModelNodes()) { + foreach (const ModelNode &subNode, node.allSubModelNodes()) { if (hasInstanceForNode(subNode)) removeInstanceNodeRelationship(subNode); } @@ -427,7 +427,7 @@ void NodeInstanceView::nodeOrderChanged(const NodeListProperty & listProperty, if (hasInstanceForNode(containerNode)) containerInstanceId = instanceForNode(containerNode).instanceId(); - foreach(const ModelNode &node, listProperty.toModelNodeList()) { + foreach (const ModelNode &node, listProperty.toModelNodeList()) { qint32 instanceId = -1; if (hasInstanceForNode(node)) { instanceId = instanceForNode(node).instanceId(); @@ -657,7 +657,7 @@ NodeInstance NodeInstanceView::rootNodeInstance() const void NodeInstanceView::insertInstanceRelationships(const NodeInstance &instance) { Q_ASSERT(instance.instanceId() >=0); - if(m_nodeInstanceHash.contains(instance.modelNode())) + if (m_nodeInstanceHash.contains(instance.modelNode())) return; m_nodeInstanceHash.insert(instance.modelNode(), instance); @@ -738,7 +738,7 @@ QRectF NodeInstanceView::sceneRect() const QList<ModelNode> filterNodesForSkipItems(const QList<ModelNode> &nodeList) { QList<ModelNode> filteredNodeList; - foreach(const ModelNode &node, nodeList) { + foreach (const ModelNode &node, nodeList) { if (isSkippedNode(node)) continue; @@ -781,7 +781,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() QVector<InstanceContainer> instanceContainerList; - foreach(const NodeInstance &instance, instanceList) { + foreach (const NodeInstance &instance, instanceList) { InstanceContainer::NodeSourceType nodeSourceType = static_cast<InstanceContainer::NodeSourceType>(instance.modelNode().nodeSourceType()); InstanceContainer::NodeMetaType nodeMetaType = InstanceContainer::ObjectMetaType; @@ -802,7 +802,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() } QVector<ReparentContainer> reparentContainerList; - foreach(const NodeInstance &instance, instanceList) { + foreach (const NodeInstance &instance, instanceList) { if (instance.modelNode().hasParentProperty()) { NodeAbstractProperty parentProperty = instance.modelNode().parentProperty(); ReparentContainer container(instance.instanceId(), -1, QString(), instanceForNode(parentProperty.parentModelNode()).instanceId(), parentProperty.name()); @@ -811,7 +811,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() } QVector<IdContainer> idContainerList; - foreach(const NodeInstance &instance, instanceList) { + foreach (const NodeInstance &instance, instanceList) { QString id = instance.modelNode().id(); if (!id.isEmpty()) { IdContainer container(instance.instanceId(), id); @@ -820,7 +820,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() } QVector<PropertyValueContainer> valueContainerList; - foreach(const VariantProperty &property, variantPropertyList) { + foreach (const VariantProperty &property, variantPropertyList) { ModelNode node = property.parentModelNode(); if (node.isValid() && hasInstanceForNode(node)) { NodeInstance instance = instanceForNode(node); @@ -830,7 +830,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() } QVector<PropertyBindingContainer> bindingContainerList; - foreach(const BindingProperty &property, bindingPropertyList) { + foreach (const BindingProperty &property, bindingPropertyList) { ModelNode node = property.parentModelNode(); if (node.isValid() && hasInstanceForNode(node)) { NodeInstance instance = instanceForNode(node); @@ -840,7 +840,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() } QVector<AddImportContainer> importVector; - foreach(const Import &import, model()->imports()) + foreach (const Import &import, model()->imports()) importVector.append(AddImportContainer(import.url(), import.file(), import.version(), import.alias(), import.importPaths())); return CreateSceneCommand(instanceContainerList, @@ -861,7 +861,7 @@ ClearSceneCommand NodeInstanceView::createClearSceneCommand() const CompleteComponentCommand NodeInstanceView::createComponentCompleteCommand(const QList<NodeInstance> &instanceList) const { QVector<qint32> containerList; - foreach(const NodeInstance &instance, instanceList) { + foreach (const NodeInstance &instance, instanceList) { if (instance.instanceId() >= 0) containerList.append(instance.instanceId()); } @@ -872,7 +872,7 @@ CompleteComponentCommand NodeInstanceView::createComponentCompleteCommand(const ComponentCompletedCommand NodeInstanceView::createComponentCompletedCommand(const QList<NodeInstance> &instanceList) const { QVector<qint32> containerList; - foreach(const NodeInstance &instance, instanceList) { + foreach (const NodeInstance &instance, instanceList) { if (instance.instanceId() >= 0) containerList.append(instance.instanceId()); } @@ -883,7 +883,7 @@ ComponentCompletedCommand NodeInstanceView::createComponentCompletedCommand(cons CreateInstancesCommand NodeInstanceView::createCreateInstancesCommand(const QList<NodeInstance> &instanceList) const { QVector<InstanceContainer> containerList; - foreach(const NodeInstance &instance, instanceList) { + foreach (const NodeInstance &instance, instanceList) { InstanceContainer::NodeSourceType nodeSourceType = static_cast<InstanceContainer::NodeSourceType>(instance.modelNode().nodeSourceType()); InstanceContainer::NodeMetaType nodeMetaType = InstanceContainer::ObjectMetaType; @@ -901,7 +901,7 @@ CreateInstancesCommand NodeInstanceView::createCreateInstancesCommand(const QLis ReparentInstancesCommand NodeInstanceView::createReparentInstancesCommand(const QList<NodeInstance> &instanceList) const { QVector<ReparentContainer> containerList; - foreach(const NodeInstance &instance, instanceList) { + foreach (const NodeInstance &instance, instanceList) { if (instance.modelNode().hasParentProperty()) { NodeAbstractProperty parentProperty = instance.modelNode().parentProperty(); ReparentContainer container(instance.instanceId(), -1, QString(), instanceForNode(parentProperty.parentModelNode()).instanceId(), parentProperty.name()); @@ -943,7 +943,7 @@ ChangeValuesCommand NodeInstanceView::createChangeValueCommand(const QList<Varia { QVector<PropertyValueContainer> containerList; - foreach(const VariantProperty &property, propertyList) { + foreach (const VariantProperty &property, propertyList) { ModelNode node = property.parentModelNode(); if (node.isValid() && hasInstanceForNode(node)) { NodeInstance instance = instanceForNode(node); @@ -960,7 +960,7 @@ ChangeBindingsCommand NodeInstanceView::createChangeBindingCommand(const QList<B { QVector<PropertyBindingContainer> containerList; - foreach(const BindingProperty &property, propertyList) { + foreach (const BindingProperty &property, propertyList) { ModelNode node = property.parentModelNode(); if (node.isValid() && hasInstanceForNode(node)) { NodeInstance instance = instanceForNode(node); @@ -976,7 +976,7 @@ ChangeBindingsCommand NodeInstanceView::createChangeBindingCommand(const QList<B ChangeIdsCommand NodeInstanceView::createChangeIdsCommand(const QList<NodeInstance> &instanceList) const { QVector<IdContainer> containerList; - foreach(const NodeInstance &instance, instanceList) { + foreach (const NodeInstance &instance, instanceList) { QString id = instance.modelNode().id(); if (!id.isEmpty()) { IdContainer container(instance.instanceId(), id); @@ -992,7 +992,7 @@ ChangeIdsCommand NodeInstanceView::createChangeIdsCommand(const QList<NodeInstan RemoveInstancesCommand NodeInstanceView::createRemoveInstancesCommand(const QList<ModelNode> &nodeList) const { QVector<qint32> idList; - foreach(const ModelNode &node, nodeList) { + foreach (const ModelNode &node, nodeList) { if (node.isValid() && hasInstanceForNode(node)) { NodeInstance instance = instanceForNode(node); @@ -1019,7 +1019,7 @@ RemovePropertiesCommand NodeInstanceView::createRemovePropertiesCommand(const QL { QVector<PropertyAbstractContainer> containerList; - foreach(const AbstractProperty &property, propertyList) { + foreach (const AbstractProperty &property, propertyList) { ModelNode node = property.parentModelNode(); if (node.isValid() && hasInstanceForNode(node)) { NodeInstance instance = instanceForNode(node); @@ -1054,7 +1054,7 @@ void NodeInstanceView::valuesChanged(const ValuesChangedCommand &command) QList<QPair<ModelNode, QString> > valuePropertyChangeList; - foreach(const PropertyValueContainer &container, command.valueChanges()) { + foreach (const PropertyValueContainer &container, command.valueChanges()) { if (hasInstanceForId(container.instanceId())) { NodeInstance instance = instanceForId(container.instanceId()); if (instance.isValid()) { @@ -1165,7 +1165,7 @@ void NodeInstanceView::componentCompleted(const ComponentCompletedCommand &comma QVector<ModelNode> nodeVector; - foreach(const qint32 &instanceId, command.instances()) { + foreach (const qint32 &instanceId, command.instances()) { if (hasModelNodeForInternalId(instanceId)) { nodeVector.append(modelNodeForInternalId(instanceId)); } @@ -1183,7 +1183,7 @@ void NodeInstanceView::childrenChanged(const ChildrenChangedCommand &command) QVector<ModelNode> childNodeVector; - foreach(qint32 instanceId, command.childrenInstances()) { + foreach (qint32 instanceId, command.childrenInstances()) { if (hasInstanceForId(instanceId)) { NodeInstance instance = instanceForId(instanceId); instance.setParentId(command.parentInstanceId()); diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index 2113c9e4979..c25fcd85c17 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -252,7 +252,7 @@ QList<ModelNode> AbstractView::toModelNodeList(const QList<Internal::InternalNod QList<ModelNode> toModelNodeList(const QList<Internal::InternalNode::Pointer> &nodeList, AbstractView *view) { QList<ModelNode> newNodeList; - foreach(const Internal::InternalNode::Pointer &node, nodeList) + foreach (const Internal::InternalNode::Pointer &node, nodeList) newNodeList.append(ModelNode(node, view->model(), view)); return newNodeList; @@ -261,7 +261,7 @@ QList<ModelNode> toModelNodeList(const QList<Internal::InternalNode::Pointer> &n QList<Internal::InternalNode::Pointer> toInternalNodeList(const QList<ModelNode> &nodeList) { QList<Internal::InternalNode::Pointer> newNodeList; - foreach(const ModelNode &node, nodeList) + foreach (const ModelNode &node, nodeList) newNodeList.append(node.internalNode()); return newNodeList; diff --git a/src/plugins/qmldesigner/designercore/model/internalnode.cpp b/src/plugins/qmldesigner/designercore/model/internalnode.cpp index 74323c351a0..50e3a0f0797 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnode.cpp @@ -289,7 +289,7 @@ QList<InternalProperty::Pointer> InternalNode::propertyList() const QList<InternalNodeAbstractProperty::Pointer> InternalNode::nodeAbstractPropertyList() const { QList<InternalNodeAbstractProperty::Pointer> abstractPropertyList; - foreach(const InternalProperty::Pointer &property, propertyList()) { + foreach (const InternalProperty::Pointer &property, propertyList()) { if (property->isNodeAbstractProperty()) abstractPropertyList.append(property->toNodeAbstractProperty()); } @@ -301,7 +301,7 @@ QList<InternalNodeAbstractProperty::Pointer> InternalNode::nodeAbstractPropertyL QList<InternalNode::Pointer> InternalNode::allSubNodes() const { QList<InternalNode::Pointer> nodeList; - foreach(const InternalNodeAbstractProperty::Pointer &property, nodeAbstractPropertyList()) { + foreach (const InternalNodeAbstractProperty::Pointer &property, nodeAbstractPropertyList()) { nodeList.append(property->allSubNodes()); } @@ -311,7 +311,7 @@ QList<InternalNode::Pointer> InternalNode::allSubNodes() const QList<InternalNode::Pointer> InternalNode::allDirectSubNodes() const { QList<InternalNode::Pointer> nodeList; - foreach(const InternalNodeAbstractProperty::Pointer &property, nodeAbstractPropertyList()) { + foreach (const InternalNodeAbstractProperty::Pointer &property, nodeAbstractPropertyList()) { nodeList.append(property->allDirectSubNodes()); } diff --git a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp index 8140f80dedf..bfc9abce3c7 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.cpp @@ -109,7 +109,7 @@ void InternalNodeListProperty::slide(int from, int to) QList<InternalNode::Pointer> InternalNodeListProperty::allSubNodes() const { QList<InternalNode::Pointer> nodeList; - foreach(const InternalNode::Pointer &childNode, m_nodeList) { + foreach (const InternalNode::Pointer &childNode, m_nodeList) { nodeList.append(childNode->allSubNodes()); nodeList.append(childNode); } diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp index c2fb7a9b804..f07acbdb0c2 100644 --- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp @@ -85,7 +85,7 @@ static void splitIdInBaseNameAndNumber(const QString &id, QString *baseId, int * { int counter = 0; - while(counter < id.count()) { + while (counter < id.count()) { bool canConvertToInteger = false; int newNumber = id.right(counter +1).toInt(&canConvertToInteger); if (canConvertToInteger) diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 4c5c4f57453..beebf98baf9 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -134,7 +134,7 @@ QString ModelNode::generateNewId() const int counter = 1; QString newId = QString("%1%2").arg(simplifiedTypeName().toLower()).arg(counter); - while(view()->hasId(newId)) { + while (view()->hasId(newId)) { counter += 1; newId = QString("%1%2").arg(simplifiedTypeName().toLower()).arg(counter); } diff --git a/src/plugins/qmldesigner/designercore/model/painteventfilter.cpp b/src/plugins/qmldesigner/designercore/model/painteventfilter.cpp index 56b300fe614..e3bf3161221 100644 --- a/src/plugins/qmldesigner/designercore/model/painteventfilter.cpp +++ b/src/plugins/qmldesigner/designercore/model/painteventfilter.cpp @@ -46,7 +46,7 @@ PaintEventFilter::PaintEventFilter(QObject *parent) bool PaintEventFilter::eventFilter(QObject *object, QEvent *event) { - switch(event->type()) + switch (event->type()) { case QEvent::Paint : { diff --git a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp index d9f30143049..b1eed40a5a6 100644 --- a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp @@ -138,7 +138,7 @@ QDataStream &operator>>(QDataStream &stream, QList<PropertyContainer> &propertyC int count; stream >> count; Q_ASSERT(count >= 0); - for( int i = 0; i < count; i++) { + for ( int i = 0; i < count; i++) { PropertyContainer propertyContainer; stream >> propertyContainer; propertyContainerList.append(propertyContainer); diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 8c534a47d05..2c09b2a3aee 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -356,7 +356,7 @@ QList<ModelNode> toModelNodeList(const QList<QmlObjectNode> &fxObjectNodeList) { QList<ModelNode> modelNodeList; - foreach(const QmlObjectNode &fxObjectNode, fxObjectNodeList) + foreach (const QmlObjectNode &fxObjectNode, fxObjectNodeList) modelNodeList.append(fxObjectNode.modelNode()); return modelNodeList; @@ -366,7 +366,7 @@ QList<QmlObjectNode> toQmlObjectNodeList(const QList<ModelNode> &modelNodeList) { QList<QmlObjectNode> qmlObjectNodeList; - foreach(const ModelNode &modelNode, modelNodeList) { + foreach (const ModelNode &modelNode, modelNodeList) { QmlObjectNode objectNode(modelNode); if (objectNode.isValid()) qmlObjectNodeList.append(objectNode); diff --git a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp index 623c6c23ac8..946e1f8a0ee 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp @@ -118,7 +118,7 @@ bool QmlModelState::hasPropertyChanges(const ModelNode &node) const if (isBaseState()) return false; - foreach(const QmlPropertyChanges &changeSet, propertyChanges()) { + foreach (const QmlPropertyChanges &changeSet, propertyChanges()) { if (changeSet.target().isValid() && changeSet.target() == node) return true; } @@ -132,7 +132,7 @@ bool QmlModelState::hasStateOperation(const ModelNode &node) const if (isBaseState()) return false; - foreach(const QmlModelStateOperation &stateOperation, stateOperations()) { + foreach (const QmlModelStateOperation &stateOperation, stateOperations()) { if (stateOperation.target() == node) return true; } diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index 9c43b3aa0f9..b457ddcd12f 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -107,7 +107,7 @@ QString RewriterView::Error::toString() const str += tr("line %1").arg(line()); } - if(column() != -1) { + if (column() != -1) { if (!str.isEmpty()) str += QLatin1Char(' '); diff --git a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp index e225b5aae08..53f9dcf6837 100644 --- a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp @@ -140,14 +140,14 @@ void ViewLogger::propertiesRemoved(const QList<AbstractProperty> &propertyList) void ViewLogger::variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) { m_output << time() << indent("variantPropertiesChanged:") << serialize(propertyChange) << endl; - foreach(const VariantProperty &property, propertyList) + foreach (const VariantProperty &property, propertyList) m_output << time() << indent() << property << endl; } void ViewLogger::bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) { m_output << time() << indent("bindingPropertiesChanged:") << serialize(propertyChange) << endl; - foreach(const BindingProperty &property, propertyList) + foreach (const BindingProperty &property, propertyList) m_output << time() << indent() << property << endl; } @@ -160,9 +160,9 @@ void ViewLogger::selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) { m_output << time() << indent("selectedNodesChanged:") << endl; - foreach(const ModelNode &node, selectedNodeList) + foreach (const ModelNode &node, selectedNodeList) m_output << time() << indent("new: ") << node << endl; - foreach(const ModelNode &node, lastSelectedNodeList) + foreach (const ModelNode &node, lastSelectedNodeList) m_output << time() << indent("old: ") << node << endl; } @@ -184,18 +184,18 @@ void ViewLogger::auxiliaryDataChanged(const ModelNode &node, const QString &name void ViewLogger::importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) { m_output << time() << indent("importsChanged:") << endl; - foreach(const Import &import, addedImports) + foreach (const Import &import, addedImports) m_output << time() << indent("import added: ") << import.toString() << endl; - foreach(const Import &import, removedImports) + foreach (const Import &import, removedImports) m_output << time() << indent("import removed: ") << import.toString() << endl; } void ViewLogger::customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) { m_output << time() << indent("customNotification:") << view << identifier << endl; - foreach(const ModelNode &node, nodeList) + foreach (const ModelNode &node, nodeList) m_output << time() << indent("node: ") << node << endl; - foreach(const QVariant &variant, data) + foreach (const QVariant &variant, data) m_output << time() << indent("data: ") << variant.toString() << endl; } @@ -209,7 +209,7 @@ void ViewLogger::instancePropertyChange(const QList<QPair<ModelNode, QString> > typedef QPair<ModelNode, QString> PropertyPair; m_output << time() << indent("instancePropertyChange:") << endl; - foreach(const PropertyPair &propertyPair, propertyList) + foreach (const PropertyPair &propertyPair, propertyList) m_output << time() << indent("property: ") << propertyPair.first << propertyPair.second << endl; } @@ -217,7 +217,7 @@ void ViewLogger::instancesCompleted(const QVector<ModelNode> &completedNodeList) { m_output << time() << indent("instancesCompleted:") << endl; - foreach(const ModelNode &node, completedNodeList) + foreach (const ModelNode &node, completedNodeList) m_output << time() << indent("node: ") << node << endl; } @@ -238,7 +238,7 @@ void ViewLogger::instancesRenderImageChanged(const QVector<ModelNode> &nodeList) { m_output << time() << indent("instancesRenderImageChanged:") << endl; - foreach(const ModelNode &node, nodeList) + foreach (const ModelNode &node, nodeList) m_output << time() << indent("node: ") << node << endl; } @@ -246,7 +246,7 @@ void ViewLogger::instancesPreviewImageChanged(const QVector<ModelNode> &nodeList { m_output << time() << indent("instancesPreviewImageChanged:") << endl; - foreach(const ModelNode &node, nodeList) + foreach (const ModelNode &node, nodeList) m_output << time() << indent("node: ") << node << endl; } @@ -254,7 +254,7 @@ void ViewLogger::instancesChildrenChanged(const QVector<ModelNode> &nodeList) { m_output << time() << indent("instancesChildrenChanged:") << endl; - foreach(const ModelNode &node, nodeList) + foreach (const ModelNode &node, nodeList) m_output << time() << indent("node: ") << node << endl; } diff --git a/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp b/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp index a70afd6dbeb..0d6f44b11e6 100644 --- a/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp +++ b/src/plugins/qmldesigner/designercore/preview/stylemanager.cpp @@ -87,7 +87,7 @@ QString StyleManager::applicationStyle() QStyle *applicationStyle = qApp->style(); QStyle *style; if (applicationStyle) - foreach(const QString &name, styles()) + foreach (const QString &name, styles()) if ((style = QStyleFactory::create(name)) && (applicationStyle->metaObject()->className() == style->metaObject()->className())) diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 9e8a6513d34..4bceab82220 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -988,7 +988,7 @@ void QmlJSTextEditorWidget::setSelectedElements() QList<UiObjectMember *> members = selectedMembers(m_semanticInfo.document, startPos, endPos); if (!members.isEmpty()) { - foreach(UiObjectMember *m, members) { + foreach (UiObjectMember *m, members) { offsets << m; } } diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 09571ac4114..5b515c2f840 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -1310,7 +1310,7 @@ QSet<Utils::FileName> Qt4PriFileNode::filterFilesRecursiveEnumerata(ProjectExplo QSet<Utils::FileName> result; if (fileType != ProjectExplorer::QMLType && fileType != ProjectExplorer::UnknownFileType) return result; - if(fileType == ProjectExplorer::QMLType) { + if (fileType == ProjectExplorer::QMLType) { foreach (const Utils::FileName &file, files) if (file.endsWith(QLatin1String(".qml"))) result << file; @@ -1797,7 +1797,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async) // Remove case toRemove << *existingIt; ++existingIt; - } else if(! newExactAtEnd + } else if (! newExactAtEnd && (existingAtEnd || *newExactIt < (*existingIt)->path()) && (newCumlativeAtEnd || *newExactIt < *newCumlativeIt)) { // Mark node from exact for adding @@ -1824,7 +1824,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async) ++newCumlativeIt; } else if (newCumlativeAtEnd) { ++newExactIt; - } else if(*newExactIt < *newCumlativeIt) { + } else if (*newExactIt < *newCumlativeIt) { ++newExactIt; } else if (*newCumlativeIt < *newExactIt) { ++newCumlativeIt; diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 2f50f54f94d..8d3d2084021 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -913,7 +913,7 @@ void Qt4Project::asyncUpdate() } else { if (debug) qDebug()<<" partial update,"<<m_partialEvaluate.size()<<"nodes to update"; - foreach(Qt4ProFileNode *node, m_partialEvaluate) + foreach (Qt4ProFileNode *node, m_partialEvaluate) node->asyncUpdate(); } @@ -970,10 +970,10 @@ QStringList Qt4Project::files(FilesMode fileMode) const // Find the folder that contains a file a certain type (recurse down) static FolderNode *folderOf(FolderNode *in, FileType fileType, const QString &fileName) { - foreach(FileNode *fn, in->fileNodes()) + foreach (FileNode *fn, in->fileNodes()) if (fn->fileType() == fileType && fn->path() == fileName) return in; - foreach(FolderNode *folder, in->subFolderNodes()) + foreach (FolderNode *folder, in->subFolderNodes()) if (FolderNode *pn = folderOf(folder, fileType, fileName)) return pn; return 0; @@ -1210,7 +1210,7 @@ void Qt4Project::notifyChanged(const QString &name) if (files(Qt4Project::ExcludeGeneratedFiles).contains(name)) { QList<Qt4ProFileNode *> list; findProFile(name, rootQt4ProjectNode(), list); - foreach(Qt4ProFileNode *node, list) { + foreach (Qt4ProFileNode *node, list) { QtSupport::ProFileCacheManager::instance()->discardFile(name); node->update(); } @@ -1353,7 +1353,7 @@ void CentralizedFolderWatcher::folderChanged(const QString &folder) void CentralizedFolderWatcher::onTimer() { - foreach(const QString &folder, m_changedFolders) + foreach (const QString &folder, m_changedFolders) delayedFolderChanged(folder); m_changedFolders.clear(); } diff --git a/src/plugins/qtsupport/debugginghelper.cpp b/src/plugins/qtsupport/debugginghelper.cpp index 1ec7e382ca6..33df8879615 100644 --- a/src/plugins/qtsupport/debugginghelper.cpp +++ b/src/plugins/qtsupport/debugginghelper.cpp @@ -99,7 +99,7 @@ QString DebuggingHelperLibrary::copy(const QString &qtInstallData, const QStringList directories = DebuggingHelperLibrary::debuggingHelperLibraryDirectories(qtInstallData); // Try to find a writeable directory. - foreach(const QString &directory, directories) + foreach (const QString &directory, directories) if (copyFiles(sourcePath(), sourceFileNames(), directory, errorMessage)) { errorMessage->clear(); return directory; diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index e590a704ebc..426bd18820a 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -548,7 +548,7 @@ bool ExamplesListModelFilter::filterAcceptsRow(int sourceRow, const QModelIndex const QStringList tags = sourceModel()->index(sourceRow, 0, sourceParent).data(Tags).toStringList(); if (!m_filterTags.isEmpty()) { - foreach(const QString &tag, m_filterTags) + foreach (const QString &tag, m_filterTags) if (!tags.contains(tag, Qt::CaseInsensitive)) return false; return true; @@ -559,7 +559,7 @@ bool ExamplesListModelFilter::filterAcceptsRow(int sourceRow, const QModelIndex const QString name = sourceModel()->index(sourceRow, 0, sourceParent).data(Name).toString(); - foreach(const QString &subString, m_searchString) { + foreach (const QString &subString, m_searchString) { bool wordMatch = false; wordMatch |= (bool)name.contains(subString, Qt::CaseInsensitive); if (wordMatch) diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp index 701862882e1..488ed409d27 100644 --- a/src/plugins/qtsupport/qmldumptool.cpp +++ b/src/plugins/qtsupport/qmldumptool.cpp @@ -275,7 +275,7 @@ QStringList QmlDumpTool::locationsByInstallData(const QString &qtInstallData, bo QStringList result; QFileInfo fileInfo; const QStringList binFilenames = validBinaryFilenames(debugDump); - foreach(const QString &directory, installDirectories(qtInstallData)) { + foreach (const QString &directory, installDirectories(qtInstallData)) { if (getHelperFileInfoFor(binFilenames, directory, &fileInfo)) result << fileInfo.filePath(); } @@ -294,7 +294,7 @@ QString QmlDumpTool::copy(const QString &qtInstallData, QString *errorMessage) const QStringList directories = QmlDumpTool::installDirectories(qtInstallData); // Try to find a writeable directory. - foreach(const QString &directory, directories) { + foreach (const QString &directory, directories) { if (copyFiles(sourcePath(), sourceFileNames(), directory, errorMessage)) { return directory; } diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp index d670d5a0bd1..5bb392b0eda 100644 --- a/src/plugins/qtsupport/qtoutputformatter.cpp +++ b/src/plugins/qtsupport/qtoutputformatter.cpp @@ -53,7 +53,7 @@ QtOutputFormatter::QtOutputFormatter(ProjectExplorer::Project *project) , m_qtTestFail(QLatin1String("^ Loc: \\[(.*)\\]")) , m_project(project) { - if(project) { + if (project) { m_projectFinder.setProjectFiles(project->files(Project::ExcludeGeneratedFiles)); m_projectFinder.setProjectDirectory(project->projectDirectory()); diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 61590009638..17bdac89cea 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -634,7 +634,7 @@ BaseQtVersion *QtVersionManager::qtVersionForQMakeBinary(const Utils::FileName & void dumpQMakeAssignments(const QList<QMakeAssignment> &list) { - foreach(const QMakeAssignment &qa, list) { + foreach (const QMakeAssignment &qa, list) { qDebug()<<qa.variable<<qa.op<<qa.value; } } @@ -690,11 +690,11 @@ QPair<BaseQtVersion::QmakeBuildConfigs, QString> QtVersionManager::scanMakeFile( if (debug) dumpQMakeAssignments(assignments); - foreach(const QMakeAssignment &qa, assignments) + foreach (const QMakeAssignment &qa, assignments) Utils::QtcProcess::addArg(&result2, qa.variable + qa.op + qa.value); if (!afterAssignments.isEmpty()) { Utils::QtcProcess::addArg(&result2, QLatin1String("-after")); - foreach(const QMakeAssignment &qa, afterAssignments) + foreach (const QMakeAssignment &qa, afterAssignments) Utils::QtcProcess::addArg(&result2, qa.variable + qa.op + qa.value); } } @@ -789,11 +789,11 @@ BaseQtVersion::QmakeBuildConfigs QtVersionManager::qmakeBuildConfigFromCmdArgs(Q BaseQtVersion::QmakeBuildConfigs result = defaultBuildConfig; QList<QMakeAssignment> oldAssignments = *assignments; assignments->clear(); - foreach(const QMakeAssignment &qa, oldAssignments) { + foreach (const QMakeAssignment &qa, oldAssignments) { if (qa.variable == QLatin1String("CONFIG")) { QStringList values = qa.value.split(QLatin1Char(' ')); QStringList newValues; - foreach(const QString &value, values) { + foreach (const QString &value, values) { if (value == QLatin1String("debug")) { if (qa.op == QLatin1String("+=")) result = result | BaseQtVersion::DebugBuild; diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index bf4768c2181..90fa24b3347 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -883,7 +883,7 @@ void SubversionPlugin::filelog(const QString &workingDir, QStringList args(QLatin1String("log")); if (m_settings.logCount > 0) args << QLatin1String("-l") << QString::number(m_settings.logCount); - foreach(const QString &file, files) + foreach (const QString &file, files) args.append(QDir::toNativeSeparators(file)); // subversion stores log in UTF-8 and returns it back in user system locale. @@ -1305,20 +1305,20 @@ QString SubversionPlugin::vcsGetRepositoryURL(const QString &directory) bool repo = false; bool root = false; - while(!xml.atEnd() && !xml.hasError()) { - switch(xml.readNext()) { + while (!xml.atEnd() && !xml.hasError()) { + switch (xml.readNext()) { case QXmlStreamReader::StartDocument: break; case QXmlStreamReader::StartElement: - if(xml.name() == QLatin1String("repository")) + if (xml.name() == QLatin1String("repository")) repo = true; - else if(repo && xml.name() == QLatin1String("root")) + else if (repo && xml.name() == QLatin1String("root")) root = true; break; case QXmlStreamReader::EndElement: - if(xml.name() == QLatin1String("repository")) + if (xml.name() == QLatin1String("repository")) repo = false; - else if(repo && xml.name() == QLatin1String("root")) + else if (repo && xml.name() == QLatin1String("root")) root = false; break; case QXmlStreamReader::Characters: diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index faa74f49124..a423fc3dfbf 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -2231,7 +2231,7 @@ bool BaseTextEditorWidget::restoreState(const QByteArray &state) stream >> collapsedBlocks; QTextDocument *doc = document(); bool layoutChanged = false; - foreach(int blockNumber, collapsedBlocks) { + foreach (int blockNumber, collapsedBlocks) { QTextBlock block = doc->findBlockByNumber(qMax(0, blockNumber)); if (block.isValid()) { BaseTextDocumentLayout::doFoldOrUnfold(block, false); diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp index 728f1ce5d77..59e54b57977 100644 --- a/src/plugins/texteditor/refactoroverlay.cpp +++ b/src/plugins/texteditor/refactoroverlay.cpp @@ -62,7 +62,7 @@ void RefactorOverlay::paint(QPainter *painter, const QRect &clip) RefactorMarker RefactorOverlay::markerAt(const QPoint &pos) const { QPointF offset = m_editor->contentOffset(); - foreach(const RefactorMarker &marker, m_markers) { + foreach (const RefactorMarker &marker, m_markers) { if (marker.rect.translated(offset.toPoint()).contains(pos)) return marker; } diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp index 8db29c70f96..c52ee29ee6c 100644 --- a/src/plugins/texteditor/texteditoroverlay.cpp +++ b/src/plugins/texteditor/texteditoroverlay.cpp @@ -248,7 +248,7 @@ QPainterPath TextEditorOverlay::createSelectionPath(const QTextCursor &begin, co points += selection.at(0).bottomRight() + QPointF(margin+1, 0); - for(int i = 1; i < selection.count()-1; ++i) { + for (int i = 1; i < selection.count()-1; ++i) { #define MAX3(a,b,c) qMax(a, qMax(b,c)) qreal x = MAX3(selection.at(i-1).right(), @@ -265,7 +265,7 @@ QPainterPath TextEditorOverlay::createSelectionPath(const QTextCursor &begin, co points += selection.at(selection.count()-1).bottomLeft() + QPointF(-margin, margin+extra); points += selection.at(selection.count()-1).topLeft() + QPointF(-margin, 0); - for(int i = selection.count()-2; i > 0; --i) { + for (int i = selection.count()-2; i > 0; --i) { #define MIN3(a,b,c) qMin(a, qMin(b,c)) qreal x = MIN3(selection.at(i-1).left(), selection.at(i).left(), diff --git a/src/plugins/vcsbase/checkoutwizarddialog.cpp b/src/plugins/vcsbase/checkoutwizarddialog.cpp index df9f0433f8f..2aa5a0fa8ea 100644 --- a/src/plugins/vcsbase/checkoutwizarddialog.cpp +++ b/src/plugins/vcsbase/checkoutwizarddialog.cpp @@ -53,7 +53,7 @@ CheckoutWizardDialog::CheckoutWizardDialog(const QList<QWizardPage *> ¶meter m_progressPageId(-1) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - foreach(QWizardPage *wp, parameterPages) + foreach (QWizardPage *wp, parameterPages) addPage(wp); m_progressPageId = parameterPages.size(); setPage(m_progressPageId, m_progressPage); diff --git a/src/plugins/vcsbase/cleandialog.cpp b/src/plugins/vcsbase/cleandialog.cpp index ab11227b552..a1262319c12 100644 --- a/src/plugins/vcsbase/cleandialog.cpp +++ b/src/plugins/vcsbase/cleandialog.cpp @@ -64,7 +64,7 @@ static void removeFileRecursion(const QFileInfo &f, QString *errorMessage) return; if (f.isDir()) { const QDir dir(f.absoluteFilePath()); - foreach(const QFileInfo &fi, dir.entryInfoList(QDir::AllEntries|QDir::NoDotAndDotDot|QDir::Hidden)) + foreach (const QFileInfo &fi, dir.entryInfoList(QDir::AllEntries|QDir::NoDotAndDotDot|QDir::Hidden)) removeFileRecursion(fi, errorMessage); QDir parent = f.absoluteDir(); if (!parent.rmdir(f.fileName())) @@ -108,7 +108,7 @@ CleanFilesTask::CleanFilesTask(const QString &repository, const QStringList &fil void CleanFilesTask::run() { - foreach(const QString &name, m_files) + foreach (const QString &name, m_files) removeFileRecursion(QFileInfo(name), &m_errorMessage); if (!m_errorMessage.isEmpty()) { // Format and emit error. |