From 2f440bd88841d6de310867f098bf2237b02c51a3 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Thu, 24 May 2012 20:43:50 +0200
Subject: [PATCH] fix synchronous geometry validation

---
 src/core/qgsgeometry.cpp          | 4 +---
 src/core/qgsgeometryvalidator.cpp | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
index 20db422f30f4..4fa29d26cee5 100644
--- 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
index f905b215dc19..bcfa7b4279a8 100644
--- 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();
 }