We depend against kf5.98

agents/archivemailagent/archivemailwidget.cpp

@@ -9,12 +9,7 @@
 #include "archivemailagentutil.h"
 #include "archivemailkernel.h"
 
-#include <kio_version.h>
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
 #include <KIO/JobUiDelegateFactory>
-#else
-#include <KIO/JobUiDelegate>
-#endif
 #include <KIO/OpenUrlJob>
 
 #include "kmail-version.h"
@@ -314,11 +309,7 @@ void ArchiveMailWidget::slotOpenFolder()
         if (archiveItemInfo) {
             const QUrl url = archiveItemInfo->url();
             auto job = new KIO::OpenUrlJob(url);
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
             job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, parentWidget()));
-#else
-            job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, parentWidget()));
-#endif
             job->setRunExecutables(false);
             job->start();
         }

ktnef/src/ktnefmain.cpp

@@ -25,12 +25,7 @@
 #include <KEditToolBar>
 #include <KFileItemActions>
 #include <KIO/ApplicationLauncherJob>
-#include <kio_version.h>
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
 #include <KIO/JobUiDelegateFactory>
-#else
-#include <KIO/JobUiDelegate>
-#endif
 #include <KIO/OpenUrlJob>
 #include <KLocalizedString>
 #include <KMessageBox>
@@ -242,11 +237,7 @@ void KTNEFMain::viewFile()
             qCDebug(KTNEFAPPS_LOG) << "Mime type from attachment object: " << mimename;
         }
         auto job = new KIO::OpenUrlJob(url, mimename);
-#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->setDeleteTemporaryFile(true);
         job->start();
     } else {
@@ -277,11 +268,7 @@ void KTNEFMain::viewFileAs()
             // Creating ApplicationLauncherJob without any args will invoke the open-with dialog
             auto job = new KIO::ApplicationLauncherJob();
             job->setUrls(list);
-#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->start();
         }
     } else {
@@ -491,11 +478,7 @@ void KTNEFMain::slotShowMessageText()
         tmpFile->write(rtf.toLocal8Bit());
         tmpFile->close();
         auto job = new KIO::OpenUrlJob(QUrl::fromLocalFile(tmpFile->fileName()), QStringLiteral("text/rtf"));
-#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->setDeleteTemporaryFile(true);
         job->start();
         delete tmpFile;
@@ -531,11 +514,7 @@ void KTNEFMain::openWith(const KService::Ptr &offer)
         const QList<QUrl> lst{url};
         auto job = new KIO::ApplicationLauncherJob(offer);
         job->setUrls(lst);
-#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->start();
     }
 }

src/kmail_part.cpp

@@ -125,11 +125,6 @@ void KMailPart::exit()
     delete this;
 }
 
-QWidget *KMailPart::parentWidget() const
-{
-    return mParentWidget;
-}
-
 void KMailPart::save()
 {
     /*TODO*/

src/kmail_part.h

@@ -24,8 +24,6 @@ public:
     explicit KMailPart(QWidget *parentWidget, QObject *parent, const QVariantList &);
     ~KMailPart() override;
 
-    QWidget *parentWidget() const;
-
 public Q_SLOTS:
     Q_SCRIPTABLE void save();
     Q_SCRIPTABLE void exit();

src/messageactions.cpp

@@ -36,12 +36,7 @@
 #include <Akonadi/ItemFetchJob>
 #include <KActionCollection>
 #include <KActionMenu>
-#include <kio_version.h>
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
 #include <KIO/JobUiDelegateFactory>
-#else
-#include <KIO/JobUiDelegate>
-#endif
 #include <KIO/OpenUrlJob>
 #include <KLocalizedString>
 #include <KStringHandler>
@@ -575,11 +570,7 @@ void MessageActions::slotRunUrl(QAction *urlAction)
     const QVariant q = urlAction->data();
     if (q.type() == QVariant::Url) {
         auto job = new KIO::OpenUrlJob(q.toUrl());
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
         job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, mParent));
-#else
-        job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, mParent));
-#endif
         job->start();
     }
 }