Skip to content

Commit 3f22a7a

Browse files
jef-njef-n
committed
another scripts/replacev2.sh with minor manual fixes
1 parent f2d6209 commit 3f22a7a

File tree

320 files changed

+891
-892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+891
-892
lines changed

‎python/core/core.sip

+29-29
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
%Include diagram/qgshistogramdiagram.sip
217217
%Include diagram/qgspiediagram.sip
218218
%Include diagram/qgstextdiagram.sip
219-
%Include qgsdiagramrendererv2.sip
219+
%Include qgsdiagramrenderer.sip
220220

221221
%Include effects/qgsblureffect.sip
222222
%Include effects/qgscoloreffect.sip
@@ -287,29 +287,29 @@
287287

288288
%Include symbology-ng/qgscolorbrewerpalette.sip
289289
%Include symbology-ng/qgscptcityarchive.sip
290-
%Include symbology-ng/qgsstylev2.sip
290+
%Include symbology-ng/qgsstyle.sip
291291
%Include symbology-ng/qgssvgcache.sip
292292
%Include symbology-ng/qgssymbol.sip
293-
%Include symbology-ng/qgsvectorcolorrampv2.sip
293+
%Include symbology-ng/qgsvectorcolorramp.sip
294294

295295
%Include symbology-ng/qgs25drenderer.sip
296-
%Include symbology-ng/qgscategorizedsymbolrendererv2.sip
297-
%Include symbology-ng/qgsgraduatedsymbolrendererv2.sip
296+
%Include symbology-ng/qgscategorizedsymbolrenderer.sip
297+
%Include symbology-ng/qgsgraduatedsymbolrenderer.sip
298298
%Include symbology-ng/qgsheatmaprenderer.sip
299299
%Include symbology-ng/qgsinvertedpolygonrenderer.sip
300-
%Include symbology-ng/qgslegendsymbolitemv2.sip
300+
%Include symbology-ng/qgslegendsymbolitem.sip
301301
%Include symbology-ng/qgsnullsymbolrenderer.sip
302302
%Include symbology-ng/qgspointdisplacementrenderer.sip
303-
%Include symbology-ng/qgsrendererv2.sip
304-
%Include symbology-ng/qgsrendererv2registry.sip
305-
%Include symbology-ng/qgsrulebasedrendererv2.sip
306-
%Include symbology-ng/qgssinglesymbolrendererv2.sip
303+
%Include symbology-ng/qgsrenderer.sip
304+
%Include symbology-ng/qgsrendererregistry.sip
305+
%Include symbology-ng/qgsrulebasedrenderer.sip
306+
%Include symbology-ng/qgssinglesymbolrenderer.sip
307307

308-
%Include symbology-ng/qgsellipsesymbollayerv2.sip
309-
%Include symbology-ng/qgsfillsymbollayerv2.sip
310-
%Include symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
311-
%Include symbology-ng/qgslinesymbollayerv2.sip
312-
%Include symbology-ng/qgsmarkersymbollayerv2.sip
308+
%Include symbology-ng/qgsellipsesymbollayer.sip
309+
%Include symbology-ng/qgsfillsymbollayer.sip
310+
%Include symbology-ng/qgsgeometrygeneratorsymbollayer.sip
311+
%Include symbology-ng/qgslinesymbollayer.sip
312+
%Include symbology-ng/qgsmarkersymbollayer.sip
313313
%Include symbology-ng/qgssymbollayer.sip
314314
%Include symbology-ng/qgssymbollayerregistry.sip
315315
%Include symbology-ng/qgssymbollayerutils.sip
@@ -320,22 +320,22 @@
320320

321321
%Include dxf/qgsdxfexport.sip
322322

