revert last commit, it leads to the uncommon behavior that the last state of the...

svn path=/trunk/KDE/kdebase/apps/; revision=661511

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 2057c05d5ba6b8aa05bc24d2d3da683d3c19fe80..b87b3cb08e74d73e8b73836d17b91e060dff1a83 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -950,7 +950,8 @@ void DolphinMainWindow::compareFiles()
 
 void DolphinMainWindow::editSettings()
 {
-    DolphinSettingsDialog::instance(this).exec();
+    DolphinSettingsDialog dialog(this);
+    dialog.exec();
 }
 
 void DolphinMainWindow::init()

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 3ac70de028f00588cff43934ed938347ee53f038..7f8c50cca7d397b16144da85fb05faca3c050fb3 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -26,27 +26,6 @@
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
 
-DolphinSettingsDialog& DolphinSettingsDialog::instance(DolphinMainWindow* mainWindow)
-{
-    static DolphinSettingsDialog* instance = 0;
-    if (instance == 0) {
-        instance = new DolphinSettingsDialog(mainWindow);
-    }
-    return *instance;
-}
-
-DolphinSettingsDialog::~DolphinSettingsDialog()
-{
-}
-
-void DolphinSettingsDialog::slotButtonClicked(int button)
-{
-    if (button == Ok || button == Apply) {
-        applySettings();
-    }
-    KPageDialog::slotButtonClicked(button);
-}
-
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
     KPageDialog(),
     m_mainWindow(mainWindow)
@@ -68,6 +47,18 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
     viewSettingsFrame->setIcon(KIcon("view-choose"));
 }
 
+DolphinSettingsDialog::~DolphinSettingsDialog()
+{
+}
+
+void DolphinSettingsDialog::slotButtonClicked(int button)
+{
+    if (button == Ok || button == Apply) {
+        applySettings();
+    }
+    KPageDialog::slotButtonClicked(button);
+}
+
 void DolphinSettingsDialog::applySettings()
 {
     m_generalSettingsPage->applySettings();

diff --git a/src/dolphinsettingsdialog.h b/src/dolphinsettingsdialog.h
index 3a13dd0bde6630cfdd70e4c2f37ab5b924a84e5b..22d01b02e53b8b88d112267c82154315a530b0cf 100644 (file)
--- a/src/dolphinsettingsdialog.h
+++ b/src/dolphinsettingsdialog.h
@@ -39,14 +39,13 @@ class DolphinSettingsDialog : public KPageDialog
     Q_OBJECT
 
 public:
-    static DolphinSettingsDialog& instance(DolphinMainWindow* mainWindow);
+    explicit DolphinSettingsDialog(DolphinMainWindow* mainWindow);
     virtual ~DolphinSettingsDialog();
 
 protected slots:
     virtual void slotButtonClicked(int button);
 
 private:
-    DolphinSettingsDialog(DolphinMainWindow* mainWindow);
     void applySettings();
 
 private: