diff --git a/CMakeLists.txt b/CMakeLists.txt index f5a67c7d13321da43ed2bff41b0f3b23d9e40362..4dba27750ead66c86dc95445250e624ec7eced79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,7 +237,6 @@ add_subdirectory(grantleeeditor) add_subdirectory(korganizer) -add_subdirectory(korgac) add_subdirectory(sieveeditor) add_subdirectory(storageservicemanager) add_subdirectory(akregator) diff --git a/SPLIT-APPS-STATUS b/SPLIT-APPS-STATUS index 6c90be8c5a391480b7c47815c469559bc8a1020d..73bd4059cc9be2112ba79538812ccca2ae9e7264 100644 --- a/SPLIT-APPS-STATUS +++ b/SPLIT-APPS-STATUS @@ -10,7 +10,7 @@ kmail (DONE) knotes (DONE) kontact (INPROGRESS) korgac (move in korganizer) -korganizer +korganizer (INPROGRESS) ktnef (DONE) mboximporter (DONE) pimsettingexporter (DONE) diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt index ffd1cbaca3c5ac978ba8f36e00273035787441b6..b1dedc29c206586b85f5dc3c722d08daf3e31a4d 100644 --- a/korganizer/CMakeLists.txt +++ b/korganizer/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions( -DQT_NO_CAST_TO_ASCII ) add_subdirectory(src) +add_subdirectory(korgac) if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/korgac/CMakeLists.txt b/korganizer/korgac/CMakeLists.txt similarity index 95% rename from korgac/CMakeLists.txt rename to korganizer/korgac/CMakeLists.txt index aa826d2b8733ddac995acd651d805da9d50d81a1..9b8c86c5f025e5674d2407e5f9886e60277d2c1f 100644 --- a/korgac/CMakeLists.txt +++ b/korganizer/korgac/CMakeLists.txt @@ -28,7 +28,7 @@ set(korgac_SRCS mailclient.cpp ) -set(korganizer_xml ${CMAKE_SOURCE_DIR}/korganizer/data/org.kde.korganizer.Korganizer.xml) +set(korganizer_xml ../src/data/org.kde.korganizer.Korganizer.xml) qt5_add_dbus_interface(korgac_SRCS ${korganizer_xml} korganizer_interface diff --git a/korgac/Mainpage.dox b/korganizer/korgac/Mainpage.dox similarity index 100% rename from korgac/Mainpage.dox rename to korganizer/korgac/Mainpage.dox diff --git a/korgac/Messages.sh b/korganizer/korgac/Messages.sh similarity index 100% rename from korgac/Messages.sh rename to korganizer/korgac/Messages.sh diff --git a/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp similarity index 100% rename from korgac/alarmdialog.cpp rename to korganizer/korgac/alarmdialog.cpp diff --git a/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h similarity index 100% rename from korgac/alarmdialog.h rename to korganizer/korgac/alarmdialog.h diff --git a/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp similarity index 100% rename from korgac/alarmdockwindow.cpp rename to korganizer/korgac/alarmdockwindow.cpp diff --git a/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h similarity index 100% rename from korgac/alarmdockwindow.h rename to korganizer/korgac/alarmdockwindow.h diff --git a/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp similarity index 100% rename from korgac/koalarmclient.cpp rename to korganizer/korgac/koalarmclient.cpp diff --git a/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h similarity index 100% rename from korgac/koalarmclient.h rename to korganizer/korgac/koalarmclient.h diff --git a/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp similarity index 100% rename from korgac/korgacmain.cpp rename to korganizer/korgac/korgacmain.cpp diff --git a/korgac/mailclient.cpp b/korganizer/korgac/mailclient.cpp similarity index 100% rename from korgac/mailclient.cpp rename to korganizer/korgac/mailclient.cpp diff --git a/korgac/mailclient.h b/korganizer/korgac/mailclient.h similarity index 100% rename from korgac/mailclient.h rename to korganizer/korgac/mailclient.h diff --git a/korgac/org.kde.korgac.desktop b/korganizer/korgac/org.kde.korgac.desktop similarity index 100% rename from korgac/org.kde.korgac.desktop rename to korganizer/korgac/org.kde.korgac.desktop diff --git a/korgac/org.kde.korganizer.KOrgac.xml b/korganizer/korgac/org.kde.korganizer.KOrgac.xml similarity index 100% rename from korgac/org.kde.korganizer.KOrgac.xml rename to korganizer/korgac/org.kde.korganizer.KOrgac.xml diff --git a/korgac/pixmaps/128-apps-korgac.png b/korganizer/korgac/pixmaps/128-apps-korgac.png similarity index 100% rename from korgac/pixmaps/128-apps-korgac.png rename to korganizer/korgac/pixmaps/128-apps-korgac.png diff --git a/korgac/pixmaps/16-apps-korgac.png b/korganizer/korgac/pixmaps/16-apps-korgac.png similarity index 100% rename from korgac/pixmaps/16-apps-korgac.png rename to korganizer/korgac/pixmaps/16-apps-korgac.png diff --git a/korgac/pixmaps/22-apps-korgac.png b/korganizer/korgac/pixmaps/22-apps-korgac.png similarity index 100% rename from korgac/pixmaps/22-apps-korgac.png rename to korganizer/korgac/pixmaps/22-apps-korgac.png diff --git a/korgac/pixmaps/256-apps-korgac.png b/korganizer/korgac/pixmaps/256-apps-korgac.png similarity index 100% rename from korgac/pixmaps/256-apps-korgac.png rename to korganizer/korgac/pixmaps/256-apps-korgac.png diff --git a/korgac/pixmaps/32-apps-korgac.png b/korganizer/korgac/pixmaps/32-apps-korgac.png similarity index 100% rename from korgac/pixmaps/32-apps-korgac.png rename to korganizer/korgac/pixmaps/32-apps-korgac.png diff --git a/korgac/pixmaps/64-apps-korgac.png b/korganizer/korgac/pixmaps/64-apps-korgac.png similarity index 100% rename from korgac/pixmaps/64-apps-korgac.png rename to korganizer/korgac/pixmaps/64-apps-korgac.png diff --git a/korgac/pixmaps/CMakeLists.txt b/korganizer/korgac/pixmaps/CMakeLists.txt similarity index 100% rename from korgac/pixmaps/CMakeLists.txt rename to korganizer/korgac/pixmaps/CMakeLists.txt diff --git a/korgac/pixmaps/hisc-apps-korgac.svgz b/korganizer/korgac/pixmaps/hisc-apps-korgac.svgz similarity index 100% rename from korgac/pixmaps/hisc-apps-korgac.svgz rename to korganizer/korgac/pixmaps/hisc-apps-korgac.svgz diff --git a/korgac/tests/CMakeLists.txt b/korganizer/korgac/tests/CMakeLists.txt similarity index 90% rename from korgac/tests/CMakeLists.txt rename to korganizer/korgac/tests/CMakeLists.txt index 3f8fe5ec739b63595dfa022460cecebefee1597d..491e6d6d9d9334c83ee02fb63284567251203857 100644 --- a/korgac/tests/CMakeLists.txt +++ b/korganizer/korgac/tests/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( ${CMAKE_BINARY_DIR}/korgac ) -set(korganizer_xml ${CMAKE_SOURCE_DIR}/korganizer/data/org.kde.korganizer.Korganizer.xml) +set(korganizer_xml ${CMAKE_SOURCE_DIR}/korganizer/src/data/org.kde.korganizer.Korganizer.xml) ########### next target ############### diff --git a/korgac/tests/testalarmdlg.cpp b/korganizer/korgac/tests/testalarmdlg.cpp similarity index 100% rename from korgac/tests/testalarmdlg.cpp rename to korganizer/korgac/tests/testalarmdlg.cpp diff --git a/korganizer/src/CMakeLists.txt b/korganizer/src/CMakeLists.txt index 4ec267576c6060a76820d858427d9c72c54a4f31..e744e6d5261d341ca85db26d00cd5de5df220fac 100644 --- a/korganizer/src/CMakeLists.txt +++ b/korganizer/src/CMakeLists.txt @@ -223,7 +223,7 @@ qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS ) qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS - ${CMAKE_SOURCE_DIR}/korgac/org.kde.korganizer.KOrgac.xml + ../korgac/org.kde.korganizer.KOrgac.xml ) qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS diff --git a/plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt index f553926350c6749d4fb51f778cbf545aa3ce75f9..815f21ee52bdf89bbf3182fc4e7ee3ed61a94606 100644 --- a/plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt +++ b/plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt @@ -6,7 +6,7 @@ set(messageviewer_bodypartformatter_text_calendar_PART_SRCS text_calendar.cpp de ecm_qt_declare_logging_category(messageviewer_bodypartformatter_text_calendar_PART_SRCS HEADER text_calendar_debug.h IDENTIFIER TEXT_CALENDAR_LOG CATEGORY_NAME log_text_calendar) qt5_add_dbus_interfaces(messageviewer_bodypartformatter_text_calendar_PART_SRCS - ${CMAKE_SOURCE_DIR}/korganizer/data/org.kde.Korganizer.Calendar.xml + ${CMAKE_SOURCE_DIR}/korganizer/src/data/org.kde.Korganizer.Calendar.xml ) ki18n_wrap_ui(messageviewer_bodypartformatter_text_calendar_PART_SRCS attendeeselector.ui)