Convert kalarm files to build with merged kalarmcal files

.kde-ci.yml

@@ -9,7 +9,6 @@ Dependencies:
     'pim/akonadi' : '@same'
     'pim/akonadi-contacts' : '@same'
     'pim/akonadi-mime' : '@same'
-    'pim/kalarmcal' : '@same'
     'pim/kcalutils' : '@same'
     'pim/kidentitymanagement' : '@same'
     'pim/kimap' : '@same'

CMakeLists.txt

@@ -38,7 +38,6 @@ endif()
 
 
 set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
-set(KALARMCALENDAR_LIB_VERSION "5.19.40")
 set(KIMAP_LIB_VERSION "5.19.40")
 set(AKONADI_MIMELIB_VERSION "5.19.40")
 set(AKONADI_CONTACT_VERSION "5.19.40")
@@ -97,7 +96,6 @@ find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
-find_package(KF5AlarmCalendar ${KALARMCALENDAR_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)

src/CMakeLists.txt

@@ -3,6 +3,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/
 )
 
+add_subdirectory(kalarmcalendar)
 add_subdirectory(appicons)
 add_subdirectory(pixmaps)
 add_subdirectory(autostart)
@@ -75,7 +76,7 @@ set(libkalarm_SRCS
     lib/stackedwidgets.h
     lib/lineedit.h
     lib/synchtimer.h
-)
+   )
 set(resources_SRCS
     resources/calendarfunctions.cpp
     resources/resourcetype.cpp
@@ -98,6 +99,8 @@ set(resources_SRCS
     resources/singlefileresource.cpp
     resources/singlefileresourceconfigdialog.cpp
     resources/dirresourceimportdialog.cpp
+    resources/migration/collectionattribute.cpp
+    resources/migration/compatibilityattribute.cpp
     resources/calendarfunctions.h
     resources/resourcetype.h
     resources/resource.h
@@ -119,6 +122,8 @@ set(resources_SRCS
     resources/singlefileresource.h
     resources/singlefileresourceconfigdialog.h
     resources/dirresourceimportdialog.h
+    resources/migration/collectionattribute.h
+    resources/migration/compatibilityattribute.h
    )
 
 set(kalarm_bin_SRCS ${libkalarm_SRCS} ${resources_SRCS}
@@ -260,6 +265,7 @@ target_compile_definitions(kalarm_bin PRIVATE -DVERSION="${KALARM_VERSION}")
 
 
 target_link_libraries(kalarm_bin
+    kalarmprivate
     KF5::Codecs
     KF5::ConfigCore
     KF5::Completion
@@ -281,7 +287,6 @@ target_link_libraries(kalarm_bin
     KF5::AkonadiMime
     KF5::AkonadiContact
     KF5::AkonadiWidgets
-    KF5::AlarmCalendar
     KF5::CalendarCore
     KF5::CalendarUtils
     KF5::Contacts

src/alarmlistdelegate.cpp

 /*
  *  alarmlistdelegate.cpp  -  handles editing and display of alarm list
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2007-2021 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2007-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -11,10 +11,9 @@
 #include "functions.h"
 #include "resources/resourcedatamodelbase.h"
 #include "resources/eventmodel.h"
+#include "kalarmcalendar/kacalendar.h"
 #include "kalarm_debug.h"
 
-#include <KAlarmCal/KACalendar>
-
 #include <KColorScheme>
 
 #include <QPainter>

src/alarmtimewidget.h

 /*
  *  alarmtimewidget.h  -  alarm date/time entry widget
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2001-2021 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2001-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once
 
-#include <KAlarmCal/DateTime>
+#include "kalarmcalendar/datetime.h"
 
 #include <QFrame>
 

src/birthdaydlg.h

 /*
  *  birthdaydlg.h  -  dialog to pick birthdays from address book
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2002-2020 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2002-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
 #pragma once
 
-#include <KAlarmCal/KAEvent>
+#include "kalarmcalendar/kaevent.h"
 
 #include <KLineEdit>
 

src/birthdaymodel.cpp

@@ -2,7 +2,7 @@
  *  birthdaymodel.cpp  -  model class for birthdays from address book
  *  Program:  kalarm
  *  SPDX-FileCopyrightText: 2009 Tobias Koenig <tokoe@kde.org>
- *  SPDX-FileCopyrightText: 2007-2020 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2007-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -10,8 +10,7 @@
 #include "birthdaymodel.h"
 
 #include "resourcescalendar.h"
-
-#include <KAlarmCal/KAEvent>
+#include "kalarmcalendar/kaevent.h"
 
 #include <Akonadi/ChangeRecorder>
 #include <Akonadi/EntityDisplayAttribute>

src/commandoptions.cpp

@@ -11,9 +11,9 @@
 #include "functions.h"
 #include "kalarmapp.h"
 #include "kamail.h"
+#include "kalarmcalendar/identities.h"
 #include "kalarm_debug.h"
 
-#include <KAlarmCal/Identities>
 #include <KPIMTextEdit/TextToSpeech>
 #include <KLocalizedString>
 

src/commandoptions.h

 /*
  *  commandoptions.h  -  extract command line options
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2001-2020 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2001-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -11,9 +11,9 @@
 #include "editdlg.h"
 #include "eventid.h"
 
-#include <KAlarmCal/KAEvent>
-#include <KAlarmCal/KARecurrence>
-#include <KAlarmCal/KADateTime>
+#include "kalarmcalendar/kaevent.h"
+#include "kalarmcalendar/karecurrence.h"
+#include "kalarmcalendar/kadatetime.h"
 
 #include <QColor>
 #include <QStringList>

src/data/kalarmconfig.kcfgc

@@ -8,7 +8,7 @@ GlobalEnums=false
 UseEnumTypes=true
 ItemAccessors=false
 SetUserTexts=true
-SourceIncludeFiles=kalarmcal/identities.h
+SourceIncludeFiles=kalarmcalendar/identities.h
 IncludeFiles=kalarm_debug.h
 CategoryLoggingName=KALARM_LOG
 TranslationSystem=kde

src/datepicker.cpp

 /*
  *  datepicker.cpp  -  date chooser widget
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2021 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2021-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -13,8 +13,7 @@
 #include "preferences.h"
 #include "lib/locale.h"
 #include "lib/synchtimer.h"
-
-#include <KAlarmCal/KADateTime>
+#include "kalarmcalendar/kadatetime.h"
 
 #include <KLocalizedString>
 

src/daymatrix.h

@@ -6,7 +6,7 @@
  *  SPDX-FileCopyrightText: 2001 Eitzenberger Thomas <thomas.eitzenberger@siemens.at>
  *  SPDX-FileCopyrightText: 2003 Cornelius Schumacher <schumacher@kde.org>
  *  SPDX-FileCopyrightText: 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
- *  SPDX-FileCopyrightText: 2021 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2021-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later WITH Qt-Commercial-exception-1.0
 */
@@ -14,8 +14,7 @@
 #pragma once
 
 #include "editdlg.h"
-
-#include <KAlarmCal/KAEvent>
+#include "kalarmcalendar/kaevent.h"
 
 #include <QFrame>
 #include <QDate>

src/dbushandler.cpp

 /*
  *  dbushandler.cpp  -  handler for D-Bus calls by other applications
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2002-2020 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2002-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -16,11 +16,10 @@
 #include "resourcescalendar.h"
 #include "resources/resources.h"
 #include <kalarmadaptor.h>
+#include "kalarmcalendar/identities.h"
+#include "kalarmcalendar/karecurrence.h"
 #include "kalarm_debug.h"
 
-#include <KAlarmCal/Identities>
-#include <KAlarmCal/KARecurrence>
-
 using namespace KCalendarCore;
 
 #include <stdlib.h>

src/dbushandler.h

 /*
  *  dbushandler.h  -  handler for D-Bus calls by other applications
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2001-2020 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2001-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -10,7 +10,7 @@
 
 #include "kalarmiface.h"
 
-#include <KAlarmCal/KAEvent>
+#include "kalarmcalendar/kaevent.h"
 
 #include <KCalendarCore/Duration>
 

src/deferdlg.cpp

 /*
  *  deferdlg.cpp  -  dialog to defer an alarm
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2002-2020 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2002-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -14,10 +14,9 @@
 #include "resourcescalendar.h"
 #include "resources/resources.h"
 #include "lib/messagebox.h"
+#include "kalarmcalendar/kaevent.h"
 #include "kalarm_debug.h"
 
-#include <KAlarmCal/KAEvent>
-
 #include <KLocalizedString>
 
 #include <QVBoxLayout>

src/deferdlg.h

 /*
  *  deferdlg.h  -  dialog to defer an alarm
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2002-2019 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2002-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -9,8 +9,7 @@
 #pragma once
 
 #include "eventid.h"
-
-#include <KAlarmCal/DateTime>
+#include "kalarmcalendar/datetime.h"
 
 #include <QDialog>
 

src/displaycalendar.h

 /*
  *  displaycalendar.h  -  KAlarm display calendar file access
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2001-2020 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2001-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once
 
-#include <KAlarmCal/KAEvent>
+#include "kalarmcalendar/kaevent.h"
 
 #include <KCalendarCore/FileStorage>
 #include <KCalendarCore/Event>

src/editdlg.h

 /*
  *  editdlg.h  -  dialog to create or modify an alarm or alarm template
  *  Program:  kalarm
- *  SPDX-FileCopyrightText: 2001-2021 David Jarvie <djarvie@kde.org>
+ *  SPDX-FileCopyrightText: 2001-2022 David Jarvie <djarvie@kde.org>
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -9,10 +9,9 @@
 #pragma once
 
 #include "resources/resource.h"
-
-#include <KAlarmCal/AlarmText>
-#include <KAlarmCal/DateTime>
-#include <KAlarmCal/KAEvent>
+#include "kalarmcalendar/alarmtext.h"
+#include "kalarmcalendar/datetime.h"
+#include "kalarmcalendar/kaevent.h"
 
 #include <QDialog>
 #include <QTime>

src/editdlgtypes.cpp

@@ -34,10 +34,9 @@
 #include "lib/radiobutton.h"
 #include "lib/shellprocess.h"
 #include "lib/timespinbox.h"
+#include "kalarmcalendar/identities.h"
 #include "kalarm_debug.h"
 
-#include <KAlarmCal/Identities>
-
 #include <Akonadi/EmailAddressSelectionDialog>
 #include <KCalUtils/ICalDrag>
 #include <KCalendarCore/Person>

src/editdlgtypes.h

@@ -10,9 +10,8 @@
 
 #include "editdlg.h"
 #include "preferences.h"
-
-#include <KAlarmCal/AlarmText>
-#include <KAlarmCal/KAEvent>
+#include "kalarmcalendar/alarmtext.h"
+#include "kalarmcalendar/kaevent.h"
 
 using namespace KAlarmCal;