From 7c2152c4a9292d18911d504603ab30c40b1d4080 Mon Sep 17 00:00:00 2001 From: jef Date: Sun, 11 Nov 2007 14:53:24 +0000 Subject: [PATCH] use comma as delimiter in all part of raster fileformat list git-svn-id: http://svn.osgeo.org/qgis/trunk@7375 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/core/raster/qgsrasterlayer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index 254ba344781..fae1bd6d25d 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -136,7 +136,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri QStringList metadataTokens; // essentially the metadata string delimited by '=' - QString catchallFilter; // for Any file(*.*), but also for those + QStringList catchallFilter; // for Any file(*.*), but also for those // drivers with no specific file filter GDALDriver *jp2Driver = NULL; // first JPEG2000 driver found @@ -269,7 +269,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri } else { - catchallFilter += QString(myGdalDriver->GetDescription()) + " "; + catchallFilter << QString(myGdalDriver->GetDescription()); } } @@ -278,7 +278,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri } // each loaded GDAL driver // can't forget the default case - theFileFiltersString += catchallFilter + tr("and all other files") + " (*)"; + theFileFiltersString += catchallFilter.join(", ") + " " + tr("and all other files") + " (*)"; QgsDebugMsg("Raster filter list built: " + theFileFiltersString); } // buildSupportedRasterFileFilter_() @@ -374,8 +374,7 @@ QgsRasterLayer::QgsRasterLayer(QString const & path, QString const & baseName) showDebugOverlayFlag(false), invertHistogramFlag(false), stdDevsToPlotDouble(0), -dataProvider(0) - + dataProvider(0) { userDefinedColorMinMax = false; //defaults needed to bypass stretch userDefinedGrayMinMax = false;