kdepim: cleanup

kdepim/CMakeLists.txt

@@ -6,7 +6,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
 ############### Build Options ###############
 
 option(KDEPIM_BUILD_EXAMPLES "Build the kdepim example applications." FALSE)
-option(KDEPIM_BUILD_MOBILE "Build the mobile applications. Note that you have to enable KDEPIM_MOBILE_UI if you want to run these applications on a mobile device." TRUE)
+# TODO: drop this entirely
+option(KDEPIM_BUILD_MOBILE "Build the mobile applications. Note that you have to enable KDEPIM_MOBILE_UI if you want to run these applications on a mobile device." FALSE)
 option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
 option(KDEPIM_MOBILE_UI "Build UI for mobile devices instead of for desktops" FALSE)
 option(KDEPIM_ONLY_KLEO "Only build Kleopatra. This option will build only libkleo and kleopatra" FALSE)
@@ -29,19 +30,13 @@ if(KDEPIM_ENTERPRISE_BUILD)
   message(STATUS "Enterprise build is enabled.")
 endif()
 
-# if KDEPIM_ONLY_KLEO is defined, KDEPIM_BUILD_MOBILE and KDEPIM_MOBILE_UI are disabled.
+# if KDEPIM_ONLY_KLEO is defined, KDEPIM_MOBILE_UI are disabled.
 if(KDEPIM_ONLY_KLEO)
- set(KDEPIM_BUILD_MOBILE FALSE)
  set(KDEPIM_MOBILE_UI FALSE)
  set(KDEPIM_DEFINITIONS "-DHAVE_CONFIG_H=1")
  message(STATUS "Only libkleo and Kleopatra will be built.")
 endif()
 
-if(KDEPIM_MOBILE_UI)
-    # Build the mobile applications
-    set(KDEPIM_BUILD_MOBILE TRUE)
-endif()
-
 # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING
 configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h )
 
@@ -176,10 +171,21 @@ else()
   set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra")
 
   find_package(Grantlee 0.3.0 QUIET CONFIG)
-  set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." )
+  set_package_properties(Grantlee PROPERTIES
+  DESCRIPTION "The Grantlee Template System"
+  URL "http://www.gitorious.org/grantlee/pages/Home"
+  TYPE REQUIRED
+  PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)."
+  )
 
   find_package(Baloo 4.14.0 QUIET CONFIG)
-  set_package_properties(Baloo PROPERTIES DESCRIPTION "The Baloo libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Baloo provides search capabilities in KMail and Akonadi")
+  set_package_properties(Baloo PROPERTIES
+    DESCRIPTION "The Baloo libraries"
+    URL "http://www.kde.org"
+    # FIXME: rip it off
+    # TYPE REQUIRED
+    PURPOSE "Baloo provides search capabilities in KMail and Akonadi"
+    )
 
   # Xsltproc
   find_package(Xsltproc)
@@ -200,21 +206,6 @@ else()
   endif()
 
 
-
-############### Desktop vs. Mobile options ##############
-
-  if(KDEPIM_MOBILE_UI)
-    add_definitions( -DKDEPIM_MOBILE_UI )
-    if(NOT QT_QTDECLARATIVE_FOUND)
-      message(FATAL_ERROR "The QtDeclarative (QML) module is required for building the mobile UI")
-    endif()
-  else()
-    if(NOT QT_QTDECLARATIVE_FOUND)
-      message(STATUS "The Qt Declarative (QML) module was not found. The mobile applications will not be built.")
-      set(KDEPIM_BUILD_MOBILE FALSE)
-    endif()
-  endif()
-
 ############### Needed commands before building anything ###############
 
   add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS} ${AKONADI_DEFINITIONS})
@@ -263,9 +254,6 @@ else()
   add_subdirectory(mailcommon) # TODO: does this make sense?!?
   macro_optional_add_subdirectory(kmail)
   macro_optional_add_subdirectory(grantleeeditor)
-  if(KDEPIM_BUILD_MOBILE)
-    add_subdirectory(mobile)
-  endif()
 
   if(KDEPIM_BUILD_EXAMPLES)
     add_subdirectory(examples)

kdepim/agents/archivemailagent/CMakeLists.txt

