merging gxs_phase2 branch

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2013-06-04 21:00:43 +00:00
parent 1150366913
commit 325fa4f222
116 changed files with 6050 additions and 3596 deletions

View file

@ -52,13 +52,18 @@ public:
* @param dbPath path to data base file
* @param flags determine where to open read only or read/write
*/
RetroDb(const std::string& dbPath, int flags);
RetroDb(const std::string& dbPath, int flags, const std::string& key = "");
/*!
* closes db if it is not already closed
*/
~RetroDb();
/*!
* @return key used to encrypt database
*/
std::string getKey() const;
/*!
* opens sqlite data base
* @param dbPath
@ -173,7 +178,7 @@ private:
private:
sqlite3* mDb;
const std::string mKey;
};
/*!