feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Renamed name to displayName.

Browse Source 
Change-Id: I7cd22e359ffb0f4db920923964694611821c2977
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Radovan Zivkovic
2014-02-25 08:44:58 +01:00
committed by Oswald Buddenhagen
parent 0fc520f610
commit 621eb673d8
13 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/vcprojectmanager/interfaces/iconfiguration.h
View File

@@ -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;

2
src/plugins/vcprojectmanager/interfaces/iplatform.h
View File

@@ -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;
};

4
src/plugins/vcprojectmanager/interfaces/itoolsectiondescription.h
View File

@@ -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;

4
src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp
View File

@@ -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;
}

4
src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
View File

@@ -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;

2
src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp
View File

@@ -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;
}

2
src/plugins/vcprojectmanager/vcprojectmodel/platform.h
View File

@@ -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:

4
src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.cpp
View File

@@ -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;
}

2
src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescriptiondatamanager.cpp
View File

@@ -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());
}
}
}

6
src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolsectioncontainer.cpp
View File

@@ -83,7 +83,7 @@ IToolSection *ToolSectionContainer::section(int index) const
IToolSection *ToolSectionContainer::section(const QString &sectionName) 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 &sectionName)
{
foreach (IToolSection *sec, m_toolSections) {
if (sec && sec->sectionDescription()->name() == sectionName) {
if (sec && sec->sectionDescription()->displayName() == sectionName) {
m_toolSections.removeOne(sec);
delete sec;
return;

4
src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.cpp
View File

@@ -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;
}

4
src/plugins/vcprojectmanager/vcprojectmodel/tools/toolsectiondescription.h
View File

@@ -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;

2
src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.cpp
View File

@@ -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);
}
}