spelling fixes

qgis · Jun 27, 2017 · 51fde8e · 51fde8e
1 parent 8c5838f
commit 51fde8e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip
@@ -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
  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
 
     QgsMapTool *mapTool();

diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh
@@ -117,7 +117,7 @@ for f in $MODIFIED; do
     if grep -Exq "^\s*%Include $sip_file" ${TOPLEVEL}/$sip_include ; then
       #echo "in SIP"
       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
         #echo "automatic file"
         m=python/$sip_file.$REV.prepare
@@ -152,4 +152,4 @@ exec git diff-index --check --cached HEAD --
 
 exit 0
 
-# vim: set ts=8 noexpandtab :
+# vim: set ts=2 expandtab :
diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat
@@ -4242,6 +4242,7 @@ manisfestations:manifestations
 mannor:manner
 mannual:manual
 mannually:manually
+manualy:manually
 manoeuverability:maneuverability
 manoeuvering:maneuvering
 manoeuvre:maneuver

diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -242,7 +242,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
      *
      * This is called from destructor of map tools to make sure
      * 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 );
 

diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -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" )
-                 .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 ) );
     mLayer->map()->oldLids()[newLid] = oldestLid;
     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,
       // 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;
       QgsFeature &feature = addedFeatures[fid];
       int catIndex = feature.fields().indexFromName( mLayer->keyColumnName() );