323-
%Include geometry/qgsabstractgeometryv2.sip
324-
%Include geometry/qgscircularstringv2.sip
325-
%Include geometry/qgscompoundcurvev2.sip
326-
%Include geometry/qgscurvepolygonv2.sip
327-
%Include geometry/qgscurvev2.sip
323+
%Include geometry/qgsabstractgeometry.sip
324+
%Include geometry/qgscircularstring.sip
325+
%Include geometry/qgscompoundcurve.sip
326+
%Include geometry/qgscurvepolygon.sip
327+
%Include geometry/qgscurve.sip
328328
%Include geometry/qgsgeometry.sip
329-
%Include geometry/qgsgeometrycollectionv2.sip
329+
%Include geometry/qgsgeometrycollection.sip
330330
%Include geometry/qgsgeometryengine.sip
331-
%Include geometry/qgslinestringv2.sip
332-
%Include geometry/qgsmulticurvev2.sip
333-
%Include geometry/qgsmultilinestringv2.sip
334-
%Include geometry/qgsmultipointv2.sip
335-
%Include geometry/qgsmultipolygonv2.sip
336-
%Include geometry/qgsmultisurfacev2.sip
331+
%Include geometry/qgslinestring.sip
332+
%Include geometry/qgsmulticurve.sip
333+
%Include geometry/qgsmultilinestring.sip
334+
%Include geometry/qgsmultipoint.sip
335+
%Include geometry/qgsmultipolygon.sip
336+
%Include geometry/qgsmultisurface.sip
337337
%Include geometry/qgspointv2.sip
338-
%Include geometry/qgspolygonv2.sip
339-
%Include geometry/qgssurfacev2.sip
338+
%Include geometry/qgspolygon.sip
339+
%Include geometry/qgssurface.sip
340340
%Include geometry/qgswkbtypes.sip
341341
%Include geometry/qgswkbptr.sip

