moved wiki and wire items to rsitems/

libretroshare/src/libretroshare.pro

@@ -821,20 +821,20 @@ wikipoos {
 	# Wiki Service
 	HEADERS += retroshare/rswiki.h \
 		services/p3wiki.h \
-		serialiser/rswikiitems.h
+		rsitems/rswikiitems.h
 
 	SOURCES += services/p3wiki.cc \
-		serialiser/rswikiitems.cc \
+		rsitems/rswikiitems.cc \
 }
 
 gxsthewire {
 	# Wire Service
 	HEADERS += retroshare/rswire.h \
 		services/p3wire.h \
-		serialiser/rswireitems.h
+		rsitems/rswireitems.h
 
 	SOURCES += services/p3wire.cc \
-		serialiser/rswireitems.cc \
+		rsitems/rswireitems.cc \
 }
 
 # Posted Service

libretroshare/src/rsitems/rswikiitems.cc

@@ -25,9 +25,9 @@
 
 #include <iostream>
 
-#include "rswikiitems.h"
+#include "rsitems/rswikiitems.h"
 #include "serialiser/rstlvbase.h"
-#include "serialiser/rsbaseserial.h"
+#include "serialization/rstypeserializer.h"
 
 #define GXSID_DEBUG	1
 

libretroshare/src/rsitems/rswikiitems.h

@@ -30,8 +30,8 @@
 
 #include "rsitems/rsserviceids.h"
 #include "rsitems/rsitem.h"
+#include "rsitems/rsgxsitems.h"
 
-#include "serialiser/rsgxsitems.h"
 #include "retroshare/rswiki.h"
 
 const uint8_t RS_PKT_SUBTYPE_WIKI_COLLECTION_ITEM = 0x02;

libretroshare/src/services/p3wiki.cc

@@ -25,7 +25,7 @@
 
 #include "services/p3wiki.h"
 #include "retroshare/rsgxsflags.h"
-#include "serialiser/rswikiitems.h"
+#include "rsitems/rswikiitems.h"
 
 #include "util/rsrandom.h"
 

libretroshare/src/services/p3wire.cc

@@ -24,7 +24,7 @@
  */
 
 #include "services/p3wire.h"
-#include "serialiser/rswireitems.h"
+#include "rsitems/rswireitems.h"
 
 #include "util/rsrandom.h"