Followup 59db4d0: Cleanup

m-kuhn · m-kuhn · commit 604da1f24d64 · 2016-05-11T09:22:49.000+02:00
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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2372,7 +2372,7 @@ void QgsPostgresProvider::appendGeomParam( const QgsGeometry *geom, QStringList`
`2372`	`2372`
`2373`	`2373`	`QString param;`
`2374`	`2374`
`2375`		`- QgsGeometry* convertedGeom = convertToProviderType( geom );`
	`2375`	`+ QScopedPointer<QgsGeometry> convertedGeom( convertToProviderType( geom ) );`
`2376`	`2376`	`const unsigned char *buf = convertedGeom ? convertedGeom->asWkb() : geom->asWkb();`
`2377`	`2377`	`size_t wkbSize = convertedGeom ? convertedGeom->wkbSize() : geom->wkbSize();`
`2378`	`2378`
`@@ -2383,7 +2383,6 @@ void QgsPostgresProvider::appendGeomParam( const QgsGeometry *geom, QStringList`
`2383`	`2383`	`else`
`2384`	`2384`	`param += QString( "\\%1" ).arg(( int ) buf[i], 3, 8, QChar( '0' ) );`
`2385`	`2385`	`}`
`2386`		`- delete convertedGeom;`
`2387`	`2386`	`params << param;`
`2388`	`2387`	`}`
`2389`	`2388`