Allow to split korganizer

CMakeLists.txt

@@ -74,9 +74,14 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kalarm_SOURCE_DIR})
     find_package(Xsltproc)
     set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
 
-    include_directories(${kalarm_SOURCE_DIR} ${kalarm_BINARY_DIR})
+    if (NOT APPLE)
+        find_package(X11)
+    endif()
 endif()
+set(KDEPIM_HAVE_X11 ${X11_FOUND})
+configure_file(src/config-kalarm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kalarm.h )
 
+include_directories(${kalarm_SOURCE_DIR} ${kalarm_BINARY_DIR})
 
 add_definitions(-DQT_STRICT_ITERATORS)
 add_definitions(-DQT_NO_CAST_FROM_ASCII)

src/CMakeLists.txt

@@ -112,7 +112,8 @@ ki18n_wrap_ui(kalarm_bin_SRCS
 )
 
 qt5_add_dbus_adaptor(kalarm_bin_SRCS org.kde.kalarm.kalarm.xml dbushandler.h DBusHandler)
-qt5_add_dbus_interfaces(kalarm_bin_SRCS ${CMAKE_BINARY_DIR}/kmail/src/org.kde.kmail.kmail.xml)
+
+qt5_add_dbus_interfaces(kalarm_bin_SRCS kmail/org.kde.kmail.kmail.xml)
 
 kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings)
 qt5_add_dbus_interface(kalarm_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarm.Settings.xml kalarmsettings KAlarmSettings)
@@ -129,7 +130,7 @@ kconfig_add_kcfg_files(kalarm_bin_SRCS GENERATE_MOC kalarmconfig.kcfgc)
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/appicons/*-apps-kalarm.png")
 ecm_add_app_icon(kalarm_bin_SRCS ICONS ${ICONS_SRCS})
 add_executable(kalarm_bin ${kalarm_bin_SRCS})
-add_dependencies(kalarm_bin kmail_xml)
+add_dependencies(kalarm_bin kmail_interface_xml)
 
 set_target_properties(kalarm_bin PROPERTIES OUTPUT_NAME kalarm)
 

src/config-kalarm.h.cmake

+/* config-kdepim.h. Generated by cmake from config-kdepim.h.cmake */
+
+/* Define to 1 if you have the Xlib */
+#cmakedefine01 KDEPIM_HAVE_X11
+
+
+#cmakedefine QTWEBENGINE_SUPPORT_OPTION 1

src/find.cpp

@@ -25,7 +25,7 @@
 #include "eventlistview.h"
 #include "messagebox.h"
 #include "preferences.h"
-#include "config-kdepim.h"
+#include "config-kalarm.h"
 
 #include <kalarmcal/kaevent.h>
 

src/functions.cpp

@@ -39,7 +39,7 @@
 #include "templatelistview.h"
 #include "templatemenuaction.h"
 
-#include "config-kdepim.h"
+#include "config-kalarm.h"
 
 #include <kalarmcal/identities.h>
 #include <kalarmcal/kaevent.h>

src/kmail/org.kde.kmail.kmail.xml

