Split qgsogrprovider.cpp/.h up to seperate into qgsogrproviderutils

and qgsorgprovidermetadata These files were becoming mammoth, with functions from different classes all mashed together in the .cpp file, making it hard to navigate the various classes.
qgis · Jun 21, 2021 · b422306 · b422306
1 parent e4ba6b1
commit b422306
Show file tree

Hide file tree

Showing 15 changed files with 4,996 additions and 4,878 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -231,6 +231,8 @@ set(QGIS_CORE_SRCS
   providers/meshmemory/qgsmeshmemorydataprovider.cpp
 
   providers/ogr/qgsogrprovider.cpp
+  providers/ogr/qgsogrprovidermetadata.cpp
+  providers/ogr/qgsogrproviderutils.cpp
   providers/ogr/qgsogrdataitems.cpp
   providers/ogr/qgsogrfeatureiterator.cpp
   providers/ogr/qgsogrconnpool.cpp
@@ -1495,6 +1497,8 @@ set(QGIS_CORE_HDRS
   providers/ogr/qgsogrdataitems.h
   providers/ogr/qgsogrdbconnection.h
   providers/ogr/qgsogrprovider.h
+  providers/ogr/qgsogrprovidermetadata.h
+  providers/ogr/qgsogrproviderutils.h
   providers/ogr/qgsogrtransaction.h
 
   raster/qgsbilinearrasterresampler.h

diff --git a/src/core/providers/ogr/qgsgeopackagedataitems.cpp b/src/core/providers/ogr/qgsgeopackagedataitems.cpp
@@ -37,6 +37,7 @@
 #include "qgsprojectstorageregistry.h"
 #include "qgsgeopackageprojectstorage.h"
 #include "qgsgeopackageproviderconnection.h"
+#include "qgsprovidermetadata.h"
 
 QString QgsGeoPackageDataItemProvider::name()
 {

diff --git a/src/core/providers/ogr/qgsgeopackageproviderconnection.cpp b/src/core/providers/ogr/qgsgeopackageproviderconnection.cpp
@@ -21,6 +21,9 @@
 #include "qgsproviderregistry.h"
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
+#include "qgsfeedback.h"
+
+#include <QTextCodec>
 
 QgsGeoPackageProviderConnection::QgsGeoPackageProviderConnection( const QString &name )
   : QgsAbstractDatabaseProviderConnection( name )

diff --git a/src/core/providers/ogr/qgsogrconnpool.h b/src/core/providers/ogr/qgsogrconnpool.h
@@ -17,9 +17,11 @@
 #define QGSOGRCONNPOOL_H
 
 #include "qgsconnectionpool.h"
-#include "qgsogrprovider.h"
+#include "qgsogrprovidermetadata.h"
+#include "qgsogrproviderutils.h"
 #include <gdal.h>
 #include "qgis_sip.h"
+#include <cpl_string.h>
 
 ///@cond PRIVATE
 #define SIP_NO_FILE

diff --git a/src/core/providers/ogr/qgsogrdataitems.cpp b/src/core/providers/ogr/qgsogrdataitems.cpp
@@ -32,6 +32,7 @@
 #include "qgsfieldsitem.h"
 #include "qgszipitem.h"
 #include "qgsabstractdatabaseproviderconnection.h"
+#include "qgsogrprovidermetadata.h"
 
 #include <QFileInfo>
 #include <QTextStream>

diff --git a/src/core/providers/ogr/qgsogrfeatureiterator.h b/src/core/providers/ogr/qgsogrfeatureiterator.h
@@ -18,6 +18,7 @@
 #include "qgsfeatureiterator.h"
 #include "qgsogrconnpool.h"
 #include "qgsfields.h"
+#include "qgsogrutils.h"
 
 #include <ogr_api.h>