[QGIS Commit] r13391 - in trunk/qgis: cmake scripts src/analysis/vector src/core/symbology-ng src/plugins/georeferencer src/providers/grass

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Apr 26 03:20:03 EDT 2010


Author: jef
Date: 2010-04-26 03:19:50 -0400 (Mon, 26 Apr 2010)
New Revision: 13391

Modified:
   trunk/qgis/cmake/SIPMacros.cmake
   trunk/qgis/scripts/spelling.dat
   trunk/qgis/src/analysis/vector/qgszonalstatistics.cpp
   trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
   trunk/qgis/src/core/symbology-ng/qgssymbolv2.h
   trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp
   trunk/qgis/src/providers/grass/qgsgrassrasterprovider.cpp
Log:
fix common typos

Modified: trunk/qgis/cmake/SIPMacros.cmake
===================================================================
--- trunk/qgis/cmake/SIPMacros.cmake	2010-04-25 22:37:59 UTC (rev 13390)
+++ trunk/qgis/cmake/SIPMacros.cmake	2010-04-26 07:19:50 UTC (rev 13391)
@@ -54,7 +54,7 @@
 
     # 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}")

Modified: trunk/qgis/scripts/spelling.dat
===================================================================
--- trunk/qgis/scripts/spelling.dat	2010-04-25 22:37:59 UTC (rev 13390)
+++ trunk/qgis/scripts/spelling.dat	2010-04-26 07:19:50 UTC (rev 13391)
@@ -443,6 +443,7 @@
 useage:usage
 aribitary:arbitrary
 colour:color
+colours:colors
 recommeneded:recommended
 implementaed:implemented
 containging:containing

Modified: trunk/qgis/src/analysis/vector/qgszonalstatistics.cpp
===================================================================
--- trunk/qgis/src/analysis/vector/qgszonalstatistics.cpp	2010-04-25 22:37:59 UTC (rev 13390)
+++ trunk/qgis/src/analysis/vector/qgszonalstatistics.cpp	2010-04-26 07:19:50 UTC (rev 13391)
@@ -285,7 +285,7 @@
       pixelRectGeometry = QgsGeometry::fromRect( QgsRectangle( currentX - hCellSizeX, currentY - hCellSizeY, currentX + hCellSizeX, currentY + hCellSizeY ) );
       if ( pixelRectGeometry )
       {
-        //intersecton
+        //intersection
         intersectGeometry = pixelRectGeometry->intersection( poly );
         if ( intersectGeometry )
         {

Modified: trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	2010-04-25 22:37:59 UTC (rev 13390)
+++ trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	2010-04-26 07:19:50 UTC (rev 13391)
@@ -169,8 +169,8 @@
   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 )
   {

Modified: trunk/qgis/src/core/symbology-ng/qgssymbolv2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgssymbolv2.h	2010-04-25 22:37:59 UTC (rev 13390)
+++ trunk/qgis/src/core/symbology-ng/qgssymbolv2.h	2010-04-26 07:19:50 UTC (rev 13391)
@@ -137,8 +137,7 @@
     //! @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;

Modified: trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp	2010-04-25 22:37:59 UTC (rev 13390)
+++ trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp	2010-04-26 07:19:50 UTC (rev 13391)
@@ -953,7 +953,7 @@
     {
       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( "," );

Modified: trunk/qgis/src/providers/grass/qgsgrassrasterprovider.cpp
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrassrasterprovider.cpp	2010-04-25 22:37:59 UTC (rev 13390)
+++ trunk/qgis/src/providers/grass/qgsgrassrasterprovider.cpp	2010-04-26 07:19:50 UTC (rev 13391)
@@ -109,7 +109,7 @@
     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()) );



More information about the QGIS-commit mailing list