Code maintenance for Qt 5:

- 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

View file

@ -93,7 +93,7 @@ int main(int argc, char **argv)
sc3.addCachePair(cp3);
/* add in a cache to sc2 */
CacheData cdata;
RsCacheData cdata;
cdata.pid = pid1;
cdata.cid = cid1;
@ -191,8 +191,8 @@ void handleQuery(CacheStrapper *csp, RsPeerId pid,
std::map<RsPeerId, CacheStrapper *>::iterator sit;
if (strappers.end() != (sit = strappers.find(*pit)))
{
std::map<CacheId, CacheData> hashs;
std::map<CacheId, CacheData>::iterator hit;
std::map<CacheId, RsCacheData> hashs;
std::map<CacheId, RsCacheData>::iterator hit;
(sit -> second) -> handleCacheQuery(pid, hashs);
for(hit = hashs.begin(); hit != hashs.end(); hit++)
{