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>

21 files changed, 67 insertions, 67 deletions

diff --git a/src/libs/3rdparty/cplusplus/AST.cpp b/src/libs/3rdparty/cplusplus/AST.cpp
index 03dc59e889..5e166b83b2 100644
--- a/src/libs/3rdparty/cplusplus/AST.cpp
+++ b/src/libs/3rdparty/cplusplus/AST.cpp
@@ -29,10 +29,10 @@
 
 
 /*
-   All firstToken/lastToken methods below which have a doxygen comment with
+   All firstToken/lastToken functions below which have a doxygen comment with
    \generated in it, will be re-generated when the tool "cplusplus-update-frontend" is run.
 
-   For methods which are hand-coded, or which should not be changed, make sure that
+   For functions which are hand-coded, or which should not be changed, make sure that
    the comment is gone.
  */
 
diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp
index 9a4f61c2a3..c6bd27dc53 100644
--- a/src/libs/aggregation/aggregate.cpp
+++ b/src/libs/aggregation/aggregate.cpp
@@ -56,7 +56,7 @@
     other components in the Aggregate to the outside.
     Specifically that means:
     \list
-    \li They can be "cast" to each other (using query and query_all methods).
+    \li They can be "cast" to each other (using query and query_all functions).
     \li Their life cycle is coupled, i.e. whenever one is deleted all of them are.
     \endlist
     Components can be of any QObject derived type.
@@ -69,7 +69,7 @@
         [...]
         MyInterface *object = new MyInterface; // this is single inheritance
     \endcode
-    The query method works like a qobject_cast with normal objects:
+    The query function works like a qobject_cast with normal objects:
     \code
         Q_ASSERT(query<MyInterface>(object) == object);
         Q_ASSERT(query<MyInterfaceEx>(object) == 0);
