Skip to content

Commit ab57541

Browse files
authoredAug 5, 2016
Merge pull request #3355 from 3nids/V2removal
remove V2 in some classes
2 parents 19ab72c + acbf5cd commit ab57541

File tree

289 files changed

+4554
-4532
lines changed

Some content is hidden

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

289 files changed

+4554
-4532
lines changed
 

‎doc/api_break.dox

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,28 @@ This page tries to maintain a list with incompatible changes that happened in pr
1818

1919
\section qgis_api_break_3_0 QGIS 3.0
2020

21+
\subsection qgis_api_break_3_0_renamed_classes Renamed Classes
22+
23+
<table>
24+
<caption id="renamed_classes">Renamed classes</caption>
25+
<tr><th>API 2.x <th>API 3.X
26+
<tr><td>QgsColorButtonV2 <td>QgsColorButton
27+
<tr><td>QgsSymbolLayerV2 <td>QgsSymbolLayer
28+
<tr><td>QgsSymbolLayerV2AbstractMetadata <td>QgsSymbolLayerAbstractMetadata
29+
<tr><td>QgsSymbolLayerV2Metadata <td>QgsSymbolLayerMetadata
30+
<tr><td>QgsSymbolLayerV2Registry <td>QgsSymbolLayerRegistry
31+
<tr><td>QgsSymbolLayerV2Utils <td>QgsSymbolLayerUtils
32+
<tr><td>QgsSymbolLayerV2Widget <td>QgsSymbolLayerWidget
33+
<tr><td>QgsSymbolLevelsV2Dialog <td>QgsSymbolLevelsDialog
34+
<tr><td>QgsSymbologyV2Conversion <td>QgsSymbologyConversion
35+
<tr><th>QgsSymbolV2 <th>QgsSymbol
36+
<tr><td>QgsSymbolV2LegendNode <td>QgsSymbolLegendNode
37+
<tr><td>QgsSymbolV2LevelItem <td>QgsSymbolLevelItem
38+
<tr><td>QgsSymbolV2RenderContext <td>QgsSymbolRenderContext
39+
<tr><td>QgsSymbolV2SelectorDialog <td>QgsSymbolSelectorDialog
40+
<tr><td>QgsSymbolV2SelectorWidget <td>QgsSymbolSelectorWidget
41+
</table>
42+
2143
\subsection qgis_api_break_3_0_removed_classes Removed Classes
2244

2345
<ul>
@@ -531,30 +553,30 @@ be returned instead of a null pointer if no transformation is required.</li>
531553
<li>Constructor variant with QgsMapRenderer has been removed. Use the variant with QgsMapSettings.</li>
532554
</ul>
533555

534-
\subsection qgis_api_break_3_0_QgsSymbolV2 QgsSymbolV2
556+
\subsection qgis_api_break_3_0_QgsSymbol QgsSymbol (renamed from QgsSymbolV2)
535557

536558
<ul>
537-
<li>The OutputUnit enum, including QgsSymbolV2::MM, QgsSymbolV2::MapUnit, QgsSymbolV2::Mixed, QgsSymbolV2::Pixel and QgsSymbolV2::Percentage has been moved to QgsUnitTypes
538-
and renamed to RenderUnit. QgsSymbolV2::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbolV2::OutputUnit
539-
parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
559+
<li>The OutputUnit enum, including QgsSymbol::MM, QgsSymbol::MapUnit, QgsSymbol::Mixed, QgsSymbol::Pixel and QgsSymbol::Percentage has been moved to QgsUnitTypes
560+
and renamed to RenderUnit. QgsSymbol::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbol::OutputUnit
561+
parameters or QgsSymbol::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
540562
<li>startRender() now accepts a QgsFields reference, not a pointer.</li>
541563
</ul>
542564

543-
\subsection qgis_api_break_3_0_QgsSymbolLayerV2 QgsSymbolLayerV2
565+
\subsection qgis_api_break_3_0_QgsSymbolLayer QgsSymbolLayer (renamed from QgsSymbolLayerV2)
544566

545567
<ul>
546568
<li>The deprecated prepareExpressions( const QgsFields* fields, double scale = -1.0 ) method has been removed. Use
547-
the variant which takes QgsSymbolV2RenderContext instead.</li>
569+
the variant which takes QgsSymbolRenderContext instead.</li>
548570
</ul>
549571

550-
\subsection qgis_api_break_3_0_QgsSymbolV2RenderContext QgsSymbolV2RenderContext
572+
\subsection qgis_api_break_3_0_QgsSymbolRenderContext QgsSymbolRenderContext (renamed from QgsSymbolV2RenderContext)
551573

552574
<ul>
553575
<li>The constructor now accepts a QgsFields reference, not a pointer.</li>
554576
<li>fields() now returns a QgsFields value, not a pointer.</li>
555577
</ul>
556578

557-
\subsection qgis_api_break_3_0_QgsSymbolLayerV2Utils QgsSymbolLayerV2Utils
579+
\subsection qgis_api_break_3_0_QgsSymbolLayerUtils QgsSymbolLayerUtils (renamed from QgsSymbolLayerUtilsV2)
558580

559581
<ul>
560582
<li>encodeOutputUnit() and decodeOutputUnit() were removed. QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should be used instead.</li>

‎python/core/composer/qgscomposerlegenditem.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ class QgsComposerSymbolV2Item: QgsComposerLegendItem
5959
virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true );
6060

6161
/** Set symbol (takes ownership)*/
62-
void setSymbolV2( QgsSymbolV2* s /Transfer/ );
63-
QgsSymbolV2* symbolV2();
62+
void setSymbolV2( QgsSymbol* s /Transfer/ );
63+
QgsSymbol* symbolV2();
6464

6565
ItemType itemType() const;
6666
};

0 commit comments

Comments
 (0)
Please sign in to comment.