Catch geos exception in event loop

m-kuhn · m-kuhn · commit a71132a15bb7 · 2017-03-29T07:20:28.000+02:00
diff --git a/src/core/geometry/qgsgeos.h b/src/core/geometry/qgsgeos.h
@@ -250,42 +250,14 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine
 
 /// @cond PRIVATE
 
-class GEOSException // clazy:exclude=rule-of-three
+
+class GEOSException : public std::runtime_error
 {
   public:
     explicit GEOSException( const QString &message )
+      : std::runtime_error( message.toUtf8().constData() )
     {
-      if ( message == QLatin1String( "Unknown exception thrown" ) && lastMsg().isNull() )
-      {
-        msg = message;
-      }
-      else
-      {
-        msg = message;
-        lastMsg() = msg;
-      }
-    }
-
-    // copy constructor
-    GEOSException( const GEOSException &rhs )
-    {
-      *this = rhs;
-    }
-
-    ~GEOSException()
-    {
-      if ( lastMsg() == msg )
-        lastMsg() = QString::null;
-    }
-
-    QString what()
-    {
-      return msg;
     }
-
-  private:
-    QString msg;
-    static QString &lastMsg() { static QString sLastMsg; return sLastMsg; }
 };
 
 /// @endcond
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -37,7 +37,6 @@
 #include "qgsmessagelog.h"
 #include "qgsannotationregistry.h"
 #include "qgssettings.h"
-#include "qgsgeos.h"
 
 #include "gps/qgsgpsconnectionregistry.h"
 #include "processing/qgsprocessingregistry.h"
@@ -314,12 +313,6 @@ bool QgsApplication::notify( QObject *receiver, QEvent *event )
     if ( qApp->thread() == QThread::currentThread() )
       QMessageBox::critical( activeWindow(), tr( "Exception" ), e.what() );
   }
-  catch ( GEOSException &e )
-  {
-    QgsDebugMsg( "Caught unhandled GEOSException: " + e.what() );
-    if ( qApp->thread() == QThread::currentThread() )
-      QMessageBox::critical( activeWindow(), tr( "Exception" ), e.what() );
-  }
   catch ( std::exception &e )
   {
     QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromAscii( e.what() ) );
diff --git a/src/core/qgstracer.cpp b/src/core/qgstracer.cpp
@@ -550,7 +550,7 @@ bool QgsTracer::initGraph()
 
     mHasTopologyProblem = true;
 
-    QgsDebugMsg( "Tracer Noding Exception: " + e.what() );
+    QgsDebugMsg( QString( "Tracer Noding Exception: %1" ).arg( e.what() ) );
   }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ bool QgsTracer::initGraph()`
`550`	`550`
`551`	`551`	`mHasTopologyProblem = true;`
`552`	`552`
`553`		`- QgsDebugMsg( "Tracer Noding Exception: " + e.what() );`
	`553`	`+ QgsDebugMsg( QString( "Tracer Noding Exception: %1" ).arg( e.what() ) );`
`554`	`554`	`}`
`555`	`555`	`#endif`
`556`	`556`