From ad85be955bc34f9ed9aa69f4453f26f57bf85e04 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Tue, 26 Jan 2010 12:04:56 +0000
Subject: Deprecated KNewMenu and make it derive from KNewFileMenu (BIC, but
 SC; the only way to avoid duplicating code until kde5) Port all of kdebase'
 use of KNewMenu to KNewFileMenu. Also port from KonqNameAndUrlInputDialog to
 KNameAndUrlInputDialog, and from KonqMenuActions to KFileItemActions in
 dolphincontextmenu.cpp

svn path=/trunk/KDE/kdebase/apps/; revision=1080547
---
 src/dolphincontextmenu.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/dolphincontextmenu.cpp')

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 7e1586bf4..9b49f7c89 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -41,7 +41,7 @@
 #include <knewmenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
-#include <konq_menuactions.h>
+#include <kfileitemactions.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 #include <krun.h>
@@ -191,7 +191,7 @@ void DolphinContextMenu::openItemContextMenu()
         DolphinNewMenu* newMenu = new DolphinNewMenu(popup, m_mainWindow);
         const DolphinView* view = m_mainWindow->activeViewContainer()->view();
         newMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
-        newMenu->slotCheckUpToDate();
+        newMenu->checkUpToDate();
         newMenu->setPopupFiles(m_fileInfo.url());
         newMenu->setEnabled(capabilities().supportsWriting());
 
@@ -222,7 +222,7 @@ void DolphinContextMenu::openItemContextMenu()
         }
     }
 
-    KonqMenuActions menuActions;
+    KFileItemActions menuActions;
     menuActions.setParentWidget(m_mainWindow);
     menuActions.setItemListProperties(m_selectedItems);
 
@@ -230,7 +230,7 @@ void DolphinContextMenu::openItemContextMenu()
     menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
 
     // insert 'Actions' sub menu
-    if (menuActions.addActionsTo(popup)) {
+    if (menuActions.addServiceActionsTo(popup)) {
         popup->addSeparator();
     }
 
@@ -269,10 +269,10 @@ void DolphinContextMenu::openViewportContextMenu()
     addShowMenubarAction(popup);
 
     // setup 'Create New' menu
-    KNewMenu* newMenu = m_mainWindow->newMenu();
+    KNewFileMenu* newMenu = m_mainWindow->newMenu();
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     newMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
-    newMenu->slotCheckUpToDate();
+    newMenu->checkUpToDate();
     newMenu->setPopupFiles(m_baseUrl);
     popup->addMenu(newMenu->menu());
     popup->addSeparator();
-- 
cgit v1.3