‎python/core/geometry/qgsabstractgeometryv2.sip renamed to ‎python/core/geometry/qgsabstractgeometry.sip

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
struct QgsVertexId
22
{
33
%TypeHeaderCode
4-
#include <qgsabstractgeometryv2.h>
4+
#include <qgsabstractgeometry.h>
55
%End
66

77
enum VertexType
@@ -35,8 +35,8 @@ struct QgsVertexId
3535
class QgsAbstractGeometry
3636
{
3737
%TypeHeaderCode
38-
#include <qgsabstractgeometryv2.h>
39-
#include <qgslinestringv2.h>
38+
#include <qgsabstractgeometry.h>
39+
#include <qgslinestring.h>
4040
%End
4141

4242
%ConvertToSubClassCode

‎python/core/geometry/qgscircularstringv2.sip renamed to ‎python/core/geometry/qgscircularstring.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsCircularString: public QgsCurve
22
{
33
%TypeHeaderCode
4-
#include <qgscircularstringv2.h>
4+
#include <qgscircularstring.h>
55
%End
66

77
public:

‎python/core/geometry/qgscompoundcurvev2.sip renamed to ‎python/core/geometry/qgscompoundcurve.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsCompoundCurve: public QgsCurve
22
{
33
%TypeHeaderCode
4-
#include <qgscompoundcurvev2.h>
4+
#include <qgscompoundcurve.h>
55
%End
66

77
public:

‎python/core/geometry/qgscurvev2.sip renamed to ‎python/core/geometry/qgscurve.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsCurve: public QgsAbstractGeometry
22
{
33
%TypeHeaderCode
4-
#include <qgscurvev2.h>
4+
#include <qgscurve.h>
55
%End
66
public:
77
QgsCurve();

‎python/core/geometry/qgscurvepolygonv2.sip renamed to ‎python/core/geometry/qgscurvepolygon.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsCurvePolygon: public QgsSurface
22
{
33
%TypeHeaderCode
4-
#include <qgscurvepolygonv2.h>
4+
#include <qgscurvepolygon.h>
55
%End
66

77
public:

‎python/core/geometry/qgsgeometrycollectionv2.sip renamed to ‎python/core/geometry/qgsgeometrycollection.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsGeometryCollection: public QgsAbstractGeometry
22
{
33
%TypeHeaderCode
4-
#include <qgsgeometrycollectionv2.h>
4+
#include <qgsgeometrycollection.h>
55
%End
66

77
public:

‎python/core/geometry/qgslinestringv2.sip renamed to ‎python/core/geometry/qgslinestring.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
class QgsLineString: public QgsCurve
77
{
88
%TypeHeaderCode
9-
#include <qgslinestringv2.h>
9+
#include <qgslinestring.h>
1010
%End
1111

1212
public:

‎python/core/geometry/qgsmulticurvev2.sip renamed to ‎python/core/geometry/qgsmulticurve.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsMultiCurve: public QgsGeometryCollection
22
{
33
%TypeHeaderCode
4-
#include <qgsmulticurvev2.h>
4+
#include <qgsmulticurve.h>
55
%End
66

77
public:

‎python/core/geometry/qgsmultilinestringv2.sip renamed to ‎python/core/geometry/qgsmultilinestring.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsMultiLineString: public QgsMultiCurve
22
{
33
%TypeHeaderCode
4-
#include <qgsmultilinestringv2.h>
4+
#include <qgsmultilinestring.h>
55
%End
66

77
public:

‎python/core/geometry/qgsmultipointv2.sip renamed to ‎python/core/geometry/qgsmultipoint.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsMultiPointV2: public QgsGeometryCollection
22
{
33
%TypeHeaderCode
4-
#include <qgsmultipointv2.h>
4+
#include <qgsmultipoint.h>
55
%End
66
public:
77
virtual QString geometryType() const;

‎python/core/geometry/qgsmultipolygonv2.sip renamed to ‎python/core/geometry/qgsmultipolygon.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsMultiPolygonV2: public QgsMultiSurface
22
{
33
%TypeHeaderCode
4-
#include <qgsmultipolygonv2.h>
4+
#include <qgsmultipolygon.h>
55
%End
66
public:
77
virtual QString geometryType() const;

‎python/core/geometry/qgsmultisurfacev2.sip renamed to ‎python/core/geometry/qgsmultisurface.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsMultiSurface: public QgsGeometryCollection
22
{
33
%TypeHeaderCode
4-
#include <qgsmultisurfacev2.h>
4+
#include <qgsmultisurface.h>
55
%End
66
public:
77
virtual QString geometryType() const;

‎python/core/geometry/qgspolygonv2.sip renamed to ‎python/core/geometry/qgspolygon.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsPolygonV2: public QgsCurvePolygon
22
{
33
%TypeHeaderCode
4-
#include <qgspolygonv2.h>
4+
#include <qgspolygon.h>
55
%End
66

77
public:

‎python/core/geometry/qgssurfacev2.sip renamed to ‎python/core/geometry/qgssurface.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsSurface: public QgsAbstractGeometry
22
{
33
%TypeHeaderCode
4-
#include <qgssurfacev2.h>
4+
#include <qgssurface.h>
55
%End
66

77
public:

‎python/core/qgsdiagramrendererv2.sip renamed to ‎python/core/qgsdiagramrenderer.sip

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
class QgsDiagramLayerSettings
1010
{
1111
%TypeHeaderCode
12-
#include <qgsdiagramrendererv2.h>
12+
#include <qgsdiagramrenderer.h>
1313
%End
1414

1515
public:
@@ -248,7 +248,7 @@ class QgsDiagramLayerSettings
248248
class QgsDiagramSettings
249249
{
250250
%TypeHeaderCode
251-
#include <qgsdiagramrendererv2.h>
251+
#include <qgsdiagramrenderer.h>
252252
%End
253253
public:
254254

@@ -335,7 +335,7 @@ class QgsDiagramSettings
335335
class QgsDiagramInterpolationSettings
336336
{
337337
%TypeHeaderCode
338-
#include <qgsdiagramrendererv2.h>
338+
#include <qgsdiagramrenderer.h>
339339
%End
340340
public:
341341
QSizeF lowerSize;
@@ -357,7 +357,7 @@ class QgsDiagramInterpolationSettings
357357
class QgsDiagramRenderer
358358
{
359359
%TypeHeaderCode
360-
#include <qgsdiagramrendererv2.h>
360+
#include <qgsdiagramrenderer.h>
361361
%End
362362
public:
363363

@@ -477,7 +477,7 @@ class QgsDiagramRenderer
477477
class QgsSingleCategoryDiagramRenderer : QgsDiagramRenderer
478478
{
479479
%TypeHeaderCode
480-
#include <qgsdiagramrendererv2.h>
480+
#include <qgsdiagramrenderer.h>
481481
%End
482482

483483
public:
@@ -508,7 +508,7 @@ class QgsSingleCategoryDiagramRenderer : QgsDiagramRenderer
508508
class QgsLinearlyInterpolatedDiagramRenderer : QgsDiagramRenderer
509509
{
510510
%TypeHeaderCode
511-
#include <qgsdiagramrendererv2.h>
511+
#include <qgsdiagramrenderer.h>
512512
%End
513513

514514
public:

‎python/core/qgspallabeling.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class QgsPalLayerSettings
157157
{
158158
%TypeHeaderCode
159159
#include <qgspallabeling.h>
160-
#include <qgsdiagramrendererv2.h>
160+
#include <qgsdiagramrenderer.h>
161161
%End
162162
public:
163163
QgsPalLayerSettings();

‎python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip renamed to ‎python/core/symbology-ng/qgscategorizedsymbolrenderer.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsRendererCategory
22
{
33
%TypeHeaderCode
4-
#include <qgscategorizedsymbolrendererv2.h>
4+
#include <qgscategorizedsymbolrenderer.h>
55
%End
66
public:
77

@@ -40,7 +40,7 @@ typedef QList<QgsRendererCategory> QgsCategoryList;
4040
class QgsCategorizedSymbolRenderer : QgsFeatureRenderer
4141
{
4242
%TypeHeaderCode
43-
#include <qgscategorizedsymbolrendererv2.h>
43+
#include <qgscategorizedsymbolrenderer.h>
4444
%End
4545

4646
public:

‎python/core/symbology-ng/qgsellipsesymbollayerv2.sip renamed to ‎python/core/symbology-ng/qgsellipsesymbollayer.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsEllipseSymbolLayer : QgsMarkerSymbolLayer
22
{
33
%TypeHeaderCode
4-
#include <qgsellipsesymbollayerv2.h>
4+
#include <qgsellipsesymbollayer.h>
55
%End
66

77
public:

‎python/core/symbology-ng/qgsfillsymbollayerv2.sip renamed to ‎python/core/symbology-ng/qgsfillsymbollayer.sip

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class QgsSimpleFillSymbolLayer : QgsFillSymbolLayer
22
{
33
%TypeHeaderCode
4-
#include <qgsfillsymbollayerv2.h>
4+
#include <qgsfillsymbollayer.h>
55
%End
66

77
public:
@@ -114,7 +114,7 @@ class QgsSimpleFillSymbolLayer : QgsFillSymbolLayer
114114
class QgsGradientFillSymbolLayer : QgsFillSymbolLayer
115115
{
116116
%TypeHeaderCode
117-
#include <qgsfillsymbollayerv2.h>
117+
#include <qgsfillsymbollayer.h>
118118
%End
119119
public:
120120

@@ -236,7 +236,7 @@ class QgsGradientFillSymbolLayer : QgsFillSymbolLayer
236236
class QgsShapeburstFillSymbolLayer : QgsFillSymbolLayer
237237
{
238238
%TypeHeaderCode
239-
#include <qgsfillsymbollayerv2.h>
239+
#include <qgsfillsymbollayer.h>
240240
%End
241241
public:
242242

@@ -445,7 +445,7 @@ class QgsShapeburstFillSymbolLayer : QgsFillSymbolLayer
445445
class QgsImageFillSymbolLayer: QgsFillSymbolLayer
446446
{
447447
%TypeHeaderCode
448-
#include <qgsfillsymbollayerv2.h>
448+
#include <qgsfillsymbollayer.h>
449449
%End
450450

451451
public:
@@ -497,7 +497,7 @@ class QgsImageFillSymbolLayer: QgsFillSymbolLayer
497497
class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
498498
{
499499
%TypeHeaderCode
500-
#include <qgsfillsymbollayerv2.h>
500+
#include <qgsfillsymbollayer.h>
501501
%End
502502
public:
503503

@@ -663,7 +663,7 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
663663
class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
664664
{
665665
%TypeHeaderCode
666-
#include <qgsfillsymbollayerv2.h>
666+
#include <qgsfillsymbollayer.h>
667667
%End
668668

669669
public:
@@ -741,7 +741,7 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
741741
class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
742742
{
743743
%TypeHeaderCode
744-
#include <qgsfillsymbollayerv2.h>
744+
#include <qgsfillsymbollayer.h>
745745
%End
746746
public:
747747
QgsLinePatternFillSymbolLayer();
@@ -849,7 +849,7 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
849849
class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
850850
{
851851
%TypeHeaderCode
852-
#include <qgsfillsymbollayerv2.h>
852+
#include <qgsfillsymbollayer.h>
853853
%End
854854
public:
855855
QgsPointPatternFillSymbolLayer();
@@ -950,7 +950,7 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
950950
class QgsCentroidFillSymbolLayer : QgsFillSymbolLayer
951951
{
952952
%TypeHeaderCode
953-
#include <qgsfillsymbollayerv2.h>
953+
#include <qgsfillsymbollayer.h>
954954
%End
955955

956956
public:

0 commit comments

Comments
 (0)