Skip to content

Commit 748be8d

Browse files
committed
[spelling] replace behaviour by behavior
1 parent bc4c470 commit 748be8d

File tree

120 files changed

+416
-398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+416
-398
lines changed

NEWS

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

21902190
2004-05-25 [larsl] 0.2.0devel34

cmake/SIPMacros.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# which is typically a shared library, should be linked to. The built
1717
# module will also be install into Python's site-packages directory.
1818
#
19-
# The behaviour of the ADD_SIP_PYTHON_MODULE macro can be controlled by a
19+
# The behavior of the ADD_SIP_PYTHON_MODULE macro can be controlled by a
2020
# number of variables:
2121
#
2222
# SIP_INCLUDES - List of directories which SIP will scan through when looking

cmake_templates/Doxyfile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ QT_AUTOBRIEF = NO
159159

160160
# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
161161
# treat a multi-line C++ special comment block (i.e. a block of //! or ///
162-
# comments) as a brief description. This used to be the default behaviour.
162+
# comments) as a brief description. This used to be the default behavior.
163163
# The new default is to treat a multi-line C++ comment block as a detailed
164-
# description. Set this tag to YES if you prefer the old behaviour instead.
164+
# description. Set this tag to YES if you prefer the old behavior instead.
165165

166166
MULTILINE_CPP_IS_BRIEF = NO
167167

