revert last commit, it leads to the uncommon behavior that the last state of the settings dialog is remembered (grmpf - I should do more testing... ;-))

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

1 files changed, 12 insertions, 21 deletions

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 3ac70de02..7f8c50cca 100644
--- 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();