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

[dolphin.git] / src / views / dolphinnewfilemenuobserver.cpp

diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 50a755b9a6a42e67cb803a7c5dd2ed71c732442b..7669f15616d0615fa4f7fae58fb9c336a3340cab 100644 (file)
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2009 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -19,8 +19,8 @@
 
 #include "dolphinnewfilemenuobserver.h"
 
-#include <kglobal.h>
-#include <knewmenu.h>
+#include <KGlobal>
+#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(const KUrl&)),
-            this, SIGNAL(itemCreated(const KUrl&)));
-    connect(menu, SIGNAL(directoryCreated(const KUrl&)),
-            this, SIGNAL(itemCreated(const KUrl&)));
+    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(const KUrl&)),
-               this, SIGNAL(itemCreated(const KUrl&)));
-    disconnect(menu, SIGNAL(directoryCreated(const KUrl&)),
-               this, SIGNAL(itemCreated(const KUrl&)));
+    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() :