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

List:       kde-commits
Subject:    playground/pim/krss
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2009-05-25 6:13:55
Message-ID: 1243232035.330718.8136.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 972492 by osterfeld:

prepare for Protocol Buffers serializer impl

 M  +9 -0      CMakeLists.txt  
 A             cmake (directory)  
 A             cmake/modules (directory)  
 A             cmake/modules/FindProtocolBuffers.cmake  
 M  +12 -2     libkrss/CMakeLists.txt  
 D             libkrss/rssitemserializer.cpp  
 M  +11 -1     libkrss/rssitemserializer.h  
 A             libkrss/rssitemserializer_protobuf.cpp   [License: LGPL (v2+)]
 A             libkrss/rssitemserializer_xml.cpp   \
libkrss/rssitemserializer.cpp#972098 [License: LGPL (v2+)]


--- trunk/playground/pim/krss/CMakeLists.txt #972491:972492
@@ -1,10 +1,19 @@
 project(krss)
 
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+
 find_package(KDE4 REQUIRED)
 find_package(KdepimLibs REQUIRED)
 find_package(Boost REQUIRED)
 include (KDE4Defaults)
 
+if (KRSS_ENABLE_PROTOBUF_SERIALIZER)
+    find_package(ProtocolBuffers REQUIRED)
+    add_definitions( -DKRSS_ENABLE_PROTOBUF_SERIALIZER)
+    include_directories( ${PROTOBUF_INCLUDE_DIR} )
+endif (KRSS_ENABLE_PROTOBUF_SERIALIZER)
+
 include_directories( ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} \
${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS}  ${QT_INCLUDES} \
${CMAKE_CURRENT_BINARY_DIR}/libkrss )  
--- trunk/playground/pim/krss/libkrss/CMakeLists.txt #972491:972492
@@ -23,7 +23,6 @@
    person.cpp
    category.cpp
    rssitem.cpp
-   rssitemserializer.cpp
    tag.cpp
    feedpropertiescollectionattribute.cpp
    subscriptionlabelscollectionattribute.cpp
@@ -49,6 +48,7 @@
    netfeedcreatejob.cpp
    persistentfeedmodifyjob.cpp
    persistentfeeddeletejob.cpp
+   rssitemserializer_xml.cpp
    standardactionmanager.cpp
    #subscriptionsmodel.cpp
    tagjobs.cpp
@@ -61,6 +61,12 @@
    ui/tagpropertiesdialog.cpp
 )
 
+if(KRSS_ENABLE_PROTOBUF_SERIALIZER)
+    set(krss_LIB_SRCS
+        ${krss_LIB_SRCS}
+        rssitemserializer_protobuf.cpp
+    )
+endif(KRSS_ENABLE_PROTOBUF_SERIALIZER)
 
 if(Nepomuk_FOUND)
 set(krss_LIB_SRCS
@@ -122,8 +128,12 @@
 
 kde4_add_library(krss SHARED ${krss_LIB_SRCS})
 
-target_link_libraries(krss ${KDE4_SYNDICATION_LIBS} ${KDE4_KDECORE_LIBS} \
${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_AKONADI_LIBS}) \
+if(KRSS_ENABLE_PROTOBUF_SERIALIZER) +    set(KRSS_EXTRA_LIBS ${PROTOBUF_LIBRARY})
+endif(KRSS_ENABLE_PROTOBUF_SERIALIZER)
 
+target_link_libraries(krss ${KDE4_SYNDICATION_LIBS} ${KDE4_KDECORE_LIBS} \
${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_AKONADI_LIBS} ${KRSS_EXTRA_LIBS}) +
 if (Nepomuk_FOUND)
     target_link_libraries(krss ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES})
 endif (Nepomuk_FOUND)
--- trunk/playground/pim/krss/libkrss/rssitemserializer.h #972491:972492
@@ -42,7 +42,7 @@
         Full
     };
 
-    virtual ~RssItemSerializer();
+    virtual ~RssItemSerializer() {}
     virtual void serialize( const KRss::RssItem& item, QByteArray& array, ItemPart \
                part = Full ) const = 0;
     virtual bool deserialize( KRss::RssItem& item, const QByteArray& array, ItemPart \
part = Full ) const = 0;  };
@@ -54,6 +54,16 @@
     bool deserialize( KRss::RssItem& item, const QByteArray& array, ItemPart part = \
Full ) const;  };
 
+#ifdef KRSS_ENABLE_PROTOBUF_SERIALIZER
+
+class KRSS_EXPORT ProtobufRssItemSerializerImpl : public RssItemSerializer
+{
+    void serialize( const KRss::RssItem& item, QByteArray& array, ItemPart part = \
Full ) const; +    bool deserialize( KRss::RssItem& item, const QByteArray& array, \
ItemPart part = Full ) const; +};
+
+#endif
+
 }
 
 #endif // KRSS_RSSITEMSERIALIZER_H


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