diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2013-11-04 13:56:41 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-11-04 14:11:11 +0100 |
commit | a287352109c51ead3a0907dde0698372ce03b755 (patch) | |
tree | df27a985d4f167e6c197d3799d17b3e84f5d4c54 | |
parent | 12bdfdb744d4622571a007b72aa1da9c23515824 (diff) | |
download | qt-creator-a287352109c51ead3a0907dde0698372ce03b755.tar.gz |
Remove unused code.
Change-Id: I12007e9d198cd264d461b22abf3851052db62cf0
Reviewed-by: hjk <hjk121@nokiamail.com>
7 files changed, 8 insertions, 14 deletions
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp index 171277b616..a4a7af58f9 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp @@ -72,7 +72,7 @@ static inline QStringList baseClasses() namespace QmakeProjectManager { namespace Internal { -GuiAppWizard::GuiAppWizard(bool isMobile) +GuiAppWizard::GuiAppWizard() { setId(QLatin1String("C.Qt4Gui")); setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY)); @@ -84,7 +84,6 @@ GuiAppWizard::GuiAppWizard(bool isMobile) "Preselects a desktop Qt for building the application if available.")); setIcon(QIcon(QLatin1String(":/wizards/images/gui.png"))); setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS)); - m_createMobileProject = isMobile; } QWizard *GuiAppWizard::createWizardDialog(QWidget *parent, @@ -92,7 +91,6 @@ QWizard *GuiAppWizard::createWizardDialog(QWidget *parent, { GuiAppWizardDialog *dialog = new GuiAppWizardDialog(displayName(), icon(), showModulesPageForApplications(), - m_createMobileProject, parent, wizardDialogParameters); dialog->setProjectName(GuiAppWizardDialog::uniqueProjectName(wizardDialogParameters.defaultPath())); // Order! suffixes first to generate files correctly diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h index b52f74817c..812157de4d 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h @@ -42,7 +42,7 @@ class GuiAppWizard : public QtWizard Q_OBJECT public: - GuiAppWizard(bool isMobile = false); + GuiAppWizard(); private: QWizard *createWizardDialog(QWidget *parent, @@ -55,7 +55,6 @@ private: const GuiAppParameters ¶ms, QString *target, QString *errorMessage); - bool m_createMobileProject; }; } // namespace Internal diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp index bd201531c5..8b810dd7c0 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp @@ -47,7 +47,6 @@ GuiAppParameters::GuiAppParameters() GuiAppWizardDialog::GuiAppWizardDialog(const QString &templateName, const QIcon &icon, bool showModulesPage, - bool isMobile, QWidget *parent, const Core::WizardDialogParameters ¶meters) : BaseQmakeProjectWizardDialog(showModulesPage, parent, parameters), @@ -63,7 +62,7 @@ GuiAppWizardDialog::GuiAppWizardDialog(const QString &templateName, addModulesPage(); if (!parameters.extraValues().contains(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS))) - addTargetSetupPage(isMobile); + addTargetSetupPage(); m_filesPage->setFormInputCheckable(true); m_filesPage->setClassTypeComboVisible(false); diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h index 180e523f55..7ee7eff14e 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h @@ -61,7 +61,6 @@ public: explicit GuiAppWizardDialog(const QString &templateName, const QIcon &icon, bool showModulesPage, - bool mobile, QWidget *parent, const Core::WizardDialogParameters ¶meters); diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp index f5a200308c..adacdb4730 100644 --- a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp @@ -198,7 +198,7 @@ QtProjectParameters::Type LibraryWizardDialog::type() const bool LibraryWizardDialog::isModulesPageSkipped() const { - // When leaving the intro, target or mobile page, the modules page is skipped + // When leaving the intro or target page, the modules page is skipped // in the case of a plugin since it knows its dependencies by itself. return type() == QtProjectParameters::Qt4Plugin; } diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp index ccd2c08e06..3641d8660c 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp @@ -138,7 +138,7 @@ QWizard *CustomQmakeProjectWizard::createWizardDialog BaseQmakeProjectWizardDialog *wizard = new BaseQmakeProjectWizardDialog(false, parent, wizardDialogParameters); if (!wizardDialogParameters.extraValues().contains(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS))) - wizard->addTargetSetupPage(false, targetPageId); + wizard->addTargetSetupPage(targetPageId); initProjectWizardDialog(wizard, wizardDialogParameters.defaultPath(), wizardDialogParameters.extensionPages()); @@ -210,12 +210,11 @@ int BaseQmakeProjectWizardDialog::addModulesPage(int id) return newId; } -int BaseQmakeProjectWizardDialog::addTargetSetupPage(bool mobile, int id) +int BaseQmakeProjectWizardDialog::addTargetSetupPage(int id) { m_targetSetupPage = new ProjectExplorer::TargetSetupPage; const QString platform = selectedPlatform(); - Core::FeatureSet features = mobile ? Core::FeatureSet(QtSupport::Constants::FEATURE_MOBILE) - : Core::FeatureSet(QtSupport::Constants::FEATURE_DESKTOP); + Core::FeatureSet features = Core::FeatureSet(QtSupport::Constants::FEATURE_DESKTOP); if (platform.isEmpty()) m_targetSetupPage->setPreferredKitMatcher(new QtSupport::QtVersionKitMatcher(features)); else diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h index 3c12284ebf..2a67421621 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h @@ -123,7 +123,7 @@ public: virtual ~BaseQmakeProjectWizardDialog(); int addModulesPage(int id = -1); - int addTargetSetupPage(bool mobile = false, int id = -1); + int addTargetSetupPage(int id = -1); QStringList selectedModulesList() const; void setSelectedModules(const QString &, bool lock = false); |