Use new class from calendarsupport

CMakeLists.txt

@@ -34,7 +34,7 @@ set(QT_REQUIRED_VERSION "5.13.0")
 set(AKONADICALENDAR_LIB_VERSION "5.14.40")
 set(KMIME_LIB_VERSION "5.14.40")
 set(LIBKDEPIM_LIB_VERSION "5.14.40")
-set(CALENDARSUPPORT_LIB_VERSION "5.14.40")
+set(CALENDARSUPPORT_LIB_VERSION "5.14.42")
 
 find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED)
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)

src/todo/todoview.cpp

@@ -45,7 +45,7 @@
 #include <CalendarSupport/KCalPrefs>
 #include <CalendarSupport/Utils>
 
-#include <Libkdepim/KDatePickerPopup>
+#include <CalendarSupport/KDatePickerPopup>
 
 #include <KCalendarCore/CalFormat>
 
@@ -399,25 +399,25 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, bool sidebarView, QWidget
 
     mItemPopupMenu->addSeparator();
 
-    mCopyPopupMenu = new KPIM::KDatePickerPopup(KPIM::KDatePickerPopup::NoDate
-                                                |KPIM::KDatePickerPopup::DatePicker
-                                                |KPIM::KDatePickerPopup::Words,
+    mCopyPopupMenu = new CalendarSupport::KDatePickerPopup(CalendarSupport::KDatePickerPopup::NoDate
+                                                |CalendarSupport::KDatePickerPopup::DatePicker
+                                                |CalendarSupport::KDatePickerPopup::Words,
                                                 QDate::currentDate(), this);
     mCopyPopupMenu->setTitle(i18nc("@title:menu", "&Copy To"));
 
-    connect(mCopyPopupMenu, &KPIM::KDatePickerPopup::dateChanged, this, &TodoView::copyTodoToDate);
+    connect(mCopyPopupMenu, &CalendarSupport::KDatePickerPopup::dateChanged, this, &TodoView::copyTodoToDate);
 
-    connect(mCopyPopupMenu, &KPIM::KDatePickerPopup::dateChanged, mItemPopupMenu, &QMenu::hide);
+    connect(mCopyPopupMenu, &CalendarSupport::KDatePickerPopup::dateChanged, mItemPopupMenu, &QMenu::hide);
 
-    mMovePopupMenu = new KPIM:: KDatePickerPopup(KPIM::KDatePickerPopup::NoDate
-                                                 |KPIM::KDatePickerPopup::DatePicker
-                                                 |KPIM::KDatePickerPopup::Words,
+    mMovePopupMenu = new CalendarSupport:: KDatePickerPopup(CalendarSupport::KDatePickerPopup::NoDate
+                                                 |CalendarSupport::KDatePickerPopup::DatePicker
+                                                 |CalendarSupport::KDatePickerPopup::Words,
                                                  QDate::currentDate(), this);
     mMovePopupMenu->setTitle(i18nc("@title:menu", "&Move To"));
 
-    connect(mMovePopupMenu, &KPIM::KDatePickerPopup::dateChanged, this, &TodoView::setNewDate);
+    connect(mMovePopupMenu, &CalendarSupport::KDatePickerPopup::dateChanged, this, &TodoView::setNewDate);
 
-    connect(mMovePopupMenu, &KPIM::KDatePickerPopup::dateChanged, mItemPopupMenu, &QMenu::hide);
+    connect(mMovePopupMenu, &CalendarSupport::KDatePickerPopup::dateChanged, mItemPopupMenu, &QMenu::hide);
 
     mItemPopupMenu->insertMenu(nullptr, mCopyPopupMenu);
     mItemPopupMenu->insertMenu(nullptr, mMovePopupMenu);

src/todo/todoview.h

@@ -41,7 +41,7 @@ class TodoViewQuickSearch;
 class TodoViewSortFilterProxyModel;
 class TodoViewView;
 
-namespace KPIM {
+namespace CalendarSupport {
 class KDatePickerPopup;
 }
 
@@ -167,8 +167,8 @@ private:
     QToolButton *mFlatViewButton = nullptr;
 
     QMenu *mItemPopupMenu = nullptr;
-    KPIM::KDatePickerPopup *mCopyPopupMenu = nullptr;
-    KPIM::KDatePickerPopup *mMovePopupMenu = nullptr;
+    CalendarSupport::KDatePickerPopup *mCopyPopupMenu = nullptr;
+    CalendarSupport::KDatePickerPopup *mMovePopupMenu = nullptr;
     QMenu *mPriorityPopupMenu = nullptr;
     QMenu *mPercentageCompletedPopupMenu = nullptr;
     QList<QAction *> mItemPopupMenuItemOnlyEntries;