From 49c5ef262cc46db0976e6a64c5ae3bd617bc7afe Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 14 Jan 2009 10:00:58 +0100
Subject: [PATCH] Fixes: Use apply()/finish() of Designer settings page
interface
RevBy: Thorbjorn
---
src/plugins/designer/settingspage.cpp | 9 +++------
src/plugins/designer/settingspage.h | 7 +++----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp
index 0cd62445101..8de4cad5dc2 100644
--- a/src/plugins/designer/settingspage.cpp
+++ b/src/plugins/designer/settingspage.cpp
@@ -39,8 +39,7 @@
using namespace Designer::Internal;
SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) :
- m_designerPage(designerPage),
- m_applyOnFinish(false)
+ m_designerPage(designerPage)
{
}
@@ -65,17 +64,15 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent)
{
- m_applyOnFinish = false;
return m_designerPage->createPage(parent);
}
void SettingsPage::apply()
{
- // FIXME: Since no cleanup should be done here, we can't call finish(true)
- m_applyOnFinish = true;
+ m_designerPage->apply();
}
void SettingsPage::finish()
{
- m_designerPage->finish(m_applyOnFinish);
+ m_designerPage->finish();
}
diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h
index 1eea480db72..8ad707dd769 100644
--- a/src/plugins/designer/settingspage.h
+++ b/src/plugins/designer/settingspage.h
@@ -58,13 +58,12 @@ public:
QString category() const;
QString trCategory() const;
- QWidget *createPage(QWidget *parent);
- void apply();
- void finish();
+ virtual QWidget *createPage(QWidget *parent);
+ virtual void apply();
+ virtual void finish();
private:
QDesignerOptionsPageInterface *m_designerPage;
- bool m_applyOnFinish;
};
} // namespace Internal
--
GitLab