@@ -26,9 +26,7 @@ qt4_add_dbus_adaptor(archivemailagent_SRCS org.freedesktop.Akonadi.ArchiveMailAg
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
-kde4_add_ui_files(archivemailagent_SRCS ui/archivemailwidget.ui )
+add_executable(akonadi_archivemail_agent ${archivemailagent_SRCS})
-
-kde4_add_executable(akonadi_archivemail_agent ${archivemailagent_SRCS})
 
 target_link_libraries(akonadi_archivemail_agent
   ${KDEPIMLIBS_AKONADI_LIBS}
@@ -39,15 +37,11 @@ target_link_libraries(akonadi_archivemail_agent
   mailcommon
 )
 
-if (Q_WS_MAC)
-  set_target_properties(akonadi_archivemail_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template)
-  set_target_properties(akonadi_archivemail_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.archivemail")
-  set_target_properties(akonadi_archivemail_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Email Archiver")
-endif ()
-
 install(TARGETS akonadi_archivemail_agent ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(FILES archivemailagent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
 install(FILES akonadi_archivemail_agent.notifyrc DESTINATION "${DATA_INSTALL_DIR}/akonadi_archivemail_agent" )
 
-add_subdirectory(tests)
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()

kdepim/agents/followupreminderagent/CMakeLists.txt

@@ -6,6 +6,10 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/messagecomposer/
 )
 
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
+
 set(followupreminderlib_SRCS 
     followupreminderinfo.cpp
     followupreminderutil.cpp
@@ -16,7 +20,7 @@ kde4_add_kcfg_files(followupreminderlib_SRCS
 )
 
 
-kde4_add_library( followupreminder ${LIBRARY_TYPE} ${followupreminderlib_SRCS} )
+add_library( followupreminder ${LIBRARY_TYPE} ${followupreminderlib_SRCS} )
 target_link_libraries( followupreminder ${KDE4_KDEUI_LIBS} )
 
 set_target_properties( followupreminder PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
@@ -41,7 +45,7 @@ set(followupreminderagent_SRCS
 
 qt4_add_dbus_adaptor(followupreminderagent_SRCS org.freedesktop.Akonadi.FollowUpReminder.xml followupreminderagent.h FollowUpReminderAgent)
 
-kde4_add_executable(akonadi_followupreminder_agent ${followupreminderagent_SRCS})
+add_executable(akonadi_followupreminder_agent ${followupreminderagent_SRCS})
 
 target_link_libraries(akonadi_followupreminder_agent
   ${KDEPIMLIBS_AKONADI_LIBS}
@@ -51,17 +55,9 @@ target_link_libraries(akonadi_followupreminder_agent
   followupreminder
 )
 
-if (Q_WS_MAC)
-  set_target_properties(akonadi_followupreminder_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template)
-  set_target_properties(akonadi_followupreminder_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.akonadi_followupreminder_agent")
-  set_target_properties(akonadi_followupreminder_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Followup Reminder Agent")
-endif ()
-
 install(TARGETS akonadi_followupreminder_agent ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(FILES followupreminder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
 
-add_subdirectory(tests)
-
 install(FILES akonadi_followupreminder_agent.notifyrc DESTINATION "${DATA_INSTALL_DIR}/akonadi_followupreminder_agent" )
 

kdepim/agents/mailfilteragent/CMakeLists.txt

@@ -24,7 +24,7 @@ qt4_add_dbus_adaptor(akonadi_mailfilter_agent_SRCS org.freedesktop.Akonadi.MailF
 #kde4_add_kcfg_files(akonadi_mailfilter_agent_SRCS settings.kcfgc)
 #kde4_add_ui_files(akonadi_mailfilter_agent_SRCS configdialog.ui)
 
-kde4_add_executable(akonadi_mailfilter_agent ${akonadi_mailfilter_agent_SRCS})
+add_executable(akonadi_mailfilter_agent ${akonadi_mailfilter_agent_SRCS})
 
 if (Q_WS_MAC)
   set_target_properties(akonadi_mailfilter_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template)

kdepim/agents/notesagent/CMakeLists.txt

@@ -23,7 +23,7 @@ qt4_add_dbus_adaptor(notesagent_SRCS org.freedesktop.Akonadi.NotesAgent.xml note
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
-kde4_add_executable(akonadi_notes_agent ${notesagent_SRCS})
+add_executable(akonadi_notes_agent ${notesagent_SRCS})
 
 target_link_libraries(akonadi_notes_agent
   ${KDEPIMLIBS_AKONADI_LIBS}

kdepim/agents/sendlateragent/CMakeLists.txt

@@ -8,7 +8,9 @@ include_directories(
 )
 
 
-add_subdirectory(tests)
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
 
 set(sendlaterlib_SRCS 
     sendlaterinfo.cpp
@@ -21,10 +23,7 @@ kde4_add_kcfg_files(sendlaterlib_SRCS
     settings/sendlateragentsettings.kcfgc 
   )
 
-kde4_add_ui_files(sendlaterlib_SRCS ui/sendlaterwidget.ui)
+add_library( sendlater ${LIBRARY_TYPE} ${sendlaterlib_SRCS} )
-
-
-kde4_add_library( sendlater ${LIBRARY_TYPE} ${sendlaterlib_SRCS} )
 target_link_libraries( sendlater ${KDE4_KDEUI_LIBS} )
 
 set_target_properties( sendlater PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
@@ -48,9 +47,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
 qt4_add_dbus_adaptor(sendlateragent_SRCS org.freedesktop.Akonadi.SendLaterAgent.xml sendlateragent.h SendLaterAgent)
 
-kde4_add_ui_files(sendlateragent_SRCS ui/sendlaterconfigurewidget.ui)
+add_executable(akonadi_sendlater_agent ${sendlateragent_SRCS})
-
-kde4_add_executable(akonadi_sendlater_agent ${sendlateragent_SRCS})
 
 target_link_libraries(akonadi_sendlater_agent
   sendlater
@@ -63,12 +60,6 @@ target_link_libraries(akonadi_sendlater_agent
   pimcommon
 )
 
-if (Q_WS_MAC)
-  set_target_properties(akonadi_sendlater_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template)
-  set_target_properties(akonadi_sendlater_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.sendlater")
-  set_target_properties(akonadi_sendlater_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Send Later")
-endif ()
-
 install(TARGETS akonadi_sendlater_agent ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(FILES sendlateragent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")

kdepim/akonadi_next/CMakeLists.txt

@@ -31,7 +31,7 @@ set(akonadi_next_SRCS
   amazingdelegate.cpp
 )
 
-kde4_add_library(akonadi_next ${LIBRARY_TYPE} ${akonadi_next_SRCS})
+add_library(akonadi_next ${LIBRARY_TYPE} ${akonadi_next_SRCS})
 
 target_link_libraries(akonadi_next
   ${AKONADI_COMMON_LIBRARIES}

kdepim/akonadiconsole/CMakeLists.txt

@@ -77,23 +77,7 @@ qt4_add_dbus_interface(akonadiconsole_bin_SRCS
   storagedebuggerinterface
 )
 
-kde4_add_ui_files(akonadiconsole_bin_SRCS
+add_executable(akonadiconsole_bin ${akonadiconsole_bin_SRCS})
-  agentwidget.ui
-  agentconfigdialog.ui
-  browserwidget_itemview.ui
-  collectionattributespage.ui
-  collectionaclpage.ui
-  dbbrowser.ui
-  dbconsole.ui
-  instanceselector.ui
-  rawsocketconsole.ui
-  browserwidget_contentview.ui
-  collectioninternalspage.ui
-)
-
-kde4_add_app_icon(akonadiconsole_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-akonadiconsole.png")
-
-kde4_add_executable(akonadiconsole_bin ${akonadiconsole_bin_SRCS})
 set_target_properties(akonadiconsole_bin PROPERTIES OUTPUT_NAME akonadiconsole)
 
 target_link_libraries(akonadiconsole_bin

kdepim/blogilo/src/CMakeLists.txt

@@ -59,7 +59,7 @@ kde4_add_ui_files(
 
 kde4_add_kcfg_files( blogilo_SRCS settings.kcfgc)
 kde4_add_app_icon(blogilo_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-blogilo.png")
-kde4_add_executable( blogilo ${blogilo_SRCS})
+add_executable( blogilo ${blogilo_SRCS})
 
 target_link_libraries( blogilo kdepim ${KDE4_KDEUI_LIBS} ${QT_QTSQL_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEWEBKIT_LIBRARY} ${KDEPIMLIBS_KBLOG_LIBS} ${LibKGAPI2_LIBRARY} composereditorng  pimcommon)
 

kdepim/calendarsupport/CMakeLists.txt

@@ -36,21 +36,11 @@ set(calendarsupport_LIB_SRCS
   next/incidenceviewer.cpp
 )
 
-kde4_add_ui_files(calendarsupport_LIB_SRCS
-  printing/calprintdayconfig_base.ui
-  printing/calprintincidenceconfig_base.ui
-  printing/calprintjournalconfig_base.ui
-  printing/calprintmonthconfig_base.ui
-  printing/calprinttodoconfig_base.ui
-  printing/calprintweekconfig_base.ui
-  printing/calprintyearconfig_base.ui
-)
-
 kde4_add_kcfg_files(calendarsupport_LIB_SRCS kcalprefs_base.kcfgc)
 
 # qt4_add_dbus_interface(calendarsupport_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.Akonadi.CalendarSearchAgent.xml calendarsearchinterface)
 
-kde4_add_library(calendarsupport ${LIBRARY_TYPE} ${calendarsupport_LIB_SRCS})
+add_library(calendarsupport ${LIBRARY_TYPE} ${calendarsupport_LIB_SRCS})
 
 target_link_libraries(
   calendarsupport

kdepim/calendarviews/CMakeLists.txt

@@ -87,11 +87,7 @@ set(eventviews_LIB_SRCS
 
 kde4_add_kcfg_files(eventviews_LIB_SRCS prefs_base.kcfgc)
 
-kde4_add_ui_files(eventviews_LIB_SRCS
+add_library(eventviews ${LIBRARY_TYPE} ${eventviews_LIB_SRCS})
-  agenda/timescaleedit_base.ui
-)
-
-kde4_add_library(eventviews ${LIBRARY_TYPE} ${eventviews_LIB_SRCS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 

kdepim/calendarviews/viewerapp/CMakeLists.txt

@@ -17,7 +17,7 @@ kde4_add_ui_files(viewerapp_SRCS
   mainwindow.ui
 )
 
-kde4_add_executable(viewerapp ${viewerapp_SRCS})
+add_executable(viewerapp ${viewerapp_SRCS})
 
 target_link_libraries(viewerapp
   calendarsupport

kdepim/composereditor-ng/CMakeLists.txt

@@ -8,7 +8,6 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
 #add_subdirectory(tests)
 
 add_definitions(-DQT_STATICPLUGIN)
-qt4_wrap_cpp(wk_HEADERS_MOC spellplugin/qwebkitplatformplugin.h)
 
 set(libcomposereditor_ng_SRCS 
     composereditor.cpp
@@ -38,18 +37,13 @@ set(libcomposereditor_ng_SRCS
     spellplugin/kspellplugin.cpp 
     widgets/domtreewidget.cpp 
     widgets/findreplacebar.cpp
-    ${wk_HEADERS_MOC}
 )
 
 kde4_add_kcfg_files(libcomposereditor_ng_SRCS
    globalsettings_base.kcfgc 
 )
 
-
+add_library(composereditorng ${LIBRARY_TYPE} ${libcomposereditor_ng_SRCS})
-kde4_add_ui_files(libcomposereditor_ng_SRCS ui/pagecolorbackgroundwidget.ui )
-
-
-kde4_add_library(composereditorng ${LIBRARY_TYPE} ${libcomposereditor_ng_SRCS})
 
 target_link_libraries(composereditorng 
    ${KDE4_KDEWEBKIT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDE4_KPRINTUTILS_LIBS}

kdepim/console/calendarjanitor/CMakeLists.txt

@@ -22,11 +22,8 @@ include_directories(
   ${QT_INCLUDES}
   ${ZLIB_INCLUDE_DIRS}
 )
-   
 
-kde4_add_app_icon(calendarjanitor_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-calendar.png")
+add_executable(calendarjanitor ${calendarjanitor_SRCS})
-
-kde4_add_executable(calendarjanitor NOGUI ${calendarjanitor_SRCS})
 
 target_link_libraries(calendarjanitor
                       ${KDE4_KDECORE_LIBS}

kdepim/console/kabcclient/src/CMakeLists.txt

@@ -17,21 +17,12 @@ SET(kabcclient_SRCS
     outputformatimpls.cpp)
 
 
-# todo: more appropriate icon?
+add_executable(kabcclient ${kabcclient_SRCS})
-kde4_add_app_icon(kabcclient_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png")
-
-kde4_add_executable(kabcclient NOGUI ${kabcclient_SRCS})
 
 target_link_libraries(kabcclient ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} )
 
 install(TARGETS kabcclient ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-if(NOT WIN32)
 #note: kabcclient acts as kabc2mutt invoked with that name
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kabcclient DESTINATION ${BIN_INSTALL_DIR} RENAME kabc2mutt)
-else()
-kde4_add_executable(kabc2mutt NOGUI ${kabcclient_SRCS})
-target_link_libraries(kabc2mutt ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} )
-install(TARGETS kabc2mutt ${INSTALL_TARGETS_DEFAULT_ARGS})
-endif()
 

kdepim/console/konsolekalendar/CMakeLists.txt

@@ -29,11 +29,8 @@ include_directories(
   ${QT_INCLUDES}
   ${ZLIB_INCLUDE_DIRS}
 )
-   
 
-kde4_add_app_icon(konsolekalendar_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-calendar.png")
+add_executable(konsolekalendar ${konsolekalendar_SRCS})
-
-kde4_add_executable(konsolekalendar NOGUI ${konsolekalendar_SRCS})
 
 target_link_libraries(konsolekalendar
                       ${KDE4_KDECORE_LIBS}

kdepim/examples/akonablog/CMakeLists.txt

@@ -12,7 +12,7 @@ include_directories(
 
 kde4_add_app_icon(akonablog_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/email.png")
 
-kde4_add_executable(akonablog_bin ${akonablog_bin_SRCS})
+add_executable(akonablog_bin ${akonablog_bin_SRCS})
 set_target_properties(akonablog_bin PROPERTIES OUTPUT_NAME akonablog)
 
 target_link_libraries(akonablog_bin ${KDEPIMLIBS_AKONADI_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_MICROBLOG_LIBS})

kdepim/examples/akonalendar/CMakeLists.txt

@@ -7,7 +7,7 @@ set(calendar_bin_SRCS
 )
 
 
-kde4_add_executable(akonalendar_bin ${calendar_bin_SRCS})
+add_executable(akonalendar_bin ${calendar_bin_SRCS})
 set_target_properties(akonalendar_bin PROPERTIES OUTPUT_NAME akonalendar)
 
 target_link_libraries(akonalendar_bin ${KDEPIMLIBS_AKONADI_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} calendarsupport)

kdepim/examples/coisceim/CMakeLists.txt

@@ -32,7 +32,7 @@ set (coisceim_part_SRCS
   coisceimpart.cpp
 )
 
-kde4_add_library(coisceim_widget ${LIBRARY_TYPE} ${coisceim_widget_SRCS})
+add_library(coisceim_widget ${LIBRARY_TYPE} ${coisceim_widget_SRCS})
 
 qt4_generate_dbus_interface(coisceimwidget.h
   org.kde.coisceim.CoisceimWidget.xml
@@ -55,7 +55,7 @@ set_target_properties(coisceim_widget
     PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
-kde4_add_executable(coisceim ${coisceim_SRCS})
+add_executable(coisceim ${coisceim_SRCS})
 
 target_link_libraries(coisceim
   coisceim_widget

kdepim/examples/coisceim/coisceim-mobile/CMakeLists.txt

@@ -11,7 +11,7 @@ set(coisceim_mobile_srcs
   messageviewitem.cpp
 )
 
-kde4_add_executable(coisceim-mobile ${coisceim_mobile_srcs})
+add_executable(coisceim-mobile ${coisceim_mobile_srcs})
 
 target_link_libraries(coisceim-mobile
   ${QT_QTDECLARATIVE_LIBRARIES}

kdepim/examples/etm_usage/CMakeLists.txt

@@ -34,7 +34,7 @@ set(etm_usage_SRCS
   checkable2.cpp
 )
 
-kde4_add_executable(etm_usage ${etm_usage_SRCS})
+add_executable(etm_usage ${etm_usage_SRCS})
 
 target_link_libraries(etm_usage
   ${KDE4_KDEUI_LIBS}

kdepim/examples/kabc/CMakeLists.txt

@@ -10,7 +10,7 @@ set(kabcviewer_bin_SRCS
 # todo: more appropriate icon?
 kde4_add_app_icon(kabcviewer_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png")
 
-kde4_add_executable(kabcviewer_bin ${kabcviewer_bin_SRCS})
+add_executable(kabcviewer_bin ${kabcviewer_bin_SRCS})
 set_target_properties(kabcviewer_bin PROPERTIES OUTPUT_NAME kabcviewer)
 
 target_link_libraries( kabcviewer_bin ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_CONTACT_LIBS} ${KDE4_KDEUI_LIBS} )
@@ -26,7 +26,7 @@ set(kabceditor_bin_SRCS
 # todo: more appropriate icon?
 kde4_add_app_icon(kabceditor_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png")
 
-kde4_add_executable(kabceditor_bin ${kabceditor_bin_SRCS})
+add_executable(kabceditor_bin ${kabceditor_bin_SRCS})
 set_target_properties(kabceditor_bin PROPERTIES OUTPUT_NAME kabceditor)
 
 target_link_libraries( kabceditor_bin ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_CONTACT_LIBS} ${KDE4_KDEUI_LIBS} )

kdepim/examples/mailreader/CMakeLists.txt

@@ -18,7 +18,7 @@ kde4_add_ui_files(mailreader_SRCS mailreaderview.ui prefs_base.ui prefs_messagel
 
 kde4_add_kcfg_files(mailreader_SRCS settings.kcfgc)
 
-kde4_add_executable(akonadimailreader ${mailreader_SRCS})
+add_executable(akonadimailreader ${mailreader_SRCS})
 
 target_link_libraries(akonadimailreader
   ${KDE4_KDEUI_LIBS}

kdepim/grantleeeditor/contactthemeeditor/CMakeLists.txt

@@ -29,7 +29,7 @@ set(contactthemeeditor_SRCS
 )
 
 
-kde4_add_executable(contactthemeeditor ${contactthemeeditor_SRCS} )
+add_executable(contactthemeeditor ${contactthemeeditor_SRCS} )
 TARGET_LINK_LIBRARIES(contactthemeeditor 
                        ${KDEPIMLIBS_KMIME_LIBS} 
                        ${KDE4_KDEUI_LIBS} 

kdepim/grantleeeditor/grantleethemeeditor/CMakeLists.txt

@@ -25,12 +25,7 @@ kde4_add_kcfg_files(libgrantleethemeeditor_SRCS
   settings/globalsettings_base.kcfgc
 )
 
-kde4_add_ui_files(libgrantleethemeeditor_SRCS
+add_library(grantleethemeeditor ${LIBRARY_TYPE} ${libgrantleethemeeditor_SRCS})
-    ui/configurewidget.ui
-)
-
-
-kde4_add_library(grantleethemeeditor ${LIBRARY_TYPE} ${libgrantleethemeeditor_SRCS})
 
 target_link_libraries(grantleethemeeditor  ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} pimcommon
 )

kdepim/grantleeeditor/headerthemeeditor/CMakeLists.txt

@@ -28,7 +28,7 @@ set(headerthemeeditor_SRCS
 )
 
 
-kde4_add_executable(headerthemeeditor ${headerthemeeditor_SRCS} )
+add_executable(headerthemeeditor ${headerthemeeditor_SRCS} )
 TARGET_LINK_LIBRARIES(headerthemeeditor ${KDEPIMLIBS_KMIME_LIBS} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} pimcommon messageviewer grantleethemeeditor)
 
 install(TARGETS headerthemeeditor ${INSTALL_TARGETS_DEFAULT_ARGS})

kdepim/grantleetheme/CMakeLists.txt

@@ -11,12 +11,10 @@ kde4_add_kcfg_files(libgrantleetheme_SRCS
   globalsettings_base.kcfgc
 )
 
-kde4_add_library(grantleetheme ${LIBRARY_TYPE} ${libgrantleetheme_SRCS})
+add_library(grantleetheme ${LIBRARY_TYPE} ${libgrantleetheme_SRCS})
 
 target_link_libraries(grantleetheme  ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KNEWSTUFF3_LIBS}
 )
 
 set_target_properties(grantleetheme PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 install(TARGETS grantleetheme ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-add_subdirectory(kconf_update)

kdepim/grantleetheme/kconf_update/CMakeLists.txt

@@ -1 +0,0 @@
-install( FILES grantleetheme.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})

kdepim/grantleetheme/kconf_update/grantleetheme.upd

@@ -1,4 +0,0 @@
-Id=initial-grantlee-theme-migration
-File=kmail2rc,kmail2rc
-Group=Reader,GrantleeTheme
-Key=grantlee-theme-name,grantlee-theme-name

kdepim/importwizard/CMakeLists.txt

@@ -3,58 +3,58 @@ project(importwizard)
 add_subdirectory(icons)
 
 set(importwizard_SRCS
-abstractbase.cpp
+    abstractbase.cpp
-importwizardkernel.cpp
+    importwizardkernel.cpp
-selectprogrampage.cpp
+    selectprogrampage.cpp
-importaddressbookpage.cpp
+    importaddressbookpage.cpp
-importfilterpage.cpp
+    importfilterpage.cpp
-importmailpage.cpp
+    importmailpage.cpp
-importsettingpage.cpp
+    importsettingpage.cpp
-importwizard.cpp
+    importwizard.cpp
-importfinishpage.cpp
+    importfinishpage.cpp
-main.cpp
+    main.cpp
-abstractimporter.cpp
+    abstractimporter.cpp
-selectcomponentpage.cpp
+    selectcomponentpage.cpp
-importfilterinfogui.cpp
+    importfilterinfogui.cpp
-abstractsettings.cpp
+    abstractsettings.cpp
-abstractaddressbook.cpp
+    abstractaddressbook.cpp
-abstractcalendar.cpp
+    abstractcalendar.cpp
-importcalendarpage.cpp
+    importcalendarpage.cpp
-importwizardutil.cpp
+    importwizardutil.cpp
-thunderbird/thunderbirdimportdata.cpp
+    thunderbird/thunderbirdimportdata.cpp
-thunderbird/thunderbirdsettings.cpp
+    thunderbird/thunderbirdsettings.cpp
-thunderbird/thunderbirdaddressbook.cpp
+    thunderbird/thunderbirdaddressbook.cpp
-thunderbird/addressbook/MorkParser.cpp
+    thunderbird/addressbook/MorkParser.cpp
-sylpheed/sylpheedimportdata.cpp
+    sylpheed/sylpheedimportdata.cpp
-sylpheed/sylpheedsettings.cpp
+    sylpheed/sylpheedsettings.cpp
-sylpheed/sylpheedaddressbook.cpp
+    sylpheed/sylpheedaddressbook.cpp
-sylpheed/sylpheedsettingsutils.cpp
+    sylpheed/sylpheedsettingsutils.cpp
-evolutionv3/evolutionv3importdata.cpp
+    evolutionv3/evolutionv3importdata.cpp
-evolutionv3/evolutionsettings.cpp
+    evolutionv3/evolutionsettings.cpp
-evolutionv3/evolutioncalendar.cpp
+    evolutionv3/evolutioncalendar.cpp
-evolutionv3/evolutionaddressbook.cpp
+    evolutionv3/evolutionaddressbook.cpp
-evolutionv3/evolutionutil.cpp
+    evolutionv3/evolutionutil.cpp
-evolutionv2/evolutionv2importdata.cpp
+    evolutionv2/evolutionv2importdata.cpp
-evolutionv1/evolutionv1importdata.cpp
+    evolutionv1/evolutionv1importdata.cpp
-opera/operaimportdata.cpp
+    opera/operaimportdata.cpp
-opera/operaaddressbook.cpp
+    opera/operaaddressbook.cpp
-opera/operasettings.cpp
+    opera/operasettings.cpp
-oe/oeimportdata.cpp
+    oe/oeimportdata.cpp
-mailapp/mailappimportdata.cpp
+    mailapp/mailappimportdata.cpp
-pmail/pmailimportdata.cpp
+    pmail/pmailimportdata.cpp
-pmail/pmailsettings.cpp
+    pmail/pmailsettings.cpp
-thebat/thebatimportdata.cpp
+    thebat/thebatimportdata.cpp
-balsa/balsaimportdata.cpp
+    balsa/balsaimportdata.cpp
-balsa/balsasettings.cpp
+    balsa/balsasettings.cpp
-balsa/balsaaddressbook.cpp
+    balsa/balsaaddressbook.cpp
-claws-mail/clawsmailimportdata.cpp
+    claws-mail/clawsmailimportdata.cpp
-claws-mail/clawsmailsettings.cpp
+    claws-mail/clawsmailsettings.cpp
-claws-mail/clawsmailaddressbook.cpp
+    claws-mail/clawsmailaddressbook.cpp
-trojita/trojitasettings.cpp
+    trojita/trojitasettings.cpp
-trojita/trojitaimportdata.cpp
+    trojita/trojitaimportdata.cpp
-trojita/trojitaaddressbook.cpp
+    trojita/trojitaaddressbook.cpp
-kmail1/kmail1importdata.cpp
+    kmail1/kmail1importdata.cpp
-kmail1/kmail1settings.cpp
+    kmail1/kmail1settings.cpp
 )
 
 include_directories(${CMAKE_SOURCE_DIR}/mailimporter 
@@ -68,19 +68,7 @@ include_directories(${CMAKE_SOURCE_DIR}/mailimporter
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
-kde4_add_ui_files(importwizard_SRCS 
+add_executable(importwizard ${importwizard_SRCS})
-                  ui/selectprogrampage.ui
-                  ui/importaddressbookpage.ui
-                  ui/importfilterpage.ui
-                  ui/importmailpage.ui
-                  ui/importsettingpage.ui
-                  ui/selectcomponentpage.ui 
-		  ui/importfinishpage.ui 
-		  ui/importcalendarpage.ui)
-
-kde4_add_app_icon(importwizard_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-kontact-import-wizard.png")
-
-kde4_add_executable(importwizard ${importwizard_SRCS})
 
 target_link_libraries(importwizard
   ${KDE4_KIO_LIBS}

kdepim/incidenceeditor-ng/CMakeLists.txt

@@ -74,18 +74,7 @@ set(incidenceeditors_ng_desktop_LIB_SRCS
   visualfreebusywidget.cpp
 )
 
-kde4_add_ui_files(incidenceeditors_ng_desktop_LIB_SRCS
+add_library(incidenceeditorsng ${LIBRARY_TYPE} ${incidenceeditors_ng_desktop_LIB_SRCS})
-  categoryeditdialog_base.ui
-  categoryselectdialog_base.ui
-  categorydialog_base.ui
-  template_management_dialog_base.ui
-  dialogdesktop.ui
-  alarmdialog.ui
-  attachmenteditdialog.ui
-  schedulingdialog.ui
-)
-
-kde4_add_library(incidenceeditorsng ${LIBRARY_TYPE} ${incidenceeditors_ng_desktop_LIB_SRCS})
 
 target_link_libraries(incidenceeditorsng
   akonadi-calendar
@@ -115,20 +104,7 @@ install(TARGETS incidenceeditorsng ${INSTALL_TARGETS_DEFAULT_ARGS})
     ${incidenceeditors_ng_shared_LIB_SRCS}
   )
 
-  kde4_add_ui_files(incidenceeditors_ng_mobile_LIB_SRCS
+  add_library(incidenceeditorsngmobile ${LIBRARY_TYPE} ${incidenceeditors_ng_mobile_LIB_SRCS})
-    categoryeditdialog_base.ui
-    categoryselectdialog_base.ui
-    categorydialog_base.ui
-    editoralarms_base.ui
-    dialogdesktop.ui
-    dialogmobile.ui
-    dialogmoremobile.ui
-    attachmenteditdialog.ui
-    alarmdialog.ui
-    mobileschedulingdialog.ui
-  )
-
-  kde4_add_library(incidenceeditorsngmobile ${LIBRARY_TYPE} ${incidenceeditors_ng_mobile_LIB_SRCS})
 
   target_link_libraries(incidenceeditorsngmobile
     akonadi-calendar
@@ -156,7 +132,7 @@ install(TARGETS incidenceeditorsng ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 set(testincidenceeditor_SRCS main.cpp)
 
-kde4_add_executable(kincidenceeditor ${testincidenceeditor_SRCS})
+add_executable(kincidenceeditor ${testincidenceeditor_SRCS})
 
 target_link_libraries(kincidenceeditor
   akonadi-calendar
@@ -171,4 +147,6 @@ target_link_libraries(kincidenceeditor
 
 install(TARGETS kincidenceeditor ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-add_subdirectory(tests)
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()

kdepim/kaddressbook/CMakeLists.txt

@@ -27,7 +27,11 @@ endif()
 
 add_subdirectory(icons)
 add_subdirectory(printing)
-add_subdirectory(tests)
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+    add_subdirectory(merge/tests)
+    add_subdirectory(sendmail/tests)
+endif()
 if(QGPGME_FOUND)
   add_definitions(-DQGPGME_FOUND)
 endif()
@@ -54,12 +58,6 @@ set(kaddressbook_printing_SRCS
   printing/stylepage.cpp
 )
 
-kde4_add_ui_files(kaddressbook_printing_SRCS
-  printing/ringbinder/rbs_appearance.ui
-  printing/detailled/ds_appearance.ui
-  printing/compact/compactstyle.ui
-)
-
 set(kaddressbook_xxport_SRCS
   xxport/csv/csv_xxport.cpp
   xxport/csv/csvimportdialog.cpp
@@ -115,7 +113,7 @@ set(kaddressbook_LIB_SRCS
 qt4_add_dbus_adaptor( kaddressbook_LIB_SRCS org.kde.kaddressbook.xml mainwidget.h MainWidget)
 
 kde4_add_kcfg_files(kaddressbook_LIB_SRCS settings/settings.kcfgc)
-kde4_add_library(kaddressbookprivate ${LIBRARY_TYPE} ${kaddressbook_LIB_SRCS})
+add_library(kaddressbookprivate ${LIBRARY_TYPE} ${kaddressbook_LIB_SRCS})
 target_link_libraries(kaddressbookprivate
   kdepim
   pimcommon
@@ -131,8 +129,6 @@ target_link_libraries(kaddressbookprivate
   grantleetheme
   kleo
 )
-add_subdirectory(merge/tests)
-add_subdirectory(sendmail/tests)
 
 if(QGPGME_FOUND)
   target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES})
@@ -152,9 +148,7 @@ set(kaddressbook_SRCS
   mainwindow.cpp
 )
 
-kde4_add_app_icon(kaddressbook_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kaddressbook.png")
+add_executable(kaddressbook ${kaddressbook_SRCS})
-
-kde4_add_executable(kaddressbook ${kaddressbook_SRCS})
 
 target_link_libraries(kaddressbook
   ${KDEPIMLIBS_AKONADI_LIBS}

kdepim/kaddressbookgrantlee/CMakeLists.txt

@@ -24,7 +24,7 @@ set(kaddressbook_grantlee_LIB_SRCS
   grantleeutil.cpp
 )
 
-kde4_add_library(kaddressbookgrantlee ${LIBRARY_TYPE} ${kaddressbook_grantlee_LIB_SRCS})
+add_library(kaddressbookgrantlee ${LIBRARY_TYPE} ${kaddressbook_grantlee_LIB_SRCS})
 target_link_libraries(kaddressbookgrantlee
   ${Grantlee_CORE_LIBRARIES}
   grantleetheme

kdepim/kalarm/CMakeLists.txt

@@ -174,10 +174,6 @@ set(kalarm_bin_SRCS ${kalarm_bin_SRCS}
    )
 endif()
 
-kde4_add_ui_files(kalarm_bin_SRCS
-    wakedlg.ui
-)
-
 qt4_add_dbus_adaptor(kalarm_bin_SRCS org.kde.kalarm.kalarm.xml dbushandler.h DBusHandler)
 if (KMAIL_SUPPORTED)
     qt4_add_dbus_interfaces(kalarm_bin_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
@@ -198,11 +194,7 @@ endif()
 kde4_add_kcfg_files(kalarm_bin_SRCS GENERATE_MOC kalarmconfig.kcfgc)
 
 #if (UNIX)
-kde4_add_app_icon(kalarm_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/appicons/ox*-app-kalarm.png")
+add_executable(kalarm_bin ${kalarm_bin_SRCS})
-kde4_add_executable(kalarm_bin ${kalarm_bin_SRCS})
-if(KALARM_USE_AKONADI)
-    add_dependencies(kalarm_bin kalarm_resource_xml kalarmdir_resource_xml)
-endif()
 if (KMAIL_SUPPORTED)
     add_dependencies(kalarm_bin kmail_xml)
 endif ()
@@ -265,8 +257,7 @@ install(PROGRAMS kalarm-version.pl kalarm-1.2.1-general.pl kalarm-1.9.5-defaults
 
 ########### KAuth helper ###############
 
-kde4_add_executable(kalarm_helper rtcwakeaction.cpp)
+add_executable(kalarm_helper rtcwakeaction.cpp)
 target_link_libraries(kalarm_helper ${KDE4_KDECORE_LIBS})
 install(TARGETS kalarm_helper DESTINATION ${LIBEXEC_INSTALL_DIR})
 kde4_install_auth_helper_files(kalarm_helper org.kde.kalarmrtcwake root)
-kde4_install_auth_actions(org.kde.kalarmrtcwake rtcwakeaction.actions)

kdepim/kalarm/autostart/CMakeLists.txt

@@ -6,9 +6,7 @@ set(kalarmautostart_SRCS
 	autostart.cpp 
 )
 
-kde4_add_app_icon(kalarmautostart_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../appicons/ox*-app-kalarm.png")
+add_executable(kalarmautostart ${kalarmautostart_SRCS})
-
-kde4_add_executable(kalarmautostart ${kalarmautostart_SRCS})
 
 target_link_libraries(kalarmautostart ${KDE4_KDEUI_LIBS} )
 

kdepim/kalarm/resources/CMakeLists.txt

@@ -12,7 +12,7 @@ set(kalarm_resources_LIB_SRCS
 )
 
 
-kde4_add_library(kalarm_resources ${LIBRARY_TYPE} ${kalarm_resources_LIB_SRCS})
+add_library(kalarm_resources ${LIBRARY_TYPE} ${kalarm_resources_LIB_SRCS})
 
 target_link_libraries(kalarm_resources
                       ${KDEPIMLIBS_KALARMCAL_LIBS}

kdepim/kdgantt2/CMakeLists.txt

@@ -1,55 +1,30 @@
 # Those paths need to be absolute since this file is included from other CMakeLists.txt files
 set(libkdgantt2_SRCS
-kdganttabstractgrid.cpp
+    kdganttabstractgrid.cpp
-kdganttabstractrowcontroller.cpp
+    kdganttabstractrowcontroller.cpp
-kdganttconstraint.cpp
+    kdganttconstraint.cpp
-kdganttconstraintgraphicsitem.cpp
+    kdganttconstraintgraphicsitem.cpp
-kdganttconstraintmodel.cpp
+    kdganttconstraintmodel.cpp
-kdganttconstraintproxy.cpp
+    kdganttconstraintproxy.cpp
-kdganttdatetimegrid.cpp
+    kdganttdatetimegrid.cpp
-kdganttforwardingproxymodel.cpp
+    kdganttforwardingproxymodel.cpp
-kdganttglobal.cpp
+    kdganttglobal.cpp
-kdganttgraphicsitem.cpp
+    kdganttgraphicsitem.cpp
-kdganttgraphicsscene.cpp
+    kdganttgraphicsscene.cpp
-kdganttgraphicsview.cpp
+    kdganttgraphicsview.cpp
-kdganttitemdelegate.cpp
+    kdganttitemdelegate.cpp
-kdganttlegend.cpp
+    kdganttlegend.cpp
-kdganttlistviewrowcontroller.cpp
+    kdganttlistviewrowcontroller.cpp
-kdganttproxymodel.cpp
+    kdganttproxymodel.cpp
-kdganttstyleoptionganttitem.cpp
+    kdganttstyleoptionganttitem.cpp
-kdganttsummaryhandlingproxymodel.cpp
+    kdganttsummaryhandlingproxymodel.cpp
-kdgantttreeviewrowcontroller.cpp
+    kdgantttreeviewrowcontroller.cpp
-kdganttview.cpp
+    kdganttview.cpp
 )
 
 add_definitions(-DKDAB_NO_UNIT_TESTS -DKDGANTT_SHAREDLIB -DKDGANTT_BUILD_KDGANTT_LIB)
 
-# Generate moc_foo.cpp files since that's what the cpp files include (it works automatically with qmake, this way...)
+add_library(kdgantt2 ${LIBRARY_TYPE} ${libkdgantt2_SRCS})
-# List of source files generated with "grep -l moc_ *.cpp | sed -e 's/\.cpp$//'"
-# Plus kdganttgraphicsview_p
-set(libkdgantt_mocable_files
-  kdganttabstractgrid
-  kdganttconstraintmodel
-  kdganttconstraintproxy
-  kdganttdatetimegrid
-  kdganttforwardingproxymodel
-  kdganttgraphicsscene
-  kdganttgraphicsview
-  kdganttitemdelegate
-  kdganttproxymodel
-  kdganttsummaryhandlingproxymodel
-  kdganttview
-  kdganttlegend
-  kdgantttimescalezoomdialog
-)
-foreach(it ${libkdgantt_mocable_files})
-  qt4_generate_moc(${it}.h ${CMAKE_BINARY_DIR}/kdgantt2/moc_${it}.cpp)
-  macro_add_file_dependencies(${it}.cpp ${CMAKE_BINARY_DIR}/kdgantt2/moc_${it}.cpp)
-endforeach(it)
-
-qt4_generate_moc(kdganttgraphicsview_p.h ${CMAKE_BINARY_DIR}/kdgantt2/moc_kdganttgraphicsview_p.cpp)
-macro_add_file_dependencies(kdganttgraphicsview.cpp ${CMAKE_BINARY_DIR}/kdgantt2/moc_kdganttgraphicsview_p.cpp)
-kde4_add_library(kdgantt2 ${LIBRARY_TYPE} ${libkdgantt2_SRCS})
 target_link_libraries(kdgantt2  ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} )
 
 set_target_properties( kdgantt2 PROPERTIES VERSION 0.1.0 SOVERSION 0)

kdepim/kjots/ANNOUNCE

@@ -1,28 +0,0 @@
-(This file is being kept for historical reasons only.)
-
-kjots (version 0.3.0) - a note taker
-------------------------------------
-
-Hi !
-
-New versions of kjots go directly into the kdeutils distribution.
-This is for version 0.3.0.
-
-What is kjots
--------------
-
-Name and idea for this program are taken from the jots program included
-in the tkgoodstuff package by Mark Crimmins (markcrim@umich.edu).
-
-Kjots helps you to write down some notes and maybe reduces the stack of
-paper lying on your desk.
-
-New in this version
--------------------
-
-- added lots of keyboard shortcuts
-
-
-Regards.
-
-        Chris.

kdepim/kjots/CHANGES

@@ -1,117 +0,0 @@
-4.0 (Jaison Lee <lee.jaison@gmail.com>)
-- Port to KDE4/Qt4
-- Refactored LOTS of code.
-- Use delayed initialization tricks to make startup snappier.
-- (FEATURE: 120025) Save bookshelf order in between program invocations.
-- (FEATURE: 40854) Now available: Bold, Underline, Italic, and Strike-Out
-- (FEATURE: 74677) Multiple entries can be selected in the bookshelf.
-- Detect if there are duplicate IDs to prevent runtime problems.
-- (FEATURE: 74647) Links to other KJots pages can be embedded in an entry.
-- (FEATURE: 66826) Dropped URLs are clickable, and you can make new URLs, too.
-- Refactored find/replace system. KJots now supports every find and replace option
-    generally available, including regular expressions and placeholders. And you
-    can even tell it to recursively search/replace through all the pages.
-    (BUG: 109621) Find doesn't work in bookshelf
-    (FEATURE: 124006) Global search all pages
-- (FEATURE: 59032) You can now change the background color of books in the bookshelf.
-- FEATURE: Added support for fonts.
-- (FEATURE: 75070) Added ability to Export and Import a book.
-- BUG/FEATURE: Added "dontAskAgain" functionality to several dialogs.
-- (FEATURE: 74676) Prompt for title of new pages if the user wishes.
-
-0.6 / 0.7 (Jaison Lee <lee.jaison@gmail.com>)
-- (BUG:105501) Recent changes show up when printing.
-- Autosave works now.
-- Massive code cleanup/restructure.
-- (BUG: 106059) Fix data loss after drag.
-- (BUG: 78403) Display collapsed books correctly.
-- (BUG: 94290) Book renames are now displayed immediately in the book overview.
-- (BUG: 78403) Allow for Unicode.
-- Books are now saved in XML, for easier addition of new features.
-- (BUG: 79960) Save books with unique filename.
-- Bookmarks work better.
-- (FEATURE: 74642) At long last! Books can be nested to any level! Enjoy.
-- (FEATURE: 80719) The cursor position will be remembered while the program is running.
-- (BUG: 109198) Prevent misbehaviour when there is nothing in the QListView.
-- (BUG: 109299) Fix race condition.
-- (BUG: 109303) Act better when no books available.
-- (BUG: 109371) Correct menu behaviour.
-- (BUG: 109372) Disable renaming and moving during invalid page moves.
-- (BUG: 109580) The next/prev book/page functions will no longer loop forever.
-- (BUG: 109583) Fixed a minor regression that was causing the Edit->Cut menu option
-to display incorrectly.
-
-new in version 0.5 (Aaron J. Seigo)
-- redesign of UI
-- use of XMLGUI
-- simplification of internals
-- insertion of date and time
-- printing
-- stability improvements
-- made KUniqueApp
-
-(Carsten Pfeiffer <pfeiffer@kde.org>)
-- use KEdit instead of QMultiLineEdit directly
-  -> gains Search & replace + undo
-- allocate KTMainWindow on the heap to avoid double deletion on quit
-
-new in version 0.4 (Mario Weilguni <mweilguni@kde.org>)
-- works now with Qt 2.0
-- fixed broken layout of main window
-- layout improvements in AskFileName()
-- layout improvements in SubjList()
-- compiles without warnings
-- "Apply" button is only activated when changes were made
-- improved layout of configuration dialog
-- fixed a bug in the font selection
-
-- now compiles with EGCS   ( Robert Williams )
-
-new in version 0.3.0
-- added lots of keyboard shortcuts
-- added klocale->translate()
-
-new in version 0.2.6
-- icons should be visible in the toolbar
-
-new in version 0.2.5
-- you may save books and pages to an ascii file
-- more kde conforming due to the use of KTopLevelWidget
-
-new in version 0.2.4
-- uses kfontdialog to set the font of the editor widget
-- you may select an URL in your text and press the right mouse button
-  to execute a program with this URL. The program to execute is
-  configurable for http and ftp URLs.
-- some code cleanup
-
-new in version 0.2.3
-- compiles with libkde-970510   NOTE: this version is needed !
-- shouldn't segfault, if you delete pages
-- double clicking on an entry in the subjectlist closes the subjectlist window
-- fixed fonds -> fonts ;)
-
-new in version 0.2.2
-- compiles with libkde-0.7.2
-- several bug fixes
-
-new in version 0.2.1
-
-- should compile cleanly with libqt1.2 and libkde-0.7.1 and later
-
-new in version 0.2.0
-
-- changed the layout to be more KDE conforming (toolbar, statusbar,...)
-- folders are now called books and entries are pages
-- added subject to each page
-- you may popup a window with a list of all subjects and use it to find
-  pages more easily
-- further reduced the minimum size of the window
-
-new in version 0.1.1
-
-- does not delete empty lines anymore
-- you may insert TABs into your text
-- the minimum size of the window is smaller now
-- the size of the window is saved and read the next
-  time kjots is started

kdepim/kjots/CMakeLists.txt

@@ -29,9 +29,6 @@ set(kjots_config_SRCS kjotsconfigdlg.cpp)
 
 kde4_add_kcfg_files(kjots_config_SRCS KJotsSettings.kcfgc )
 
-kde4_add_ui_files(kjots_config_SRCS confpagemisc.ui)
-
-
 set (kjots_common_SRCS
      aboutdata.cpp
      kjotslockjob.cpp
@@ -67,9 +64,8 @@ set(kjots_SRCS
    KJotsMain.cpp
    ${kjots_common_SRCS}
 )
-kde4_add_app_icon(kjots_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kjots.png")
 
-kde4_add_executable(kjots ${kjots_SRCS})
+add_executable(kjots ${kjots_SRCS})
 
 target_link_libraries(kjots
   ${kjotsLibs}

kdepim/kjots/plasmoid/CMakeLists.txt

@@ -12,8 +12,6 @@ set(akonotes_noteslist_plasmoid_SRCS
     plasmatreeview.cpp
 )
 
-kde4_add_ui_files(akonotes_noteslist_plasmoid_SRCS akonotes_applet.ui )
-
 kde4_add_plugin(plasma_applet_akonotes_note ${akonotes_note_plasmoid_SRCS})
 kde4_add_plugin(plasma_applet_akonotes_list ${akonotes_noteslist_plasmoid_SRCS})
 

kdepim/kleopatra/CMakeLists.txt

@@ -70,14 +70,8 @@ endif()
 
 add_subdirectory(kgpgconf)
 add_subdirectory(kwatchgnupg)
-add_subdirectory(tests)
+if(ENABLE_TESTING)
-
+    add_subdirectory(tests)
-if(WIN32)
-  set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_win.cpp)
-  set(_kleopatra_extra_SRCS utils/gnupg-registry.c selftest/registrycheck.cpp)
-else()
-  set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_unix.cpp)
-  set(_kleopatra_extra_SRCS)
 endif()
 
 if(USABLE_ASSUAN_FOUND)
@@ -85,7 +79,7 @@ if(USABLE_ASSUAN_FOUND)
   set(_kleopatra_uiserver_SRCS
     uiserver/sessiondata.cpp
     uiserver/uiserver.cpp
-    ${_kleopatra_extra_uiserver_SRCS}
+    uiserver/uiserver_unix.cpp
     uiserver/assuanserverconnection.cpp
     uiserver/echocommand.cpp
     uiserver/decryptverifycommandemailbase.cpp
@@ -103,15 +97,6 @@ if(USABLE_ASSUAN_FOUND)
     libkleopatraclient/core/command.cpp
     selftest/uiservercheck.cpp
   )
-  set_source_files_properties(libkleopatraclient/core/command.cpp PROPERTIES SKIP_AUTOMOC TRUE)
-
-  qt4_generate_moc(libkleopatraclient/core/command_p.h "${CMAKE_CURRENT_BINARY_DIR}/libkleopatraclient/core/moc_command_p.cpp")
-  qt4_generate_moc(libkleopatraclient/core/command.h "${CMAKE_CURRENT_BINARY_DIR}/libkleopatraclient/core/moc_command.cpp")
-
-  list(APPEND _kleopatra_uiserver_SRCS
-    "${CMAKE_CURRENT_BINARY_DIR}/libkleopatraclient/core/moc_command_p.cpp"
-    "${CMAKE_CURRENT_BINARY_DIR}/libkleopatraclient/core/moc_command.cpp"
-  )
 
   if(ASSUAN2_FOUND)
     set(_kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES})
@@ -133,8 +118,6 @@ else()
   set(_kleopatra_uiserver_SRCS)
 endif()
 
-kde4_add_ui_files(_kleopatra_uiserver_SRCS crypto/gui/signingcertificateselectionwidget.ui)
-
 set(_kleopatra_SRCS
   utils/gnupg-helper.cpp
   utils/filesystemwatcher.cpp
@@ -171,8 +154,6 @@ set(_kleopatra_SRCS
   selftest/gpgagentcheck.cpp
   selftest/libkleopatrarccheck.cpp
 
-  ${_kleopatra_extra_SRCS}
-
   models/keycache.cpp
   models/keylistmodel.cpp
   models/keylistsortfilterproxymodel.cpp
@@ -307,26 +288,6 @@ if(KLEO_MODEL_TEST)
   set(_kleopatra_SRCS ${_kleopatra_SRCS} models/modeltest.cpp)
 endif()
 
-kde4_add_ui_files(_kleopatra_SRCS
-  dialogs/certificationoptionswidget.ui
-  dialogs/expirydialog.ui
-  dialogs/lookupcertificatesdialog.ui
-  dialogs/ownertrustdialog.ui
-  dialogs/selectchecklevelwidget.ui
-  dialogs/selftestdialog.ui
-  dialogs/exportsecretkeydialog.ui
-  dialogs/adduseriddialog.ui
-  dialogs/certificatedetailsdialog.ui
-  dialogs/setinitialpindialog.ui
-  newcertificatewizard/listwidget.ui
-  newcertificatewizard/chooseprotocolpage.ui
-  newcertificatewizard/enterdetailspage.ui
-  newcertificatewizard/overviewpage.ui
-  newcertificatewizard/keycreationpage.ui
-  newcertificatewizard/resultpage.ui
-  newcertificatewizard/advancedsettingsdialog.ui
-)
-
 kde4_add_kcfg_files(_kleopatra_SRCS
   kcfg/tooltippreferences.kcfgc
   kcfg/emailoperationspreferences.kcfgc
@@ -358,9 +319,7 @@ endif()
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5151)
 
-kde4_add_app_icon(_kleopatra_mainwindow_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-kleopatra.png")
+add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS})
-
-kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS})
 set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra)
 
 target_link_libraries(kleopatra_bin
@@ -374,10 +333,6 @@ target_link_libraries(kleopatra_bin
   ${_kleopatra_libkdepim_LIBS}
 )
 
-if(KDEPIM_MOBILE_UI)
-  target_link_libraries(kleopatra_bin ${QT_QTDECLARATIVE_LIBRARY})
-endif()
-
 if(USABLE_ASSUAN_FOUND)
   target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY})
 endif()

kdepim/kleopatra/conf/CMakeLists.txt

@@ -16,11 +16,6 @@ if(BUILD_libkleopatraclient)
     cryptooperationsconfigpage.cpp
   )
 
-  kde4_add_ui_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS
-    smimevalidationconfigurationwidget.ui
-    cryptooperationsconfigwidget.ui
-  )
-
   kde4_add_kcfg_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS
     ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/smimevalidationpreferences.kcfgc
   )
@@ -51,11 +46,6 @@ set(kcm_kleopatra_PART_SRCS
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5152)
 
-kde4_add_ui_files(kcm_kleopatra_PART_SRCS
-  appearanceconfigwidget.ui
-  smimevalidationconfigurationwidget.ui
-)
-
 kde4_add_kcfg_files(kcm_kleopatra_PART_SRCS
   ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/tooltippreferences.kcfgc
   ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/emailoperationspreferences.kcfgc

kdepim/kleopatra/kgpgconf/CMakeLists.txt

@@ -14,12 +14,7 @@ set(_kgpgconf_SRCS
   mainwindow.cpp
 )
 
-kde4_add_ui_files(_kgpgconf_SRCS mainwidget.ui)
+add_executable(kgpgconf ${_kgpgconf_SRCS})
-
-# todo: more appropriate icon?
-kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png")
-
-kde4_add_executable(kgpgconf ${_kgpgconf_SRCS})
 
 target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS})
 

kdepim/kleopatra/kwatchgnupg/CMakeLists.txt

@@ -9,13 +9,9 @@ set(kwatchgnupg_SRCS
   main.cpp
 )
 
-if(WIN32)
-  set(kwatchgnupg_SRCS ${kwatchgnupg_SRCS} ../utils/gnupg-registry.c)
-endif()
-
 include_directories(..)
 
-kde4_add_executable(kwatchgnupg ${kwatchgnupg_SRCS})
+add_executable(kwatchgnupg ${kwatchgnupg_SRCS})
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5153)
 

kdepim/kleopatra/libkleopatraclient/CMakeLists.txt

@@ -4,5 +4,7 @@ set(libkleopatraclient_soversion "0")
 add_subdirectory(core)
 add_subdirectory(gui)
 
-add_subdirectory(tests)
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
 

kdepim/kleopatra/libkleopatraclient/core/CMakeLists.txt

@@ -9,24 +9,12 @@ add_definitions(
   -DQT_NO_CAST_FROM_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_TO_ASCII
 )
 
-if(WIN32)
+add_library(kleopatraclientcore ${LIBRARY_TYPE}
-  set(_kleopatraclientcore_extra_SRCS ../../utils/gnupg-registry.c)
-else()
-  set(_kleopatraclientcore_extra_SRCS)
-endif()
-
-set_source_files_properties(command.cpp PROPERTIES SKIP_AUTOMOC TRUE)
-qt4_generate_moc(command_p.h "${CMAKE_CURRENT_BINARY_DIR}/moc_command_p.cpp")
-qt4_generate_moc(command.h "${CMAKE_CURRENT_BINARY_DIR}/moc_command.cpp")
-kde4_add_library(kleopatraclientcore ${LIBRARY_TYPE}
-  ${_kleopatraclientcore_extra_SRCS}
   initialization.cpp
   command.cpp
   selectcertificatecommand.cpp
   signencryptfilescommand.cpp
   decryptverifyfilescommand.cpp
-  "${CMAKE_CURRENT_BINARY_DIR}/moc_command_p.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/moc_command.cpp"
 )
 
 set_target_properties(kleopatraclientcore PROPERTIES
@@ -34,32 +22,16 @@ set_target_properties(kleopatraclientcore PROPERTIES
   SOVERSION ${libkleopatraclient_soversion}
 )
 
-if(WIN32)
+if(ASSUAN2_FOUND)
-  if(ASSUAN2_FOUND)
+target_link_libraries(kleopatraclientcore
-    target_link_libraries(kleopatraclientcore
+    ${QT_QTCORE_LIBRARY}
-      ${QT_QTCORE_LIBRARY}
+    ${ASSUAN2_LIBRARIES}
-      ${ASSUAN2_LIBRARIES}
+)
-      ws2_32
-    )
-  else()
-    target_link_libraries(kleopatraclientcore
-      ${QT_QTCORE_LIBRARY}
-      ${ASSUAN_VANILLA_LIBRARIES}
-      ws2_32
-    )
-  endif()
 else()
-  if(ASSUAN2_FOUND)
+target_link_libraries(kleopatraclientcore
-    target_link_libraries(kleopatraclientcore
+    ${QT_QTCORE_LIBRARY}
-      ${QT_QTCORE_LIBRARY}
+    ${ASSUAN_PTHREAD_LIBRARIES}
-      ${ASSUAN2_LIBRARIES}
+)
-    )
-  else()
-    target_link_libraries(kleopatraclientcore
-      ${QT_QTCORE_LIBRARY}
-      ${ASSUAN_PTHREAD_LIBRARIES}
-    )
-  endif()
 endif()
 
 install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS})

kdepim/kleopatra/libkleopatraclient/gui/CMakeLists.txt

@@ -2,7 +2,7 @@ include_directories(${CMAKE_SOURCE_DIR}/kleopatra)
 
 add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_TO_ASCII)
 
-kde4_add_library(kleopatraclientgui ${LIBRARY_TYPE} certificaterequester.cpp)
+add_library(kleopatraclientgui ${LIBRARY_TYPE} certificaterequester.cpp)
 
 target_link_libraries(kleopatraclientgui
   ${QT_QTGUI_LIBRARY}

kdepim/kleopatra/selftest/registrycheck.cpp

@@ -1,120 +0,0 @@
-/* -*- mode: c++; c-basic-offset:4 -*-
-    selftest/registrycheck.cpp
-
-    This file is part of Kleopatra, the KDE keymanager
-    Copyright (c) 2008 Klarälvdalens Datakonsult AB
-
-    Kleopatra is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    Kleopatra is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    In addition, as a special exception, the copyright holders give
-    permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
-    combinations including the two.  You must obey the GNU General
-    Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
-    your version of the file, but you are not obligated to do so.  If
-    you do not wish to do so, delete this exception statement from
-    your version.
-*/
-
-#include <config-kleopatra.h>
-
-#include "registrycheck.h"
-
-#include "implementation_p.h"
-
-#include <KLocalizedString>
-#include <KMessageBox>
-
-#include <QSettings>
-
-#include <boost/shared_ptr.hpp>
-
-#include <cassert>
-
-using namespace Kleo;
-using namespace Kleo::_detail;
-using namespace boost;
-
-static QString gnupg_path = QLatin1String("HKEY_LOCAL_MACHINE\\Software\\GNU\\GnuPG");
-static QString gnupg_key = QLatin1String("gpgProgram");
-
-namespace {
-
-    class RegistryCheck : public SelfTestImplementation {
-    public:
-        explicit RegistryCheck()
-            : SelfTestImplementation( i18nc("@title", "Windows Registry") )
-        {
-            runTest();
-        }
-
-        void runTest() {
-
-            m_passed = !QSettings( gnupg_path, QSettings::NativeFormat ).contains( gnupg_key );
-
-            if ( m_passed )
-                return;
-
-            m_error = i18n("Obsolete registry entries found");
-
-            m_explaination
-                = i18nc( "@info",
-                         "<para>Kleopatra detected an obsolete registry key (<resource>%1\\%2</resource>), "
-                         "added by either a previous <application>Gpg4win</application> version or "
-                         "applications such as <application>WinPT</application> or <application>EnigMail</application>.</para>"
-                         "<para>Keeping the entry might lead to an old GnuPG backend being used.</para>",
-                         gnupg_path, gnupg_key );
-            m_proposedFix = i18nc( "@info",
-                                   "<para>Delete registry key <resource>%1\\%2</resource>.</para>",
-                                   gnupg_path, gnupg_key );
-
-        }
-
-        /* reimp */ bool canFixAutomatically() const { return true; }
-
-        /* reimp */ bool fix() {
-
-            QSettings settings( gnupg_path, QSettings::NativeFormat );
-            if ( !settings.contains( gnupg_key ) )
-                return true;
-
-            settings.remove( gnupg_key );
-            settings.sync();
-
-            if ( settings.status() != QSettings::NoError ) {
-                KMessageBox::error(
-                    0,
-                    i18nc("@info",
-                          "Could not delete the registry key <resource>%1\\%2</resource>",
-                          gnupg_path, gnupg_key ),
-                    i18nc("@title", "Error Deleting Registry Key") );
-                return false;
-            }
-
-            m_passed = true;
-            m_error.clear();
-            m_explaination.clear();
-            m_proposedFix.clear();
-            return true;
-        }
-
-    };
-}
-
-shared_ptr<SelfTest> Kleo::makeGpgProgramRegistryCheckSelfTest() {
-    return shared_ptr<SelfTest>( new RegistryCheck );
-}

kdepim/kleopatra/uiserver/uiserver_win.cpp

@@ -1,91 +0,0 @@
-/* -*- mode: c++; c-basic-offset:4 -*-
-    uiserver/uiserver_win.cpp
-
-    This file is part of Kleopatra, the KDE keymanager
-    Copyright (c) 2007 Klarälvdalens Datakonsult AB
-
-    Kleopatra is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    Kleopatra is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    In addition, as a special exception, the copyright holders give
-    permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
-    combinations including the two.  You must obey the GNU General
-    Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
-    your version of the file, but you are not obligated to do so.  If
-    you do not wish to do so, delete this exception statement from
-    your version.
-*/
-
-#include <config-kleopatra.h>
-
-#include "uiserver_p.h"
-
-#include "utils/gnupg-helper.h"
-
-#include <KLocalizedString>
-
-#include <qendian.h>
-
-#include <stdexcept>
-#include <cassert>
-
-#include <windows.h>
-#include <io.h>
-#include <winsock2.h>
-
-#include <cstring>
-#include <cstdlib>
-
-using namespace Kleo;
-using namespace boost;
-
-
-QString UiServer::Private::systemErrorString() {
-    return QString::fromLocal8Bit( strerror(errno) );
-}
-
-void UiServer::Private::doMakeListeningSocket( const QByteArray & encodedFileName ) {
-    // Create a Unix Domain Socket:
-    const assuan_fd_t sock = assuan_sock_new( AF_UNIX, SOCK_STREAM, 0 );
-    if ( sock == ASSUAN_INVALID_FD )
-        throw_<std::runtime_error>( i18n( "Could not create socket: %1", systemErrorString() ) );
-
-    try {
-        // Bind
-        struct sockaddr_un sa;
-        std::memset( &sa, 0, sizeof(sa) );
-        sa.sun_family = AF_UNIX;
-        std::strncpy( sa.sun_path, encodedFileName.constData(), sizeof( sa.sun_path ) - 1 );
-        if ( assuan_sock_bind( sock, (struct sockaddr*)&sa, sizeof( sa ) ) )
-            throw_<std::runtime_error>( i18n( "Could not bind to socket: %1", systemErrorString() ) );
-
-        if ( assuan_sock_get_nonce( (struct sockaddr*)&sa, sizeof( sa ), &nonce ) )
-            throw_<std::runtime_error>( i18n("Could not get socket nonce: %1", systemErrorString() ) );
-
-        // Listen
-        if ( ::listen( (SOCKET)sock, SOMAXCONN ) )
-            throw_<std::runtime_error>( i18n( "Could not listen to socket: %1", systemErrorString() ) );
-
-        if ( !setSocketDescriptor( (intptr_t)sock  ) )
-            throw_<std::runtime_error>( i18n( "Could not pass socket to Qt: %1. This should not happen, please report this bug.", errorString() ) );
-
-    } catch ( ... ) {
-        assuan_sock_close( sock );
-        throw;
-    }
-}
-

kdepim/kmail/CMakeLists.txt

@@ -52,8 +52,9 @@ if (KDEPIM_BUILD_DESKTOP)
   add_subdirectory(pics)
   add_subdirectory(icons)
   add_subdirectory(avscripts)
-  add_subdirectory(tests)
+  if(ENABLE_TESTING)
-  add_subdirectory(kconf_update)
+    add_subdirectory(tests)
+  endif()
 endif()
 add_subdirectory(kcm_kpimidentities)
 
@@ -230,19 +231,6 @@ if (KDEPIM_BUILD_DESKTOP)
     ${CMAKE_SOURCE_DIR}/kmail/dbusinterface/org.freedesktop.Akonadi.NewMailNotifier.xml
   )
 
-
-  kde4_add_ui_files(kmailprivate_LIB_SRCS
-    ui/composercryptoconfiguration.ui
-    ui/warningconfiguration.ui
-    ui/smimeconfiguration.ui
-    ui/miscpagemaintab.ui
-    ui/securitypagegeneraltab.ui
-    ui/securitypagemdntab.ui
-    ui/identitypage.ui
-    ui/accountspagereceivingtab.ui
-    ui/searchwindow.ui
-  )
-
   # KCFG files. The main kmail.kcfg is configured by CMake and put
   # in the build directory.
 
@@ -260,7 +248,7 @@ if (KDEPIM_BUILD_DESKTOP)
   )
 
 
-  kde4_add_library(kmailprivate ${LIBRARY_TYPE} ${kmailprivate_LIB_SRCS})
+  add_library(kmailprivate ${LIBRARY_TYPE} ${kmailprivate_LIB_SRCS})
 
   target_link_libraries(kmailprivate
     ${KDEPIMLIBS_KMBOX_LIBS}
@@ -334,8 +322,7 @@ if (KDEPIM_BUILD_DESKTOP)
   ########### KMail executable ###############
 
   set(kmail_SRCS main.cpp)
-  kde4_add_app_icon(kmail_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kmail.png")
+  add_executable(kmail ${kmail_SRCS})
-  kde4_add_executable(kmail ${kmail_SRCS})
   target_link_libraries(kmail
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KDECORE_LIBS}
@@ -346,8 +333,10 @@ if (KDEPIM_BUILD_DESKTOP)
   )
 
 
-  add_subdirectory(mailmerge/tests/)
+  if(ENABLE_TESTING)
-  add_subdirectory(folderarchive/autotests/)
+    add_subdirectory(mailmerge/tests)
+    add_subdirectory(folderarchive/autotests)
+  endif()
   ########### install files ###############
 
   install(TARGETS kmailprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)

kdepim/kmail/kcm_kpimidentities/CMakeLists.txt

@@ -14,7 +14,6 @@ set(kcm_identities_srcs
   ../identity/xfaceconfigurator.cpp
 )
 
-kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui)
 kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs})
 target_link_libraries(kcm_kpimidentities
   ${KDEPIMLIBS_GPGMEPP_LIBS}

kdepim/kmail/kconf_update/CMakeLists.txt

@@ -1,24 +0,0 @@
-install( FILES kmail.upd  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
-install(PROGRAMS 
-  upgrade-transport.pl
-  kmail-pgpidentity.pl
-  upgrade-signature.pl
-  kmail-upd-identities.pl
-  kmail-3.1-use-UOID-for-identities.pl
-  kmail-3.1-update-new-mail-notification-settings.pl
-  kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-  kmail-3.2-update-loop-on-goto-unread-settings.sh
-  kmail-3.2-misc.sh
-  kmail-3.3-use-ID-for-accounts.pl
-  kmail-3.3-move-identities.pl
-  kmail-3.3-aegypten.pl
-  kmail-3.3-split-sign-encr-keys.sh
-  kmail-3.3-misc.pl
-  kmail-3.3b1-misc.pl
-  kmail-3.4-misc.pl
-  kmail-3.4.1-update-status-filters.pl
-  kmail-3.5-trigger-flag-migration.pl
-  kmail-4.0-misc.pl 
-DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
-
-

kdepim/kmail/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl

@@ -1,38 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-my $presentation = -1;
-my $commandline = "";
-while ( <> ) {
-  chomp;
-  if ( /^msgbox-on-mail/ ) {
-    my ($key,$value) = split /=/;
-    if( -1 == $presentation ) {
-      $presentation = 0;
-    }
-    $presentation += 2*( $value eq "true" );
-  }
-  elsif ( /^exec-on-mail-cmd/ ) {
-    my ($key,$value) = split /=/;
-    $commandline = $value;
-  }
-  elsif ( /^exec-on-mail/ ) {
-    my ($key,$value) = split /=/;
-    if( -1 == $presentation ) {
-      $presentation = 0;
-    }
-    $presentation += 32*( $value eq "true" );
-  }
-}
-
-if ( "" ne $commandline ) {
-  print "commandline=$commandline\n";
-}
-if ( -1 != $presentation ) {
-  print "presentation=$presentation\n";
-}
-
-print "# DELETE msgbox-on-mail\n";
-print "# DELETE exec-on-mail\n";
-print "# DELETE exec-on-mail-cmd\n";

kdepim/kmail/kconf_update/kmail-3.1-use-UOID-for-identities.pl

@@ -1,93 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# this script goes through all the config keys that deal with
-# identities and replaces identities referenced by name to be referenced
-# by UOIDs. To this end, adds uoid keys to the identity groups.
-
-# read the whole config file:
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-    chomp;
-    next if ( /^$/ ); # skip empty lines
-    next if ( /^\#/ ); # skip comments
-    if ( /^\[/ ) { # group begin
-	$currentGroup = $_;
-	next;
-    } elsif ( $currentGroup =~ /^\[Identity/ and /^uoid/ ) {
-	# We need to prevent this script from running twice, since it
-        # would change UOIDs of identities then.
-        # Presence of a uoid key in an [Identity #n] section is the
-	# best indicator:
-	exit;
-    } elsif ( $currentGroup ne "" ) { # normal entry
-	my ($key,$value) = split /=/;
-	$configFile{$currentGroup}{$key}=$value;
-    }
-}
-
-# filter out identity groups:
-my @identityGroups = grep { /^\[Identity \#\d+\]/ } keys %configFile;
-
-# create UOIDs for each identity:
-my %nameToUOID;
-foreach my $identityGroup (@identityGroups) {
-    my $uoid = int(rand 0x7fFFffFF);
-    my $name = $configFile{$identityGroup}{'Identity'};
-    $nameToUOID{$name} = $uoid;
-    # create the uoid entries of [Identity #n] groups:
-    print "${identityGroup}\nuoid=$uoid\n";
-}
-
-# change the default identity value:
-print "# DELETE [General]Default Identity\n[General]\nDefault Identity="
-    . $nameToUOID{$configFile{'[General]'}{'Default Identity'}} . "\n";
-
-# [Composer]previous-identity
-print "# DELETE [Composer]previous-identity\n[Composer]\nprevious-identity="
-    . $nameToUOID{$configFile{'[Composer]'}{'previous-identity'}} . "\n";
-
-# Now, go through all [Folder-*] groups and replace the Identity value
-# with the UOID. Also, move MailingListIdentity entries to Identity entries:
-my @folderGroups = grep { /^\[Folder-.*\]/ } keys %configFile;
-
-foreach my $folderGroup ( @folderGroups ) {
-    my $identity = "";
-    # delete the (MailingList)Identity keys:
-    print "# DELETE ${folderGroup}MailingListIdentity\n";
-    print "# DELETE ${folderGroup}Identity\n";
-    # extract the identity name:
-    if ( exists ($configFile{$folderGroup}{'Identity'}) ) {
-	$identity = $configFile{$folderGroup}{'Identity'};
-    }
-    if ( $identity eq ""
-	 and exists($configFile{$folderGroup}{'MailingListIdentity'}) ) {
-	$identity = $configFile{$folderGroup}{'MailingListIdentity'};
-    }
-    # write the new Identity=<uoid> key if we have an UOID for the identity:
-    if ( exists( $nameToUOID{$identity} ) ) {
-	print "$folderGroup\nIdentity=" . $nameToUOID{$identity} . "\n";
-    }
-}
-
-# Now, go through all [Filter #n] groups and change arguments to the
-# 'set identity' filter action to use UOIDs:
-
-my @filterGroups = grep { /^\[Filter \#\d+\]/ } keys %configFile;
-
-foreach my $filterGroup (@filterGroups) {
-    my $numActions = +$configFile{$filterGroup}{'actions'};
-    # go through all actions in search for "set identity":
-    for ( my $i = 0 ; $i < $numActions ; ++$i ) {
-	my $actionName = "action-name-$i";
-	my $actionArgs = "action-args-$i";
-	if ( $configFile{$filterGroup}{$actionName} eq "set identity" ) {
-	    # found one: replace it's argument with the UOID:
-	    print "# DELETE $filterGroup$actionArgs\n$filterGroup\n$actionArgs="
-		. $nameToUOID{$configFile{$filterGroup}{$actionArgs}} . "\n";
-	}
-    }
-}
-

kdepim/kmail/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl

@@ -1,88 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# this script goes through all the config keys that deal with
-# identities and replaces UOID 0 (which was erroneously always assigned to the
-# first identity) with a non-zero UOID.
-
-# read the whole config file
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-    chomp;
-    next if ( /^$/ ); # skip empty lines
-    next if ( /^\#/ ); # skip comments
-    if ( /^\[/ ) { # group begin
-	$currentGroup = $_;
-	next;
-    } elsif ( $currentGroup ne "" ) { # normal entry
-	my ($key,$value) = split /=/;
-	$configFile{$currentGroup}{$key}=$value;
-    }
-}
-
-# filter out identity groups
-my @identityGroups = grep { /^\[Identity \#\d+\]/ } keys %configFile;
-
-# create new UOID for an identity with UOID 0
-my $newUoid = 0;
-foreach my $identityGroup (@identityGroups) {
-    my $oldUoid = $configFile{$identityGroup}{'uoid'};
-    if ( $oldUoid eq "0" ) {
-        $newUoid = int(rand 0x7fFFffFE) + 1;
-        # change the uoid entry this identity
-        print "# DELETE ${identityGroup}uoid\n";
-        print "${identityGroup}\nuoid=$newUoid\n";
-    }
-}
-
-if ( $newUoid != 0 ) {
-    # change the default identity value if it was 0
-    my $tempId = $configFile{'[General]'}{'Default Identity'};
-    if ( $tempId eq "0" ) {
-        print "# DELETE [General]Default Identity\n";
-        print "[General]\nDefault Identity=$newUoid\n";
-    }
-
-    # [Composer]previous-identity
-    $tempId = $configFile{'[Composer]'}{'previous-identity'};
-    if ( $tempId eq "0" ) {
-        print "# DELETE [Composer]previous-identity\n";
-        print "[Composer]\nprevious-identity=$newUoid\n";
-    }
-
-    # Now, go through all [Folder-*] groups and replace all occurrences of
-    # Identity=0 with Identity=$newUoid
-    my @folderGroups = grep { /^\[Folder-.*\]/ } keys %configFile;
-
-    foreach my $folderGroup ( @folderGroups ) {
-        $tempId = $configFile{$folderGroup}{'Identity'};
-        if ( $tempId eq "0" ) {
-            print "# DELETE ${folderGroup}Identity\n";
-            print "$folderGroup\nIdentity=$newUoid\n";
-        }
-    }
-
-    # Now, go through all [Filter #n] groups and replace all occurrences of
-    # UOID 0 as argument to the 'set identity' filter action with the new UOID
-    my @filterGroups = grep { /^\[Filter \#\d+\]/ } keys %configFile;
-
-    foreach my $filterGroup (@filterGroups) {
-        my $numActions = +$configFile{$filterGroup}{'actions'};
-        # go through all actions in search for "set identity":
-        for ( my $i = 0 ; $i < $numActions ; ++$i ) {
-	    my $actionName = "action-name-$i";
-            my $actionArgs = "action-args-$i";
-            if ( $configFile{$filterGroup}{$actionName} eq "set identity" ) {
-                # found one:
-                # replace it's argument with the new UOID if necessary
-                $tempId = $configFile{$filterGroup}{$actionArgs};;
-                if ( $tempId eq "0" ) {
-                    print "# DELETE $filterGroup$actionArgs\n";
-                    print "$filterGroup\n$actionArgs=$newUoid\n";
-                }
-            }
-        }
-    }
-}

kdepim/kmail/kconf_update/kmail-3.2-misc.sh

@@ -1,78 +0,0 @@
-#! /usr/bin/env bash
-
-function delete_this_key() {
-    echo "# DELETE [$GROUP]$KEY"
-}
-
-while read; do
-    if [ "${REPLY#\[}" != "$REPLY" ] ; then # group name
-	GROUP="${REPLY:1:${#REPLY}-2}"
-	continue;
-    fi
-    # normal key=value pair:
-    KEY="${REPLY%%=*}"
-    VALUE="${REPLY#*=}"
-
-    case "$GROUP/$KEY" in
-	Geometry/MimePaneHeight)
-	    case "$VALUE" in
-		[0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9]) ;;
-		*) VALUE=100 ;;
-	    esac
-	    GeometryMimePaneHeight="$VALUE"
-	    ;;
-	Geometry/MessagePaneHeight)
-	    delete_this_key;
-	    case "$VALUE" in
-		[0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9]) ;;
-		*) VALUE=180 ;;
-	    esac
-	    GeometryMessagePaneHeight="$VALUE"
-	    ;;
-	Geometry/FolderPaneHeight)
-	    #
-	    # keys to delete
-	    #
-	    delete_this_key
-	    ;;
-	Geometry/windowLayout)
-	    #
-	    # break [Geometry]windowLayout={0,1,2,3,4} into
-	    # [Geometry]FolderList={long,short} and
-      	    # [Reader]MimeTreeLocation={top,bottom}
-       	    #
-	    delete_this_key
-	    case "$VALUE" in
-		[0-4]) ;;
-		*) VALUE=1 ;;
-	    esac
-	    location=("top" "bottom" "bottom" "top" "top")
-	    folder=("long" "long" "long" "short" "short")
-	    echo "[Reader]"
-	    echo "MimeTreeLocation=${location[$VALUE]}"
-	    echo "[Geometry]"
-	    echo "FolderList=${folder[$VALUE]}"
-	    continue;
-	    ;;
-	Geometry/showMIME)
-	    #
-	    # Rename [Geometry]showMime={0,1,2} into
-	    # [Reader]MimeTreeMode={never,smart,always}
-	    #
-	    delete_this_key
-	    case "$VALUE" in
-		[0-2]) ;;
-		*) VALUE=1 ;;
-	    esac
-	    substitution=("never" "smart" "always")
-	    echo "[Reader]"
-	    echo "MimeTreeMode=${substitution[$VALUE]}"
-	    continue;
-	    ;;
-    esac
-done
-
-if [ "$GeometryMimePaneHeight" ] && [ "$GeometryMessagePaneHeight" ]; then
-    echo "[Geometry]"
-    echo "ReaderPaneHeight=$(($GeometryMimePaneHeight+$GeometryMessagePaneHeight))"
-fi

kdepim/kmail/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh

@@ -1,21 +0,0 @@
-#! /usr/bin/env bash
-
-while read; do
-    KEY="${REPLY%%=*}"
-    VALUE="${REPLY#*=}"
-    if [ "$KEY" = "LoopOnGotoUnread" ]; then
-	case "$VALUE" in
-	    [Ff][Aa][Ll][Ss][Ee]|0)
-	        echo "LoopOnGotoUnread=0"
-		;;
-	    2)  # we were run already, be nice and don't change anything
-		echo "LoopOnGotoUnread=2"
-		;;
-	    *)  # default
-	        echo "LoopOnGotoUnread=1"
-		;;
-	esac
-    else
-	echo "$REPLY"
-    fi
-done

kdepim/kmail/kconf_update/kmail-3.3-aegypten.pl

@@ -1,28 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# This script updates some configuration keys and adds a 'mailto:' to all 
-# mailing list posting addresses
-
-# read the whole config file
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-  chomp; # eat the trailing '\n'
-  next if ( /^$/ ); # skip empty lines
-  next if ( /^\#/ ); # skip comments
-  if ( /^\[/ ) { # group begin
-    $currentGroup = $_;
-    next;
-  } elsif ( $currentGroup eq "" and /^pgpType/ ) {
-    my ($key,$value) = split /=/;
-    # 0 is auto -> delete key, i.e. use the default
-    # 1-4 map to the kpgp ones
-    # 5 is off -> off; since there's no such backend it won't set one
-    if ( $value != 0 ) {
-      my @newvalues = ("","Kpgp/gpg1","Kpgp/pgp v2","Kpgp/pgp v5","Kpgp/pgp v6","");
-      print "OpenPGP=$newvalues[$value]\n";
-    }
-  }
-}

kdepim/kmail/kconf_update/kmail-3.3-misc.pl

@@ -1,27 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# This script updates some configuration keys
-
-# read the whole config file
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-  chomp; # eat the trailing '\n'
-  next if ( /^$/ ); # skip empty lines
-  next if ( /^\#/ ); # skip comments
-  if ( /^\[/ ) { # group begin
-    $currentGroup = $_;
-    next;
-  } elsif ( $currentGroup eq "[General]" and /^sendOnCheck/ ) {
-    my ($key,$value) = split /=/;
-    print "# DELETE $currentGroup$key\n";
-    if ( $value eq "true" ) {
-      print "[Behaviour]\nSendOnCheck=SendOnManualCheck\n";
-    }
-    else {
-      print "[Behaviour]\nSendOnCheck=DontSendOnCheck\n";
-    }
-  }
-}

kdepim/kmail/kconf_update/kmail-3.3-move-identities.pl

@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-# David Faure <faure@kde.org>
-# License: GPL
-
-$currentGroup = "";
-
-while (<>) {
-    next if /^$/;
-    # recognize groups:
-    if ( /^\[(.+)\]$/ ) { 
-        $currentGroup = $1;
-        if ( $currentGroup =~ /^Identity/ ) {
-            print "# DELETEGROUP [$currentGroup]\n";
-            print "[$currentGroup]\n";
-        }
-        next;
-    };
-    # Move over keys from the identity groups
-    if ( $currentGroup =~ /^Identity/ ) {
-        print;
-    }
-    # Move over the key for the default identity
-    elsif ( $currentGroup eq 'General' ) {
-	($key,$value) = split /=/;
-	chomp $value;
-        if ( $key eq 'Default Identity' ) {
-            print "[$currentGroup]\n$key=$value\n";
-            print "# DELETE [$currentGroup]$key\n";
-        }
-    }
-}

kdepim/kmail/kconf_update/kmail-3.3-split-sign-encr-keys.sh

@@ -1,31 +0,0 @@
-#! /usr/bin/env bash
-
-function delete_this_key() {
-    echo "# DELETE [$GROUP]$KEY"
-}
-
-while read; do
-    # Currently unused
-    if [ "${REPLY#\[}" != "$REPLY" ] ; then # group name
-	GROUP="${REPLY:1:${#REPLY}-2}"
-	continue;
-    fi
-    # normal key=value pair:
-    KEY="${REPLY%%=*}"
-    VALUE="${REPLY#*=}"
-
-    case "$GROUP" in
-	Identity*)
-	    echo "# got Identity Key \"$KEY\""
-	    case "$KEY" in
-		"Default PGP Key")
-		    echo "[$GROUP]"
-            echo "PGP Signing Key=$VALUE"
-		    echo "[$GROUP]"
-            echo "PGP Encryption Key=$VALUE"
-		    delete_this_key
-		    ;;
-	    esac
-	    ;;
-    esac
-done

kdepim/kmail/kconf_update/kmail-3.3-use-ID-for-accounts.pl

@@ -1,236 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# this script goes through all the config keys that deal with
-# accounts and replaces accounts referenced by name to be referenced
-# by IDs. 
-# It also renames the toplevel-folder and the sent/trash/drafts folder
-# accordingly and renames all references
-# last but not least we move the lokal folder-cache of (d)imap folders
-
-# read the whole config file
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-    chomp;
-    next if ( /^$/ ); # skip empty lines
-    next if ( /^\#/ ); # skip comments
-    if ( /^\[/ ) { # group begin
-      $currentGroup = $_;
-      next;
-    } elsif ( $currentGroup =~ /^\[Account/ and /^Id/ ) {
-	  # We need to prevent this script from running twice, since it
-      # would change IDs of accounts then.
-      # Presence of a id key in an Account section is the
-	  # best indicator
-      exit;
-    } elsif ( $currentGroup ne "" ) { # normal entry
-      my ($key,$value) = split /=/;
-      $configFile{$currentGroup}{$key}=$value;
-    }
-}
-
-# filter out account groups
-my @accountGroups = grep { /^\[Account \d+\]/ } keys %configFile;
-
-# create IDs for each account
-my %nameToID;
-my %nameToType;
-foreach my $accountGroup (@accountGroups) {
-  my $id;
-  do {
-    $id = int(rand 0x7fFFffFF);
-  } while ($id <= 0);
-  my $name = $configFile{$accountGroup}{'Name'};
-  # remember id and type
-  $nameToID{$name} = $id;
-  $nameToType{$name} = $configFile{$accountGroup}{'Type'};
-  # create the id entries
-  print "${accountGroup}\nId=$id\n";
-}
-
-foreach my $accountGroup (@accountGroups) {
-  # rename the trash
-  my $trash = $configFile{$accountGroup}{'trash'};
-  if (&replaceID($trash)) {
-    print "# DELETE ".$accountGroup."trash\n";
-    print "${accountGroup}\ntrash=".&replaceID($trash)."\n";
-  }
-}
-
-# we need the directory where the imap cache is stored
-open(CMD, "kde4-config --localprefix|");
-my $basedir = <CMD>;
-chomp( $basedir );
-$basedir = $basedir."share/apps/kmail";
-
-# Now, go through all [Folder-*] groups that belong to (d)imap folders
-# and replace the account name with the id
-my @folderGroups = grep { /^\[Folder-.*\]/ } keys %configFile;
-
-foreach my $folderGroup ( @folderGroups ) 
-{
-  my $isRootFolder = 1;
-  # extract the accountname
-  my (@parts) = split (/\[Folder-/,$folderGroup);
-  my $account = substr($parts[1], 0, -1);
-  if ($account =~ /^[^\/]*\.directory\//)
-  {
-    # .account.directory
-    my (@dirparts) = split (/\.directory\//,$account);
-    $account = substr( $dirparts[0], 1 );
-    # this is no root folder
-    $isRootFolder = 0;
-  }
-  # delete the old group and write the new entry
-  my $accountDecoded = QFileDecode( $account );
-  if ( exists( $nameToID{$accountDecoded} ) )
-  {
-    my $id = $nameToID{$accountDecoded};
-    print "# DELETEGROUP $folderGroup\n";
-    my $folderGroupNew = $folderGroup;
-    my $pattern = quotemeta( $account );
-    $folderGroupNew =~ s/$pattern/$id/;
-    # new account section
-    print "$folderGroupNew\n";
-    # print all original keys
-    my %groupData = %{$configFile{$folderGroup}};
-    foreach my $key ( keys %groupData ) {
-      print "$key=" . $groupData{$key} . "\n";
-    }
-    if ($isRootFolder) {
-      # new label and id of this rootfolder
-      print "SystemLabel=$account\n";
-      print "Id=".$id."\n";
-
-      # move the directory
-      my $subdir;
-      if ($nameToType{$accountDecoded} eq "imap") {
-        $subdir = "imap";
-      } elsif ($nameToType{$accountDecoded} eq "cachedimap") {
-        $subdir = "dimap";
-      }
-      my $oldname = QFileEncode( "$basedir/$subdir/\.$account\.directory" );
-      my $systemcall = "mv '$oldname' '$basedir/$subdir/\.".$id."\.directory'";
-      system($systemcall);
-
-      $oldname = QFileEncode( "$basedir/$subdir/$account" );
-      $systemcall = "mv '$oldname' '$basedir/$subdir/".$id."'";
-      system($systemcall);
-
-      $oldname = QFileEncode( "$basedir/$subdir/\.$account\.index" );
-      $systemcall = "mv '$oldname' '$basedir/$subdir/\.".$id."\.index'";
-      system($systemcall);
-
-      $oldname = QFileEncode( "$basedir/$subdir/\.$account\.index.ids" );
-      $systemcall = "mv '$oldname' '$basedir/$subdir/\.".$id."\.index.ids'";
-      system($systemcall);
-    }
-  }
-}
-
-# go through all identities and replace the sent-mail and drafts folder
-my @identities = grep { /^\[Identity #\d\]/ } keys %configFile;
-
-foreach my $identity (@identities)
-{
-  my $drafts = $configFile{$identity}{'Drafts'};
-  my $sent = $configFile{$identity}{'Fcc'};
-  # extract the account name
-  if (&replaceID($drafts))
-  {
-    print "# DELETE ".$identity."Drafts\n";
-    print "${identity}\nDrafts=".&replaceID($drafts)."\n";
-  }
-  if (&replaceID($sent))
-  {
-    print "# DELETE ".$identity."Fcc\n";
-    print "${identity}\nFcc=".&replaceID($sent)."\n";
-  }
-}
-
-# go through all filters and replace the target
-my @filterGroups = grep { /^\[Filter \#\d+\]/ } keys %configFile;
-foreach my $filterGroup (@filterGroups) 
-{
-    my $numActions = +$configFile{$filterGroup}{'actions'};
-    # go through all actions in search for "set identity":
-    for ( my $i = 0 ; $i < $numActions ; ++$i ) 
-    {
-      my $actionName = "action-name-$i";
-      my $actionArgs = "action-args-$i";
-      if ( $configFile{$filterGroup}{$actionName} eq "transfer" &&
-           &replaceID($configFile{$filterGroup}{$actionArgs}) ) 
-      {
-        print "# DELETE $filterGroup$actionArgs\n";
-        print "$filterGroup\n$actionArgs=".
-          &replaceID($configFile{$filterGroup}{$actionArgs})."\n";
-      }
-    }
-}
-
-# previous fcc
-my $pfcc = $configFile{'[Composer]'}{'previous-fcc'};
-if (&replaceID($pfcc)) {
-  print "# DELETE [Composer]previous-fcc\n";
-  print "[Composer]\nprevious-fcc=".&replaceID($pfcc)."\n";
-}
-
-# GroupwareFolder
-my $groupware = $configFile{'[Groupware]'}{'GroupwareFolder'};
-if (&replaceID($groupware)) {
-  print "# DELETE [Groupware]GroupwareFolder\n";
-  print "[Groupware]\nGroupwareFolder=".&replaceID($groupware)."\n";
-}
-
-# and finally the startupFolder
-my $startup = $configFile{'[General]'}{'startupFolder'};
-if (&replaceID($startup)) {
-  print "# DELETE [General]startupFolder\n";
-  print "[General]\nstartupFolder=".&replaceID($startup)."\n";
-}
-
-## Returns input string with replaced account name
-## If there is nothing to replace it returns undef
-sub replaceID
-{
-  my ($input) = @_;
-
-  if ($input && $input =~ /\.directory/)
-  {
-    my (@dirparts) = split (/\.directory\//,$input);
-    my $account = substr( $dirparts[0], 1 );
-    my $accountDecoded = QFileDecode( $account );
-    if ( exists( $nameToID{$accountDecoded} ) )
-    {
-      my $pattern = quotemeta( $account );
-      $input =~ s/$pattern/$nameToID{$accountDecoded}/;
-      return $input;
-    }
-  }
-}
-
-## emulate QFileDecode
-sub QFileDecode
-{
-  my ($input) = @_;
-
-  $input =~ s/%20/ /g;
-  $input =~ s/%40/\@/g;
-  $input =~ s/%25/%/g;  # must be the last one
-
-  return $input;
-}
-
-## emulate QFileEncode
-sub QFileEncode
-{
-  my ($input) = @_;
-
-  $input =~ s/%/%25/g;  # must be the first one
-  $input =~ s/ /%20/g;
-  $input =~ s/\@/%40/g;
-
-  return $input;
-}

kdepim/kmail/kconf_update/kmail-3.3b1-misc.pl

@@ -1,38 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# This script updates some configuration keys and adds a 'mailto:' to all 
-# mailing list posting addresses
-
-# read the whole config file
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-  chomp; # eat the trailing '\n'
-  next if ( /^$/ ); # skip empty lines
-  next if ( /^\#/ ); # skip comments
-  if ( /^\[/ ) { # group begin
-    $currentGroup = $_;
-    next;
-  } elsif ( $currentGroup eq "[General]" and /^systray-on-mail/ ) {
-    my ($key,$value) = split /=/;
-    print "# DELETE $currentGroup$key\n";
-    print "[General]\nSystemTrayEnabled=$value\n";
-  } elsif ( $currentGroup eq "[General]" and /^systray-on-new/ ) {
-    my ($key,$value) = split /=/;
-    print "# DELETE $currentGroup$key\n";
-    if ( $value eq "true" ) {
-      print "[General]\nSystemTrayPolicy=ShowOnUnread\n";
-    }
-    else {
-      print "[General]\nSystemTrayPolicy=ShowAlways\n";
-    }
-  } elsif ( /^MailingListPostingAddress/ ) {
-    my ($key,$value) = split /=/;
-    if ( not $value eq "" and not $value =~ /^mailto:/ ) {
-      print "# DELETE $currentGroup$key\n";
-      print "$currentGroup\n$key=mailto:$value\n";
-    }
-  }
-}

kdepim/kmail/kconf_update/kmail-3.4-misc.pl

@@ -1,27 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# This script updates some configuration keys
-
-# read the whole config file
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-  chomp; # eat the trailing '\n'
-  next if ( /^$/ ); # skip empty lines
-  next if ( /^\#/ ); # skip comments
-  if ( /^\[/ ) { # group begin
-    $currentGroup = $_;
-    next;
-  } elsif ( $currentGroup eq "[Behaviour]" and /^JumpToUnread/ ) {
-    my ($key,$value) = split /=/;
-    print "# DELETE $currentGroup$key\n";
-    if ( $value eq "true" ) {
-      print "[Behaviour]\nActionEnterFolder=SelectFirstUnreadNew\n";
-    }
-    else {
-      print "[Behaviour]\nActionEnterFolder=SelectFirstNew\n";
-    }
-  }
-}

kdepim/kmail/kconf_update/kmail-3.4.1-update-status-filters.pl

@@ -1,42 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# This script converts lower case status filter rules to upper case.
-
-# read the whole config file
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-    chomp;
-    next if ( /^$/ ); # skip empty lines
-    next if ( /^\#/ ); # skip comments
-    if ( /^\[/ ) { # group begin
-      $currentGroup = $_;
-      next;
-    } elsif ( $currentGroup ne "" ) { # normal entry
-      my ($key,$value) = split /=/;
-      $configFile{$currentGroup}{$key}=$value;
-    }
-}
-
-# go through all filters and check for rules which are no longer valid
-my @filterGroups = grep { /^\[Filter \#\d+\]/ } keys %configFile;
-foreach my $filterGroup (@filterGroups) {
-  my $numRules = $configFile{$filterGroup}{'rules'};
-  # go through all rules:
-  for ( my $i = 0; $i < $numRules; ++$i ) {
-    my $c = chr( ord("A") + $i );
-    my $fieldKey = "field$c";
-    my $field = $configFile{$filterGroup}{$fieldKey};
-    if ( $field eq "<status>" ) {
-      my $contentsKey = "contents$c";
-      my $contents = $configFile{$filterGroup}{$contentsKey};
-      if ( $contents =~ /^[a-z]/ ) {
-        $contents = ucfirst( $contents );
-        print "# DELETE $filterGroup$contentsKey\n";
-        print "$filterGroup\n$contentsKey=$contents\n";
-      }
-    }
-  }
-}

kdepim/kmail/kconf_update/kmail-3.5-trigger-flag-migration.pl

@@ -1,39 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
-#
-
-$currentGroup = "";
-
-$source = $ARGV[0];
-
-while (<STDIN>) {
-    chomp;
-    next if /^$/;
-    next if /^\#/;
-
-    # recognize groups:
-    if ( /^\[(.+)\]$/ ) {
-        $currentGroup = $_;
-        next;
-    };
-
-    ($key,$value) = split /=/;
-    next if $key eq "";
-
-    if ( $currentGroup =~ /^\[Folder/ ) {
-        if( ($key eq "UploadAllFlags" or $key eq "StatusChangedLocally") and not $value eq "true" ) {
-            $value = "true";
-            print "#DELETE $currentGroup $key\n";
-            print "$currentGroup\n$key=$value\n"
-        }
-    }
-}

kdepim/kmail/kconf_update/kmail-4.0-misc.pl

@@ -1,48 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-# read the whole config file
-my $currentGroup = "";
-my %configFile;
-while ( <> ) {
-    chomp;
-    next if ( /^$/ ); # skip empty lines
-    next if ( /^\#/ ); # skip comments
-    if ( /^\[/ ) { # group begin
-	$currentGroup = $_;
-	next;
-    } elsif ( $currentGroup ne "" ) { # normal entry
-	my ($key,$value) = split /=/;
-	$configFile{$currentGroup}{$key}=$value;
-    }
-}
-
-# filter out account groups
-my @accountGroups = grep { /^\[Account \d+\]/ } keys %configFile;
-
-# create new account type
-my $newType;
-foreach my $accountGroup (@accountGroups) {
-    my $oldType = $configFile{$accountGroup}{'Type'};
-    $newType = $oldType;
-    if ( $oldType eq "pop" or $oldType eq "6" ) {
-        $newType = "Pop";
-    }
-    if ( $oldType eq "cachedimap" or $oldType eq "4" ) {
-        $newType = "DImap";
-    }
-    if ( $oldType eq "local" or $oldType eq "5" ) {
-        $newType = "Local";
-    }
-    if ( $oldType eq "maildir" or $oldType eq "2" ) {
-        $newType = "Maildir";
-    }
-    if ( $oldType eq "imap" or $oldType eq "0" ) {
-        $newType = "Imap";
-    }
-
-    # change the type entry this account
-    print "# DELETE ${accountGroup}Type\n";
-    print "${accountGroup}\nType=$newType\n";
-}

kdepim/kmail/kconf_update/kmail-pgpidentity.pl

@@ -1,34 +0,0 @@
-#!/usr/bin/perl
-
-# For each KMail Identity convert the "PGP Identity" entry (which contains a
-# user ID) to a "Default PGP Key" entry (which contains a key ID)
-
-$DEBUG = 0;
-
-while(<>)
-{
-  if( /\[(Identity.*)\]/ )
-  {
-    $section = $1;
-    next;
-  }
-  if( /^PGP Identity=(.*)$/ )
-  {
-    print STDERR "\n[$section]PGP Identity=$1\n" if ( $DEBUG );
-
-    if( ( $1 ne "" ) &&
-        ( open GnuPG, "gpg --list-secret-keys --utf8-strings '$1' |" ) )
-    {
-      while (<GnuPG>)
-      {
-        # search in gpg's output for the key id of the first matching key
-        if(/^sec[^\/]*\/([0-9A-F]*)/)
-        {
-          print "[$section]\nDefault PGP Key=$1\n";
-          last;
-        }
-      }
-    }
-    print "# DELETE [$section]PGP Identity\n";
-  }
-}

kdepim/kmail/kconf_update/kmail-upd-identities.pl

@@ -1,54 +0,0 @@
-#!/usr/bin/perl
-
-my (%data);
-
-$currentGroup = "";
-
-while (<>) {
-    next if /^$/;
-    # filter out groups:
-    if ( /^\[(.+)\]$/ ) { $currentGroup = $1; next; };
-    # store all keys regarding Identities in the hash:
-    if ( $currentGroup =~ /^Identity/ ) {
-	($key,$value) = split /=/;
-	chomp $value;
-	$data{$currentGroup}{$key} = $value;
-    }
-}
-
-# We need to prevent this script from being run twice, since it would
-# kill all identities then.
-# Non-presence of the [Identity]IdentityList key is the best indiator:
-unless ( defined( $data{'Identity'}{'IdentityList'} ) ) { exit; }
-
-# first, delete all old groups:
-foreach $group ( keys %data ) {
-    print "# DELETEGROUP [$group]\n";
-}
-
-# now, extract the list of valid identities (and their sequence):
-$rawIdentityList = $data{'Identity'}{'IdentityList'};
-# don't include the IdentityList anymore:
-delete $data{'Identity'}{'IdentityList'};
-# remove backslash-quoting:
-$rawIdentityList =~ s/\\(.)/$1/g;
-# split into a list at unquoted commas:
-@identities = split /(?<!\\),/, $rawIdentityList;
-# unquote individual items yet again:
-for ( @identities ) { s/\\(.)/$1/g; }
-# build the list of groups (this time incl. the default identity):
-@groups = ( 'Identity', map { $_ = "Identity-$_"; } @identities );
-# write out the groups, now named "Identity #n",
-# with the same data and the same keys that the old groups had:
-$n = 0;
-foreach $group (@groups) {
-    %groupData = %{$data{$group}};
-    print "[Identity #$n]\n";
-    foreach $key ( keys %groupData ) {
-	print "$key=" 
-	    . $groupData{$key} . "\n";
-    }
-    $n++;
-}
-# remember which one is default:
-print "[General]\nDefault Identity=" . $data{'Identity'}{'Identity'} . "\n";

kdepim/kmail/kconf_update/kmail.upd

@@ -1,245 +0,0 @@
-# Update for transport configuration
-Id=1
-File=kmail2rc
-Group=sending mail,Transport 1
-Script=upgrade-transport.pl,perl
-# Fix spelling of QuoutedText[123]
-Id=4
-File=kmail2rc,kmail2rc
-Group=Reader,Reader
-Key=QuoutedText1,QuotedText1
-Key=QuoutedText2,QuotedText2
-Key=QuoutedText3,QuotedText3
-# Remove obsolete PGP config entries
-Id=5
-File=kmail2rc
-Group=Reader
-Key=PGPMessageOK,PGPMessageOkKeyOk
-Options=copy
-Key=PGPMessageWarn,PGPMessageOkKeyBad
-RemoveGroup=Kpgp
-File=kpgprc
-Group=<default>
-RemoveKey=user
-# Default to KAddressbook
-Id=6
-File=kmail2rc
-Group=General
-RemoveKey=addressbook
-RemoveGroup=Addressbook
-# createOwnMessageIdHeaders -> useCustomMessageIdSuffix
-Id=7
-File=kmail2rc
-Group=General
-Key=createOwnMessageIdHeaders,useCustomMessageIdSuffix
-# Upgrade "PGP Identity" (KDE 2.2.x) -> "Default PGP Key" (KDE 3.0)
-Id=8
-File=kmail2rc
-Script=kmail-pgpidentity.pl,perl
-#
-# KDE 3.0 released
-#
-# Uppgrade the signature config options (where a trailing pipe (|) meant
-# to interpret the filename as a command (KDE 3.0 -> KDE 3.1)
-Id=9
-File=kmail2rc
-Script=upgrade-signature.pl,perl
-# rename the config groups associated with identities.
-# get rid of Identity/IdentityList and addd group [IdentityManager] with
-# keys Idenities (number of identities) and "Default Identity" (3.0->3.1):
-Id=3.1-update-identities
-File=kmail2rc
-Script=kmail-upd-identities.pl,perl
-# identify identities by UOID, not name...
-Id=3.1-use-identity-uoids
-File=kmail2rc
-Script=kmail-3.1-use-UOID-for-identities.pl,perl
-# update new mail notification settings
-Id=3.1-new-mail-notification
-File=kmail2rc,kmail.eventsrc
-Group=General,new-mail-arrived
-Options=overwrite
-Script=kmail-3.1-update-new-mail-notification-settings.pl,perl
-#
-# KDE 3.1 released
-#
-Id=3.2-update-loop-on-goto-unread-settings
-File=kmail2rc
-Group=Behaviour
-Key=LoopOnGotoUnread
-Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,bash
-# due to a bug the first identity always had UOID 0, assign another UOID
-Id=3.1.4-dont-use-UOID-0-for-any-identity
-File=kmail2rc
-Script=kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl,perl
-Id=3.2-misc
-########## W A R N I N G #### W A R N I N G #### W A R N I N G #######
-# collection of small adjustments. Since updates will be added to this
-# script during the pre-3.2 development, HEAD users should regularly
-# remove the "3.2-{misc,moves}-xx" keys from their kmail2rc and kconf_updaterc.
-# For this to work, the script MUST be idempotent, ie. be robust
-# against being run multiple times.
-######################################################################
-File=kmail2rc
-Script=kmail-3.2-misc.sh,bash
-#
-# reuse this section to add trivial stuff!
-#
-Id=3.2-moves
-File=kmail2rc
-Group=Geometry,Reader
-Key=MimePaneHeight
-#
-Id=3.3-use-ID-for-accounts
-File=kmail2rc
-Script=kmail-3.3-use-ID-for-accounts.pl,perl
-#
-Id=3.3-update-filter-rules
-File=kmail2rc
-Script=kmail-3.3-update-filter-rules.pl,perl
-#
-Id=3.3-move-identities-to-own-file
-File=kmail2rc,emailidentities
-Script=kmail-3.3-move-identities.pl,perl
-#
-# aegypten: moving options from kpgprc to kmailrc
-#
-Id=3.3-aegypten-kpgprc-to-kmailrc
-File=kpgprc,kmail2rc
-Group=,Composer
-Key=showEncryptionResult,crypto-show-encryption-result
-Key=encryptToSelf,crypto-encrypt-to-self
-Key=showKeysForApproval,crypto-show-keys-for-approval
-
-Id=3.3-aegypten-kpgprc-to-libkleopatrarc
-File=kpgprc,libkleopatrarc
-Group=,Backends
-Script=kmail-3.3-aegypten.pl,perl
-
-Id=3.3-aegypten-emailidentities-split-sign-encr-keys
-File=emailidentities
-Script=kmail-3.3-split-sign-encr-keys.sh
-#
-Id=3.3-misc
-########## W A R N I N G #### W A R N I N G #### W A R N I N G #######
-# collection of small adjustments. Since updates will be added to this
-# script during the pre-3.3 development, HEAD users should regularly
-# remove the "3.3-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc.
-# For this to work, the script MUST be idempotent, ie. be robust
-# against being run multiple times.
-######################################################################
-File=kmail2rc
-Script=kmail-3.3-misc.pl,perl
-#
-# Updates which were added after the release of KDE 3.3 Beta 1
-Id=3.3b1-misc
-File=kmail2rc
-Script=kmail-3.3b1-misc.pl,perl
-# Updates which were added after the release of KDE 3.3
-Id=3.4
-File=kmail2rc
-Script=kmail-3.4-misc.pl,perl
-# Remove the MenuBar key so that menu bar will be visible in the separate reader window
-Id=3.4a
-File=kmail2rc
-Group=Separate Reader Window
-RemoveKey=MenuBar
-# Use the normal message list font for the new fonts for important/new/unread
-Id=3.4b
-File=kmail2rc
-Group=Fonts
-Options=copy
-Key=list-font,list-important-font
-Options=copy
-Key=list-font,list-new-font
-Options=copy
-Key=list-font,list-unread-font
-# Convert status filter rules to upper case (cf. bug #101001)
-Id=3.4.1
-File=kmail2rc
-Script=kmail-3.4.1-update-status-filters.pl,perl
-# Remove the stored size so that we get a reasonable default now that we have 2 columns in the folder selection dialog
-Id=3.5.4
-File=kmail2rc
-Group=FolderSelectionDialog
-RemoveKey=Size
-# Trigger migration of all local imap flags to the server
-Id=3.5.7-imap-flag-migration
-Options=overwrite
-File=kmail2rc
-Script=kmail-3.5-trigger-flag-migration.pl,perl
-
-# Misc settings for KMail in KDE 4.0
-Id=4.0-misc
-File=kmail2rc
-Script=kmail-4.0-misc.pl,perl
-
-########## W A R N I N G #### W A R N I N G #### W A R N I N G #######
-# collection of small adjustments. Since updates will be added to this
-# script during the pre-4.0 development, trunk users should regularly
-# remove the "4.0-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc.
-# For this to work, the script MUST be idempotent, ie. be robust
-# against being run multiple times.
-######################################################################
-# Misc settings for KMail in KDE 4.2
-Id=4.2
-File=kmail2rc
-Group=General
-Key=showTodoColumn,showToActColumn
-Group=Reader
-Key=TodoMessage,ToActMessage
-Group=Fonts
-Key=list-todo-font,list-toact-font
-
-########## W A R N I N G #### W A R N I N G #### W A R N I N G #######
-# collection of small adjustments. Since updates will be added to this
-# script during the pre-4.4 Akonadi, trunk users should regularly
-# remove the "4.4-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc.
-# For this to work, the script MUST be idempotent, ie. be robust
-# against being run multiple times.
-######################################################################
-# Misc settings for KMail-akonadi
-Id=4.4-akonadi
-File=kmail2rc
-Group=Reader
-Key=showColorbar,showColorBar
-Group=MessageListView
-Key=DisplayMessageToolTips,MessageToolTipEnabled
-Group=MessageListView
-Key=HideTabBarWithSingleTab,AutoHideTabBarWithSingleTab
-Key=list-todo-font,list-toact-font
-Group=Reader,MessageListView::Fonts
-Key=list-font,MessageListFont
-Key=list-important-font,ImportantMessageFont
-Key=list-new-font,NewMessageFont
-Key=list-unread-font,UnreadMessageFont
-Key=list-toact-font,TodoMessageFont
-Group=Reader,MessageListView::Colors
-Key=NewMessage,NewMessageColor
-Key=UnreadMessage,UnreadMessageColor
-Key=FlagMessage,ImportantMessageColor
-Key=ToActMessage,TodoMessageColor
-
-Id=4.12
-File=kmail2rc
-Group=General,Print
-Key=PrintSelectedText,PrintSelectedText
-
-
-Id=4.13
-File=akonadi_folderarchive_agentrc,foldermailarchiverc
-AllGroups
-
-Id=4.13.2
-File=kmail2rc
-Group=GrantleeTheme
-Key=grantlee-theme-name,grantlee-mail-theme-name
-
-#
-# Important notice:
-# If you add updates here, keep this text below them.
-# Make sure your updates can be safely run twice and add any new Id
-# to the QStringList in kmail/kmstartup.cpp:checkConfigUpdates().
-# Collect smaller stuff in kmail-<version>-misc and <version>-moves!
-# (mmutz)
-#

kdepim/kmail/kconf_update/upgrade-signature.pl

@@ -1,63 +0,0 @@
-#!/usr/bin/perl
-
-my (%data);
-my $section = "";
-
-sub process {
-    # delete obsolete keys:
-    print "# DELETE [$section]UseSignatureFile\n";
-
-    # now determine the type of signature:
-    if ( $data{'usefile'} =~ /false/i ) {
-	# type = inline
-	if ( $data{'inline'} ne "" ) {
-	    print "[$section]\nSignature Type=inline\n";
-	} else {
-	    print "[$section]\nSignature Type=disabled\n";
-	    print "# DELETE [$section]Inline Signature\n";
-	}
-	print "# DELETE [$section]Signature File\n";
-    } else {
-	# type = file or command
-	if ( $data{'file'} =~ /\|$/ ) {
-	    # a trailing pipe means:
-	    # type = command
-	    chop $data{'file'};
-	    print "[$section]\nSignature Type=command\n";
-	    print "[$section]\nSignature Command=", $data{'file'}, "\n";
-	    print "# DELETE [$section]Signature File\n";
-	    print "# DELETE [$section]Inline Signature\n";
-	} elsif ( $data{'file'} eq "" ) {
-	    # empty filename means:
-	    # type = disabled
-	    print "[$section]\nSignature Type=disabled\n";
-	    print "# DELETE [$section]Inline Signature\n";
-	    print "# DELETE [$section]Signature File\n";
-	} else {
-	    # type = file
-	    print "[$section]\nSignature Type=file\n";
-	    print "# DELETE [$section]Inline Signature\n";
-	}
-    }
-}
-
-#loop over all lines to find Identity sections:
-while (<>) {
-    if ( /\[(Identity[^]]*)\]/ ) {
-        # new group means that we have to process the old group:
-        if ( $section ne "" ) { process(); }
-	$section = $1;
-	%data = ();
-	next;
-    }
-    chomp;
-    # We need to prevent this script from begin run twice
-    # since it would set all signatures to 'disabled' then.
-    # Presence of the Signature Type key is the best indicator.
-    /^Signature Type/ and exit;
-    /^Inline Signature=(.*)$/ and $data{'inline'} = $1;
-    /^Signature File=(.*)$/   and $data{'file'} = $1;
-    /^UseSignatureFile=(.*)$/ and $data{'usefile'} = $1;
-}
-#and don't forget to preocess the last group ;-)
-if ( $section ne "" ) { process(); }

kdepim/kmail/kconf_update/upgrade-transport.pl

@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-my (%data);
-
-#read in all the data and split it up into hashes.
-while (<>) {
-  $data{$1} = $2 if /^([^=]*)=(.*)$/;
-}
-
-# Delete obsolete entries from the [sending mail] section
-print "# DELETE Mailer\n";
-print "# DELETE Method\n";
-print "# DELETE Precommand\n";
-print "# DELETE Smtp Host\n";
-print "# DELETE Smtp Password\n";
-print "# DELETE Smtp Port\n";
-print "# DELETE Smtp Username\n";
-
-# Write entries to the [Transport 1] section
-print "precommand=$data{'Precommand'}\n" if (defined $data{'Precommand'});
-print "port=$data{'Smtp Port'}\n" if (defined $data{'Smtp Port'});
-
-if (defined $data{'Method'}) {
-  if ($data{'Method'} eq "smtp") {
-    print "type=smtp\n";
-    print "host=$data{'Smtp Host'}\n";
-    print "name=$data{'Smtp Host'}\n";
-  }
-  else {
-    print "type=sendmail\n";
-    print "host=$data{'Mailer'}\n";
-    print "name=Sendmail\n";
-  }
-  print "\n[General]\n";
-  print "transports=1\n";
-}
-

kdepim/kmailcvt/CMakeLists.txt

@@ -19,10 +19,7 @@ set(kmailcvt_SRCS
 include_directories(${Boost_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/mailimporter ${CMAKE_SOURCE_DIR}/mailcommon ${CMAKE_SOURCE_DIR}/messagecomposer)
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
-kde4_add_ui_files(kmailcvt_SRCS ui/kselfilterpagedlg.ui ui/kimportpagedlg.ui)
+add_executable(kmailcvt ${kmailcvt_SRCS})
-
-kde4_add_app_icon(kmailcvt_SRCS "icons/hi*-app-kmailcvt.png")
-kde4_add_executable(kmailcvt ${kmailcvt_SRCS})
 
 target_link_libraries(kmailcvt
   ${KDE4_KIO_LIBS}

kdepim/knode/CMakeLists.txt

@@ -106,7 +106,7 @@ kde4_add_ui_files(knodecommon_LIB_SRCS
 
 kde4_add_kcfg_files(knodecommon_LIB_SRCS settings_base.kcfgc )
 
-kde4_add_library(knodecommon ${LIBRARY_TYPE} ${knodecommon_LIB_SRCS})
+add_library(knodecommon ${LIBRARY_TYPE} ${knodecommon_LIB_SRCS})
 
 target_link_libraries(knodecommon
   ${KDEPIMLIBS_KMIME_LIBS} ${KDE4_KCMUTILS_LIBS} ${KDE4_KIO_LIBS}
@@ -162,7 +162,7 @@ set(knode_SRCS knode.cpp knapplication.cpp main.cpp )
 
 kde4_add_app_icon(knode_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-knode.png")
 
-kde4_add_executable(knode ${knode_SRCS})
+add_executable(knode ${knode_SRCS})
 
 target_link_libraries(knode ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} kdepim knodecommon)
 

kdepim/knotes/CMakeLists.txt

@@ -1,6 +1,8 @@
 project(knotes)
 add_subdirectory( icons ) 
-add_subdirectory( tests )
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
@@ -47,7 +49,7 @@ set( libknotesprivate_kcfg_lib_SRCS settings/knotesglobalconfig.kcfgc )
 
 kde4_add_kcfg_files(libknotesprivate_kcfg_lib_SRCS ${libknotesprivate_kcfg_lib_SRCS})
 
-kde4_add_library(knotesprivate ${LIBRARY_TYPE} ${libknotesprivate_lib_SRCS} ${libknotesprivate_kcfg_lib_SRCS} )
+add_library(knotesprivate ${LIBRARY_TYPE} ${libknotesprivate_lib_SRCS} ${libknotesprivate_kcfg_lib_SRCS} )
 
 target_link_libraries(knotesprivate kdepim ${KDE4_KIO_LIBS} pimcommon ${KDE4_KPRINTUTILS_LIBS} ${KDE4_KCMUTILS_LIBS} ${Grantlee_CORE_LIBRARIES} ${KDE4_KDNSSD_LIBS} ${KDE4_KNEWSTUFF3_LIBS} noteshared akonadi_next ${BALOO_LIBRARIES})
 
@@ -74,9 +76,7 @@ set(knotes_SRCS
 
 qt4_add_dbus_adaptor(knotes_SRCS  apps/org.kde.KNotes.xml apps/knotesapp.h KNotesApp )
 
-kde4_add_app_icon(knotes_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-knotes.png")
+add_executable(knotes ${knotes_SRCS})
-
-kde4_add_executable(knotes ${knotes_SRCS})
 
 target_link_libraries(knotes knotesprivate pimcommon kdepim ${KDE4_KIO_LIBS}
                              ${KDE4_KCMUTILS_LIBS} ${X11_X11_LIB} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ${KDE4_KPRINTUTILS_LIBS} ${KDE4_KDNSSD_LIBS} noteshared

kdepim/kontact/plugins/korganizer/CMakeLists.txt

@@ -38,8 +38,6 @@ target_link_libraries(kontact_journalplugin ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KON
 
 set(kcm_apptsummary_PART_SRCS kcmapptsummary.cpp)
 
-kde4_add_ui_files(kcm_apptsummary_PART_SRCS apptsummaryconfig_base.ui)
-
 kde4_add_plugin(kcm_apptsummary ${kcm_apptsummary_PART_SRCS})
 
 target_link_libraries(kcm_apptsummary ${KDE4_KDEUI_LIBS} korganizerprivate ${KDEPIMLIBS_KCALUTILS_LIBS})
@@ -48,14 +46,16 @@ target_link_libraries(kcm_apptsummary ${KDE4_KDEUI_LIBS} korganizerprivate ${KDE
 
 set(kcm_todosummary_PART_SRCS kcmtodosummary.cpp)
 
-kde4_add_ui_files(kcm_todosummary_PART_SRCS todosummaryconfig_base.ui)
 
 kde4_add_plugin(kcm_todosummary ${kcm_todosummary_PART_SRCS})
 
 target_link_libraries(kcm_todosummary ${KDE4_KDEUI_LIBS})
 
 ########## Unit Test ###########
-add_subdirectory(tests)
+
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
 
 ########### install files ###############
 

kdepim/kontact/plugins/specialdates/CMakeLists.txt

@@ -33,8 +33,6 @@ target_link_libraries(kontact_specialdatesplugin
 
 set(kcm_sdsummary_PART_SRCS kcmsdsummary.cpp)
 
-kde4_add_ui_files(kcm_sdsummary_PART_SRCS sdsummaryconfig_base.ui)
-
 kde4_add_plugin(kcm_sdsummary ${kcm_sdsummary_PART_SRCS})
 
 target_link_libraries(kcm_sdsummary ${KDE4_KDEUI_LIBS})

kdepim/kontact/src/CMakeLists.txt

@@ -19,7 +19,7 @@ set(kontactprivate_LIB_SRCS
 
 kde4_add_kcfg_files(kontactprivate_LIB_SRCS prefs.kcfgc)
 
-kde4_add_library(kontactprivate ${LIBRARY_TYPE} ${kontactprivate_LIB_SRCS})
+add_library(kontactprivate ${LIBRARY_TYPE} ${kontactprivate_LIB_SRCS})
 
 target_link_libraries(kontactprivate
   ${KDE4_KCMUTILS_LIBS}
@@ -43,9 +43,7 @@ install(TARGETS kontactprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_
 
 set(kontact_bin_SRCS main.cpp)
 
-kde4_add_app_icon(kontact_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kontact.png")
+add_executable(kontact_bin ${kontact_bin_SRCS})
-
-kde4_add_executable(kontact_bin ${kontact_bin_SRCS})
 
 set_target_properties(kontact_bin PROPERTIES OUTPUT_NAME kontact)
 

kdepim/korgac/CMakeLists.txt

@@ -18,7 +18,9 @@ include_directories(
 )
 
 add_subdirectory(pixmaps)
-add_subdirectory(tests)
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
 
 ########### next target ###############
 
@@ -53,23 +55,10 @@ if(RUNTIME_PLUGINS_STATIC)
   add_definitions(-DSERIALIZER_PLUGIN_STATIC)
 endif()
 
-kde4_add_app_icon(korgac_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pixmap/hi*-apps-korganizer.png")
-
 if(KORGAC_AKONADI_AGENT)
   kde4_add_plugin(korgac ${korgac_SRCS})
 else()
-  kde4_add_executable(korgac ${korgac_SRCS})
+  add_executable(korgac ${korgac_SRCS})
-  if(Q_WS_MAC)
-    set_target_properties(korgac PROPERTIES
-      MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template
-    )
-    set_target_properties(korgac PROPERTIES
-      MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.pim.korgac"
-    )
-    set_target_properties(korgac PROPERTIES
-      MACOSX_BUNDLE_BUNDLE_NAME "KOrganizer Reminder Client"
-    )
-  endif()
 endif()
 
 target_link_libraries(korgac

kdepim/korganizer/CMakeLists.txt

@@ -25,7 +25,9 @@ include_directories(
   ${ZLIB_INCLUDE_DIRS}
 )
 
-add_subdirectory(tests)
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
 add_subdirectory(interfaces)
 if(KDEPIM_BUILD_DESKTOP)
   add_subdirectory(pixmaps)
@@ -48,9 +50,7 @@ if(KDEPIM_BUILD_DESKTOP)
     koapp.cpp
   )
 
-  kde4_add_app_icon(korganizer_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/hi*-apps-korganizer.png")
+  add_executable(korganizer ${korganizer_SRCS})
-
-  kde4_add_executable(korganizer ${korganizer_SRCS})
 
   target_link_libraries(korganizer
     ${KDE4_KDEUI_LIBS}
@@ -140,7 +140,7 @@ set(korganizer_core_LIB_SRCS
 
 kde4_add_kcfg_files(korganizer_core_LIB_SRCS koprefs_base.kcfgc)
 
-kde4_add_library(korganizer_core ${LIBRARY_TYPE} ${korganizer_core_LIB_SRCS})
+add_library(korganizer_core ${LIBRARY_TYPE} ${korganizer_core_LIB_SRCS})
 
 target_link_libraries(korganizer_core
   calendarsupport
@@ -213,15 +213,6 @@ set(korganizerprivate_LIB_SRCS
 
   kde4_add_kcfg_files(korganizerprivate_LIB_SRCS htmlexportsettings.kcfgc)
 
-  kde4_add_ui_files(korganizerprivate_LIB_SRCS
-    filteredit_base.ui
-    kogroupwareprefspage.ui
-    multiagendaviewconfigwidget.ui
-    publishdialog_base.ui
-    searchdialog_base.ui
-    timescaleedit_base.ui
-  )
-
   qt4_add_resources(korganizerprivate_LIB_SRCS
     agendaitem_pixmaps/agendaitemtheme.qrc)
 
@@ -247,7 +238,7 @@ set(korganizerprivate_LIB_SRCS
     ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml
   )
 
-  kde4_add_library(korganizerprivate ${LIBRARY_TYPE} ${korganizerprivate_LIB_SRCS})
+  add_library(korganizerprivate ${LIBRARY_TYPE} ${korganizerprivate_LIB_SRCS})
 
   target_link_libraries(korganizerprivate
     pimcommon

kdepim/korganizer/interfaces/korganizer/CMakeLists.txt

@@ -6,7 +6,7 @@ set(korganizer_interfaces_LIB_SRCS
   mainwindow.cpp
 )
 
-kde4_add_library(korganizer_interfaces ${LIBRARY_TYPE} ${korganizer_interfaces_LIB_SRCS})
+add_library(korganizer_interfaces ${LIBRARY_TYPE} ${korganizer_interfaces_LIB_SRCS})
 
 target_link_libraries(korganizer_interfaces
   akonadi_next

kdepim/kresources/blog/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(
 
 set(kcal_resourceblog_LIB_SRCS resourceblog.cpp resourceblogconfig.cpp )
 
-kde4_add_library(kcal_resourceblog ${LIBRARY_TYPE} ${kcal_resourceblog_LIB_SRCS})
+add_library(kcal_resourceblog ${LIBRARY_TYPE} ${kcal_resourceblog_LIB_SRCS})
 
 target_link_libraries(kcal_resourceblog ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KBLOG_LIBS} kdepim)
 

kdepim/kresources/remote/CMakeLists.txt

@@ -11,7 +11,7 @@ include_directories(
 set(kcal_resourceremote_LIB_SRCS resourceremote.cpp resourceremoteconfig.cpp )
 
 
-kde4_add_library(kcal_resourceremote ${LIBRARY_TYPE} ${kcal_resourceremote_LIB_SRCS})
+add_library(kcal_resourceremote ${LIBRARY_TYPE} ${kcal_resourceremote_LIB_SRCS})
 
 target_link_libraries(kcal_resourceremote  ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KCAL_LIBS} kdepim )
 

kdepim/ksendemail/CMakeLists.txt

@@ -8,7 +8,7 @@ if(KMAIL_SUPPORTED)
 
   qt4_add_dbus_interfaces( ksendemail_SRCS  ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml )
 
-  kde4_add_executable( ksendemail ${ksendemail_SRCS})
+  add_executable( ksendemail ${ksendemail_SRCS})
   add_dependencies( ksendemail kmail_xml )
   target_link_libraries( ksendemail ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} )