Make it (almost) possible to have more than one Dolphin KMainWindow

    Create a DolphinApplication, holding DolphinMainWindows and update
    the code to use the DolphinView to get the MainWindow, or get a ptr
    to the MainWindow directly. Or if all windows are effected go through
    the DolphinApplication to update every mainwindow.
    The UndowManager and ProgressIndicator have a rather strange relationship
    and will need some more attention but as UndoManager will be killed
    anyway I have skipped this.
    More cleanup, debugging and thinking is needed.

svn path=/trunk/playground/utils/dolphin/; revision=608945

1 files changed, 6 insertions, 5 deletions

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 0982a61c7..f05d0d77d 100644
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -29,10 +29,11 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 
-FilterBar::FilterBar(QWidget *parent, const char *name) :
-    QWidget(parent, name)
+FilterBar::FilterBar(DolphinMainWindow* mainWindow, QWidget *parent, const char *name) :
+    QWidget(parent, name),
+    m_mainWindow(mainWindow)
 {
     const int gap = 3;
 
@@ -62,7 +63,7 @@ FilterBar::FilterBar(QWidget *parent, const char *name) :
             this, SIGNAL(signalFilterChanged(const QString&)));
     connect(m_close, SIGNAL(clicked()), this, SLOT(hide()));
     connect(m_close, SIGNAL(clicked()),
-            &Dolphin::mainWin(), SLOT(slotShowFilterBarChanged()));
+            mainWindow, SLOT(slotShowFilterBarChanged()));
 }
 
 FilterBar::~FilterBar()
@@ -89,7 +90,7 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {
         hide();
-        Dolphin::mainWin().slotShowFilterBarChanged();
+        m_mainWindow->slotShowFilterBarChanged();
     }
 }