From 621eb673d8e6d457ebe93c9ad99bbac0a040f84e Mon Sep 17 00:00:00 2001 From: Radovan Zivkovic Date: Tue, 25 Feb 2014 08:44:58 +0100 Subject: [PATCH] Renamed name to displayName. Change-Id: I7cd22e359ffb0f4db920923964694611821c2977 Reviewed-by: Tobias Hunger --- src/plugins/vcprojectmanager/interfaces/iconfiguration.h | 4 ++-- src/plugins/vcprojectmanager/interfaces/iplatform.h | 2 +- .../vcprojectmanager/interfaces/itoolsectiondescription.h | 4 ++-- .../vcprojectmanager/vcprojectmodel/configuration.cpp | 4 ++-- src/plugins/vcprojectmanager/vcprojectmodel/configuration.h | 4 ++-- src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp | 2 +- src/plugins/vcprojectmanager/vcprojectmodel/platform.h | 2 +- .../vcprojectmodel/tools/toolattributes/tooldescription.cpp | 4 ++-- .../tools/toolattributes/tooldescriptiondatamanager.cpp | 2 +- .../tools/toolattributes/toolsectioncontainer.cpp | 6 +++--- .../vcprojectmodel/tools/toolsectiondescription.cpp | 4 ++-- .../vcprojectmodel/tools/toolsectiondescription.h | 4 ++-- .../widgets/toolwidgets/toolsettingswidget.cpp | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/plugins/vcprojectmanager/interfaces/iconfiguration.h b/src/plugins/vcprojectmanager/interfaces/iconfiguration.h index 74cb509f9dc..3fe4fa50572 100644 --- a/src/plugins/vcprojectmanager/interfaces/iconfiguration.h +++ b/src/plugins/vcprojectmanager/interfaces/iconfiguration.h @@ -52,10 +52,10 @@ public: virtual IAttributeContainer *attributeContainer() const = 0; virtual QString fullName() const = 0; - virtual QString name() const = 0; + virtual QString displayname() const = 0; virtual QString platform() const = 0; virtual void setFullName(const QString &fullName) = 0; - virtual void setName(const QString &name) = 0; + virtual void setDisplayName(const QString &displayname) = 0; virtual void setPlatform(const QString &platform) = 0; virtual ITools *tools() const = 0; diff --git a/src/plugins/vcprojectmanager/interfaces/iplatform.h b/src/plugins/vcprojectmanager/interfaces/iplatform.h index fa939a620f3..6ee4cd3f10f 100644 --- a/src/plugins/vcprojectmanager/interfaces/iplatform.h +++ b/src/plugins/vcprojectmanager/interfaces/iplatform.h @@ -43,7 +43,7 @@ public: virtual ~IPlatform() {} virtual QString displayName() const = 0; - virtual void setName(const QString &displayName) = 0; + virtual void setDisplayName(const QString &displayName) = 0; virtual IPlatform *clone() const = 0; }; diff --git a/src/plugins/vcprojectmanager/interfaces/itoolsectiondescription.h b/src/plugins/vcprojectmanager/interfaces/itoolsectiondescription.h index fd323437995..dde07e3511d 100644 --- a/src/plugins/vcprojectmanager/interfaces/itoolsectiondescription.h +++ b/src/plugins/vcprojectmanager/interfaces/itoolsectiondescription.h @@ -44,8 +44,8 @@ public: virtual ~IToolSectionDescription() {} virtual IToolSection* createToolSection() const = 0; - virtual QString name() const = 0; - virtual void setName(const QString &name) = 0; + virtual QString displayName() const = 0; + virtual void setDisplayName(const QString &displayName) = 0; virtual IAttributeDescriptionDataItem *attributeDescription(const QString &attributeKey) const = 0; virtual IAttributeDescriptionDataItem *attributeDescription(int index) const = 0; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp index 3ea605c5835..7c4eb95d2cb 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp @@ -139,7 +139,7 @@ QString Configuration::fullName() const return m_fullName; } -QString Configuration::name() const +QString Configuration::displayname() const { return m_configurationName; } @@ -155,7 +155,7 @@ void Configuration::setFullName(const QString &fullName) emit nameChanged(); } -void Configuration::setName(const QString &name) +void Configuration::setDisplayName(const QString &name) { m_configurationName = name; } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h index c44c7db97c5..818b0c1a515 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h @@ -58,10 +58,10 @@ public: // IConfiguration interface IAttributeContainer *attributeContainer() const; QString fullName() const; - QString name() const; + QString displayname() const; QString platform() const; void setFullName(const QString &fullName); - void setName(const QString &name); + void setDisplayName(const QString &displayname); void setPlatform(const QString &platform); ITools *tools() const; IConfiguration *clone() const; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp index 41c936fdc2a..324a6477c74 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp @@ -78,7 +78,7 @@ QString Platform::displayName() const return m_name; } -void Platform::setName(const QString &name) +void Platform::setDisplayName(const QString &name) { m_name = name; } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platform.h b/src/plugins/vcprojectmanager/vcprojectmodel/platform.h index 0268bf0ec62..a7d180d1a30 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/platform.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/platform.h @@ -48,7 +48,7 @@ public: QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const; QString displayName() const; - void setName(const QString &displayName); + void setDisplayName(const QString &displayName); IPlatform *clone() const; private: diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp index 721d42834fb..4cb9d63886f 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp @@ -69,7 +69,7 @@ void ToolDescription::removeSectionDescription(IToolSectionDescription *sectionD } foreach (IToolSectionDescription* toolSectionDesc, m_sectionDescriptions) { - if (toolSectionDesc->name() == sectionDescription->name()) { + if (toolSectionDesc->displayName() == sectionDescription->displayName()) { m_sectionDescriptions.removeOne(sectionDescription); delete sectionDescription; return; @@ -80,7 +80,7 @@ void ToolDescription::removeSectionDescription(IToolSectionDescription *sectionD void ToolDescription::addSectionDescription(IToolSectionDescription *sectionDescription) { foreach (IToolSectionDescription* toolSectionDesc, m_sectionDescriptions) { - if (toolSectionDesc->name() == sectionDescription->name()) + if (toolSectionDesc->displayName() == sectionDescription->displayName()) return; } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp index acb074fa381..3f90376e9ae 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp @@ -223,7 +223,7 @@ void ToolDescriptionDataManager::processToolSectionNode(IToolDescription *toolDe QDomAttr domElement = domNode.toAttr(); if (domElement.name() == QLatin1String("Name")) { - toolSectionDesc->setName(domElement.value()); + toolSectionDesc->setDisplayName(domElement.value()); } } } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp index 9ebf93ac555..126739e838b 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp @@ -83,7 +83,7 @@ IToolSection *ToolSectionContainer::section(int index) const IToolSection *ToolSectionContainer::section(const QString §ionName) const { foreach (IToolSection *sec, m_toolSections) { - if (sec && sec->sectionDescription()->name() == sectionName) { + if (sec && sec->sectionDescription()->displayName() == sectionName) { return sec; } } @@ -101,7 +101,7 @@ void ToolSectionContainer::appendSection(IToolSection *section) return; foreach (IToolSection *sec, m_toolSections) { - if (sec && sec->sectionDescription()->name() == section->sectionDescription()->name()) + if (sec && sec->sectionDescription()->displayName() == section->sectionDescription()->displayName()) return; } m_toolSections.append(section); @@ -110,7 +110,7 @@ void ToolSectionContainer::appendSection(IToolSection *section) void ToolSectionContainer::removeSection(const QString §ionName) { foreach (IToolSection *sec, m_toolSections) { - if (sec && sec->sectionDescription()->name() == sectionName) { + if (sec && sec->sectionDescription()->displayName() == sectionName) { m_toolSections.removeOne(sec); delete sec; return; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp index 1adc9ba0e24..dcb05ae1da3 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp @@ -43,12 +43,12 @@ IToolSection *ToolSectionDescription::createToolSection() const return new ToolSection(this); } -QString ToolSectionDescription::name() const +QString ToolSectionDescription::displayName() const { return m_name; } -void ToolSectionDescription::setName(const QString &name) +void ToolSectionDescription::setDisplayName(const QString &name) { m_name = name; } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h index e782eef9e3c..d4548666e22 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h @@ -48,8 +48,8 @@ public: IToolSection *createToolSection() const; - QString name() const; - void setName(const QString &name); + QString displayName() const; + void setDisplayName(const QString &displayName); IAttributeDescriptionDataItem *attributeDescription(const QString &attributeKey) const; IAttributeDescriptionDataItem *attributeDescription(int index) const; diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp index 14c77bcc027..59714010131 100644 --- a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp +++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp @@ -57,7 +57,7 @@ ToolSettingsWidget::ToolSettingsWidget(ConfigurationTool *tool, QWidget *parent) if (toolSection) { VcNodeWidget *toolSectionWidget = toolSection->createSettingsWidget(); - mainTabWidget->addTab(toolSectionWidget, toolSection->sectionDescription()->name()); + mainTabWidget->addTab(toolSectionWidget, toolSection->sectionDescription()->displayName()); m_sections.append(toolSectionWidget); } }