Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code maintenance for Qt 5:

Browse source 
- Renamed CacheData to RsCacheData, MinGW-w64 has already a class with the same name

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-10-21 12:07:33 +00:00
parent ec08eba2c9
commit 5b6aa594c6
13 changed files with 116 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/ft/ftdbase.cc
View file

@ -396,7 +396,7 @@ bool ftCacheStrapper::search(const std::string &hash, FileSearchFlags hintflags,
std::cerr << std::endl;
#endif
CacheData data;
RsCacheData data;
if (findCache(hash, data))
{
#ifdef DB_DEBUG

6
libretroshare/src/ft/ftserver.cc
View file

@ -1329,7 +1329,7 @@ bool ftServer::handleCacheData()
#endif
/* these go to the CacheStrapper! */
CacheData data;
RsCacheData data;
data.pid = ci->PeerId();
data.cid = CacheId(ci->cacheType, ci->cacheSubId);
data.path = ci->file.path;
@ -1359,8 +1359,8 @@ bool ftServer::handleCacheData()
// Now handle it replacement (pushed cache results)
{
std::list<std::pair<RsPeerId, CacheData> > cacheUpdates;
std::list<std::pair<RsPeerId, CacheData> >::iterator it;
std::list<std::pair<RsPeerId, RsCacheData> > cacheUpdates;
std::list<std::pair<RsPeerId, RsCacheData> >::iterator it;
mCacheStrapper->getCacheUpdates(cacheUpdates);
for(it = cacheUpdates.begin(); it != cacheUpdates.end(); it++)