X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ee0f3435b28908478dec8fc8bca651fa7795f139..a6db5029acc09639fd8c7c20a7676b1ac9f36539:/src/views/dolphinnewfilemenuobserver.cpp

diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 8d7e00738..6379adb31 100644
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -19,39 +19,42 @@
 
 #include "dolphinnewfilemenuobserver.h"
 
-#include <KGlobal>
-#include <knewfilemenu.h>
+#include "dolphinnewfilemenu.h"
 
 class DolphinNewFileMenuObserverSingleton
 {
 public:
     DolphinNewFileMenuObserver instance;
 };
-K_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
+Q_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
 
 DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()
 {
     return s_DolphinNewFileMenuObserver->instance;
 }
 
-void DolphinNewFileMenuObserver::attach(const KNewFileMenu* menu)
+void DolphinNewFileMenuObserver::attach(const DolphinNewFileMenu* menu)
 {
-    connect(menu, SIGNAL(fileCreated(const KUrl&)),
-            this, SIGNAL(itemCreated(const KUrl&)));
-    connect(menu, SIGNAL(directoryCreated(const KUrl&)),
-            this, SIGNAL(itemCreated(const KUrl&)));
+    connect(menu, &DolphinNewFileMenu::fileCreated,
+            this, &DolphinNewFileMenuObserver::itemCreated);
+    connect(menu, &DolphinNewFileMenu::directoryCreated,
+            this, &DolphinNewFileMenuObserver::itemCreated);
+    connect(menu, &DolphinNewFileMenu::errorMessage,
+            this, &DolphinNewFileMenuObserver::errorMessage);
 }
 
-void DolphinNewFileMenuObserver::detach(const KNewFileMenu* menu)
+void DolphinNewFileMenuObserver::detach(const DolphinNewFileMenu* menu)
 {
-    disconnect(menu, SIGNAL(fileCreated(const KUrl&)),
-               this, SIGNAL(itemCreated(const KUrl&)));
-    disconnect(menu, SIGNAL(directoryCreated(const KUrl&)),
-               this, SIGNAL(itemCreated(const KUrl&)));
+    disconnect(menu, &DolphinNewFileMenu::fileCreated,
+               this, &DolphinNewFileMenuObserver::itemCreated);
+    disconnect(menu, &DolphinNewFileMenu::directoryCreated,
+               this, &DolphinNewFileMenuObserver::itemCreated);
+    disconnect(menu, &DolphinNewFileMenu::errorMessage,
+               this, &DolphinNewFileMenuObserver::errorMessage);
 }
 
 DolphinNewFileMenuObserver::DolphinNewFileMenuObserver() :
-    QObject(0)
+    QObject(nullptr)
 {
 }
 
@@ -59,4 +62,3 @@ DolphinNewFileMenuObserver::~DolphinNewFileMenuObserver()
 {
 }
 
-#include "dolphinnewfilemenuobserver.moc"