sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Replace OGR_Dr_GetName with GDALGetDescription
This commit is contained in:
Even Rouault 2025-01-15 13:01:20 +01:00 committed by GitHub
commit 1b3c7d96a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/qgsvectorfilewriter.cpp
View File

@ -3842,7 +3842,7 @@ QStringList multiLayerFormats()
const QSet< QString > splitExtensions = qgis::listToSet( driverExtensions.split( ' ', Qt::SkipEmptyParts ) ); const QSet< QString > splitExtensions = qgis::listToSet( driverExtensions.split( ' ', Qt::SkipEmptyParts ) );
if ( splitExtensions.intersects( multiLayerExtensions ) ) if ( splitExtensions.intersects( multiLayerExtensions ) )
{ {
driverNames << OGR_Dr_GetName( driver ); driverNames << GDALGetDescription( driver );
} }
} }
return driverNames; return driverNames;
@ -3872,7 +3872,7 @@ QList< QgsVectorFileWriter::FilterFormatDetails > QgsVectorFileWriter::supported
OGRSFDriverH drv = OGRGetDriver( i ); OGRSFDriverH drv = OGRGetDriver( i );
if ( drv ) if ( drv )
{ {
const QString drvName = OGR_Dr_GetName( drv ); const QString drvName = GDALGetDescription( drv );
if ( options & SupportsMultipleLayers ) if ( options & SupportsMultipleLayers )
{ {
@ -3995,7 +3995,7 @@ QList< QgsVectorFileWriter::DriverDetails > QgsVectorFileWriter::ogrDriverList(
OGRSFDriverH drv = OGRGetDriver( i ); OGRSFDriverH drv = OGRGetDriver( i );
if ( drv ) if ( drv )
{ {
const QString drvName = OGR_Dr_GetName( drv ); const QString drvName = GDALGetDescription( drv );
if ( options & SupportsMultipleLayers ) if ( options & SupportsMultipleLayers )
{ {
@ -4492,7 +4492,7 @@ QgsVectorFileWriter::EditionCapabilities QgsVectorFileWriter::editionCapabilitie
gdal::ogr_datasource_unique_ptr hDS( OGROpen( datasetName.toUtf8().constData(), TRUE, &hDriver ) ); gdal::ogr_datasource_unique_ptr hDS( OGROpen( datasetName.toUtf8().constData(), TRUE, &hDriver ) );
if ( !hDS ) if ( !hDS )
return QgsVectorFileWriter::EditionCapabilities(); return QgsVectorFileWriter::EditionCapabilities();
QString drvName = OGR_Dr_GetName( hDriver ); const QString drvName = GDALGetDescription( hDriver );
QgsVectorFileWriter::EditionCapabilities caps = QgsVectorFileWriter::EditionCapabilities(); QgsVectorFileWriter::EditionCapabilities caps = QgsVectorFileWriter::EditionCapabilities();
if ( OGR_DS_TestCapability( hDS.get(), ODsCCreateLayer ) ) if ( OGR_DS_TestCapability( hDS.get(), ODsCCreateLayer ) )
{ {