diff options
author | Jarek Kobus <jkobus@trolltech.com> | 2010-03-29 18:32:37 +0200 |
---|---|---|
committer | Jarek Kobus <jkobus@trolltech.com> | 2010-03-29 18:33:49 +0200 |
commit | 2319f57caaaf1668f1d32fec95b104d4ec70b698 (patch) | |
tree | 24eae08a6270abeb9e810371c877c390e57adcd0 /src/libs/utils/wizard.cpp | |
parent | b1aae1b65d0ee5bb10f0de1a97f0ebaa89aa3ac3 (diff) | |
download | qt-creator-2319f57caaaf1668f1d32fec95b104d4ec70b698.tar.gz |
The constructor of Wizard takes now WindowFlags, get rid of QScopedPointer
Diffstat (limited to 'src/libs/utils/wizard.cpp')
-rw-r--r-- | src/libs/utils/wizard.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index 0149c882b6..4489c95ca2 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -290,8 +290,8 @@ public: WizardProgress *m_wizardProgress; }; -Wizard::Wizard(QWidget *parent) : - QWizard(parent), d_ptr(new WizardPrivate) +Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) : + QWizard(parent, flags), d_ptr(new WizardPrivate) { d_ptr->q_ptr = this; d_ptr->m_wizardProgress = new WizardProgress(this); @@ -301,6 +301,11 @@ Wizard::Wizard(QWidget *parent) : setSideWidget(new LinearProgressWidget(d_ptr->m_wizardProgress, this)); } +Wizard::~Wizard() +{ + delete d_ptr; +} + bool Wizard::isAutomaticProgressCreationEnabled() const { Q_D(const Wizard); @@ -563,6 +568,7 @@ WizardProgress::~WizardProgress() delete it.key(); ++it; } + delete d_ptr; } WizardProgressItem *WizardProgress::addItem(const QString &title) @@ -764,7 +770,7 @@ WizardProgressItem::WizardProgressItem(WizardProgress *progress, const QString & WizardProgressItem::~WizardProgressItem() { - + delete d_ptr; } void WizardProgressItem::addPage(int pageId) |