OGR provider: moved QgsCPLErrorHandler to its own header file

elpaso · elpaso · commit 13c9e1de0181 · 2017-08-22T12:07:01.000+02:00
This is being reused in gpkg data items
diff --git a/src/providers/ogr/qgscplerrorhandler.h b/src/providers/ogr/qgscplerrorhandler.h
@@ -0,0 +1,48 @@
+/***************************************************************************
+  qgscplerrorhandler.h - QgsCplErrorHandler
+
+ ---------------------
+ begin                : Oct 29, 2003
+ copyright            : (C) 2003 by Gary E.Sherman
+ email                : sherman at mrcc.com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef QGSCPLERRORHANDLER_H
+#define QGSCPLERRORHANDLER_H
+
+#include "gdal.h"
+#include "qgsmessagelog.h"
+
+class QgsCPLErrorHandler
+{
+    static void CPL_STDCALL showError( CPLErr errClass, int errNo, const char *msg )
+    {
+      if ( errNo != OGRERR_NONE )
+        QgsMessageLog::logMessage( QObject::tr( "OGR[%1] error %2: %3" ).arg( errClass ).arg( errNo ).arg( msg ), QObject::tr( "OGR" ) );
+    }
+
+  public:
+    QgsCPLErrorHandler()
+    {
+      CPLPushErrorHandler( showError );
+    }
+
+    ~QgsCPLErrorHandler()
+    {
+      CPLPopErrorHandler();
+    }
+
+  private:
+    QgsCPLErrorHandler( const QgsCPLErrorHandler &other );
+    QgsCPLErrorHandler &operator=( const QgsCPLErrorHandler &other );
+
+};
+
+
+#endif // QGSCPLERRORHANDLER_H
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -16,6 +16,7 @@ email                : sherman at mrcc.com
  ***************************************************************************/
 
 #include "qgsogrprovider.h"
+#include "qgscplerrorhandler.h"
 #include "qgsogrfeatureiterator.h"
 #include "qgslogger.h"
 #include "qgsmessagelog.h"
@@ -80,31 +81,6 @@ static const QString TEXT_PROVIDER_DESCRIPTION =
 
 static OGRwkbGeometryType ogrWkbGeometryTypeFromName( const QString &typeName );
 
-class QgsCPLErrorHandler
-{
-    static void CPL_STDCALL showError( CPLErr errClass, int errNo, const char *msg )
-    {
-      if ( errNo != OGRERR_NONE )
-        QgsMessageLog::logMessage( QObject::tr( "OGR[%1] error %2: %3" ).arg( errClass ).arg( errNo ).arg( msg ), QObject::tr( "OGR" ) );
-    }
-
-  public:
-    QgsCPLErrorHandler()
-    {
-      CPLPushErrorHandler( showError );
-    }
-
-    ~QgsCPLErrorHandler()
-    {
-      CPLPopErrorHandler();
-    }
-
-  private:
-    QgsCPLErrorHandler( const QgsCPLErrorHandler &other );
-    QgsCPLErrorHandler &operator=( const QgsCPLErrorHandler &other );
-
-};
-
 
 bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding )
 {
