diff options
| author | Radovan Zivkovic <pivonroll@gmail.com> | 2013-07-15 01:38:25 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-11 19:54:54 +0100 |
| commit | c4c0a3855cfb1ee0fd99e5019042de432d2cf510 (patch) | |
| tree | d49af5bbbccd0f930762ca3233eaa39d377c105d | |
| parent | e0e04c1a3ff69401e7e3b910e5af01a14273740d (diff) | |
| download | qt-creator-c4c0a3855cfb1ee0fd99e5019042de432d2cf510.tar.gz | |
Various code style fixes.
Change-Id: I38ec00f80d96eab3b7ee968a71f62880ce78d2ce
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
26 files changed, 217 insertions, 185 deletions
diff --git a/src/plugins/vcprojectmanager/msbuildversionmanager.cpp b/src/plugins/vcprojectmanager/msbuildversionmanager.cpp index e2431b8855..fc836173d2 100644 --- a/src/plugins/vcprojectmanager/msbuildversionmanager.cpp +++ b/src/plugins/vcprojectmanager/msbuildversionmanager.cpp @@ -55,9 +55,10 @@ bool MsBuildVersionManager::addMsBuildInformation(MsBuildInformation *msBuildInf if (!msBuildInfo) return false; - foreach (MsBuildInformation *info, m_msBuildInfos) + foreach (MsBuildInformation *info, m_msBuildInfos) { if (info->m_executable == msBuildInfo->m_executable) return false; + } m_msBuildInfos.append(msBuildInfo); emit msBuildAdded(msBuildInfo->getId()); @@ -71,22 +72,23 @@ QList<MsBuildInformation*> MsBuildVersionManager::msBuildInformations() const MsBuildInformation *MsBuildVersionManager::msBuildInformation(Core::Id msBuildID) { - foreach (MsBuildInformation *info, m_msBuildInfos) + foreach (MsBuildInformation *info, m_msBuildInfos) { if (info->getId() == msBuildID) return info; + } return 0; } MsBuildInformation *MsBuildVersionManager::msBuildInformation(MsBuildInformation::MsBuildVersion minVersion, MsBuildInformation::MsBuildVersion maxVersion) { - foreach (MsBuildInformation *info, m_msBuildInfos) + foreach (MsBuildInformation *info, m_msBuildInfos) { if (info->m_msBuildVersion >= minVersion && info->m_msBuildVersion <= maxVersion) return info; - + } return 0; } -void MsBuildVersionManager::removeMsBuildInformation(Core::Id msBuildId) +void MsBuildVersionManager::removeMsBuildInformation(const Core::Id &msBuildId) { for (int i = 0; i < m_msBuildInfos.size(); ++i) { MsBuildInformation *info = m_msBuildInfos[i]; diff --git a/src/plugins/vcprojectmanager/msbuildversionmanager.h b/src/plugins/vcprojectmanager/msbuildversionmanager.h index ad92393c1f..9f1b8d7f2d 100644 --- a/src/plugins/vcprojectmanager/msbuildversionmanager.h +++ b/src/plugins/vcprojectmanager/msbuildversionmanager.h @@ -101,7 +101,7 @@ public: QList<MsBuildInformation *> msBuildInformations() const; MsBuildInformation* msBuildInformation(Core::Id msBuildID); MsBuildInformation* msBuildInformation(MsBuildInformation::MsBuildVersion minVersion, MsBuildInformation::MsBuildVersion maxVersion); - void removeMsBuildInformation(Core::Id msBuildId); + void removeMsBuildInformation(const Core::Id &msBuildId); void replace(Core::Id targetMsBuild, MsBuildInformation *newMsBuild); void saveSettings(); diff --git a/src/plugins/vcprojectmanager/vcproject.cpp b/src/plugins/vcprojectmanager/vcproject.cpp index 684c3acdb1..6b9f3685bb 100644 --- a/src/plugins/vcprojectmanager/vcproject.cpp +++ b/src/plugins/vcprojectmanager/vcproject.cpp @@ -253,7 +253,7 @@ bool VcProject::setupTarget(ProjectExplorer::Target *t) { QList<Configuration::Ptr > configsModel = m_projectFile->documentModel()->vcProjectDocument()->configurations()->configurations(); - foreach (Configuration::Ptr configModel, configsModel) + foreach (const Configuration::Ptr &configModel, configsModel) addBuildConfiguration(t, configModel); return true; } @@ -263,9 +263,10 @@ bool VcProject::setupTarget(ProjectExplorer::Target *t) */ void VcProject::addCxxModelFiles(const FolderNode *node, QStringList &projectFiles) { - foreach (const FileNode *file, node->fileNodes()) + foreach (const FileNode *file, node->fileNodes()) { if (file->fileType() == HeaderType || file->fileType() == SourceType) projectFiles << file->path(); + } foreach (const FolderNode *subfolder, node->subFolderNodes()) addCxxModelFiles(subfolder, projectFiles); } @@ -314,10 +315,10 @@ void VcProject::updateCodeModels() pPart->defines += tc->predefinedMacros(QStringList()); QStringList cxxFlags; - foreach (const HeaderPath &path, tc->systemHeaderPaths(cxxFlags, Utils::FileName())) + foreach (const HeaderPath &path, tc->systemHeaderPaths(cxxFlags, Utils::FileName())) { if (path.kind() != HeaderPath::FrameworkHeaderPath) pPart->includePaths += path.path(); - + } QStringList files; addCxxModelFiles(m_rootNode, files); diff --git a/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp b/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp index b75a60abb5..24456c09e1 100644 --- a/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp +++ b/src/plugins/vcprojectmanager/vcprojectbuildoptionspage.cpp @@ -273,7 +273,7 @@ void VcProjectBuildOptionsWidget::saveSettings() const disconnect(msBVM, SIGNAL(msBuildReplaced(Core::Id,Core::Id)), this, SLOT(onMsBuildReplaced(Core::Id,Core::Id))); if (msBVM) { - foreach (Core::Id id, m_removedMsBuilds) + foreach (const Core::Id &id, m_removedMsBuilds) msBVM->removeMsBuildInformation(id); foreach (MsBuildInformation *info, m_newMsBuilds) diff --git a/src/plugins/vcprojectmanager/vcprojectmanager.cpp b/src/plugins/vcprojectmanager/vcprojectmanager.cpp index d4a3ec44c5..f2b312d464 100644 --- a/src/plugins/vcprojectmanager/vcprojectmanager.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmanager.cpp @@ -187,7 +187,7 @@ void VcManager::readSchemaPath() QStringList schemaPaths = msSchemaPathsData.split(QLatin1Char(';')); - foreach (QString schema, schemaPaths) { + foreach (const QString &schema, schemaPaths) { QStringList schemaData = schema.split(QLatin1String("::")); if (schemaData.size() == 2) { if (schemaData[0] == QLatin1String(Constants::VC_PROJECT_SCHEMA_2003_QUIALIFIER)) diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference_private.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference_private.cpp index fd9a53018f..54befc8a82 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference_private.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference_private.cpp @@ -64,7 +64,7 @@ QDomNode ActiveXReference_Private::toXMLDomNode(QDomDocument &domXMLDocument) co activeXNode.setAttribute(QLatin1String("ControlVersion"), m_controlVersion); activeXNode.setAttribute(QLatin1String("WrapperTool"), m_wrapperTool); - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) activeXNode.appendChild(refConfig->toXMLDomNode(domXMLDocument)); return activeXNode; @@ -76,9 +76,10 @@ void ActiveXReference_Private::addReferenceConfiguration(ReferenceConfiguration: return; // Don't add configuration with the same name - foreach (ReferenceConfiguration::Ptr refConf, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConf, m_referenceConfigurations) { if (refConfig->name() == refConf->name()) return; + } m_referenceConfigurations.append(refConfig); } @@ -90,7 +91,7 @@ void ActiveXReference_Private::removeReferenceConfiguration(ReferenceConfigurati void ActiveXReference_Private::removeReferenceConfiguration(const QString &refConfigName) { - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) { + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) { if (refConfig->name() == refConfigName) { removeReferenceConfiguration(refConfig); return; @@ -105,9 +106,10 @@ QList<ReferenceConfiguration::Ptr > ActiveXReference_Private::referenceConfigura ReferenceConfiguration::Ptr ActiveXReference_Private::referenceConfiguration(const QString &refConfigName) const { - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) { if (refConfig->name() == refConfigName) return refConfig; + } return ReferenceConfiguration::Ptr(); } @@ -152,7 +154,7 @@ ActiveXReference_Private::ActiveXReference_Private(const ActiveXReference_Privat m_controlVersion = ref.m_controlVersion; m_wrapperTool = ref.m_wrapperTool; - foreach (ReferenceConfiguration::Ptr refConf, ref.m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConf, ref.m_referenceConfigurations) m_referenceConfigurations.append(refConf->clone()); } @@ -165,7 +167,7 @@ ActiveXReference_Private &ActiveXReference_Private::operator =(const ActiveXRefe m_referenceConfigurations.clear(); - foreach (ReferenceConfiguration::Ptr refConf, ref.m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConf, ref.m_referenceConfigurations) m_referenceConfigurations.append(refConf->clone()); } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference_private.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference_private.cpp index fa772f6c0c..03d861443e 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference_private.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference_private.cpp @@ -62,7 +62,7 @@ QDomNode AssemblyReference_Private::toXMLDomNode(QDomDocument &domXMLDocument) c assemblyRefNode.setAttribute(QLatin1String("RelativePath"), m_relativePath); - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) assemblyRefNode.appendChild(refConfig->toXMLDomNode(domXMLDocument)); return assemblyRefNode; @@ -83,9 +83,10 @@ void AssemblyReference_Private::addReferenceConfiguration(ReferenceConfiguration if (m_referenceConfigurations.contains(refConfig)) return; - foreach (ReferenceConfiguration::Ptr refConf, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConf, m_referenceConfigurations) { if (refConfig->name() == refConf->name()) return; + } m_referenceConfigurations.append(refConfig); } @@ -97,7 +98,7 @@ void AssemblyReference_Private::removeReferenceConfiguration(ReferenceConfigurat void AssemblyReference_Private::removeReferenceConfiguration(const QString &refConfName) { - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) { + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) { if (refConfig->name() == refConfName) { removeReferenceConfiguration(refConfig); return; @@ -112,9 +113,10 @@ QList<ReferenceConfiguration::Ptr > AssemblyReference_Private::referenceConfigur ReferenceConfiguration::Ptr AssemblyReference_Private::referenceConfiguration(const QString &refConfigName) const { - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) { if (refConfig->name() == refConfigName) return refConfig; + } return ReferenceConfiguration::Ptr(); } @@ -126,7 +128,7 @@ AssemblyReference_Private::AssemblyReference_Private(const AssemblyReference_Pri { m_relativePath = asmPrivate.m_relativePath; - foreach (ReferenceConfiguration::Ptr refConfig, asmPrivate.m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, asmPrivate.m_referenceConfigurations) m_referenceConfigurations.append(refConfig->clone()); } @@ -135,7 +137,7 @@ AssemblyReference_Private &AssemblyReference_Private::operator =(const AssemblyR if (this != &asmPrivate) { m_relativePath = asmPrivate.m_relativePath; - foreach (ReferenceConfiguration::Ptr refConfig, asmPrivate.m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, asmPrivate.m_referenceConfigurations) m_referenceConfigurations.append(refConfig->clone()); } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp index 4b99aaf741..5704c440cd 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp @@ -48,7 +48,7 @@ Configurations::Configurations(const Configurations &configs) { m_vcProjDoc = configs.m_vcProjDoc; - foreach (Configuration::Ptr config, configs.m_configurations) + foreach (const Configuration::Ptr &config, configs.m_configurations) m_configurations.append(config->clone()); } @@ -58,7 +58,7 @@ Configurations &Configurations::operator =(const Configurations &configs) m_vcProjDoc = configs.m_vcProjDoc; m_configurations.clear(); - foreach (Configuration::Ptr config, configs.m_configurations) + foreach (const Configuration::Ptr &config, configs.m_configurations) m_configurations.append(config->clone()); } @@ -96,7 +96,7 @@ QDomNode Configurations::toXMLDomNode(QDomDocument &domXMLDocument) const { QDomElement configsNode = domXMLDocument.createElement(QLatin1String("Configurations")); - foreach (Configuration::Ptr config, m_configurations) + foreach (const Configuration::Ptr &config, m_configurations) configsNode.appendChild(config->toXMLDomNode(domXMLDocument)); return configsNode; @@ -175,9 +175,10 @@ bool Configurations::appendConfiguration(Configuration::Ptr config) return false; // if there is already a configuration with the same name - foreach (Configuration::Ptr conf, m_configurations) + foreach (const Configuration::Ptr &conf, m_configurations) { if (config->name() == conf->name()) return false; + } m_configurations.append(config); return true; } @@ -189,9 +190,10 @@ void Configurations::removeConfiguration(Configuration::Ptr config) Configuration::Ptr Configurations::configuration(const QString &configName) { - foreach (Configuration::Ptr config, m_configurations) + foreach (const Configuration::Ptr &config, m_configurations) { if (config->name() == configName) return config; + } return Configuration::Ptr(); } @@ -201,7 +203,7 @@ Configuration::Ptr Configurations::cloneConfiguration(const QString &newConfigNa if (configuration(newConfigName)) return Configuration::Ptr(); - foreach (Configuration::Ptr config, m_configurations) { + foreach (const Configuration::Ptr &config, m_configurations) { if (config->name() == configToClone) { Configuration::Ptr clonedConfig = config->clone(); clonedConfig->setName(newConfigName); diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurationtype.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurationtype.cpp index f62851b180..8d139dc74d 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configurationtype.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurationtype.cpp @@ -102,7 +102,7 @@ QDomNode ConfigurationType::toXMLDomNode(QDomDocument &domXMLDocument, const QSt configurationNode.setAttribute(it.key(), it.value()); } - foreach (Tool::Ptr tool, m_tools) + foreach (const Tool::Ptr &tool, m_tools) configurationNode.appendChild(tool->toXMLDomNode(domXMLDocument)); return configurationNode; @@ -123,9 +123,10 @@ void ConfigurationType::removeTool(Tool::Ptr tool) Tool::Ptr ConfigurationType::tool(const QString &toolName) const { - foreach (Tool::Ptr tool, m_tools) + foreach (const Tool::Ptr &tool, m_tools) { if (tool && tool->name() == toolName) return tool; + } return Tool::Ptr(); } @@ -185,7 +186,7 @@ ConfigurationType::ConfigurationType(const ConfigurationType &configType) m_name = configType.m_name; m_anyAttribute = configType.m_anyAttribute; - foreach (Tool::Ptr tool, configType.m_tools) + foreach (const Tool::Ptr &tool, configType.m_tools) m_tools.append(tool->clone()); } @@ -196,7 +197,7 @@ ConfigurationType &ConfigurationType::operator =(const ConfigurationType &config m_anyAttribute = configType.m_anyAttribute; m_tools.clear(); - foreach (Tool::Ptr tool, configType.m_tools) + foreach (const Tool::Ptr &tool, configType.m_tools) m_tools.append(tool->clone()); } return *this; @@ -282,10 +283,10 @@ QDomNode ConfigurationType2005::toXMLDomNode(QDomDocument &domXMLDocument, const configurationNode.setAttribute(it.key(), it.value()); } - foreach (Tool::Ptr tool, m_tools) + foreach (const Tool::Ptr &tool, m_tools) configurationNode.appendChild(tool->toXMLDomNode(domXMLDocument)); - foreach (DeploymentTool::Ptr tool, m_deploymentTools) + foreach (const DeploymentTool::Ptr &tool, m_deploymentTools) configurationNode.appendChild(tool->toXMLDomNode(domXMLDocument)); return configurationNode; @@ -318,9 +319,10 @@ QList<DeploymentTool::Ptr > ConfigurationType2005::deploymentTools(const QString { QList<DeploymentTool::Ptr > deploymentTools; - foreach (DeploymentTool::Ptr tool, m_deploymentTools) + foreach (const DeploymentTool::Ptr &tool, m_deploymentTools) { if (tool->attributeValue(attributeName) == attributeValue) deploymentTools.append(tool); + } return deploymentTools; } @@ -331,7 +333,7 @@ ConfigurationType2005::ConfigurationType2005() ConfigurationType2005::ConfigurationType2005(const ConfigurationType2005 &configType) : ConfigurationType2003(configType) { - foreach (DeploymentTool::Ptr tool, configType.m_deploymentTools) + foreach (const DeploymentTool::Ptr &tool, configType.m_deploymentTools) m_deploymentTools.append(DeploymentTool::Ptr(new DeploymentTool(*tool))); } @@ -341,7 +343,7 @@ ConfigurationType2005 &ConfigurationType2005::operator=(const ConfigurationType2 ConfigurationType2003::operator =(configType); m_deploymentTools.clear(); - foreach (DeploymentTool::Ptr tool, configType.m_deploymentTools) + foreach (const DeploymentTool::Ptr &tool, configType.m_deploymentTools) m_deploymentTools.append(DeploymentTool::Ptr(new DeploymentTool(*tool))); } return *this; @@ -408,13 +410,13 @@ QDomNode ConfigurationType2008::toXMLDomNode(QDomDocument &domXMLDocument, const configurationNode.setAttribute(it.key(), it.value()); } - foreach (Tool::Ptr tool, m_tools) + foreach (const Tool::Ptr &tool, m_tools) configurationNode.appendChild(tool->toXMLDomNode(domXMLDocument)); - foreach (DeploymentTool::Ptr tool, m_deploymentTools) + foreach (const DeploymentTool::Ptr &tool, m_deploymentTools) configurationNode.appendChild(tool->toXMLDomNode(domXMLDocument)); - foreach (DebuggerTool::Ptr tool, m_debuggerTools) + foreach (const DebuggerTool::Ptr &tool, m_debuggerTools) configurationNode.appendChild(tool->toXMLDomNode(domXMLDocument)); return configurationNode; @@ -446,9 +448,10 @@ QList<DebuggerTool::Ptr > ConfigurationType2008::debuggerTools(const QString &at { QList<DebuggerTool::Ptr > debuggerTools; - foreach (DebuggerTool::Ptr tool, m_debuggerTools) + foreach (const DebuggerTool::Ptr &tool, m_debuggerTools) { if (tool->attributeValue(attributeName) == attributeValue) debuggerTools.append(tool); + } return debuggerTools; } @@ -459,7 +462,7 @@ ConfigurationType2008::ConfigurationType2008() ConfigurationType2008::ConfigurationType2008(const ConfigurationType2008 &configType) : ConfigurationType2005(configType) { - foreach (DebuggerTool::Ptr tool, configType.m_debuggerTools) + foreach (const DebuggerTool::Ptr &tool, configType.m_debuggerTools) m_debuggerTools.append(DebuggerTool::Ptr(new DebuggerTool(*tool))); } @@ -469,7 +472,7 @@ ConfigurationType2008 &ConfigurationType2008::operator=(const ConfigurationType2 ConfigurationType2005::operator =(configType); m_debuggerTools.clear(); - foreach (DebuggerTool::Ptr tool, configType.m_debuggerTools) + foreach (const DebuggerTool::Ptr &tool, configType.m_debuggerTools) m_debuggerTools.append(DebuggerTool::Ptr(new DebuggerTool(*tool))); } return *this; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp index 90419b4895..dcfaa693fc 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp @@ -108,8 +108,7 @@ void DeploymentTool::clearAttribute(const QString &attributeName) void DeploymentTool::removeAttribute(const QString &attributeName) { - if (m_anyAttribute.contains(attributeName)) - m_anyAttribute.remove(attributeName); + m_anyAttribute.remove(attributeName); } } // namespace Internal diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp index a857447f5e..8aa67a9668 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp @@ -75,7 +75,7 @@ void Files::removeFilter(const QString &filterName) { QList<Filter::Ptr> filters = m_private->filters(); - foreach (Filter::Ptr filter, filters) { + foreach (const Filter::Ptr &filter, filters) { if (filter->name() == filterName) { m_private->removeFilter(filter); return; @@ -117,14 +117,14 @@ bool Files::fileExists(const QString &relativeFilePath) const { QList<File::Ptr> files = m_private->files(); - foreach (File::Ptr filePtr, files) { + foreach (const File::Ptr &filePtr, files) { if (filePtr->relativePath() == relativeFilePath) return true; } QList<Filter::Ptr> filters = m_private->filters(); - foreach (Filter::Ptr filterPtr, filters) { + foreach (const Filter::Ptr &filterPtr, filters) { if (filterPtr->fileExists(relativeFilePath)) return true; } @@ -137,10 +137,10 @@ void Files::allProjectFiles(QStringList &sl) const QList<Filter::Ptr > filters = m_private->filters(); QList<File::Ptr > files = m_private->files(); - foreach (Filter::Ptr filter, filters) + foreach (const Filter::Ptr &filter, filters) filter->allFiles(sl); - foreach (File::Ptr file, files) + foreach (const File::Ptr &file, files) sl.append(file->canonicalPath()); } @@ -224,14 +224,14 @@ bool Files2005::fileExists(const QString &relativeFilePath) const { QList<File::Ptr> files = m_private->files(); - foreach (File::Ptr filePtr, files) { + foreach (const File::Ptr &filePtr, files) { if (filePtr->relativePath() == relativeFilePath) return true; } QList<Filter::Ptr> filters = m_private->filters(); - foreach (Filter::Ptr filterPtr, filters) { + foreach (const Filter::Ptr &filterPtr, filters) { if (filterPtr->fileExists(relativeFilePath)) return true; } @@ -239,7 +239,7 @@ bool Files2005::fileExists(const QString &relativeFilePath) const QSharedPointer<Files2005_Private> files_p = m_private.staticCast<Files2005_Private>(); QList<Folder::Ptr> folders = files_p->folders(); - foreach (Folder::Ptr folderPtr, folders) { + foreach (const Folder::Ptr &folderPtr, folders) { if (folderPtr->fileExists(relativeFilePath)) return true; } @@ -264,7 +264,7 @@ void Files2005::removeFolder(const QString &folderName) QSharedPointer<Files2005_Private> files_p = m_private.staticCast<Files2005_Private>(); QList<Folder::Ptr> folders = files_p->folders(); - foreach (Folder::Ptr folder, folders) { + foreach (const Folder::Ptr &folder, folders) { if (folder->name() == folderName) { files_p->removeFolder(folder); return; @@ -291,13 +291,13 @@ void Files2005::allProjectFiles(QStringList &sl) const QList<Filter::Ptr > filters = m_private->filters(); QList<File::Ptr > files = m_private->files(); - foreach (Filter::Ptr filter, filters) + foreach (const Filter::Ptr &filter, filters) filter->allFiles(sl); - foreach (Folder::Ptr filter, folders) + foreach (const Folder::Ptr &filter, folders) filter->allFiles(sl); - foreach (File::Ptr file, files) + foreach (const File::Ptr &file, files) sl.append(file->canonicalPath()); } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/files_private.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/files_private.cpp index 2271c739f8..ef6a544838 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/files_private.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/files_private.cpp @@ -65,10 +65,10 @@ QDomNode Files_Private::toXMLDomNode(QDomDocument &domXMLDocument) const { QDomElement fileNode = domXMLDocument.createElement(QLatin1String("Files")); - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) fileNode.appendChild(file->toXMLDomNode(domXMLDocument)); - foreach (Filter::Ptr filter, m_filters) + foreach (const Filter::Ptr &filter, m_filters) fileNode.appendChild(filter->toXMLDomNode(domXMLDocument)); return fileNode; @@ -79,9 +79,10 @@ void Files_Private::addFilter(Filter::Ptr newFilter) if (m_filters.contains(newFilter)) return; - foreach (Filter::Ptr filter, m_filters) + foreach (const Filter::Ptr &filter, m_filters) { if (filter->name() == newFilter->name()) return; + } m_filters.append(newFilter); } @@ -98,9 +99,10 @@ QList<Filter::Ptr > Files_Private::filters() const Filter::Ptr Files_Private::filter(const QString &filterName) const { - foreach (Filter::Ptr filter, m_filters) + foreach (const Filter::Ptr &filter, m_filters) { if (filter->name() == filterName) return filter; + } return Filter::Ptr(); } @@ -109,9 +111,10 @@ void Files_Private::addFile(File::Ptr newFile) if (m_files.contains(newFile)) return; - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) { if (file->relativePath() == newFile->relativePath()) return; + } m_files.append(newFile); } @@ -128,9 +131,10 @@ QList<File::Ptr > Files_Private::files() const File::Ptr Files_Private::file(const QString &relativePath) const { - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) { if (file->relativePath() == relativePath) return file; + } return File::Ptr(); } @@ -141,10 +145,10 @@ Files_Private::Files_Private(VcProjectDocument *parentProject) Files_Private::Files_Private(const Files_Private &filesPrivate) { - foreach (File::Ptr file, filesPrivate.m_files) + foreach (const File::Ptr &file, filesPrivate.m_files) m_files.append(File::Ptr(new File(*file))); - foreach (Filter::Ptr filter, filesPrivate.m_filters) + foreach (const Filter::Ptr &filter, filesPrivate.m_filters) m_filters.append(Filter::Ptr(new Filter(*filter))); } @@ -154,10 +158,10 @@ Files_Private &Files_Private::operator=(const Files_Private &filesPrivate) m_files.clear(); m_filters.clear(); - foreach (File::Ptr file, filesPrivate.m_files) + foreach (const File::Ptr &file, filesPrivate.m_files) m_files.append(File::Ptr(new File(*file))); - foreach (Filter::Ptr filter, filesPrivate.m_filters) + foreach (const Filter::Ptr &filter, filesPrivate.m_filters) m_filters.append(Filter::Ptr(new Filter(*filter))); } return *this; @@ -231,7 +235,7 @@ Files2005_Private::Files2005_Private(VcProjectDocument *parentProjectDocument) Files2005_Private::Files2005_Private(const Files2005_Private &filesPrivate) : Files_Private(filesPrivate) { - foreach (Folder::Ptr folder, filesPrivate.m_folders) + foreach (const Folder::Ptr &folder, filesPrivate.m_folders) m_folders.append(Folder::Ptr(new Folder(*folder))); } @@ -241,7 +245,7 @@ Files2005_Private &Files2005_Private::operator =(const Files2005_Private &filesP Files_Private::operator =(filesPrivate); m_folders.clear(); - foreach (Folder::Ptr folder, filesPrivate.m_folders) + foreach (const Folder::Ptr &folder, filesPrivate.m_folders) m_folders.append(Folder::Ptr(new Folder(*folder))); } return *this; @@ -274,13 +278,13 @@ QDomNode Files2005_Private::toXMLDomNode(QDomDocument &domXMLDocument) const { QDomElement fileNode = domXMLDocument.createElement(QLatin1String("Files")); - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) fileNode.appendChild(file->toXMLDomNode(domXMLDocument)); - foreach (Filter::Ptr filter, m_filters) + foreach (const Filter::Ptr &filter, m_filters) fileNode.appendChild(filter->toXMLDomNode(domXMLDocument)); - foreach (Folder::Ptr folder, m_folders) + foreach (const Folder::Ptr &folder, m_folders) fileNode.appendChild(folder->toXMLDomNode(domXMLDocument)); return fileNode; @@ -296,9 +300,10 @@ void Files2005_Private::addFolder(Folder::Ptr newFolder) if (m_folders.contains(newFolder)) return; - foreach (Folder::Ptr folder, m_folders) + foreach (const Folder::Ptr &folder, m_folders) { if (folder->name() == newFolder->name()) return; + } m_folders.append(newFolder); } @@ -315,9 +320,10 @@ QList<Folder::Ptr > Files2005_Private::folders() const Folder::Ptr Files2005_Private::folder(const QString &folderName) const { - foreach (Folder::Ptr folder, m_folders) + foreach (const Folder::Ptr &folder, m_folders) { if (folder->name() == folderName) return folder; + } return Folder::Ptr(); } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filetype.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/filetype.cpp index 00abe1f842..b509f73651 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/filetype.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/filetype.cpp @@ -79,10 +79,10 @@ QDomNode FileType::toXMLDomNode(QDomDocument &domXMLDocument) const fileNode.setAttribute(it.key(), it.value()); } - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) fileNode.appendChild(file->toXMLDomNode(domXMLDocument)); - foreach (FileConfiguration::Ptr fileConfig, m_fileConfigurations) + foreach (const FileConfiguration::Ptr &fileConfig, m_fileConfigurations) fileNode.appendChild(fileConfig->toXMLDomNode(domXMLDocument)); return fileNode; @@ -193,10 +193,10 @@ FileType::FileType(const FileType &fileType) m_parentProjectDoc = fileType.m_parentProjectDoc; m_relativePath = fileType.m_relativePath; - foreach (File::Ptr file, fileType.m_files) + foreach (const File::Ptr &file, fileType.m_files) m_files.append(File::Ptr(new File(*file))); - foreach (FileConfiguration::Ptr fileConfig, m_fileConfigurations) + foreach (const FileConfiguration::Ptr &fileConfig, m_fileConfigurations) m_fileConfigurations.append(fileConfig->clone()); } @@ -209,10 +209,10 @@ FileType &FileType::operator=(const FileType &fileType) m_files.clear(); m_fileConfigurations.clear(); - foreach (File::Ptr file, fileType.m_files) + foreach (const File::Ptr &file, fileType.m_files) m_files.append(File::Ptr(new File(*file))); - foreach (FileConfiguration::Ptr fileConfig, m_fileConfigurations) + foreach (const FileConfiguration::Ptr &fileConfig, m_fileConfigurations) m_fileConfigurations.append(fileConfig->clone()); } return *this; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp index 4a468c98f5..399574b853 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp @@ -137,16 +137,17 @@ bool Filter::fileExists(const QString &relativeFilePath) { QList<File::Ptr> files = m_filterType->files(); - foreach (File::Ptr filePtr, files) { + foreach (const File::Ptr &filePtr, files) { if (filePtr->relativePath() == relativeFilePath) return true; } QList<Filter::Ptr> filters = m_filterType->filters(); - foreach (Filter::Ptr filterPtr, filters) + foreach (const Filter::Ptr &filterPtr, filters) { if (filterPtr->fileExists(relativeFilePath)) return true; + } return false; } @@ -176,10 +177,10 @@ void Filter::allFiles(QStringList &sl) const QList<Filter::Ptr > filters = m_filterType->filters(); QList<File::Ptr > files = m_filterType->files(); - foreach (Filter::Ptr filter, filters) + foreach (const Filter::Ptr &filter, filters) filter->allFiles(sl); - foreach (File::Ptr file, files) + foreach (const File::Ptr &file, files) sl.append(file->canonicalPath()); } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filtertype.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/filtertype.cpp index 8ec0e4705b..927d6d139e 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/filtertype.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/filtertype.cpp @@ -71,10 +71,10 @@ QDomNode FilterType::toXMLDomNode(QDomDocument &domXMLDocument) const fileNode.setAttribute(it.key(), it.value()); } - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) fileNode.appendChild(file->toXMLDomNode(domXMLDocument)); - foreach (Filter::Ptr filter, m_filters) + foreach (const Filter::Ptr &filter, m_filters) fileNode.appendChild(filter->toXMLDomNode(domXMLDocument)); return fileNode; @@ -95,9 +95,10 @@ void FilterType::addFilter(QSharedPointer<VcProjectManager::Internal::Filter> fi if (m_filters.contains(filter)) return; - foreach (Filter::Ptr filt, m_filters) + foreach (const Filter::Ptr &filt, m_filters) { if (filt->name() == filter->name()) return; + } m_filters.append(filter); } @@ -109,7 +110,7 @@ void FilterType::removeFilter(QSharedPointer<VcProjectManager::Internal::Filter> void FilterType::removeFilter(const QString &filterName) { - foreach (Filter::Ptr filter, m_filters) { + foreach (const Filter::Ptr &filter, m_filters) { if (filter->name() == filterName) { removeFilter(filter); return; @@ -127,9 +128,10 @@ void FilterType::addFile(File::Ptr file) if (m_files.contains(file)) return; - foreach (File::Ptr f, m_files) + foreach (const File::Ptr &f, m_files) { if (f->relativePath() == file->relativePath()) return; + } m_files.append(file); } @@ -141,7 +143,7 @@ void FilterType::removeFile(File::Ptr file) void FilterType::removeFile(const QString &relativeFilePath) { - foreach (File::Ptr file, m_files) { + foreach (const File::Ptr &file, m_files) { if (file->relativePath() == relativeFilePath) { removeFile(file); return; @@ -151,9 +153,10 @@ void FilterType::removeFile(const QString &relativeFilePath) File::Ptr FilterType::file(const QString &relativePath) const { - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) { if (file->relativePath() == relativePath) return file; + } return File::Ptr(); } @@ -199,10 +202,10 @@ FilterType::FilterType(const FilterType &filterType) m_anyAttribute = filterType.m_anyAttribute; m_name = filterType.m_name; - foreach (File::Ptr file, filterType.m_files) + foreach (const File::Ptr &file, filterType.m_files) m_files.append(File::Ptr(new File(*file))); - foreach (Filter::Ptr filter, filterType.m_filters) + foreach (const Filter::Ptr &filter, filterType.m_filters) m_filters.append(Filter::Ptr(new Filter(*filter))); } @@ -215,10 +218,10 @@ FilterType &FilterType::operator =(const FilterType &filterType) m_files.clear(); m_filters.clear(); - foreach (File::Ptr file, filterType.m_files) + foreach (const File::Ptr &file, filterType.m_files) m_files.append(File::Ptr(new File(*file))); - foreach (Filter::Ptr file, filterType.m_filters) + foreach (const Filter::Ptr &file, filterType.m_filters) m_filters.append(Filter::Ptr(new Filter(*file))); } return *this; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp index 905f44612e..4e8cc3faa9 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp @@ -132,21 +132,24 @@ bool Folder::fileExists(const QString &relativeFilePath) { QList<File::Ptr> files = m_folderType->files(); - foreach (File::Ptr filePtr, files) + foreach (const File::Ptr &filePtr, files) { if (filePtr->relativePath() == relativeFilePath) return true; + } QList<Filter::Ptr> filters = m_folderType->filters(); - foreach (Filter::Ptr filterPtr, filters) + foreach (const Filter::Ptr &filterPtr, filters) { if (filterPtr->fileExists(relativeFilePath)) return true; + } QList<Folder::Ptr> folders = m_folderType->folders(); - foreach (Folder::Ptr folderPtr, folders) + foreach (const Folder::Ptr &folderPtr, folders) { if (folderPtr->fileExists(relativeFilePath)) return true; + } return false; } @@ -212,13 +215,13 @@ void Folder::allFiles(QStringList &sl) QList<Filter::Ptr > filters = m_folderType->filters(); QList<File::Ptr > files = m_folderType->files(); - foreach (Filter::Ptr filter, filters) + foreach (const Filter::Ptr &filter, filters) filter->allFiles(sl); - foreach (Folder::Ptr filter, folders) + foreach (const Folder::Ptr &filter, folders) filter->allFiles(sl); - foreach (File::Ptr file, files) + foreach (const File::Ptr &file, files) sl.append(file->canonicalPath()); } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/foldertype.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/foldertype.cpp index aef20efef5..ff7eaa3802 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/foldertype.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/foldertype.cpp @@ -95,13 +95,13 @@ QDomNode FolderType::toXMLDomNode(QDomDocument &domXMLDocument) const fileNode.setAttribute(it.key(), it.value()); } - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) fileNode.appendChild(file->toXMLDomNode(domXMLDocument)); - foreach (Filter::Ptr filter, m_filters) + foreach (const Filter::Ptr &filter, m_filters) fileNode.appendChild(filter->toXMLDomNode(domXMLDocument)); - foreach (Folder::Ptr folder, m_folders) + foreach (const Folder::Ptr &folder, m_folders) fileNode.appendChild(folder->toXMLDomNode(domXMLDocument)); return fileNode; @@ -166,7 +166,7 @@ void FolderType::addFilter(Filter::Ptr filter) if (m_filters.contains(filter)) return; - foreach (Filter::Ptr filt, m_filters) { + foreach (const Filter::Ptr &filt, m_filters) { if (filt->name() == filter->name()) return; } @@ -181,7 +181,7 @@ void FolderType::removeFilter(Filter::Ptr filter) void FolderType::removeFilter(const QString &filterName) { - foreach (Filter::Ptr filter, m_filters) { + foreach (const Filter::Ptr &filter, m_filters) { if (filter->name() == filterName) { removeFilter(filter); return; @@ -196,9 +196,10 @@ QList<Filter::Ptr > FolderType::filters() const Filter::Ptr FolderType::filter(const QString &filterName) const { - foreach (Filter::Ptr filter, m_filters) + foreach (const Filter::Ptr &filter, m_filters) { if (filter->name() == filterName) return filter; + } return Filter::Ptr(); } @@ -207,10 +208,10 @@ void FolderType::addFile(File::Ptr file) if (m_files.contains(file)) return; - foreach (File::Ptr f, m_files) + foreach (const File::Ptr &f, m_files) { if (f->relativePath() == file->relativePath()) return; - + } m_files.append(file); } @@ -221,7 +222,7 @@ void FolderType::removeFile(File::Ptr file) void FolderType::removeFile(const QString &relativeFilePath) { - foreach (File::Ptr file, m_files) { + foreach (const File::Ptr &file, m_files) { if (file->relativePath() == relativeFilePath) { removeFile(file); return; @@ -236,9 +237,10 @@ QList<File::Ptr > FolderType::files() const File::Ptr FolderType::file(const QString &relativeFilePath) const { - foreach (File::Ptr file, m_files) + foreach (const File::Ptr &file, m_files) { if (file->relativePath() == relativeFilePath) return file; + } return File::Ptr(); } @@ -247,10 +249,10 @@ void FolderType::addFolder(QSharedPointer<Folder> folder) if (m_folders.contains(folder)) return; - foreach (Folder::Ptr f, m_folders) + foreach (const Folder::Ptr &f, m_folders) { if (f->name() == folder->name()) return; - + } m_folders.append(folder); } @@ -261,7 +263,7 @@ void FolderType::removeFolder(QSharedPointer<Folder> folder) void FolderType::removeFolder(const QString &folderName) { - foreach (Folder::Ptr f, m_folders) { + foreach (const Folder::Ptr &f, m_folders) { if (f->name() == folderName) { removeFolder(f); return; @@ -276,9 +278,10 @@ QList<QSharedPointer<Folder> > FolderType::folders() const QSharedPointer<Folder> FolderType::folder(const QString &folderName) const { - foreach (Folder::Ptr folder, m_folders) + foreach (const Folder::Ptr &folder, m_folders) { if (folder->name() == folderName) return folder; + } return Folder::Ptr(); } @@ -329,13 +332,13 @@ FolderType::FolderType(const FolderType &folderType) m_name = folderType.m_name; m_anyAttribute = folderType.m_anyAttribute; - foreach (File::Ptr file, folderType.m_files) + foreach (const File::Ptr &file, folderType.m_files) m_files.append(File::Ptr(new File(*file))); - foreach (Filter::Ptr filter, folderType.m_filters) + foreach (const Filter::Ptr &filter, folderType.m_filters) m_filters.append(Filter::Ptr(new Filter(*filter))); - foreach (Folder::Ptr folder, folderType.m_folders) + foreach (const Folder::Ptr &folder, folderType.m_folders) m_folders.append(Folder::Ptr(new Folder(*folder))); } @@ -350,13 +353,13 @@ FolderType &FolderType::operator =(const FolderType &folderType) m_folders.clear(); m_filters.clear(); - foreach (File::Ptr file, folderType.m_files) + foreach (const File::Ptr &file, folderType.m_files) m_files.append(File::Ptr(new File(*file))); - foreach (Filter::Ptr filter, folderType.m_filters) + foreach (const Filter::Ptr &filter, folderType.m_filters) m_filters.append(Filter::Ptr(new Filter(*filter))); - foreach (Folder::Ptr folder, folderType.m_folders) + foreach (const Folder::Ptr &folder, folderType.m_folders) m_folders.append(Folder::Ptr(new Folder(*folder))); } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp index f64afebec8..d88b63ab39 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp @@ -86,7 +86,7 @@ QDomNode Globals::toXMLDomNode(QDomDocument &domXMLDocument) const { QDomElement globalsNode = domXMLDocument.createElement(QLatin1String("Globals")); - foreach (Global::Ptr global, m_globals) + foreach (const Global::Ptr &global, m_globals) globalsNode.appendChild(global->toXMLDomNode(domXMLDocument)); return globalsNode; @@ -122,7 +122,7 @@ void Globals::removeGlobal(Global::Ptr global) void Globals::removeGlobal(const QString &globalName) { - foreach (Global::Ptr global, m_globals) { + foreach (const Global::Ptr &global, m_globals) { if (global->name() == globalName) { removeGlobal(global); return; @@ -137,9 +137,10 @@ QList<Global::Ptr > Globals::globals() const Global::Ptr Globals::global(const QString &name) { - foreach (Global::Ptr global, m_globals) + foreach (const Global::Ptr &global, m_globals) { if (global->name() == name) return global; + } return Global::Ptr(); } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp index a280c7662d..69d5bf0f46 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp @@ -38,7 +38,7 @@ Platforms::Platforms() Platforms::Platforms(const Platforms &platforms) { - foreach (Platform::Ptr platform, platforms.m_platforms) + foreach (const Platform::Ptr &platform, platforms.m_platforms) m_platforms.append(Platform::Ptr(new Platform(*platform))); } @@ -47,7 +47,7 @@ Platforms &Platforms::operator =(const Platforms &platforms) if (this != &platforms) { m_platforms.clear(); - foreach (Platform::Ptr platform, platforms.m_platforms) + foreach (const Platform::Ptr &platform, platforms.m_platforms) m_platforms.append(Platform::Ptr(new Platform(*platform))); } return *this; @@ -84,7 +84,7 @@ QDomNode Platforms::toXMLDomNode(QDomDocument &domXMLDocument) const { QDomElement platformsNode = domXMLDocument.createElement(QLatin1String("Platforms")); - foreach (Platform::Ptr platform, m_platforms) + foreach (const Platform::Ptr &platform, m_platforms) platformsNode.appendChild(platform->toXMLDomNode(domXMLDocument)); return platformsNode; @@ -112,10 +112,10 @@ void Platforms::addPlatform(Platform::Ptr platform) if (m_platforms.contains(platform)) return; - foreach (Platform::Ptr platf, m_platforms) + foreach (const Platform::Ptr &platf, m_platforms) { if (platf->name() == platform->name()) return; - + } m_platforms.append(platform); } @@ -126,7 +126,7 @@ void Platforms::removePlatform(Platform::Ptr platform) void Platforms::removePlatform(const QString &platformName) { - foreach (Platform::Ptr platform, m_platforms) { + foreach (const Platform::Ptr &platform, m_platforms) { if (platform->name() == platformName) { removePlatform(platform); return; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference_private.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference_private.cpp index 21144b822c..89f3ebb294 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference_private.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference_private.cpp @@ -63,7 +63,7 @@ QDomNode ProjectReference_Private::toXMLDomNode(QDomDocument &domXMLDocument) co projRefNode.setAttribute(QLatin1String("Name"), m_name); projRefNode.setAttribute(QLatin1String("ReferencedProjectIdentifier"), m_referencedProjectIdentifier); - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) projRefNode.appendChild(refConfig->toXMLDomNode(domXMLDocument)); return projRefNode; @@ -95,10 +95,10 @@ void ProjectReference_Private::addReferenceConfiguration(ReferenceConfiguration: return; // Don't add configuration with the same name - foreach (ReferenceConfiguration::Ptr refConf, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConf, m_referenceConfigurations) { if (refConfig->name() == refConf->name()) return; - + } m_referenceConfigurations.append(refConfig); } @@ -109,7 +109,7 @@ void ProjectReference_Private::removeReferenceConfiguration(ReferenceConfigurati void ProjectReference_Private::removeReferenceConfiguration(const QString &refConfigName) { - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) { + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) { if (refConfig->name() == refConfigName) { removeReferenceConfiguration(refConfig); return; @@ -124,9 +124,10 @@ QList<ReferenceConfiguration::Ptr > ProjectReference_Private::referenceConfigura ReferenceConfiguration::Ptr ProjectReference_Private::referenceConfiguration(const QString &refConfigName) const { - foreach (ReferenceConfiguration::Ptr refConfig, m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, m_referenceConfigurations) { if (refConfig->name() == refConfigName) return refConfig; + } return ReferenceConfiguration::Ptr(); } @@ -139,7 +140,7 @@ ProjectReference_Private::ProjectReference_Private(const ProjectReference_Privat m_referencedProjectIdentifier = projRef_p.m_referencedProjectIdentifier; m_name = projRef_p.m_name; - foreach (ReferenceConfiguration::Ptr refConfig, projRef_p.m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, projRef_p.m_referenceConfigurations) m_referenceConfigurations.append(refConfig->clone()); } @@ -150,7 +151,7 @@ ProjectReference_Private &ProjectReference_Private::operator =(const ProjectRefe m_name = projRef_p.m_name; m_referenceConfigurations.clear(); - foreach (ReferenceConfiguration::Ptr refConfig, projRef_p.m_referenceConfigurations) + foreach (const ReferenceConfiguration::Ptr &refConfig, projRef_p.m_referenceConfigurations) m_referenceConfigurations.append(refConfig->clone()); } return *this; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp index 4a4decc339..c55f7cab92 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp @@ -40,7 +40,7 @@ PublishingData::PublishingData(const PublishingData &data) { m_anyAttribute = data.m_anyAttribute; - foreach (PublishingItem::Ptr item, data.m_publishingItems) + foreach (const PublishingItem::Ptr &item, data.m_publishingItems) m_publishingItems.append(PublishingItem::Ptr(new PublishingItem(*item))); } @@ -50,7 +50,7 @@ PublishingData &PublishingData::operator =(const PublishingData &data) m_anyAttribute = data.m_anyAttribute; m_publishingItems.clear(); - foreach (PublishingItem::Ptr item, data.m_publishingItems) + foreach (const PublishingItem::Ptr &item, data.m_publishingItems) m_publishingItems.append(PublishingItem::Ptr(new PublishingItem(*item))); } return *this; @@ -106,7 +106,7 @@ QDomNode PublishingData::toXMLDomNode(QDomDocument &domXMLDocument) const publishingDataNode.setAttribute(it.key(), it.value()); } - foreach (PublishingItem::Ptr publish, m_publishingItems) + foreach (const PublishingItem::Ptr &publish, m_publishingItems) publishingDataNode.appendChild(publish->toXMLDomNode(domXMLDocument)); return publishingDataNode; @@ -150,9 +150,10 @@ QList<PublishingItem::Ptr > PublishingData::publishingItems(const QString &attri { QList<PublishingItem::Ptr > items; - foreach (PublishingItem::Ptr item, m_publishingItems) + foreach (const PublishingItem::Ptr &item, m_publishingItems) { if (item->attributeValue(attributeName) == attributeValue) items.append(item); + } return items; } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp index 9505aba86f..f253979c58 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp @@ -41,13 +41,13 @@ References::References(const References &references) { m_docVersion = references.m_docVersion; - foreach (ActiveXReference::Ptr ref, references.m_activeXReferences) + foreach (const ActiveXReference::Ptr &ref, references.m_activeXReferences) m_activeXReferences.append(ref->clone()); - foreach (AssemblyReference::Ptr ref, references.m_assemblyReferences) + foreach (const AssemblyReference::Ptr &ref, references.m_assemblyReferences) m_assemblyReferences.append(ref->clone()); - foreach (ProjectReference::Ptr ref, references.m_projectReferences) + foreach (const ProjectReference::Ptr &ref, references.m_projectReferences) m_projectReferences.append(ref->clone()); } @@ -59,13 +59,13 @@ References &References::operator =(const References &references) m_assemblyReferences.clear(); m_projectReferences.clear(); - foreach (ActiveXReference::Ptr ref, references.m_activeXReferences) + foreach (const ActiveXReference::Ptr &ref, references.m_activeXReferences) m_activeXReferences.append(ref->clone()); - foreach (AssemblyReference::Ptr ref, references.m_assemblyReferences) + foreach (const AssemblyReference::Ptr &ref, references.m_assemblyReferences) m_assemblyReferences.append(ref->clone()); - foreach (ProjectReference::Ptr ref, references.m_projectReferences) + foreach (const ProjectReference::Ptr &ref, references.m_projectReferences) m_projectReferences.append(ref->clone()); } return *this; @@ -101,13 +101,13 @@ QDomNode References::toXMLDomNode(QDomDocument &domXMLDocument) const { QDomElement fileNode = domXMLDocument.createElement(QLatin1String("References")); - foreach (AssemblyReference::Ptr asmRef, m_assemblyReferences) + foreach (const AssemblyReference::Ptr &asmRef, m_assemblyReferences) fileNode.appendChild(asmRef->toXMLDomNode(domXMLDocument)); - foreach (ActiveXReference::Ptr activeXRef, m_activeXReferences) + foreach (const ActiveXReference::Ptr &activeXRef, m_activeXReferences) fileNode.appendChild(activeXRef->toXMLDomNode(domXMLDocument)); - foreach (ProjectReference::Ptr projRef, m_projectReferences) + foreach (const ProjectReference::Ptr &projRef, m_projectReferences) fileNode.appendChild(projRef->toXMLDomNode(domXMLDocument)); return fileNode; @@ -156,7 +156,7 @@ void References::removeProjectReference(ProjectReference::Ptr projRef) void References::removeProjectReference(const QString &projRefName) { - foreach (ProjectReference::Ptr projRef, m_projectReferences) { + foreach (const ProjectReference::Ptr &projRef, m_projectReferences) { if (projRef->name() == projRefName) { removeProjectReference(projRef); return; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp index 9c46efea73..7e1324ccb4 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp @@ -38,10 +38,10 @@ ToolFiles::ToolFiles() ToolFiles::ToolFiles(const ToolFiles &toolFiles) { - foreach (ToolFile::Ptr toolFile, toolFiles.m_toolFiles) + foreach (const ToolFile::Ptr &toolFile, toolFiles.m_toolFiles) m_toolFiles.append(ToolFile::Ptr(new ToolFile(*toolFile))); - foreach (DefaultToolFile::Ptr toolFile, toolFiles.m_defaultToolFiles) + foreach (const DefaultToolFile::Ptr &toolFile, toolFiles.m_defaultToolFiles) m_defaultToolFiles.append(DefaultToolFile::Ptr(new DefaultToolFile(*toolFile))); } @@ -51,10 +51,10 @@ ToolFiles &ToolFiles::operator =(const ToolFiles &toolFiles) m_toolFiles.clear(); m_defaultToolFiles.clear(); - foreach (ToolFile::Ptr toolFile, toolFiles.m_toolFiles) + foreach (const ToolFile::Ptr &toolFile, toolFiles.m_toolFiles) m_toolFiles.append(ToolFile::Ptr(new ToolFile(*toolFile))); - foreach (DefaultToolFile::Ptr toolFile, toolFiles.m_defaultToolFiles) + foreach (const DefaultToolFile::Ptr &toolFile, toolFiles.m_defaultToolFiles) m_defaultToolFiles.append(DefaultToolFile::Ptr(new DefaultToolFile(*toolFile))); } @@ -94,10 +94,10 @@ QDomNode ToolFiles::toXMLDomNode(QDomDocument &domXMLDocument) const { QDomElement toolFilesElement = domXMLDocument.createElement(QLatin1String("ToolFiles")); - foreach (ToolFile::Ptr file, m_toolFiles) + foreach (const ToolFile::Ptr &file, m_toolFiles) toolFilesElement.appendChild(file->toXMLDomNode(domXMLDocument)); - foreach (DefaultToolFile::Ptr file, m_defaultToolFiles) + foreach (const DefaultToolFile::Ptr &file, m_defaultToolFiles) toolFilesElement.appendChild(file->toXMLDomNode(domXMLDocument)); return toolFilesElement; @@ -113,9 +113,10 @@ void ToolFiles::addToolFile(ToolFile::Ptr toolFile) if (m_toolFiles.contains(toolFile)) return; - foreach (ToolFile::Ptr toolF, m_toolFiles) + foreach (const ToolFile::Ptr &toolF, m_toolFiles) { if (toolF->relativePath() == toolFile->relativePath()) return; + } m_toolFiles.append(toolFile); } @@ -126,7 +127,7 @@ void ToolFiles::removeToolFile(ToolFile::Ptr toolFile) void ToolFiles::removeToolFile(const QString &relativeToolFilePath) { - foreach (ToolFile::Ptr toolF, m_toolFiles) { + foreach (const ToolFile::Ptr &toolF, m_toolFiles) { if (toolF->relativePath() == relativeToolFilePath) { removeToolFile(toolF); return; @@ -141,9 +142,10 @@ QList<ToolFile::Ptr > ToolFiles::toolFiles() const ToolFile::Ptr ToolFiles::toolFile(const QString &relativePath) { - foreach (ToolFile::Ptr toolFile, m_toolFiles) + foreach (const ToolFile::Ptr &toolFile, m_toolFiles) { if (toolFile->relativePath() == relativePath) return toolFile; + } return ToolFile::Ptr(); } @@ -152,10 +154,10 @@ void ToolFiles::addDefaultToolFile(DefaultToolFile::Ptr defToolFile) if (m_defaultToolFiles.contains(defToolFile)) return; - foreach (DefaultToolFile::Ptr toolF, m_defaultToolFiles) + foreach (const DefaultToolFile::Ptr &toolF, m_defaultToolFiles) { if (toolF->fileName() == defToolFile->fileName()) return; - + } m_defaultToolFiles.append(defToolFile); } @@ -166,7 +168,7 @@ void ToolFiles::removeDefaultToolFile(DefaultToolFile::Ptr defToolFile) void ToolFiles::removeDefaultToolFile(const QString &fileName) { - foreach (DefaultToolFile::Ptr toolF, m_defaultToolFiles) { + foreach (const DefaultToolFile::Ptr &toolF, m_defaultToolFiles) { if (toolF->fileName() == fileName) { removeDefaultToolFile(toolF); return; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp index c629b72c04..3caaa36132 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp @@ -220,13 +220,13 @@ void VcFilterNode::readChildren() QList<File::Ptr > files = m_vcFilterModel->files(); QList<ProjectExplorer::FolderNode *> vcFolderNodes; - foreach (Filter::Ptr filter, filters) + foreach (const Filter::Ptr &filter, filters) vcFolderNodes.append(new VcFilterNode(filter.data(), m_parentVcDocProjNode)); m_parentVcDocProjNode->addFolderNodes(vcFolderNodes, this); QList<ProjectExplorer::FileNode *> vcFileNodes; - foreach (File::Ptr file, files) + foreach (const File::Ptr &file, files) vcFileNodes.append(new VcFileNode(file.data(), m_parentVcDocProjNode)); m_parentVcDocProjNode->addFileNodes(vcFileNodes, this); @@ -416,19 +416,19 @@ void VcFolderNode::readChildren() QList<File::Ptr > files = m_vcFolderModel->files(); QList<ProjectExplorer::FolderNode *> vcFolderNodes; - foreach (Filter::Ptr filter, filters) + foreach (const Filter::Ptr &filter, filters) vcFolderNodes.append(new VcFilterNode(filter.data(), m_parentVcDocProjNode)); m_parentVcDocProjNode->addFolderNodes(vcFolderNodes, this); vcFolderNodes.clear(); - foreach (Folder::Ptr folder, folders) + foreach (const Folder::Ptr &folder, folders) vcFolderNodes.append(new VcFolderNode(folder.data(), m_parentVcDocProjNode)); m_parentVcDocProjNode->addFolderNodes(vcFolderNodes, this); QList<ProjectExplorer::FileNode *> vcFileNodes; - foreach (File::Ptr file, files) + foreach (const File::Ptr &file, files) vcFileNodes.append(new VcFileNode(file.data(), m_parentVcDocProjNode)); m_parentVcDocProjNode->addFileNodes(vcFileNodes, this); @@ -444,21 +444,21 @@ VcDocProjectNode::VcDocProjectNode(VcProjectDocument *vcProjectModel) QList<Filter::Ptr > filters = files2005->filters(); QList<ProjectExplorer::FolderNode *> vcFolderNodes; - foreach (Filter::Ptr filter, filters) + foreach (const Filter::Ptr &filter, filters) vcFolderNodes.append(new VcFilterNode(filter.data(), this)); addFolderNodes(vcFolderNodes, this); QList<Folder::Ptr > folders = files2005->folders(); vcFolderNodes.clear(); - foreach (Folder::Ptr folder, folders) + foreach (const Folder::Ptr &folder, folders) vcFolderNodes.append(new VcFolderNode(folder.data(), this)); addFolderNodes(vcFolderNodes, this); QList<File::Ptr > files = files2005->files(); QList<ProjectExplorer::FileNode *> vcFileNodes; - foreach (File::Ptr file, files) + foreach (const File::Ptr &file, files) vcFileNodes.append(new VcFileNode(file.data(), this)); addFileNodes(vcFileNodes, this); @@ -468,14 +468,14 @@ VcDocProjectNode::VcDocProjectNode(VcProjectDocument *vcProjectModel) QList<Filter::Ptr > filters = m_vcProjectModel->files()->filters(); QList<ProjectExplorer::FolderNode *> vcFolderNodes; - foreach (Filter::Ptr filter, filters) + foreach (const Filter::Ptr &filter, filters) vcFolderNodes.append(new VcFilterNode(filter.data(), this)); addFolderNodes(vcFolderNodes, this); QList<File::Ptr > files = m_vcProjectModel->files()->files(); QList<ProjectExplorer::FileNode *> vcFileNodes; - foreach (File::Ptr file, files) + foreach (const File::Ptr &file, files) vcFileNodes.append(new VcFileNode(file.data(), this)); addFileNodes(vcFileNodes, this); diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp index 852abc2278..917c3ff1ef 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp @@ -217,7 +217,7 @@ void VcProjectDocument::processNodeAttributes(const QDomElement &element) void VcProjectDocument::parseProcessingInstruction(const QDomProcessingInstruction &processingInstruction) { QStringList data = processingInstruction.data().split(QLatin1Char(' ')); - foreach (QString dataElement, data) { + foreach (const QString &dataElement, data) { QStringList sl = dataElement.split(QLatin1Char('=')); if (sl.size() == 2) { diff --git a/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp b/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp index cde4409f38..7a2cbfc71c 100644 --- a/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp +++ b/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp @@ -51,7 +51,7 @@ ConfigurationsBaseWidget::ConfigurationsBaseWidget(Configurations *configs, VcPr if (m_configs) { QList<Configuration::Ptr> configs = m_configs->configurations(); - foreach (Configuration::Ptr config, configs) + foreach (const Configuration::Ptr &config, configs) addConfiguration(config.data()); } @@ -72,7 +72,7 @@ ConfigurationsBaseWidget::~ConfigurationsBaseWidget() void ConfigurationsBaseWidget::saveData() { // remove deleted configurations - foreach (QString removeConfigName, m_removedConfigurations) { + foreach (const QString &removeConfigName, m_removedConfigurations) { Configuration::Ptr foundConfig = m_configs->configuration(removeConfigName); if (foundConfig) m_configs->removeConfiguration(foundConfig); @@ -88,7 +88,7 @@ void ConfigurationsBaseWidget::saveData() } // add new configurations - foreach (Configuration::Ptr newConfig, m_newConfigurations) + foreach (const Configuration::Ptr &newConfig, m_newConfigurations) m_configs->appendConfiguration(newConfig); // save data for every configuration @@ -121,7 +121,7 @@ void ConfigurationsBaseWidget::onAddNewConfig(QString newConfigName, QString cop if (platforms && !newConfigName.isEmpty()) { if (copyFrom.isEmpty()) { QList<Platform::Ptr> platformList = platforms->platforms(); - foreach (Platform::Ptr platform, platformList) { + foreach (const Platform::Ptr &platform, platformList) { Configuration::Ptr newConfig = createConfiguration(newConfigName + QLatin1Char('|') + platform->name()); if (newConfig) { @@ -138,7 +138,7 @@ void ConfigurationsBaseWidget::onAddNewConfig(QString newConfigName, QString cop if (config) { QList<Platform::Ptr > platformList = platforms->platforms(); - foreach (Platform::Ptr platform, platformList) { + foreach (const Platform::Ptr &platform, platformList) { Configuration::Ptr newConfig = config->clone(); if (newConfig) { @@ -165,7 +165,7 @@ void ConfigurationsBaseWidget::onRenameConfig(QString newConfigName, QString old return; QList<Platform::Ptr > platformList = platforms->platforms(); - foreach (Platform::Ptr platform, platformList) { + foreach (const Platform::Ptr &platform, platformList) { QString targetConfigName = splits[0] + QLatin1Char('|') + platform->name(); QString newName = newConfigName + QLatin1Char('|') + platform->name(); Configuration::Ptr configInNew = configInNewConfigurations(targetConfigName); @@ -216,7 +216,7 @@ void ConfigurationsBaseWidget::onRemoveConfig(QString configNameWithPlatform) return; QList<Platform::Ptr > platformList = platforms->platforms(); - foreach (Platform::Ptr platform, platformList) { + foreach (const Platform::Ptr &platform, platformList) { QString targetConfigName = splits[0] + QLatin1Char('|') + platform->name(); Configuration::Ptr config = m_configs->configuration(targetConfigName); @@ -226,7 +226,7 @@ void ConfigurationsBaseWidget::onRemoveConfig(QString configNameWithPlatform) m_removedConfigurations.append(config->name()); } else { // else remove it from the list of newly added configurations - foreach (Configuration::Ptr configPtr, m_newConfigurations) { + foreach (const Configuration::Ptr &configPtr, m_newConfigurations) { if (configPtr && configPtr->name() == targetConfigName) { removeConfiguration(configPtr.data()); m_newConfigurations.removeAll(configPtr); @@ -310,7 +310,7 @@ Configuration::Ptr ConfigurationsBaseWidget::createConfiguration(const QString & Configuration::Ptr ConfigurationsBaseWidget::configInNewConfigurations(const QString &configNameWithPlatform) const { - foreach (Configuration::Ptr config, m_newConfigurations) { + foreach (const Configuration::Ptr &config, m_newConfigurations) { if (config && config->name() == configNameWithPlatform) return config; } |
