Make it compile with renamed lib

CMakeLists.txt

@@ -148,7 +148,7 @@ set(LIBKLEO_LIB_VERSION_LIB "5.1.41")
 set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.1.41")
 set(PIMCOMMON_LIB_VERSION_LIB "5.1.48")
 set(LIBKDEPIM_LIB_VERSION_LIB "5.1.41")
-set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.1.41")
+set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.1.50")
 set(CALENDARSUPPORT_LIB_VERSION_LIB "5.1.41")
 set(EVENTVIEW_LIB_VERSION_LIB "5.1.41")
 set(KDGANTT2_LIB_VERSION_LIB "5.1.41")
@@ -162,7 +162,7 @@ find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
-find_package(KF5IncidenceEditorsng ${LIBINCIDENCEEDITOR_LIB_VERSION_LIB} CONFIG REQUIRED)
+find_package(KF5IncidenceEditor ${LIBINCIDENCEEDITOR_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5MessageComposer ${KDEPIM_LIB_INSTALLED_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageList ${KDEPIM_LIB_INSTALLED_VERSION} CONFIG REQUIRED)

korgac/CMakeLists.txt

@@ -59,7 +59,7 @@ target_link_libraries(korgac
   KF5::AkonadiCalendar
   KF5::AkonadiMime
   KF5::CalendarSupport
-  KF5::IncidenceEditorsng
+  KF5::IncidenceEditor
   KF5::AkonadiCore
   KF5::CalendarCore
   KF5::CalendarUtils

korgac/alarmdialog.cpp

@@ -35,8 +35,8 @@
 #include <CalendarSupport/IdentityManager>
 #include <CalendarSupport/Utils>
 
-#include <IncidenceEditorsng/IncidenceDialog>
-#include <IncidenceEditorsng/IncidenceDialogFactory>
+#include <IncidenceEditor/IncidenceDialog>
+#include <IncidenceEditor/IncidenceDialogFactory>
 
 #include <KCalCore/Event>
 #include <KCalCore/Todo>

korgac/tests/CMakeLists.txt

@@ -22,7 +22,7 @@ target_link_libraries(testalarmdlg
   KF5::AkonadiCalendar
   KF5::AkonadiMime
   KF5::CalendarSupport
-  KF5::IncidenceEditorsng
+  KF5::IncidenceEditor
   KF5::KdepimDBusInterfaces
   KF5::KIOCore
   KF5::Mime

korganizer/CMakeLists.txt

@@ -73,7 +73,7 @@ target_link_libraries(kcm_korganizer
   KF5::AkonadiCalendar
   KF5::CalendarSupport 
   KF5::EventViews
-  KF5::IncidenceEditorsng
+  KF5::IncidenceEditor
   KF5::Libkdepim
   korganizer_core
   korganizerprivate
@@ -239,7 +239,7 @@ PUBLIC
 PRIVATE
     KF5::CalendarSupport 
     KF5::EventViews
-    KF5::IncidenceEditorsng
+    KF5::IncidenceEditor
     KF5::Libkdepim
     KF5::KdepimDBusInterfaces
     korganizer_core

korganizer/actionmanager.cpp

@@ -51,7 +51,7 @@
 #include <CalendarSupport/KCalPrefs>
 #include <CalendarSupport/Utils>
 
-#include <IncidenceEditorsng/IncidenceEditorSettings>
+#include <IncidenceEditor/IncidenceEditorSettings>
 
 #include <AkonadiCore/EntityDisplayAttribute>
 #include <AkonadiWidgets/EntityTreeView>

korganizer/autotests/CMakeLists.txt

@@ -25,7 +25,7 @@ target_link_libraries(koeventpopmenutest
   KF5::AkonadiCalendar
   KF5::AkonadiNotes
   KF5::CalendarCore
-  KF5::IncidenceEditorsng
+  KF5::IncidenceEditor
   KF5::CalendarSupport
   korganizer_core
   korganizerprivate
@@ -43,7 +43,7 @@ target_link_libraries(noteeditdialogtest
   KF5::AkonadiCalendar
   KF5::AkonadiNotes
   KF5::CalendarCore
-  KF5::IncidenceEditorsng
+  KF5::IncidenceEditor
   KF5::CalendarSupport
   korganizer_core
   korganizerprivate

korganizer/autotests/koeventpopupmenutest.cpp

@@ -18,8 +18,8 @@
 #include "koeventpopupmenutest.h"
 #include "dialog/noteeditdialog.h"
 #include "koeventpopupmenu.h"
-#include <IncidenceEditorsng/IncidenceDialog>
-#include <IncidenceEditorsng/IncidenceAttendee>
+#include <IncidenceEditor/IncidenceDialog>
+#include <IncidenceEditor/IncidenceAttendee>
 #include <CalendarSupport/Utils>
 #include <AkonadiCore/EntityTreeModel>
 #include <Akonadi/Notes/NoteUtils>

korganizer/calendarview.cpp

@@ -51,7 +51,7 @@
 #include "kocheckableproxymodel.h"
 #include "akonadicollectionview.h"
 #include "korganizer_debug.h"
-#include <IncidenceEditorsng/IncidenceEditorSettings>
+#include <IncidenceEditor/IncidenceEditorSettings>
 
 #include <KHolidays/HolidayRegion>
 #include "collectiongeneralpage.h"
@@ -62,10 +62,10 @@
 #include <CalendarSupport/CalPrinter>
 #include <CalendarSupport/CalendarSingleton>
 
-#include <IncidenceEditorsng/IncidenceDefaults>
-#include <IncidenceEditorsng/IncidenceDialog>
-#include <IncidenceEditorsng/IncidenceDialogFactory>
-#include <IncidenceEditorsng/IndividualMailComponentFactory>
+#include <IncidenceEditor/IncidenceDefaults>
+#include <IncidenceEditor/IncidenceDialog>
+#include <IncidenceEditor/IncidenceDialogFactory>
+#include <IncidenceEditor/IndividualMailComponentFactory>
 
 #include <Libkdepim/PIMMessageBox>
 #include <Akonadi/Calendar/FreeBusyManager>

korganizer/dialog/noteeditdialog.cpp

@@ -35,8 +35,8 @@
 #include <AkonadiWidgets/CollectionComboBox>
 #include <QPushButton>
 
-#include <IncidenceEditorsng/IncidenceDialogFactory>
-#include <IncidenceEditorsng/IncidenceDialog>
+#include <IncidenceEditor/IncidenceDialogFactory>
+#include <IncidenceEditor/IncidenceDialog>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>

korganizer/kodialogmanager.cpp

@@ -33,9 +33,9 @@
 #include <CalendarSupport/CategoryConfig>
 #include <CalendarSupport/Utils>
 
-#include <IncidenceEditorsng/CategoryEditDialog>
-#include <IncidenceEditorsng/IncidenceDialog>
-#include <IncidenceEditorsng/IncidenceDialogFactory>
+#include <IncidenceEditor/CategoryEditDialog>
+#include <IncidenceEditor/IncidenceDialog>
+#include <IncidenceEditor/IncidenceDialogFactory>
 
 #include <AkonadiCore/Item>
 #include <AkonadiWidgets/TagManagementDialog>

korganizer/koeventpopupmenu.cpp

@@ -46,8 +46,8 @@
 #include <KMimeTypeTrader>
 #include "korganizer_debug.h"
 
-#include <IncidenceEditorsng/IncidenceDialogFactory>
-#include <IncidenceEditorsng/IncidenceDialog>
+#include <IncidenceEditor/IncidenceDialogFactory>
+#include <IncidenceEditor/IncidenceDialog>
 
 KOEventPopupMenu::KOEventPopupMenu(Akonadi::ETMCalendar *calendar, QWidget *parent)
     : QMenu(parent), mCalendar(calendar)

korganizer/prefs/koprefsdialog.cpp

@@ -34,7 +34,7 @@
 #include <CalendarSupport/KCalPrefs>
 #include <CalendarSupport/CategoryConfig>
 
-#include <IncidenceEditorsng/IncidenceEditorSettings>
+#include <IncidenceEditor/IncidenceEditorSettings>
 #include <Libkdepim/TagSelectionCombo>
 #include <libkdepim/tagwidgets.h>
 

plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt

@@ -29,7 +29,7 @@ target_link_libraries(messageviewer_bodypartformatter_text_calendar
   KF5::Libkleo
 )
 
-target_link_libraries(messageviewer_bodypartformatter_text_calendar KF5::IncidenceEditorsng)
+target_link_libraries(messageviewer_bodypartformatter_text_calendar KF5::IncidenceEditor)
 
 install(TARGETS messageviewer_bodypartformatter_text_calendar  DESTINATION ${KDE_INSTALL_PLUGINDIR})
 

plugins/messageviewer/bodypartformatter/calendar/syncitiphandler.h

@@ -32,7 +32,7 @@
 #ifndef SYNCITIPHANDLER_H
 #define SYNCITIPHANDLER_H
 
-#include <IncidenceEditorsng/GroupwareUiDelegate>
+#include <IncidenceEditor/GroupwareUiDelegate>
 #include <Akonadi/Calendar/ITIPHandler>
 
 #include <QObject>