From d855f7f3f468543ea72e67c3215baa4da7de530b Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Sun, 5 Nov 2017 14:24:48 +1000 Subject: [PATCH] Remove redundant '[OGR'] string from dialogs --- src/core/qgsvectorfilewriter.cpp | 6 ++++-- tests/src/python/test_qgsvectorfilewriter.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index f58f1e9adf4..d7554101736 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -2894,9 +2894,11 @@ QString QgsVectorFileWriter::filterForDriver( const QString &driverName ) { MetaData metadata; if ( !driverMetadata( driverName, metadata ) || metadata.trLongName.isEmpty() || metadata.glob.isEmpty() ) - return QLatin1String( "" ); + return QString(); - return metadata.trLongName + " [OGR] (" + metadata.glob.toLower() + ' ' + metadata.glob.toUpper() + ')'; + return QStringLiteral( "%1 (%2 %3)" ).arg( metadata.trLongName, + metadata.glob.toLower(), + metadata.glob.toUpper() ); } QString QgsVectorFileWriter::convertCodecNameForEncodingOption( const QString &codecName ) diff --git a/tests/src/python/test_qgsvectorfilewriter.py b/tests/src/python/test_qgsvectorfilewriter.py index 3614b254c86..32e39520156 100644 --- a/tests/src/python/test_qgsvectorfilewriter.py +++ b/tests/src/python/test_qgsvectorfilewriter.py @@ -726,8 +726,8 @@ class TestQgsVectorFileWriter(unittest.TestCase): def testSupportedFiltersAndFormat(self): # test with formats in recommended order formats = QgsVectorFileWriter.supportedFiltersAndFormats(QgsVectorFileWriter.SortRecommended) - self.assertEqual(formats[0], ('GeoPackage [OGR] (*.gpkg *.GPKG)', 'GPKG')) - self.assertEqual(formats[1], ('ESRI Shapefile [OGR] (*.shp *.SHP)', 'ESRI Shapefile')) + self.assertEqual(formats[0], ('GeoPackage (*.gpkg *.GPKG)', 'GPKG')) + self.assertEqual(formats[1], ('ESRI Shapefile (*.shp *.SHP)', 'ESRI Shapefile')) # alphabetical sorting formats2 = QgsVectorFileWriter.supportedFiltersAndFormats(QgsVectorFileWriter.VectorFormatOptions()) self.assertTrue(formats2[0][0] < formats2[1][0])