Committing Horsts OGR format patch from the QGIS hackfest in Vienna

git-svn-id: http://svn.osgeo.org/qgis/trunk@12026 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 8, 2009 · 6c33237 · 6c33237
1 parent d8b5738
commit 6c33237
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip
@@ -37,7 +37,8 @@ public:
                         const QString& fileEncoding,
                         const QMap<int, QgsField>& fields,
                         QGis::WkbType geometryType,
-                        const QgsCoordinateReferenceSystem* srs);
+                        const QgsCoordinateReferenceSystem* srs,
+			const QString& driverName = "ESRI Shapefile" );
 
     /** checks whether there were any errors in constructor */
     WriterError hasError();

diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -43,11 +43,11 @@ QgsVectorFileWriter::QgsVectorFileWriter( const QString& shapefileName,
     const QString& fileEncoding,
     const QgsFieldMap& fields,
     QGis::WkbType geometryType,
-    const QgsCoordinateReferenceSystem* srs )
+    const QgsCoordinateReferenceSystem* srs,
+    const QString& driverName )
     : mDS( NULL ), mLayer( NULL ), mGeom( NULL ), mError( NoError )
 {
   // save the layer as a shapefile
-  QString driverName = "ESRI Shapefile";
 
   // find driver in OGR
   OGRSFDriverH poDriver;

diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -65,7 +65,8 @@ class CORE_EXPORT QgsVectorFileWriter
                          const QString& fileEncoding,
                          const QgsFieldMap& fields,
                          QGis::WkbType geometryType,
-                         const QgsCoordinateReferenceSystem* srs );
+                         const QgsCoordinateReferenceSystem* srs,
+                         const QString& driverName = "ESRI Shapefile" );
 
     /** checks whether there were any errors in constructor */
     WriterError hasError();