moved RTT items to rsitems/

This commit is contained in:
csoler 2017-04-24 11:06:51 +02:00
parent f6aaee7382
commit 26e95416d1
6 changed files with 5 additions and 11 deletions

View file

@ -483,7 +483,7 @@ HEADERS += rsitems/itempriorities.h \
rsitems/rsbwctrlitems.h \ rsitems/rsbwctrlitems.h \
rsitems/rsdiscovery2items.h \ rsitems/rsdiscovery2items.h \
serialiser/rsheartbeatitems.h \ serialiser/rsheartbeatitems.h \
serialiser/rsrttitems.h \ rsitems/rsrttitems.h \
serialiser/rsgxsrecognitems.h \ serialiser/rsgxsrecognitems.h \
serialiser/rsgxsupdateitems.h \ serialiser/rsgxsupdateitems.h \
serialiser/rsserviceinfoitems.h \ serialiser/rsserviceinfoitems.h \
@ -631,7 +631,7 @@ SOURCES += serialiser/rsbaseserial.cc \
rsitems/rsbwctrlitems.cc \ rsitems/rsbwctrlitems.cc \
rsitems/rsdiscovery2items.cc \ rsitems/rsdiscovery2items.cc \
serialiser/rsheartbeatitems.cc \ serialiser/rsheartbeatitems.cc \
serialiser/rsrttitems.cc \ rsitems/rsrttitems.cc \
serialiser/rsgxsrecognitems.cc \ serialiser/rsgxsrecognitems.cc \
serialiser/rsgxsupdateitems.cc \ serialiser/rsgxsupdateitems.cc \
serialiser/rsserviceinfoitems.cc \ serialiser/rsserviceinfoitems.cc \

View file

@ -24,9 +24,7 @@
* *
*/ */
#include "serialiser/rsbaseserial.h" #include "rsitems/rsrttitems.h"
#include "serialiser/rsrttitems.h"
//#include "serialiser/rstlvbase.h"
/*** /***
#define RSSERIAL_DEBUG 1 #define RSSERIAL_DEBUG 1

View file

@ -33,10 +33,6 @@ class RsSerializer: public RsSerialType
* should be overloaded to create the correct type of item depending on the data * should be overloaded to create the correct type of item depending on the data
*/ */
virtual RsItem *create_item(uint16_t /* service */, uint8_t /* item_sub_id */) const=0; virtual RsItem *create_item(uint16_t /* service */, uint8_t /* item_sub_id */) const=0;
// {
// std::cerr << "(EE) Serializer does not overload create_item(). This is probably an error."<< std::endl;
// return NULL ;
// }
// The following functions overload RsSerialType. They *should not* need to be further overloaded. // The following functions overload RsSerialType. They *should not* need to be further overloaded.

View file

@ -32,7 +32,7 @@
#include "pqi/p3linkmgr.h" #include "pqi/p3linkmgr.h"
#include "services/p3rtt.h" #include "services/p3rtt.h"
#include "serialiser/rsrttitems.h" #include "rsitems/rsrttitems.h"
#include <sys/time.h> #include <sys/time.h>

View file

@ -30,7 +30,7 @@
#include <list> #include <list>
#include <string> #include <string>
#include "serialiser/rsrttitems.h" #include "rsitems/rsrttitems.h"
#include "services/p3service.h" #include "services/p3service.h"
#include "retroshare/rsrtt.h" #include "retroshare/rsrtt.h"