fix buildSupportedRasterFileFilter for sip api v2

qgis · Jun 4, 2013 · 097536c · brushtyler · Jun 5, 2013 · etiennesky
1 parent ae3abcc
commit 097536c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/python/core/raster/qgsrasterlayer.sip b/python/core/raster/qgsrasterlayer.sip
@@ -94,6 +94,7 @@ class QgsRasterLayer : QgsMapLayer
     // Static methods:
     //
     static void buildSupportedRasterFileFilter( QString & fileFilters );
+    static QString buildSupportedRasterFileFilter2(); /* for sip api v2 */
 
     /** This helper checks to see whether the file name appears to be a valid
      *  raster file name.  If the file name looks like it could be valid,

diff --git a/python/plugins/GdalTools/tools/GdalTools_utils.py b/python/plugins/GdalTools/tools/GdalTools_utils.py
@@ -429,8 +429,7 @@ def setFilter(self, typeName, aFilter):
   @classmethod
   def allRastersFilter(self):
     if self.rastersFilter == '':
-      # TODO fix this, does not work
-      QgsRasterLayer.buildSupportedRasterFileFilter(self.rastersFilter)
+      self.rastersFilter = QgsRasterLayer.buildSupportedRasterFileFilter2()
 
       # workaround for QGis < 1.5 (see #2376)
       # removed as this is a core plugin QGis >= 1.9

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -176,13 +176,20 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
   buildsupportedrasterfilefilter_t *pBuild = ( buildsupportedrasterfilefilter_t * ) cast_to_fptr( QgsProviderRegistry::instance()->function( "gdal", "buildSupportedRasterFileFilter" ) );
   if ( ! pBuild )
   {
-    QgsDebugMsg( "Could get buildSupportedRasterFileFilter in gdal provider library" );
+    QgsDebugMsg( "Could not get buildSupportedRasterFileFilter in gdal provider library" );
     return;
   }
 
   pBuild( theFileFiltersString );
 }
 
+QString QgsRasterLayer::buildSupportedRasterFileFilter2( )
+{
+  QString theFileFiltersString;
+  buildSupportedRasterFileFilter( theFileFiltersString );
+  return theFileFiltersString;
+}
+
 /**
  * This helper checks to see whether the file name appears to be a valid raster file name
  */

diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -245,6 +245,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     };
 
     static void buildSupportedRasterFileFilter( QString & fileFilters );
+    static QString buildSupportedRasterFileFilter2(); /* for sip api v2 */
 
     /** This helper checks to see whether the file name appears to be a valid
      *  raster file name.  If the file name looks like it could be valid,