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>

8 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 06d6e6401e..beb49cb46d 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -6520,11 +6520,11 @@ int BaseTextEditorWidget::rowCount() const
 }
 
 /**
-  Helper method to transform a selected text. If nothing is selected at the moment
+  Helper function to transform a selected text. If nothing is selected at the moment
   the word under the cursor is used.
-  The type of the transformation is determined by the method pointer given.
+  The type of the transformation is determined by the function pointer given.
 
-  @param method     pointer to the QString method to use for the transformation
+  @param method     pointer to the QString function to use for the transformation
 
   @see uppercaseSelection, lowercaseSelection
 */
diff --git a/src/plugins/texteditor/basetextmark.cpp b/src/plugins/texteditor/basetextmark.cpp
index dbef43c04c..dd5832a7bb 100644
--- a/src/plugins/texteditor/basetextmark.cpp
+++ b/src/plugins/texteditor/basetextmark.cpp
@@ -136,7 +136,7 @@ BaseTextMark::BaseTextMark(const QString &fileName, int lineNumber)
 {
 }
 
-// we need two phase initilization, since we are calling virtual methods
+// we need two phase initilization, since we are calling virtual functions
 // of BaseTextMark in add() and also accessing widthFactor
 // which might be set in the derived constructor
 void BaseTextMark::init()
diff --git a/src/plugins/texteditor/codeassist/iassistinterface.cpp b/src/plugins/texteditor/codeassist/iassistinterface.cpp
index 51fe2a615a..2f3ec8d923 100644
--- a/src/plugins/texteditor/codeassist/iassistinterface.cpp
+++ b/src/plugins/texteditor/codeassist/iassistinterface.cpp
@@ -90,7 +90,7 @@ IAssistInterface::~IAssistInterface()
 
     Detaches the interface. If it is necessary to take any special care in order to allow
     this interface to be run in a separate thread \a destination this needs to be done
-    in this method.
+    in this function.
 */
 
 /*!
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp
index 06106e9703..787b1fc1b8 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp
@@ -416,7 +416,7 @@ void Highlighter::applyFormat(int offset,
         QTextCharFormat format = formatForCategory(formatId);
         if (itemData->isCustomized()) {
             // Please notice that the following are applied every time for item data which have
-            // customizations. The configureFormats method could be used to provide a "one time"
+            // customizations. The configureFormats function could be used to provide a "one time"
             // configuration, but it would probably require to traverse all item data from all
             // definitions available/loaded (either to set the values or for some "notifying"
             // strategy). This is because the highlighter does not really know on which
diff --git a/src/plugins/texteditor/highlighterutils.h b/src/plugins/texteditor/highlighterutils.h
index dd6bc5343d..8e9fba0f44 100644
--- a/src/plugins/texteditor/highlighterutils.h
+++ b/src/plugins/texteditor/highlighterutils.h
@@ -33,9 +33,9 @@
 #include <QString>
 #include "texteditor_global.h"
 
-/* These methods were originally a part of TextEditor::Highlighter,
+/* These functions were originally a part of TextEditor::Highlighter,
  * but due to a very hackish test of that generic highlighter,
- * there methods must be outside. */
+ * there functions must be outside. */
 
 namespace Core {
 class MimeType;
diff --git a/src/plugins/texteditor/quickfix.h b/src/plugins/texteditor/quickfix.h
index d4317aab6c..349c003f2e 100644
--- a/src/plugins/texteditor/quickfix.h
+++ b/src/plugins/texteditor/quickfix.h
@@ -81,7 +81,7 @@ public:
     /*!
         Perform this quick-fix's operation.
 
-        Subclasses should implement this method to do the actual changes.
+        Subclasses should implement this function to do the actual changes.
      */
     virtual void perform() = 0;
 
diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index 1cf9359c37..8066f8d7f7 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -693,7 +693,7 @@ static bool byStartOfRange(const QTextLayout::FormatRange &range, const QTextLay
 }
 
 // The formats is passed in by reference in order to prevent unnecessary copying of its items.
-// After this method returns, the list is modified, and should be considered invalidated!
+// After this function returns, the list is modified, and should be considered invalidated!
 void SyntaxHighlighter::setExtraAdditionalFormats(const QTextBlock& block,
                                                   QList<QTextLayout::FormatRange> &formats)
 {
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index e795b3ab3b..3a98d51e60 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -150,8 +150,8 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
     formatDescr.append(FormatDescription(C_FUNCTION, tr("Function"), tr("Name of a function."),
                                          functionFormat));
     functionFormat.setItalic(true);
-    formatDescr.append(FormatDescription(C_VIRTUAL_METHOD, tr("Virtual Method"),
-                                         tr("Name of method declared as virtual."),
+    formatDescr.append(FormatDescription(C_VIRTUAL_METHOD, tr("Virtual Function"),
+                                         tr("Name of function declared as virtual."),
                                          functionFormat));
 
     formatDescr.append(FormatDescription(C_BINDING, tr("QML Binding"),