Merge pull request #60153 from elpaso/replace-deprecated-OGR_Dr_GetName

Replace OGR_Dr_GetName with GDALGetDescription
qgis · Jan 15, 2025 · 1b3c7d9 · 1b3c7d9
2 parents b7b9451 + 9374da8
commit 1b3c7d9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -3842,7 +3842,7 @@ QStringList multiLayerFormats()
     const QSet< QString > splitExtensions = qgis::listToSet( driverExtensions.split( ' ', Qt::SkipEmptyParts ) );
     if ( splitExtensions.intersects( multiLayerExtensions ) )
     {
-      driverNames << OGR_Dr_GetName( driver );
+      driverNames << GDALGetDescription( driver );
     }
   }
   return driverNames;
@@ -3872,7 +3872,7 @@ QList< QgsVectorFileWriter::FilterFormatDetails > QgsVectorFileWriter::supported
     OGRSFDriverH drv = OGRGetDriver( i );
     if ( drv )
     {
-      const QString drvName = OGR_Dr_GetName( drv );
+      const QString drvName = GDALGetDescription( drv );
 
       if ( options & SupportsMultipleLayers )
       {
@@ -3995,7 +3995,7 @@ QList< QgsVectorFileWriter::DriverDetails > QgsVectorFileWriter::ogrDriverList(
     OGRSFDriverH drv = OGRGetDriver( i );
     if ( drv )
     {
-      const QString drvName = OGR_Dr_GetName( drv );
+      const QString drvName = GDALGetDescription( drv );
 
       if ( options & SupportsMultipleLayers )
       {
@@ -4492,7 +4492,7 @@ QgsVectorFileWriter::EditionCapabilities QgsVectorFileWriter::editionCapabilitie
   gdal::ogr_datasource_unique_ptr hDS( OGROpen( datasetName.toUtf8().constData(), TRUE, &hDriver ) );
   if ( !hDS )
     return QgsVectorFileWriter::EditionCapabilities();
-  QString drvName = OGR_Dr_GetName( hDriver );
+  const QString drvName = GDALGetDescription( hDriver );
   QgsVectorFileWriter::EditionCapabilities caps = QgsVectorFileWriter::EditionCapabilities();
   if ( OGR_DS_TestCapability( hDS.get(), ODsCCreateLayer ) )
   {