Merge branch 'master' into kf6

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index ffd0d9b5eb0afba4ce7d4474714b757a7b2acb70..c0ef1997a6762ff4af04349b562bae409bacc3fd 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -23,15 +23,10 @@
 #if HAVE_KACTIVITIES
 #include <KActivities/ResourceInstance>
 #endif
 #if HAVE_KACTIVITIES
 #include <KActivities/ResourceInstance>
 #endif

+#include <KApplicationTrader>

 #include <KFileItemActions>
 #include <KFilePlacesModel>
 #include <KFileItemActions>
 #include <KFilePlacesModel>

-#include <kio_version.h>
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)

 #include <KIO/JobUiDelegateFactory>
 #include <KIO/JobUiDelegateFactory>

-#else
-#include <KIO/JobUiDelegate>
-#endif
-#include <KApplicationTrader>

 #include <KIO/OpenUrlJob>
 #include <KLocalizedString>
 #include <KMessageWidget>
 #include <KIO/OpenUrlJob>
 #include <KLocalizedString>
 #include <KMessageWidget>


@@ -731,11 +726,7 @@ void DolphinViewContainer::slotItemActivated(const KFileItem &item)
     }
 
     KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl(), item.mimetype());
     }
 
     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));
     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();
     job->setShowOpenOrExecuteDialog(true);
     connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished);
     job->start();