another scripts/replacev2.sh with minor manual fixes

python/core/core.sip

@@ -216,7 +216,7 @@
 %Include diagram/qgshistogramdiagram.sip
 %Include diagram/qgspiediagram.sip
 %Include diagram/qgstextdiagram.sip
-%Include qgsdiagramrendererv2.sip
+%Include qgsdiagramrenderer.sip
 
 %Include effects/qgsblureffect.sip
 %Include effects/qgscoloreffect.sip
@@ -287,29 +287,29 @@
 
 %Include symbology-ng/qgscolorbrewerpalette.sip
 %Include symbology-ng/qgscptcityarchive.sip
-%Include symbology-ng/qgsstylev2.sip
+%Include symbology-ng/qgsstyle.sip
 %Include symbology-ng/qgssvgcache.sip
 %Include symbology-ng/qgssymbol.sip
-%Include symbology-ng/qgsvectorcolorrampv2.sip
+%Include symbology-ng/qgsvectorcolorramp.sip
 
 %Include symbology-ng/qgs25drenderer.sip
-%Include symbology-ng/qgscategorizedsymbolrendererv2.sip
-%Include symbology-ng/qgsgraduatedsymbolrendererv2.sip
+%Include symbology-ng/qgscategorizedsymbolrenderer.sip
+%Include symbology-ng/qgsgraduatedsymbolrenderer.sip
 %Include symbology-ng/qgsheatmaprenderer.sip
 %Include symbology-ng/qgsinvertedpolygonrenderer.sip
-%Include symbology-ng/qgslegendsymbolitemv2.sip
+%Include symbology-ng/qgslegendsymbolitem.sip
 %Include symbology-ng/qgsnullsymbolrenderer.sip
 %Include symbology-ng/qgspointdisplacementrenderer.sip
-%Include symbology-ng/qgsrendererv2.sip
-%Include symbology-ng/qgsrendererv2registry.sip
-%Include symbology-ng/qgsrulebasedrendererv2.sip
-%Include symbology-ng/qgssinglesymbolrendererv2.sip
+%Include symbology-ng/qgsrenderer.sip
+%Include symbology-ng/qgsrendererregistry.sip
+%Include symbology-ng/qgsrulebasedrenderer.sip
+%Include symbology-ng/qgssinglesymbolrenderer.sip
 
-%Include symbology-ng/qgsellipsesymbollayerv2.sip
-%Include symbology-ng/qgsfillsymbollayerv2.sip
-%Include symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
-%Include symbology-ng/qgslinesymbollayerv2.sip
-%Include symbology-ng/qgsmarkersymbollayerv2.sip
+%Include symbology-ng/qgsellipsesymbollayer.sip
+%Include symbology-ng/qgsfillsymbollayer.sip
+%Include symbology-ng/qgsgeometrygeneratorsymbollayer.sip
+%Include symbology-ng/qgslinesymbollayer.sip
+%Include symbology-ng/qgsmarkersymbollayer.sip
 %Include symbology-ng/qgssymbollayer.sip
 %Include symbology-ng/qgssymbollayerregistry.sip
 %Include symbology-ng/qgssymbollayerutils.sip
@@ -320,22 +320,22 @@
 
 %Include dxf/qgsdxfexport.sip
 
-%Include geometry/qgsabstractgeometryv2.sip
-%Include geometry/qgscircularstringv2.sip
-%Include geometry/qgscompoundcurvev2.sip
-%Include geometry/qgscurvepolygonv2.sip
-%Include geometry/qgscurvev2.sip
+%Include geometry/qgsabstractgeometry.sip
+%Include geometry/qgscircularstring.sip
+%Include geometry/qgscompoundcurve.sip
+%Include geometry/qgscurvepolygon.sip
+%Include geometry/qgscurve.sip
 %Include geometry/qgsgeometry.sip
-%Include geometry/qgsgeometrycollectionv2.sip
+%Include geometry/qgsgeometrycollection.sip
 %Include geometry/qgsgeometryengine.sip
-%Include geometry/qgslinestringv2.sip
-%Include geometry/qgsmulticurvev2.sip
-%Include geometry/qgsmultilinestringv2.sip
-%Include geometry/qgsmultipointv2.sip
-%Include geometry/qgsmultipolygonv2.sip
-%Include geometry/qgsmultisurfacev2.sip
+%Include geometry/qgslinestring.sip
+%Include geometry/qgsmulticurve.sip
+%Include geometry/qgsmultilinestring.sip
+%Include geometry/qgsmultipoint.sip
+%Include geometry/qgsmultipolygon.sip
+%Include geometry/qgsmultisurface.sip
 %Include geometry/qgspointv2.sip
-%Include geometry/qgspolygonv2.sip
-%Include geometry/qgssurfacev2.sip
+%Include geometry/qgspolygon.sip
+%Include geometry/qgssurface.sip
 %Include geometry/qgswkbtypes.sip
 %Include geometry/qgswkbptr.sip

python/core/geometry/qgsabstractgeometryv2.sip → python/core/geometry/qgsabstractgeometry.sip

@@ -1,7 +1,7 @@
 struct QgsVertexId
 {