Skip to content

Commit bf22cbf

Browse files
3nids3nids
committedJan 16, 2017
[spellcheck] fix case detection + some fixes
·
ltr-3_40final-3_0_0
1 parent 5679fb0 commit bf22cbf

File tree

12 files changed

+36
-36
lines changed

12 files changed

+36
-36
lines changed
 

‎NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2605,7 +2605,7 @@ Raster support for most GDAL formats
26052605
Raster implementation supports a variety of rendering settings including
26062606
semi transparent overlays, pallette inversion, flexible band to color mapping
26072607
in multiband images and creation of pseudocolor.
2608-
Change to a data provider architecture for vector layers. Addtional data
2608+
Change to a data provider architecture for vector layers. Additional data
26092609
types can be supported by writing a provider plugin
26102610
Buffer plugin for PostGIS layers
26112611
PostgreSQL port number can be specified when making connections

‎doc/news.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2936,7 +2936,7 @@ <H1>28. 0.5</H1>
29362936
Raster implementation supports a variety of rendering settings including
29372937
semi transparent overlays, pallette inversion, flexible band to color mapping
29382938
in multiband images and creation of pseudocolor.
2939-
Change to a data provider architecture for vector layers. Addtional data
2939+
Change to a data provider architecture for vector layers. Additional data
29402940
types can be supported by writing a provider plugin
29412941
Buffer plugin for PostGIS layers
29422942
PostgreSQL port number can be specified when making connections

‎doc/news.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2558,7 +2558,7 @@ Raster support for most GDAL formats
25582558
Raster implementation supports a variety of rendering settings including
25592559
semi transparent overlays, pallette inversion, flexible band to color mapping
25602560
in multiband images and creation of pseudocolor.
2561-
Change to a data provider architecture for vector layers. Addtional data
2561+
Change to a data provider architecture for vector layers. Additional data
25622562
types can be supported by writing a provider plugin
25632563
Buffer plugin for PostGIS layers
25642564
PostgreSQL port number can be specified when making connections

‎python/core/qgsvectorlayer.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
420420
bool removeJoin( const QString& joinLayerId );
421421

422422
/**
423-
* Acccessor to the join buffer object
423+
* Accessor to the join buffer object
424424
* @note added 2.14.7
425425
*/
426426
QgsVectorLayerJoinBuffer* joinBuffer();

‎scripts/spell_check/check_spelling.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ SPLIT=4
6161
${GNUPREFIX}split --number=l/$SPLIT --numeric-suffixes --suffix-length=1 --additional-suffix=~ ${DIR}/spelling.dat spelling
6262

6363
# global replace variables (dictionary)
64-
declare -A GLOBREP_ALLFILES
65-
declare -A GLOBREP_CURRENTFILE
66-
declare -A GLOBREP_IGNORE
64+
declare -A GLOBREP_ALLFILES=()
65+
declare -A GLOBREP_CURRENTFILE=()
66+
declare -A GLOBREP_IGNORE=()
6767

