moved rsserializer and rstypeserializer to serialiser/

2025-05-02 06:06:10 -04:00 · 2017-04-30 16:05:37 +02:00 · 2017-04-30 16:05:37 +02:00 · e401b90e02
commit e401b90e02
parent 4f92f483fa
50 changed files with 52 additions and 248 deletions
--- a/libretroshare/src/rsitems/rsbanlistitems.cc
+++ b/libretroshare/src/rsitems/rsbanlistitems.cc
@ -26,7 +26,7 @@
 #include "serialiser/rsbaseserial.h"
 #include "rsitems/rsbanlistitems.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /***
 #define RSSERIAL_DEBUG 1
--- a/libretroshare/src/rsitems/rsbanlistitems.h
+++ b/libretroshare/src/rsitems/rsbanlistitems.h
@ -32,7 +32,7 @@
 #include "rsitems/rsitem.h"
 #include "rsitems/itempriorities.h"
 #include "serialiser/rstlvbanlist.h"
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 #define RS_PKT_SUBTYPE_BANLIST_ITEM_deprecated  		0x01
 #define RS_PKT_SUBTYPE_BANLIST_CONFIG_ITEM_deprecated 	0x02
--- a/libretroshare/src/rsitems/rsbwctrlitems.h
+++ b/libretroshare/src/rsitems/rsbwctrlitems.h
@ -32,8 +32,8 @@
 #include "rsitems/rsserviceids.h"
 #include "rsitems/itempriorities.h"

-#include "serialization/rsserializer.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rsserializer.h"
+#include "serialiser/rstypeserializer.h"

 #define RS_PKT_SUBTYPE_BWCTRL_ALLOWED_ITEM       0x01

