[QGIS Commit] r12694 - in trunk/qgis/src/app: . gps

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2010-01-07 12:37:20 -0500 (Thu, 07 Jan 2010)
New Revision: 12694

Modified:
   trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp
   trunk/qgis/src/app/qgsmaptooladdfeature.cpp
   trunk/qgis/src/app/qgsmaptooladdfeature.h
Log:
Fixed typo

Modified: trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp
===================================================================
--- trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp	2010-01-07 17:32:58 UTC (rev 12693)
+++ trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp	2010-01-07 17:37:20 UTC (rev 12694)
@@ -767,7 +767,7 @@
       memcpy( &wkb[position], &y, sizeof( double ) );
       f->setGeometryAndOwnership( &wkb[0], size );
 
-      int avoidIntersectionsReturn = QgsMapToolAddFeature::avoidIntersectons( f->geometry() );
+      int avoidIntersectionsReturn = QgsMapToolAddFeature::avoidIntersections( f->geometry() );
       if ( avoidIntersectionsReturn == 1 )
       {
         //not a polygon type. Impossible to get there

Modified: trunk/qgis/src/app/qgsmaptooladdfeature.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptooladdfeature.cpp	2010-01-07 17:32:58 UTC (rev 12693)
+++ trunk/qgis/src/app/qgsmaptooladdfeature.cpp	2010-01-07 17:37:20 UTC (rev 12694)
@@ -443,7 +443,7 @@
         }
         f->setGeometryAndOwnership( &wkb[0], size );
 
-        int avoidIntersectionsReturn = avoidIntersectons( f->geometry() );
+        int avoidIntersectionsReturn = avoidIntersections( f->geometry() );
         if ( avoidIntersectionsReturn == 1 )
         {
           //not a polygon type. Impossible to get there
@@ -520,7 +520,7 @@
   }
 }
 
-int QgsMapToolAddFeature::avoidIntersectons( QgsGeometry* g )
+int QgsMapToolAddFeature::avoidIntersections( QgsGeometry* g )
 {
   int returnValue = 0;
 

Modified: trunk/qgis/src/app/qgsmaptooladdfeature.h
===================================================================
--- trunk/qgis/src/app/qgsmaptooladdfeature.h	2010-01-07 17:32:58 UTC (rev 12693)
+++ trunk/qgis/src/app/qgsmaptooladdfeature.h	2010-01-07 17:37:20 UTC (rev 12694)
@@ -31,5 +31,5 @@
     @return 2 if avoid intersection would change the geometry type, \
     3 other error during intersection removal
     @note Consider moving this into analysis lib since it is now used by QgsGpsInformation too. */
-    static int avoidIntersectons( QgsGeometry* g );
+    static int avoidIntersections( QgsGeometry* g );
 };