'[kdepim/akregator_port] krss: Make RssItemSerializer private to the serializer plugin'

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

List:       kde-commits
Subject:    [kdepim/akregator_port] krss: Make RssItemSerializer private to the serializer plugin
From:       Frank Osterfeld <frank.osterfeld () kdab ! com>
Date:       2012-02-24 15:53:17
Message-ID: 20120224155317.E8058A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit f9c9b7aadd8ac1576d31935f1ef9bba6c6d4b641 by Frank Osterfeld.
Committed on 24/02/2012 at 16:39.
Pushed by osterfeld into branch 'akregator_port'.

Make RssItemSerializer private to the serializer plugin

M  +0    -40   krss/krss/CMakeLists.txt
M  +1    -1    krss/krss/tests/CMakeLists.txt
M  +35   -1    krss/plugin/CMakeLists.txt
M  +1    -1    krss/plugin/akonadi_serializer_rss.h
R  +0    -0    krss/plugin/krss.proto [from: krss/krss/krss.proto - 100% si=
milarity]
R  +1    -3    krss/plugin/rssitemserializer.h [from: krss/krss/rssitemseri=
alizer.h - 095% similarity]
R  +0    -0    krss/plugin/rssitemserializer_json.cpp [from: krss/krss/rssi=
temserializer_json.cpp - 100% similarity]
R  +0    -0    krss/plugin/rssitemserializer_protobuf.cpp [from: krss/krss/=
rssitemserializer_protobuf.cpp - 100% similarity]
R  +0    -0    krss/plugin/rssitemserializer_qdatastream.cpp [from: krss/kr=
ss/rssitemserializer_qdatastream.cpp - 100% similarity]
R  +4    -4    krss/plugin/rssitemserializer_xml.cpp [from: krss/krss/rssit=
emserializer_xml.cpp - 099% similarity]
A  +52   -0    krss/plugin/tests/CMakeLists.txt
R  +5    -5    krss/plugin/tests/testxmlitemserializer.cpp [from: krss/krss=
/tests/testxmlitemserializer.cpp - 097% similarity]
R  +0    -0    krss/plugin/tests/testxmlitemserializer.h [from: krss/krss/t=
ests/testxmlitemserializer.h - 100% similarity]

http://commits.kde.org/kdepim/f9c9b7aadd8ac1576d31935f1ef9bba6c6d4b641

diff --git a/krss/krss/CMakeLists.txt b/krss/krss/CMakeLists.txt
index 1cd3239..d845c3c 100644
--- a/krss/krss/CMakeLists.txt
+++ b/krss/krss/CMakeLists.txt
@@ -24,38 +24,6 @@ set(krss_LIB_SRCS
    feeditemmodel.cpp
 )
 =

