[utilities/krusader] app: Drop code variants for no longer supported KF versions

Toni Asensi Esteve <[email protected]>
Newsgroups gmane.comp.kde.cvs
Message-ID <[email protected]>
Git commit b7a7d34715bd26902d968cbb3f4869ab28c3ae54 by Toni Asensi Esteve, on behalf of Friedrich W. H. Kossebau.
Committed on 19/07/2026 at 23:02.
Pushed by asensi into branch 'master'.

Drop code variants for no longer supported KF versions

M  +0    -16   app/DiskUsage/radialMap/widgetEvents.cpp
M  +0    -5    app/JobMan/jobman.cpp
M  +0    -5    app/KrViewer/krviewer.cpp
M  +0    -12   app/Panel/panelcontextmenu.cpp
M  +0    -6    app/Panel/panelfunc.cpp

https://invent.kde.org/utilities/krusader/-/commit/b7a7d34715bd26902d968cbb3f4869ab28c3ae54

diff --git a/app/DiskUsage/radialMap/widgetEvents.cpp b/app/DiskUsage/radialMap/widgetEvents.cpp
index 71bb812ce..15bcb1fcc 100644
--- a/app/DiskUsage/radialMap/widgetEvents.cpp
+++ b/app/DiskUsage/radialMap/widgetEvents.cpp
@@ -25,18 +25,8 @@
 #include <KIO/JobUiDelegate>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <kio_version.h>
-#include <kservice_version.h>
-
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 71, 0)
 #include <KIO/OpenUrlJob>
-#endif
-
-#if KSERVICE_VERSION >= QT_VERSION_CHECK(5, 83, 0)
 #include <KTerminalLauncherJob>
-#else
-#include <KToolInvocation>
-#endif
 
 void RadialMap::Widget::resizeEvent(QResizeEvent *)
 {
@@ -186,15 +176,9 @@ void RadialMap::Widget::mousePressEvent(QMouseEvent *e)
                 auto *job = new KIO::OpenUrlJob(url, this);
                 job->start();
             } else if (result == actKonsole) {
-#if KSERVICE_VERSION >= QT_VERSION_CHECK(5, 83, 0)
                 auto *job = new KTerminalLauncherJob(QString());
                 job->setWorkingDirectory(url.url());
                 job->start();
-#elif KSERVICE_VERSION >= QT_VERSION_CHECK(5, 79, 0)
-                KToolInvocation::invokeTerminal(QString(), QStringList(), url.url());
-#else
-                KToolInvocation::invokeTerminal(QString(), url.url());
-#endif
             } else if (result == actViewMag || result == actFileOpen) {
                 goto sectionTwo;
             } else if (result == actEditDel) {
diff --git a/app/JobMan/jobman.cpp b/app/JobMan/jobman.cpp
index e1a8a6084..1c57c6826 100644
--- a/app/JobMan/jobman.cpp
+++ b/app/JobMan/jobman.cpp
@@ -20,7 +20,6 @@
 #include <KIO/FileUndoManager>
 #include <KLocalizedString>
 #include <KSharedConfig>
-#include <kio_version.h>
 
 #include "../icon.h"
 #include "../krglobal.h"
@@ -347,11 +346,7 @@ void JobMan::slotUpdateControlAction()
 
 void JobMan::slotUndoTextChange(const QString &text)
 {
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 79, 0)
     bool isUndoAvailable = KIO::FileUndoManager::self()->isUndoAvailable();
-#else
-    bool isUndoAvailable = KIO::FileUndoManager::self()->undoAvailable();
-#endif
 
     m_undoAction->setToolTip(isUndoAvailable ? text : i18n("Undo Last Job"));
 }
diff --git a/app/KrViewer/krviewer.cpp b/app/KrViewer/krviewer.cpp
index 655035dc7..3a3654168 100644
--- a/app/KrViewer/krviewer.cpp
+++ b/app/KrViewer/krviewer.cpp
@@ -36,7 +36,6 @@
 #include <KShortcutsDialog>
 #include <KStandardAction>
 #include <KToolBar>
-#include <kxmlgui_version.h>
 #include <utility>
 #include <KParts/NavigationExtension>
 
