[spelling] replace behaviour by behavior

NEWS

@@ -56,7 +56,7 @@ This release has following new features:
 - User Interface: Improved color pickers
 - User Interface: Copy cell contents from attribute table
 - User Interface: Improved HiDPI support
-- User Interface: Improved map select tool behaviour
+- User Interface: Improved map select tool behavior
 - Symbology: Arrow symbol layer
 - Symbology: New "Filled marker" symbol layer type
 - Symbology: New accessibility and low vision symbols
@@ -166,7 +166,7 @@ This release has following new features:
 - Digitising : Configurable rubber band color
 - Digitising : Autotrace
 - Digitising : Trace digitising tool
-- General : Changed behaviour of strpos function
+- General : Changed behavior of strpos function
 - General : Field calculator can be used to update feature's geometry
 - General : Virtual layers
 - General : Zoom to feature with right-click in attribute table
@@ -333,7 +333,7 @@ This is a minor release increment with the following feature:
 - New field calculator bar in attribute table.
 - DXF export improvements.
 - Advanced digitizing tools.
-- Improved snapping options and behaviour.
+- Improved snapping options and behavior.
 - Better simplify tool - including support for on the fly reprojection being enabled.
 - Qt5 support (optional - default packages are still currently built against Qt4).
 - Spatial bookmark import/export.
@@ -636,7 +636,7 @@ were made.
 - Allow setting I/O encoding for OGR layers in vector layer properties.
 - Fix #4414 (SVG indicators for arrows are not shown)
 - Label direction symbol shouldn't depend on "map" vs. "line" orientation.
-- Set prompt as default behaviour for unknown CRS
+- Set prompt as default behavior for unknown CRS
 - For EPSG initialize GDAL CRS from authid instead of proj.4 string
 - Fix #4439 (Crash when changing style in Layer Properties)
 - Fix #4444 (Error when loading Python plugins)
@@ -2184,7 +2184,7 @@ Fixed some more instances of the same bug in raster layer
 Disable overview widget for release. Minor bugfix in rasterlayer picker up by
 Larsl which is only encountered bu i8n users. Miscellaneous other fixes
 including proper rotation support for north arrows in all 4 corners of
-display, inproved refresh behaviour of n-arrow and copyright plugin, better
+display, inproved refresh behavior of n-arrow and copyright plugin, better
 state hadnling for copyright plugin.
 
 2004-05-25 [larsl] 0.2.0devel34

cmake/SIPMacros.cmake

@@ -16,7 +16,7 @@
 #     which is typically a shared library, should be linked to. The built
 #     module will also be install into Python's site-packages directory.
 #
-# The behaviour of the ADD_SIP_PYTHON_MODULE macro can be controlled by a
+# The behavior of the ADD_SIP_PYTHON_MODULE macro can be controlled by a
 # number of variables:
 #
 # SIP_INCLUDES - List of directories which SIP will scan through when looking

cmake_templates/Doxyfile.in

@@ -159,9 +159,9 @@ QT_AUTOBRIEF           = NO
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
+# comments) as a brief description. This used to be the default behavior.
 # The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# description. Set this tag to YES if you prefer the old behavior instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 

doc/api_break.dox

