summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadovan Zivkovic <pivonroll@gmail.com>2014-02-25 08:41:56 +0100
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-03-11 19:55:01 +0100
commit58fadd6dad6967f21b937d863e7f762f7efe65af (patch)
treea4828a83160372ffa87b2e63b02eb3dd8b6aec8b
parentcba5927df40903c1aa97056a9387053ed474f047 (diff)
downloadqt-creator-58fadd6dad6967f21b937d863e7f762f7efe65af.tar.gz
Code style fixes.
Change-Id: Icaea2fc240cd645a2c23110ce93f41eeaad3ccdb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h2
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h2
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/configuration.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/file.h3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/files.h4
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h4
-rw-r--r--src/plugins/vcprojectmanager/widgets/configurationbasewidget.h1
-rw-r--r--src/plugins/vcprojectmanager/widgets/configurationseditwidget.h1
-rw-r--r--src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h3
-rw-r--r--src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h3
-rw-r--r--src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp5
-rw-r--r--src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h2
16 files changed, 25 insertions, 12 deletions
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h
index 6c1aeb8fe0..d483630a02 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h
@@ -46,8 +46,8 @@ public:
ActiveXReference();
ActiveXReference(const ActiveXReference &ref);
ActiveXReference &operator=(const ActiveXReference &ref);
+ ~ActiveXReference();
- virtual ~ActiveXReference();
void processNode(const QDomNode &node);
VcNodeWidget *createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
index 8eee5cf151..92ed91af8a 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.h
@@ -46,8 +46,8 @@ public:
AssemblyReference();
AssemblyReference(const AssemblyReference &asmRef);
AssemblyReference &operator=(const AssemblyReference &asmRef);
-
~AssemblyReference();
+
void processNode(const QDomNode &node);
VcNodeWidget *createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
index 5ea51d6647..c44c7db97c 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h
@@ -47,10 +47,11 @@ class GeneralAttributeContainer;
class Configuration : public IConfiguration
{
public:
- Configuration(const QString &nodeName);
+ explicit Configuration(const QString &nodeName);
Configuration(const Configuration &config);
Configuration& operator=(const Configuration &config);
~Configuration();
+
void processNode(const QDomNode &node);
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h
index 7933520b79..aad0637d34 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/debuggertools.h
@@ -42,7 +42,6 @@ public:
DebuggerTools();
// IDebuggerTools interface
-public:
void addTool(IDebuggerTool *tool);
void removeTool(IDebuggerTool *tool);
IDebuggerTool *tool(int index) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h
index a3c8419069..a4e6f0b55f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/deploymenttools.h
@@ -42,6 +42,7 @@ public:
DeploymentTools();
DeploymentTools(const DeploymentTools &tools);
DeploymentTools &operator=(const DeploymentTools &tools);
+
// IDeploymentTools interface
void addTool(IDeploymentTool *tool);
void removeTool(IDeploymentTool *tool);
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/file.h b/src/plugins/vcprojectmanager/vcprojectmodel/file.h
index 61010ed479..8b618149c5 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/file.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/file.h
@@ -47,10 +47,11 @@ class File : public IFile
public:
typedef QSharedPointer<File> Ptr;
- File(IVisualStudioProject *parentProjectDoc);
+ explicit File(IVisualStudioProject *parentProjectDoc);
File(const File &file);
File &operator=(const File &file);
~File();
+
void processNode(const QDomNode &node);
VcNodeWidget *createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/files.h b/src/plugins/vcprojectmanager/vcprojectmodel/files.h
index 134e2d09ac..f353744018 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/files.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/files.h
@@ -42,11 +42,11 @@ namespace Internal {
class Files : public IFiles
{
public:
- Files(IVisualStudioProject *parentProject);
+ explicit Files(IVisualStudioProject *parentProject);
Files(const Files &files);
Files &operator =(const Files &files);
-
~Files();
+
void processNode(const QDomNode &node);
VcNodeWidget *createSettingsWidget();
QDomNode toXMLDomNode(QDomDocument &domXMLDocument) const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.h b/src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.h
index a02434c309..04d1560d35 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/generalattributecontainer.h
@@ -43,6 +43,7 @@ public:
GeneralAttributeContainer();
GeneralAttributeContainer(const GeneralAttributeContainer &attrCont);
GeneralAttributeContainer &operator=(const GeneralAttributeContainer &attrCont);
+
QString attributeValue(const QString &attributeName) const;
void clearAttribute(const QString &attributeName);
void removeAttribute(const QString &attributeName);
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h
index 75ac5f60b3..87fe83122f 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/attributedescriptiondataitem.h
@@ -46,6 +46,7 @@ public:
const QString &descriptionText,
const QString &defaultVal);
~AttributeDescriptionDataItem();
+
// IAttributeDescriptionDataItem interface
QString descriptionText() const;
QString displayText() const;
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
index d2152e9f27..9cc41885a6 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.h
@@ -54,9 +54,9 @@ public:
VcProjectDocument(const QString &filePath, VcDocConstants::DocumentVersion docVersion);
VcProjectDocument(const VcProjectDocument &vcDoc);
VcProjectDocument &operator=(const VcProjectDocument &vcDoc);
- virtual ~VcProjectDocument();
- void processNode(const QDomNode &domDoc);
+ ~VcProjectDocument();
+ void processNode(const QDomNode &domDoc);
bool saveToFile(const QString &filePath) const;
VcDocConstants::DocumentVersion documentVersion() const;
QString filePath() const;
diff --git a/src/plugins/vcprojectmanager/widgets/configurationbasewidget.h b/src/plugins/vcprojectmanager/widgets/configurationbasewidget.h
index fe07f63c5d..305ea2d986 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationbasewidget.h
+++ b/src/plugins/vcprojectmanager/widgets/configurationbasewidget.h
@@ -47,6 +47,7 @@ class ConfigurationBaseWidget : public VcNodeWidget
public:
explicit ConfigurationBaseWidget(IConfiguration *config);
~ConfigurationBaseWidget();
+
void saveData();
protected:
diff --git a/src/plugins/vcprojectmanager/widgets/configurationseditwidget.h b/src/plugins/vcprojectmanager/widgets/configurationseditwidget.h
index e2720876ab..f4da653aed 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationseditwidget.h
+++ b/src/plugins/vcprojectmanager/widgets/configurationseditwidget.h
@@ -50,6 +50,7 @@ class ConfigurationsEditWidget : public VcNodeWidget
public:
ConfigurationsEditWidget(IVisualStudioProject *vsProj, ConfigurationContainer *configContainer);
~ConfigurationsEditWidget();
+
void saveData();
private slots:
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h
index 4641de89cf..a54a86524f 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsectionsettingswidget.h
@@ -46,7 +46,8 @@ class IToolAttributeSettingsWidget;
class ToolSectionSettingsWidget : public VcNodeWidget
{
public:
- ToolSectionSettingsWidget(ToolSection *toolSection, QWidget *parent = 0);
+ explicit ToolSectionSettingsWidget(ToolSection *toolSection, QWidget *parent = 0);
+
void saveData();
private:
diff --git a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h
index d7d8f704a9..e05a28f5eb 100644
--- a/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h
+++ b/src/plugins/vcprojectmanager/widgets/toolwidgets/toolsettingswidget.h
@@ -42,7 +42,8 @@ class ToolSectionSettingsWidget;
class ToolSettingsWidget : public VcNodeWidget
{
public:
- ToolSettingsWidget(ConfigurationTool *tool, QWidget *parent = 0);
+ explicit ToolSettingsWidget(ConfigurationTool *tool, QWidget *parent = 0);
+
void saveData();
private:
diff --git a/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp b/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp
index 2654493f9a..ea374a2811 100644
--- a/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp
+++ b/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.cpp
@@ -86,6 +86,11 @@ QWidget *VcProjectKitConfigWidget::mainWidget() const
return m_comboBox;
}
+QWidget *VcProjectKitConfigWidget::buttonWidget() const
+{
+ return 0;
+}
+
void VcProjectKitConfigWidget::currentMsBuildChanged(int index)
{
if (0 <= index && index < m_comboBox->count()) {
diff --git a/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h b/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h
index e81fbd704b..d0193c2c95 100644
--- a/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h
+++ b/src/plugins/vcprojectmanager/widgets/vcprojectkitconfigwidget.h
@@ -57,7 +57,7 @@ public:
bool visibleInKit();
QWidget *mainWidget() const;
- QWidget *buttonWidget() const { return 0; }
+ QWidget *buttonWidget() const;
private slots:
void currentMsBuildChanged(int index);