doc/api_break.dox

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,11 @@ QgsColorBrewerColorRampDialog {#qgis_api_break_3_0_QgsColorBrewerColorRam
475475
and the new ramp can be retrieved after executing the dialog by calling ramp().
476476
- Some internal methods which were previously public or protected were made private.
477477

478+
QgsColorButton {#qgis_api_break_3_0_QgsColorButton}
479+
--------------
480+
481+
- Behaviour enum and its corresponding setter/getter have been renamed to Behavior <!--#spellok-->
482+
478483

479484
QgsColorRampShader {#qgis_api_break_3_0_QgsColorRampShader}
480485
------------------
@@ -611,7 +616,10 @@ QgsComposerTableV2 {#qgis_api_break_3_0_QgsComposerTableV2}
611616

612617
- rowsVisible(), rowRange(), drawHorizontalGridLines() and
613618
drawVerticalGridLines() were removed.
614-
619+
- WrapBehaviour enum and its setter and getter methods has been renamed to WrapBehavior <!--#spellok-->
620+
- EmptyTableBehaviour enum and its setter and getter methods has been renamed to EmptyTableBehavior <!--#spellok-->
621+
622+
615623
QgsComposerView {#qgis_api_break_3_0_QgsComposerView}
616624
--------------------
617625

@@ -1146,7 +1154,7 @@ and the new ramp can be retrieved after executing the dialog by calling ramp().
11461154
QgsLinearlyInterpolatedDiagramRenderer {#qgis_api_break_3_0_QgsLinearlyInterpolatedDiagramRenderer}
11471155
--------------------------------------
11481156

1149-
- The classificationAttribute() and setClassificationAttribute() methods were replace by
1157+
- The classificationAttribute() and setClassificationAttribute() methods were replace by
11501158
classificationField() and setClassificationField() which use the field names instead of field
11511159
indexes.
11521160

@@ -1715,7 +1723,7 @@ capabilities have been removed, as they were unused and had no effect.
17151723
- capabilities() now returns a typesafe QgsVectorDataProvider::Capabilities object, not an integer.
17161724
- convertToProviderType() now takes a geometry reference, not a pointer.
17171725
- geometryType() has been renamed to wkbType() to be in line with QgsVectorLayer
1718-
- The behaviour of defaultValue() has changed from 2.x. In 2.x, defaultValue() would return a SQL
1726+
- The behavior of defaultValue() has changed from 2.x. In 2.x, defaultValue() would return a SQL
17191727
clause fragment which must be evaluated by the provider in order to calculate the default value. In
17201728
QGIS 3.0 defaultValue() only returns literal, constant defaultValues. A new method defaultValueClause
17211729
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
18271835
- setScaleMethodToSymbol was removed. This is now handled using data defined scaling at a symbol layer level
18281836
- usedAttributes is now a const method and returns QSet<QString> instead of QStringList
18291837

1838+
18301839
Processing {#qgis_api_break_3_0_Processing}
18311840
----------
18321841

@@ -1839,6 +1848,13 @@ object of type QgsProcessingFeedback, and will need to adapt their use of progre
18391848
- SilentProgress was removed. Use the base QgsProcessingFeedback class instead.
18401849

18411850

1851+
Triangulation {#qgis_api_break_3_0_Triangulation}
1852+
-------------
1853+
1854+
- 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-->
1855+
1856+
1857+
18421858
QGIS 2.4 {#qgis_api_break_2_4}
18431859
========
18441860

doc/contributors.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
"properties": {
208208
"Name": "Marco Hugentobler",
209209
"Committer": "Yes",
210-
"First Commit Message": "Changes in the display behaviour of qgsmapcanvas (updating the screen, avoid flickering when paning).",
210+
"First Commit Message": "Changes in the display behavior of qgsmapcanvas (updating the screen, avoid flickering when paning).",
211211
"First Commit Date": "15-06-2003",
212212
"GIT Nickname": "mhugent"
213213
},

doc/news.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
136136
<LI>User Interface: Improved color pickers
137137
<LI>User Interface: Copy cell contents from attribute table
138138
<LI>User Interface: Improved HiDPI support
139-
<LI>User Interface: Improved map select tool behaviour
139+
<LI>User Interface: Improved map select tool behavior
140140
<LI>Symbology: Arrow symbol layer
141141
<LI>Symbology: New "Filled marker" symbol layer type
142142
<LI>Symbology: New accessibility and low vision symbols
@@ -249,7 +249,7 @@ <H1>2. What's new in Version 2.14 'Essen'?</H1>
249249
<LI>Digitising : Configurable rubber band color
250250
<LI>Digitising : Autotrace
251251
<LI>Digitising : Trace digitising tool
252-
<LI>General : Changed behaviour of strpos function
252+
<LI>General : Changed behavior of strpos function
253253
<LI>General : Field calculator can be used to update feature's geometry
254254
<LI>General : Virtual layers
255255
<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>
425425
<LI>New field calculator bar in attribute table.
426426
<LI>DXF export improvements.
427427
<LI>Advanced digitizing tools.
428-
<LI>Improved snapping options and behaviour.
428+
<LI>Improved snapping options and behavior.
429429
<LI>Better simplify tool - including support for on the fly reprojection being enabled.
430430
<LI>Qt5 support (optional - default packages are still currently built against Qt4).
431431
<LI>Spatial bookmark import/export.
@@ -747,7 +747,7 @@ <H1>12. Whats new in Version 1.7.2 'Wroclaw'?</H1>
747747
<LI>Allow setting I/O encoding for OGR layers in vector layer properties.
748748
<LI>Fix #4414 (SVG indicators for arrows are not shown)
749749
<LI>Label direction symbol shouldn't depend on "map" vs. "line" orientation.
750-
<LI>Set prompt as default behaviour for unknown CRS
750+
<LI>Set prompt as default behavior for unknown CRS
751751
<LI>For EPSG initialize GDAL CRS from authid instead of proj.4 string
752752
<LI>Fix #4439 (Crash when changing style in Layer Properties)
753753
<LI>Fix #4444 (Error when loading Python plugins)
@@ -2421,7 +2421,7 @@ <H1>28. 0.5</H1>
24212421
Disable overview widget for release. Minor bugfix in rasterlayer picker up by
24222422
Larsl which is only encountered bu i8n users. Miscellaneous other fixes
24232423
including proper rotation support for north arrows in all 4 corners of
2424-
display, inproved refresh behaviour of n-arrow and copyright plugin, better
2424+
display, inproved refresh behavior of n-arrow and copyright plugin, better
24252425
state hadnling for copyright plugin.
24262426
</P>
24272427
<P>

doc/news.t2t

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

21442144
2004-05-25 [larsl] 0.2.0devel34

python/analysis/interpolation/DualEdgeTriangulation.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class DualEdgeTriangulation: Triangulation
4040
virtual double getYMin() const;
4141
/** Returns the number of points*/
4242
virtual int getNumberOfPoints() const;
43-
/** Sets the behaviour of the triangulation in case of crossing forced lines*/
44-
virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b );
43+
/** Sets the behavior of the triangulation in case of crossing forced lines*/
44+
virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b );
4545
/** Sets the color of the normal edges*/
4646
virtual void setEdgeColor( int r, int g, int b );
4747
/** Sets the color of the forced edges*/

python/analysis/interpolation/TriDecorator.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TriDecorator : Triangulation
2727
virtual double getXMin() const;
2828
virtual double getYMax() const;
2929
virtual double getYMin() const;
30-
virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b );
30+
virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b );
3131
virtual void setEdgeColor( int r, int g, int b );
3232
virtual void setForcedEdgeColor( int r, int g, int b );
3333
virtual void setBreakEdgeColor( int r, int g, int b );

python/analysis/interpolation/Triangulation.sip

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ class Triangulation
77
public:
88

99

10-
//! Enumeration describing the behaviour, if two forced lines cross.
11-
enum forcedCrossBehaviour
10+
//! Enumeration describing the behavior, if two forced lines cross.
11+
enum ForcedCrossBehavior
1212
{
13-
SnappingType_VERTICE, //!< the second inserted forced line is snapped to the closest vertice of the first inserted forced line.
14-
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)
15-
INSERT_VERTICE
13+
SnappingTypeVertex, //!< the second inserted forced line is snapped to the closest vertice of the first inserted forced line.
14+
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)
15+
InsertVertex
1616
};
1717

1818
virtual ~Triangulation();
@@ -91,8 +91,8 @@ class Triangulation
9191

9292
/** Draws the points, edges and the forced lines*/
9393
//virtual void draw(QPainter* p, double xlowleft, double ylowleft, double xupright, double yupright, double width, double height) const=0;
94-
/** Sets the behaviour of the triangulation in case of crossing forced lines*/
95-
virtual void setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour b ) = 0;
94+
/** Sets the behavior of the triangulation in case of crossing forced lines*/
95+
virtual void setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b ) = 0;
9696
/** Sets the color of the normal edges*/
9797
virtual void setEdgeColor( int r, int g, int b ) = 0;
9898
/** Sets the color of the forced edges*/

0 commit comments

Comments
 (0)