summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadovan Zivkovic <pivonroll@gmail.com>2013-10-11 10:43:29 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-03-11 19:55:00 +0100
commit90600a341bbaf7054005c7142235851c6e159f32 (patch)
tree240a9dd1c90baf0828ee7b60e411d7269e9d4451
parentd6acc9bc57eb9f5b88ca8e4d38c8ee22015b5c15 (diff)
downloadqt-creator-90600a341bbaf7054005c7142235851c6e159f32.tar.gz
Removed Configuration Widgets 2003, 2005 and 2008.
Change-Id: I266d6f83b9a1437a3e5dd61ffe61c63462ebb32a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp3
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.cpp62
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.h56
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/file.cpp1
-rw-r--r--src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri2
-rw-r--r--src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp30
-rw-r--r--src/plugins/vcprojectmanager/widgets/configurationswidgets.h21
9 files changed, 1 insertions, 176 deletions
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp
index a86aecea11..4a07c92c2e 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.cpp
@@ -30,7 +30,6 @@
#include "activexreference.h"
#include <QVariant>
-#include "configurationsfactory.h"
#include "generalattributecontainer.h"
#include "configurationcontainer.h"
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp
index 522f8155ab..8cd8d4fce0 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/assemblyreference.cpp
@@ -31,7 +31,6 @@
#include <QVariant>
-#include "configurationsfactory.h"
#include "configurationcontainer.h"
#include "generalattributecontainer.h"
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
index 45dda5cf00..cf16588138 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.cpp
@@ -29,7 +29,6 @@
****************************************************************************/
#include "configurations.h"
-#include "configurationsfactory.h"
#include "vcprojectdocument.h"
#include "../widgets/configurationswidgets.h"
#include "../interfaces/iconfiguration.h"
@@ -82,7 +81,7 @@ void Configurations::processNode(const QDomNode &node)
VcNodeWidget *Configurations::createSettingsWidget()
{
- ConfigurationsBaseWidget* widget = ConfigurationsFactory::createSettingsWidget(m_vcProjDoc, this);
+ ConfigurationsBaseWidget* widget = new ConfigurationsBaseWidget(this, m_vcProjDoc);
return widget;
}
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.cpp
deleted file mode 100644
index 73d8d81ee5..0000000000
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/**************************************************************************
-**
-** Copyright (c) 2013 Bojan Petrovic
-** Copyright (c) 2013 Radovan Zivkovic
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-#include "configurationsfactory.h"
-#include "../widgets/configurationswidgets.h"
-#include "vcprojectdocument.h"
-
-namespace VcProjectManager {
-namespace Internal {
-
-ConfigurationsFactory::ConfigurationsFactory()
-{
-}
-
-ConfigurationsFactory::~ConfigurationsFactory()
-{
-}
-
-ConfigurationsBaseWidget *ConfigurationsFactory::createSettingsWidget(VcProjectDocument *vcProjDoc, Configurations *config)
-{
- switch (vcProjDoc->documentVersion()) {
- case VcDocConstants::DV_MSVC_2003:
- return new Configurations2003Widget(config, vcProjDoc);
- case VcDocConstants::DV_MSVC_2005:
- return new Configurations2005Widget(config, vcProjDoc);
- case VcDocConstants::DV_MSVC_2008:
- return new Configurations2008Widget(config, vcProjDoc);
- case VcDocConstants::DV_UNRECOGNIZED:
- return 0;
- }
-
- return 0;
-}
-
-} // namespace Internal
-} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.h b/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.h
deleted file mode 100644
index dfd3663372..0000000000
--- a/src/plugins/vcprojectmanager/vcprojectmodel/configurationsfactory.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**************************************************************************
-**
-** Copyright (c) 2013 Bojan Petrovic
-** Copyright (c) 2013 Radovan Zivkovic
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-#ifndef VCPROJECTMANAGER_INTERNAL_CONFIGURATIONSFACTORY_H
-#define VCPROJECTMANAGER_INTERNAL_CONFIGURATIONSFACTORY_H
-
-#include "configuration.h"
-#include "vcprojectdocument_constants.h"
-
-namespace VcProjectManager {
-namespace Internal {
-
-class Configurations;
-class VcNodeWidget;
-class VcProjectDocument;
-class ConfigurationsBaseWidget;
-
-class ConfigurationsFactory
-{
-public:
- ConfigurationsFactory();
- ~ConfigurationsFactory();
-
- static ConfigurationsBaseWidget *createSettingsWidget(VcProjectDocument *vcProjDoc, Configurations *config);
-};
-
-} // namespace Internal
-} // namespace VcProjectManager
-
-#endif // VCPROJECTMANAGER_INTERNAL_CONFIGURATIONSFACTORY_H
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp
index ab69e98416..5d3b5a4ad0 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/file.cpp
@@ -29,7 +29,6 @@
****************************************************************************/
#include "file.h"
-#include "configurationsfactory.h"
#include "vcprojectdocument.h"
#include "configurationcontainer.h"
#include "generalattributecontainer.h"
diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri
index 27a127bdfc..44543fb1e0 100644
--- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri
+++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri
@@ -18,7 +18,6 @@ HEADERS += \
vcprojectmodel/deploymenttool.h \
vcprojectmodel/defaulttoolfile.h \
vcprojectmodel/debuggertool.h \
- vcprojectmodel/configurationsfactory.h \
vcprojectmodel/configurations.h \
vcprojectmodel/configuration.h \
vcprojectmodel/assemblyreference.h \
@@ -68,7 +67,6 @@ SOURCES += \
vcprojectmodel/deploymenttool.cpp \
vcprojectmodel/defaulttoolfile.cpp \
vcprojectmodel/debuggertool.cpp \
- vcprojectmodel/configurationsfactory.cpp \
vcprojectmodel/configurations.cpp \
vcprojectmodel/configuration.cpp \
vcprojectmodel/assemblyreference.cpp \
diff --git a/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp b/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp
index 3bc0b65dd8..ce8ca17604 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp
+++ b/src/plugins/vcprojectmanager/widgets/configurationswidgets.cpp
@@ -34,7 +34,6 @@
#include "configurationswidget.h"
#include "../vcprojectmodel/configurations.h"
#include "../vcprojectmodel/vcprojectdocument.h"
-#include "../vcprojectmodel/configurationsfactory.h"
#include "../vcprojectmodel/configurationcontainer.h"
#include "../vcprojectmodel/configuration.h"
#include "../vcprojectmodel/tools/toolattributes/tooldescription.h"
@@ -330,34 +329,5 @@ void ConfigurationsBaseWidget::addConfigurationToFile(IFile *filePtr, const QStr
}
}
-Configurations2003Widget::Configurations2003Widget(Configurations *configs, VcProjectDocument *vcProjDoc)
- : ConfigurationsBaseWidget(configs, vcProjDoc)
-{
-}
-
-Configurations2003Widget::~Configurations2003Widget()
-{
-}
-
-
-Configurations2005Widget::Configurations2005Widget(Configurations *configs, VcProjectDocument *vcProjDoc)
- : ConfigurationsBaseWidget(configs, vcProjDoc)
-{
-}
-
-Configurations2005Widget::~Configurations2005Widget()
-{
-}
-
-
-Configurations2008Widget::Configurations2008Widget(Configurations *configs, VcProjectDocument *vcProjDoc)
- : ConfigurationsBaseWidget(configs, vcProjDoc)
-{
-}
-
-Configurations2008Widget::~Configurations2008Widget()
-{
-}
-
} // namespace Internal
} // namespace VcProjectManager
diff --git a/src/plugins/vcprojectmanager/widgets/configurationswidgets.h b/src/plugins/vcprojectmanager/widgets/configurationswidgets.h
index d1c82024af..84b45a4b3d 100644
--- a/src/plugins/vcprojectmanager/widgets/configurationswidgets.h
+++ b/src/plugins/vcprojectmanager/widgets/configurationswidgets.h
@@ -80,27 +80,6 @@ protected:
QHash<IFile*, QList<IConfiguration*> > m_newFilesConfigurations;
};
-class Configurations2003Widget : public ConfigurationsBaseWidget
-{
-public:
- explicit Configurations2003Widget(Configurations *configs, VcProjectDocument *vcProjDoc);
- ~Configurations2003Widget();
-};
-
-class Configurations2005Widget : public ConfigurationsBaseWidget
-{
-public:
- explicit Configurations2005Widget(Configurations *configs, VcProjectDocument *vcProjDoc);
- ~Configurations2005Widget();
-};
-
-class Configurations2008Widget : public ConfigurationsBaseWidget
-{
-public:
- explicit Configurations2008Widget(Configurations *configs, VcProjectDocument *vcProjDoc);
- ~Configurations2008Widget();
-};
-
} // namespace Internal
} // namespace VcProjectManager