diff options
Diffstat (limited to 'src/plugins/vcprojectmanager/vcprojectmodel')
7 files changed, 12 insertions, 8 deletions
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp index ffe59a43a9..99d254ff61 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.cpp @@ -54,7 +54,7 @@ Configuration::Configuration(const QString &nodeName) { } -Configuration::Configuration(const Configuration &config) +Configuration::Configuration(const Configuration &config) : IConfiguration(config) { m_fullName = config.m_fullName; m_nodeName = config.m_nodeName; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.cpp index ee3f0fbcb7..73d8d81ee5 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.cpp @@ -47,13 +47,12 @@ ConfigurationsBaseWidget *ConfigurationsFactory::createSettingsWidget(VcProjectD switch (vcProjDoc->documentVersion()) { case VcDocConstants::DV_MSVC_2003: return new Configurations2003Widget(config, vcProjDoc); - break; case VcDocConstants::DV_MSVC_2005: return new Configurations2005Widget(config, vcProjDoc); - break; case VcDocConstants::DV_MSVC_2008: return new Configurations2008Widget(config, vcProjDoc); - break; + case VcDocConstants::DV_UNRECOGNIZED: + return 0; } return 0; diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp index b25f0c5aaa..6aa470fafa 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/projectreference.cpp @@ -308,6 +308,8 @@ ProjectReference::Ptr ProjectReferenceFactory::create(VcDocConstants::DocumentVe case VcDocConstants::DV_MSVC_2008: ref = ProjectReference::Ptr(new ProjectReference2008); break; + case VcDocConstants::DV_UNRECOGNIZED: + return ref; } if (ref) diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolattributeoption.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolattributeoption.cpp index 1f65b1c151..1f119b6cab 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolattributeoption.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/toolattributeoption.cpp @@ -33,8 +33,8 @@ namespace VcProjectManager { namespace Internal { ToolAttributeOption::ToolAttributeOption() - : m_isNull(true), - m_nextOption(0) + : m_nextOption(0), + m_isNull(true) { } diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.h index 499be0581f..8a18805ff3 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/toolattributes/tooldescription.h @@ -30,6 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_TOOLDESCRIPTION_H #define VCPROJECTMANAGER_INTERNAL_TOOLDESCRIPTION_H +#include <QList> #include <QString> #include "../../../interfaces/itooldescription.h" diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp index e0fc6663ba..8d3b770b67 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcdocprojectnodes.cpp @@ -333,7 +333,7 @@ bool VcDocProjectNode::addFiles(const ProjectExplorer::FileType fileType, const } } - if (node->nodeType() == ProjectExplorer::ProjectFileType) { + if (node->nodeType() == ProjectExplorer::ProjectNodeType) { VcDocProjectNode *projectNode = static_cast<VcDocProjectNode *>(node); if (projectNode) { @@ -383,7 +383,7 @@ bool VcDocProjectNode::removeFiles(const ProjectExplorer::FileType fileType, con containerNode->removeFileNode(fileNode); } - else if (parentNode && parentNode->nodeType() == ProjectExplorer::ProjectFileType) { + else if (parentNode && parentNode->nodeType() == ProjectExplorer::ProjectNodeType) { VcDocProjectNode *projectNode = static_cast<VcDocProjectNode *>(parentNode); if (projectNode) diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp index 53227a5a21..701811291e 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectdocument.cpp @@ -778,6 +778,8 @@ VcProjectDocument *VcProjectDocumentFactory::create(const QString &filePath, VcD case VcDocConstants::DV_MSVC_2008: vcDoc = new VcProjectDocument2008(filePath); break; + case VcDocConstants::DV_UNRECOGNIZED: + return 0; } if (vcDoc) |