Skip to content

Commit 275736d

Browse files
3nids3nids
committedAug 5, 2016
removed V2 from QgsSymbolV2*
·
ltr-3_40final-3_0_0
1 parent c16d139 commit 275736d

File tree

230 files changed

+2074
-2068
lines changed

Some content is hidden

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

230 files changed

+2074
-2068
lines changed
 

‎doc/api_break.dox

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,22 @@ 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>QgsColorButtonV2 <tr><td>QgsColorButton
27-
<tr><td>QgsSymbolLayerV2 <tr><td>QgsSymbolLayer
28-
<tr><td>QgsSymbolLayerV2AbstractMetadata <tr><td>QgsSymbolLayerAbstractMetadata
29-
<tr><td>QgsSymbolLayerV2Metadata <tr><td>QgsSymbolLayerMetadata
30-
<tr><td>QgsSymbolLayerV2Registry <tr><td>QgsSymbolLayerRegistry
31-
<tr><td>QgsSymbolLayerV2Utils <tr><td>QgsSymbolLayerUtils
32-
<tr><td>QgsSymbolLayerV2Widget <tr><td>QgsSymbolLayerWidget
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><th>QgsSymbolV2 <th>QgsSymbol
34+
<tr><td>QgsSymbolV2LegendNode <td>QgsSymbolLegendNode
35+
<tr><td>QgsSymbolV2LevelItem <td>QgsSymbolLevelItem
36+
<tr><td>QgsSymbolV2RenderContext <td>QgsSymbolRenderContext
37+
<tr><td>QgsSymbolV2SelectorDialog <td>QgsSymbolSelectorDialog
38+
<tr><td>QgsSymbolV2SelectorWidget <td>QgsSymbolSelectorWidget
3339
</table>
34-
40+
3541
\subsection qgis_api_break_3_0_removed_classes Removed Classes
3642

3743
<ul>
@@ -545,23 +551,23 @@ be returned instead of a null pointer if no transformation is required.</li>
545551
<li>Constructor variant with QgsMapRenderer has been removed. Use the variant with QgsMapSettings.</li>
546552
</ul>
547553

548-
\subsection qgis_api_break_3_0_QgsSymbolV2 QgsSymbolV2
554+
\subsection qgis_api_break_3_0_QgsSymbol QgsSymbol (renamed from QgsSymbolV2)
549555

550556
<ul>
551-
<li>The OutputUnit enum, including QgsSymbolV2::MM, QgsSymbolV2::MapUnit, QgsSymbolV2::Mixed, QgsSymbolV2::Pixel and QgsSymbolV2::Percentage has been moved to QgsUnitTypes
552-
and renamed to RenderUnit. QgsSymbolV2::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbolV2::OutputUnit
553-
parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
557+
<li>The OutputUnit enum, including QgsSymbol::MM, QgsSymbol::MapUnit, QgsSymbol::Mixed, QgsSymbol::Pixel and QgsSymbol::Percentage has been moved to QgsUnitTypes
558+
and renamed to RenderUnit. QgsSymbol::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbol::OutputUnit
559+
parameters or QgsSymbol::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
554560
<li>startRender() now accepts a QgsFields reference, not a pointer.</li>
555561
</ul>
556562

557563
\subsection qgis_api_break_3_0_QgsSymbolLayer QgsSymbolLayer (renamed from QgsSymbolLayerV2)
558564

559565
<ul>
560566
<li>The deprecated prepareExpressions( const QgsFields* fields, double scale = -1.0 ) method has been removed. Use
561-
the variant which takes QgsSymbolV2RenderContext instead.</li>
567+
the variant which takes QgsSymbolRenderContext instead.</li>
562568
</ul>
563569

564-
\subsection qgis_api_break_3_0_QgsSymbolV2RenderContext QgsSymbolV2RenderContext
570+
\subsection qgis_api_break_3_0_QgsSymbolRenderContext QgsSymbolRenderContext (renamed from QgsSymbolV2RenderContext)
565571

566572
<ul>
567573
<li>The constructor now accepts a QgsFields reference, not a pointer.</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.