Skip to content

Commit 1d21072

Browse files
m-kuhnm-kuhn
authoredOct 30, 2017
Merge pull request #5491 from m-kuhn/dropV2
Drop V2 suffix on all geometry classes
·
ltr-3_40final-3_0_0
2 parents 86d170b + d2c1011 commit 1d21072

File tree

171 files changed

+1226
-1208
lines changed

Some content is hidden

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

171 files changed

+1226
-1208
lines changed
 

‎doc/api_break.dox

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
6464
<caption id="renamed_classes">Renamed classes</caption>
6565
<tr><th>API 2.x<th>API 3.X
6666
<tr><td>QgisGui<td>QgsGuiUtils
67-
<tr><td>QgsAttributeAction<td>QgsActionManager
6867
<tr><td>QgsAbstractGeometryV2<td>QgsAbstractGeometry
68+
<tr><td>QgsArcProperter<td>QgsStrategy
69+
<tr><td>QgsAttributeAction<td>QgsActionManager
6970
<tr><td>QgsCategorizedSymbolRendererV2<td>QgsCategorizedSymbolRenderer
7071
<tr><td>QgsCategorizedSymbolRendererV2Model<td>QgsCategorizedSymbolRendererModel
7172
<tr><td>QgsCategorizedSymbolRendererV2ViewStyle<td>QgsCategorizedSymbolRendererViewStyle
@@ -86,6 +87,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
8687
<tr><td>QgsCurveV2<td>QgsCurve
8788
<tr><td>QgsDbFilterProxyModel<td>QgsDatabaseFilterProxyModel
8889
<tr><td>QgsDiagramRendererV2<td>QgsDiagramRenderer
90+
<tr><td>QgsDistanceArcProperter<td>QgsDistanceStrategy
8991
<tr><td>QgsDoubleBoxBarStyle<td>QgsDoubleBoxScaleBarRenderer
9092
<tr><td>QgsEditorWidgetV2<td>QgsEditorWidget
9193
<tr><td>QgsEllipseSymbolLayerV2<td>QgsEllipseSymbolLayer
@@ -104,6 +106,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
104106
<tr><td>QgsGraduatedSymbolRendererV2Model<td>QgsGraduatedSymbolRendererModel
105107
<tr><td>QgsGraduatedSymbolRendererV2ViewStyle<td>QgsGraduatedSymbolRendererViewStyle
106108
<tr><td>QgsGraduatedSymbolRendererV2Widget<td>QgsGraduatedSymbolRendererWidget
109+
<tr><td>QgsGraphArc<td>QgsGraphEdge
107110
<tr><td>QgsJSONExporter<td>QgsJsonExporter
108111
<tr><td>QgsJSONUtils<td>QgsJsonUtils
109112
<tr><td>QgsLabelingEngineV2<td>QgsLabelingEngine
@@ -118,11 +121,21 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
118121
<tr><td>QgsMarkerSymbolV2<td>QgsMarkerSymbol
119122
<tr><td>QgsMultiCurveV2<td>QgsMultiCurve
120123
<tr><td>QgsMultiLineStringV2<td>QgsMultiLineString
124+
<tr><td>QgsMultiPoint<td>QgsMultiPointXY
125+
<tr><td>QgsMultiPointV2<td>QgsMultiPoint
126+
<tr><td>QgsMultiPolygon<td>QgsPolygonXY
127+
<tr><td>QgsMultiPolygonV2<td>QgsPolygon
128+
<tr><td>QgsMultiPolyline<td>QgsPolylineXY
129+
<tr><td>QgsMultiPolylineV2<td>QgsPolyline
121130
<tr><td>QgsMultiSurfaceV2<td>QgsMultiSurface
122131
<tr><td>QgsNumericScaleBarStyle<td>QgsNumericScaleBarRenderer
123-
<tr><td>QgsPointV2<td>QgsPoint
124132
<tr><td>QgsPoint<td>QgsPointXY
125133
<tr><td>QgsPointSequenceV2<td>QgsPointSequence
134+
<tr><td>QgsPointV2<td>QgsPoint
135+
<tr><td>QgsPolygon<td>QgsPolygonXY
136+
<tr><td>QgsPolygonV2<td>QgsPolygon
137+
<tr><td>QgsPolyline<td>QgsPolylineXY
138+
<tr><td>QgsPolylineV2<td>QgsPolyline
126139
<tr><td>QgsProperty<td>QgsProjectProperty
127140
<tr><td>QgsPropertyKey<td>QgsProjectPropertyKey
128141
<tr><td>QgsPropertyValue<td>QgsProjectPropertyValue
@@ -175,6 +188,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
175188
<tr><td>QgsSymbolLayerV2Utils<td>QgsSymbolLayerUtils
176189
<tr><td>QgsSymbolLayerV2Widget<td>QgsSymbolLayerWidget
177190
<tr><td>QgsSymbolLevelsV2Dialog<td>QgsSymbolLevelsDialog
191+
<tr><td>QgsSymbolV2<td>QgsSymbol
178192
<tr><td>QgsSymbolV2LegendNode<td>QgsSymbolLegendNode
179193
<tr><td>QgsSymbolV2LevelItem<td>QgsSymbolLevelItem
180194
<tr><td>QgsSymbolV2RenderContext<td>QgsSymbolRenderContext
@@ -196,10 +210,6 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
196210
<tr><td>QgsVectorRandomColorRampV2<td>QgsLimitedRandomColorRamp
197211
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsLimitedRandomColorRampDialog
198212
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsLimitedRandomColorRampDialogBase
199-
<tr><td>QgsSymbolV2<td>QgsSymbol
200-
<tr><td>QgsArcProperter<td>QgsStrategy
201-
<tr><td>QgsDistanceArcProperter<td>QgsDistanceStrategy
202-
<tr><td>QgsGraphArc<td>QgsGraphEdge
203213
</table>
204214

