Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / dolphinnewfilemenu.cpp

diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index 9d9baabe2b6911fee5c0c3debba615e6fb242f1c..e6ad72078d6e9944b1ddffb5f48df5cbf0427b0e 100644 (file)
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -20,17 +20,13 @@
 
 #include "dolphinnewfilemenu.h"
 
 
 #include "dolphinnewfilemenu.h"
 

-#include "dolphinmainwindow.h"
-#include "dolphinviewcontainer.h"

 #include "views/dolphinnewfilemenuobserver.h"
 #include "views/dolphinnewfilemenuobserver.h"

-#include "views/dolphinview.h"

 
 #include <KActionCollection>
 #include <KIO/Job>
 
 
 #include <KActionCollection>
 #include <KIO/Job>
 

-DolphinNewFileMenu::DolphinNewFileMenu(DolphinMainWindow* parent) :
-    KNewFileMenu(parent->actionCollection(), "create_new", parent),
-    m_mainWin(parent)
+DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection* collection, QObject* parent) :
+    KNewFileMenu(collection, QStringLiteral("new_menu"), parent)

 {
     DolphinNewFileMenuObserver::instance().attach(this);
 }
 {
     DolphinNewFileMenuObserver::instance().attach(this);
 }


@@ -43,11 +39,9 @@ DolphinNewFileMenu::~DolphinNewFileMenu()
 void DolphinNewFileMenu::slotResult(KJob* job)
 {
     if (job->error()) {
 void DolphinNewFileMenu::slotResult(KJob* job)
 {
     if (job->error()) {

-        DolphinViewContainer* container = m_mainWin->activeViewContainer();
-        container->showMessage(job->errorString(), DolphinViewContainer::Error);
+        emit errorMessage(job->errorString());

     } else {
         KNewFileMenu::slotResult(job);
     }
 }
 
     } else {
         KNewFileMenu::slotResult(job);
     }
 }
 

-#include "dolphinnewfilemenu.moc"