From 0d0049143642c551b79df16cfd6b9962a6a0497b Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Mon, 5 Mar 2018 22:37:39 -0500
Subject: [PATCH] s/Modeller/Modeler/

---
 .../models/qgsprocessingmodelchildalgorithm.sip.in   |  8 ++++----
 scripts/spell_check/spelling.dat                     |  1 +
 .../models/qgsprocessingmodelchildalgorithm.h        | 12 ++++++------
 src/core/processing/qgsprocessingparametertype.cpp   |  2 +-
 src/core/processing/qgsprocessingparametertype.h     |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/python/core/processing/models/qgsprocessingmodelchildalgorithm.sip.in b/python/core/processing/models/qgsprocessingmodelchildalgorithm.sip.in
index 3aedb99b75a..372071feaa7 100644
--- a/python/core/processing/models/qgsprocessingmodelchildalgorithm.sip.in
+++ b/python/core/processing/models/qgsprocessingmodelchildalgorithm.sip.in
@@ -181,7 +181,7 @@ dependent algorithms.
     bool parametersCollapsed() const;
 %Docstring
 Returns true if the list of parameters for this algorithm should be collapsed
-in the graphical modeller.
+in the graphical modeler.
 
 .. seealso:: :py:func:`setParametersCollapsed`
 
@@ -191,7 +191,7 @@ in the graphical modeller.
     void setParametersCollapsed( bool collapsed );
 %Docstring
 Sets whether the list of parameters for this algorithm should be collapsed
-in the graphical modeller.
+in the graphical modeler.
 
 .. seealso:: :py:func:`parametersCollapsed`
 
@@ -201,7 +201,7 @@ in the graphical modeller.
     bool outputsCollapsed() const;
 %Docstring
 Returns true if the list of outputs for this algorithm should be collapsed
-in the graphical modeller.
+in the graphical modeler.
 
 .. seealso:: :py:func:`setParametersCollapsed`
 
@@ -211,7 +211,7 @@ in the graphical modeller.
     void setOutputsCollapsed( bool collapsed );
 %Docstring
 Sets whether the list of outputs for this algorithm should be collapsed
-in the graphical modeller.
+in the graphical modeler.
 
 .. seealso:: :py:func:`outputsCollapsed`
 
diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat
index c915e41e2e8..1afdea5b715 100644
--- a/scripts/spell_check/spelling.dat
+++ b/scripts/spell_check/spelling.dat
@@ -4475,6 +4475,7 @@ mkaes:makes
 mkaing:making
 mkea:make
 mmnemonic:mnemonic
+modeller:modeler
 moderm:modem
 modfied:modified
 modfies:modifies
diff --git a/src/core/processing/models/qgsprocessingmodelchildalgorithm.h b/src/core/processing/models/qgsprocessingmodelchildalgorithm.h
index 0ba2a258bbd..9941a2b52d6 100644
--- a/src/core/processing/models/qgsprocessingmodelchildalgorithm.h
+++ b/src/core/processing/models/qgsprocessingmodelchildalgorithm.h
@@ -175,7 +175,7 @@ class CORE_EXPORT QgsProcessingModelChildAlgorithm : public QgsProcessingModelCo
 
     /**
      * Returns true if the list of parameters for this algorithm should be collapsed
-     * in the graphical modeller.
+     * in the graphical modeler.
      * \see setParametersCollapsed()
      * \see outputsCollapsed()
      */
@@ -183,7 +183,7 @@ class CORE_EXPORT QgsProcessingModelChildAlgorithm : public QgsProcessingModelCo
 
     /**
      * Sets whether the list of parameters for this algorithm should be collapsed
-     * in the graphical modeller.
+     * in the graphical modeler.
      * \see parametersCollapsed()
      * \see setOutputsCollapsed()
      */
@@ -191,7 +191,7 @@ class CORE_EXPORT QgsProcessingModelChildAlgorithm : public QgsProcessingModelCo
 
     /**
      * Returns true if the list of outputs for this algorithm should be collapsed
-     * in the graphical modeller.
+     * in the graphical modeler.
      * \see setParametersCollapsed()
      * \see parametersCollapsed()
      */
@@ -199,7 +199,7 @@ class CORE_EXPORT QgsProcessingModelChildAlgorithm : public QgsProcessingModelCo
 
     /**
      * Sets whether the list of outputs for this algorithm should be collapsed
-     * in the graphical modeller.
+     * in the graphical modeler.
      * \see outputsCollapsed()
      * \see setParametersCollapsed()
      */
@@ -274,9 +274,9 @@ class CORE_EXPORT QgsProcessingModelChildAlgorithm : public QgsProcessingModelCo
     //! List of child algorithms from the parent model on which this algorithm is dependent
     QStringList mDependencies;
 
-    //! Whether list of parameters should be collapsed in the graphical modeller
+    //! Whether list of parameters should be collapsed in the graphical modeler
     bool mParametersCollapsed = true;
-    //! Whether list of outputs should be collapsed in the graphical modeller
+    //! Whether list of outputs should be collapsed in the graphical modeler
     bool mOutputsCollapsed = true;
 
 };
diff --git a/src/core/processing/qgsprocessingparametertype.cpp b/src/core/processing/qgsprocessingparametertype.cpp
index daf13f5261f..20a5ba9b277 100644
--- a/src/core/processing/qgsprocessingparametertype.cpp
+++ b/src/core/processing/qgsprocessingparametertype.cpp
@@ -1,6 +1,6 @@
 #include "qgsprocessingparametertype.h"
 
-bool QgsProcessingParameterType::exposeToModeller() const
+bool QgsProcessingParameterType::exposeToModeler() const
 {
   return true;
 }
diff --git a/src/core/processing/qgsprocessingparametertype.h b/src/core/processing/qgsprocessingparametertype.h
index e0f81a9a880..120204b2aca 100644
--- a/src/core/processing/qgsprocessingparametertype.h
+++ b/src/core/processing/qgsprocessingparametertype.h
@@ -45,10 +45,10 @@ class CORE_EXPORT QgsProcessingParameterType
     virtual QString id() const = 0;
 
     /**
-     * Determines if this parameter is available in the modeller.
+     * Determines if this parameter is available in the modeler.
      * The default implementation returns true.
      */
-    virtual bool exposeToModeller() const;
+    virtual bool exposeToModeler() const;
 
     /**
      * Metadata for this parameter type. Can be used for example to define custom widgets.