sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

spelling fixes

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-06-27 10:34:12 +02:00
parent 8c5838fe86
commit 51fde8e08f
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/gui/qgsmapcanvas.sip
View File

@ -245,7 +245,7 @@ Pan to the selected features of current (vector) layer keeping same extent.
This is called from destructor of map tools to make sure This is called from destructor of map tools to make sure
that this map tool won't be used any more. that this map tool won't be used any more.
You don't have to call it manualy, QgsMapTool takes care of it. You don't have to call it manually, QgsMapTool takes care of it.
%End %End
QgsMapTool *mapTool(); QgsMapTool *mapTool();

4
scripts/prepare-commit.sh
View File

@ -117,7 +117,7 @@ for f in $MODIFIED; do
if grep -Exq "^\s*%Include $sip_file" ${TOPLEVEL}/$sip_include ; then if grep -Exq "^\s*%Include $sip_file" ${TOPLEVEL}/$sip_include ; then
#echo "in SIP" #echo "in SIP"
sip_file=$(${GP}sed -r 's/^src\///; s/\.h$/.sip/' <<<$f ) sip_file=$(${GP}sed -r 's/^src\///; s/\.h$/.sip/' <<<$f )
# check it is not blacklisted (i.e. manualy SIP) # check it is not blacklisted (i.e. manually SIP)
if ! grep -Fxq "$sip_file" python/auto_sip.blacklist; then if ! grep -Fxq "$sip_file" python/auto_sip.blacklist; then
#echo "automatic file" #echo "automatic file"
m=python/$sip_file.$REV.prepare m=python/$sip_file.$REV.prepare
@ -152,4 +152,4 @@ exec git diff-index --check --cached HEAD --
exit 0 exit 0
# vim: set ts=8 noexpandtab : # vim: set ts=2 expandtab :

1
scripts/spell_check/spelling.dat
View File

@ -4242,6 +4242,7 @@ manisfestations:manifestations
mannor:manner mannor:manner
mannual:manual mannual:manual
mannually:manually mannually:manually
manualy:manually
manoeuverability:maneuverability manoeuverability:maneuverability
manoeuvering:maneuvering manoeuvering:maneuvering
manoeuvre:maneuver manoeuvre:maneuver

2
src/gui/qgsmapcanvas.h
View File

@ -242,7 +242,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
* *
* This is called from destructor of map tools to make sure * This is called from destructor of map tools to make sure
* that this map tool won't be used any more. * that this map tool won't be used any more.
* You don't have to call it manualy, QgsMapTool takes care of it. * You don't have to call it manually, QgsMapTool takes care of it.
*/ */
void unsetMapTool( QgsMapTool *mapTool ); void unsetMapTool( QgsMapTool *mapTool );

4
src/providers/grass/qgsgrassprovider.cpp
View File

@ -794,7 +794,7 @@ int QgsGrassProvider::rewriteLine( int oldLid, int type, struct line_pnts *Point
} }
QgsDebugMsg( QString( "oldLid = %1 oldestLid = %2 newLine = %3 numLines = %4" ) QgsDebugMsg( QString( "oldLid = %1 oldestLid = %2 newLine = %3 numLines = %4" )
.arg( oldLid ).arg( oldestLid ).arg( newLid ).arg( mLayer->map()->numLines() ) ); .arg( oldLid ).arg( oldestLid ).arg( newLid ).arg( mLayer->map()->numLines() ) );
QgsDebugMsg( QString( "oldLids : %1 -> %2" ).arg( newLid ).arg( oldestLid ) ); QgsDebugMsg( QString( "oldLids : %1 -> %2" ).arg( newLid ).arg( oldestLid ) );
mLayer->map()->oldLids()[newLid] = oldestLid; mLayer->map()->oldLids()[newLid] = oldestLid;
QgsDebugMsg( QString( "newLids : %1 -> %2" ).arg( oldestLid ).arg( newLid ) ); QgsDebugMsg( QString( "newLids : %1 -> %2" ).arg( oldestLid ).arg( newLid ) );
@ -1269,7 +1269,7 @@ void QgsGrassProvider::onFeatureAdded( QgsFeatureId fid )
// TODO: redo of deleted new features - save new cats somewhere, // TODO: redo of deleted new features - save new cats somewhere,
// resetting fid probably is not possible because it is stored in undo commands and used in buffer maps // resetting fid probably is not possible because it is stored in undo commands and used in buffer maps
// It may be that user manualy entered cat value // It may be that user manually entered cat value
QgsFeatureMap &addedFeatures = mEditBuffer->mAddedFeatures; QgsFeatureMap &addedFeatures = mEditBuffer->mAddedFeatures;
QgsFeature &feature = addedFeatures[fid]; QgsFeature &feature = addedFeatures[fid];
int catIndex = feature.fields().indexFromName( mLayer->keyColumnName() ); int catIndex = feature.fields().indexFromName( mLayer->keyColumnName() );