moved gxs comment and Id items to rsitems/

libretroshare/src/gxs/rsgds.h

@@ -32,7 +32,7 @@
 
 #include "inttypes.h"
 
-#include "serialiser/rsgxsitems.h"
+#include "rsitems/rsgxsitems.h"
 #include "serialiser/rsnxsitems.h"
 #include "gxs/rsgxsdata.h"
 #include "rsgxs.h"

libretroshare/src/gxs/rsgxsdata.h

@@ -29,10 +29,9 @@
 #include <string>
 
 #include <retroshare/rstypes.h>
-
-#include "serialiser/rsserial.h"
 #include "serialiser/rstlvkeys.h"
-#include "serialiser/rsgxsitems.h"
+
+#include "rsitems/rsgxsitems.h"
 
 class RsGroupMetaData;
 class RsMsgMetaData;
@@ -56,22 +55,22 @@ public:
     void clear();
     void operator =(const RsGroupMetaData& rMeta);
 
-    //Sort data in same order than serialiser and deserializer
+    //Sort data in same order than serialiser and deserializer
     RsGxsGroupId mGroupId;
     RsGxsGroupId mOrigGrpId;
-    RsGxsGroupId mParentGrpId;
+    RsGxsGroupId mParentGrpId;
     std::string mGroupName;
     uint32_t    mGroupFlags;	// GXS_SERV::FLAG_PRIVACY_RESTRICTED | GXS_SERV::FLAG_PRIVACY_PRIVATE | GXS_SERV::FLAG_PRIVACY_PUBLIC
     uint32_t    mPublishTs;
-    uint32_t mCircleType;
-    uint32_t mAuthenFlags;
+    uint32_t mCircleType;
+    uint32_t mAuthenFlags;
     RsGxsId mAuthorId;
-    std::string mServiceString;
+    std::string mServiceString;
     RsGxsCircleId mCircleId;
     RsTlvKeySignatureSet signSet;
     RsTlvSecurityKeySet keys;
 
-    uint32_t    mSignFlags;
+    uint32_t    mSignFlags;
 
     // BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.
 
@@ -103,9 +102,9 @@ public:
     void clear();
     void operator =(const RsMsgMetaData& rMeta);
 
-    static int refcount;
-
-    //Sort data in same order than serialiser and deserializer
+    static int refcount;
+
+    //Sort data in same order than serialiser and deserializer
     RsGxsGroupId mGroupId;
     RsGxsMessageId mMsgId;
     RsGxsMessageId mThreadId;
@@ -121,7 +120,7 @@ public:
     // BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.
     // normally READ / UNREAD flags. LOCAL Data.
 
-    std::string mServiceString;
+    std::string mServiceString;
     uint32_t    mMsgStatus;
     uint32_t    mMsgSize;
     time_t      mChildTs;

libretroshare/src/libretroshare.pro

@@ -735,7 +735,7 @@ HEADERS += serialiser/rsnxsitems.h \
 	retroshare/rstokenservice.h \
 	gxs/rsgxsdataaccess.h \
 	retroshare/rsgxsservice.h \
-	serialiser/rsgxsitems.h \
+	rsitems/rsgxsitems.h \
 	util/retrodb.h \
 	util/rsdbbind.h \
 	gxs/rsgxsutil.h \
@@ -753,7 +753,7 @@ SOURCES += serialiser/rsnxsitems.cc \
 	gxs/rsgenexchange.cc \
 	gxs/rsgxsnetservice.cc \
 	gxs/rsgxsdata.cc \
-	serialiser/rsgxsitems.cc \
+	rsitems/rsgxsitems.cc \
 	gxs/rsgxsdataaccess.cc \
 	util/retrodb.cc \
 	util/contentvalue.cc \
@@ -783,12 +783,12 @@ SOURCES += serialization/rsserializer.cc \
 HEADERS += retroshare/rsidentity.h \
 	gxs/rsgixs.h \
 	services/p3idservice.h \
-	serialiser/rsgxsiditems.h \
+	rsitems/rsgxsiditems.h \
 	services/p3gxsreputation.h \
 	rsitems/rsgxsreputationitems.h \
 
 SOURCES += services/p3idservice.cc \
-	serialiser/rsgxsiditems.cc \
+	rsitems/rsgxsiditems.cc \
 	services/p3gxsreputation.cc \
 	rsitems/rsgxsreputationitems.cc \
 
@@ -812,12 +812,12 @@ SOURCES += services/p3gxsforums.cc \
 HEADERS += retroshare/rsgxschannels.h \
 	services/p3gxschannels.h \
 	services/p3gxscommon.h \
