Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-18 10:58:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/pqi/pqistore.h
View file

@ -41,7 +41,7 @@
class pqistore: public PQInterface
{
public:
pqistore(RsSerialiser *rss, const std::string &srcId, BinInterface *bio_in, int bio_flagsin);
pqistore(RsSerialiser *rss, const RsPeerId&srcId, BinInterface *bio_in, int bio_flagsin);
virtual ~pqistore();
// PQInterface
@ -51,7 +51,7 @@ virtual RsItem *GetItem();
virtual int tick();
virtual int status();
std::string gethash();
RsFileHash gethash();
bool bStopReading;
@ -63,7 +63,7 @@ unsigned int bio_flags; // only BIN_NO_CLOSE at the moment.
// Temp Storage for transient data.....
RsItem *nextPkt;
std::string mSrcId;
RsPeerId mSrcId;
private:
@ -86,7 +86,7 @@ class pqiSSLstore: public pqistore
public:
pqiSSLstore(RsSerialiser *rss, std::string srcId, BinEncryptedFileInterface *bio_in, int bio_flagsin);
pqiSSLstore(RsSerialiser *rss, const RsPeerId& srcId, BinEncryptedFileInterface *bio_in, int bio_flagsin);
virtual ~pqiSSLstore();