feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Fix names of functions dealing with enclosing scopes

Browse Source 
...in order to better tell apart the type related functions
isScope()/asScope() and the functions dealing with enclosing scopes:

    * scope() --> enclosingScope()
    * setScope() --> setEnclosingScope()
    * resetScope() --> resetEnclosingScope()

Change-Id: Id743a7d1b6a1a1a0ffcd8568cbd8ebbdfc16eaa1
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-07-08 15:28:07 +02:00
parent 42e0e229af
commit f7e26babba
9 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/3rdparty/cplusplus/Templates.cpp vendored
View File

@@ -188,7 +188,7 @@ Symbol *CloneSymbol::cloneSymbol(Symbol *symbol, Subst *subst)
SymbolSubstPair symbolSubstPair = std::make_pair(symbol, subst);
if (_cache.find(symbolSubstPair) != _cache.end()) {
Symbol *cachedSymbol = _cache[symbolSubstPair];
if (cachedSymbol->scope() == symbol->scope())
if (cachedSymbol->enclosingScope() == symbol->enclosingScope())
return cachedSymbol;
}
@@ -531,7 +531,7 @@ Symbol *Clone::instantiate(Template *templ, const FullySpecifiedType *const args
}
}
if (Symbol *inst = symbol(templ->declaration(), &subst)) {
inst->setScope(templ->enclosingScope());
inst->setEnclosingScope(templ->enclosingScope());
return inst;
}
return 0;