From 957b78f69b1a06dd73f86f7116a1462c58ca890c Mon Sep 17 00:00:00 2001 From: Radovan Zivkovic Date: Fri, 4 Oct 2013 01:14:33 +0200 Subject: Removed unneeded functions from Configurations class. Change-Id: Id0056323dfbdd6b0bbdd6dae8a166ec0335bc133 Reviewed-by: Tobias Hunger --- .../vcprojectmanager/interfaces/iconfigurations.h | 4 ++- src/plugins/vcprojectmanager/vcproject.cpp | 13 +++++---- .../vcprojectmodel/configurations.cpp | 32 +--------------------- .../vcprojectmodel/configurations.h | 11 +------- .../vcprojectmodel/vcprojectdocument.cpp | 3 +- .../widgets/configurationswidgets.cpp | 16 +++++------ 6 files changed, 22 insertions(+), 57 deletions(-) diff --git a/src/plugins/vcprojectmanager/interfaces/iconfigurations.h b/src/plugins/vcprojectmanager/interfaces/iconfigurations.h index 7f4bafc44c..fac2ebb26b 100644 --- a/src/plugins/vcprojectmanager/interfaces/iconfigurations.h +++ b/src/plugins/vcprojectmanager/interfaces/iconfigurations.h @@ -32,12 +32,14 @@ #include +#include "../vcprojectmodel/ivcprojectnodemodel.h" + namespace VcProjectManager { namespace Internal { class ConfigurationContainer; -class IConfigurations +class IConfigurations : public IVcProjectXMLNode { public: virtual ~IConfigurations() {} diff --git a/src/plugins/vcprojectmanager/vcproject.cpp b/src/plugins/vcprojectmanager/vcproject.cpp index 3b6fffc339..9272e43866 100644 --- a/src/plugins/vcprojectmanager/vcproject.cpp +++ b/src/plugins/vcprojectmanager/vcproject.cpp @@ -35,6 +35,7 @@ #include "vcprojectkitinformation.h" #include "vcprojectmanagerconstants.h" #include "vcprojectbuildconfiguration.h" +#include #include "vcprojectmodel/vcdocumentmodel.h" #include "vcprojectmodel/vcprojectdocument.h" #include "vcprojectmodel/configurations.h" @@ -218,7 +219,7 @@ void VcProject::onSettingsDialogAccepted() foreach (ProjectExplorer::BuildConfiguration *bc, buildConfigurationList) { VcProjectBuildConfiguration *vcBc = qobject_cast(bc); if (vcBc) { - IConfiguration *lookFor = configs->configuration(vcBc->displayName()); + IConfiguration *lookFor = configs->configurationContainer()->configuration(vcBc->displayName()); if (!lookFor) target->removeBuildConfiguration(vcBc); } @@ -230,8 +231,8 @@ void VcProject::onSettingsDialogAccepted() foreach (ProjectExplorer::Target *target, targetList) { if (target) { - for (int i = 0; i < configs->configurationCount(); ++i) { - IConfiguration *config = configs->configuration(i); + for (int i = 0; i < configs->configurationContainer()->configurationCount(); ++i) { + IConfiguration *config = configs->configurationContainer()->configuration(i); if (config && !findBuildConfiguration(target, config->fullName())) addBuildConfiguration(target, config); } @@ -256,8 +257,8 @@ bool VcProject::fromMap(const QVariantMap &map) bool VcProject::setupTarget(ProjectExplorer::Target *t) { - for (int i = 0; i < m_projectFile->documentModel()->vcProjectDocument()->configurations()->configurationCount(); ++i){ - IConfiguration *config = m_projectFile->documentModel()->vcProjectDocument()->configurations()->configuration(i); + for (int i = 0; i < m_projectFile->documentModel()->vcProjectDocument()->configurations()->configurationContainer()->configurationCount(); ++i){ + IConfiguration *config = m_projectFile->documentModel()->vcProjectDocument()->configurations()->configurationContainer()->configuration(i); if (config) addBuildConfiguration(t, config); } @@ -307,7 +308,7 @@ void VcProject::updateCodeModels() QTC_ASSERT(vbc, return); QString configName = vbc->displayName(); - IConfiguration *configModel = m_projectFile->documentModel()->vcProjectDocument()->configurations()->configuration(configName); + IConfiguration *configModel = m_projectFile->documentModel()->vcProjectDocument()->configurations()->configurationContainer()->configuration(configName); if (configModel) { ITool *configTool = configModel->tools()->tool(QLatin1String(ToolConstants::strVCCLCompilerTool)); diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp index 4e4e05785c..b98faae19d 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp @@ -98,36 +98,6 @@ ConfigurationContainer *Configurations::configurationContainer() const return m_configurationContainer; } -void Configurations::addConfiguration(IConfiguration *config) -{ - m_configurationContainer->addConfiguration(config); -} - -IConfiguration *Configurations::configuration(const QString &fullName) const -{ - return m_configurationContainer->configuration(fullName); -} - -IConfiguration *Configurations::configuration(int index) const -{ - return m_configurationContainer->configuration(index); -} - -int Configurations::configurationCount() const -{ - return m_configurationContainer->configurationCount(); -} - -void Configurations::removeConfiguration(const QString &fullName) -{ - m_configurationContainer->removeConfiguration(fullName); -} - -bool Configurations::isEmpty() const -{ - return m_configurationContainer->configurationCount() == 0; -} - void Configurations::processConfiguration(const QDomNode &configurationNode) { IConfiguration *config = 0; @@ -141,7 +111,7 @@ void Configurations::processConfiguration(const QDomNode &configurationNode) if (config) { config->processNode(configurationNode); - addConfiguration(config); + m_configurationContainer->addConfiguration(config); } // process next sibling diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h index c611740789..191525ee70 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h @@ -41,7 +41,7 @@ namespace Internal { class VcProjectDocument; -class Configurations : public IVcProjectXMLNode, public IConfigurations +class Configurations : public IConfigurations { public: typedef QSharedPointer Ptr; @@ -57,15 +57,6 @@ public: ConfigurationContainer* configurationContainer() const; - // IConfigurations interface - void addConfiguration(IConfiguration *config); - IConfiguration *configuration(const QString &fullName) const; - IConfiguration *configuration(int index) const; - int configurationCount() const; - void removeConfiguration(const QString &fullName); - - bool isEmpty() const; - private: void processConfiguration(const QDomNode &configurationNode); diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp index 43b432e317..53227a5a21 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp @@ -41,6 +41,7 @@ #include "../widgets/projectsettingswidget.h" #include "../widgets/configurationswidgets.h" +#include "configurationcontainer.h" namespace VcProjectManager { namespace Internal { @@ -324,7 +325,7 @@ QDomElement VcProjectDocument::toVcDocumentElement(QDomDocument &domXMLDocument) if (!m_platforms->isEmpty()) vcDocNode.appendChild(m_platforms->toXMLDomNode(domXMLDocument)); - if (!m_configurations->isEmpty()) + if (m_configurations->configurationContainer()->configurationCount()) vcDocNode.appendChild(m_configurations->toXMLDomNode(domXMLDocument)); if (m_files->fileCount() || m_files->fileContainerCount()) diff --git a/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp b/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp index 1941bd710d..d4171f3063 100644 --- a/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp +++ b/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp @@ -55,8 +55,8 @@ ConfigurationsBaseWidget::ConfigurationsBaseWidget(Configurations *configs, VcPr m_configsWidget = new ConfigurationsWidget; if (m_configs) { - for (int i = 0; i < m_configs->configurationCount(); ++i) { - IConfiguration *config = m_configs->configuration(i); + for (int i = 0; i < m_configs->configurationContainer()->configurationCount(); ++i) { + IConfiguration *config = m_configs->configurationContainer()->configuration(i); if (config) addConfiguration(config); } @@ -80,9 +80,9 @@ void ConfigurationsBaseWidget::saveData() { // remove deleted configurations foreach (const QString &removeConfigName, m_removedConfigurations) { - IConfiguration *foundConfig = m_configs->configuration(removeConfigName); + IConfiguration *foundConfig = m_configs->configurationContainer()->configuration(removeConfigName); if (foundConfig) - m_configs->removeConfiguration(foundConfig->fullName()); + m_configs->configurationContainer()->removeConfiguration(foundConfig->fullName()); } // rename configurations that were renamed @@ -96,7 +96,7 @@ void ConfigurationsBaseWidget::saveData() // add new configurations foreach (IConfiguration *newConfig, m_newConfigurations) - m_configs->addConfiguration(newConfig); + m_configs->configurationContainer()->addConfiguration(newConfig); QHashIterator > fileConfigIt(m_newFilesConfigurations); @@ -134,7 +134,7 @@ void ConfigurationsBaseWidget::onAddNewConfig(QString newConfigName, QString cop } } } else { - IConfiguration *config = m_configs->configuration(copyFrom); + IConfiguration *config = m_configs->configurationContainer()->configuration(copyFrom); if (config) { QList platformList = platforms->platforms(); @@ -196,7 +196,7 @@ void ConfigurationsBaseWidget::onRenameConfig(QString newConfigName, QString old } if (!targetAlreadyExists) { - IConfiguration *config = m_configs->configuration(targetConfigName); + IConfiguration *config = m_configs->configurationContainer()->configuration(targetConfigName); if (config) m_renamedConfigurations.insert(config, newName); } @@ -221,7 +221,7 @@ void ConfigurationsBaseWidget::onRemoveConfig(QString configNameWithPlatform) QList platformList = platforms->platforms(); foreach (const Platform::Ptr &platform, platformList) { QString targetConfigName = splits[0] + QLatin1Char('|') + platform->name(); - IConfiguration *config = m_configs->configuration(targetConfigName); + IConfiguration *config = m_configs->configurationContainer()->configuration(targetConfigName); // if config exists in the document model, add it to remove list if (config) { -- cgit v1.2.3