SVN_SILENT: Minor coding style and format cleanups. No change of behavior has been...

[dolphin.git] / src / dolphinnewmenu.cpp

diff --git a/src/dolphinnewmenu.cpp b/src/dolphinnewmenu.cpp
index 8592c30ad0e8b568b401de6bef58fa49d77e600f..234f75f8183bbd534b4c417c3fc6d293ae9ffef7 100644 (file)
--- a/src/dolphinnewmenu.cpp
+++ b/src/dolphinnewmenu.cpp
@@ -19,31 +19,35 @@
  ***************************************************************************/
 
 #include "dolphinnewmenu.h"
+
 #include "dolphinmainwindow.h"
-#include "dolphinstatusbar.h"
+#include "dolphinnewmenuobserver.h"
 #include "dolphinview.h"
+#include "dolphinviewcontainer.h"
+#include "statusbar/dolphinstatusbar.h"
 
 #include <kactioncollection.h>
 #include <kio/job.h>
 
-DolphinNewMenu::DolphinNewMenu(DolphinMainWindow* mainWin) :
-    KNewMenu(mainWin->actionCollection(), mainWin, "create_new"),
+DolphinNewMenu::DolphinNewMenu(QWidget* parent, DolphinMainWindow* mainWin) :
+    KNewFileMenu(mainWin->actionCollection(), "create_new", parent),
     m_mainWin(mainWin)
 {
+    DolphinNewMenuObserver::instance().attach(this);
 }
 
 DolphinNewMenu::~DolphinNewMenu()
 {
+    DolphinNewMenuObserver::instance().detach(this);
 }
 
 void DolphinNewMenu::slotResult(KJob* job)
 {
     if (job->error()) {
-        DolphinStatusBar* statusBar = m_mainWin->activeView()->statusBar();
+        DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar();
         statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);
-    }
-    else {
-        KNewMenu::slotResult(job);
+    } else {
+        KNewFileMenu::slotResult(job);
     }
 }