3 files changed, 22 insertions, 22 deletions

diff --git a/src/views/dolphinnewmenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index def510c53..50a755b9a 100644
--- a/src/views/dolphinnewmenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -17,24 +17,24 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "dolphinnewmenuobserver.h"
+#include "dolphinnewfilemenuobserver.h"
 
 #include <kglobal.h>
 #include <knewmenu.h>
 
-class DolphinNewMenuObserverSingleton
+class DolphinNewFileMenuObserverSingleton
 {
 public:
-    DolphinNewMenuObserver instance;
+    DolphinNewFileMenuObserver instance;
 };
-K_GLOBAL_STATIC(DolphinNewMenuObserverSingleton, s_dolphinNewMenuObserver)
+K_GLOBAL_STATIC(DolphinNewFileMenuObserverSingleton, s_DolphinNewFileMenuObserver)
 
-DolphinNewMenuObserver& DolphinNewMenuObserver::instance()
+DolphinNewFileMenuObserver& DolphinNewFileMenuObserver::instance()
 {
-    return s_dolphinNewMenuObserver->instance;
+    return s_DolphinNewFileMenuObserver->instance;
 }
 
-void DolphinNewMenuObserver::attach(const KNewFileMenu* menu)
+void DolphinNewFileMenuObserver::attach(const KNewFileMenu* menu)
 {
     connect(menu, SIGNAL(fileCreated(const KUrl&)),
             this, SIGNAL(itemCreated(const KUrl&)));
@@ -42,7 +42,7 @@ void DolphinNewMenuObserver::attach(const KNewFileMenu* menu)
             this, SIGNAL(itemCreated(const KUrl&)));
 }
 
-void DolphinNewMenuObserver::detach(const KNewFileMenu* menu)
+void DolphinNewFileMenuObserver::detach(const KNewFileMenu* menu)
 {
     disconnect(menu, SIGNAL(fileCreated(const KUrl&)),
                this, SIGNAL(itemCreated(const KUrl&)));
@@ -50,13 +50,13 @@ void DolphinNewMenuObserver::detach(const KNewFileMenu* menu)
                this, SIGNAL(itemCreated(const KUrl&)));
 }
 
-DolphinNewMenuObserver::DolphinNewMenuObserver() :
+DolphinNewFileMenuObserver::DolphinNewFileMenuObserver() :
     QObject(0)
 {
 }
 
-DolphinNewMenuObserver::~DolphinNewMenuObserver()
+DolphinNewFileMenuObserver::~DolphinNewFileMenuObserver()
 {
 }
 
-#include "dolphinnewmenuobserver.moc"
+#include "dolphinnewfilemenuobserver.moc"
diff --git a/src/views/dolphinnewmenuobserver.h b/src/views/dolphinnewfilemenuobserver.h
index dc9010a43..35fda11db 100644
--- a/src/views/dolphinnewmenuobserver.h
+++ b/src/views/dolphinnewfilemenuobserver.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef DOLPHINNEWMENUOBSERVER_H
-#define DOLPHINNEWMENUOBSERVER_H
+#ifndef DOLPHINNEWFILEMENUOBSERVER_H
+#define DOLPHINNEWFILEMENUOBSERVER_H
 
 #include <QObject>
 
@@ -29,17 +29,17 @@ class KUrl;
 
 /**
  * @brief Allows to observe new file items that have been created
- *        by a DolphinNewMenu instance.
+ *        by a DolphinNewFileMenu instance.
  *
- * As soon as a DolphinNewMenu instance created a new item,
+ * As soon as a DolphinNewFileMenu instance created a new item,
  * the observer will emit the signal itemCreated().
  */
-class LIBDOLPHINPRIVATE_EXPORT DolphinNewMenuObserver : public QObject
+class LIBDOLPHINPRIVATE_EXPORT DolphinNewFileMenuObserver : public QObject
 {
     Q_OBJECT
 
 public:
-    static DolphinNewMenuObserver& instance();
+    static DolphinNewFileMenuObserver& instance();
     void attach(const KNewFileMenu* menu);
     void detach(const KNewFileMenu* menu);
 
@@ -47,10 +47,10 @@ signals:
     void itemCreated(const KUrl& url);
 
 private:
-    DolphinNewMenuObserver();
-    virtual ~DolphinNewMenuObserver();
+    DolphinNewFileMenuObserver();
+    virtual ~DolphinNewFileMenuObserver();
 
-    friend class DolphinNewMenuObserverSingleton;
+    friend class DolphinNewFileMenuObserverSingleton;
 };
 
 #endif
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 9d42aad0c..00751bf77 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -55,7 +55,7 @@
 #include "dolphinviewcontroller.h"
 #include "dolphindetailsview.h"
 #include "dolphinfileitemdelegate.h"
-#include "dolphinnewmenuobserver.h"
+#include "dolphinnewfilemenuobserver.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"
@@ -149,7 +149,7 @@ DolphinView::DolphinView(QWidget* parent,
     // When a new item has been created by the "Create New..." menu, the item should
     // get selected and it must be assured that the item will get visible. As the
     // creation is done asynchronously, several signals must be checked:
-    connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
+    connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
             this, SLOT(observeCreatedItem(const KUrl&)));
 
     m_selectionChangedTimer = new QTimer(this);