Utils: Remove FileWizard class altogether

This fixes the regression where two Location pages were added
before.

Change-Id: Ic3241d707ad8dcf6fc3063bb4613dce49001e196
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/src/plugins/glsleditor/glslfilewizard.cpp b/src/plugins/glsleditor/glslfilewizard.cpp
index aa02e0d063..ddf3a98914 100644
--- a/src/plugins/glsleditor/glslfilewizard.cpp
+++ b/src/plugins/glsleditor/glslfilewizard.cpp
@@ -32,6 +32,7 @@
 
 #include <coreplugin/basefilewizard.h>
 
+#include <utils/filewizardpage.h>
 #include <utils/qtcassert.h>
 
 #include <QFileInfo>
@@ -51,8 +52,11 @@ Core::GeneratedFiles GLSLFileWizard::generateFiles(const QWizard *w,
                                                  QString * /*errorMessage*/) const
 {
     const Core::BaseFileWizard *wizard = qobject_cast<const Core::BaseFileWizard *>(w);
-    const QString path = wizard->path();
-    const QString name = wizard->fileName();
+    Utils::FileWizardPage *page = wizard->find<Utils::FileWizardPage>();
+    QTC_ASSERT(page, return Core::GeneratedFiles());
+
+    const QString path = page->path();
+    const QString name = page->fileName();
 
     const QString fileName = Core::BaseFileWizardFactory::buildFileName(path, name, preferredSuffix(m_shaderType));
 
@@ -120,7 +124,10 @@ Core::BaseFileWizard *GLSLFileWizard::create(QWidget *parent, const Core::Wizard
 {
     Core::BaseFileWizard *wizard = new Core::BaseFileWizard(parent);
     wizard->setWindowTitle(tr("New %1").arg(displayName()));
-    wizard->setPath(parameters.defaultPath());
+    Utils::FileWizardPage *page = new Utils::FileWizardPage;
+    page->setPath(parameters.defaultPath());
+    wizard->addPage(page);
+
     foreach (QWizardPage *p, parameters.extensionPages())
         wizard->addPage(p);
     return wizard;