@@ -105,7 +105,7 @@
 /*!
     \fn T *Aggregate::component()
 
-    Template method that returns the component with the given type, if there is one.
+    Template function that returns the component with the given type, if there is one.
     If there are multiple components with that type a random one is returned.
 
     \sa Aggregate::components()
@@ -115,7 +115,7 @@
 /*!
     \fn QList<T *> Aggregate::components()
 
-    Template method that returns all components with the given type, if there are any.
+    Template function that returns all components with the given type, if there are any.
 
     \sa Aggregate::component()
     \sa Aggregate::add()
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 6ba998a6e4..0d8bbd2f31 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -474,7 +474,7 @@ void Document::setGlobalNamespace(Namespace *globalNamespace)
  * Extract the function name including scope at the given position.
  *
  * Note that a function (scope) starts at the name of that function, not at the return type. The
- * implication is that this method will return an empty string when the line/column is on the
+ * implication is that this function will return an empty string when the line/column is on the
  * return type.
  *
  * \param line the line number, starting with line 1
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 15beba1771..05a7a083d3 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -687,7 +687,7 @@ QString Preprocessor::State::guardStateToString(int guardState)
  * occurs inside the #ifndef block, but not nested inside other
  * #if/#ifdef/#ifndef blocks.
  *
- * This method tracks the state, and is called from \c updateIncludeGuardState
+ * This function tracks the state, and is called from \c updateIncludeGuardState
  * which handles the most common no-op cases.
  *
  * @param hint indicates what kind of token is encountered in the input
@@ -857,7 +857,7 @@ _Lagain:
         // to the macro that generated this token. In either case, the macro
         // that generated the token still needs to be blocked (!), which is
         // recorded in the token buffer. Removing the blocked macro and the
-        // empty token buffer happens the next time that this method is called.
+        // empty token buffer happens the next time that this function is called.
     } else {
         // No token buffer, so have the lexer scan the next token.
         tk->setSource(m_state.m_source);
diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp
index 132e5078f3..e867062068 100644
--- a/src/libs/extensionsystem/iplugin.cpp
+++ b/src/libs/extensionsystem/iplugin.cpp
@@ -64,10 +64,10 @@
     \list 1
     \li All plugin libraries are loaded in \e{root-to-leaf} order of the
        dependency tree.
-    \li All plugins' initialize methods are called in \e{root-to-leaf} order
+    \li All plugins' initialize functions are called in \e{root-to-leaf} order
        of the dependency tree. This is a good place to put
        objects in the plugin manager's object pool.
-    \li All plugins' extensionsInitialized methods are called in \e{leaf-to-root}
+    \li All plugins' extensionsInitialized functions are called in \e{leaf-to-root}
        order of the dependency tree. At this point, plugins can
        be sure that all plugins that depend on this plugin have
        been initialized completely (implying that they have put
@@ -79,7 +79,7 @@
 
     Plugins have access to the plugin manager
     (and its object pool) via the PluginManager::instance()
-    method.
+    function.
 */
 
 /*!
@@ -87,10 +87,10 @@
     \brief Called after the plugin has been loaded and the IPlugin instance
     has been created.
 
-    The initialize methods of plugins that depend
-    on this plugin are called after the initialize method of this plugin
+    The initialize functions of plugins that depend
+    on this plugin are called after the initialize function of this plugin
     has been called. Plugins should initialize their internal state in this
-    method. Returns if initialization of successful. If it wasn't successful,
+    function. Returns if initialization of successful. If it wasn't successful,
     the \a errorString should be set to a user-readable message
     describing the reason.
 
@@ -100,11 +100,11 @@
 
 /*!
     \fn void IPlugin::extensionsInitialized()
-    \brief Called after the IPlugin::initialize() method has been called,
+    \brief Called after the IPlugin::initialize() function has been called,
     and after both the IPlugin::initialize() and IPlugin::extensionsInitialized()
-    methods of plugins that depend on this plugin have been called.
+    functions of plugins that depend on this plugin have been called.
 
-    In this method, the plugin can assume that plugins that depend on
+    In this function, the plugin can assume that plugins that depend on
     this plugin are fully 'up and running'. It is a good place to
     look in the plugin manager's object pool for objects that have
     been provided by dependent plugins.
@@ -115,17 +115,17 @@
 
 /*!
     \fn bool IPlugin::delayedInitialize()
-    \brief Called after all plugins' IPlugin::extensionsInitialized() method has been called,
-    and after the IPlugin::delayedInitialize() method of plugins that depend on this plugin
+    \brief Called after all plugins' IPlugin::extensionsInitialized() function has been called,
+    and after the IPlugin::delayedInitialize() function of plugins that depend on this plugin
     have been called.
 
-    The plugins' delayedInitialize() methods are called after the application is already running,
+    The plugins' delayedInitialize() functions are called after the application is already running,
     with a few milliseconds delay to application startup, and between individual delayedInitialize
-    method calls. To avoid unnecessary delays, a plugin should return true from the method if it
+    function calls. To avoid unnecessary delays, a plugin should return true from the function if it
     actually implements it, to indicate that the next plugins' delayedInitialize() call should
     be delayed a few milliseconds to give input and paint events a chance to be processed.
 
-    This method can be used if a plugin needs to do non-trivial setup that doesn't
+    This function can be used if a plugin needs to do non-trivial setup that doesn't
     necessarily needs to be done directly at startup, but still should be done within a
     short time afterwards. This can increase the felt plugin/application startup
     time a lot, with very little effort.
@@ -139,16 +139,16 @@
     \brief Called during a shutdown sequence in the same order as initialization
     before the plugins get deleted in reverse order.
 
-    This method should be used to disconnect from other plugins,
+    This function should be used to disconnect from other plugins,
     hide all UI, and optimize shutdown in general.
     If a plugin needs to delay the real shutdown for a while, for example if
     it needs to wait for external processes to finish for a clean shutdown,
-    the plugin can return IPlugin::AsynchronousShutdown from this method. This
+    the plugin can return IPlugin::AsynchronousShutdown from this function. This
     will keep the main event loop running after the aboutToShutdown() sequence
     has finished, until all plugins requesting AsynchronousShutdown have sent
     the asynchronousShutdownFinished() signal.
 
-    The default implementation of this method does nothing and returns
+    The default implementation of this function does nothing and returns
     IPlugin::SynchronousShutdown.
 
     Returns IPlugin::AsynchronousShutdown if the plugin needs to perform
@@ -160,7 +160,7 @@
 /*!
     \fn QObject *IPlugin::remoteCommand(const QStringList &options, const QStringList &arguments)
     \brief When \QC is executed with the -client argument while already another instance of \QC
-           is running, this method of plugins is called in the running instance.
+           is running, this function of plugins is called in the running instance.
 
     Plugin-specific arguments are passed in \a options, while the rest of the
     arguments are passed in \a arguments.
@@ -215,7 +215,7 @@ PluginSpec *IPlugin::pluginSpec() const
 
 /*!
     \fn void IPlugin::addObject(QObject *obj)
-    Convenience method that registers \a obj in the plugin manager's
+    Convenience function that registers \a obj in the plugin manager's
     plugin pool by just calling PluginManager::addObject().
 */
 void IPlugin::addObject(QObject *obj)
