Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-29 20:06:38 -05: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

10
libretroshare/src/pqi/p3cfgmgr.h
View file

@ -122,7 +122,7 @@ virtual ~pqiConfig();
* @param loadHash This is the hash that will be compared to confirm saved configuration has not
* been tampered with
*/
virtual bool loadConfiguration(std::string &loadHash) = 0;
virtual bool loadConfiguration(RsFileHash &loadHash) = 0;
/**
* save configuration of object
@ -144,7 +144,7 @@ const std::string& Filename();
* The hash computed for this configuration, can use this to compare to externally stored hash
* for validation checking
*/
const std::string& Hash();
const RsFileHash& Hash();
protected:
@ -152,7 +152,7 @@ const std::string& Hash();
* Checks if configuration has changed
*/
virtual void IndicateConfigChanged();
void setHash(const std::string& h);
void setHash(const RsFileHash& h);
RsMutex cfgMtx;
@ -172,7 +172,7 @@ void setHash(const std::string& h);
uint32_t type;
std::string filename;
std::string hash;
RsFileHash hash;
friend class p3ConfigMgr;
@ -268,7 +268,7 @@ class p3Config: public pqiConfig
p3Config(uint32_t t);
virtual bool loadConfiguration(std::string &loadHash);
virtual bool loadConfiguration(RsFileHash &loadHash);
virtual bool saveConfiguration();