Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-15 01:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed channel delete feature

Browse source 
added optimisation suggestion with load/savelist

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3920 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2010-12-18 19:35:07 +00:00
parent d3a6f7316c
commit 2f559dae96
37 changed files with 133 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libretroshare/src/pqi/p3cfgmgr.cc
View file

@ -904,7 +904,8 @@ bool p3Config::saveConfig()
{
bool cleanup = true;
std::list<RsItem *> toSave = saveList(cleanup);
std::list<RsItem *> toSave;
saveList(cleanup, toSave);
// temporarily append new to files as these will replace current configuration
std::string newCfgFname = Filename() + "_new";
@ -986,7 +987,8 @@ bool p3Config::saveGlobalConfig()
{
bool cleanup = true;
std::list<RsItem *> toSave = saveList(cleanup);
std::list<RsItem *> toSave;
saveList(cleanup, toSave);
std::string cfg_fname = Filename(); // get configuration file name
@ -1212,7 +1214,7 @@ RsSerialiser *p3GeneralConfig::setupSerialiser()
return rss;
}
std::list<RsItem *> p3GeneralConfig::saveList(bool &cleanup)
bool p3GeneralConfig::saveList(bool &cleanup, std::list<RsItem *>& savelist)
{
RsStackMutex stack(cfgMtx); /***** LOCK STACK MUTEX ****/
@ -1222,7 +1224,7 @@ std::list<RsItem *> p3GeneralConfig::saveList(bool &cleanup)
#endif
cleanup = true;
std::list<RsItem *> savelist;
RsConfigKeyValueSet *item = new RsConfigKeyValueSet();
std::map<std::string, std::string>::iterator it;
@ -1246,11 +1248,11 @@ std::list<RsItem *> p3GeneralConfig::saveList(bool &cleanup)
savelist.push_back(item);
}
return savelist;
return true;
}
bool p3GeneralConfig::loadList(std::list<RsItem *> load)
bool p3GeneralConfig::loadList(std::list<RsItem *>& load)
{
#ifdef CONFIG_DEBUG
std::cerr << "p3GeneralConfig::loadList() count: " << load.size();