--- a/libretroshare/src/rsitems/rsconfigitems.cc
+++ b/libretroshare/src/rsitems/rsconfigitems.cc
@ -28,7 +28,7 @@
 #include "rsitems/rsconfigitems.h"
 #include "retroshare/rspeers.h" // Needed for RsGroupInfo.

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 /***
 * #define RSSERIAL_DEBUG 		1
 * #define RSSERIAL_ERROR_DEBUG 	1
--- a/libretroshare/src/rsitems/rsconfigitems.h
+++ b/libretroshare/src/rsitems/rsconfigitems.h
@ -39,7 +39,7 @@
 #include "serialiser/rstlvkeyvalue.h"
 #include "serialiser/rstlvaddrs.h"

-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 class RsGroupInfo;

--- a/libretroshare/src/rsitems/rsdiscovery2items.cc
+++ b/libretroshare/src/rsitems/rsdiscovery2items.cc
@ -27,7 +27,7 @@
 #include "rsitems/rsdiscovery2items.h"
 #include "serialiser/rsbaseserial.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 #if 0

--- a/libretroshare/src/rsitems/rsdiscovery2items.h
+++ b/libretroshare/src/rsitems/rsdiscovery2items.h
@ -35,7 +35,7 @@
 #include "rsitems/rsitem.h"
 #include "rsitems/itempriorities.h"

-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 const uint8_t RS_PKT_SUBTYPE_DISC_PGP_LIST           = 0x01;
 const uint8_t RS_PKT_SUBTYPE_DISC_PGP_CERT           = 0x02;
--- a/libretroshare/src/rsitems/rsfiletransferitems.cc
+++ b/libretroshare/src/rsitems/rsfiletransferitems.cc
@ -28,7 +28,7 @@
 #include "serialiser/rstlvbase.h"
 #include "rsitems/rsfiletransferitems.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /***
 * #define RSSERIAL_DEBUG 1
--- a/libretroshare/src/rsitems/rsfiletransferitems.h
+++ b/libretroshare/src/rsitems/rsfiletransferitems.h
@ -34,7 +34,7 @@
 #include "rsitems/rsserviceids.h"
 #include "rsitems/itempriorities.h"

-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 const uint8_t RS_PKT_SUBTYPE_FT_DATA_REQUEST       = 0x01;
 const uint8_t RS_PKT_SUBTYPE_FT_DATA               = 0x02;
--- a/libretroshare/src/rsitems/rsgxschannelitems.cc
+++ b/libretroshare/src/rsitems/rsgxschannelitems.cc
@ -29,7 +29,7 @@
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rsbaseserial.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 RsItem *RsGxsChannelSerialiser::create_item(uint16_t service_id,uint8_t item_subtype) const
 {
--- a/libretroshare/src/rsitems/rsgxschannelitems.h
+++ b/libretroshare/src/rsitems/rsgxschannelitems.h
@ -37,7 +37,7 @@

 #include "retroshare/rsgxschannels.h"

-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 #include "util/rsdir.h"

--- a/libretroshare/src/rsitems/rsgxscircleitems.cc
+++ b/libretroshare/src/rsitems/rsgxscircleitems.cc
@ -27,7 +27,7 @@

 #include "rsgxscircleitems.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 //#define CIRCLE_DEBUG	1

--- a/libretroshare/src/rsitems/rsgxscommentitems.cc
+++ b/libretroshare/src/rsitems/rsgxscommentitems.cc
@ -28,7 +28,7 @@
 #include "rsgxscommentitems.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rsbaseserial.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 //#define GXSCOMMENT_DEBUG	1

--- a/libretroshare/src/rsitems/rsgxsforumitems.cc
+++ b/libretroshare/src/rsitems/rsgxsforumitems.cc
@ -27,7 +27,7 @@

 #include "rsgxsforumitems.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 //#define GXSFORUM_DEBUG	1

--- a/libretroshare/src/rsitems/rsgxsforumitems.h
+++ b/libretroshare/src/rsitems/rsgxsforumitems.h
@ -31,7 +31,7 @@
 #include "rsitems/rsserviceids.h"
 #include "rsitems/rsgxsitems.h"

-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 #include "retroshare/rsgxsforums.h"

--- a/libretroshare/src/rsitems/rsgxsiditems.cc
+++ b/libretroshare/src/rsitems/rsgxsiditems.cc
@ -31,7 +31,7 @@
 #include "serialiser/rstlvstring.h"
 #include "util/rsstring.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 #define GXSID_DEBUG	1

--- a/libretroshare/src/rsitems/rsgxsrecognitems.cc
+++ b/libretroshare/src/rsitems/rsgxsrecognitems.cc
@ -24,7 +24,7 @@
 */

 #include "rsitems/rsgxsrecognitems.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /***
 #define RSSERIAL_DEBUG 1
--- a/libretroshare/src/rsitems/rsgxsreputationitems.cc
+++ b/libretroshare/src/rsitems/rsgxsreputationitems.cc
@ -28,7 +28,7 @@
 #include "serialiser/rsbaseserial.h"
 #include "rsitems/rsgxsreputationitems.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /***
 #define RSSERIAL_DEBUG 1
--- a/libretroshare/src/rsitems/rsgxsreputationitems.h
+++ b/libretroshare/src/rsitems/rsgxsreputationitems.h
@ -37,7 +37,7 @@
 #include "retroshare/rsgxsifacetypes.h"
 #include "retroshare/rsreputations.h"

-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 #define RS_PKT_SUBTYPE_GXS_REPUTATION_CONFIG_ITEM          0x01
 #define RS_PKT_SUBTYPE_GXS_REPUTATION_SET_ITEM_deprecated2 0x02
--- a/libretroshare/src/rsitems/rsgxsupdateitems.cc
+++ b/libretroshare/src/rsitems/rsgxsupdateitems.cc
@ -23,7 +23,7 @@
 *
 */

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 #include "serialiser/rsbaseserial.h"

 #include "rsgxsupdateitems.h"
--- a/libretroshare/src/rsitems/rshistoryitems.cc
+++ b/libretroshare/src/rsitems/rshistoryitems.cc
@ -29,7 +29,7 @@
 #include "serialiser/rsbaseserial.h"
 #include "serialiser/rstlvbase.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /***
 #define RSSERIAL_DEBUG 1
