Skip to content

Commit f38856e

Browse files
jef-njef-n
authoredAug 10, 2016
Merge pull request #3359 from jef-n/api-updates-v2
Replace V2 in API
·
ltr-3_40final-3_0_0
2 parents 4267a19 + c24692c commit f38856e

File tree

624 files changed

+8891
-9676
lines changed

Some content is hidden

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

624 files changed

+8891
-9676
lines changed
 

‎doc/api_break.dox

Lines changed: 148 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,146 @@ This page tries to maintain a list with incompatible changes that happened in pr
2222

2323
<table>
2424
<caption id="renamed_classes">Renamed classes</caption>
25-
<tr><th>API 2.x <th>API 3.X
26-
<tr><td>QgsAttributeAction <td>QgsActionManager
27-
<tr><td>QgsColorButtonV2 <td>QgsColorButton
28-
<tr><td>QgsSymbolLayerV2 <td>QgsSymbolLayer
29-
<tr><td>QgsSymbolLayerV2AbstractMetadata <td>QgsSymbolLayerAbstractMetadata
30-
<tr><td>QgsSymbolLayerV2Metadata <td>QgsSymbolLayerMetadata
31-
<tr><td>QgsSymbolLayerV2Registry <td>QgsSymbolLayerRegistry
32-
<tr><td>QgsSymbolLayerV2Utils <td>QgsSymbolLayerUtils
33-
<tr><td>QgsSymbolLayerV2Widget <td>QgsSymbolLayerWidget
34-
<tr><td>QgsSymbolLevelsV2Dialog <td>QgsSymbolLevelsDialog
35-
<tr><td>QgsSymbologyV2Conversion <td>QgsSymbologyConversion
36-
<tr><th>QgsSymbolV2 <th>QgsSymbol
37-
<tr><td>QgsSymbolV2LegendNode <td>QgsSymbolLegendNode
38-
<tr><td>QgsSymbolV2LevelItem <td>QgsSymbolLevelItem
39-
<tr><td>QgsSymbolV2RenderContext <td>QgsSymbolRenderContext
40-
<tr><td>QgsSymbolV2SelectorDialog <td>QgsSymbolSelectorDialog
41-
<tr><td>QgsSymbolV2SelectorWidget <td>QgsSymbolSelectorWidget
25+
<tr><th>API 2.x<th>API 3.X
26+
<tr><td>QgsAttributeAction<td>QgsActionManager
27+
<tr><td>QgsAbstractGeometryV2<td>QgsAbstractGeometry
28+
<tr><td>QgsCategorizedSymbolRendererV2<td>QgsCategorizedSymbolRenderer
29+
<tr><td>QgsCategorizedSymbolRendererV2Model<td>QgsCategorizedSymbolRendererModel
30+
<tr><td>QgsCategorizedSymbolRendererV2ViewStyle<td>QgsCategorizedSymbolRendererViewStyle
31+
<tr><td>QgsCategorizedSymbolRendererV2Widget<td>QgsCategorizedSymbolRendererWidget
32+
<tr><td>QgsCentroidFillSymbolLayerV2<td>QgsCentroidFillSymbolLayer
33+
<tr><td>QgsCentroidFillSymbolLayerV2Widget<td>QgsCentroidFillSymbolLayerWidget
34+
<tr><td>QgsCircularStringV2<td>QgsCircularString
35+
<tr><td>QgsColorButtonV2<td>QgsColorButton
36+
<tr><td>QgsComposerSymbolV2Item<td>QgsComposerSymbolItem
37+
<tr><td>QgsComposerTableAvailableSortProxyModelV2<td>QgsComposerTableAvailableSortProxyModel
38+
<tr><td>QgsCompoundCurveV2<td>QgsCompoundCurve
39+
<tr><td>QgsCoordinateSequenceV2<td>QgsCoordinateSequence
40+
<tr><td>QgsCptCityColorRampV2<td>QgsCptCityColorRamp
41+
<tr><td>QgsCptCityColorRampV2Dialog<td>QgsCptCityColorRampDialog
42+
<tr><td>QgsCptCityColorRampV2DialogBase<td>QgsCptCityColorRampDialogBase
43+
<tr><td>QgsCurvePolygonV2<td>QgsCurvePolygon
44+
<tr><td>QgsCurveV2<td>QgsCurve
45+
<tr><td>QgsDiagramRendererV2<td>QgsDiagramRenderer
46+
<tr><td>QgsEditorWidgetV2<td>QgsEditorWidget
47+
<tr><td>QgsEllipseSymbolLayerV2<td>QgsEllipseSymbolLayer
48+
<tr><td>QgsEllipseSymbolLayerV2Widget<td>QgsEllipseSymbolLayerWidget
49+
<tr><td>QgsFeatureRendererV2<td>QgsFeatureRenderer
50+
<tr><td>QgsFillSymbolLayerV2<td>QgsFillSymbolLayer
51+
<tr><td>QgsFillSymbolV2<td>QgsFillSymbol
52+
<tr><td>QgsFontMarkerSymbolLayerV2<td>QgsFontMarkerSymbolLayer
53+
<tr><td>QgsFontMarkerSymbolLayerV2Widget<td>QgsFontMarkerSymbolLayerWidget
54+
<tr><td>QgsGeometryCollectionV2<td>QgsGeometryCollection
55+
<tr><td>QgsGeometryGeneratorSymbolLayerV2<td>QgsGeometryGeneratorSymbolLayer
56+
<tr><td>QgsGradientFillSymbolLayerV2<td>QgsGradientFillSymbolLayer
57+
<tr><td>QgsGradientFillSymbolLayerV2Widget<td>QgsGradientFillSymbolLayerWidget
58+
<tr><td>QgsGraduatedSymbolRendererV2<td>QgsGraduatedSymbolRenderer
59+
<tr><td>QgsGraduatedSymbolRendererV2Model<td>QgsGraduatedSymbolRendererModel
60+
<tr><td>QgsGraduatedSymbolRendererV2ViewStyle<td>QgsGraduatedSymbolRendererViewStyle
61+
<tr><td>QgsGraduatedSymbolRendererV2Widget<td>QgsGraduatedSymbolRendererWidget
62+
<tr><td>QgsLabelingEngineV2<td>QgsLabelingEngine
63+
<tr><td>QgsLegendSymbolItemV2<td>QgsLegendSymbolItem
64+
<tr><td>QgsLineStringV2<td>QgsLineString
65+
<tr><td>QgsLineSymbolLayerV2<td>QgsLineSymbolLayer
66+
<tr><td>QgsLineSymbolV2<td>QgsLineSymbol
67+
<tr><td>QgsMarkerLineSymbolLayerV2<td>QgsMarkerLineSymbolLayer
68+
<tr><td>QgsMarkerLineSymbolLayerV2Widget<td>QgsMarkerLineSymbolLayerWidget
69+
<tr><td>QgsMarkerSymbolLayerV2<td>QgsMarkerSymbolLayer
70+
<tr><td>QgsMarkerSymbolV2<td>QgsMarkerSymbol
71+
<tr><td>QgsMultiCurveV2<td>QgsMultiCurve
72+
<tr><td>QgsMultiLineStringV2<td>QgsMultiLineString
73+
<tr><td>QgsMultiSurfaceV2<td>QgsMultiSurface
74+
<tr><td>QgsPointSequenceV2<td>QgsPointSequence
75+
<tr><td>QgsRandomColorsV2<td>QgsRandomColors
76+
<tr><td>QgsRendererCategoryV2<td>QgsRendererCategory
77+
<tr><td>QgsRendererRangeV2<td>QgsRendererRange
78+
<tr><td>QgsRendererRangeV2LabelFomat<td>QgsRendererRangeLabelFomat
79+
<tr><td>QgsRendererRangeV2LabelFormat<td>QgsRendererRangeLabelFormat
80+
<tr><td>QgsRendererV2<td>QgsRenderer
81+
<tr><td>QgsRendererV2AbstractMetadata<td>QgsRendererAbstractMetadata
82+
<tr><td>QgsRendererV2CreateFromSldFunc<td>QgsRendererCreateFromSldFunc
83+
<tr><td>QgsRendererV2CreateFunc<td>QgsRendererCreateFunc
84+
<tr><td>QgsRendererV2DataDefinedMenus<td>QgsRendererDataDefinedMenus
85+
<tr><td>QgsRendererV2Metadata<td>QgsRendererMetadata
86+
<tr><td>QgsRendererV2PropertiesDialog<td>QgsRendererPropertiesDialog
87+
<tr><td>QgsRendererV2PropsDialogBase<td>QgsRendererPropsDialogBase
88+
<tr><td>QgsRendererV2Registry<td>QgsRendererRegistry
89+
<tr><td>QgsRendererV2Widget<td>QgsRendererWidget
90+
<tr><td>QgsRendererV2WidgetFunc<td>QgsRendererWidgetFunc
91+
<tr><td>QgsRingSequenceV2<td>QgsRingSequence
92+
<tr><td>QgsRuleBasedRendererV2<td>QgsRuleBasedRenderer
93+
<tr><td>QgsRuleBasedRendererV2Count<td>QgsRuleBasedRendererCount
94+
<tr><td>QgsRuleBasedRendererV2Model<td>QgsRuleBasedRendererModel
95+
<tr><td>QgsRuleBasedRendererV2Widget<td>QgsRuleBasedRendererWidget
96+
<tr><td>QgsShapeburstFillSymbolLayerV2<td>QgsShapeburstFillSymbolLayer
97+
<tr><td>QgsShapeburstFillSymbolLayerV2Widget<td>QgsShapeburstFillSymbolLayerWidget
98+
<tr><td>QgsSimpleFillSymbolLayerV2<td>QgsSimpleFillSymbolLayer
99+
<tr><td>QgsSimpleFillSymbolLayerV2Widget<td>QgsSimpleFillSymbolLayerWidget
100+
<tr><td>QgsSimpleLineSymbolLayerV2<td>QgsSimpleLineSymbolLayer
101+
<tr><td>QgsSimpleLineSymbolLayerV2Widget<td>QgsSimpleLineSymbolLayerWidget
102+
<tr><td>QgsSimpleMarkerSymbolLayerV2<td>QgsSimpleMarkerSymbolLayer
103+
<tr><td>QgsSimpleMarkerSymbolLayerV2Widget<td>QgsSimpleMarkerSymbolLayerWidget
104+
<tr><td>QgsSingleSymbolRendererV2<td>QgsSingleSymbolRenderer
105+
<tr><td>QgsSingleSymbolRendererV2Widget<td>QgsSingleSymbolRendererWidget
106+
<tr><td>QgsStyleV2<td>QgsStyle
107+
<tr><td>QgsStyleV2ExportImportDialog<td>QgsStyleExportImportDialog
108+
<tr><td>QgsStyleV2ExportImportDialogBase<td>QgsStyleExportImportDialogBase
109+
<tr><td>QgsStyleV2GroupSelectionDialog<td>QgsStyleGroupSelectionDialog
110+
<tr><td>QgsStyleV2ManagerDialog<td>QgsStyleManagerDialog
111+
<tr><td>QgsStyleV2ManagerDialogBase<td>QgsStyleManagerDialogBase
112+
<tr><td>QgsSurfaceV2<td>QgsSurface
113+
<tr><td>QgsSvgMarkerSymbolLayerV2<td>QgsSvgMarkerSymbolLayer
114+
<tr><td>QgsSvgMarkerSymbolLayerV2Widget<td>QgsSvgMarkerSymbolLayerWidget
115+
<tr><td>QgsSymbolLayerV2<td>QgsSymbolLayer
116+
<tr><td>QgsSymbolLayerV2AbstractMetadata<td>QgsSymbolLayerAbstractMetadata
117+
<tr><td>QgsSymbolLayerV2Metadata<td>QgsSymbolLayerMetadata
118+
<tr><td>QgsSymbolLayerV2Registry<td>QgsSymbolLayerRegistry
119+
<tr><td>QgsSymbolLayerV2Utils<td>QgsSymbolLayerUtils
120+
<tr><td>QgsSymbolLayerV2Widget<td>QgsSymbolLayerWidget
121+
<tr><td>QgsSymbolLevelsV2Dialog<td>QgsSymbolLevelsDialog
122+
<tr><td>QgsSymbolV2LegendNode<td>QgsSymbolLegendNode
123+
<tr><td>QgsSymbolV2LevelItem<td>QgsSymbolLevelItem
124+
<tr><td>QgsSymbolV2RenderContext<td>QgsSymbolRenderContext
125+
<tr><td>QgsSymbolV2SelectorDialog<td>QgsSymbolSelectorDialog
126+
<tr><td>QgsSymbolV2SelectorWidget<td>QgsSymbolSelectorWidget
127+
<tr><td>QgsSymbologyV2Conversion<td>QgsSymbologyConversion
128+
<tr><td>QgsVectorColorBrewerColorRampV2<td>QgsVectorColorBrewerColorRamp
129+
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsVectorColorBrewerColorRampDialog
130+
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsVectorColorBrewerColorRampDialogBase
131+
<tr><td>QgsVectorColorRampV2<td>QgsVectorColorRamp
132+
<tr><td>QgsVectorColorRampV2Map<td>QgsVectorColorRampMap
133+
<tr><td>QgsVectorGradientColorRampV2<td>QgsVectorGradientColorRamp
134+
<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsVectorGradientColorRampDialog
135+
<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsVectorGradientColorRampDialogBase
136+
<tr><td>QgsVectorGradientRampV2<td>QgsVectorGradientRamp
137+
<tr><td>QgsVectorLayersetRendererV2<td>QgsVectorLayersetRenderer
138+
<tr><td>QgsVectorRandomColorRampV2<td>QgsVectorRandomColorRamp
139+
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsVectorRandomColorRampDialog
140+
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsVectorRandomColorRampDialogBase
141+
<tr><th>QgsSymbolV2<th>QgsSymbol
142+
</table>
143+
144+
<table>
145+
<caption id="renamed_enum_values">Renamed enum values</caption>
146+
<tr><th>class</th><th>API 2.x<th>API 3.X
147+
<tr><td>QgsLayerTreeModelLegendNode<td>SymbolV2LegacyRuleKeyRole<td>SymbolLegacyRuleKeyRole
148+
<tr><td>QgsVectorLayer<td>EditorWidgetV2<td>EditorWidget
149+
</table>
150+
151+
<table>
152+
<caption id="renamed_methods">Renamed method names</caption>
153+
<tr><th>class</th><th>API 2.x<th>API 3.X
154+
<tr><td>QgsApplication<td>defaultStyleV2Path<td>defaultStylePath
155+
<tr><td>QgsApplication<td>userStyleV2Path<td>userStylePath
156+
<tr><td>QgsComposerShape<td>setUseSymbolV2<td>setUseSymbol
157+
<tr><td>QgsSymbolLayerUtils<td>createSymbolLayerV2ListFromSld<td>createSymbolLayerListFromSld
158+
<tr><td>QgsVectorLayer<td>editorWidgetV2Config<td>editorWidgetConfig
159+
<tr><td>QgsVectorLayer<td>editorWidgetV2Text<td>editorWidgetText
160+
<tr><td>QgsVectorLayer<td>editorWidgetV2Type<td>editorWidgetType
161+
<tr><td>QgsVectorLayer<td>deleteVertexV2<td>deleteVertex
162+
<tr><td>QgsVectorLayer<td>rendererV2<td>renderer
163+
<tr><td>QgsVectorLayerEditUtils<td>deleteVertexV2<td>deleteVertex
164+
<tr><td>QgsComposerSymbolItem<td>symbolV2<td>symbol
42165
</table>
43166

