Skip to content

Commit d855f7f

Browse files
committed
Remove redundant '[OGR'] string from dialogs
1 parent dc341d2 commit d855f7f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/core/qgsvectorfilewriter.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2894,9 +2894,11 @@ QString QgsVectorFileWriter::filterForDriver( const QString &driverName )
28942894
{
28952895
MetaData metadata;
28962896
if ( !driverMetadata( driverName, metadata ) || metadata.trLongName.isEmpty() || metadata.glob.isEmpty() )
2897-
return QLatin1String( "" );
2897+
return QString();
28982898

2899-
return metadata.trLongName + " [OGR] (" + metadata.glob.toLower() + ' ' + metadata.glob.toUpper() + ')';
2899+
return QStringLiteral( "%1 (%2 %3)" ).arg( metadata.trLongName,
2900+
metadata.glob.toLower(),
2901+
metadata.glob.toUpper() );
29002902
}
29012903

29022904
QString QgsVectorFileWriter::convertCodecNameForEncodingOption( const QString &codecName )

tests/src/python/test_qgsvectorfilewriter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,8 +726,8 @@ def testOverwriteLayer(self):
726726
def testSupportedFiltersAndFormat(self):
727727
# test with formats in recommended order
728728
formats = QgsVectorFileWriter.supportedFiltersAndFormats(QgsVectorFileWriter.SortRecommended)
729-
self.assertEqual(formats[0], ('GeoPackage [OGR] (*.gpkg *.GPKG)', 'GPKG'))
730-
self.assertEqual(formats[1], ('ESRI Shapefile [OGR] (*.shp *.SHP)', 'ESRI Shapefile'))
729+
self.assertEqual(formats[0], ('GeoPackage (*.gpkg *.GPKG)', 'GPKG'))
730+
self.assertEqual(formats[1], ('ESRI Shapefile (*.shp *.SHP)', 'ESRI Shapefile'))
731731
# alphabetical sorting
732732
formats2 = QgsVectorFileWriter.supportedFiltersAndFormats(QgsVectorFileWriter.VectorFormatOptions())
733733
self.assertTrue(formats2[0][0] < formats2[1][0])

0 commit comments

Comments
 (0)