summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadovan Zivkovic <pivonroll@gmail.com>2013-08-07 23:06:43 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-03-11 19:54:56 +0100
commitc2b851aac4c4ca46bb02234d714eb6a83338aea4 (patch)
treef9924fd42f018c0485b892f392ba9dddac41dba6
parent51a3b84fb344a738bd0d512a34e525eec0efbf2a (diff)
downloadqt-creator-c2b851aac4c4ca46bb02234d714eb6a83338aea4.tar.gz
processNodeAttributes is removed from the IVcProjectXMLNode interface.
Change-Id: I296258d42b28cbe65083ba525850b155759f1945 Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h6
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/configuration.h2
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp5
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/configurations.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp28
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp32
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp28
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/file.cpp38
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/file.h2
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/files.cpp5
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/files.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp38
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/filter.h2
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp38
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/folder.h2
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/global.cpp38
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/global.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp5
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/globals.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.h6
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp32
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/platform.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp5
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/platforms.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp5
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp28
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp28
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/references.cpp5
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/references.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp32
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp5
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.cpp38
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.h2
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp5
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h1
44 files changed, 224 insertions, 271 deletions
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h
index efbca9f396..99b78d00d2 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h
@@ -46,7 +46,6 @@ public:
virtual ~ActiveXReference();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -73,6 +72,7 @@ protected:
ActiveXReference();
ActiveXReference(const ActiveXReference &ref);
ActiveXReference& operator=(const ActiveXReference &ref);
+ virtual void processNodeAttributes(const QDomElement &element);
virtual void processReferenceConfig(const QDomNode &referenceConfig);
/*!
@@ -113,7 +113,6 @@ public:
ActiveXReference2005& operator=(const ActiveXReference2005 &ref);
~ActiveXReference2005();
- void processNodeAttributes(const QDomElement &element);
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
ActiveXReference::Ptr clone() const;
@@ -127,6 +126,7 @@ public:
protected:
ActiveXReference2005();
Configuration::Ptr createReferenceConfiguration() const;
+ void processNodeAttributes(const QDomElement &element);
QString m_localeID; // opt
QString m_copyLocal; // opt
@@ -142,7 +142,6 @@ public:
ActiveXReference2008& operator=(const ActiveXReference2008 &ref);
~ActiveXReference2008();
- void processNodeAttributes(const QDomElement &element);
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
ActiveXReference::Ptr clone() const;
@@ -156,6 +155,7 @@ public:
protected:
ActiveXReference2008();
Configuration::Ptr createReferenceConfiguration() const;
+ void processNodeAttributes(const QDomElement &element);
bool m_copyLocalDependencies; //optional default: true
bool m_copyLocalSatelliteAssemblies; //optional default: true
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
index 83f75d7b89..3d557bee2d 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
@@ -47,7 +47,6 @@ public:
~AssemblyReference();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -69,7 +68,7 @@ protected:
AssemblyReference();
AssemblyReference(const AssemblyReference &asmRef);
AssemblyReference& operator=(const AssemblyReference &asmRef);
-
+ virtual void processNodeAttributes(const QDomElement &element);
void processReferenceConfig(const QDomNode &referenceConfig);
/*!
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
index e77213a03b..ba60ead326 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
@@ -52,7 +52,6 @@ public:
Configuration& operator=(const Configuration &config);
~Configuration();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
virtual QString nodeWidgetName() const;
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -79,6 +78,7 @@ signals:
protected:
Configuration(const QString &nodeName);
virtual void processToolNode(const QDomNode &toolNode);
+ void processNodeAttributes(const QDomElement &element);
QString m_name;
QString m_nodeName;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
index fcc7bb040b..4e347ccb69 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
@@ -81,11 +81,6 @@ void Configurations::processNode(const QDomNode &node)
}
}
-void Configurations::processNodeAttributes(const QDomElement &element)
-{
- Q_UNUSED(element)
-}
-
VcNodeWidget *Configurations::createSettingsWidget()
{
ConfigurationsBaseWidget* widget = ConfigurationsFactory::createSettingsWidget(m_vcProjDoc, this);
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h
index 4d12d1ec31..ac72f00bcc 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h
@@ -51,7 +51,6 @@ public:
~Configurations();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp
index 8688f60446..dbe0a39b20 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.cpp
@@ -61,20 +61,6 @@ void DebuggerTool::processNode(const QDomNode &node)
processNodeAttributes(node.toElement());
}
-void DebuggerTool::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
- m_anyAttribute.insert(domElement.name(), domElement.value());
- }
- }
-}
-
VcNodeWidget *DebuggerTool::createSettingsWidget()
{
return 0;
@@ -115,5 +101,19 @@ void DebuggerTool::removeAttribute(const QString &attributeName)
m_anyAttribute.remove(attributeName);
}
+void DebuggerTool::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+ m_anyAttribute.insert(domElement.name(), domElement.value());
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h
index ef48d020f4..fe84d67511 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertool.h
@@ -49,7 +49,6 @@ public:
~DebuggerTool();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -59,6 +58,8 @@ public:
void removeAttribute(const QString &attributeName);
private:
+ void processNodeAttributes(const QDomElement &element);
+
QHash<QString, QString> m_anyAttribute;
};
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp
index de3b1e6310..41845d82b1 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.cpp
@@ -61,22 +61,6 @@ void DefaultToolFile::processNode(const QDomNode &node)
processNodeAttributes(node.toElement());
}
-void DefaultToolFile::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- if (namedNodeMap.size() == 1) {
- QDomNode domNode = namedNodeMap.item(0);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domAttr = domNode.toAttr();
-
- if (domAttr.name() == QLatin1String("FileName"))
- m_fileName = domAttr.value();
- }
- }
-}
-
VcNodeWidget *DefaultToolFile::createSettingsWidget()
{
return 0;
@@ -99,5 +83,21 @@ void DefaultToolFile::setFileName(const QString &fileName)
m_fileName = fileName;
}
+void DefaultToolFile::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ if (namedNodeMap.size() == 1) {
+ QDomNode domNode = namedNodeMap.item(0);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domAttr = domNode.toAttr();
+
+ if (domAttr.name() == QLatin1String("FileName"))
+ m_fileName = domAttr.value();
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h b/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h
index d295a606ea..668f337d4e 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/defaulttoolfile.h
@@ -49,7 +49,6 @@ public:
~DefaultToolFile();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -57,6 +56,8 @@ public:
void setFileName(const QString &fileName);
private:
+ void processNodeAttributes(const QDomElement &element);
+
QString m_fileName; // required
};
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp
index dcfaa693fc..92c17d28f6 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.cpp
@@ -57,20 +57,6 @@ void DeploymentTool::processNode(const QDomNode &node)
processNodeAttributes(node.toElement());
}
-void DeploymentTool::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
- m_anyAttribute.insert(domElement.name(), domElement.value());
- }
- }
-}
-
VcNodeWidget *DeploymentTool::createSettingsWidget()
{
return 0;
@@ -111,5 +97,19 @@ void DeploymentTool::removeAttribute(const QString &attributeName)
m_anyAttribute.remove(attributeName);
}
+void DeploymentTool::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+ m_anyAttribute.insert(domElement.name(), domElement.value());
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h
index 7a82562492..4912b457ce 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttool.h
@@ -49,7 +49,6 @@ public:
~DeploymentTool();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -59,6 +58,8 @@ public:
void removeAttribute(const QString &attributeName);
private:
+ void processNodeAttributes(const QDomElement &element);
+
QHash<QString, QString> m_anyAttribute;
};
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp
index 5510ff7f57..33a0b17bba 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp
@@ -99,25 +99,6 @@ void File::processNode(const QDomNode &node)
}
}
-void File::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
-
- if (domElement.name() == QLatin1String("RelativePath"))
- m_relativePath = domElement.value();
-
- else
- m_anyAttribute.insert(domElement.name(), domElement.value());
- }
- }
-}
-
VcNodeWidget *File::createSettingsWidget()
{
return 0;
@@ -267,5 +248,24 @@ void File::processFile(const QDomNode &fileNode)
}
}
+void File::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+
+ if (domElement.name() == QLatin1String("RelativePath"))
+ m_relativePath = domElement.value();
+
+ else
+ m_anyAttribute.insert(domElement.name(), domElement.value());
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/file.h b/src/plugins/vcprojectmanager/vcprojectmodel/file.h
index 600d3628ac..a7e6ac1a05 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/file.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/file.h
@@ -52,7 +52,6 @@ public:
File& operator=(const File &file);
~File();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -74,6 +73,7 @@ public:
private:
void processFileConfiguration(const QDomNode &fileConfigNode);
void processFile(const QDomNode &fileNode);
+ void processNodeAttributes(const QDomElement &element);
QString m_relativePath; // required
QList<QSharedPointer<File> > m_files;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp
index 93e38d2d5e..86a7139552 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/files.cpp
@@ -54,11 +54,6 @@ void Files::processNode(const QDomNode &node)
}
}
-void Files::processNodeAttributes(const QDomElement &element)
-{
- Q_UNUSED(element)
-}
-
VcNodeWidget *Files::createSettingsWidget()
{
return 0;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/files.h b/src/plugins/vcprojectmanager/vcprojectmodel/files.h
index 52b504553c..30d6409d40 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/files.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/files.h
@@ -46,7 +46,6 @@ public:
~Files();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp
index 5a5b13431e..99ee4d3ac6 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/filter.cpp
@@ -95,25 +95,6 @@ void Filter::processNode(const QDomNode &node)
}
}
-void Filter::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
-
- if (domElement.name() == QLatin1String("Name"))
- m_name = domElement.value();
-
- else
- m_anyAttribute.insert(domElement.name(), domElement.value());
- }
- }
-}
-
VcNodeWidget *Filter::createSettingsWidget()
{
return 0;
@@ -301,5 +282,24 @@ void Filter::processFilter(const QDomNode &filterNode)
}
}
+void Filter::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+
+ if (domElement.name() == QLatin1String("Name"))
+ m_name = domElement.value();
+
+ else
+ m_anyAttribute.insert(domElement.name(), domElement.value());
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filter.h b/src/plugins/vcprojectmanager/vcprojectmodel/filter.h
index 5fdb80530d..88f28c0d0f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/filter.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/filter.h
@@ -49,7 +49,6 @@ public:
~Filter();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -78,6 +77,7 @@ public:
private:
void processFile(const QDomNode &fileNode);
void processFilter(const QDomNode &filterNode);
+ void processNodeAttributes(const QDomElement &element);
QString m_name;
QHash<QString, QString> m_anyAttribute;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp
index d2278397e0..1dc5e12213 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/folder.cpp
@@ -106,25 +106,6 @@ void Folder::processNode(const QDomNode &node)
}
}
-void Folder::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
-
- if (domElement.name() == QLatin1String("Name"))
- setName(domElement.value());
-
- else
- setAttribute(domElement.name(), domElement.value());
- }
- }
-}
-
VcNodeWidget *Folder::createSettingsWidget()
{
return 0;
@@ -396,5 +377,24 @@ void Folder::processFolder(const QDomNode &folderNode)
}
}
+void Folder::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+
+ if (domElement.name() == QLatin1String("Name"))
+ setName(domElement.value());
+
+ else
+ setAttribute(domElement.name(), domElement.value());
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/folder.h b/src/plugins/vcprojectmanager/vcprojectmodel/folder.h
index ae5d48d270..ac54d831ee 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/folder.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/folder.h
@@ -49,7 +49,6 @@ public:
~Folder();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -86,6 +85,7 @@ private:
void processFile(const QDomNode &fileNode);
void processFilter(const QDomNode &filterNode);
void processFolder(const QDomNode &folderNode);
+ void processNodeAttributes(const QDomElement &element);
QList<QSharedPointer<Folder> > m_folders;
QList<File::Ptr> m_files;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/global.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/global.cpp
index 3b023268fe..67fe7a2a25 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/global.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/global.cpp
@@ -65,25 +65,6 @@ void Global::processNode(const QDomNode &node)
processNodeAttributes(node.toElement());
}
-void Global::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
-
- if (domElement.name() == QLatin1String("Name"))
- m_name = domElement.value();
-
- else if (domElement.name() == QLatin1String("Value"))
- m_value = domElement.value();
- }
- }
-}
-
VcNodeWidget *Global::createSettingsWidget()
{
return 0;
@@ -119,5 +100,24 @@ void Global::setValue(const QString &value)
m_value = value;
}
+void Global::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+
+ if (domElement.name() == QLatin1String("Name"))
+ m_name = domElement.value();
+
+ else if (domElement.name() == QLatin1String("Value"))
+ m_value = domElement.value();
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/global.h b/src/plugins/vcprojectmanager/vcprojectmodel/global.h
index 365ab62287..34300cfb1d 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/global.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/global.h
@@ -49,7 +49,6 @@ public:
~Global();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -59,6 +58,8 @@ public:
void setValue(const QString &value);
private:
+ void processNodeAttributes(const QDomElement &element);
+
QString m_name; // required
QString m_value; // required
};
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp
index b1ca0b83b5..a7a2e9b2a6 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/globals.cpp
@@ -72,11 +72,6 @@ void Globals::processNode(const QDomNode &node)
}
}
-void Globals::processNodeAttributes(const QDomElement &element)
-{
- Q_UNUSED(element)
-}
-
VcNodeWidget *Globals::createSettingsWidget()
{
return 0;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/globals.h b/src/plugins/vcprojectmanager/vcprojectmodel/globals.h
index 43877609ba..8befddf838 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/globals.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/globals.h
@@ -53,7 +53,6 @@ public:
~Globals();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.h b/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.h
index d66a258402..8a1e1b276a 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.h
@@ -54,12 +54,6 @@ public:
virtual void processNode(const QDomNode &node) = 0;
/*!
- * This member function is called whenever XML DOM node element's attributes are processed.
- * \param element is the current XML DOM elements which attributes we are processing.
- */
- virtual void processNodeAttributes(const QDomElement &element) = 0;
-
- /*!
* This member function is used to create settings widget for a node.
* For example, every Configuration project node creates it's own settings widget.
* This widget is created by calling createSettingsWidget() of every Tool project node present
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp
index 7689615052..4a1714cfa4 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/platform.cpp
@@ -61,22 +61,6 @@ void Platform::processNode(const QDomNode &node)
processNodeAttributes(node.toElement());
}
-void Platform::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- if (namedNodeMap.size() == 1) {
- QDomNode domNode = namedNodeMap.item(0);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
-
- if (domElement.name() == QLatin1String("Name"))
- m_name = domElement.value();
- }
- }
-}
-
VcNodeWidget *Platform::createSettingsWidget()
{
return 0;
@@ -99,5 +83,21 @@ void Platform::setName(const QString &name)
m_name = name;
}
+void Platform::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ if (namedNodeMap.size() == 1) {
+ QDomNode domNode = namedNodeMap.item(0);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+
+ if (domElement.name() == QLatin1String("Name"))
+ m_name = domElement.value();
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platform.h b/src/plugins/vcprojectmanager/vcprojectmodel/platform.h
index f26540341d..4003917446 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/platform.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/platform.h
@@ -49,7 +49,6 @@ public:
~Platform();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -57,6 +56,8 @@ public:
void setName(const QString &name);
private:
+ void processNodeAttributes(const QDomElement &element);
+
QString m_name; // required
};
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp
index 1f84de66d5..a92ac1b17f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/platforms.cpp
@@ -70,11 +70,6 @@ void Platforms::processNode(const QDomNode &node)
}
}
-void Platforms::processNodeAttributes(const QDomElement &element)
-{
- Q_UNUSED(element)
-}
-
VcNodeWidget *Platforms::createSettingsWidget()
{
return 0;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.h b/src/plugins/vcprojectmanager/vcprojectmodel/platforms.h
index 64416ffafc..a6ff92f15c 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/platforms.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/platforms.h
@@ -52,7 +52,6 @@ public:
~Platforms();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp
index bb2cfeac75..f393c5c1bc 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp
@@ -41,11 +41,6 @@ void ProjectReference::processNode(const QDomNode &node)
m_private->processNode(node);
}
-void ProjectReference::processNodeAttributes(const QDomElement &element)
-{
- Q_UNUSED(element)
-}
-
VcNodeWidget *ProjectReference::createSettingsWidget()
{
// TODO(Radovan): Finish implementation
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h
index e0a42f78ab..c587cf8f26 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.h
@@ -47,7 +47,6 @@ public:
~ProjectReference();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp
index aa3c43e141..decc330bfb 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.cpp
@@ -77,20 +77,6 @@ void PublishingData::processNode(const QDomNode &node)
}
}
-void PublishingData::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
- m_anyAttribute.insert(domElement.name(), domElement.value());
- }
- }
-}
-
VcNodeWidget *PublishingData::createSettingsWidget()
{
return 0;
@@ -179,5 +165,19 @@ void PublishingData::removeAttribute(const QString &attributeName)
m_anyAttribute.remove(attributeName);
}
+void PublishingData::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+ m_anyAttribute.insert(domElement.name(), domElement.value());
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h b/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h
index b3cdd4b925..0069266930 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/publishingdata.h
@@ -48,7 +48,6 @@ public:
~PublishingData();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -67,6 +66,8 @@ public:
void removeAttribute(const QString &attributeName);
private:
+ void processNodeAttributes(const QDomElement &element);
+
QList<PublishingItem::Ptr> m_publishingItems;
QHash<QString, QString> m_anyAttribute;
};
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp
index e958331334..11cc47c29c 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.cpp
@@ -61,20 +61,6 @@ void PublishingItem::processNode(const QDomNode &node)
processNodeAttributes(node.toElement());
}
-void PublishingItem::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
- m_anyAttribute.insert(domElement.name(), domElement.value());
- }
- }
-}
-
VcNodeWidget *PublishingItem::createSettingsWidget()
{
return 0;
@@ -115,5 +101,19 @@ void PublishingItem::removeAttribute(const QString &attributeName)
m_anyAttribute.remove(attributeName);
}
+void PublishingItem::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+ m_anyAttribute.insert(domElement.name(), domElement.value());
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h b/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h
index edd2c5266a..a3aec8b66e 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/publishingitem.h
@@ -49,7 +49,6 @@ public:
~PublishingItem();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -59,6 +58,8 @@ public:
void removeAttribute(const QString &attributeName);
private:
+ void processNodeAttributes(const QDomElement &element);
+
QHash<QString, QString> m_anyAttribute;
};
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp
index f253979c58..d4eaabf411 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/references.cpp
@@ -87,11 +87,6 @@ void References::processNode(const QDomNode &node)
}
}
-void References::processNodeAttributes(const QDomElement &element)
-{
- Q_UNUSED(element);
-}
-
VcNodeWidget *References::createSettingsWidget()
{
return 0;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/references.h b/src/plugins/vcprojectmanager/vcprojectmodel/references.h
index f9b8f0ea33..f8dfa23b44 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/references.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/references.h
@@ -50,7 +50,6 @@ public:
~References();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp
index 4bff06949c..b27f879e2b 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.cpp
@@ -61,22 +61,6 @@ void ToolFile::processNode(const QDomNode &node)
processNodeAttributes(node.toElement());
}
-void ToolFile::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- if (namedNodeMap.size() == 1) {
- QDomNode domNode = namedNodeMap.item(0);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
-
- if (domElement.name() == QLatin1String("RelativePath"))
- m_relativePath = domElement.value();
- }
- }
-}
-
VcNodeWidget *ToolFile::createSettingsWidget()
{
return 0;
@@ -100,5 +84,21 @@ void ToolFile::setRelativePath(const QString &relativePath)
m_relativePath = relativePath;
}
+void ToolFile::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ if (namedNodeMap.size() == 1) {
+ QDomNode domNode = namedNodeMap.item(0);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+
+ if (domElement.name() == QLatin1String("RelativePath"))
+ m_relativePath = domElement.value();
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h b/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h
index 3ddb136f5d..ddd24e7751 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/toolfile.h
@@ -49,7 +49,6 @@ public:
~ToolFile();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -57,6 +56,8 @@ public:
void setRelativePath(const QString &relativePath);
private:
+ void processNodeAttributes(const QDomElement &element);
+
QString m_relativePath; // required
};
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp
index bd3bdb7387..7626e40f51 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.cpp
@@ -80,11 +80,6 @@ void ToolFiles::processNode(const QDomNode &node)
}
}
-void ToolFiles::processNodeAttributes(const QDomElement &element)
-{
- Q_UNUSED(element)
-}
-
VcNodeWidget *ToolFiles::createSettingsWidget()
{
return 0;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h
index 168aa2dcd3..a78e5177c0 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/toolfiles.h
@@ -49,7 +49,6 @@ public:
~ToolFiles();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
VcNodeWidget* createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.cpp
index c32ae7e152..cc850b12b7 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.cpp
@@ -65,25 +65,6 @@ void Tool::processNode(const QDomNode &node)
processNodeAttributes(node.toElement());
}
-void Tool::processNodeAttributes(const QDomElement &element)
-{
- QDomNamedNodeMap namedNodeMap = element.attributes();
-
- for (int i = 0; i < namedNodeMap.size(); ++i) {
- QDomNode domNode = namedNodeMap.item(i);
-
- if (domNode.nodeType() == QDomNode::AttributeNode) {
- QDomAttr domElement = domNode.toAttr();
-
- if (domElement.name() == QLatin1String("Name"))
- m_name = domElement.value();
-
- else
- m_anyAttribute.insert(domElement.name(), domElement.value());
- }
- }
-}
-
QDomNode Tool::toXMLDomNode(QDomDocument &domXMLDocument) const
{
QDomElement toolNode = domXMLDocument.createElement(QLatin1String("Tool"));
@@ -201,5 +182,24 @@ void Tool::setIntegerEnumAttribute(const QString &attributeName, int value, int
setAttribute(attributeName, QVariant(value).toString());
}
+void Tool::processNodeAttributes(const QDomElement &element)
+{
+ QDomNamedNodeMap namedNodeMap = element.attributes();
+
+ for (int i = 0; i < namedNodeMap.size(); ++i) {
+ QDomNode domNode = namedNodeMap.item(i);
+
+ if (domNode.nodeType() == QDomNode::AttributeNode) {
+ QDomAttr domElement = domNode.toAttr();
+
+ if (domElement.name() == QLatin1String("Name"))
+ m_name = domElement.value();
+
+ else
+ m_anyAttribute.insert(domElement.name(), domElement.value());
+ }
+ }
+}
+
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.h
index 4375313f16..24be7b01f3 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/tool.h
@@ -49,7 +49,6 @@ public:
Tool& operator= (const Tool& tool);
~Tool();
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
virtual QString nodeWidgetName() const = 0;
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
@@ -89,6 +88,7 @@ protected:
}
void setIntegerEnumAttribute(const QString &attributeName, int value, int defaultValue);
+ void processNodeAttributes(const QDomElement &element);
QHash<QString, QString> m_anyAttribute;
QString m_name;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp
index 605e3b36ec..453b9e5932 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp
@@ -212,11 +212,6 @@ void VcProjectDocument::processNode(const QDomNode &node)
processNode(node.nextSibling());
}
-void VcProjectDocument::processNodeAttributes(const QDomElement &element)
-{
- Q_UNUSED(element)
-}
-
void VcProjectDocument::parseProcessingInstruction(const QDomProcessingInstruction &processingInstruction)
{
QStringList data = processingInstruction.data().split(QLatin1Char(' '));
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
index 401414366a..967412c21e 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
@@ -91,7 +91,6 @@ protected:
VcProjectDocument(const VcProjectDocument &vcDoc);
VcProjectDocument& operator=(const VcProjectDocument &vcDoc);
void processNode(const QDomNode &node);
- void processNodeAttributes(const QDomElement &element);
virtual void processVisualStudioNode(const QDomElement &vsNode);
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
virtual QDomElement toVcDocumentElement(QDomDocument &domXMLDocument) const;