@@ -475,6 +475,11 @@ QgsColorBrewerColorRampDialog        {#qgis_api_break_3_0_QgsColorBrewerColorRam
 and the new ramp can be retrieved after executing the dialog by calling ramp().
 - Some internal methods which were previously public or protected were made private.
 
+QgsColorButton     {#qgis_api_break_3_0_QgsColorButton}
+--------------
+
+- Behaviour enum and its corresponding setter/getter have been renamed to Behavior <!--#spellok-->
+
 
 QgsColorRampShader        {#qgis_api_break_3_0_QgsColorRampShader}
 ------------------
@@ -611,7 +616,10 @@ QgsComposerTableV2        {#qgis_api_break_3_0_QgsComposerTableV2}
 
 - rowsVisible(), rowRange(), drawHorizontalGridLines() and
  drawVerticalGridLines() were removed.
-
+- WrapBehaviour enum and its setter and getter methods has been renamed to WrapBehavior <!--#spellok-->
+- EmptyTableBehaviour enum and its setter and getter methods has been renamed to EmptyTableBehavior <!--#spellok-->
+
+
  QgsComposerView        {#qgis_api_break_3_0_QgsComposerView}
 --------------------
 
@@ -1146,7 +1154,7 @@ and the new ramp can be retrieved after executing the dialog by calling ramp().
 QgsLinearlyInterpolatedDiagramRenderer        {#qgis_api_break_3_0_QgsLinearlyInterpolatedDiagramRenderer}
 --------------------------------------
 
-- The classificationAttribute() and setClassificationAttribute() methods were replace by 
+- The classificationAttribute() and setClassificationAttribute() methods were replace by
 classificationField() and setClassificationField() which use the field names instead of field
 indexes.
 
@@ -1715,7 +1723,7 @@ capabilities have been removed, as they were unused and had no effect.
 - capabilities() now returns a typesafe QgsVectorDataProvider::Capabilities object, not an integer.
 - convertToProviderType() now takes a geometry reference, not a pointer.
 - geometryType() has been renamed to wkbType() to be in line with QgsVectorLayer
-- The behaviour of defaultValue() has changed from 2.x. In 2.x, defaultValue() would return a SQL
+- The behavior of defaultValue() has changed from 2.x. In 2.x, defaultValue() would return a SQL
 clause fragment which must be evaluated by the provider in order to calculate the default value. In
 QGIS 3.0 defaultValue() only returns literal, constant defaultValues. A new method defaultValueClause
 has been added which returns the SQL clause fragments which must be evaluated by the provider itself.
@@ -1827,6 +1835,7 @@ optional property map passing down layer level properties to the SLD encoders. I
 - setScaleMethodToSymbol was removed. This is now handled using data defined scaling at a symbol layer level
 - usedAttributes is now a const method and returns QSet<QString> instead of QStringList
 
+
 Processing        {#qgis_api_break_3_0_Processing}
 ----------
 
@@ -1839,6 +1848,13 @@ object of type QgsProcessingFeedback, and will need to adapt their use of progre
 - SilentProgress was removed. Use the base QgsProcessingFeedback class instead.
 
 
+Triangulation        {#qgis_api_break_3_0_Triangulation}
+-------------
+
+- forcedCrossBehaviour enum and its setter and getter have been renamed to ForcedCrossBehavior. Its members have been renamed: SnappingType_VERTICE: SnappingTypeVertex, DELETE_FIRST: DeleteFirst, INSERT_VERTEX: InsertVertex. <!--#spellok-->
+
+
+
 QGIS 2.4        {#qgis_api_break_2_4}
 ========
 

doc/contributors.json

@@ -207,7 +207,7 @@
       "properties": {
         "Name": "Marco Hugentobler",
         "Committer": "Yes",
-        "First Commit Message": "Changes in the display behaviour of qgsmapcanvas (updating the screen, avoid flickering when paning).",
+        "First Commit Message": "Changes in the display behavior of qgsmapcanvas (updating the screen, avoid flickering when paning).",
         "First Commit Date": "15-06-2003",
         "GIT Nickname": "mhugent"
       },

doc/news.html

@@ -136,7 +136,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
 <LI>User Interface: Improved color pickers
 <LI>User Interface: Copy cell contents from attribute table
 <LI>User Interface: Improved HiDPI support
-<LI>User Interface: Improved map select tool behaviour
+<LI>User Interface: Improved map select tool behavior
 <LI>Symbology: Arrow symbol layer
 <LI>Symbology: New "Filled marker" symbol layer type
 <LI>Symbology: New accessibility and low vision symbols
@@ -249,7 +249,7 @@ <H1>2. What's new in Version 2.14 'Essen'?</H1>
 <LI>Digitising : Configurable rubber band color
 <LI>Digitising : Autotrace
 <LI>Digitising : Trace digitising tool
-<LI>General : Changed behaviour of strpos function
+<LI>General : Changed behavior of strpos function
 <LI>General : Field calculator can be used to update feature's geometry
 <LI>General : Virtual layers
 <LI>General : Zoom to feature with right-click in attribute table
@@ -425,7 +425,7 @@ <H1>5. What's new in Version 2.8 'Wien'?</H1>
 <LI>New field calculator bar in attribute table.
 <LI>DXF export improvements.
 <LI>Advanced digitizing tools.
-<LI>Improved snapping options and behaviour.
+<LI>Improved snapping options and behavior.
 <LI>Better simplify tool - including support for on the fly reprojection being enabled.
 <LI>Qt5 support (optional - default packages are still currently built against Qt4).
 <LI>Spatial bookmark import/export.
@@ -747,7 +747,7 @@ <H1>12. Whats new in Version 1.7.2 'Wroclaw'?</H1>
 <LI>Allow setting I/O encoding for OGR layers in vector layer properties.
 <LI>Fix #4414 (SVG indicators for arrows are not shown)
 <LI>Label direction symbol shouldn't depend on "map" vs. "line" orientation.
-<LI>Set prompt as default behaviour for unknown CRS
+<LI>Set prompt as default behavior for unknown CRS
 <LI>For EPSG initialize GDAL CRS from authid instead of proj.4 string
 <LI>Fix #4439 (Crash when changing style in Layer Properties)
 <LI>Fix #4444 (Error when loading Python plugins)
@@ -2421,7 +2421,7 @@ <H1>28. 0.5</H1>
 Disable overview widget for release. Minor bugfix in rasterlayer picker up by
 Larsl which is only encountered bu i8n users. Miscellaneous other fixes
 including proper rotation support for north arrows in all 4 corners of
-display, inproved refresh behaviour of n-arrow and copyright plugin, better
+display, inproved refresh behavior of n-arrow and copyright plugin, better
 state hadnling for copyright plugin.
 </P>
 <P>

doc/news.t2t

@@ -50,7 +50,7 @@ This release has following new features:
 - User Interface: Improved color pickers
 - User Interface: Copy cell contents from attribute table
 - User Interface: Improved HiDPI support
-- User Interface: Improved map select tool behaviour
+- User Interface: Improved map select tool behavior
 - Symbology: Arrow symbol layer
 - Symbology: New "Filled marker" symbol layer type
 - Symbology: New accessibility and low vision symbols
@@ -160,7 +160,7 @@ This release has following new features:
 - Digitising : Configurable rubber band color
 - Digitising : Autotrace
 - Digitising : Trace digitising tool
-- General : Changed behaviour of strpos function
+- General : Changed behavior of strpos function
 - General : Field calculator can be used to update feature's geometry
 - General : Virtual layers
 - General : Zoom to feature with right-click in attribute table
@@ -325,7 +325,7 @@ This is a minor release increment with the following feature:
 - New field calculator bar in attribute table.
 - DXF export improvements.
 - Advanced digitizing tools.
-- Improved snapping options and behaviour.
+- Improved snapping options and behavior.
 - Better simplify tool - including support for on the fly reprojection being enabled.
 - Qt5 support (optional - default packages are still currently built against Qt4).
 - Spatial bookmark import/export.
@@ -621,7 +621,7 @@ were made.
 - Allow setting I/O encoding for OGR layers in vector layer properties.
 - Fix #4414 (SVG indicators for arrows are not shown)
 - Label direction symbol shouldn't depend on "map" vs. "line" orientation.
-- Set prompt as default behaviour for unknown CRS
+- Set prompt as default behavior for unknown CRS
 - For EPSG initialize GDAL CRS from authid instead of proj.4 string
 - Fix #4439 (Crash when changing style in Layer Properties)
 - Fix #4444 (Error when loading Python plugins)
@@ -2138,7 +2138,7 @@ Fixed some more instances of the same bug in raster layer
 Disable overview widget for release. Minor bugfix in rasterlayer picker up by
 Larsl which is only encountered bu i8n users. Miscellaneous other fixes
 including proper rotation support for north arrows in all 4 corners of
-display, inproved refresh behaviour of n-arrow and copyright plugin, better
+display, inproved refresh behavior of n-arrow and copyright plugin, better
 state hadnling for copyright plugin.
 
 2004-05-25 [larsl] 0.2.0devel34

python/analysis/interpolation/DualEdgeTriangulation.sip

@@ -40,8 +40,8 @@ class DualEdgeTriangulation: Triangulation
     virtual double getYMin() const;
     /** Returns the number of points*/
     virtual int getNumberOfPoints() const;
-    /** Sets the behaviour of the triangulation in case of crossing forced lines*/
-    virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b );
+    /** Sets the behavior of the triangulation in case of crossing forced lines*/
+    virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b );
     /** Sets the color of the normal edges*/
     virtual void setEdgeColor( int r, int g, int b );
     /** Sets the color of the forced edges*/

python/analysis/interpolation/TriDecorator.sip

@@ -27,7 +27,7 @@ class TriDecorator : Triangulation
     virtual double getXMin() const;
     virtual double getYMax() const;
     virtual double getYMin() const;
-    virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b );
+    virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b );
     virtual void setEdgeColor( int r, int g, int b );
     virtual void setForcedEdgeColor( int r, int g, int b );
     virtual void setBreakEdgeColor( int r, int g, int b );

python/analysis/interpolation/Triangulation.sip

@@ -7,12 +7,12 @@ class Triangulation
   public:
 
 
-    //! Enumeration describing the behaviour, if two forced lines cross.
-    enum forcedCrossBehaviour
+    //! Enumeration describing the behavior, if two forced lines cross.
+    enum ForcedCrossBehavior
     {
-      SnappingType_VERTICE,  //!< the second inserted forced line is snapped to the closest vertice of the first inserted forced line.
-      DELETE_FIRST,          //!< the status of the first inserted forced line is reset to that of a normal edge (so that the second inserted forced line remain and the first not)
-      INSERT_VERTICE
+      SnappingTypeVertex, //!< the second inserted forced line is snapped to the closest vertice of the first inserted forced line.
+      DeleteFirst,        //!< the status of the first inserted forced line is reset to that of a normal edge (so that the second inserted forced line remain and the first not)
+      InsertVertex
     };
 
     virtual ~Triangulation();
@@ -91,8 +91,8 @@ class Triangulation
 
     /** Draws the points, edges and the forced lines*/
     //virtual void draw(QPainter* p, double xlowleft, double ylowleft, double xupright, double yupright, double width, double height) const=0;
-    /** Sets the behaviour of the triangulation in case of crossing forced lines*/
-    virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b ) = 0;
+    /** Sets the behavior of the triangulation in case of crossing forced lines*/
+    virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b ) = 0;
     /** Sets the color of the normal edges*/
     virtual void setEdgeColor( int r, int g, int b ) = 0;
     /** Sets the color of the forced edges*/

python/core/composer/qgscomposermultiframe.sip

@@ -33,7 +33,7 @@ class QgsComposerMultiFrame: QgsComposerObject
 
   public:
 
-    /** Specifies the behaviour for creating new frames to fit the multiframe's content
+    /** Specifies the behavior for creating new frames to fit the multiframe's content
      */
     enum ResizeMode
     {

python/core/composer/qgscomposertablev2.sip

@@ -95,7 +95,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
 
     /** Controls how long strings in the table are handled
      */
-    enum WrapBehaviour
+    enum WrapBehavior
     {
       TruncateText = 0, /*!< text which doesn't fit inside the cell is truncated */
       WrapText /*!< text which doesn't fit inside the cell is wrapped. Note that this only applies to text in columns with a fixed width. */
@@ -133,34 +133,34 @@ class QgsComposerTableV2: QgsComposerMultiFrame
      */
     double cellMargin() const;
 
-    /** Sets the behaviour for empty tables with no content rows.
-     * @param mode behaviour mode for empty tables
-     * @see emptyTableBehaviour
+    /** Sets the behavior for empty tables with no content rows.
+     * @param mode behavior mode for empty tables
+     * @see emptyTableBehavior
      */
-    void setEmptyTableBehaviour( const EmptyTableMode mode );
+    void setEmptyTableBehavior( const EmptyTableMode mode );
 
-    /** Returns the behaviour mode for empty tables. This property controls
+    /** Returns the behavior mode for empty tables. This property controls
      * how the table is drawn if it contains no content rows.
-     * @returns behaviour mode for empty tables
-     * @see setEmptyTableBehaviour
+     * @returns behavior mode for empty tables
+     * @see setEmptyTableBehavior
      */
-    EmptyTableMode emptyTableBehaviour() const;
+    EmptyTableMode emptyTableBehavior() const;
 
     /** Sets the message for empty tables with no content rows. This message
-     * is displayed in the table body if the empty table behaviour is
+     * is displayed in the table body if the empty table behavior is
      * set to ShowMessage
      * @param message message to show for empty tables
      * @see emptyTableMessage
-     * @see setEmptyTableBehaviour
+     * @see setEmptyTableBehavior
      */
     void setEmptyTableMessage( const QString& message );
 
     /** Returns the message for empty tables with no content rows. This message
-     * is displayed in the table body if the empty table behaviour is
+     * is displayed in the table body if the empty table behavior is
      * set to ShowMessage
      * @returns message to show for empty tables
      * @see setEmptyTableMessage
-     * @see emptyTableBehaviour
+     * @see emptyTableBehavior
      */
     QString emptyTableMessage() const;
 
@@ -364,21 +364,21 @@ class QgsComposerTableV2: QgsComposerMultiFrame
      */
     QColor backgroundColor() const;
 
-    /** Sets the wrap behaviour for the table, which controls how text within cells is
+    /** Sets the wrap behavior for the table, which controls how text within cells is
      * automatically wrapped.
-     * @param behaviour wrap behaviour
-     * @see wrapBehaviour
+     * @param behavior wrap behavior
+     * @see wrapBehavior
      * @note added in QGIS 2.12
      */
-    void setWrapBehaviour( WrapBehaviour behaviour );
+    void setWrapBehavior( WrapBehavior behavior );
 
-    /** Returns the wrap behaviour for the table, which controls how text within cells is
+    /** Returns the wrap behavior for the table, which controls how text within cells is
      * automatically wrapped.
-     * @returns current wrap behaviour
-     * @see setWrapBehaviour
+     * @returns current wrap behavior
+     * @see setWrapBehavior
      * @note added in QGIS 2.12
      */
-    WrapBehaviour wrapBehaviour() const;
+    WrapBehavior wrapBehavior() const;
 
     /** Returns a pointer to the list of QgsComposerTableColumns shown in the table
      * @returns pointer to list of columns in table