From b44b4806cb1a16cf8b414b504de6f46cf45dc52f Mon Sep 17 00:00:00 2001 From: =?utf8?q?D=C4=81vis=20Mos=C4=81ns?= Date: Sat, 4 Mar 2023 23:08:37 +0000 Subject: [PATCH] Port to KF6 KParts --- src/dolphinpart.cpp | 12 ++++++------ src/dolphinpart_ext.cpp | 6 +++--- src/dolphinpart_ext.h | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 64c829c2d..e97417994 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -85,7 +85,7 @@ DolphinPart::DolphinPart(QWidget *parentWidget, QObject *parent, const KPluginMe }); connect(m_view, &DolphinView::tabRequested, this, &DolphinPart::createNewWindow); connect(m_view, &DolphinView::requestContextMenu, this, &DolphinPart::slotOpenContextMenu); - connect(m_view, &DolphinView::selectionChanged, m_extension, &KParts::BrowserExtension::selectionInfo); + connect(m_view, &DolphinView::selectionChanged, m_extension, &KParts::NavigationExtension::selectionInfo); connect(m_view, &DolphinView::selectionChanged, this, &DolphinPart::slotSelectionChanged); connect(m_view, &DolphinView::requestItemInfo, this, &DolphinPart::slotRequestItemInfo); connect(m_view, &DolphinView::modeChanged, this, &DolphinPart::viewModeChanged); // relay signal @@ -362,8 +362,8 @@ void DolphinPart::createNewWindow(const QUrl &url) void DolphinPart::slotOpenContextMenu(const QPoint &pos, const KFileItem &_item, const KFileItemList &selectedItems, const QUrl &) { - KParts::BrowserExtension::PopupFlags popupFlags = - KParts::BrowserExtension::DefaultPopupItems | KParts::BrowserExtension::ShowProperties | KParts::BrowserExtension::ShowUrlOperations; + KParts::NavigationExtension::PopupFlags popupFlags = + KParts::NavigationExtension::DefaultPopupItems | KParts::NavigationExtension::ShowProperties | KParts::NavigationExtension::ShowUrlOperations; KFileItem item(_item); @@ -384,7 +384,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint &pos, const KFileItem &_item, KFileItemListProperties capabilities(items); - KParts::BrowserExtension::ActionGroupMap actionGroups; + KParts::NavigationExtension::ActionGroupMap actionGroups; QList editActions; editActions += m_view->versionControlActions(m_view->selectedItems()); @@ -409,7 +409,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint &pos, const KFileItem &_item, m_removeAction->update(); } } else { - popupFlags |= KParts::BrowserExtension::NoDeletion; + popupFlags |= KParts::NavigationExtension::NoDeletion; } if (supportsMoving) { @@ -420,7 +420,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint &pos, const KFileItem &_item, // since otherwise the created file would not be visible. // But in treeview mode we should allow it. if (m_view->itemsExpandable()) - popupFlags |= KParts::BrowserExtension::ShowCreateDirectory; + popupFlags |= KParts::NavigationExtension::ShowCreateDirectory; } actionGroups.insert(QStringLiteral("editactions"), editActions); diff --git a/src/dolphinpart_ext.cpp b/src/dolphinpart_ext.cpp index 9028b0358..1aa16eeaa 100644 --- a/src/dolphinpart_ext.cpp +++ b/src/dolphinpart_ext.cpp @@ -10,20 +10,20 @@ #include "views/dolphinview.h" DolphinPartBrowserExtension::DolphinPartBrowserExtension(DolphinPart *part) - : KParts::BrowserExtension(part) + : KParts::NavigationExtension(part) , m_part(part) { } void DolphinPartBrowserExtension::restoreState(QDataStream &stream) { - KParts::BrowserExtension::restoreState(stream); + KParts::NavigationExtension::restoreState(stream); m_part->view()->restoreState(stream); } void DolphinPartBrowserExtension::saveState(QDataStream &stream) { - KParts::BrowserExtension::saveState(stream); + KParts::NavigationExtension::saveState(stream); m_part->view()->saveState(stream); } diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h index 615f14252..7f8792fbb 100644 --- a/src/dolphinpart_ext.h +++ b/src/dolphinpart_ext.h @@ -7,16 +7,16 @@ #ifndef DOLPHINPART_EXT_H #define DOLPHINPART_EXT_H -#include -#include -#include -#include +#include +#include +#include +#include #include class DolphinPart; -class DolphinPartBrowserExtension : public KParts::BrowserExtension +class DolphinPartBrowserExtension : public KParts::NavigationExtension { Q_OBJECT public: -- 2.47.3