Rename "[Mm]ethod(s)" to "[Ff]unction(s)"

Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>

5 files changed, 12 insertions, 12 deletions

diff --git a/src/libs/utils/ansiescapecodehandler.cpp b/src/libs/utils/ansiescapecodehandler.cpp
index ecb2285dc5..0086255ff0 100644
--- a/src/libs/utils/ansiescapecodehandler.cpp
+++ b/src/libs/utils/ansiescapecodehandler.cpp
@@ -42,15 +42,15 @@ namespace Utils {
     Also, one instance of this class should not handle multiple streams (at least not
     at the same time).
 
-    Its main method is parseText(), which accepts text and default QTextCharFormat.
-    This method is designed to parse text and split colored text to smaller strings,
+    Its main function is parseText(), which accepts text and default QTextCharFormat.
+    This function is designed to parse text and split colored text to smaller strings,
     with their appropriate formatting information set inside QTextCharFormat.
 
     Usage:
     \list
     \li Create new instance of AnsiEscapeCodeHandler for a stream.
     \li To add new text, call parseText() with the text and a default QTextCharFormat.
-        The result of this method is a list of strings with formats set in appropriate
+        The result of this function is a list of strings with formats set in appropriate
         QTextCharFormat.
     \endlist
 */
diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp
index eb6b679c54..6fdfb81df4 100644
--- a/src/libs/utils/fileinprojectfinder.cpp
+++ b/src/libs/utils/fileinprojectfinder.cpp
@@ -112,7 +112,7 @@ void FileInProjectFinder::setSysroot(const QString &sysroot)
 /*!
   Returns the best match for the given file URL in the project directory.
 
-  The method first checks whether the file inside the project directory exists.
+  The function first checks whether the file inside the project directory exists.
   If not, the leading directory in the path is stripped, and the - now shorter - path is
   checked for existence, and so on. Second, it tries to locate the file in the sysroot
   folder specified. Third, we walk the list of project files, and search for a file name match
diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp
index 8a56f9c4a9..b4d691566a 100644
--- a/src/libs/utils/json.cpp
+++ b/src/libs/utils/json.cpp
@@ -319,7 +319,7 @@ void JsonSchema::enterNestedPropertySchema(const QString &property)
 /*!
  * An array schema is allowed to have its \e items specification in the form of
  * another schema
- * or in the form of an array of schemas [Sec. 5.5]. This methods checks whether this is case
+ * or in the form of an array of schemas [Sec. 5.5]. This functions checks whether this is case
  * in which the items are a schema.
  *
  * Returns whether or not the items from the array are a schema.
@@ -340,7 +340,7 @@ void JsonSchema::enterNestedItemSchema()
 
 /*!
  * An array schema is allowed to have its \e items specification in the form of another schema
- * or in the form of an array of schemas [Sec. 5.5]. This methods checks whether this is case
+ * or in the form of an array of schemas [Sec. 5.5]. This functions checks whether this is case
  * in which the items are an array of schemas.
  *
  * Returns whether or not the items from the array are a an array of schemas.
@@ -366,7 +366,7 @@ int JsonSchema::itemArraySchemaSize() const
  * interested on). This shall only happen if the item at the supplied array index is of type
  * object, which is then assumed to be a schema.
  *
- * The method also marks the context as being inside an array evaluation.
+ * The function also marks the context as being inside an array evaluation.
  *
  * Returns whether it was necessary to enter a schema for the supplied
  * array \a index, false if index is out of bounds.
@@ -383,7 +383,7 @@ bool JsonSchema::maybeEnterNestedArraySchema(int index)
 
 /*!
  * The type of a schema can be specified in the form of a union type, which is basically an
- * array of allowed types for the particular instance [Sec. 5.1]. This method checks whether
+ * array of allowed types for the particular instance [Sec. 5.1]. This function checks whether
  * the current schema is one of such.
  *
  * Returns whether or not the current schema specifies a union type.
@@ -405,7 +405,7 @@ int JsonSchema::unionSchemaSize() const
  * This shall only happen if the item at the supplied union \a index, which is then assumed to be
  * a schema.
  *
- * The method also marks the context as being inside an union evaluation.
+ * The function also marks the context as being inside an union evaluation.
  *
  * Returns whether or not it was necessary to enter a schema for the
  * supplied union index.
diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h
index 853b4366e5..5efa8ab45e 100644
--- a/src/libs/utils/json.h
+++ b/src/libs/utils/json.h
@@ -263,7 +263,7 @@ class JsonSchemaManager;
  * corresponding nested schema. Afterwards, it's expected that one would "leave" such nested
  * schema.
  *
- * All methods assume that the current "context" is a valid schema. Once an instance of this
+ * All functions assume that the current "context" is a valid schema. Once an instance of this
  * class is created the root schema is put on top of the stack.
  *
  */
@@ -350,7 +350,7 @@ private:
 
     QStringList properties(JsonObjectValue *v) const;
     JsonObjectValue *propertySchema(const QString &property, JsonObjectValue *v) const;
-    // TODO: Similar methods for other attributes which require looking into base schemas.
+    // TODO: Similar functions for other attributes which require looking into base schemas.
 
     static bool maybeSchemaName(const QString &s);
 
diff --git a/src/libs/utils/tooltip/tooltip.cpp b/src/libs/utils/tooltip/tooltip.cpp
index 4b46ab59fe..469fd5e33e 100644
--- a/src/libs/utils/tooltip/tooltip.cpp
+++ b/src/libs/utils/tooltip/tooltip.cpp
@@ -97,7 +97,7 @@ bool ToolTip::acceptShow(const TipContent &content,
     }
 #if !defined(QT_NO_EFFECTS) && !defined(Q_OS_MAC)
     // While the effect takes places it might be that although the widget is actually on
-    // screen the isVisible method doesn't return true.
+    // screen the isVisible function doesn't return true.
     else if (m_tip
              && (QApplication::isEffectEnabled(Qt::UI_FadeTooltip)
                  || QApplication::isEffectEnabled(Qt::UI_AnimateTooltip))) {