Merge remote-tracking branch 'origin/3.0'

1 files changed, 10 insertions, 10 deletions

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();