+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.kde.kmail.kmail">
+    <method name="checkMail">
+    </method>
+    <method name="openReader">
+    </method>
+    <method name="setSystrayIconNotificationsEnabled">
+      <arg name="enabled" type="b" direction="in"/>
+    </method>
+    <method name="pauseBackgroundJobs">
+    </method>
+    <method name="resumeBackgroundJobs">
+    </method>
+    <method name="stopNetworkJobs">
+    </method>
+    <method name="resumeNetworkJobs">
+    </method>
+    <method name="accounts">
+      <arg type="as" direction="out"/>
+    </method>
+    <method name="checkAccount">
+      <arg name="account" type="s" direction="in"/>
+    </method>
+    <method name="selectFolder">
+      <arg type="b" direction="out"/>
+      <arg name="folder" type="s" direction="in"/>
+    </method>
+    <method name="canQueryClose">
+      <arg type="b" direction="out"/>
+    </method>
+    <method name="handleCommandLine">
+      <arg type="b" direction="out"/>
+      <arg name="noArgsOpensReader" type="b" direction="in"/>
+      <arg name="args" type="as" direction="in"/>
+      <arg name="workingDir" type="s" direction="in"/>
+    </method>
+    <method name="openComposer">
+      <arg type="i" direction="out"/>
+      <arg name="to" type="s" direction="in"/>
+      <arg name="cc" type="s" direction="in"/>
+      <arg name="bcc" type="s" direction="in"/>
+      <arg name="subject" type="s" direction="in"/>
+      <arg name="body" type="s" direction="in"/>
+      <arg name="hidden" type="b" direction="in"/>
+      <arg name="messageFile" type="s" direction="in"/>
+      <arg name="attachmentPaths" type="as" direction="in"/>
+      <arg name="customHeaders" type="as" direction="in"/>
+      <arg name="replyTo" type="s" direction="in"/>
+      <arg name="inReplyTo" type="s" direction="in"/>
+    </method>
+    <method name="openComposer">
+      <arg type="i" direction="out"/>
+      <arg name="to" type="s" direction="in"/>
+      <arg name="cc" type="s" direction="in"/>
+      <arg name="bcc" type="s" direction="in"/>
+      <arg name="subject" type="s" direction="in"/>
+      <arg name="body" type="s" direction="in"/>
+      <arg name="hidden" type="b" direction="in"/>
+      <arg name="messageFile" type="s" direction="in"/>
+      <arg name="attachmentPaths" type="as" direction="in"/>
+      <arg name="customHeaders" type="as" direction="in"/>
+      <arg name="replyTo" type="s" direction="in"/>
+    </method>
+    <method name="openComposer">
+      <arg type="i" direction="out"/>
+      <arg name="to" type="s" direction="in"/>
+      <arg name="cc" type="s" direction="in"/>
+      <arg name="bcc" type="s" direction="in"/>
+      <arg name="subject" type="s" direction="in"/>
+      <arg name="body" type="s" direction="in"/>
+      <arg name="hidden" type="b" direction="in"/>
+      <arg name="messageFile" type="s" direction="in"/>
+      <arg name="attachmentPaths" type="as" direction="in"/>
+      <arg name="customHeaders" type="as" direction="in"/>
+    </method>
+    <method name="openComposer">
+      <arg type="i" direction="out"/>
+      <arg name="to" type="s" direction="in"/>
+      <arg name="cc" type="s" direction="in"/>
+      <arg name="bcc" type="s" direction="in"/>
+      <arg name="subject" type="s" direction="in"/>
+      <arg name="body" type="s" direction="in"/>
+      <arg name="hidden" type="b" direction="in"/>
+      <arg name="attachName" type="s" direction="in"/>
+      <arg name="attachCte" type="ay" direction="in"/>
+      <arg name="attachData" type="ay" direction="in"/>
+      <arg name="attachType" type="ay" direction="in"/>
+      <arg name="attachSubType" type="ay" direction="in"/>
+      <arg name="attachParamAttr" type="ay" direction="in"/>
+      <arg name="attachParamValue" type="s" direction="in"/>
+      <arg name="attachContDisp" type="ay" direction="in"/>
+      <arg name="attachCharset" type="ay" direction="in"/>
+      <arg name="identity" type="u" direction="in"/>
+    </method>
+    <method name="openComposer">
+      <arg type="i" direction="out"/>
+      <arg name="to" type="s" direction="in"/>
+      <arg name="cc" type="s" direction="in"/>
+      <arg name="bcc" type="s" direction="in"/>
+      <arg name="subject" type="s" direction="in"/>
+      <arg name="body" type="s" direction="in"/>
+      <arg name="attachName" type="s" direction="in"/>
+      <arg name="attachCte" type="ay" direction="in"/>
+      <arg name="attachData" type="ay" direction="in"/>
+      <arg name="attachType" type="ay" direction="in"/>
+      <arg name="attachSubType" type="ay" direction="in"/>
+      <arg name="attachParamAttr" type="ay" direction="in"/>
+      <arg name="attachParamValue" type="s" direction="in"/>
+      <arg name="attachContDisp" type="ay" direction="in"/>
+      <arg name="attachCharset" type="ay" direction="in"/>
+      <arg name="identity" type="u" direction="in"/>
+    </method>
+    <method name="openComposer">
+      <arg type="o" direction="out"/>
+      <arg name="to" type="s" direction="in"/>
+      <arg name="cc" type="s" direction="in"/>
+      <arg name="bcc" type="s" direction="in"/>
+      <arg name="subject" type="s" direction="in"/>
+      <arg name="body" type="s" direction="in"/>
+      <arg name="hidden" type="b" direction="in"/>
+    </method>
+    <method name="newMessage">
+      <arg type="o" direction="out"/>
+      <arg name="to" type="s" direction="in"/>
+      <arg name="cc" type="s" direction="in"/>
+      <arg name="bcc" type="s" direction="in"/>
+      <arg name="hidden" type="b" direction="in"/>
+      <arg name="useFolderId" type="b" direction="in"/>
+      <arg name="messageFile" type="s" direction="in"/>
+      <arg name="attachURL" type="s" direction="in"/>
+    </method>
+    <method name="showMail">
+      <arg type="b" direction="out"/>
+      <arg name="serialNumber" type="x" direction="in"/>
+    </method>
+    <method name="viewMessage">
+      <arg type="i" direction="out"/>
+      <arg name="messageFile" type="s" direction="in"/>
+    </method>
+    <method name="updateConfig">
+    </method>
+    <method name="showFolder">
+      <arg name="collectionId" type="s" direction="in"/>
+    </method>
+    <method name="reloadFolderArchiveConfig">
+    </method>
+  </interface>
+</node>

src/lib/desktop.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "desktop.h"
-#include "config-kdepim.h"
+#include "config-kalarm.h"
 #if KDEPIM_HAVE_X11
 #include <kwindowsystem.h>
 #endif

src/messagewin.cpp

@@ -18,7 +18,7 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "config-kdepim.h"
+#include "config-kalarm.h"
 #include "kalarm.h"
 #include "messagewin_p.h"
 #include "messagewin.h"
@@ -39,7 +39,7 @@
 #include "synchtimer.h"
 
 #include <kpimtextedit/texttospeech.h>
-//QT5 reactivate after porting (activated by config-kdepim.h include in texttospeech.h)
+//QT5 reactivate after porting (activated by config-kalarm.h include in texttospeech.h)
 #define KDEPIM_HAVE_X11 0
 
 #include <KAboutData>

src/prefdlg.cpp

@@ -51,7 +51,7 @@
 #include "prefdlg_p.h"
 #include "prefdlg.h"
 
-#include "config-kdepim.h"
+#include "config-kalarm.h"
 
 #include <kalarmcal/identities.h>