From a86ea9707b2355282324fa5822b947834f597a77 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 24 Sep 2009 14:39:30 +0200
Subject: [PATCH] Fix form class wizard clobbering the class name when choosing
back
Task-number: QTCREATORBUG-116
Use initializePage instead of currentPageChanged().
---
src/plugins/designer/cpp/formclasswizarddialog.cpp | 5 ++---
src/plugins/designer/cpp/formclasswizarddialog.h | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index b3697e283fb..2abe1977cfb 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -57,8 +57,6 @@ FormClassWizardDialog::FormClassWizardDialog(const WizardPageList &extensionPage
foreach (QWizardPage *p, extensionPages)
addPage(p);
-
- connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotCurrentIdChanged(int)));
}
QString FormClassWizardDialog::path() const
@@ -76,8 +74,9 @@ bool FormClassWizardDialog::validateCurrentPage()
return QWizard::validateCurrentPage();
}
-void FormClassWizardDialog::slotCurrentIdChanged(int id)
+void FormClassWizardDialog::initializePage(int id)
{
+ QWizard::initializePage(id);
// Switching from form to class page: store XML template and set a suitable
// class name in the class page based on the form base class
if (id == ClassPageId) {
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h
index 2997ba6adb3..9707d92d099 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.h
+++ b/src/plugins/designer/cpp/formclasswizarddialog.h
@@ -62,8 +62,8 @@ public:
public slots:
void setPath(const QString &);
-private slots:
- void slotCurrentIdChanged(int id);
+protected:
+ void initializePage(int id);
private:
FormTemplateWizardPage *m_formPage;
--
GitLab