summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-09-13 14:40:56 +0200
committerMontel Laurent <[email protected]>2015-09-13 14:43:00 +0200
commit6e17187fb69fefa5ea0124a04aeb87c2c85d6195 (patch)
treeea81efd7242285bdd223083f526578760f4e67b5
parentcff0a21b19e44115b8ab98ad1eba1a499689a3af (diff)
Rename it
-rw-r--r--CMakeLists.txt2
-rw-r--r--calendarsupport/src/printing/calprinter.cpp2
-rw-r--r--eventviews/.krazy (renamed from calendarviews/.krazy)0
-rw-r--r--eventviews/CMakeLists.txt (renamed from calendarviews/CMakeLists.txt)0
-rw-r--r--eventviews/KF5EventViewsConfig.cmake.in (renamed from calendarviews/KF5EventViewsConfig.cmake.in)0
-rw-r--r--eventviews/Messages.sh (renamed from calendarviews/Messages.sh)0
-rw-r--r--eventviews/agenda/agenda.cpp (renamed from calendarviews/agenda/agenda.cpp)0
-rw-r--r--eventviews/agenda/agenda.h (renamed from calendarviews/agenda/agenda.h)0
-rw-r--r--eventviews/agenda/agendaitem.cpp (renamed from calendarviews/agenda/agendaitem.cpp)0
-rw-r--r--eventviews/agenda/agendaitem.h (renamed from calendarviews/agenda/agendaitem.h)0
-rw-r--r--eventviews/agenda/agendaview.cpp (renamed from calendarviews/agenda/agendaview.cpp)0
-rw-r--r--eventviews/agenda/agendaview.h (renamed from calendarviews/agenda/agendaview.h)0
-rw-r--r--eventviews/agenda/alternatelabel.cpp (renamed from calendarviews/agenda/alternatelabel.cpp)0
-rw-r--r--eventviews/agenda/alternatelabel.h (renamed from calendarviews/agenda/alternatelabel.h)0
-rw-r--r--eventviews/agenda/calendardecoration.cpp (renamed from calendarviews/agenda/calendardecoration.cpp)0
-rw-r--r--eventviews/agenda/calendardecoration.desktop (renamed from calendarviews/agenda/calendardecoration.desktop)0
-rw-r--r--eventviews/agenda/calendardecoration.h (renamed from calendarviews/agenda/calendardecoration.h)0
-rw-r--r--eventviews/agenda/decorationlabel.cpp (renamed from calendarviews/agenda/decorationlabel.cpp)0
-rw-r--r--eventviews/agenda/decorationlabel.h (renamed from calendarviews/agenda/decorationlabel.h)0
-rw-r--r--eventviews/agenda/timelabels.cpp (renamed from calendarviews/agenda/timelabels.cpp)0
-rw-r--r--eventviews/agenda/timelabels.h (renamed from calendarviews/agenda/timelabels.h)0
-rw-r--r--eventviews/agenda/timelabelszone.cpp (renamed from calendarviews/agenda/timelabelszone.cpp)0
-rw-r--r--eventviews/agenda/timelabelszone.h (renamed from calendarviews/agenda/timelabelszone.h)0
-rw-r--r--eventviews/agenda/timescaleconfigdialog.cpp (renamed from calendarviews/agenda/timescaleconfigdialog.cpp)0
-rw-r--r--eventviews/agenda/timescaleconfigdialog.h (renamed from calendarviews/agenda/timescaleconfigdialog.h)0
-rw-r--r--eventviews/agenda/timescaleedit_base.ui (renamed from calendarviews/agenda/timescaleedit_base.ui)0
-rw-r--r--eventviews/agenda/viewcalendar.cpp (renamed from calendarviews/agenda/viewcalendar.cpp)0
-rw-r--r--eventviews/agenda/viewcalendar.h (renamed from calendarviews/agenda/viewcalendar.h)0
-rw-r--r--eventviews/eventview.cpp (renamed from calendarviews/eventview.cpp)0
-rw-r--r--eventviews/eventview.h (renamed from calendarviews/eventview.h)0
-rw-r--r--eventviews/eventview_p.cpp (renamed from calendarviews/eventview_p.cpp)0
-rw-r--r--eventviews/eventview_p.h (renamed from calendarviews/eventview_p.h)0
-rw-r--r--eventviews/eventviews.kcfg (renamed from calendarviews/eventviews.kcfg)0
-rw-r--r--eventviews/helper.cpp (renamed from calendarviews/helper.cpp)0
-rw-r--r--eventviews/helper.h (renamed from calendarviews/helper.h)0
-rw-r--r--eventviews/journal/journalframe.cpp (renamed from calendarviews/journal/journalframe.cpp)0
-rw-r--r--eventviews/journal/journalframe.h (renamed from calendarviews/journal/journalframe.h)0
-rw-r--r--eventviews/journal/journalview.cpp (renamed from calendarviews/journal/journalview.cpp)0
-rw-r--r--eventviews/journal/journalview.h (renamed from calendarviews/journal/journalview.h)0
-rw-r--r--eventviews/list/listview.cpp (renamed from calendarviews/list/listview.cpp)0
-rw-r--r--eventviews/list/listview.h (renamed from calendarviews/list/listview.h)0
-rw-r--r--eventviews/month/monthgraphicsitems.cpp (renamed from calendarviews/month/monthgraphicsitems.cpp)0
-rw-r--r--eventviews/month/monthgraphicsitems.h (renamed from calendarviews/month/monthgraphicsitems.h)0
-rw-r--r--eventviews/month/monthitem.cpp (renamed from calendarviews/month/monthitem.cpp)0
-rw-r--r--eventviews/month/monthitem.h (renamed from calendarviews/month/monthitem.h)0
-rw-r--r--eventviews/month/monthscene.cpp (renamed from calendarviews/month/monthscene.cpp)0
-rw-r--r--eventviews/month/monthscene.h (renamed from calendarviews/month/monthscene.h)0
-rw-r--r--eventviews/month/monthview.cpp (renamed from calendarviews/month/monthview.cpp)0
-rw-r--r--eventviews/month/monthview.h (renamed from calendarviews/month/monthview.h)0
-rw-r--r--eventviews/multiagenda/configdialoginterface.h (renamed from calendarviews/multiagenda/configdialoginterface.h)0
-rw-r--r--eventviews/multiagenda/multiagendaview.cpp (renamed from calendarviews/multiagenda/multiagendaview.cpp)0
-rw-r--r--eventviews/multiagenda/multiagendaview.h (renamed from calendarviews/multiagenda/multiagendaview.h)0
-rw-r--r--eventviews/prefs.cpp (renamed from calendarviews/prefs.cpp)0
-rw-r--r--eventviews/prefs.h (renamed from calendarviews/prefs.h)0
-rw-r--r--eventviews/prefs_base.kcfgc (renamed from calendarviews/prefs_base.kcfgc)0
-rw-r--r--eventviews/tests/CMakeLists.txt (renamed from calendarviews/tests/CMakeLists.txt)0
-rw-r--r--eventviews/tests/createcolorgui_test.cpp (renamed from calendarviews/tests/createcolorgui_test.cpp)0
-rw-r--r--eventviews/tests/createcolorgui_test.h (renamed from calendarviews/tests/createcolorgui_test.h)0
-rw-r--r--eventviews/timeline/timelineitem.cpp (renamed from calendarviews/timeline/timelineitem.cpp)0
-rw-r--r--eventviews/timeline/timelineitem.h (renamed from calendarviews/timeline/timelineitem.h)0
-rw-r--r--eventviews/timeline/timelineview.cpp (renamed from calendarviews/timeline/timelineview.cpp)0
-rw-r--r--eventviews/timeline/timelineview.h (renamed from calendarviews/timeline/timelineview.h)0
-rw-r--r--eventviews/timeline/timelineview_p.cpp (renamed from calendarviews/timeline/timelineview_p.cpp)0
-rw-r--r--eventviews/timeline/timelineview_p.h (renamed from calendarviews/timeline/timelineview_p.h)0
-rw-r--r--eventviews/timespent/timespentview.cpp (renamed from calendarviews/timespent/timespentview.cpp)0
-rw-r--r--eventviews/timespent/timespentview.h (renamed from calendarviews/timespent/timespentview.h)0
-rw-r--r--eventviews/todo/incidencetreemodel.cpp (renamed from calendarviews/todo/incidencetreemodel.cpp)0
-rw-r--r--eventviews/todo/incidencetreemodel.h (renamed from calendarviews/todo/incidencetreemodel.h)0
-rw-r--r--eventviews/todo/incidencetreemodel_p.h (renamed from calendarviews/todo/incidencetreemodel_p.h)0
-rw-r--r--eventviews/todo/tododelegates.cpp (renamed from calendarviews/todo/tododelegates.cpp)0
-rw-r--r--eventviews/todo/tododelegates.h (renamed from calendarviews/todo/tododelegates.h)0
-rw-r--r--eventviews/todo/todomodel.cpp (renamed from calendarviews/todo/todomodel.cpp)0
-rw-r--r--eventviews/todo/todomodel.h (renamed from calendarviews/todo/todomodel.h)0
-rw-r--r--eventviews/todo/todomodel_p.h (renamed from calendarviews/todo/todomodel_p.h)0
-rw-r--r--eventviews/todo/todoview.cpp (renamed from calendarviews/todo/todoview.cpp)0
-rw-r--r--eventviews/todo/todoview.h (renamed from calendarviews/todo/todoview.h)0
-rw-r--r--eventviews/todo/todoviewquickaddline.cpp (renamed from calendarviews/todo/todoviewquickaddline.cpp)0
-rw-r--r--eventviews/todo/todoviewquickaddline.h (renamed from calendarviews/todo/todoviewquickaddline.h)0
-rw-r--r--eventviews/todo/todoviewquicksearch.cpp (renamed from calendarviews/todo/todoviewquicksearch.cpp)0
-rw-r--r--eventviews/todo/todoviewquicksearch.h (renamed from calendarviews/todo/todoviewquicksearch.h)0
-rw-r--r--eventviews/todo/todoviewsortfilterproxymodel.cpp (renamed from calendarviews/todo/todoviewsortfilterproxymodel.cpp)0
-rw-r--r--eventviews/todo/todoviewsortfilterproxymodel.h (renamed from calendarviews/todo/todoviewsortfilterproxymodel.h)0
-rw-r--r--eventviews/todo/todoviewview.cpp (renamed from calendarviews/todo/todoviewview.cpp)0
-rw-r--r--eventviews/todo/todoviewview.h (renamed from calendarviews/todo/todoviewview.h)0
-rw-r--r--eventviews/viewerapp/CMakeLists.txt (renamed from calendarviews/viewerapp/CMakeLists.txt)0
-rw-r--r--eventviews/viewerapp/main.cpp (renamed from calendarviews/viewerapp/main.cpp)0
-rw-r--r--eventviews/viewerapp/mainwindow.cpp (renamed from calendarviews/viewerapp/mainwindow.cpp)0
-rw-r--r--eventviews/viewerapp/mainwindow.h (renamed from calendarviews/viewerapp/mainwindow.h)0
-rw-r--r--eventviews/viewerapp/mainwindow.ui (renamed from calendarviews/viewerapp/mainwindow.ui)0
-rw-r--r--eventviews/viewerapp/settings.kcfg (renamed from calendarviews/viewerapp/settings.kcfg)0
-rw-r--r--eventviews/viewerapp/settings.kcfgc (renamed from calendarviews/viewerapp/settings.kcfgc)0
-rw-r--r--eventviews/whatsnext/whatsnextview.cpp (renamed from calendarviews/whatsnext/whatsnextview.cpp)0
-rw-r--r--eventviews/whatsnext/whatsnextview.h (renamed from calendarviews/whatsnext/whatsnextview.h)0
-rw-r--r--incidenceeditor-ng/src/resourcemanagement.cpp4
-rw-r--r--incidenceeditor-ng/src/resourcemanagement.h2
-rw-r--r--korganizer/dialog/searchdialog.cpp2
-rw-r--r--korganizer/interfaces/korganizer/baseview.h2
-rw-r--r--korganizer/kocore.h2
-rw-r--r--korganizer/koviewmanager.h2
-rw-r--r--korganizer/plugins/datenums/datenums.h2
-rw-r--r--korganizer/plugins/hebrew/hebrew.h2
-rw-r--r--korganizer/plugins/picoftheday/picoftheday.h2
-rw-r--r--korganizer/plugins/thisdayinhistory/thisdayinhistory.h2
-rw-r--r--korganizer/prefs/koprefs.h2
-rw-r--r--korganizer/views/agendaview/koagendaview.cpp2
-rw-r--r--korganizer/views/collectionview/quickview.cpp4
-rw-r--r--korganizer/views/collectionview/quickview.h2
-rw-r--r--korganizer/views/journalview/kojournalview.cpp2
-rw-r--r--korganizer/views/listview/kolistview.cpp2
-rw-r--r--korganizer/views/monthview/monthview.cpp2
-rw-r--r--korganizer/views/multiagendaview/multiagendaview.cpp4
-rw-r--r--korganizer/views/multiagendaview/multiagendaview.h2
-rw-r--r--korganizer/views/timelineview/kotimelineview.cpp2
-rw-r--r--korganizer/views/timespentview/kotimespentview.cpp2
-rw-r--r--korganizer/views/todoview/kotodoview.cpp2
-rw-r--r--korganizer/views/todoview/kotodoview.h2
-rw-r--r--korganizer/views/whatsnextview/kowhatsnextview.h2
-rw-r--r--korganizer/widgets/kitemiconcheckcombo.h2
-rw-r--r--libkleo/KF5KleoConfig.cmake.in3
-rw-r--r--libksieve/KF5KSieveConfig.cmake.in3
120 files changed, 36 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1249756..33093e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,7 +214,7 @@ configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ente
add_subdirectory(noteshared)
add_subdirectory(libkdepim)
add_subdirectory(calendarsupport)
-add_subdirectory(calendarviews)
+add_subdirectory(eventviews)
add_subdirectory(incidenceeditor-ng)
add_subdirectory(libkdepimdbusinterfaces)
add_subdirectory(libkleo)
diff --git a/calendarsupport/src/printing/calprinter.cpp b/calendarsupport/src/printing/calprinter.cpp
index f17333e..93f5949 100644
--- a/calendarsupport/src/printing/calprinter.cpp
+++ b/calendarsupport/src/printing/calprinter.cpp
@@ -26,7 +26,7 @@
#include "journalprint.h"
#include "yearprint.h"
-//#include <calendarviews/prefs.h>
+//#include <eventviews/prefs.h>
#include <KMessageBox>
#include <KStandardGuiItem>
diff --git a/calendarviews/.krazy b/eventviews/.krazy
index 7a1aae4..7a1aae4 100644
--- a/calendarviews/.krazy
+++ b/eventviews/.krazy
diff --git a/calendarviews/CMakeLists.txt b/eventviews/CMakeLists.txt
index 47e79fb..47e79fb 100644
--- a/calendarviews/CMakeLists.txt
+++ b/eventviews/CMakeLists.txt
diff --git a/calendarviews/KF5EventViewsConfig.cmake.in b/eventviews/KF5EventViewsConfig.cmake.in
index 27093e2..27093e2 100644
--- a/calendarviews/KF5EventViewsConfig.cmake.in
+++ b/eventviews/KF5EventViewsConfig.cmake.in
diff --git a/calendarviews/Messages.sh b/eventviews/Messages.sh
index 242c2e3..242c2e3 100644
--- a/calendarviews/Messages.sh
+++ b/eventviews/Messages.sh
diff --git a/calendarviews/agenda/agenda.cpp b/eventviews/agenda/agenda.cpp
index eabc569..eabc569 100644
--- a/calendarviews/agenda/agenda.cpp
+++ b/eventviews/agenda/agenda.cpp
diff --git a/calendarviews/agenda/agenda.h b/eventviews/agenda/agenda.h
index 4c23ac3..4c23ac3 100644
--- a/calendarviews/agenda/agenda.h
+++ b/eventviews/agenda/agenda.h
diff --git a/calendarviews/agenda/agendaitem.cpp b/eventviews/agenda/agendaitem.cpp
index ab794bd..ab794bd 100644
--- a/calendarviews/agenda/agendaitem.cpp
+++ b/eventviews/agenda/agendaitem.cpp
diff --git a/calendarviews/agenda/agendaitem.h b/eventviews/agenda/agendaitem.h
index 26fd19b..26fd19b 100644
--- a/calendarviews/agenda/agendaitem.h
+++ b/eventviews/agenda/agendaitem.h
diff --git a/calendarviews/agenda/agendaview.cpp b/eventviews/agenda/agendaview.cpp
index cfca8f8..cfca8f8 100644
--- a/calendarviews/agenda/agendaview.cpp
+++ b/eventviews/agenda/agendaview.cpp
diff --git a/calendarviews/agenda/agendaview.h b/eventviews/agenda/agendaview.h
index abc4314..abc4314 100644
--- a/calendarviews/agenda/agendaview.h
+++ b/eventviews/agenda/agendaview.h
diff --git a/calendarviews/agenda/alternatelabel.cpp b/eventviews/agenda/alternatelabel.cpp
index 7dacc92..7dacc92 100644
--- a/calendarviews/agenda/alternatelabel.cpp
+++ b/eventviews/agenda/alternatelabel.cpp
diff --git a/calendarviews/agenda/alternatelabel.h b/eventviews/agenda/alternatelabel.h
index ad38692..ad38692 100644
--- a/calendarviews/agenda/alternatelabel.h
+++ b/eventviews/agenda/alternatelabel.h
diff --git a/calendarviews/agenda/calendardecoration.cpp b/eventviews/agenda/calendardecoration.cpp
index 4ccf881..4ccf881 100644
--- a/calendarviews/agenda/calendardecoration.cpp
+++ b/eventviews/agenda/calendardecoration.cpp
diff --git a/calendarviews/agenda/calendardecoration.desktop b/eventviews/agenda/calendardecoration.desktop
index cef663e..cef663e 100644
--- a/calendarviews/agenda/calendardecoration.desktop
+++ b/eventviews/agenda/calendardecoration.desktop
diff --git a/calendarviews/agenda/calendardecoration.h b/eventviews/agenda/calendardecoration.h
index 83bfb35..83bfb35 100644
--- a/calendarviews/agenda/calendardecoration.h
+++ b/eventviews/agenda/calendardecoration.h
diff --git a/calendarviews/agenda/decorationlabel.cpp b/eventviews/agenda/decorationlabel.cpp
index cd89902..cd89902 100644
--- a/calendarviews/agenda/decorationlabel.cpp
+++ b/eventviews/agenda/decorationlabel.cpp
diff --git a/calendarviews/agenda/decorationlabel.h b/eventviews/agenda/decorationlabel.h
index 81fc72d..81fc72d 100644
--- a/calendarviews/agenda/decorationlabel.h
+++ b/eventviews/agenda/decorationlabel.h
diff --git a/calendarviews/agenda/timelabels.cpp b/eventviews/agenda/timelabels.cpp
index 8d128b6..8d128b6 100644
--- a/calendarviews/agenda/timelabels.cpp
+++ b/eventviews/agenda/timelabels.cpp
diff --git a/calendarviews/agenda/timelabels.h b/eventviews/agenda/timelabels.h
index d2dad47..d2dad47 100644
--- a/calendarviews/agenda/timelabels.h
+++ b/eventviews/agenda/timelabels.h
diff --git a/calendarviews/agenda/timelabelszone.cpp b/eventviews/agenda/timelabelszone.cpp
index 6d670f0..6d670f0 100644
--- a/calendarviews/agenda/timelabelszone.cpp
+++ b/eventviews/agenda/timelabelszone.cpp
diff --git a/calendarviews/agenda/timelabelszone.h b/eventviews/agenda/timelabelszone.h
index b6e4acf..b6e4acf 100644
--- a/calendarviews/agenda/timelabelszone.h
+++ b/eventviews/agenda/timelabelszone.h
diff --git a/calendarviews/agenda/timescaleconfigdialog.cpp b/eventviews/agenda/timescaleconfigdialog.cpp
index ef3a2da..ef3a2da 100644
--- a/calendarviews/agenda/timescaleconfigdialog.cpp
+++ b/eventviews/agenda/timescaleconfigdialog.cpp
diff --git a/calendarviews/agenda/timescaleconfigdialog.h b/eventviews/agenda/timescaleconfigdialog.h
index 06c9bb5..06c9bb5 100644
--- a/calendarviews/agenda/timescaleconfigdialog.h
+++ b/eventviews/agenda/timescaleconfigdialog.h
diff --git a/calendarviews/agenda/timescaleedit_base.ui b/eventviews/agenda/timescaleedit_base.ui
index ae70c63..ae70c63 100644
--- a/calendarviews/agenda/timescaleedit_base.ui
+++ b/eventviews/agenda/timescaleedit_base.ui
diff --git a/calendarviews/agenda/viewcalendar.cpp b/eventviews/agenda/viewcalendar.cpp
index 694f418..694f418 100644
--- a/calendarviews/agenda/viewcalendar.cpp
+++ b/eventviews/agenda/viewcalendar.cpp
diff --git a/calendarviews/agenda/viewcalendar.h b/eventviews/agenda/viewcalendar.h
index 3d61dba..3d61dba 100644
--- a/calendarviews/agenda/viewcalendar.h
+++ b/eventviews/agenda/viewcalendar.h
diff --git a/calendarviews/eventview.cpp b/eventviews/eventview.cpp
index 0c70923..0c70923 100644
--- a/calendarviews/eventview.cpp
+++ b/eventviews/eventview.cpp
diff --git a/calendarviews/eventview.h b/eventviews/eventview.h
index 70b13b8..70b13b8 100644
--- a/calendarviews/eventview.h
+++ b/eventviews/eventview.h
diff --git a/calendarviews/eventview_p.cpp b/eventviews/eventview_p.cpp
index 17806de..17806de 100644
--- a/calendarviews/eventview_p.cpp
+++ b/eventviews/eventview_p.cpp
diff --git a/calendarviews/eventview_p.h b/eventviews/eventview_p.h
index c6d624b..c6d624b 100644
--- a/calendarviews/eventview_p.h
+++ b/eventviews/eventview_p.h
diff --git a/calendarviews/eventviews.kcfg b/eventviews/eventviews.kcfg
index 3a48833..3a48833 100644
--- a/calendarviews/eventviews.kcfg
+++ b/eventviews/eventviews.kcfg
diff --git a/calendarviews/helper.cpp b/eventviews/helper.cpp
index 1c4a250..1c4a250 100644
--- a/calendarviews/helper.cpp
+++ b/eventviews/helper.cpp
diff --git a/calendarviews/helper.h b/eventviews/helper.h
index dbf51a0..dbf51a0 100644
--- a/calendarviews/helper.h
+++ b/eventviews/helper.h
diff --git a/calendarviews/journal/journalframe.cpp b/eventviews/journal/journalframe.cpp
index 9862ea9..9862ea9 100644
--- a/calendarviews/journal/journalframe.cpp
+++ b/eventviews/journal/journalframe.cpp
diff --git a/calendarviews/journal/journalframe.h b/eventviews/journal/journalframe.h
index ed15b94..ed15b94 100644
--- a/calendarviews/journal/journalframe.h
+++ b/eventviews/journal/journalframe.h
diff --git a/calendarviews/journal/journalview.cpp b/eventviews/journal/journalview.cpp
index 12cf7e4..12cf7e4 100644
--- a/calendarviews/journal/journalview.cpp
+++ b/eventviews/journal/journalview.cpp
diff --git a/calendarviews/journal/journalview.h b/eventviews/journal/journalview.h
index 17be121..17be121 100644
--- a/calendarviews/journal/journalview.h
+++ b/eventviews/journal/journalview.h
diff --git a/calendarviews/list/listview.cpp b/eventviews/list/listview.cpp
index 075711f..075711f 100644
--- a/calendarviews/list/listview.cpp
+++ b/eventviews/list/listview.cpp
diff --git a/calendarviews/list/listview.h b/eventviews/list/listview.h
index 4debb6e..4debb6e 100644
--- a/calendarviews/list/listview.h
+++ b/eventviews/list/listview.h
diff --git a/calendarviews/month/monthgraphicsitems.cpp b/eventviews/month/monthgraphicsitems.cpp
index cb56c82..cb56c82 100644
--- a/calendarviews/month/monthgraphicsitems.cpp
+++ b/eventviews/month/monthgraphicsitems.cpp
diff --git a/calendarviews/month/monthgraphicsitems.h b/eventviews/month/monthgraphicsitems.h
index 15a6aa6..15a6aa6 100644
--- a/calendarviews/month/monthgraphicsitems.h
+++ b/eventviews/month/monthgraphicsitems.h
diff --git a/calendarviews/month/monthitem.cpp b/eventviews/month/monthitem.cpp
index 4f3d1ab..4f3d1ab 100644
--- a/calendarviews/month/monthitem.cpp
+++ b/eventviews/month/monthitem.cpp
diff --git a/calendarviews/month/monthitem.h b/eventviews/month/monthitem.h
index 0e3c7d3..0e3c7d3 100644
--- a/calendarviews/month/monthitem.h
+++ b/eventviews/month/monthitem.h
diff --git a/calendarviews/month/monthscene.cpp b/eventviews/month/monthscene.cpp
index c2c2d96..c2c2d96 100644
--- a/calendarviews/month/monthscene.cpp
+++ b/eventviews/month/monthscene.cpp
diff --git a/calendarviews/month/monthscene.h b/eventviews/month/monthscene.h
index cfff88e..cfff88e 100644
--- a/calendarviews/month/monthscene.h
+++ b/eventviews/month/monthscene.h
diff --git a/calendarviews/month/monthview.cpp b/eventviews/month/monthview.cpp
index cc6fb2f..cc6fb2f 100644
--- a/calendarviews/month/monthview.cpp
+++ b/eventviews/month/monthview.cpp
diff --git a/calendarviews/month/monthview.h b/eventviews/month/monthview.h
index 841b111..841b111 100644
--- a/calendarviews/month/monthview.h
+++ b/eventviews/month/monthview.h
diff --git a/calendarviews/multiagenda/configdialoginterface.h b/eventviews/multiagenda/configdialoginterface.h
index e722686..e722686 100644
--- a/calendarviews/multiagenda/configdialoginterface.h
+++ b/eventviews/multiagenda/configdialoginterface.h
diff --git a/calendarviews/multiagenda/multiagendaview.cpp b/eventviews/multiagenda/multiagendaview.cpp
index 5274dd1..5274dd1 100644
--- a/calendarviews/multiagenda/multiagendaview.cpp
+++ b/eventviews/multiagenda/multiagendaview.cpp
diff --git a/calendarviews/multiagenda/multiagendaview.h b/eventviews/multiagenda/multiagendaview.h
index 993f6e2..993f6e2 100644
--- a/calendarviews/multiagenda/multiagendaview.h
+++ b/eventviews/multiagenda/multiagendaview.h
diff --git a/calendarviews/prefs.cpp b/eventviews/prefs.cpp
index d67ca61..d67ca61 100644
--- a/calendarviews/prefs.cpp
+++ b/eventviews/prefs.cpp
diff --git a/calendarviews/prefs.h b/eventviews/prefs.h
index dca6b74..dca6b74 100644
--- a/calendarviews/prefs.h
+++ b/eventviews/prefs.h
diff --git a/calendarviews/prefs_base.kcfgc b/eventviews/prefs_base.kcfgc
index d57ca75..d57ca75 100644
--- a/calendarviews/prefs_base.kcfgc
+++ b/eventviews/prefs_base.kcfgc
diff --git a/calendarviews/tests/CMakeLists.txt b/eventviews/tests/CMakeLists.txt
index 9062bc2..9062bc2 100644
--- a/calendarviews/tests/CMakeLists.txt
+++ b/eventviews/tests/CMakeLists.txt
diff --git a/calendarviews/tests/createcolorgui_test.cpp b/eventviews/tests/createcolorgui_test.cpp
index 651285d..651285d 100644
--- a/calendarviews/tests/createcolorgui_test.cpp
+++ b/eventviews/tests/createcolorgui_test.cpp
diff --git a/calendarviews/tests/createcolorgui_test.h b/eventviews/tests/createcolorgui_test.h
index 49d4fb1..49d4fb1 100644
--- a/calendarviews/tests/createcolorgui_test.h
+++ b/eventviews/tests/createcolorgui_test.h
diff --git a/calendarviews/timeline/timelineitem.cpp b/eventviews/timeline/timelineitem.cpp
index c79acbc..c79acbc 100644
--- a/calendarviews/timeline/timelineitem.cpp
+++ b/eventviews/timeline/timelineitem.cpp
diff --git a/calendarviews/timeline/timelineitem.h b/eventviews/timeline/timelineitem.h
index 62dcd70..62dcd70 100644
--- a/calendarviews/timeline/timelineitem.h
+++ b/eventviews/timeline/timelineitem.h
diff --git a/calendarviews/timeline/timelineview.cpp b/eventviews/timeline/timelineview.cpp
index e45599e..e45599e 100644
--- a/calendarviews/timeline/timelineview.cpp
+++ b/eventviews/timeline/timelineview.cpp
diff --git a/calendarviews/timeline/timelineview.h b/eventviews/timeline/timelineview.h
index c5bedb6..c5bedb6 100644
--- a/calendarviews/timeline/timelineview.h
+++ b/eventviews/timeline/timelineview.h
diff --git a/calendarviews/timeline/timelineview_p.cpp b/eventviews/timeline/timelineview_p.cpp
index 7b4d6c0..7b4d6c0 100644
--- a/calendarviews/timeline/timelineview_p.cpp
+++ b/eventviews/timeline/timelineview_p.cpp
diff --git a/calendarviews/timeline/timelineview_p.h b/eventviews/timeline/timelineview_p.h
index c444321..c444321 100644
--- a/calendarviews/timeline/timelineview_p.h
+++ b/eventviews/timeline/timelineview_p.h
diff --git a/calendarviews/timespent/timespentview.cpp b/eventviews/timespent/timespentview.cpp
index 7547ec2..7547ec2 100644
--- a/calendarviews/timespent/timespentview.cpp
+++ b/eventviews/timespent/timespentview.cpp
diff --git a/calendarviews/timespent/timespentview.h b/eventviews/timespent/timespentview.h
index 2a7c1b0..2a7c1b0 100644
--- a/calendarviews/timespent/timespentview.h
+++ b/eventviews/timespent/timespentview.h
diff --git a/calendarviews/todo/incidencetreemodel.cpp b/eventviews/todo/incidencetreemodel.cpp
index 8cf88b9..8cf88b9 100644
--- a/calendarviews/todo/incidencetreemodel.cpp
+++ b/eventviews/todo/incidencetreemodel.cpp
diff --git a/calendarviews/todo/incidencetreemodel.h b/eventviews/todo/incidencetreemodel.h
index 7539cd8..7539cd8 100644
--- a/calendarviews/todo/incidencetreemodel.h
+++ b/eventviews/todo/incidencetreemodel.h
diff --git a/calendarviews/todo/incidencetreemodel_p.h b/eventviews/todo/incidencetreemodel_p.h
index 7d4a38f..7d4a38f 100644
--- a/calendarviews/todo/incidencetreemodel_p.h
+++ b/eventviews/todo/incidencetreemodel_p.h
diff --git a/calendarviews/todo/tododelegates.cpp b/eventviews/todo/tododelegates.cpp
index d5aac64..d5aac64 100644
--- a/calendarviews/todo/tododelegates.cpp
+++ b/eventviews/todo/tododelegates.cpp
diff --git a/calendarviews/todo/tododelegates.h b/eventviews/todo/tododelegates.h
index 9b4960c..9b4960c 100644
--- a/calendarviews/todo/tododelegates.h
+++ b/eventviews/todo/tododelegates.h
diff --git a/calendarviews/todo/todomodel.cpp b/eventviews/todo/todomodel.cpp
index 8a36b0d..8a36b0d 100644
--- a/calendarviews/todo/todomodel.cpp
+++ b/eventviews/todo/todomodel.cpp
diff --git a/calendarviews/todo/todomodel.h b/eventviews/todo/todomodel.h
index 56a5a7f..56a5a7f 100644
--- a/calendarviews/todo/todomodel.h
+++ b/eventviews/todo/todomodel.h
diff --git a/calendarviews/todo/todomodel_p.h b/eventviews/todo/todomodel_p.h
index 7224d36..7224d36 100644
--- a/calendarviews/todo/todomodel_p.h
+++ b/eventviews/todo/todomodel_p.h
diff --git a/calendarviews/todo/todoview.cpp b/eventviews/todo/todoview.cpp
index c25366c..c25366c 100644
--- a/calendarviews/todo/todoview.cpp
+++ b/eventviews/todo/todoview.cpp
diff --git a/calendarviews/todo/todoview.h b/eventviews/todo/todoview.h
index 464a314..464a314 100644
--- a/calendarviews/todo/todoview.h
+++ b/eventviews/todo/todoview.h
diff --git a/calendarviews/todo/todoviewquickaddline.cpp b/eventviews/todo/todoviewquickaddline.cpp
index ff7866a..ff7866a 100644
--- a/calendarviews/todo/todoviewquickaddline.cpp
+++ b/eventviews/todo/todoviewquickaddline.cpp
diff --git a/calendarviews/todo/todoviewquickaddline.h b/eventviews/todo/todoviewquickaddline.h
index 6767fed..6767fed 100644
--- a/calendarviews/todo/todoviewquickaddline.h
+++ b/eventviews/todo/todoviewquickaddline.h
diff --git a/calendarviews/todo/todoviewquicksearch.cpp b/eventviews/todo/todoviewquicksearch.cpp
index 6ce3f60..6ce3f60 100644
--- a/calendarviews/todo/todoviewquicksearch.cpp
+++ b/eventviews/todo/todoviewquicksearch.cpp
diff --git a/calendarviews/todo/todoviewquicksearch.h b/eventviews/todo/todoviewquicksearch.h
index d8c5b49..d8c5b49 100644
--- a/calendarviews/todo/todoviewquicksearch.h
+++ b/eventviews/todo/todoviewquicksearch.h
diff --git a/calendarviews/todo/todoviewsortfilterproxymodel.cpp b/eventviews/todo/todoviewsortfilterproxymodel.cpp
index 5e0f15e..5e0f15e 100644
--- a/calendarviews/todo/todoviewsortfilterproxymodel.cpp
+++ b/eventviews/todo/todoviewsortfilterproxymodel.cpp
diff --git a/calendarviews/todo/todoviewsortfilterproxymodel.h b/eventviews/todo/todoviewsortfilterproxymodel.h
index 2a31aa8..2a31aa8 100644
--- a/calendarviews/todo/todoviewsortfilterproxymodel.h
+++ b/eventviews/todo/todoviewsortfilterproxymodel.h
diff --git a/calendarviews/todo/todoviewview.cpp b/eventviews/todo/todoviewview.cpp
index 588e565..588e565 100644
--- a/calendarviews/todo/todoviewview.cpp
+++ b/eventviews/todo/todoviewview.cpp
diff --git a/calendarviews/todo/todoviewview.h b/eventviews/todo/todoviewview.h
index bfd5dc3..bfd5dc3 100644
--- a/calendarviews/todo/todoviewview.h
+++ b/eventviews/todo/todoviewview.h
diff --git a/calendarviews/viewerapp/CMakeLists.txt b/eventviews/viewerapp/CMakeLists.txt
index 15d0451..15d0451 100644
--- a/calendarviews/viewerapp/CMakeLists.txt
+++ b/eventviews/viewerapp/CMakeLists.txt
diff --git a/calendarviews/viewerapp/main.cpp b/eventviews/viewerapp/main.cpp
index 2fd9bee..2fd9bee 100644
--- a/calendarviews/viewerapp/main.cpp
+++ b/eventviews/viewerapp/main.cpp
diff --git a/calendarviews/viewerapp/mainwindow.cpp b/eventviews/viewerapp/mainwindow.cpp
index 5cf5bf4..5cf5bf4 100644
--- a/calendarviews/viewerapp/mainwindow.cpp
+++ b/eventviews/viewerapp/mainwindow.cpp
diff --git a/calendarviews/viewerapp/mainwindow.h b/eventviews/viewerapp/mainwindow.h
index 348399e..348399e 100644
--- a/calendarviews/viewerapp/mainwindow.h
+++ b/eventviews/viewerapp/mainwindow.h
diff --git a/calendarviews/viewerapp/mainwindow.ui b/eventviews/viewerapp/mainwindow.ui
index bcc3e23..bcc3e23 100644
--- a/calendarviews/viewerapp/mainwindow.ui
+++ b/eventviews/viewerapp/mainwindow.ui
diff --git a/calendarviews/viewerapp/settings.kcfg b/eventviews/viewerapp/settings.kcfg
index d5b52b7..d5b52b7 100644
--- a/calendarviews/viewerapp/settings.kcfg
+++ b/eventviews/viewerapp/settings.kcfg
diff --git a/calendarviews/viewerapp/settings.kcfgc b/eventviews/viewerapp/settings.kcfgc
index 32c0c4f..32c0c4f 100644
--- a/calendarviews/viewerapp/settings.kcfgc
+++ b/eventviews/viewerapp/settings.kcfgc
diff --git a/calendarviews/whatsnext/whatsnextview.cpp b/eventviews/whatsnext/whatsnextview.cpp
index 2307952..2307952 100644
--- a/calendarviews/whatsnext/whatsnextview.cpp
+++ b/eventviews/whatsnext/whatsnextview.cpp
diff --git a/calendarviews/whatsnext/whatsnextview.h b/eventviews/whatsnext/whatsnextview.h
index 6dd7928..6dd7928 100644
--- a/calendarviews/whatsnext/whatsnextview.h
+++ b/eventviews/whatsnext/whatsnextview.h
diff --git a/incidenceeditor-ng/src/resourcemanagement.cpp b/incidenceeditor-ng/src/resourcemanagement.cpp
index 2633d44..359d771 100644
--- a/incidenceeditor-ng/src/resourcemanagement.cpp
+++ b/incidenceeditor-ng/src/resourcemanagement.cpp
@@ -29,8 +29,8 @@
#include "freebusyganttproxymodel.h"
-#include <calendarviews/agenda/agendaview.h>
-#include <calendarviews/agenda/viewcalendar.h>
+#include <eventviews/agenda/agendaview.h>
+#include <eventviews/agenda/viewcalendar.h>
#include <KCalCore/Event>
#include <KCalCore/MemoryCalendar>
diff --git a/incidenceeditor-ng/src/resourcemanagement.h b/incidenceeditor-ng/src/resourcemanagement.h
index f983e83..9d4211d 100644
--- a/incidenceeditor-ng/src/resourcemanagement.h
+++ b/incidenceeditor-ng/src/resourcemanagement.h
@@ -31,7 +31,7 @@
#include "freebusymodel/freebusycalendar.h"
#include "resourceitem.h"
-#include <calendarviews/agenda/viewcalendar.h>
+#include <eventviews/agenda/viewcalendar.h>
#include <QDialog>
#include <QStringList>
diff --git a/korganizer/dialog/searchdialog.cpp b/korganizer/dialog/searchdialog.cpp
index 2bee93e..c712a28 100644
--- a/korganizer/dialog/searchdialog.cpp
+++ b/korganizer/dialog/searchdialog.cpp
@@ -33,7 +33,7 @@
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
-#include <calendarviews/list/listview.h>
+#include <eventviews/list/listview.h>
#include <KMessageBox>
#include <KConfigGroup>
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index eaaa0c9..4862bd0 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -25,7 +25,7 @@
#include "korganizer_interfaces_export.h"
-#include <calendarviews/eventview.h>
+#include <eventviews/eventview.h>
#include <CalendarSupport/PrintPlugin>
#include <Akonadi/Calendar/IncidenceChanger>
diff --git a/korganizer/kocore.h b/korganizer/kocore.h
index 1e24469..52827f0 100644
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@@ -29,7 +29,7 @@
#include "korganizer_core_export.h"
#include "part.h"
-#include <calendarviews/agenda/calendardecoration.h>
+#include <eventviews/agenda/calendardecoration.h>
#include <KService>
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index d2b8a17..da4e54a 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -26,7 +26,7 @@
#ifndef KORG_KOVIEWMANAGER_H
#define KORG_KOVIEWMANAGER_H
-#include <calendarviews/eventview.h>
+#include <eventviews/eventview.h>
#include <KCalCore/IncidenceBase> //for KCalCore::DateList typedef
diff --git a/korganizer/plugins/datenums/datenums.h b/korganizer/plugins/datenums/datenums.h
index 80ae8dd..4bf979e 100644
--- a/korganizer/plugins/datenums/datenums.h
+++ b/korganizer/plugins/datenums/datenums.h
@@ -21,7 +21,7 @@
#ifndef KORG_PLUGINS_DATENUMS_DATENUMS_H
#define KORG_PLUGINS_DATENUMS_DATENUMS_H
-#include <calendarviews/agenda/calendardecoration.h>
+#include <eventviews/agenda/calendardecoration.h>
using namespace EventViews::CalendarDecoration;
diff --git a/korganizer/plugins/hebrew/hebrew.h b/korganizer/plugins/hebrew/hebrew.h
index c041af6..62927d0 100644
--- a/korganizer/plugins/hebrew/hebrew.h
+++ b/korganizer/plugins/hebrew/hebrew.h
@@ -22,7 +22,7 @@
#ifndef KORG_PLUGINS_HEBREW_HEBREW_H
#define KORG_PLUGINS_HEBREW_HEBREW_H
-#include <calendarviews/agenda/calendardecoration.h>
+#include <eventviews/agenda/calendardecoration.h>
using namespace EventViews::CalendarDecoration;
diff --git a/korganizer/plugins/picoftheday/picoftheday.h b/korganizer/plugins/picoftheday/picoftheday.h
index 199635a..1bdafc6 100644
--- a/korganizer/plugins/picoftheday/picoftheday.h
+++ b/korganizer/plugins/picoftheday/picoftheday.h
@@ -21,7 +21,7 @@
#ifndef KORG_PLUGINS_PICOFTHEDAY_PICOFTHEDAY_H
#define KORG_PLUGINS_PICOFTHEDAY_PICOFTHEDAY_H
-#include <calendarviews/agenda/calendardecoration.h>
+#include <eventviews/agenda/calendardecoration.h>
using namespace EventViews::CalendarDecoration;
#include <KIO/Job>
diff --git a/korganizer/plugins/thisdayinhistory/thisdayinhistory.h b/korganizer/plugins/thisdayinhistory/thisdayinhistory.h
index 73ec4fd..9177577 100644
--- a/korganizer/plugins/thisdayinhistory/thisdayinhistory.h
+++ b/korganizer/plugins/thisdayinhistory/thisdayinhistory.h
@@ -21,7 +21,7 @@
#ifndef KORG_PLUGINS_THISDAYINHISTORY_THISDAYINHISTORY_H
#define KORG_PLUGINS_THISDAYINHISTORY_THISDAYINHISTORY_H
-#include <calendarviews/agenda/calendardecoration.h>
+#include <eventviews/agenda/calendardecoration.h>
using namespace EventViews::CalendarDecoration;
diff --git a/korganizer/prefs/koprefs.h b/korganizer/prefs/koprefs.h
index 9a645c5..6b539e1 100644
--- a/korganizer/prefs/koprefs.h
+++ b/korganizer/prefs/koprefs.h
@@ -28,7 +28,7 @@
#include "korganizer_core_export.h"
#include "koprefs_base.h"
-#include <calendarviews/prefs.h>
+#include <eventviews/prefs.h>
class KORGANIZER_CORE_EXPORT KOPrefs : public KOPrefsBase
{
diff --git a/korganizer/views/agendaview/koagendaview.cpp b/korganizer/views/agendaview/koagendaview.cpp
index f6ce6fd..eb94396 100644
--- a/korganizer/views/agendaview/koagendaview.cpp
+++ b/korganizer/views/agendaview/koagendaview.cpp
@@ -26,7 +26,7 @@
#include "koeventpopupmenu.h"
#include "prefs/koprefs.h"
-#include <calendarviews/agenda/agendaview.h>
+#include <eventviews/agenda/agendaview.h>
#include <QHBoxLayout>
diff --git a/korganizer/views/collectionview/quickview.cpp b/korganizer/views/collectionview/quickview.cpp
index cae26a6..5b9a103 100644
--- a/korganizer/views/collectionview/quickview.cpp
+++ b/korganizer/views/collectionview/quickview.cpp
@@ -30,8 +30,8 @@
#include <AkonadiCore/changerecorder.h>
#include <AkonadiCore/itemfetchscope.h>
-#include <calendarviews/agenda/agendaview.h>
-#include <calendarviews/agenda/viewcalendar.h>
+#include <eventviews/agenda/agendaview.h>
+#include <eventviews/agenda/viewcalendar.h>
#include <CalendarSupport/CalendarSingleton>
#include <freebusymodel/freebusycalendar.h>
diff --git a/korganizer/views/collectionview/quickview.h b/korganizer/views/collectionview/quickview.h
index 8247352..1425f34 100644
--- a/korganizer/views/collectionview/quickview.h
+++ b/korganizer/views/collectionview/quickview.h
@@ -25,7 +25,7 @@
#include "controller.h"
-#include <calendarviews/agenda/viewcalendar.h>
+#include <eventviews/agenda/viewcalendar.h>
#include <KCalCore/FreeBusy>
#include <QDialog>
diff --git a/korganizer/views/journalview/kojournalview.cpp b/korganizer/views/journalview/kojournalview.cpp
index 3eccb1b..a33c440 100644
--- a/korganizer/views/journalview/kojournalview.cpp
+++ b/korganizer/views/journalview/kojournalview.cpp
@@ -28,7 +28,7 @@
#include "kojournalview.h"
#include "prefs/koprefs.h"
-#include <calendarviews/journal/journalview.h>
+#include <eventviews/journal/journalview.h>
#include <CalendarSupport/Utils>
#include <CalendarSupport/CalPrinter>
diff --git a/korganizer/views/listview/kolistview.cpp b/korganizer/views/listview/kolistview.cpp
index 3a6a817..ca2a9f9 100644
--- a/korganizer/views/listview/kolistview.cpp
+++ b/korganizer/views/listview/kolistview.cpp
@@ -28,7 +28,7 @@
#include "kolistview.h"
#include "koeventpopupmenu.h"
-#include <calendarviews/list/listview.h>
+#include <eventviews/list/listview.h>
#include <QVBoxLayout>
diff --git a/korganizer/views/monthview/monthview.cpp b/korganizer/views/monthview/monthview.cpp
index 52fc7a4..6ea30ac 100644
--- a/korganizer/views/monthview/monthview.cpp
+++ b/korganizer/views/monthview/monthview.cpp
@@ -27,7 +27,7 @@
#include "koeventpopupmenu.h"
#include "prefs/koprefs.h"
-#include <calendarviews/month/monthview.h>
+#include <eventviews/month/monthview.h>
#include <QVBoxLayout>
diff --git a/korganizer/views/multiagendaview/multiagendaview.cpp b/korganizer/views/multiagendaview/multiagendaview.cpp
index d8494f1..299decf 100644
--- a/korganizer/views/multiagendaview/multiagendaview.cpp
+++ b/korganizer/views/multiagendaview/multiagendaview.cpp
@@ -26,8 +26,8 @@
#include "Libkdepim/KColumnFilterProxyModel"
-#include <calendarviews/agenda/agendaview.h>
-#include <calendarviews/multiagenda/multiagendaview.h>
+#include <eventviews/agenda/agendaview.h>
+#include <eventviews/multiagenda/multiagendaview.h>
#include <AkonadiWidgets/EntityTreeView>
#include <AkonadiCore/EntityTreeModel>
diff --git a/korganizer/views/multiagendaview/multiagendaview.h b/korganizer/views/multiagendaview/multiagendaview.h
index 2bab162..5dfd891 100644
--- a/korganizer/views/multiagendaview/multiagendaview.h
+++ b/korganizer/views/multiagendaview/multiagendaview.h
@@ -23,7 +23,7 @@
#include "koeventview.h"
-#include <calendarviews/multiagenda/configdialoginterface.h>
+#include <eventviews/multiagenda/configdialoginterface.h>
#include <QDialog>
diff --git a/korganizer/views/timelineview/kotimelineview.cpp b/korganizer/views/timelineview/kotimelineview.cpp
index 31d0c66..209dab3 100644
--- a/korganizer/views/timelineview/kotimelineview.cpp
+++ b/korganizer/views/timelineview/kotimelineview.cpp
@@ -28,7 +28,7 @@
#include "kotimelineview.h"
#include "koeventpopupmenu.h"
-#include <calendarviews/timeline/timelineview.h>
+#include <eventviews/timeline/timelineview.h>
#include <QVBoxLayout>
diff --git a/korganizer/views/timespentview/kotimespentview.cpp b/korganizer/views/timespentview/kotimespentview.cpp
index 788fda2..c7420a3 100644
--- a/korganizer/views/timespentview/kotimespentview.cpp
+++ b/korganizer/views/timespentview/kotimespentview.cpp
@@ -24,7 +24,7 @@
#include "kotimespentview.h"
-#include <calendarviews/timespent/timespentview.h>
+#include <eventviews/timespent/timespentview.h>
#include <Akonadi/Calendar/ETMCalendar>
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
diff --git a/korganizer/views/todoview/kotodoview.cpp b/korganizer/views/todoview/kotodoview.cpp
index 102017e..4688689 100644
--- a/korganizer/views/todoview/kotodoview.cpp
+++ b/korganizer/views/todoview/kotodoview.cpp
@@ -31,7 +31,7 @@
#include <CalendarSupport/CalPrinter>
-#include <calendarviews/todo/todoview.h>
+#include <eventviews/todo/todoview.h>
#include <AkonadiCore/EntityTreeModel>
diff --git a/korganizer/views/todoview/kotodoview.h b/korganizer/views/todoview/kotodoview.h
index 9762523..0fe52b4 100644
--- a/korganizer/views/todoview/kotodoview.h
+++ b/korganizer/views/todoview/kotodoview.h
@@ -31,7 +31,7 @@
#include <CalendarSupport/Utils>
-#include <calendarviews/todo/todoview.h>
+#include <eventviews/todo/todoview.h>
using namespace KOrg;
diff --git a/korganizer/views/whatsnextview/kowhatsnextview.h b/korganizer/views/whatsnextview/kowhatsnextview.h
index 35bac2b..3873e3a 100644
--- a/korganizer/views/whatsnextview/kowhatsnextview.h
+++ b/korganizer/views/whatsnextview/kowhatsnextview.h
@@ -25,7 +25,7 @@
#define KORG_VIEWS_KOWHATSNEXTVIEW_H
#include "baseview.h"
-#include <calendarviews/whatsnext/whatsnextview.h>
+#include <eventviews/whatsnext/whatsnextview.h>
/**
This class provides a view of the next events and todos
diff --git a/korganizer/widgets/kitemiconcheckcombo.h b/korganizer/widgets/kitemiconcheckcombo.h
index 2f14602..583589c 100644
--- a/korganizer/widgets/kitemiconcheckcombo.h
+++ b/korganizer/widgets/kitemiconcheckcombo.h
@@ -24,7 +24,7 @@
#include <Libkdepim/KCheckComboBox>
-#include <calendarviews/eventview.h>
+#include <eventviews/eventview.h>
class KItemIconCheckCombo : public KPIM::KCheckComboBox
{
diff --git a/libkleo/KF5KleoConfig.cmake.in b/libkleo/KF5KleoConfig.cmake.in
new file mode 100644
index 0000000..66c6727
--- /dev/null
+++ b/libkleo/KF5KleoConfig.cmake.in
@@ -0,0 +1,3 @@
+
+include("${CMAKE_CURRENT_LIST_DIR}/KF5KleoTargets.cmake")
diff --git a/libksieve/KF5KSieveConfig.cmake.in b/libksieve/KF5KSieveConfig.cmake.in
new file mode 100644
index 0000000..3a69c91
--- /dev/null
+++ b/libksieve/KF5KSieveConfig.cmake.in
@@ -0,0 +1,3 @@
+
+include("${CMAKE_CURRENT_LIST_DIR}/KF5KSieveTargets.cmake")