Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index cc89725c257491f11a206989c2c082080b7c9a80..9082e0dd0c43c877b20eaaf5a8e653a2ce5d22e2 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -31,7 +31,6 @@
 #include <ktoggleaction.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
 #include <ktoggleaction.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>

-#include <knewstuff2/engine.h>

 
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
 
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)


@@ -80,7 +79,7 @@ DolphinView* DolphinViewActionHandler::currentView()
 void DolphinViewActionHandler::createActions()
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.
 void DolphinViewActionHandler::createActions()
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.

-    // KNewMenu takes care of the GUI stuff.
+    // KNewFileMenu takes care of the GUI stuff.

     KAction* newDirAction = m_actionCollection->addAction("create_dir");
     newDirAction->setText(i18nc("@action", "Create Folder..."));
     newDirAction->setShortcut(Qt::Key_F10);
     KAction* newDirAction = m_actionCollection->addAction("create_dir");
     newDirAction->setText(i18nc("@action", "Create Folder..."));
     newDirAction->setShortcut(Qt::Key_F10);


@@ -182,13 +181,6 @@ void DolphinViewActionHandler::createActions()
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("edit-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile()));
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("edit-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile()));

-       
-    // Settings menu
-
-    KAction* getServiceMenu = m_actionCollection->addAction("get_servicemenu");
-    getServiceMenu->setText(i18nc("@action:inmenu Settings", "Get Service Menu..."));
-    getServiceMenu->setIcon(KIcon("get-hot-new-stuff"));
-    connect(getServiceMenu, SIGNAL(triggered()), this, SLOT(slotGetServiceMenu()));

 }
 
 QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
 }
 
 QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()