Followup 59db4d0: Cleanup

qgis · May 11, 2016 · 604da1f · 604da1f
1 parent 86ccaff
commit 604da1f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -15,13 +15,7 @@
 #include "qgsvectorlayereditbuffer.h"
 
 #include "qgsgeometry.h"
-#include "qgscurvepolygonv2.h"
-#include "qgscurvev2.h"
-#include "qgsgeometrycollectionv2.h"
-#include "qgsgeometryfactory.h"
-#include "qgsgeometryutils.h"
 #include "qgslogger.h"
-#include "qgspolygonv2.h"
 #include "qgsvectorlayerundocommand.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2372,7 +2372,7 @@ void QgsPostgresProvider::appendGeomParam( const QgsGeometry *geom, QStringList
 
   QString param;
 
-  QgsGeometry* convertedGeom = convertToProviderType( geom );
+  QScopedPointer<QgsGeometry> convertedGeom( convertToProviderType( geom ) );
   const unsigned char *buf = convertedGeom ? convertedGeom->asWkb() : geom->asWkb();
   size_t wkbSize = convertedGeom ? convertedGeom->wkbSize() : geom->wkbSize();
 
@@ -2383,7 +2383,6 @@ void QgsPostgresProvider::appendGeomParam( const QgsGeometry *geom, QStringList
     else
       param += QString( "\\%1" ).arg(( int ) buf[i], 3, 8, QChar( '0' ) );
   }
-  delete convertedGeom;
   params << param;
 }