diff options
Diffstat (limited to 'src/ContextUtils.cpp')
| -rw-r--r-- | src/ContextUtils.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ContextUtils.cpp b/src/ContextUtils.cpp index 55dc2628..f1c1349b 100644 --- a/src/ContextUtils.cpp +++ b/src/ContextUtils.cpp @@ -32,7 +32,7 @@ using namespace clang; using namespace std; -std::vector<DeclContext *> ContextUtils::contextsForDecl(DeclContext *currentScope) +std::vector<DeclContext *> clazy::contextsForDecl(DeclContext *currentScope) { std::vector<DeclContext *> decls; decls.reserve(20); // jump-start @@ -61,7 +61,7 @@ static string nameForContext(DeclContext *context) return {}; } -string ContextUtils::getMostNeededQualifiedName(const SourceManager &sourceManager, +string clazy::getMostNeededQualifiedName(const SourceManager &sourceManager, CXXMethodDecl *method, DeclContext *currentScope, SourceLocation usageLoc, bool honourUsingDirectives) @@ -70,23 +70,23 @@ string ContextUtils::getMostNeededQualifiedName(const SourceManager &sourceManag return method->getQualifiedNameAsString(); // All namespaces, classes, inner class qualifications - auto methodContexts = ContextUtils::contextsForDecl(method->getDeclContext()); + auto methodContexts = clazy::contextsForDecl(method->getDeclContext()); // Visible scopes in current scope - auto visibleContexts = ContextUtils::contextsForDecl(currentScope); + auto visibleContexts = clazy::contextsForDecl(currentScope); // Collect using directives vector<UsingDirectiveDecl*> usings; if (honourUsingDirectives) { for (DeclContext *context : visibleContexts) {; - clazy_std::append(context->using_directives(), usings); + clazy::append(context->using_directives(), usings); } } for (UsingDirectiveDecl *u : usings) { NamespaceDecl *ns = u->getNominatedNamespace(); if (ns) { - if (sourceManager.isBeforeInSLocAddrSpace(usageLoc, u->getLocStart())) + if (sourceManager.isBeforeInSLocAddrSpace(usageLoc, getLocStart(u))) continue; visibleContexts.push_back(ns->getOriginalNamespace()); @@ -96,7 +96,7 @@ string ContextUtils::getMostNeededQualifiedName(const SourceManager &sourceManag for (DeclContext *context : visibleContexts) { if (context != method->getParent()) { // Don't remove the most immediate - auto it = clazy_std::find_if(methodContexts, [context](DeclContext *c) { + auto it = clazy::find_if(methodContexts, [context](DeclContext *c) { if (c == context) return true; auto ns1 = dyn_cast<NamespaceDecl>(c); @@ -119,7 +119,7 @@ string ContextUtils::getMostNeededQualifiedName(const SourceManager &sourceManag return result; } -bool ContextUtils::canTakeAddressOf(CXXMethodDecl *method, DeclContext *context, bool &isSpecialProtectedCase) +bool clazy::canTakeAddressOf(CXXMethodDecl *method, DeclContext *context, bool &isSpecialProtectedCase) { isSpecialProtectedCase = false; if (!method || !method->getParent()) |