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

@ -33,6 +33,7 @@ extern RsHistory *rsHistory;
#include <string>
#include <inttypes.h>
#include <list>
#include "retroshare/rstypes.h"
//! data object for message history
/*!
@ -55,9 +56,9 @@ public:
public:
uint32_t msgId;
std::string chatPeerId;
RsPeerId chatPeerId;
bool incoming;
std::string peerId;
RsPeerId peerId;
std::string peerName;
uint32_t sendTime;
uint32_t recvTime;
@ -71,10 +72,10 @@ public:
class RsHistory
{
public:
virtual bool getMessages(const std::string &chatPeerId, std::list<HistoryMsg> &msgs, uint32_t loadCount) = 0;
virtual bool getMessages(const RsPeerId &chatPeerId, std::list<HistoryMsg> &msgs, uint32_t loadCount) = 0;
virtual bool getMessage(uint32_t msgId, HistoryMsg &msg) = 0;
virtual void removeMessages(const std::list<uint32_t> &msgIds) = 0;
virtual void clear(const std::string &chatPeerId) = 0;
virtual void clear(const RsPeerId &chatPeerId) = 0;
virtual bool getEnable(uint32_t chat_type) = 0;
virtual void setEnable(uint32_t chat_type, bool enable) = 0;