fix synchronous geometry validation

qgis · May 24, 2012 · 2f440bd · 2f440bd
1 parent d4dcde0
commit 2f440bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -6708,9 +6708,7 @@ int QgsGeometry::avoidIntersections()
 
 void QgsGeometry::validateGeometry( QList<Error> &errors )
 {
-  QgsGeometryValidator *gv = new QgsGeometryValidator( this, &errors );
-  gv->start();
-  delete gv;
+  QgsGeometryValidator::validateGeometry( this, errors );
 }
 
 bool QgsGeometry::isGeosValid()

diff --git a/src/core/qgsgeometryvalidator.cpp b/src/core/qgsgeometryvalidator.cpp
@@ -328,8 +328,7 @@ void QgsGeometryValidator::addError( QgsGeometry::Error e )
 void QgsGeometryValidator::validateGeometry( QgsGeometry *g, QList<QgsGeometry::Error> &errors )
 {
   QgsGeometryValidator *gv = new QgsGeometryValidator( g, &errors );
-  connect( gv, SIGNAL( "errorFound( QString, QgsPoint )" ), gv, SLOT( "addError( QString, QgsPoint )" ) );
-  connect( gv, SIGNAL( "errorFound( QString )" ), gv, SLOT( "addError( QString )" ) );
+  connect( gv, SIGNAL( errorFound( QgsGeometry::Error ) ), gv, SLOT( addError( QgsGeometry::Error ) ) );
   gv->run();
   gv->wait();
 }