44167
\subsection qgis_api_break_3_0_removed_classes Removed Classes
@@ -56,6 +179,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
56179
<li>QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.</li>
57180
<li>QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.</li>
58181
<li>QgsRendererV2DataDefinedMenus was removed. Use QgsDataDefinedButton instead.</li>
182+
<li>QgsLegacyHelpers.</li>
59183
</ul>
60184

61185
\subsection qgis_api_break_3_0_global General changes
@@ -713,6 +837,13 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.</li>
713837
<li>commitErrors() now returns an object, rather than a reference. This has no effect on PyQGIS code.</li>
714838
<li>subsetString() was made const. This has no effect on PyQGIS code, but c++ code implementing derived layer classes will need to update the signature of this method to match.</li>
715839
<li>label(), enableLabels(), hasLabelsEnabled(), drawLabels() have been removed. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
840+
<li>Signal layerDeleted() has been removed. Replaced by Qt signal destroyed().</li>
841+
<li>Deprecated editor widget methods and enums and structs: struct RangeData, enum FeatureFormSuppress, enum EditType, addAttributeEditorWidget(), editorWidgetV2(), editorWidgetConfig(), attributeEditorElements(), editType(), setEditType(), editorLayout(), setEditorLayout, setEditorWidgetV2Config(), setCheckedState(), editForm(), setEditForm(), featureFormSuppress(), setFeatureFormSuppress(), editFormInit(), setEditFormInit(), valueMap(), range(), dateFormat(), fieldEditable(), labelOnTop(), setFieldEditable() and setLabelOnTop(). Use editFormConfig()</li>
842+
<li>select() replaced by selectByRect()
843+
<li>setSelectedFeatures() replaced by selectByIds()
844+
<li>applyNamedStyle() replaced by applyNamedStyle()
845+
<li>isReadOnly() use readOnly()
846+
<li>Signal changeAttributeValue()
716847
</ul>
717848

718849
\subsection qgis_api_break_3_0_QgsVectorLayerEditBuffer QgsVectorLayerEditBuffer

‎python/core/composer/qgscomposerarrow.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ class QgsComposerArrow: QgsComposerItem
149149
* @see lineSymbol
150150
* @note added in 2.5
151151
*/
152-
void setLineSymbol( QgsLineSymbolV2* symbol /Transfer/ );
152+
void setLineSymbol( QgsLineSymbol* symbol /Transfer/ );
153153

154154
/** Returns the line symbol used for drawing the line portion of the arrow
155155
* @returns line symbol
156156
* @see setLineSymbol
157157
* @note added in 2.5
158158
*/
159-
QgsLineSymbolV2* lineSymbol();
159+
QgsLineSymbol* lineSymbol();
160160

161161
/** Returns marker mode, which controls how the arrow endpoints are drawn
162162
* @returns marker mode

0 commit comments

Comments
 (0)