-if(KRSS_ENABLE_PROTOBUF_SERIALIZER)
-    WRAP_PROTO(krss_LIB_PROTOBUF_SRCS krss.proto)
-
-    set(krss_LIB_SRCS
-        ${krss_LIB_SRCS}
-        ${krss_LIB_PROTOBUF_SRCS}
-        rssitemserializer_protobuf.cpp
-    )
-    set(KRSS_EXTRA_LIBS ${PROTOBUF_LIBRARY})
-else(KRSS_ENABLE_PROTOBUF_SERIALIZER)
-if(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
-    set(krss_LIB_SRCS
-        ${krss_LIB_SRCS}
-        rssitemserializer_qdatastream.cpp
-    )
-    set(KRSS_EXTRA_LIBS ${PROTOBUF_LIBRARY})
-else(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
-if(KRSS_ENABLE_JSON_SERIALIZER)
-   set(krss_LIB_SRCS
-       ${krss_LIB_SRCS}
-       rssitemserializer_json.cpp
-   )
-   set(KRSS_EXTRA_LIBS qjson)
-else(KRSS_ENABLE_JSON_SERIALIZER)
-   set(krss_LIB_SRCS
-       ${krss_LIB_SRCS}
-       rssitemserializer_xml.cpp
-   )
-endif(KRSS_ENABLE_JSON_SERIALIZER)
-endif(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
-endif(KRSS_ENABLE_PROTOBUF_SERIALIZER)
-
 set(krss_LIB_HDRS
    krss_export.h
    item.h
@@ -66,10 +34,6 @@ set(krss_LIB_HDRS
    rssitem.h  #TODO review if rssitem.h should be private
 )
 =

-set(krss_PRIVATE_LIB_HDRS
-    rssitemserializer.h
-)
-
 kde4_add_library(krss ${LIBRARY_TYPE} ${krss_LIB_SRCS})
 =

 if(KRSS_ENABLE_PROTOBUF_SERIALIZER)
@@ -84,9 +48,5 @@ target_link_libraries(krss
                       ${KRSS_EXTRA_LIBS}
 )
 =

-if (Nepomuk_FOUND)
-    target_link_libraries(krss ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES})
-endif (Nepomuk_FOUND)
-
 set_target_properties(krss PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVER=
SION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS krss ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/krss/krss/tests/CMakeLists.txt b/krss/krss/tests/CMakeLists.txt
index 0f2e06f..5b118b4 100644
--- a/krss/krss/tests/CMakeLists.txt
+++ b/krss/krss/tests/CMakeLists.txt
@@ -33,7 +33,7 @@ macro(add_simple_test _testName)
 endmacro(add_simple_test)
 =

 #add_simple_test(feedcollectiontest feedcollectiontest.cpp)
-add_simple_test(testxmlitemserializer testxmlitemserializer.cpp)
+#add_simple_test(testxmlitemserializer testxmlitemserializer.cpp)
 add_simple_test(testitem testitem.cpp)
 add_simple_test(testcategory testcategory.cpp)
 add_simple_test(testperson testperson.cpp)
diff --git a/krss/plugin/CMakeLists.txt b/krss/plugin/CMakeLists.txt
index f807908..84f432d 100644
--- a/krss/plugin/CMakeLists.txt
+++ b/krss/plugin/CMakeLists.txt
@@ -1,9 +1,43 @@
+add_subdirectory( tests )
+
 set(akonadi_serializer_rss_SRCS
     akonadi_serializer_rss.cpp
 )
 =

+if(KRSS_ENABLE_PROTOBUF_SERIALIZER)
+    WRAP_PROTO(krss_LIB_PROTOBUF_SRCS krss.proto)
+
+    set(akonadi_serializer_rss_SRCS
+        ${akonadi_serializer_rss_SRCS}
+        ${krss_LIB_PROTOBUF_SRCS}
+        rssitemserializer_protobuf.cpp
+    )
+    set(KRSS_EXTRA_LIBS ${PROTOBUF_LIBRARY})
+else(KRSS_ENABLE_PROTOBUF_SERIALIZER)
+if(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
+    set(akonadi_serializer_rss_SRCS
+        ${akonadi_serializer_rss_SRCS}
+        rssitemserializer_qdatastream.cpp
+    )
+    set(KRSS_EXTRA_LIBS ${PROTOBUF_LIBRARY})
+else(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
+if(KRSS_ENABLE_JSON_SERIALIZER)
+   set(akonadi_serializer_rss_SRCS
+       ${akonadi_serializer_rss_SRCS}
+       rssitemserializer_json.cpp
+   )
+   set(KRSS_EXTRA_LIBS qjson)
+else(KRSS_ENABLE_JSON_SERIALIZER)
+   set(akonadi_serializer_rss_SRCS
+       ${akonadi_serializer_rss_SRCS}
+       rssitemserializer_xml.cpp
+   )
+endif(KRSS_ENABLE_JSON_SERIALIZER)
+endif(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
+endif(KRSS_ENABLE_PROTOBUF_SERIALIZER)
+
 kde4_add_plugin(akonadi_serializer_rss ${akonadi_serializer_rss_SRCS})
-target_link_libraries(akonadi_serializer_rss ${KDE4_KIO_LIBS} ${KDEPIMLIBS=
_AKONADI_LIBS} krss)
+target_link_libraries(akonadi_serializer_rss ${KDE4_KIO_LIBS} ${KDEPIMLIBS=
_AKONADI_LIBS} ${KDEPIMLIBS_SYNDICATION_LIBS} krss)
 =

 install(TARGETS akonadi_serializer_rss DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES akonadi_serializer_rss.desktop DESTINATION "${DATA_INSTALL_D=
IR}/akonadi/plugins/serializer")
diff --git a/krss/plugin/akonadi_serializer_rss.h b/krss/plugin/akonadi_ser=
ializer_rss.h
index ce8a863..9089c29 100644
--- a/krss/plugin/akonadi_serializer_rss.h
+++ b/krss/plugin/akonadi_serializer_rss.h
@@ -18,7 +18,7 @@
 #ifndef AKONADI_SERIALIZER_RSS
 #define AKONADI_SERIALIZER_RSS
 =

-#include <krss/rssitemserializer.h>
+#include "rssitemserializer.h"
 =

 #include <akonadi/itemserializerplugin.h>
 =

diff --git a/krss/krss/krss.proto b/krss/plugin/krss.proto
similarity index 100%
rename from krss/krss/krss.proto
rename to krss/plugin/krss.proto
diff --git a/krss/krss/rssitemserializer.h b/krss/plugin/rssitemserializer.h
similarity index 95%
rename from krss/krss/rssitemserializer.h
rename to krss/plugin/rssitemserializer.h
index b2693fb..7dcaaed 100644
--- a/krss/krss/rssitemserializer.h
+++ b/krss/plugin/rssitemserializer.h
@@ -23,8 +23,6 @@
 #ifndef KRSS_RSSITEMSERIALIZER_H
 #define KRSS_RSSITEMSERIALIZER_H
 =

-#include "krss_export.h"
-
 class QByteArray;
 =

 namespace KRss
@@ -32,7 +30,7 @@ namespace KRss
 =

 class RssItem;
 =

-class KRSS_EXPORT RssItemSerializer
+class RssItemSerializer
 {
 public:
 =

diff --git a/krss/krss/rssitemserializer_json.cpp b/krss/plugin/rssitemseri=
alizer_json.cpp
similarity index 100%
rename from krss/krss/rssitemserializer_json.cpp
rename to krss/plugin/rssitemserializer_json.cpp
diff --git a/krss/krss/rssitemserializer_protobuf.cpp b/krss/plugin/rssitem=
serializer_protobuf.cpp
similarity index 100%
rename from krss/krss/rssitemserializer_protobuf.cpp
rename to krss/plugin/rssitemserializer_protobuf.cpp
diff --git a/krss/krss/rssitemserializer_qdatastream.cpp b/krss/plugin/rssi=
temserializer_qdatastream.cpp
similarity index 100%
rename from krss/krss/rssitemserializer_qdatastream.cpp
rename to krss/plugin/rssitemserializer_qdatastream.cpp
diff --git a/krss/krss/rssitemserializer_xml.cpp b/krss/plugin/rssitemseria=
lizer_xml.cpp
similarity index 99%
rename from krss/krss/rssitemserializer_xml.cpp
rename to krss/plugin/rssitemserializer_xml.cpp
index f0201d6..e1136da 100644
--- a/krss/krss/rssitemserializer_xml.cpp
+++ b/krss/plugin/rssitemserializer_xml.cpp
@@ -21,10 +21,10 @@
  */
 =

 #include "rssitemserializer.h"
-#include "category.h"
-#include "enclosure.h"
-#include "rssitem.h"
-#include "person.h"
+#include <krss/category.h>
+#include <krss/enclosure.h>
+#include <krss/rssitem.h>
+#include <krss/person.h>
 =

 #include <syndication/atom/constants.h>
 #include <syndication/constants.h>
diff --git a/krss/plugin/tests/CMakeLists.txt b/krss/plugin/tests/CMakeList=
s.txt
new file mode 100644
index 0000000..bce1783
--- /dev/null
+++ b/krss/plugin/tests/CMakeLists.txt
@@ -0,0 +1,52 @@
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../krss
+)
+
+macro(add_simple_test _testName)
+  set(_targetName ${_testName})
+  set(_srcList ${ARGN})
+  kde4_add_unit_test(${_targetName} ${_srcList})
+  target_link_libraries(${_targetName} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIB=
RARY} ${QT_QTTEST_LIBRARY} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_SYNDICAT=
ION_LIBS} ${KDE4_KDECORE_LIBS} krss)
+endmacro(add_simple_test)
+
+set(testxmlitemserializer_SRCS
+    testxmlitemserializer.cpp
+)
+
+if(KRSS_ENABLE_PROTOBUF_SERIALIZER)
+    WRAP_PROTO(krss_LIB_PROTOBUF_SRCS krss.proto)
+
+    set(testxmlitemserializer_SRCS
+        ${testxmlitemserializer_SRCS}
+        ${krss_LIB_PROTOBUF_SRCS}
+        ${CMAKE_CURRENT_SOURCE_DIR}/../rssitemserializer_protobuf.cpp
+    )
+    set(KRSS_EXTRA_LIBS ${PROTOBUF_LIBRARY})
+else(KRSS_ENABLE_PROTOBUF_SERIALIZER)
+if(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
+    set(testxmlitemserializer_SRCS
+        ${testxmlitemserializer_SRCS}
+        ${CMAKE_CURRENT_SOURCE_DIR}/../rssitemserializer_qdatastream.cpp
+    )
+    set(KRSS_EXTRA_LIBS ${PROTOBUF_LIBRARY})
+else(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
+if(KRSS_ENABLE_JSON_SERIALIZER)
+   set(testxmlitemserializer_SRCS
+       ${testxmlitemserializer_SRCS}
+       ${CMAKE_CURRENT_SOURCE_DIR}/../rssitemserializer_json.cpp
+   )
+   set(KRSS_EXTRA_LIBS qjson)
+else(KRSS_ENABLE_JSON_SERIALIZER)
+   set(testxmlitemserializer_SRCS
+       ${testxmlitemserializer_SRCS}
+       ${CMAKE_CURRENT_SOURCE_DIR}/../rssitemserializer_xml.cpp
+   )
+endif(KRSS_ENABLE_JSON_SERIALIZER)
+endif(KRSS_ENABLE_QDATASTREAM_SERIALIZER)
+endif(KRSS_ENABLE_PROTOBUF_SERIALIZER)
+
+add_simple_test(testxmlitemserializer ${testxmlitemserializer_SRCS})
diff --git a/krss/krss/tests/testxmlitemserializer.cpp b/krss/plugin/tests/=
testxmlitemserializer.cpp
similarity index 97%
rename from krss/krss/tests/testxmlitemserializer.cpp
rename to krss/plugin/tests/testxmlitemserializer.cpp
index e0ce96b..f333015 100644
--- a/krss/krss/tests/testxmlitemserializer.cpp
+++ b/krss/plugin/tests/testxmlitemserializer.cpp
@@ -22,11 +22,11 @@
 =

 #include "testxmlitemserializer.h"
 =

-#include "enclosure.h"
-#include "person.h"
-#include "category.h"
-#include "item.h"
-#include "rssitem.h"
+#include <krss/enclosure.h>
+#include <krss/person.h>
+#include <krss/category.h>
+#include <krss/item.h>
+#include <krss/rssitem.h>
 #include "rssitemserializer.h"
 =

 #include <KDateTime>
diff --git a/krss/krss/tests/testxmlitemserializer.h b/krss/plugin/tests/te=
stxmlitemserializer.h
similarity index 100%
rename from krss/krss/tests/testxmlitemserializer.h
rename to krss/plugin/tests/testxmlitemserializer.h
[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic