merge of branch v0.6-idclean 7180

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions

View file

@ -34,6 +34,7 @@ extern RsStatus *rsStatus;
#include <string>
#include <inttypes.h>
#include <list>
#include <retroshare/rstypes.h>
const uint32_t RS_STATUS_OFFLINE = 0x0000;
@ -58,7 +59,7 @@ class StatusInfo
}
public:
std::string id;
RsPeerId id;
uint32_t status;
time_t time_stamp; /// for owner time set, and for their peers time sent
};
@ -88,7 +89,7 @@ class RsStatus
* This retrieves the status info one peer
* @param statusInfo is populated with client's peer's status
*/
virtual bool getStatus(const std::string &id, StatusInfo &statusInfo) = 0;
virtual bool getStatus(const RsPeerId &id, StatusInfo &statusInfo) = 0;
/**
* send the client's status to his/her peers
@ -96,7 +97,7 @@ class RsStatus
* @param status the status of the peers
* @return will return false if status info does not belong to client
*/
virtual bool sendStatus(const std::string &id, uint32_t status) = 0;
virtual bool sendStatus(const RsPeerId &id, uint32_t status) = 0;
};