-	serialiser/rsgxscommentitems.h \
+	rsitems/rsgxscommentitems.h \
 	serialiser/rsgxschannelitems.h \
 
 SOURCES += services/p3gxschannels.cc \
 	services/p3gxscommon.cc \
-	serialiser/rsgxscommentitems.cc \
+	rsitems/rsgxscommentitems.cc \
 	serialiser/rsgxschannelitems.cc \
 
 wikipoos {

libretroshare/src/serialiser/rsgxschannelitems.h

@@ -29,14 +29,12 @@
 #include <map>
 
 #include "rsitems/rsserviceids.h"
-#include "serialiser/rsserial.h"
-//#include "serialiser/rstlvtypes.h"
+#include "rsitems/rsgxscommentitems.h"
+#include "rsitems/rsgxsitems.h"
+
 #include "serialiser/rstlvfileitem.h"
 #include "serialiser/rstlvimage.h"
 
-#include "serialiser/rsgxscommentitems.h"
-
-#include "rsgxsitems.h"
 #include "retroshare/rsgxschannels.h"
 
 #include "util/rsdir.h"

libretroshare/src/serialiser/rsgxscircleitems.h

@@ -29,12 +29,12 @@
 #include <map>
 
 #include "rsitems/rsserviceids.h"
-#include "serialiser/rsserial.h"
+
 #include "serialiser/rstlvitem.h"
 #include "serialiser/rstlvstring.h"
 #include "serialiser/rstlvidset.h"
 
-#include "rsgxsitems.h"
+#include "rsitems/rsgxsitems.h"
 #include "retroshare/rsgxscircles.h"
 
 const uint8_t RS_PKT_SUBTYPE_GXSCIRCLE_GROUP_ITEM                = 0x02;

libretroshare/src/serialiser/rsgxsforumitems.h

@@ -29,10 +29,8 @@
 #include <map>
 
 #include "rsitems/rsserviceids.h"
-#include "serialiser/rsserial.h"
-//#include "serialiser/rstlvtypes.h"
+#include "rsitems/rsgxsitems.h"
 
-#include "rsgxsitems.h"
 #include "retroshare/rsgxsforums.h"
 
 const uint8_t RS_PKT_SUBTYPE_GXSFORUM_GROUP_ITEM = 0x02;

libretroshare/src/serialiser/rsposteditems.h

@@ -2,12 +2,9 @@
 #define RSPOSTEDITEMS_H
 
 #include "rsitems/rsserviceids.h"
-#include "serialiser/rsserial.h"
-//#include "serialiser/rstlvtypes.h"
+#include "rsitems/rsgxscommentitems.h"
+#include "rsitems/rsgxsitems.h"
 
-#include "serialiser/rsgxscommentitems.h"
-
-#include "rsgxsitems.h"
 #include "retroshare/rsposted.h"
 
 const uint8_t RS_PKT_SUBTYPE_POSTED_GRP_ITEM = 0x02;

libretroshare/src/services/p3gxscommon.cc

@@ -25,7 +25,7 @@
 
 #include "retroshare/rsgxscommon.h"
 #include "services/p3gxscommon.h"
-#include "serialiser/rsgxscommentitems.h"
+#include "rsitems/rsgxscommentitems.h"
 #include "util/rsstring.h"
 
 #include <stdio.h>

libretroshare/src/services/p3idservice.cc

@@ -27,7 +27,7 @@
 
 #include "services/p3idservice.h"
 #include "pgp/pgpauxutils.h"
-#include "serialiser/rsgxsiditems.h"
+#include "rsitems/rsgxsiditems.h"
 #include "rsitems/rsconfigitems.h"
 #include "retroshare/rsgxsflags.h"
 #include "util/rsrandom.h"

libretroshare/src/services/p3idservice.h

@@ -32,7 +32,7 @@
 #include "gxs/rsgixs.h"			// Internal Interfaces.
 
 #include "gxs/gxstokenqueue.h"		
-#include "serialiser/rsgxsiditems.h"		
+#include "rsitems/rsgxsiditems.h"
 
 #include <map>
 #include <string>

libretroshare/src/services/p3postbase.cc

@@ -30,7 +30,7 @@
 #include <math.h>
 
 #include "services/p3postbase.h"
-#include "serialiser/rsgxscommentitems.h"
+#include "rsitems/rsgxscommentitems.h"
 
 #include "rsserver/p3face.h"
 #include "retroshare/rsnotify.h"