205215
<table>
@@ -1301,8 +1311,8 @@ method if the geometry is not being modified.
13011311
empty geometry collection)
13021312
- wkbSize() and asWkb() has been replaced by exportToWkb(). WKB representation is no longer cached within QgsGeometry
13031313
- asGeos() has been replaced by exportToGeos(). GEOS representation is no longer cached within QgsGeometry
1304-
- int addPart( const QList<QgsPoint> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPoints
1305-
- int addPart( const QList<QgsPointV2> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPointsV2
1314+
- int addPart( const QList<QgsPoint> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPointsXY
1315+
- int addPart( const QList<QgsPointV2> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPoints
13061316
- static bool compare( const QgsPolyline& p1, const QgsPolyline& p2, double epsilon ) has been renamed to comparePolylines
13071317
- static bool compare( const QgsPolygon& p1, const QgsPolygon& p2, double epsilon ) has been renamed to comparePolygons
13081318
- static bool compare( const QgsMultiPolygon& p1, const QgsMultiPolygon& p2, double epsilon ) has been renamed to compareMultiPolygons
@@ -1314,6 +1324,11 @@ empty geometry collection)
13141324
- fromPolyline() now requires a list of QgsPoint objects, instead of QgsPointXY 2d points. A new method fromPolylineXY was
13151325
added which uses the old list of 2d QgsPointXY objects. Using the newer method with QgsPoint is greatly preferred, as it
13161326
maintains Z or M dimensions from the input points and is more efficient.
1327+
- fromPoint() was renamed to fromPointXY()
1328+
- fromMultiPoint() was renamed to fromMultiPointXY()
1329+
- fromMultiPolyline() was renamed to fromMultiPolylineXY()
1330+
- fromPolygon() was renamed to fromPolygonXY()
1331+
- fromMultiPolygon() was renamed to fromMultiPolygonXY()
13171332

13181333

13191334
QgsGeometryAnalyzer {#qgis_api_break_3_0_QgsGeometryAnalyzer}

‎python/core/geometry/qgsabstractgeometry.sip

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ class QgsAbstractGeometry
3535
sipType = sipType_QgsCompoundCurve;
3636
else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != nullptr )
3737
sipType = sipType_QgsTriangle;
38-
else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != nullptr )
39-
sipType = sipType_QgsPolygonV2;
38+
else if ( qgsgeometry_cast<QgsPolygon *>( sipCpp ) != nullptr )
39+
sipType = sipType_QgsPolygon;
4040
else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != nullptr )
4141
sipType = sipType_QgsCurvePolygon;
42-
else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != nullptr )
43-
sipType = sipType_QgsMultiPointV2;
42+
else if ( qgsgeometry_cast<QgsMultiPoint *>( sipCpp ) != nullptr )
43+
sipType = sipType_QgsMultiPoint;
4444
else if ( qgsgeometry_cast<QgsMultiLineString *>( sipCpp ) != nullptr )
4545
sipType = sipType_QgsMultiLineString;
46-
else if ( qgsgeometry_cast<QgsMultiPolygonV2 *>( sipCpp ) != nullptr )
47-
sipType = sipType_QgsMultiPolygonV2;
46+
else if ( qgsgeometry_cast<QgsMultiPolygon *>( sipCpp ) != nullptr )
47+
sipType = sipType_QgsMultiPolygon;
4848
else if ( qgsgeometry_cast<QgsMultiSurface *>( sipCpp ) != nullptr )
4949
sipType = sipType_QgsMultiSurface;
5050
else if ( qgsgeometry_cast<QgsMultiCurve *>( sipCpp ) != nullptr )
@@ -396,8 +396,8 @@ Returns the centroid of the geometry
396396
virtual QgsAbstractGeometry *toCurveType() const = 0 /Factory/;
397397
%Docstring
398398
Returns the geometry converted to the more generic curve type.
399-
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygonV2 -> QgsCurvePolygon,
400-
QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
399+
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygon -> QgsCurvePolygon,
400+
QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygon -> QgsMultiSurface
401401
:return: the converted geometry. Caller takes ownership
402402
:rtype: QgsAbstractGeometry
403403
%End

0 commit comments

Comments
 (0)
Please sign in to comment.