diff options
Diffstat (limited to 'src/plugins/designer')
-rw-r--r-- | src/plugins/designer/cpp/formclasswizard.cpp | 2 | ||||
-rw-r--r-- | src/plugins/designer/cpp/formclasswizard.h | 2 | ||||
-rw-r--r-- | src/plugins/designer/cpp/formclasswizarddialog.cpp | 2 | ||||
-rw-r--r-- | src/plugins/designer/cpp/formclasswizarddialog.h | 4 | ||||
-rw-r--r-- | src/plugins/designer/formwizard.cpp | 2 | ||||
-rw-r--r-- | src/plugins/designer/formwizard.h | 2 | ||||
-rw-r--r-- | src/plugins/designer/formwizarddialog.cpp | 4 | ||||
-rw-r--r-- | src/plugins/designer/formwizarddialog.h | 4 |
8 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp index 5a062f9ead..bfa11cdc37 100644 --- a/src/plugins/designer/cpp/formclasswizard.cpp +++ b/src/plugins/designer/cpp/formclasswizard.cpp @@ -60,7 +60,7 @@ QString FormClassWizard::formSuffix() const return preferredSuffix(QLatin1String(Constants::FORM_MIMETYPE)); } -QWizard *FormClassWizard::create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const +Core::BaseFileWizard *FormClassWizard::create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const { FormClassWizardDialog *wizardDialog = new FormClassWizardDialog(parameters.extensionPages(), parent); diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h index 7dbd0aa348..09164e9f59 100644 --- a/src/plugins/designer/cpp/formclasswizard.h +++ b/src/plugins/designer/cpp/formclasswizard.h @@ -49,7 +49,7 @@ public: QString formSuffix() const; private: - QWizard *create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const; + Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; }; diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp index 1b2b3eaa2b..6ca91ac133 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.cpp +++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp @@ -44,7 +44,7 @@ namespace Internal { // ----------------- FormClassWizardDialog FormClassWizardDialog::FormClassWizardDialog(const WizardPageList &extensionPages, QWidget *parent) : - Utils::Wizard(parent), + Core::BaseFileWizard(parent), m_formPage(new FormTemplateWizardPage), m_classPage(new FormClassWizardPage) { diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h index 0a1bc48bf3..fee9a63b16 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.h +++ b/src/plugins/designer/cpp/formclasswizarddialog.h @@ -30,7 +30,7 @@ #ifndef FORMCLASSWIZARDDIALOG_H #define FORMCLASSWIZARDDIALOG_H -#include <utils/wizard.h> +#include <coreplugin/basefilewizard.h> namespace Designer { @@ -41,7 +41,7 @@ namespace Internal { class FormClassWizardPage; class FormTemplateWizardPage; -class FormClassWizardDialog : public Utils::Wizard +class FormClassWizardDialog : public Core::BaseFileWizard { Q_OBJECT diff --git a/src/plugins/designer/formwizard.cpp b/src/plugins/designer/formwizard.cpp index 485e5ff58b..7ee1f6efe6 100644 --- a/src/plugins/designer/formwizard.cpp +++ b/src/plugins/designer/formwizard.cpp @@ -42,7 +42,7 @@ FormWizard::FormWizard() addRequiredFeature(Core::Id(QtSupport::Constants::FEATURE_QWIDGETS)); } -QWizard *FormWizard::create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const +Core::BaseFileWizard *FormWizard::create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const { FormFileWizardDialog *wizardDialog = new FormFileWizardDialog(parameters.extensionPages(), parent); diff --git a/src/plugins/designer/formwizard.h b/src/plugins/designer/formwizard.h index 33c3eef86e..c8b124d99b 100644 --- a/src/plugins/designer/formwizard.h +++ b/src/plugins/designer/formwizard.h @@ -43,7 +43,7 @@ public: FormWizard(); private: - QWizard *create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const; + Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; }; diff --git a/src/plugins/designer/formwizarddialog.cpp b/src/plugins/designer/formwizarddialog.cpp index 698416e0a4..5220eb9014 100644 --- a/src/plugins/designer/formwizarddialog.cpp +++ b/src/plugins/designer/formwizarddialog.cpp @@ -45,8 +45,8 @@ namespace Internal { // ----------------- FormWizardDialog FormWizardDialog::FormWizardDialog(const WizardPageList &extensionPages, - QWidget *parent) - : Utils::Wizard(parent), + QWidget *parent) : + Core::BaseFileWizard(parent), m_formPage(new FormTemplateWizardPage) { init(extensionPages); diff --git a/src/plugins/designer/formwizarddialog.h b/src/plugins/designer/formwizarddialog.h index 3652d5afdf..345b4b204a 100644 --- a/src/plugins/designer/formwizarddialog.h +++ b/src/plugins/designer/formwizarddialog.h @@ -30,7 +30,7 @@ #ifndef FORMWIZARDDIALOG_H #define FORMWIZARDDIALOG_H -#include <utils/wizard.h> +#include <coreplugin/basefilewizard.h> namespace Utils { class FileWizardPage; } @@ -42,7 +42,7 @@ class FormTemplateWizardPage; // Single-Page Wizard for new forms offering all types known to Qt Designer. // To be used for Mode "CreateNewEditor" [not currently used] -class FormWizardDialog : public Utils::Wizard +class FormWizardDialog : public Core::BaseFileWizard { Q_OBJECT |