From 6c3323739c839a098d387d04a132ec7be894e2ee Mon Sep 17 00:00:00 2001 From: mhugent Date: Sun, 8 Nov 2009 17:52:40 +0000 Subject: [PATCH] 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 --- python/core/qgsvectorfilewriter.sip | 3 ++- src/core/qgsvectorfilewriter.cpp | 4 ++-- src/core/qgsvectorfilewriter.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip index 362ac57fe5d..eecd0a4992a 100644 --- a/python/core/qgsvectorfilewriter.sip +++ b/python/core/qgsvectorfilewriter.sip @@ -37,7 +37,8 @@ public: const QString& fileEncoding, const QMap& 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 index c46b8db94a0..8b39c98861f 100644 --- 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 index 1b152c6a3b7..7550f876b08 100644 --- 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();