Merge remote-tracking branch 'origin/KDE/4.9'

[dolphin.git] / src / dolphinnewfilemenu.cpp

diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index c7ffb788e395ae68deefefd3763a047b116aaf8f..9d9baabe2b6911fee5c0c3debba615e6fb242f1c 100644 (file)
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -22,16 +22,15 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
-#include "statusbar/dolphinstatusbar.h"
 #include "views/dolphinnewfilemenuobserver.h"
 #include "views/dolphinview.h"
 
-#include <kactioncollection.h>
-#include <kio/job.h>
+#include <KActionCollection>
+#include <KIO/Job>
 
-DolphinNewFileMenu::DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin) :
-    KNewFileMenu(mainWin->actionCollection(), "create_new", parent),
-    m_mainWin(mainWin)
+DolphinNewFileMenu::DolphinNewFileMenu(DolphinMainWindow* parent) :
+    KNewFileMenu(parent->actionCollection(), "create_new", parent),
+    m_mainWin(parent)
 {
     DolphinNewFileMenuObserver::instance().attach(this);
 }
@@ -44,8 +43,8 @@ DolphinNewFileMenu::~DolphinNewFileMenu()
 void DolphinNewFileMenu::slotResult(KJob* job)
 {
     if (job->error()) {
-        DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar();
-        statusBar->setMessage(job->errorString(), DolphinStatusBar::Error);
+        DolphinViewContainer* container = m_mainWin->activeViewContainer();
+        container->showMessage(job->errorString(), DolphinViewContainer::Error);
     } else {
         KNewFileMenu::slotResult(job);
     }