use comma as delimiter in all part of raster fileformat list

jef · jef · commit e6de7b3f5892 · 2007-11-11T14:53:24.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7375 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri`
`136`	`136`
`137`	`137`	`QStringList metadataTokens; // essentially the metadata string delimited by '='`
`138`	`138`
`139`		`- QString catchallFilter; // for Any file(.), but also for those`
	`139`	`+ QStringList catchallFilter; // for Any file(.), but also for those`
`140`	`140`	`// drivers with no specific file filter`
`141`	`141`
`142`	`142`	`GDALDriver *jp2Driver = NULL; // first JPEG2000 driver found`
`@@ -269,7 +269,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri`
`269`	`269`	`}`
`270`	`270`	`else`
`271`	`271`	`{`
`272`		`- catchallFilter += QString(myGdalDriver->GetDescription()) + " ";`
	`272`	`+ catchallFilter << QString(myGdalDriver->GetDescription());`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`@@ -278,7 +278,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter(QString & theFileFiltersStri`
`278`	`278`	`} // each loaded GDAL driver`
`279`	`279`
`280`	`280`	`// can't forget the default case`
`281`		`- theFileFiltersString += catchallFilter + tr("and all other files") + " (*)";`
	`281`	`+ theFileFiltersString += catchallFilter.join(", ") + " " + tr("and all other files") + " (*)";`
`282`	`282`	`QgsDebugMsg("Raster filter list built: " + theFileFiltersString);`
`283`	`283`	`} // buildSupportedRasterFileFilter_()`
`284`	`284`
`@@ -374,8 +374,7 @@ QgsRasterLayer::QgsRasterLayer(QString const & path, QString const & baseName)`
`374`	`374`	`showDebugOverlayFlag(false),`
`375`	`375`	`invertHistogramFlag(false),`
`376`	`376`	`stdDevsToPlotDouble(0),`
`377`		`-dataProvider(0)`
`378`		`-`
	`377`	`+ dataProvider(0)`
`379`	`378`	`{`
`380`	`379`	`userDefinedColorMinMax = false; //defaults needed to bypass stretch`
`381`	`380`	`userDefinedGrayMinMax = false;`