From c6c091ab317ea0a3e02a7fc1c43a1d4bf31ce730 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Tue, 30 Sep 2014 17:53:20 +0200
Subject: [PATCH] Remove StandardFileWizardFactory
This class is now unused.
Clean up includes of basefilefactory.h (and surrounding includes)
while at it.
Change-Id: I7d4f695b5ebf9ef0a32d523442084d0591f12d02
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
.../coreplugin/basefilewizardfactory.cpp | 41 -------------------
.../coreplugin/basefilewizardfactory.h | 11 -----
.../designer/cpp/formclasswizarddialog.cpp | 4 --
src/plugins/designer/formwizarddialog.cpp | 2 -
.../customwizard/customwizardparameters.h | 2 +-
.../wizard/pythonclasswizarddialog.cpp | 1 -
.../customwidgetwizard/plugingenerator.cpp | 5 +--
.../wizards/abstractmobileapp.h | 2 +-
.../qmakeprojectmanager/wizards/qtquickapp.h | 2 +
src/plugins/qmlprojectmanager/qmlapp.cpp | 2 -
src/plugins/vcsbase/basecheckoutwizard.cpp | 2 -
11 files changed, 6 insertions(+), 68 deletions(-)
diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp
index d60ee34f244..04e5e81a5a2 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.cpp
+++ b/src/plugins/coreplugin/basefilewizardfactory.cpp
@@ -491,47 +491,6 @@ QString BaseFileWizardFactory::preferredSuffix(const QString &mimeType)
\sa Core::Internal::WizardEventLoop
*/
-/*!
- \fn Core::GeneratedFiles Core::StandardFileWizard::generateFilesFromPath(const QString &path,
- const QString &name,
- QString *errorMessage) const = 0
- Creates the files with the \a name under the \a path.
-*/
-
-/*!
- Creates a Utils::FileWizardDialog.
-*/
-
-BaseFileWizard *StandardFileWizardFactory::create(QWidget *parent, const WizardDialogParameters ¶meters) const
-{
- BaseFileWizard *wizard = new BaseFileWizard(parent);
- wizard->setWindowTitle(tr("New %1").arg(displayName()));
-
- Utils::FileWizardPage *page = new Utils::FileWizardPage;
- if (parameters.flags().testFlag(WizardDialogParameters::ForceCapitalLetterForFileName))
- page->setForceFirstCapitalLetterForFileName(true);
- page->setPath(parameters.defaultPath());
- wizard->addPage(page);
-
- foreach (QWizardPage *p, parameters.extensionPages())
- wizard->addPage(p);
- return wizard;
-}
-
-/*!
- Retrieves \a path and \a fileName and calls \c generateFilesFromPath().
-*/
-
-GeneratedFiles StandardFileWizardFactory::generateFiles(const QWizard *w,
- QString *errorMessage) const
-{
- const Utils::Wizard *wizard = qobject_cast<const Utils::Wizard *>(w);
- Utils::FileWizardPage *page = wizard->find<Utils::FileWizardPage>();
- QTC_ASSERT(page, return GeneratedFiles());
-
- return generateFilesFromPath(page->path(), page->fileName(), errorMessage);
-}
-
} // namespace Core
#include "basefilewizardfactory.moc"
diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h
index 26261f77978..0a5919179d7 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.h
+++ b/src/plugins/coreplugin/basefilewizardfactory.h
@@ -133,17 +133,6 @@ protected:
static bool postGenerateOpenEditors(const GeneratedFiles &l, QString *errorMessage = 0);
};
-class CORE_EXPORT StandardFileWizardFactory : public BaseFileWizardFactory
-{
- Q_OBJECT
-
-protected:
- BaseFileWizard *create(QWidget *parent, const WizardDialogParameters ¶meters) const;
- GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
- virtual GeneratedFiles generateFilesFromPath(const QString &path, const QString &name,
- QString *errorMessage) const = 0;
-};
-
} // namespace Core
Q_DECLARE_OPERATORS_FOR_FLAGS(Core::GeneratedFile::Attributes)
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index 64133aef56c..07e40b07302 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -33,10 +33,6 @@
#include <designer/formtemplatewizardpage.h>
#include <qtsupport/codegenerator.h>
-#include <coreplugin/basefilewizardfactory.h>
-
-#include <QDebug>
-
enum { FormPageId, ClassPageId };
namespace Designer {
diff --git a/src/plugins/designer/formwizarddialog.cpp b/src/plugins/designer/formwizarddialog.cpp
index f1bb1fdf4b4..427e99ad5df 100644
--- a/src/plugins/designer/formwizarddialog.cpp
+++ b/src/plugins/designer/formwizarddialog.cpp
@@ -30,12 +30,10 @@
#include "formwizarddialog.h"
#include "formtemplatewizardpage.h"
-#include <coreplugin/basefilewizardfactory.h>
#include <qtsupport/codegenerator.h>
#include <utils/filewizardpage.h>
-#include <QDebug>
#include <QAbstractButton>
// Make sure there is a gap before the extension pages
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
index aa5a9781d33..a68006ac661 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
@@ -30,7 +30,7 @@
#ifndef CUSTOMWIZARDPARAMETERS_H
#define CUSTOMWIZARDPARAMETERS_H
-#include <coreplugin/basefilewizardfactory.h>
+#include <coreplugin/iwizardfactory.h>
#include <QStringList>
#include <QMap>
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
index 15ba7180878..848ee932c94 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
@@ -31,7 +31,6 @@
#include "pythonclassnamepage.h"
#include <utils/newclasswidget.h>
-#include <coreplugin/basefilewizardfactory.h>
namespace PythonEditor {
namespace Internal {
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
index 67bd728599b..6ebaa371d2e 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
@@ -30,12 +30,11 @@
#include "plugingenerator.h"
#include "pluginoptions.h"
-#include <coreplugin/basefilewizardfactory.h>
+#include <coreplugin/generatedfile.h>
+#include <cpptools/abstracteditorsupport.h>
#include <utils/fileutils.h>
-#include <cpptools/abstracteditorsupport.h>
-
#include <QFileInfo>
#include <QDir>
#include <QSet>
diff --git a/src/plugins/qmakeprojectmanager/wizards/abstractmobileapp.h b/src/plugins/qmakeprojectmanager/wizards/abstractmobileapp.h
index 14350319d20..c89de746b6e 100644
--- a/src/plugins/qmakeprojectmanager/wizards/abstractmobileapp.h
+++ b/src/plugins/qmakeprojectmanager/wizards/abstractmobileapp.h
@@ -35,7 +35,7 @@
#include <QPair>
#ifndef CREATORLESSTEST
-#include <coreplugin/basefilewizardfactory.h>
+# include <coreplugin/generatedfile.h>
#endif // CREATORLESSTEST
QT_FORWARD_DECLARE_CLASS(QTextStream)
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickapp.h b/src/plugins/qmakeprojectmanager/wizards/qtquickapp.h
index 72631b3a4ba..b85277782b9 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtquickapp.h
+++ b/src/plugins/qmakeprojectmanager/wizards/qtquickapp.h
@@ -32,6 +32,8 @@
#include "abstractmobileapp.h"
+#include <QStringList>
+
namespace QmakeProjectManager {
namespace Internal {
diff --git a/src/plugins/qmlprojectmanager/qmlapp.cpp b/src/plugins/qmlprojectmanager/qmlapp.cpp
index 4012fe12285..ef2bcf9ad06 100644
--- a/src/plugins/qmlprojectmanager/qmlapp.cpp
+++ b/src/plugins/qmlprojectmanager/qmlapp.cpp
@@ -29,13 +29,11 @@
#include "qmlapp.h"
-
#include <coreplugin/basefilewizardfactory.h>
#include <coreplugin/icore.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
-#include <QDebug>
#include <QDir>
#include <QTextStream>
diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp
index f248714eaef..bb9ff311400 100644
--- a/src/plugins/vcsbase/basecheckoutwizard.cpp
+++ b/src/plugins/vcsbase/basecheckoutwizard.cpp
@@ -31,8 +31,6 @@
#include "basecheckoutwizardfactory.h"
#include "checkoutprogresswizardpage.h"
-#include <coreplugin/basefilewizardfactory.h>
-
#include <utils/qtcassert.h>
#include <QPushButton>
--
GitLab