From 395c13f1f11dbe7be95819b6dfe6a5aa57584d83 Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Fri, 11 May 2018 10:55:34 -0400
Subject: [PATCH] fix typo

---
 python/core/locator/qgslocatorfilter.sip.in |  2 +-
 scripts/spell_check/check_spelling.sh       | 10 +++++-----
 src/core/locator/qgslocatorfilter.h         |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/python/core/locator/qgslocatorfilter.sip.in b/python/core/locator/qgslocatorfilter.sip.in
index 67efb6eccd7..2f5295a4f2c 100644
--- a/python/core/locator/qgslocatorfilter.sip.in
+++ b/python/core/locator/qgslocatorfilter.sip.in
@@ -127,7 +127,7 @@ results from this filter.
 
 .. note::
 
-   Prefixes might be overriden by user preferences.
+   Prefixes might be overridden by user preferences.
 
 .. seealso:: :py:func:`activePrefix`
 %End
diff --git a/scripts/spell_check/check_spelling.sh b/scripts/spell_check/check_spelling.sh
index 132098ec182..f140745e7e5 100755
--- a/scripts/spell_check/check_spelling.sh
+++ b/scripts/spell_check/check_spelling.sh
@@ -180,13 +180,13 @@ for I in $(seq -f '%02g' 0  $(($SPLIT-1)) ) ; do
         # also make error small case and escape special chars: () |
         ERRORSMALLCASE=$(echo ${ERRORNOCOLOR,,} |${GP}sed -r 's/\(/\\(/g' | ${GP}sed -r 's/\)/\\)/g' | ${GP}sed -r 's/\|/\\|/g' )
         if [[ ! "${ERRORSMALLCASE}" =~ $IGNORECASE_INWORD ]]; then
-         if [[ -n $(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE:1:-1}${ERRORSMALLCASE: -1}?:" scripts/spell_check/spelling.dat) ]]; then
+         if [[ -n $(ag --noaffinity --nonumbers --case-sensitive "^${ERRORSMALLCASE:1:-1}${ERRORSMALLCASE: -1}?:" scripts/spell_check/spelling.dat) ]]; then
            PREVCHAR=${ERROR::1}
            # remove first character
            ERRORSMALLCASE=${ERRORSMALLCASE#?}
            ERROR=${ERROR#?}
          fi
-         if [[ -n $(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE::-1}:" scripts/spell_check/spelling.dat) ]]; then
+         if [[ -n $(ag --noaffinity --nonumbers --case-sensitive "^${ERRORSMALLCASE::-1}:" scripts/spell_check/spelling.dat) ]]; then
            NEXTCHAR=${ERROR:${#ERROR}-1:1}
            # remove last character
            ERRORSMALLCASE=${ERRORSMALLCASE::-1}
@@ -196,9 +196,9 @@ for I in $(seq -f '%02g' 0  $(($SPLIT-1)) ) ; do
         ERRORSMALLCASE=$(${GP}sed -r 's/\./\\./g' <<< $ERRORSMALLCASE)
 
         # get correction from spelling.dat
-        CORRECTION=$(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE}:" ${DIR}/spelling.dat | cut -d: -f2)
+        CORRECTION=$(ag --noaffinity --nonumbers --case-sensitive "^${ERRORSMALLCASE}:" ${DIR}/spelling.dat | cut -d: -f2)
         # exclude script files
-        if [[ "$(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE}:" ${DIR}/spelling.dat | cut -d: -f3)" =~ "%" ]]; then
+        if [[ "$(ag --noaffinity --nonumbers --case-sensitive "^${ERRORSMALLCASE}:" ${DIR}/spelling.dat | cut -d: -f3)" =~ "%" ]]; then
           if [[ "$FILE" =~ $EXCLUDE_SCRIPT_LIST ]]; then
             echo "skipping script file for $(${GP}sed -r 's/\\//g' <<< $ERRORSMALLCASE)"
             continue
@@ -208,7 +208,7 @@ for I in $(seq -f '%02g' 0  $(($SPLIT-1)) ) ; do
         if [[ -z "$CORRECTION" ]]; then
           CORRECTION=$(perl -e "use strict; use warnings; while(<>) { chop; my(\$a,\$b) = split /:/; \$a = qr(\$a); if( my @matches = '${ERRORSMALLCASE}' =~ /^\$a\$/i ) { print sprintf(\$b, @matches); last; }}" ${DIR}/spelling.dat )
           # exclude script files
-          if [[ "$(ag --nonumbers --case-sensitive ":${CORRECTION}" ${DIR}/spelling.dat | cut -d: -f3)" =~ "%" ]]; then
+          if [[ "$(ag --noaffinity --nonumbers --case-sensitive ":${CORRECTION}" ${DIR}/spelling.dat | cut -d: -f3)" =~ "%" ]]; then
             if [[ "$FILE" =~ $EXCLUDE_SCRIPT_LIST ]]; then
               echo "skipping script file for $(${GP}sed -r 's/\\//g' <<< $ERRORSMALLCASE)"
               continue
diff --git a/src/core/locator/qgslocatorfilter.h b/src/core/locator/qgslocatorfilter.h
index 9c62784868e..89b2d2ebc14 100644
--- a/src/core/locator/qgslocatorfilter.h
+++ b/src/core/locator/qgslocatorfilter.h
@@ -155,7 +155,7 @@ class CORE_EXPORT QgsLocatorFilter : public QObject
      * as these are reserved for core QGIS functions. If a plugin registers
      * a filter with a prefix shorter than 3 characters then the prefix will
      * be ignored.
-     * \note Prefixes might be overriden by user preferences.
+     * \note Prefixes might be overridden by user preferences.
      * \see activePrefix()
      */
     virtual QString prefix() const { return QString(); }