[QGIS Commit] r12313 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2009-12-02 18:06:29 -0500 (Wed, 02 Dec 2009)
New Revision: 12313

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
Use qimagereader filters to show all available file types for save map as image

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-12-02 21:08:12 UTC (rev 12312)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-12-02 23:06:29 UTC (rev 12313)
@@ -37,6 +37,7 @@
 #include <QEvent>
 #include <QFile>
 #include <QFileInfo>
+#include <QImageReader>
 #include <QInputDialog>
 #include <QKeyEvent>
 #include <QLabel>
@@ -62,11 +63,11 @@
 #include <QStringList>
 #include <QTcpSocket>
 #include <QTextStream>
+#include <QtGlobal>
 #include <QTimer>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QWhatsThis>
-#include <QtGlobal>
 //
 // Mac OS X Includes
 // Must include before GEOS 3 due to unqualified use of 'Point'
@@ -3771,18 +3772,13 @@
   // get a list of supported output image types
   int myCounterInt = 0;
   QString myFilters;
-  QList<QByteArray> formats = QPictureIO::outputFormats();
-  // Workaround for a problem with Qt4 - calls to outputFormats tend
-  // to return nothing :(
-  if ( formats.count() == 0 )
-  {
-    formats.append( "png" );
-    formats.append( "jpg" );
-  }
+  QList<QByteArray> formats = QImageReader::supportedImageFormats();
 
   for ( ; myCounterInt < formats.count(); myCounterInt++ )
   {
     QString myFormat = QString( formats.at( myCounterInt ) );
+    //svg doesnt work so skip it
+    if ( myFormat ==  "svg" ) continue;
     QString myFilter = createFileFilter_( myFormat + " format", "*." + myFormat );
     myFilters += myFilter;
     myFilterMap[myFilter] = myFormat;