Merge remote-tracking branch 'origin/3.0'

3 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
index e9bc643c6b..739c2535f5 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h
@@ -119,7 +119,7 @@ private:
                            const QStringList &files);
 
     /**
-     * Helper method for buildFileNodeTree(): Inserts a new folder-node for
+     * Helper function for buildFileNodeTree(): Inserts a new folder-node for
      * the directory \p nodeDir and inserts it into \p nodes. If no parent
      * folder exists, it will be created recursively.
      */
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
index 4257e2ad7f..4dd627be0b 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
@@ -75,7 +75,7 @@ private:
     AutotoolsProject *m_project;
     Core::IDocument *m_projectFile;
 
-    // TODO: AutotoolsProject calls the protected method addFileNodes() from AutotoolsProjectNode.
+    // TODO: AutotoolsProject calls the protected function addFileNodes() from AutotoolsProjectNode.
     // Instead of this friend declaration, a public interface might be preferable.
     friend class AutotoolsProject;
 };
diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.h b/src/plugins/autotoolsprojectmanager/makefileparser.h
index 9638cebba7..894201bef5 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparser.h
+++ b/src/plugins/autotoolsprojectmanager/makefileparser.h
@@ -65,7 +65,7 @@ public:
 
     /**
      * Parses the makefile. Must be invoked at least once, otherwise
-     * the getter methods of MakefileParser will return empty values.
+     * the getter functions of MakefileParser will return empty values.
      * @return True, if the parsing was successful. If false is returned,
      *         the makefile could not be opened.
      */
@@ -116,15 +116,15 @@ public:
     QStringList cxxflags() const;
 
     /**
-     * Cancels the parsing. Calling this method only makes sense, if the
-     * parser runs in a different thread than the caller of this method.
-     * The method is thread-safe.
+     * Cancels the parsing. Calling this function only makes sense, if the
+     * parser runs in a different thread than the caller of this function.
+     * The function is thread-safe.
      */
     void cancel();
 
     /**
      * @return True, if the parser has been cancelled by MakefileParser::cancel().
-     *         The method is thread-safe.
+     *         The function is thread-safe.
      */
     bool isCanceled() const;
 
@@ -176,14 +176,14 @@ private:
     void parseSubDirs();
 
     /**
-     * Helper method for parseDefaultExtensions(). Returns recursively all sources
+     * Helper function for parseDefaultExtensions(). Returns recursively all sources
      * inside the directory \p directory that match with the extension \p extension.
      */
     QStringList directorySources(const QString &directory,
                                  const QStringList &extensions);
 
     /**
-     * Helper method for all parse-methods. Returns each value of a target as string in
+     * Helper function for all parse-functions. Returns each value of a target as string in
      * the stringlist. The current line m_line is used as starting point and increased
      * if the current line ends with a \.
      *
@@ -205,7 +205,7 @@ private:
     /**
      * Adds recursively all sources of the current folder to m_sources and removes
      * all duplicates. The Makefile.am is not parsed, only the folders and files are
-     * handled. This method should only be called, if the sources parsing in the Makefile.am
+     * handled. This function should only be called, if the sources parsing in the Makefile.am
      * failed because variables (e.g. $(test)) have been used.
      */
     void addAllSources();
@@ -218,7 +218,7 @@ private:
     void parseIncludePaths();
 
     /**
-     * Helper method for MakefileParser::directorySources(). Appends the name of the headerfile
+     * Helper function for MakefileParser::directorySources(). Appends the name of the headerfile
      * to \p list, if the header could be found in the directory specified by \p dir.
      * The headerfile base name is defined by \p fileName.
      */