[Kde-pim] branches/work/kdepim_kcalcore

[Bertjan Broeksema]

SVN commit 1155948 by bbroeksema:

Move KTimeZoneComboBox to incidince editors.

Its currently only used there and drags in a dependency to KCal(Core) for
libkdepim. A better solution would probably be to move it to kdelibs once
the dependency on KCal(Core) is gone (if possible).

CCMAIL: kde-pim at kde.org
MERGE: trunk


 M  +1 -0      incidenceeditors/CMakeLists.txt  
 M  +1 -1      incidenceeditors/editorgeneralevent.cpp  
 M  +1 -1      incidenceeditors/editorgeneraltodo.cpp  
 M  +1 -0      incidenceeditors/incidenceeditor-ng/CMakeLists.txt  
 M  +1 -1      incidenceeditors/incidenceeditor-ng/eventortododesktop.ui  
 M  +1 -1      incidenceeditors/incidenceeditor-ng/eventortodomobile.ui  
 A             incidenceeditors/ktimezonecombobox.cpp   libkdepim/ktimezonecombobox.cpp#1155933 [License: GPL (v2+)]
 A             incidenceeditors/ktimezonecombobox.h   libkdepim/ktimezonecombobox.h#1155933 [License: GPL (v2+) (+Qt exception)]
 M  +0 -4      libkdepim/CMakeLists.txt  
 M  +0 -6      libkdepim/kdepim.widgets  
 D             libkdepim/ktimezonecombobox.cpp  
 D             libkdepim/ktimezonecombobox.h  
 M  +1 -0      mobile/lib/CMakeLists.txt  


--- branches/work/kdepim_kcalcore/incidenceeditors/CMakeLists.txt #1155947:1155948
@@ -41,6 +41,7 @@
     incidenceeditor.cpp
     journaleditor.cpp
     korganizereditorconfig.cpp
+    ktimezonecombobox.cpp
     templatemanagementdialog.cpp
     todoeditor.cpp
 )
--- branches/work/kdepim_kcalcore/incidenceeditors/editorgeneralevent.cpp #1155947:1155948
@@ -24,10 +24,10 @@
 
 #include "editorgeneralevent.h"
 #include "editorconfig.h"
+#include "ktimezonecombobox.h"
 
 #include <libkdepim/kdateedit.h>
 #include <libkdepim/ktimeedit.h>
-#include <libkdepim/ktimezonecombobox.h>
 
 #include <kcalutils/incidenceformatter.h>
 
--- branches/work/kdepim_kcalcore/incidenceeditors/editorgeneraltodo.cpp #1155947:1155948
@@ -24,10 +24,10 @@
 
 #include "editorgeneraltodo.h"
 #include "editorconfig.h"
+#include "ktimezonecombobox.h"
 
 #include <libkdepim/kdateedit.h>
 #include <libkdepim/ktimeedit.h>
-#include <libkdepim/ktimezonecombobox.h>
 
 #include <kcalutils/incidenceformatter.h>
 #include <kcalcore/todo.h>
--- branches/work/kdepim_kcalcore/incidenceeditors/incidenceeditor-ng/CMakeLists.txt #1155947:1155948
@@ -49,6 +49,7 @@
   ../categoryselectdialog.cpp
   ../editorconfig.cpp
   ../korganizereditorconfig.cpp
+  ../ktimezonecombobox.cpp
 )
 
 ### Build the desktop version
--- branches/work/kdepim_kcalcore/incidenceeditors/incidenceeditor-ng/eventortododesktop.ui #1155947:1155948
@@ -1489,7 +1489,7 @@
   <customwidget>
    <class>KPIM::KTimeZoneComboBox</class>
    <extends>KComboBox</extends>
-   <header>libkdepim/ktimezonecombobox.h</header>
+   <header>ktimezonecombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KPIM::KTimeEdit</class>
--- branches/work/kdepim_kcalcore/incidenceeditors/incidenceeditor-ng/eventortodomobile.ui #1155947:1155948
@@ -393,7 +393,7 @@
   <customwidget>
    <class>KPIM::KTimeZoneComboBox</class>
    <extends>KComboBox</extends>
-   <header>libkdepim/ktimezonecombobox.h</header>
+   <header>ktimezonecombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
--- branches/work/kdepim_kcalcore/libkdepim/CMakeLists.txt #1155947:1155948
@@ -24,7 +24,6 @@
    kdatepickerpopup.cpp
    kcheckcombobox.cpp
    kweekdaycheckcombo.cpp
-   ktimezonecombobox.cpp
    ldap/ldapclient.cpp
    ldap/ldapsearchdialog.cpp
    overlaywidget.cpp
@@ -63,7 +62,6 @@
 target_link_libraries(kdepim
   ${KDEPIMLIBS_KRESOURCES_LIBS}
   ${KDEPIMLIBS_KABC_LIBS}
-  ${KDEPIMLIBS_KCAL_LIBS}
   ${KDEPIMLIBS_KPIMUTILS_LIBS}
   ${KDEPIMLIBS_KLDAP_LIBS}
   ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
@@ -74,13 +72,11 @@
   ${KDEPIMLIBS_KMIME_LIBS}
   ${KDEPIMLIBS_AKONADI_LIBS}
   ${KDEPIMLIBS_AKONADI_CONTACT_LIBS}
-  ${KDEPIMLIBS_KCALCORE_LIBS}
 )
 
 target_link_libraries(kdepim LINK_INTERFACE_LIBRARIES
   ${KDEPIMLIBS_KRESOURCES_LIBS}
   ${KDEPIMLIBS_KABC_LIBS}
-  ${KDEPIMLIBS_KCAL_LIBS}
   ${KDEPIMLIBS_KPIMUTILS_LIBS}
   ${KDEPIMLIBS_KLDAP_LIBS}
   ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
--- branches/work/kdepim_kcalcore/libkdepim/kdepim.widgets #1155947:1155948
@@ -29,9 +29,3 @@
 ConstructorArgs=(parent)
 Group=Input (KDE-PIM)
 
-[KPIM::KTimeZoneComboBox]
-ToolTip=Time Zone Combobox (KDE-PIM)
-WhatsThis=A widget to select a time zone.
-IncludeFile=libkdepim/ktimezonecombobox.h
-ConstructorArgs=(parent)
-Group=Input (KDE-PIM)
--- branches/work/kdepim_kcalcore/mobile/lib/CMakeLists.txt #1155947:1155948
@@ -1,5 +1,6 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}/akonadi/
+    ${CMAKE_SOURCE_DIR}/incidenceeditors
     ${Boost_INCLUDE_DIR}
 )
 
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/