From 1159c863a228ca8bd0dcb8664637c737f1df8f41 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 29 Apr 2017 21:50:55 +0200
Subject: [PATCH] moved wiki and wire items to rsitems/

---
 libretroshare/src/libretroshare.pro                      | 8 ++++----
 libretroshare/src/{serialiser => rsitems}/rswikiitems.cc | 4 ++--
 libretroshare/src/{serialiser => rsitems}/rswikiitems.h  | 2 +-
 libretroshare/src/{serialiser => rsitems}/rswireitems.cc | 0
 libretroshare/src/{serialiser => rsitems}/rswireitems.h  | 0
 libretroshare/src/services/p3wiki.cc                     | 2 +-
 libretroshare/src/services/p3wire.cc                     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename libretroshare/src/{serialiser => rsitems}/rswikiitems.cc (99%)
 rename libretroshare/src/{serialiser => rsitems}/rswikiitems.h (98%)
 rename libretroshare/src/{serialiser => rsitems}/rswireitems.cc (100%)
 rename libretroshare/src/{serialiser => rsitems}/rswireitems.h (100%)

diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 679e7c31a..2c503532a 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/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
diff --git a/libretroshare/src/serialiser/rswikiitems.cc b/libretroshare/src/rsitems/rswikiitems.cc
similarity index 99%
rename from libretroshare/src/serialiser/rswikiitems.cc
rename to libretroshare/src/rsitems/rswikiitems.cc
index dbd747b9a..8da92ab58 100644
--- a/libretroshare/src/serialiser/rswikiitems.cc
+++ b/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
 
diff --git a/libretroshare/src/serialiser/rswikiitems.h b/libretroshare/src/rsitems/rswikiitems.h
similarity index 98%
rename from libretroshare/src/serialiser/rswikiitems.h
rename to libretroshare/src/rsitems/rswikiitems.h
index a50102ab4..378b77e5a 100644
--- a/libretroshare/src/serialiser/rswikiitems.h
+++ b/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;
diff --git a/libretroshare/src/serialiser/rswireitems.cc b/libretroshare/src/rsitems/rswireitems.cc
similarity index 100%
rename from libretroshare/src/serialiser/rswireitems.cc
rename to libretroshare/src/rsitems/rswireitems.cc
diff --git a/libretroshare/src/serialiser/rswireitems.h b/libretroshare/src/rsitems/rswireitems.h
similarity index 100%
rename from libretroshare/src/serialiser/rswireitems.h
rename to libretroshare/src/rsitems/rswireitems.h
diff --git a/libretroshare/src/services/p3wiki.cc b/libretroshare/src/services/p3wiki.cc
index d91e3d5df..a707596c1 100644
--- a/libretroshare/src/services/p3wiki.cc
+++ b/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"
 
diff --git a/libretroshare/src/services/p3wire.cc b/libretroshare/src/services/p3wire.cc
index 0e525d689..7edce4a4d 100644
--- a/libretroshare/src/services/p3wire.cc
+++ b/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"