@@ -232,11 +231,7 @@ void KrViewer::createGUI(KParts::Part *part)
 
 void KrViewer::configureShortcuts()
 {
-#if KXMLGUI_VERSION >= QT_VERSION_CHECK(5, 84, 0)
     KShortcutsDialog::showDialog(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this);
-#else
-    KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this);
-#endif
 }
 
 bool KrViewer::eventFilter(QObject * /* watched */, QEvent *e)
diff --git a/app/Panel/panelcontextmenu.cpp b/app/Panel/panelcontextmenu.cpp
index 6dc053457..5d1b0c50e 100644
--- a/app/Panel/panelcontextmenu.cpp
+++ b/app/Panel/panelcontextmenu.cpp
@@ -21,8 +21,6 @@
 #include <KPluginMetaData>
 #include <KPluginFactory>
 #include <KProcess>
-#include <kio_version.h>
-#include <kservice_version.h>
 
 #include "../Archive/krarchandler.h"
 #include "../FileSystem/fileitem.h"
@@ -144,13 +142,7 @@ PanelContextMenu::PanelContextMenu(KrPanel *krPanel, QWidget *parent)
         uniqueMimeTypes.insert(file->getMime());
     const QStringList mimeTypes = uniqueMimeTypes.values();
 
-#if KSERVICE_VERSION >= QT_VERSION_CHECK(5, 83, 0)
     offers = mimeTypes.count() == 1 ? KApplicationTrader::queryByMimeType(mimeTypes.first()) : KFileItemActions::associatedApplications(mimeTypes);
-#elif KSERVICE_VERSION >= QT_VERSION_CHECK(5, 68, 0)
-    offers = mimeTypes.count() == 1 ? KApplicationTrader::queryByMimeType(mimeTypes.first()) : KFileItemActions::associatedApplications(mimeTypes, QString());
-#else
-    offers = mimeTypes.count() == 1 ? KMimeTypeTrader::self()->query(mimeTypes.first()) : KFileItemActions::associatedApplications(mimeTypes, QString());
-#endif
 
     if (!offers.isEmpty()) {
         auto *openWithMenu = new QMenu(this);
@@ -186,11 +178,7 @@ PanelContextMenu::PanelContextMenu(KrPanel *krPanel, QWidget *parent)
         auto *fileItemActions = new KFileItemActions(this);
         fileItemActions->setItemListProperties(KFileItemListProperties(_items));
         fileItemActions->setParentWidget(MAIN_VIEW);
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 79, 0)
         fileItemActions->addActionsTo(this);
-#else
-        fileItemActions->addServiceActionsTo(this);
-#endif
     }
 
     addSeparator();
diff --git a/app/Panel/panelfunc.cpp b/app/Panel/panelfunc.cpp
index abb02e39e..c3f85ae9c 100644
--- a/app/Panel/panelfunc.cpp
+++ b/app/Panel/panelfunc.cpp
@@ -31,7 +31,6 @@
 #include <KTar>
 #include <KUrlMimeData>
 
-#include <kio_version.h>
 #include <KIO/CommandLauncherJob>
 #include <KIO/OpenUrlJob>
 #include <KIO/JobUiDelegateFactory>
@@ -946,7 +945,6 @@ void ListPanelFunc::runCommand(const QString &cmd)
     qDebug() << "command=" << cmd;
     const QString workdir = panel->virtualPath().isLocalFile() ? panel->virtualPath().path() : QDir::homePath();
 
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 71, 0)
     /* A note from kjob.h (KIO::CommandLauncherJob is a KJob):
      *
      * KJob and its subclasses are meant to be used
@@ -959,10 +957,6 @@ void ListPanelFunc::runCommand(const QString &cmd)
     job->setUiDelegate(new KDialogJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, krMainWindow));
     job->setWorkingDirectory(workdir);
     job->start();
-#else
-    if (!KRun::runCommand(cmd, krMainWindow, workdir))
-        KMessageBox::error(nullptr, i18n("Could not start %1", cmd));
-#endif
 }
 
 void ListPanelFunc::runService(const KService &service, const QList<QUrl> &urls)
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.