@@ -225,7 +225,7 @@ void IPlugin::addObject(QObject *obj)
 
 /*!
     \fn void IPlugin::addAutoReleasedObject(QObject *obj)
-    Convenience method for registering \a obj in the plugin manager's
+    Convenience function for registering \a obj in the plugin manager's
     plugin pool. Usually, registered objects must be removed from
     the object pool and deleted by hand.
     Objects added to the pool via addAutoReleasedObject are automatically
@@ -241,7 +241,7 @@ void IPlugin::addAutoReleasedObject(QObject *obj)
 
 /*!
     \fn void IPlugin::removeObject(QObject *obj)
-    Convenience method that unregisters \a obj from the plugin manager's
+    Convenience function that unregisters \a obj from the plugin manager's
     plugin pool by just calling PluginManager::removeObject().
 */
 void IPlugin::removeObject(QObject *obj)
diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp
index d5c4fe7f56..e90cf11d83 100644
--- a/src/libs/extensionsystem/pluginerrorview.cpp
+++ b/src/libs/extensionsystem/pluginerrorview.cpp
@@ -91,7 +91,7 @@ void PluginErrorView::update(PluginSpec *spec)
         break;
     case PluginSpec::Initialized:
         text = tr("Initialized");
-        tooltip = tr("Plugin's initialization method succeeded");
+        tooltip = tr("Plugin's initialization function succeeded");
         break;
     case PluginSpec::Running:
         text = tr("Running");
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index c7ce379b16..2de78a7f13 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -108,8 +108,8 @@ enum { debugLeaks = 0 };
     Plugins (and everybody else) can add objects to a common 'pool' that is located in
     the plugin manager. Objects in the pool must derive from QObject, there are no other
     prerequisites. All objects of a specified type can be retrieved from the object pool
-    via the getObjects() and getObject() methods. They are aware of Aggregation::Aggregate, i.e.
-    these methods use the Aggregation::query methods instead of a qobject_cast to determine
+    via the getObjects() and getObject() functions. They are aware of Aggregation::Aggregate, i.e.
+    these functions use the Aggregation::query functions instead of a qobject_cast to determine
     the matching objects.
 
     Whenever the state of the object pool changes a corresponding signal is emitted by the plugin manager.
@@ -134,7 +134,7 @@ enum { debugLeaks = 0 };
     object in the pool. This approach does neither require the "user" plugin being
     linked against the "provider" plugin nor a common shared
     header file. The exposed interface is implicitly given by the
-    invokable methods of the "provider" object in the object pool.
+    invokable functions of the "provider" object in the object pool.
 
     The \c{ExtensionSystem::invoke} function template encapsulates
     {ExtensionSystem::Invoker} construction for the common case where
@@ -220,11 +220,11 @@ enum { debugLeaks = 0 };
 
     Retrieves the object of a given type from the object pool.
 
-    This method is aware of Aggregation::Aggregate. That is, it uses
-    the \c Aggregation::query methods instead of \c qobject_cast to
+    This function is aware of Aggregation::Aggregate. That is, it uses
+    the \c Aggregation::query functions instead of \c qobject_cast to
     determine the type of an object.
     If there are more than one object of the given type in
