From 626781a63a2e2e23345cdb55d0b5c2856bf80ca6 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sat, 30 Dec 2017 13:32:29 -0500 Subject: [PATCH] Typo fixes + added word to spelling.dat --- python/core/qgsmaplayerrenderer.sip | 2 +- scripts/spell_check/spelling.dat | 1 + src/core/pal/labelposition.h | 2 +- src/core/qgsapplication.cpp | 2 +- src/core/qgsmaplayerrenderer.h | 2 +- src/gui/qgsadvanceddigitizingdockwidget.cpp | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python/core/qgsmaplayerrenderer.sip b/python/core/qgsmaplayerrenderer.sip index 0eb8c03da03..549491d09b2 100644 --- a/python/core/qgsmaplayerrenderer.sip +++ b/python/core/qgsmaplayerrenderer.sip @@ -19,7 +19,7 @@ thread, so it is necessary to keep all structures required for rendering away from the original map layer because it may change any time. Because the data needs to be copied (to avoid the need for locking), -is is highly desirable to use copy-on-write where possible. This way, +it is highly desirable to use copy-on-write where possible. This way, the overhead of copying (both memory and CPU) will be kept low. Qt containers and various Qt classes use implicit sharing. diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat index f431d20e7e8..e84b7ad71d8 100644 --- a/scripts/spell_check/spelling.dat +++ b/scripts/spell_check/spelling.dat @@ -438,6 +438,7 @@ altho:although althought:although altough:although alusion:allusion +alway:always alwasy:always alwyas:always amalgomated:amalgamated diff --git a/src/core/pal/labelposition.h b/src/core/pal/labelposition.h index 0865d0bb7d2..628a9fa59b6 100644 --- a/src/core/pal/labelposition.h +++ b/src/core/pal/labelposition.h @@ -147,7 +147,7 @@ namespace pal int polygonIntersectionCost( PointSet *polygon ) const; /** - * Returns true if if any intersection between polygon and position exists. + * Returns true if any intersection between polygon and position exists. */ bool intersectsWithPolygon( PointSet *polygon ) const; diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index 4d4751860d5..d5078cd4ed1 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -615,7 +615,7 @@ void QgsApplication::setUITheme( const QString &themeName ) while ( !in.atEnd() ) { QString line = in.readLine(); - // This is is a variable + // This is a variable if ( line.startsWith( '@' ) ) { int index = line.indexOf( ':' ); diff --git a/src/core/qgsmaplayerrenderer.h b/src/core/qgsmaplayerrenderer.h index 390e847bdda..4022b6d1062 100644 --- a/src/core/qgsmaplayerrenderer.h +++ b/src/core/qgsmaplayerrenderer.h @@ -30,7 +30,7 @@ class QgsFeedback; * from the original map layer because it may change any time. * * Because the data needs to be copied (to avoid the need for locking), - * is is highly desirable to use copy-on-write where possible. This way, + * it is highly desirable to use copy-on-write where possible. This way, * the overhead of copying (both memory and CPU) will be kept low. * Qt containers and various Qt classes use implicit sharing. * diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp index 4c79599e0a1..d842e542130 100644 --- a/src/gui/qgsadvanceddigitizingdockwidget.cpp +++ b/src/gui/qgsadvanceddigitizingdockwidget.cpp @@ -490,7 +490,7 @@ void QgsAdvancedDigitizingDockWidget::updateCapacity( bool updateUIwithoutChange mAngleConstraint->setRelative( true ); } - // distance is alway relative + // distance is always relative mLockDistanceButton->setEnabled( relativeCoordinates ); mDistanceLineEdit->setEnabled( relativeCoordinates ); if ( !relativeCoordinates )