CppTools: Replace Method with Function

Change-Id: I6405c4dfa07eba1ea09ba23fe20667769eaca748
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

6 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/clangcodemodel/clangsymbolsearcher.cpp b/src/plugins/clangcodemodel/clangsymbolsearcher.cpp
index d603a745f2..a8512d53a8 100644
--- a/src/plugins/clangcodemodel/clangsymbolsearcher.cpp
+++ b/src/plugins/clangcodemodel/clangsymbolsearcher.cpp
@@ -112,7 +112,7 @@ void ClangSymbolSearcher::search(const QLinkedList<Symbol> &allSymbols)
         case Symbol::Constructor:
         case Symbol::Destructor:
             if (m_parameters.types & SymbolSearcher::Functions) {
-                info.type = CppTools::ModelItemInfo::Method;
+                info.type = CppTools::ModelItemInfo::Function;
                 break;
             } else {
                 continue;
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index 99f3974e53..b3999e82e4 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -130,7 +130,7 @@ public:
                     if (index != -1) {
                         QString text = info.symbolName;
                         QString scope = info.symbolScope;
-                        if (info.type == ModelItemInfo::Method) {
+                        if (info.type == ModelItemInfo::Function) {
                             QString name;
                             info.unqualifiedNameAndScope(info.symbolName, &name, &scope);
                             text = name + info.symbolType;
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index fb5567d47c..03c160c8da 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -89,7 +89,7 @@ QList<Core::LocatorFilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInte
         QString matchString = info.symbolName;
         if (info.type == ModelItemInfo::Declaration)
             matchString = ModelItemInfo::representDeclaration(info.symbolName, info.symbolType);
-        else if (info.type == ModelItemInfo::Method)
+        else if (info.type == ModelItemInfo::Function)
             matchString += info.symbolType;
 
         if ((hasWildcard && regexp.exactMatch(matchString))
@@ -98,7 +98,7 @@ QList<Core::LocatorFilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInte
             QVariant id = qVariantFromValue(info);
             QString name = matchString;
             QString extraInfo = info.symbolScope;
-            if (info.type == ModelItemInfo::Method) {
+            if (info.type == ModelItemInfo::Function) {
                 if (info.unqualifiedNameAndScope(matchString, &name, &extraInfo))
                     name += info.symbolType;
             }
diff --git a/src/plugins/cpptools/cpplocatordata.cpp b/src/plugins/cpptools/cpplocatordata.cpp
index 18086dbeac..a76b6802ca 100644
--- a/src/plugins/cpptools/cpplocatordata.cpp
+++ b/src/plugins/cpptools/cpplocatordata.cpp
@@ -132,7 +132,7 @@ void CppLocatorData::flushPendingDocument(bool force)
             case ModelItemInfo::Class:
                 resultsClasses.append(info);
                 break;
-            case ModelItemInfo::Method:
+            case ModelItemInfo::Function:
                 resultsFunctions.append(info);
                 break;
             default:
diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp
index ddbaaa01e5..98f5f4761b 100644
--- a/src/plugins/cpptools/searchsymbols.cpp
+++ b/src/plugins/cpptools/searchsymbols.cpp
@@ -97,7 +97,7 @@ bool SearchSymbols::visit(Function *symbol)
         return false;
     QString name = symbolName(symbol);
     QString type = overview.prettyType(symbol->type());
-    appendItem(name, type, _scope, ModelItemInfo::Method, symbol);
+    appendItem(name, type, _scope, ModelItemInfo::Function, symbol);
     return false;
 }
 
@@ -130,7 +130,7 @@ bool SearchSymbols::visit(Declaration *symbol)
     QString name = symbolName(symbol);
     QString type = overview.prettyType(symbol->type());
     appendItem(name, type, _scope,
-               symbol->type()->asFunctionType() ? ModelItemInfo::Method
+               symbol->type()->asFunctionType() ? ModelItemInfo::Function
                                                 : ModelItemInfo::Declaration,
                symbol);
     return false;
diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h
index a8b672b44a..3959399981 100644
--- a/src/plugins/cpptools/searchsymbols.h
+++ b/src/plugins/cpptools/searchsymbols.h
@@ -50,7 +50,7 @@ namespace CppTools {
 
 struct CPPTOOLS_EXPORT ModelItemInfo
 {
-    enum ItemType { Enum, Class, Method, Declaration };
+    enum ItemType { Enum, Class, Function, Declaration };
 
     ModelItemInfo()
         : type(Declaration),