--- a/libretroshare/src/rsitems/rshistoryitems.h
+++ b/libretroshare/src/rsitems/rshistoryitems.h
@ -31,7 +31,7 @@
 #include "rsitems/rsconfigitems.h"
 #include "retroshare/rstypes.h"

-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 /**************************************************************************/

--- a/libretroshare/src/rsitems/rsitem.h
+++ b/libretroshare/src/rsitems/rsitem.h
@ -2,7 +2,7 @@

 #include "util/smallobject.h"
 #include "retroshare/rstypes.h"
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 class RsItem: public RsMemoryManagement::SmallObject
 {
--- a/libretroshare/src/rsitems/rsmsgitems.cc
+++ b/libretroshare/src/rsitems/rsmsgitems.cc
@ -31,7 +31,7 @@

 #include "rsitems/rsmsgitems.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /***
 #define RSSERIAL_DEBUG 1
--- a/libretroshare/src/rsitems/rsnxsitems.cc
+++ b/libretroshare/src/rsitems/rsnxsitems.cc
@ -2,7 +2,7 @@
 #include "util/rsprint.h"
 #include <iomanip>

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /***
 * #define RSSERIAL_DEBUG	1
--- a/libretroshare/src/rsitems/rsphotoitems.cc
+++ b/libretroshare/src/rsitems/rsphotoitems.cc
@ -28,7 +28,7 @@
 #include "rsitems/rsphotoitems.h"

 #include "serialiser/rstlvbinary.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 #define GXS_PHOTO_SERIAL_DEBUG

--- a/libretroshare/src/rsitems/rsphotoitems.h
+++ b/libretroshare/src/rsitems/rsphotoitems.h
@ -32,7 +32,7 @@
 #include "rsitems/rsgxsitems.h"

 #include "serialiser/rsserial.h"
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 #include "retroshare/rsphoto.h"

--- a/libretroshare/src/rsitems/rspluginitems.h
+++ b/libretroshare/src/rsitems/rspluginitems.h
@ -29,7 +29,7 @@
 #include "rsitems/rsitem.h"
 #include "rsitems/rsconfigitems.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 const uint8_t RS_PKT_CLASS_PLUGIN_SUBTYPE_HASHSET = 0x01 ;

--- a/libretroshare/src/rsitems/rsposteditems.cc
+++ b/libretroshare/src/rsitems/rsposteditems.cc
@ -25,7 +25,7 @@
 */

 #include "rsitems/rsposteditems.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 void RsGxsPostedPostItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
 {
--- a/libretroshare/src/rsitems/rsrttitems.cc
+++ b/libretroshare/src/rsitems/rsrttitems.cc
@ -32,7 +32,7 @@

 #include <iostream>

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /*************************************************************************/

--- a/libretroshare/src/rsitems/rsrttitems.h
+++ b/libretroshare/src/rsitems/rsrttitems.h
@ -33,7 +33,7 @@
 #include "rsitems/itempriorities.h"
 #include "serialiser/rsserial.h"

-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"

 /**************************************************************************/

--- a/libretroshare/src/rsitems/rsserviceinfoitems.cc
+++ b/libretroshare/src/rsitems/rsserviceinfoitems.cc
@ -24,7 +24,7 @@
 */

 #include "serialiser/rsbaseserial.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 #include "rsitems/rsserviceinfoitems.h"

 /***
--- a/libretroshare/src/rsitems/rsstatusitems.h
+++ b/libretroshare/src/rsitems/rsstatusitems.h
@ -30,7 +30,7 @@
 #include "rsitems/itempriorities.h"
 #include "rsitems/rsitem.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 /**************************************************************************/

--- a/libretroshare/src/rsitems/rswikiitems.cc
+++ b/libretroshare/src/rsitems/rswikiitems.cc
@ -27,7 +27,7 @@

 #include "rsitems/rswikiitems.h"
 #include "serialiser/rstlvbase.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 #define GXSID_DEBUG	1

--- a/libretroshare/src/rsitems/rswireitems.cc
+++ b/libretroshare/src/rsitems/rswireitems.cc
@ -27,7 +27,7 @@

 #include "rswireitems.h"

-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"

 #define WIRE_DEBUG	1