6868
for ((I=0;I<$SPLIT;I++)) ; do
6969
SPELLFILE=spelling$I~;
@@ -130,9 +130,9 @@ for ((I=0;I<$SPLIT;I++)) ; do
130130
# Display menu
131131
echo "***"
132132
echo -e "Error found: \x1B[31m$ERROR\x1B[0m"
133-
echo -e " \x1B[4mr\x1B[0meplace by \x1B[33m$CORRECTION\x1B[0m at line $NUMBER"
134-
echo -e " replace all occurences by \x1B[33m$CORRECTION\x1B[0m in current \x1B[4mf\x1B[0mile"
135-
echo -e " replace all occurences by \x1B[33m$CORRECTION\x1B[0m in \x1B[4ma\x1B[0mll files"
133+
echo -e " \x1B[4mr\x1B[0meplace by \x1B[33m$CORRECTIONCASE\x1B[0m at line $NUMBER"
134+
echo -e " replace all occurences by \x1B[33m$CORRECTIONCASE\x1B[0m in current \x1B[4mf\x1B[0mile"
135+
echo -e " replace all occurences by \x1B[33m$CORRECTIONCASE\x1B[0m in \x1B[4ma\x1B[0mll files"
136136
echo -e " a\x1B[4mp\x1B[0mpend \x1B[33m$SPELLOKSTR\x1B[0m at the end of the line $NUMBER to avoid spell check on this line"
137137
echo -e " en\x1B[4mt\x1B[0mer your own correction"
138138
echo -e " skip and \x1B[4mc\x1B[0montinue"
@@ -148,13 +148,13 @@ for ((I=0;I<$SPLIT;I++)) ; do
148148
break
149149
;;
150150
f)
151-
GLOBREP_CURRENTFILE+=(["$ERROR"]="$CORRECTION")
151+
GLOBREP_CURRENTFILE+=(["$ERROR"]=1)
152152
echo -e "replacing \x1B[33m$ERROR\x1B[0m by \x1B[33m$CORRECTIONCASE\x1B[0m in \x1B[33m$FILE\x1B[0m"
153153
${GNUPREFIX}sed -i -r "/${SPELLOKRX}/! s/$ERROR/$CORRECTIONCASE/g" $FILE
154154
break
155155
;;
156156
a)
157-
GLOBREP_CURRENTFILE+=(["$ERROR"]="$CORRECTION")
157+
GLOBREP_CURRENTFILE+=(["$ERROR"]=1)
158158
GLOBREP_ALLFILES+=(["$ERROR"]="$CORRECTION")
159159
echo -e "replace \x1B[33m$ERROR\x1B[0m by \x1B[33m$CORRECTIONCASE\x1B[0m in \x1B[33m$FILE\x1B[0m"
160160
${GNUPREFIX}sed -i -r "/${SPELLOKRX}/! s/$ERROR/$CORRECTIONCASE/g" $FILE
@@ -193,8 +193,8 @@ for ((I=0;I<$SPLIT;I++)) ; do
193193
FILE=""
194194
fi
195195
fi
196-
done 3< <(unbuffer ag --smart-case --all-text --nopager --color-match "30;43" --numbers --nomultiline --word-regexp -p $AGIGNORE "${WHOLEWORDS}"'(?!.*'"${SPELLOKRX}"')' $INPUTFILES ; \
197-
unbuffer ag --smart-case --all-text --nopager --color-match "30;43" --numbers --nomultiline -p $AGIGNORE "${INWORDS}"'(?!.*'"${SPELLOKRX}"')' $INPUTFILES )
196+
done 3< <(unbuffer ag --ignore-case --all-text --nopager --color-match "30;43" --numbers --nomultiline --word-regexp -p $AGIGNORE "${WHOLEWORDS}"'(?!.*'"${SPELLOKRX}"')' $INPUTFILES ; \
197+
unbuffer ag --ignore-case --all-text --nopager --color-match "30;43" --numbers --nomultiline -p $AGIGNORE "${INWORDS}"'(?!.*'"${SPELLOKRX}"')' $INPUTFILES )
198198

199199
rm $SPELLFILE
200200

‎scripts/spell_check/spelling.dat

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ accesing:accessing
6969
accesnt:accent
7070
accesories:accessories
7171
accessable:accessible
72-
accesss:access
72+
accesss:access:*
7373
accidant:accident
7474
accidentaly:accidentally
7575
accidential:accidental
@@ -351,8 +351,8 @@ alcoholical:alcoholic
351351
aleady:already
352352
aledge:allege:*
353353
aledged:alleged
354-
aledges:alleges
355-
alege:allege
354+
aledges:alleges:*
355+
alege:allege:*
356356
aleged:alleged
357357
alegience:allegiance
358358
alegorical:allegorical
@@ -368,10 +368,10 @@ algorythm:algorithm
368368
alientating:alienating
369369
alignemnt:alignment
370370
alignemnts:alignments
371-
alledge:allege
371+
alledge:allege:*
372372
alledged:alleged
373373
alledgedly:allegedly
374-
alledges:alleges
374+
alledges:alleges:*
375375
allegedely:allegedly
376376
allegedy:allegedly
377377
allegely:allegedly
@@ -387,7 +387,7 @@ alliviate:alleviate
387387
allmost:almost
388388
allopone:allophone
389389
allopones:allophones
390-
allowd:allowed
390+
allowd:allowed:*
391391
allpication:application
392392
allready:already
393393
allthough:although
@@ -985,7 +985,7 @@ boudaries:boundaries
985985
boudary:boundary
986986
bouding:bounding
987987
boundries:boundaries
988-
boundry:boundary
988+
boundry:boundary:*
989989
bouyancy:buoyancy
990990
bouyant:buoyant
991991
boyant:buoyant
@@ -1054,7 +1054,7 @@ calcualte:calculate
10541054
calcualted:calculated
10551055
calcualtes:calculates
10561056
calcualting:calculating
1057-
calculater:calculator
1057+
calculater:calculator:*
10581058
calculs:calculus
10591059
calender:calendar
10601060
calenders:calendars
@@ -1239,11 +1239,11 @@ chemestry:chemistry
12391239
chemicaly:chemically
12401240
childen:children
12411241
childern:children
1242-
childs:children
1242+
childs:children:*
12431243
chnage:change
12441244
chnages:changes
12451245
choise:choice
1246-
choosed:chose
1246+
choosed:chose:*
12471247
choosen:chosen
12481248
chosing:choosing
12491249
chould:should
@@ -1281,7 +1281,7 @@ clearified:clarified
12811281
clearifies:clarifies
12821282
clearify:clarify
12831283
clearifying:clarifying
1284-
cleint:client
1284+
cleint:client:*
12851285
cleints:clients
12861286
clera:clear
12871287
clincial:clinical
@@ -1387,10 +1387,10 @@ commisioned:commissioned
13871387
commisioner:commissioner
13881388
commisioning:commissioning
13891389
commisions:commissions
1390-
commited:committed
1391-
commitee:committee
1392-
commiter:committer
1393-
commiters:committers
1390+
commited:committed:*
1391+
commitee:committee:*
1392+
commiter:committer:*
1393+
commiters:committers:*
13941394
commiting:committing
13951395
committ:commit
13961396
committe:committee

