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/dolphinpart.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/dolphinpart.cpp')

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 5b9297f08..c8db1c1e1 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -42,7 +42,7 @@
 #include <kio/netaccess.h>
 #include <ktoolinvocation.h>
 #include <kauthorized.h>
-#include <knewmenu.h>
+#include <knewfilemenu.h>
 #include <kmenu.h>
 #include <kinputdialog.h>
 
@@ -156,7 +156,7 @@ void DolphinPart::createActions()
 {
     // Edit menu
 
-    m_newMenu = new KNewMenu(actionCollection(), widget(), "new_menu");
+    m_newMenu = new KNewFileMenu(actionCollection(), "new_menu", widget());
     DolphinNewMenuObserver::instance().attach(m_newMenu);
     connect(m_newMenu->menu(), SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
@@ -601,8 +601,8 @@ void DolphinPart::slotOpenTerminal()
 
 void DolphinPart::updateNewMenu()
 {
-    // As requested by KNewMenu :
-    m_newMenu->slotCheckUpToDate();
+    // As requested by KNewFileMenu :
+    m_newMenu->checkUpToDate();
     m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
     // And set the files that the menu apply on :
     m_newMenu->setPopupFiles(url());
-- 
cgit v1.3