diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake index 43171f3e70c..a7609141fc3 100644 --- a/cmake/SIPMacros.cmake +++ b/cmake/SIPMacros.cmake @@ -54,7 +54,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) # We give this target a long logical target name. # (This is to avoid having the library name clash with any already - # install library names. If that happens then cmake dependancy + # install library names. If that happens then cmake dependency # tracking get confused.) STRING(REPLACE "." "_" _logical_name ${MODULE_NAME}) SET(_logical_name "python_module_${_logical_name}") diff --git a/scripts/spelling.dat b/scripts/spelling.dat index 7aca0739f72..cc9a69747b2 100644 --- a/scripts/spelling.dat +++ b/scripts/spelling.dat @@ -443,6 +443,7 @@ statics:statistics useage:usage aribitary:arbitrary colour:color +colours:colors recommeneded:recommended implementaed:implemented containging:containing diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp index 35a053e177f..952a3f447f2 100644 --- a/src/analysis/vector/qgszonalstatistics.cpp +++ b/src/analysis/vector/qgszonalstatistics.cpp @@ -285,7 +285,7 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( void* band, QgsGeome pixelRectGeometry = QgsGeometry::fromRect( QgsRectangle( currentX - hCellSizeX, currentY - hCellSizeY, currentX + hCellSizeX, currentY + hCellSizeY ) ); if ( pixelRectGeometry ) { - //intersecton + //intersection intersectGeometry = pixelRectGeometry->intersection( poly ); if ( intersectGeometry ) { diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp index 07f9a4abba6..ac9118d6ad2 100644 --- a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp @@ -169,8 +169,8 @@ void QgsSimpleMarkerSymbolLayerV2::prepareCache( QgsSymbolV2RenderContext& conte p.end(); // Check that the selected version is different. If not, then re-render, - // filling the background with the selection colour and using the normal - // colours for the symbol .. could be ugly! + // filling the background with the selection color and using the normal + // colors for the symbol .. could be ugly! if ( mSelCache == mCache ) { diff --git a/src/core/symbology-ng/qgssymbolv2.h b/src/core/symbology-ng/qgssymbolv2.h index b78f46d5a8b..2ecb4365435 100644 --- a/src/core/symbology-ng/qgssymbolv2.h +++ b/src/core/symbology-ng/qgssymbolv2.h @@ -137,8 +137,7 @@ class CORE_EXPORT QgsSymbolV2RenderContext //! @note added in 1.5 void setRenderHints( int hints ) { mRenderHints = hints; } - // Colour used for selections - + // Color used for selections static QColor selectionColor(); double outputLineWidth( double width ) const; diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp index 522ae9a5e40..d9bf397d7b8 100644 --- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp +++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp @@ -953,7 +953,7 @@ void QgsGeorefPluginGui::loadGCPs( /*bool verbose*/ ) { line = points.readLine(); QStringList ls; - if ( line.contains( QRegExp( "," ) ) ) // in previous format "\t" is delemiter of points in new - "," + if ( line.contains( QRegExp( "," ) ) ) // in previous format "\t" is delimeter of points in new - "," { // points from new georeferencer ls = line.split( "," ); diff --git a/src/providers/grass/qgsgrassrasterprovider.cpp b/src/providers/grass/qgsgrassrasterprovider.cpp index b8637be51fe..f5f56da10ff 100644 --- a/src/providers/grass/qgsgrassrasterprovider.cpp +++ b/src/providers/grass/qgsgrassrasterprovider.cpp @@ -109,7 +109,7 @@ QImage* QgsGrassRasterProvider::draw( QgsRectangle const & viewExtent, int pixe QMessageBox::warning( 0, QObject::tr( "Warning" ), QObject::tr( "Cannot draw raster" ) + "\n" + e.what() ); - // We dont set mValid to false, because the raster can be recreated and work next time + // We don't set mValid to false, because the raster can be recreated and work next time return image; } QgsDebugMsg( QString("%1 bytes read from modules stdout").arg(data.size()) );