diff options
| author | Méven Car <[email protected]> | 2023-08-28 10:32:35 +0200 |
|---|---|---|
| committer | Méven Car <[email protected]> | 2023-08-28 10:36:37 +0200 |
| commit | 1318f16fd7b84de79c04eb468d61e1c9b7b52e15 (patch) | |
| tree | 430c477f6d9229eede00ece60d11b09be3b498cc /src/dolphinviewcontainer.cpp | |
| parent | a2e888d9a03add380c113c0f5edff5391e90a358 (diff) | |
Clean obsolete ifdefs since dolphin requires KF 5.101+
Diffstat (limited to 'src/dolphinviewcontainer.cpp')
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 2811a1ee4..63d5bd27b 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -23,20 +23,16 @@ #if HAVE_KACTIVITIES #include <KActivities/ResourceInstance> #endif +#include <KApplicationTrader> #include <KFileItemActions> #include <KFilePlacesModel> -#include <kio_version.h> -#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0) #include <KIO/JobUiDelegateFactory> -#else -#include <KIO/JobUiDelegate> -#endif -#include <KApplicationTrader> #include <KIO/OpenUrlJob> #include <KLocalizedString> #include <KMessageWidget> #include <KProtocolManager> #include <KShell> +#include <kio_version.h> #include <QApplication> #include <QDesktopServices> @@ -731,11 +727,7 @@ void DolphinViewContainer::slotItemActivated(const KFileItem &item) } KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl(), item.mimetype()); -#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0) job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); -#else - job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); -#endif job->setShowOpenOrExecuteDialog(true); connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished); job->start(); @@ -766,11 +758,7 @@ void DolphinViewContainer::slotfileMiddleClickActivated(const KFileItem &item) KIO::ApplicationLauncherJob *job = new KIO::ApplicationLauncherJob(service, this); job->setUrls({item.url()}); -#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0) job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); -#else - job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); -#endif connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished); job->start(); } |