diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index e26a2bb16b..8d014fc2c0 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -378,10 +378,10 @@ QAction* DolphinContextMenu::createPasteAction() return action; } -KonqFileItemCapabilities& DolphinContextMenu::capabilities() +KFileItemListProperties& DolphinContextMenu::capabilities() { if (m_capabilities == 0) { - m_capabilities = new KonqFileItemCapabilities(m_selectedItems); + m_capabilities = new KFileItemListProperties(m_selectedItems); } return *m_capabilities; } diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index a660f05009..59da57146d 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -34,7 +34,7 @@ class KMenu; class KFileItem; class QAction; class DolphinMainWindow; -class KonqFileItemCapabilities; +class KFileItemListProperties; /** * @brief Represents the context menu which appears when doing a right @@ -95,7 +95,7 @@ private: QAction* createPasteAction(); private: - KonqFileItemCapabilities& capabilities(); + KFileItemListProperties& capabilities(); void addCustomActions(KMenu* menu); private: @@ -117,7 +117,7 @@ private: }; DolphinMainWindow* m_mainWindow; - KonqFileItemCapabilities* m_capabilities; + KFileItemListProperties* m_capabilities; KFileItem m_fileInfo; KUrl m_baseUrl; KFileItemList m_selectedItems; diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 35bc8bb863..e60d7662e5 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include @@ -1374,7 +1374,7 @@ void DolphinMainWindow::updateEditActions() QAction* cutAction = col->action(KStandardAction::name(KStandardAction::Cut)); QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler - KonqFileItemCapabilities capabilities(list); + KFileItemListProperties capabilities(list); const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); renameAction->setEnabled(capabilities.supportsMoving()); diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 93bd3ce5de..dbc9d79329 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -25,7 +25,7 @@ #include "dolphinnewmenuobserver.h" #include "dolphinremoteencoding.h" -#include +#include #include #include @@ -241,7 +241,7 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code) // in libkonq - KonqFileItemCapabilities capabilities(selection); + KFileItemListProperties capabilities(selection); const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); renameAction->setEnabled(capabilities.supportsMoving()); diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 5300553703..b2342c3b08 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -282,7 +282,7 @@ void DolphinViewContainer::slotDirListerCompleted() // it is unclear whether writing is supported m_isFolderWritable = true; } else { - KonqFileItemCapabilities capabilities(KFileItemList() << item); + KFileItemListProperties capabilities(KFileItemList() << item); m_isFolderWritable = capabilities.supportsWriting(); } diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index c63772a389..0ca48e1283 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ void TreeViewContextMenu::open() KMenu* popup = new KMenu(m_parent); if (!m_fileInfo.isNull()) { - KonqFileItemCapabilities capabilities(KFileItemList() << m_fileInfo); + KFileItemListProperties capabilities(KFileItemList() << m_fileInfo); // insert 'Cut', 'Copy' and 'Paste' QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);