Commit 1bb8be90 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

kde4 Migration code will be remove in kf6

parent 75afbd1c
Pipeline #58984 passed with stage
in 9 minutes and 22 seconds
......@@ -17,7 +17,6 @@
#include "mainwindow.h"
#include "messagewindow.h"
#include "messagenotification.h"
#include "migratekde4files.h"
#include "prefdlg.h"
#include "resourcescalendar.h"
#include "startdaytimer.h"
......@@ -31,7 +30,10 @@
#include "notifications_interface.h" // DBUS-generated
#include "dbusproperties.h" // DBUS-generated
#include "kalarm_debug.h"
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include "migratekde4files.h"
#endif
#include <KAlarmCal/DateTime>
#include <KAlarmCal/KARecurrence>
......@@ -137,9 +139,11 @@ KAlarmApp* KAlarmApp::create(int& argc, char** argv)
*/
void KAlarmApp::initialise()
{
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
// Migrate config and data files from KDE4 locations.
MigrateKde4Files migrate;
migrate.migrate();
#endif
#ifndef NDEBUG
KAlarm::setTestModeConditions();
......
......@@ -10,7 +10,7 @@
*/
#include "migratekde4files.h"
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include "kalarm_debug.h"
#include <Kdelibs4ConfigMigrator>
......@@ -55,5 +55,5 @@ void MigrateKde4Files::initializeMigrator()
migrateInfoIcs.setFilePatterns({QStringLiteral("*.ics")});
mMigrator.insertMigrateInfo(migrateInfoIcs);
}
#endif
// vim: et sw=4:
......@@ -9,7 +9,9 @@
*/
#pragma once
#include <QObject>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <PimCommon/MigrateApplicationFiles>
/** Class to migrate KAlarm config and data files from KDE4 locations to Qt5
......@@ -27,6 +29,6 @@ private:
PimCommon::MigrateApplicationFiles mMigrator;
};
#endif
// vim: et sw=4:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment