moved rsconfigitems and rshistoryitems to rsitems/

libretroshare/src/chat/p3chatservice.cc

@@ -42,7 +42,7 @@
 #include "services/p3idservice.h"
 
 #include "chat/p3chatservice.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 
 /****
  * #define CHAT_DEBUG 1

libretroshare/src/dht/p3bitdht_relay.cc

@@ -29,7 +29,7 @@
 #include "tcponudp/udprelay.h"
 #include "bitdht/bdstddht.h"
 
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 
 
 /***********************************************************************************************

libretroshare/src/ft/ftcontroller.cc

@@ -60,7 +60,7 @@
 #include "retroshare/rsiface.h"
 #include "retroshare/rspeers.h"
 
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 #include <stdio.h>
 #include <unistd.h>		/* for (u)sleep() */
 #include <time.h>

libretroshare/src/ft/ftcontroller.h

@@ -53,7 +53,7 @@ class p3ServiceControl;
 #include "pqi/p3cfgmgr.h"
 
 #include "retroshare/rsfiles.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 
 #include <map>
 

libretroshare/src/ft/ftextralist.cc

@@ -30,7 +30,7 @@
 #include <retroshare/rstypes.h>
 #include <retroshare/rsfiles.h>
 #include "ft/ftextralist.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 #include "util/rsdir.h"
 #include <stdio.h>
 #include <unistd.h>		/* for (u)sleep() */

libretroshare/src/grouter/p3grouter.cc

@@ -186,7 +186,7 @@
 #include "util/rsrandom.h"
 #include "util/rsprint.h"
 #include "util/rsmemory.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 #include "services/p3idservice.h"
 #include "turtle/p3turtle.h"
 #include "gxs/rsgixs.h"

libretroshare/src/libretroshare.pro

@@ -456,8 +456,8 @@ HEADERS +=	rsitems/itempriorities.h \
 			serialiser/rsbaseserial.h \
 			rsitems/rsfiletransferitems.h \
 			serialiser/rsserviceserialiser.h \
-			serialiser/rsconfigitems.h \
+			rsitems/rsconfigitems.h \
-			serialiser/rshistoryitems.h \
+			rsitems/rshistoryitems.h \
 			rsitems/rsmsgitems.h \
 			serialiser/rsserial.h \
 			rsitems/rsserviceids.h \
@@ -610,8 +610,8 @@ SOURCES += plugins/pluginmanager.cc \
 SOURCES +=	serialiser/rsbaseserial.cc \
 			rsitems/rsfiletransferitems.cc \
 			serialiser/rsserviceserialiser.cc \
-			serialiser/rsconfigitems.cc \
+			rsitems/rsconfigitems.cc \
-			serialiser/rshistoryitems.cc \
+			rsitems/rshistoryitems.cc \
 			rsitems/rsmsgitems.cc \
 			serialiser/rsserial.cc \
 			serialiser/rsstatusitems.cc \

libretroshare/src/pqi/authgpg.cc

@@ -41,7 +41,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <algorithm>
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 
 #define LIMIT_CERTIFICATE_SIZE		1
 #define MAX_CERTIFICATE_SIZE		10000

libretroshare/src/pqi/authssl.cc

@@ -37,7 +37,7 @@
 
 #include "pqinetwork.h"
 #include "authgpg.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 #include "util/rsdir.h"
 #include "util/rsstring.h"
 

libretroshare/src/pqi/p3cfgmgr.cc

@@ -35,7 +35,7 @@
 #include <util/rsdiscspace.h>
 #include "util/rsstring.h"
 
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 
 /*
 #define CONFIG_DEBUG 1

libretroshare/src/pqi/p3historymgr.cc

@@ -26,8 +26,8 @@
 #include <time.h>
 
 #include "p3historymgr.h"
-#include "serialiser/rshistoryitems.h"
+#include "rsitems/rshistoryitems.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 #include "retroshare/rsiface.h"
 #include "retroshare/rspeers.h"
 #include "rsitems/rsmsgitems.h"

libretroshare/src/pqi/p3historymgr.h

@@ -29,7 +29,7 @@
 #include <map>
 #include <list>
 
-#include "serialiser/rshistoryitems.h"
+#include "rsitems/rshistoryitems.h"
 #include "retroshare/rshistory.h"
 #include "pqi/p3cfgmgr.h"
 

libretroshare/src/pqi/p3linkmgr.cc

@@ -41,7 +41,8 @@
 #include "util/rsprint.h"
 #include "util/rsdebug.h"
 #include "util/rsstring.h"
-#include "serialiser/rsconfigitems.h"
+
+#include "rsitems/rsconfigitems.h"
 
 #include "retroshare/rsiface.h"
 #include "retroshare/rspeers.h"

libretroshare/src/pqi/p3netmgr.cc

@@ -42,7 +42,8 @@
 struct RsLog::logInfo p3netmgrzoneInfo = {RsLog::Default, "p3netmgr"};
 #define p3netmgrzone &p3netmgrzoneInfo
 
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
+
 #include "retroshare/rsiface.h"
 #include "retroshare/rsconfig.h"
 #include "retroshare/rsbanlist.h"

libretroshare/src/pqi/p3peermgr.cc

@@ -42,7 +42,7 @@
 #include "util/rsstring.h"
 #include "util/rsdebug.h"
 
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 
 #include "retroshare/rsiface.h" // Needed for rsicontrol (should remove this dependancy)
 #include "retroshare/rspeers.h" // Needed for Group Parameters.

libretroshare/src/rsitems/rsconfigitems.cc

@@ -25,7 +25,7 @@
  */
 
 #include "serialiser/rsbaseserial.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 #include "retroshare/rspeers.h" // Needed for RsGroupInfo.
 
 /***

libretroshare/src/rsitems/rshistoryitems.cc

@@ -23,10 +23,11 @@
  *
  */
 
-#include "serialiser/rshistoryitems.h"
+#include "rsitems/rshistoryitems.h"
+#include "rsitems/rsconfigitems.h"
+
 #include "serialiser/rsbaseserial.h"
 #include "serialiser/rstlvbase.h"
-#include "serialiser/rsconfigitems.h"
 
 /***
 #define RSSERIAL_DEBUG 1

libretroshare/src/rsitems/rshistoryitems.h

@@ -28,7 +28,7 @@
 
 #include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 #include "retroshare/rstypes.h"
 
 #include "serialization/rsserializer.h"

libretroshare/src/serialiser/rspluginitems.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include "serialiser/rsserial.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 #include "serialiser/rsbaseserial.h"
 
 #if 0

libretroshare/src/services/p3banlist.cc

@@ -30,11 +30,12 @@
 #include "util/rsnet.h"
 
 #include "services/p3banlist.h"
-#include "rsitems/rsbanlistitems.h"
-#include "serialiser/rsconfigitems.h"
 #include "retroshare/rsdht.h"
 #include "retroshare/rsbanlist.h"
 
+#include "rsitems/rsbanlistitems.h"
+#include "rsitems/rsconfigitems.h"
+
 #include <sys/time.h>
 #include <sstream>
 

libretroshare/src/services/p3gxsreputation.cc

@@ -29,8 +29,9 @@
 #include "retroshare/rspeers.h"
 
 #include "services/p3gxsreputation.h"
+
 #include "rsitems/rsgxsreputationitems.h"
-#include "serialiser/rsconfigitems.h"
+#include "rsitems/rsconfigitems.h"
 
 #include <sys/time.h>
 

libretroshare/src/services/p3idservice.cc

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

libretroshare/src/services/p3msgservice.cc

@@ -41,7 +41,8 @@
 
 #include "pgp/pgpkeyutil.h"
 #include "rsserver/p3face.h"
-#include "serialiser/rsconfigitems.h"
+
+#include "rsitems/rsconfigitems.h"
 
 #include "grouter/p3grouter.h"
 #include "grouter/groutertypes.h"