[QGIS Commit] r12026 - in trunk/qgis: python/core src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-11-08 12:52:40 -0500 (Sun, 08 Nov 2009)
New Revision: 12026

Modified:
   trunk/qgis/python/core/qgsvectorfilewriter.sip
   trunk/qgis/src/core/qgsvectorfilewriter.cpp
   trunk/qgis/src/core/qgsvectorfilewriter.h
Log:
Committing Horsts OGR format patch from the QGIS hackfest in Vienna

Modified: trunk/qgis/python/core/qgsvectorfilewriter.sip
===================================================================
--- trunk/qgis/python/core/qgsvectorfilewriter.sip	2009-11-08 17:37:13 UTC (rev 12025)
+++ trunk/qgis/python/core/qgsvectorfilewriter.sip	2009-11-08 17:52:40 UTC (rev 12026)
@@ -37,7 +37,8 @@
                         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();

Modified: trunk/qgis/src/core/qgsvectorfilewriter.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorfilewriter.cpp	2009-11-08 17:37:13 UTC (rev 12025)
+++ trunk/qgis/src/core/qgsvectorfilewriter.cpp	2009-11-08 17:52:40 UTC (rev 12026)
@@ -43,11 +43,11 @@
     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;

Modified: trunk/qgis/src/core/qgsvectorfilewriter.h
===================================================================
--- trunk/qgis/src/core/qgsvectorfilewriter.h	2009-11-08 17:37:13 UTC (rev 12025)
+++ trunk/qgis/src/core/qgsvectorfilewriter.h	2009-11-08 17:52:40 UTC (rev 12026)
@@ -65,7 +65,8 @@
                          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();