-    the object pool, this method will choose an arbitrary one of them.
+    the object pool, this function will choose an arbitrary one of them.
 
     \sa addObject()
 */
@@ -234,8 +234,8 @@ enum { debugLeaks = 0 };
 
     Retrieves all objects of a given type from the object pool.
 
-    This method is aware of Aggregation::Aggregate. That is, it uses
-    the \c Aggregation::query methods instead of \c qobject_cast to
+    This function is aware of Aggregation::Aggregate. That is, it uses
+    the \c Aggregation::query functions instead of \c qobject_cast to
     determine the type of an object.
 
     \sa addObject()
@@ -570,7 +570,7 @@ void PluginManager::remoteArguments(const QString &serializedArgument, QObject *
     Application options always override any plugin's options.
 
     \a foundAppOptions is set to pairs of ("option string", "argument") for any application options that were found.
-    The command line options that were not processed can be retrieved via the arguments() method.
+    The command line options that were not processed can be retrieved via the arguments() function.
     If an error occurred (like missing argument for an option that requires one), \a errorString contains
     a descriptive message of the error.
 
@@ -675,7 +675,7 @@ void PluginManager::startTests()
         if (!pluginSpec->plugin())
             continue;
 
-        // Collect all test functions/methods of the plugin.
+        // Collect all test functions of the plugin.
         QStringList allTestFunctions;
         const QMetaObject *metaObject = pluginSpec->plugin()->metaObject();
 
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index 1f6c8f8acd..dff461984e 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -128,19 +128,19 @@
             information is available via the PluginSpec.
     \value  Resolved
             The dependencies given in the description file have been
-            successfully found, and are available via the dependencySpecs() method.
+            successfully found, and are available via the dependencySpecs() function.
     \value  Loaded
             The plugin's library is loaded and the plugin instance created
             (available through plugin()).
     \value  Initialized
-            The plugin instance's IPlugin::initialize() method has been called
+            The plugin instance's IPlugin::initialize() function has been called
             and returned a success value.
     \value  Running
             The plugin's dependencies are successfully initialized and
             extensionsInitialized has been called. The loading process is
             complete.
     \value Stopped
-            The plugin has been shut down, i.e. the plugin's IPlugin::aboutToShutdown() method has been called.
+            The plugin has been shut down, i.e. the plugin's IPlugin::aboutToShutdown() function has been called.
     \value Deleted
             The plugin instance has been deleted.
 */
diff --git a/src/libs/glsl/glslast.h b/src/libs/glsl/glslast.h
index e203e16877..479a9514d1 100644
--- a/src/libs/glsl/glslast.h
+++ b/src/libs/glsl/glslast.h
@@ -751,7 +751,7 @@ public:
             : AST(Kind_StructField), name(_name), type(0) {}
 
         // Takes the outer shell of an array type with the innermost
-        // element type set to null.  The fixInnerTypes() method will
+        // element type set to null.  The fixInnerTypes() function will
         // set the innermost element type to a meaningful value.
         Field(const QString *_name, TypeAST *_type)
             : AST(Kind_StructField), name(_name), type(_type) {}
diff --git a/src/libs/qmldebug/qpacketprotocol.cpp b/src/libs/qmldebug/qpacketprotocol.cpp
index 6205ceec71..97792c2491 100644
--- a/src/libs/qmldebug/qpacketprotocol.cpp
+++ b/src/libs/qmldebug/qpacketprotocol.cpp
@@ -301,7 +301,7 @@ void QPacketProtocol::clear()
 
 /*!
   Returns the next unread packet, or an invalid QPacket instance if no packets
-  are available.  This method does NOT block.
+  are available.  This function does NOT block.
   */
 QPacket QPacketProtocol::read()
 {
diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp
index 09e90df4ef..1ea06d329f 100644
--- a/src/libs/qmljs/parser/qmlerror.cpp
+++ b/src/libs/qmljs/parser/qmlerror.cpp
@@ -44,13 +44,13 @@ QT_BEGIN_NAMESPACE
 
     QmlError includes a textual description of the error, as well
     as location information (the file, line, and column). The toString()
-    method creates a single-line, human-readable string containing all of
+    function creates a single-line, human-readable string containing all of
     this information, for example:
     \code
     file:///home/user/test.qml:7:8: Invalid property assignment: double expected
     \endcode
 
-    You can use qDebug() or qWarning() to output errors to the console. This method
+    You can use qDebug() or qWarning() to output errors to the console. This function
     will attempt to open the file indicated by the error
     and include additional contextual information.
     \code
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 1122e53ca4..09cd99cab5 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -1464,7 +1464,7 @@ bool Check::visit(TypeOfExpression *ast)
 
 /// When something is changed here, also change ReadingContext::lookupProperty in
 /// texttomodelmerger.cpp
-/// ### Maybe put this into the context as a helper method.
+/// ### Maybe put this into the context as a helper function.
 const Value *Check::checkScopeObjectMember(const UiQualifiedId *id)
 {
     if (!_importsOk)
diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp
index 9f0db46a7a..443d0dd63b 100644
--- a/src/libs/qmljs/qmljsevaluate.cpp
+++ b/src/libs/qmljs/qmljsevaluate.cpp
@@ -46,10 +46,10 @@ using namespace QmlJS;
 
     Example: Pass in the AST for "1 + 2" and NumberValue will be returned.
 
-    In normal cases only the call operator (or the equivalent value() method)
+    In normal cases only the call operator (or the equivalent value() function)
     will be used.
 
-    The reference() method has the special behavior of not resolving \l{Reference}s
+    The reference() function has the special behavior of not resolving \l{Reference}s
     which can be useful when interested in the identity of a variable instead
     of its value.
 
diff --git a/src/libs/qmljs/qmljsqrcparser.cpp b/src/libs/qmljs/qmljsqrcparser.cpp
index b6f0bedbbe..1011443331 100644
--- a/src/libs/qmljs/qmljsqrcparser.cpp
+++ b/src/libs/qmljs/qmljsqrcparser.cpp
@@ -64,7 +64,7 @@ namespace Internal {
  * For a single qrc a given path maps to a single file, but when one has multiple
  * (platform specific exclusive) qrc files, then multiple files match, so QStringList are used.
  *
- * Especially the collect* methods are thought as low level interface.
+ * Especially the collect* functions are thought as low level interface.
  */
 class QrcParserPrivate
 {
diff --git a/src/libs/qmljs/qmljsscopechain.cpp b/src/libs/qmljs/qmljsscopechain.cpp
index a25c094db4..9ec4d0cf37 100644
--- a/src/libs/qmljs/qmljsscopechain.cpp
+++ b/src/libs/qmljs/qmljsscopechain.cpp
@@ -40,7 +40,7 @@ using namespace QmlJS;
     a specific location.
     \sa Document Context ScopeBuilder
 
-    A ScopeChain is used to perform global lookup with the lookup() method and
+    A ScopeChain is used to perform global lookup with the lookup() function and
     to access information about the enclosing scopes.
 
     Once constructed for a Document in a Context it represents the root scope of
diff --git a/src/libs/qtcreatorcdbext/symbolgroup.cpp b/src/libs/qtcreatorcdbext/symbolgroup.cpp
index 5edd3575f9..7d284841af 100644
--- a/src/libs/qtcreatorcdbext/symbolgroup.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroup.cpp
@@ -50,8 +50,8 @@ enum { debug = 0 };
   \brief The SymbolGroup class creates a symbol group storing a tree of
   expanded symbols rooted on a fake "locals" root element.
 
-  Provides a find() method based on inames ("locals.this.i1.data") and
-  dump() methods used for GDBMI-format dumping and debug helpers.
+  Provides a find() function based on inames ("locals.this.i1.data") and
+  dump() functions used for GDBMI-format dumping and debug helpers.
   Qt Creator's WatchModel is fed from this class. It basically represents the
   symbol group tree with some additional node types (Reference and Map Node
   types.
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))) {