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

[dolphin.git] / src / dolphinnewfilemenu.h

diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h
index bc6f6be4fd8d0e82fad7af5b588e0fc3902fecd2..ae5881366dd8b13257f8b45d1fc50b8b09ddc296 100644 (file)
--- a/src/dolphinnewfilemenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -21,9 +21,8 @@
 #ifndef DOLPHINNEWFILEMENU_H
 #define DOLPHINNEWFILEMENU_H
 
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 
-class DolphinMainWindow;
 class KJob;
 
 /**
@@ -39,15 +38,15 @@ class DolphinNewFileMenu : public KNewFileMenu
     Q_OBJECT
 
 public:
-    DolphinNewFileMenu(DolphinMainWindow* parent);
+    DolphinNewFileMenu(KActionCollection* collection, QObject* parent);
     virtual ~DolphinNewFileMenu();
 
+signals:
+    void errorMessage(const QString& error);
+
 protected slots:
     /** @see KNewFileMenu::slotResult() */
     virtual void slotResult(KJob* job);
-
-private:
-    DolphinMainWindow* m_mainWin;
 };
 
 #endif