Replaced all KNewFileMenu usages in DolphinPart by DolphinNewFileMenu.

Removed all signal-slot-connections related to DolphinNewFileMenu->errorMessage(QString)
in DolphinMainWindow and DolphinContextMenu and replaced it by a better solution.

Now we make use of the already existing DolphinNewFileMenuObserver singleton class to achieve a better
error handling, because every newly created DolphinContextMenu instance registers himself by DolphinNewFileMenuObserver
and we use this to connect the errorMessage(QString) signal of every DolphinContextMenu instance to the errorMessage(QString)
signal of the DolphinNewFileMenuObserver singleton class.

So we need only one connection from DolphinNewFileMenuObserver to DolphinMainWindow (or to DolphinPart) to
collect all error messages thrown by every DolphinNewFileMenu instance.

REVIEW: 112178

2 files changed, 11 insertions, 6 deletions

diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 1cb5739d7..7669f1561 100644
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -20,7 +20,7 @@
 #include "dolphinnewfilemenuobserver.h"
 
 #include <KGlobal>
-#include <KNewFileMenu>
+#include "dolphinnewfilemenu.h"
 
 class DolphinNewFileMenuObserverSingleton
 {
@@ -34,20 +34,24 @@ DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()
     return s_DolphinNewFileMenuObserver->instance;
 }
 
-void DolphinNewFileMenuObserver::attach(const KNewFileMenu* menu)
+void DolphinNewFileMenuObserver::attach(const DolphinNewFileMenu* menu)
 {
     connect(menu, SIGNAL(fileCreated(KUrl)),
             this, SIGNAL(itemCreated(KUrl)));
     connect(menu, SIGNAL(directoryCreated(KUrl)),
             this, SIGNAL(itemCreated(KUrl)));
+    connect(menu, SIGNAL(errorMessage(QString)),
+            this, SIGNAL(errorMessage(QString)));
 }
 
-void DolphinNewFileMenuObserver::detach(const KNewFileMenu* menu)
+void DolphinNewFileMenuObserver::detach(const DolphinNewFileMenu* menu)
 {
     disconnect(menu, SIGNAL(fileCreated(KUrl)),
                this, SIGNAL(itemCreated(KUrl)));
     disconnect(menu, SIGNAL(directoryCreated(KUrl)),
                this, SIGNAL(itemCreated(KUrl)));
+    disconnect(menu, SIGNAL(errorMessage(QString)),
+               this, SIGNAL(errorMessage(QString)));
 }
 
 DolphinNewFileMenuObserver::DolphinNewFileMenuObserver() :
diff --git a/src/views/dolphinnewfilemenuobserver.h b/src/views/dolphinnewfilemenuobserver.h
index 726122cbc..239476eb9 100644
--- a/src/views/dolphinnewfilemenuobserver.h
+++ b/src/views/dolphinnewfilemenuobserver.h
@@ -24,7 +24,7 @@
 
 #include "libdolphin_export.h"
 
-class KNewFileMenu;
+class DolphinNewFileMenu;
 class KUrl;
 
 /**
@@ -40,11 +40,12 @@ class LIBDOLPHINPRIVATE_EXPORT DolphinNewFileMenuObserver : public QObject
 
 public:
     static DolphinNewFileMenuObserver& instance();
-    void attach(const KNewFileMenu* menu);
-    void detach(const KNewFileMenu* menu);
+    void attach(const DolphinNewFileMenu* menu);
+    void detach(const DolphinNewFileMenu* menu);
 
 signals:
     void itemCreated(const KUrl& url);
+    void errorMessage(const QString& error);
 
 private:
     DolphinNewFileMenuObserver();