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

List:       kde-commits
Subject:    playground/pim/microblog
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2009-04-04 13:11:20
Message-ID: 1238850680.342544.15103.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 949067 by toma:

Remove the statusitem which has move to its own library. 
Remove the serializer which is now in kdepim//akoonadi/plaugins
Adapt the code to these changes.


 M  +1 -2      CMakeLists.txt  
 M  +1 -3      demoapp/CMakeLists.txt  
 M  +2 -1      demoapp/blogmodel.cpp  
 M  +2 -1      microblog.cpp  
 D             serializer (directory)  
 D             statusitem.cpp  
 D             statusitem.h  


--- trunk/playground/pim/microblog/CMakeLists.txt #949066:949067
@@ -42,7 +42,6 @@
   configdialog.cpp
   settings.cpp
   communication.cpp
-  statusitem.cpp
   idattribute.cpp
 )
 
@@ -55,7 +54,7 @@
 kde4_add_kcfg_files(microblogresource_SRCS settingsbase.kcfgc)
 kde4_add_executable(akonadi_microblog_resource RUN_UNINSTALLED \
${microblogresource_SRCS})  
-target_link_libraries(akonadi_microblog_resource ${KDE4_KDECORE_LIBS} \
${KDE4_KDEUI_LIBS} ${KDE4_AKONADI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} \
${KDE4_KPIMUTILS_LIBS} ) +target_link_libraries(akonadi_microblog_resource \
${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_AKONADI_LIBS} ${QT_QTDBUS_LIBRARY} \
${QT_QTCORE_LIBRARY} ${KDE4_KPIMUTILS_LIBS} microblog )  
 install(TARGETS akonadi_microblog_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
 install( FILES microblog.desktop DESTINATION \
                "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
--- trunk/playground/pim/microblog/demoapp/CMakeLists.txt #949066:949067
@@ -4,7 +4,6 @@
     mainwindow.cpp
     blogmodel.cpp
     microblogdelegate.cpp
-    ../statusitem.cpp
     akonaditabbar.cpp
 )
 
@@ -13,6 +12,5 @@
 kde4_add_executable(akonablog_bin ${akonablog_bin_SRCS})
 set_target_properties(akonablog_bin PROPERTIES OUTPUT_NAME akonablog)
 
-target_link_libraries( akonablog_bin ${KDE4_AKONADI_LIBS} ${KDE4_KDEUI_LIBS} \
${QT_QTWEBKIT_LIBRARY} ${KDE4_KPIMUTILS_LIBS} ) +target_link_libraries( akonablog_bin \
${KDE4_AKONADI_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KPIMUTILS_LIBS} \
microblog)  
-#install(TARGETS akonablog_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/playground/pim/microblog/demoapp/blogmodel.cpp #949066:949067
@@ -18,8 +18,8 @@
 */
 
 #include "blogmodel.h"
-#include "../statusitem.h"
 
+#include <microblog/statusitem.h>
 #include <akonadi/itemfetchscope.h>
 #include <akonadi/monitor.h>
 #include <akonadi/session.h>
@@ -32,6 +32,7 @@
 #include <QtCore/QDebug>
 
 using namespace Akonadi;
+using namespace Microblog;
 
 class BlogModel::Private
 {
--- trunk/playground/pim/microblog/microblog.cpp #949066:949067
@@ -21,7 +21,6 @@
 #include "configdialog.h"
 #include "communication.h"
 #include "settingsadaptor.h"
-#include "statusitem.h"
 #include "idattribute.h"
 
 #include <kdebug.h>
@@ -33,9 +32,11 @@
 #include <akonadi/attributefactory.h>
 #include <akonadi/cachepolicy.h>
 #include <akonadi/item.h>
+#include <microblog/statusitem.h>
 
 
 using namespace Akonadi;
+using namespace Microblog;
 
 MicroblogResource::MicroblogResource( const QString &id )
         : ResourceBase( id ), m_comm( 0 )


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