[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kontact/plugins
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-06-18 13:54:12
Message-ID: 20100618135412.DD5E0AC8D7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1139511 by smartins:

todo/appt/specialdates no longer use KResources so i'm moving stdcalendar.{h,cpp} to \
planner, it's only user.

This also gets rid of hundreds of compiler deprectated warnings when compiling \
kontact, because planner isn't compiled by default.



 M  +2 -2      korganizer/CMakeLists.txt  
 D             korganizer/stdcalendar.cpp  
 D             korganizer/stdcalendar.h  
 M  +2 -2      planner/CMakeLists.txt  
 M  +1 -1      planner/planner.cpp  
 A             planner/stdcalendar.cpp   korganizer/stdcalendar.cpp#1139179 [License: \
LGPL (v2+)]  A             planner/stdcalendar.h   korganizer/stdcalendar.h#1139179 \
[License: LGPL (v2+)]  M  +1 -1      specialdates/CMakeLists.txt  


--- trunk/KDE/kdepim/kontact/plugins/korganizer/CMakeLists.txt #1139510:1139511
@@ -6,7 +6,7 @@
 ########### next target ###############
 set(libcommon_SRCS korg_uniqueapp.cpp)
 
-set(kontact_korganizerplugin_PART_SRCS korganizerplugin.cpp apptsummarywidget.cpp \
stdcalendar.cpp summaryeventinfo.cpp ${libcommon_SRCS}) \
+set(kontact_korganizerplugin_PART_SRCS korganizerplugin.cpp apptsummarywidget.cpp \
summaryeventinfo.cpp ${libcommon_SRCS})  
 qt4_add_dbus_interfaces(kontact_korganizerplugin_PART_SRCS \
${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml  \
${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)  
@@ -16,7 +16,7 @@
 
 ########### next target ###############
 
-set(kontact_todoplugin_PART_SRCS todoplugin.cpp todosummarywidget.cpp \
stdcalendar.cpp ${libcommon_SRCS}) +set(kontact_todoplugin_PART_SRCS todoplugin.cpp \
todosummarywidget.cpp ${libcommon_SRCS})  
 qt4_add_dbus_interfaces(kontact_todoplugin_PART_SRCS \
${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml  \
${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)  
--- trunk/KDE/kdepim/kontact/plugins/planner/CMakeLists.txt #1139510:1139511
@@ -4,13 +4,13 @@
 
 ########### next target ###############
 
-set(kontact_plannerplugin_PART_SRCS plannerplugin.cpp planner.cpp)
+set(kontact_plannerplugin_PART_SRCS plannerplugin.cpp planner.cpp stdcalendar.cpp)
 
 qt4_add_dbus_interfaces(kontact_plannerplugin_PART_SRCS \
${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml  \
${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)  
 kde4_add_plugin(kontact_plannerplugin ${kontact_plannerplugin_PART_SRCS})
 
-target_link_libraries(kontact_plannerplugin  ${KDE4_KDECORE_LIBS} \
${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} \
${KDEPIMLIBS_KONTACTINTERFACE_LIBS} kdepim korganizerprivate kaddressbookprivate \
${KDE4_AKONADI_CONTACT_LIBS}) +target_link_libraries(kontact_plannerplugin  \
${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} \
${KDEPIMLIBS_KONTACTINTERFACE_LIBS} kdepim korganizerprivate kaddressbookprivate \
${KDE4_AKONADI_CONTACT_LIBS} ${KDE4_KDE3SUPPORT_LIBS})  
 ########### next target ###############
 
--- trunk/KDE/kdepim/kontact/plugins/planner/planner.cpp #1139510:1139511
@@ -27,7 +27,7 @@
 #include "planner.h"
 #include "plannerplugin.h"
 #include "korganizer/korganizerinterface.h"
-#include "korganizer/stdcalendar.h"
+#include "stdcalendar.h"
 
 #include <akonadi/contact/contactsearchjob.h>
 
--- trunk/KDE/kdepim/kontact/plugins/specialdates/CMakeLists.txt #1139510:1139511
@@ -9,7 +9,7 @@
     ${Boost_INCLUDE_DIR}
     )
 
-set(kontact_specialdatesplugin_PART_SRCS specialdates_plugin.cpp sdsummarywidget.cpp \
../korganizer/stdcalendar.cpp) +set(kontact_specialdatesplugin_PART_SRCS \
specialdates_plugin.cpp sdsummarywidget.cpp)  
 kde4_add_plugin(kontact_specialdatesplugin ${kontact_specialdatesplugin_PART_SRCS})
 


[prev in list] [next in list] [prev in thread] [next in thread]