In kf6 kde4 migration code will be removed

aa38054f · Laurent Montel · c8aef7be · aa38054f · aa38054f
Commit aa38054f authored Apr 22, 2021 by Laurent Montel 😁
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

contactthemeeditor/main.cpp contactthemeeditor/main.cpp +5 -2

headerthemeeditor/main.cpp headerthemeeditor/main.cpp +5 -0

No files found.
--- a/contactthemeeditor/main.cpp
+++ b/contactthemeeditor/main.cpp
@@ -9,7 +9,10 @@
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
+#include <kcoreaddons_version.h>
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>
+#endif
 #include <QApplication>
 #include <QCommandLineParser>

@@ -21,12 +24,12 @@ int main(int argc, char **argv)
    app.setDesktopFileName(QStringLiteral("org.kde.contactthemeeditor"));

    KCrash::initialize();
-
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
    Kdelibs4ConfigMigrator migrate(QStringLiteral("contactthemeeditor"));
    migrate.setConfigFiles(QStringList() << QStringLiteral("contactthemeeditorrc"));
    migrate.setUiFiles(QStringList() << QStringLiteral("contactthemeeditorui.rc"));
    migrate.migrate();
-
+#endif
    KLocalizedString::setApplicationDomain("contactthemeeditor");
    KAboutData aboutData(QStringLiteral("contactthemeeditor"),
                         i18n("Contact Theme Editor"),

--- a/headerthemeeditor/main.cpp
+++ b/headerthemeeditor/main.cpp
@@ -11,7 +11,10 @@
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
+#include <kcoreaddons_version.h>
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>
+#endif
 #include <QApplication>
 #include <QCommandLineParser>

@@ -22,10 +25,12 @@ int main(int argc, char **argv)
    app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
    app.setDesktopFileName(QStringLiteral("org.kde.headerthemeeditor"));
    KCrash::initialize();
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
    Kdelibs4ConfigMigrator migrate(QStringLiteral("headerthemeeditor"));
    migrate.setConfigFiles(QStringList() << QStringLiteral("headerthemeeditorrc"));
    migrate.setUiFiles(QStringList() << QStringLiteral("headerthemeeditorui.rc"));
    migrate.migrate();
+#endif
    KLocalizedString::setApplicationDomain("headerthemeeditor");
    KAboutData aboutData(QStringLiteral("headerthemeeditor"),
                         i18n("Header Theme Editor"),