Fix the edit-menu action disabling/enabling bug in dolphinpart finally! Also, move FileItemCapabilities from dolphin to KonqFileItemCapabilities at dfaure's request (making it implicitly shared along the way).

BUGS:161594

svn path=/trunk/KDE/kdebase/apps/; revision=815584

1 files changed, 3 insertions, 3 deletions

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 13b1318da..a45d715dc 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -25,7 +25,6 @@
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
-#include "fileitemcapabilities.h"
 
 #include <kactioncollection.h>
 #include <kfileplacesmodel.h>
@@ -39,6 +38,7 @@
 #include <kmimetypetrader.h>
 #include <knewmenu.h>
 #include <konqmimedata.h>
+#include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konq_menuactions.h>
 #include <konq_popupmenuinformation.h>
@@ -451,10 +451,10 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
-FileItemCapabilities& DolphinContextMenu::capabilities()
+KonqFileItemCapabilities& DolphinContextMenu::capabilities()
 {
     if (m_capabilities == 0) {
-        m_capabilities = new FileItemCapabilities(m_selectedItems);
+        m_capabilities = new KonqFileItemCapabilities(m_selectedItems);
     }
     return *m_capabilities;
 }