‎src/core/qgsvectorlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
521521
bool removeJoin( const QString& joinLayerId );
522522

523523
/**
524-
* Acccessor to the join buffer object
524+
* Accessor to the join buffer object
525525
* @note added 2.14.7
526526
*/
527527
QgsVectorLayerJoinBuffer* joinBuffer() { return mJoinBuffer; }

‎src/core/qgsvectorlayerfeatureiterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureItera
168168
*/
169169
struct FetchJoinInfo
170170
{
171-
const QgsVectorJoinInfo* joinInfo;//!< Cannonical source of information about the join
171+
const QgsVectorJoinInfo* joinInfo;//!< Canonical source of information about the join
172172
QgsAttributeList attributes; //!< Attributes to fetch
173173
int indexOffset; //!< At what position the joined fields start
174174
QgsVectorLayer* joinLayer; //!< Resolved pointer to the joined layer

‎src/gui/qgisgui.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace QgisGui
3939
* for platforms such as the Mac where modal and modeless dialogs have
4040
* different looks, QGIS modal dialogs will look the same as Qt modal
4141
* dialogs and all modal dialogs will look distinct from modeless dialogs.
42-
* Althought not the standard Mac modal look, it does lack the minimize
42+
* Although not the standard Mac modal look, it does lack the minimize
4343
* control which makes sense only for modeless dislogs.
4444
*
4545
* The Qt3 method of creating a true Mac modal dialog is deprecated in Qt4

‎src/providers/wfs/qgswfsdatasourceuri.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
QgsWFSDataSourceURI::QgsWFSDataSourceURI( const QString& uri )
2323
: mURI( uri )
2424
{
25-
// Compatiblity with QGIS < 2.16 layer URI of the format
25+
// Compatibility with QGIS < 2.16 layer URI of the format
2626
// http://example.com/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=x&SRSNAME=y&username=foo&password=
2727
if ( !mURI.hasParam( QgsWFSConstants::URI_PARAM_URL ) )
2828
{

‎src/providers/wfs/qgswfsshareddata.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,8 +729,8 @@ bool QgsWFSSharedData::changeGeometryValues( const QgsGeometryMap &geometry_map
729729
newAttrMap[idx] = QString( wkb.toHex().data() );
730730
newChangedAttrMap[ iter.key()] = newAttrMap;
731731

732-
QgsGeometry polyBoudingBox = QgsGeometry::fromRect( iter.value().boundingBox() );
733-
newGeometryMap[ iter.key()] = polyBoudingBox;
732+
QgsGeometry polyBoundingBox = QgsGeometry::fromRect( iter.value().boundingBox() );
733+
newGeometryMap[ iter.key()] = polyBoundingBox;
734734
}
735735
else
736736
{

‎tests/src/core/testqgsexpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2158,7 +2158,7 @@ class TestQgsExpression: public QObject
21582158
QTest::newRow( "OGR no Crosses" ) << "crosses( $geometry, geomFromWKT('LINESTRING ( 0 0, 0 10 )') )" << QgsGeometry::fromPolyline( line ) << false << QVariant( 0 );
21592159
QTest::newRow( "OGR Within" ) << "within( $geometry, geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))') )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 1 );
21602160
QTest::newRow( "OGR no Within" ) << "within( geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 0 );
2161-
QTest::newRow( "OGR Contians" ) << "contains( geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 1 );
2161+
QTest::newRow( "OGR Contains" ) << "contains( geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 1 );
21622162
QTest::newRow( "OGR no Contains" ) << "contains( $geometry, geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))') )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 0 );
21632163
QTest::newRow( "OGR no Overlaps" ) << "overlaps( geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 0 );
21642164
QTest::newRow( "OGR overlaps" ) << "overlaps( geomFromWKT('POLYGON((0 -5,10 5,10 -5,0 -5))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 1 );

0 commit comments

Comments
 (0)
Please sign in to comment.