In kf6 kde4 migration code will be removed

agents/maildispatcher/maildispatcheragent.cpp

@@ -23,7 +23,10 @@
 #include <KLocalizedString>
 #include <KMime/Message>
 #include <KNotification>
+#include <kcoreaddons_version.h>
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>
+#endif
 
 #include <QDBusConnection>
 #include <QTimer>
@@ -117,10 +120,11 @@ void MailDispatcherAgent::dispatch()
 MailDispatcherAgent::MailDispatcherAgent(const QString &id)
     : AgentBase(id)
 {
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
     Kdelibs4ConfigMigrator migrate(QStringLiteral("maildispatcheragent"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("maildispatcheragentrc") << QStringLiteral("akonadi_maildispatcher_agent.notifyrc"));
     migrate.migrate();
-
+#endif
     qCDebug(MAILDISPATCHER_LOG) << "maildispatcheragent: At your service, sir!";
 
     new SettingsAdaptor(Settings::self());

agents/newmailnotifier/newmailnotifieragent.cpp

@@ -32,7 +32,10 @@
 #include <KLocalizedString>
 #include <KMime/Message>
 #include <KNotification>
+#include <kcoreaddons_version.h>
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>
+#endif
 #include <QTextToSpeech>
 
 using namespace Akonadi;
@@ -40,9 +43,11 @@ using namespace Akonadi;
 NewMailNotifierAgent::NewMailNotifierAgent(const QString &id)
     : AgentBase(id)
 {
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
     Kdelibs4ConfigMigrator migrate(QStringLiteral("newmailnotifieragent"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("akonadi_newmailnotifier_agentrc") << QStringLiteral("akonadi_newmailnotifier_agent.notifyrc"));
     migrate.migrate();
+#endif
     connect(this, &Akonadi::AgentBase::reloadConfiguration, this, &NewMailNotifierAgent::slotReloadConfiguration);
     KLocalizedString::setApplicationDomain("akonadi_newmailnotifier_agent");
     Akonadi::AttributeFactory::registerAttribute<Akonadi::NewMailNotifierAttribute>();