Skip to content

Commit c16d139

Browse files
3nids3nids
committed
removed V2 from QgsSymbolLayerV2*
1 parent 19ab72c commit c16d139

File tree

165 files changed

+2558
-2544
lines changed

Some content is hidden

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

165 files changed

+2558
-2544
lines changed

‎doc/api_break.dox

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,20 @@ 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 <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
33+
</table>
34+
2135
\subsection qgis_api_break_3_0_removed_classes Removed Classes
2236

2337
<ul>
@@ -540,7 +554,7 @@ parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::Rend
540554
<li>startRender() now accepts a QgsFields reference, not a pointer.</li>
541555
</ul>
542556

543-
\subsection qgis_api_break_3_0_QgsSymbolLayerV2 QgsSymbolLayerV2
557+
\subsection qgis_api_break_3_0_QgsSymbolLayer QgsSymbolLayer (renamed from QgsSymbolLayerV2)
544558

545559
<ul>
546560
<li>The deprecated prepareExpressions( const QgsFields* fields, double scale = -1.0 ) method has been removed. Use
@@ -554,7 +568,7 @@ the variant which takes QgsSymbolV2RenderContext instead.</li>
554568
<li>fields() now returns a QgsFields value, not a pointer.</li>
555569
</ul>
556570

557-
\subsection qgis_api_break_3_0_QgsSymbolLayerV2Utils QgsSymbolLayerV2Utils
571+
\subsection qgis_api_break_3_0_QgsSymbolLayerUtils QgsSymbolLayerUtils (renamed from QgsSymbolLayerUtilsV2)
558572

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

‎python/core/core.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,9 @@
312312
%Include symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
313313
%Include symbology-ng/qgslinesymbollayerv2.sip
314314
%Include symbology-ng/qgsmarkersymbollayerv2.sip
315-
%Include symbology-ng/qgssymbollayerv2.sip
316-
%Include symbology-ng/qgssymbollayerv2registry.sip
317-
%Include symbology-ng/qgssymbollayerv2utils.sip
315+
%Include symbology-ng/qgssymbollayer.sip
316+
%Include symbology-ng/qgssymbollayerregistry.sip
317+
%Include symbology-ng/qgssymbollayerutils.sip
318318
%Include symbology-ng/qgsvectorfieldsymbollayer.sip
319319
%Include symbology-ng/qgsarrowsymbollayer.sip
320320

‎python/core/symbology-ng/qgsarrowsymbollayer.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
2020
*
2121
* @return A new QgsArrowSymbolLayer
2222
*/
23-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
23+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
2424

2525
/** Virtual constructor */
2626
virtual QgsArrowSymbolLayer* clone() const /Factory/;

‎python/core/symbology-ng/qgsellipsesymbollayerv2.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
88
QgsEllipseSymbolLayerV2();
99
~QgsEllipseSymbolLayerV2();
1010

11-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
12-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
11+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
12+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
1313

1414
void renderPoint( QPointF point, QgsSymbolV2RenderContext& context );
1515
QString layerType() const;

‎python/core/symbology-ng/qgsfillsymbollayerv2.sip

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
1515

1616
// static stuff
1717

18-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
19-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
18+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
19+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
2020

2121
// implemented from base classes
2222

@@ -156,7 +156,7 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
156156

157157
// static stuff
158158

159-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
159+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
160160

161161
// implemented from base classes
162162

@@ -254,7 +254,7 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
254254

255255
// static stuff
256256

257-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
257+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
258258

259259
// implemented from base classes
260260

@@ -510,7 +510,7 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
510510
QgsRasterFillSymbolLayer( const QString& imageFilePath = QString() );
511511
~QgsRasterFillSymbolLayer();
512512

513-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() );
513+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() );
514514

515515
// implemented from base classes
516516
QString layerType() const;
@@ -671,8 +671,8 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
671671
QgsSVGFillSymbolLayer( const QByteArray& svgData, double width = 20, double rotation = 0.0 );
672672
~QgsSVGFillSymbolLayer();
673673

674-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
675-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
674+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
675+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
676676

677677
// implemented from base classes
678678

@@ -747,8 +747,8 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
747747
QgsLinePatternFillSymbolLayer();
748748
~QgsLinePatternFillSymbolLayer();
749749

750-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
751-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
750+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
751+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
752752

753753
QString layerType() const;
754754

@@ -855,8 +855,8 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
855855
QgsPointPatternFillSymbolLayer();
856856
~QgsPointPatternFillSymbolLayer();
857857

858-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
859-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
858+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
859+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
860860

861861
QString layerType() const;
862862

@@ -959,8 +959,8 @@ class QgsCentroidFillSymbolLayerV2 : QgsFillSymbolLayerV2
959959

960960
// static stuff
961961

962-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
963-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
962+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
963+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
964964

965965
// implemented from base classes
966966

‎python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
* (at your option) any later version. *
1313
* *
1414
***************************************************************************/
15-
class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayerV2
15+
class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayer
1616
{
1717
%TypeHeaderCode
1818
#include "qgsgeometrygeneratorsymbollayerv2.h"
1919
%End
2020
public:
21-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() );
21+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() );
2222

2323
QString layerType() const;
2424

@@ -42,7 +42,7 @@ class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayerV2
4242

4343
void stopRender( QgsSymbolV2RenderContext& context );
4444

45-
QgsSymbolLayerV2* clone() const;
45+
QgsSymbolLayer* clone() const;
4646

4747
QgsStringMap properties() const;
4848

‎python/core/symbology-ng/qgslinesymbollayerv2.sip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2
1111

1212
// static stuff
1313

14-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
15-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
14+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
15+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
1616

1717
// implemented from base classes
1818

@@ -123,7 +123,7 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
123123
*
124124
* @return A new MarkerLineSymbolLayerV2
125125
*/
126-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
126+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
127127

128128
/**
129129
* Create a new MarkerLineSymbolLayerV2 from SLD
@@ -132,7 +132,7 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
132132
*
133133
* @return A new MarkerLineSymbolLayerV2
134134
*/
135-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
135+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
136136

137137
// implemented from base classes
138138

‎python/core/symbology-ng/qgsmarkersymbollayerv2.sip

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,13 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
193193
* @param properties a property map containing symbol properties (see properties())
194194
* @returns new QgsSimpleMarkerSymbolLayerV2
195195
*/
196-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
196+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
197197

198198
/** Creates a new QgsSimpleMarkerSymbolLayerV2 from an SLD XML element.
199199
* @param element XML element containing SLD definition of symbol
200200
* @returns new QgsSimpleMarkerSymbolLayerV2
201201
*/
202-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
202+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
203203

204204
// reimplemented from base classes
205205

@@ -381,7 +381,7 @@ class QgsFilledMarkerSymbolLayer : QgsSimpleMarkerSymbolLayerBase
381381
* @param properties a property map containing symbol properties (see properties())
382382
* @returns new QgsFilledMarkerSymbolLayer
383383
*/
384-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
384+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
385385

386386
QString layerType() const;
387387
void startRender( QgsSymbolV2RenderContext& context );
@@ -417,8 +417,8 @@ class QgsSvgMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
417417

418418
// static stuff
419419

420-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
421-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
420+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
421+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
422422

423423
// implemented from base classes
424424

@@ -490,8 +490,8 @@ class QgsFontMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
490490

491491
// static stuff
492492

493-
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
494-
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
493+
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
494+
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
495495

496496
// implemented from base classes
497497

‎python/core/symbology-ng/qgssvgcache.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class QgsSvgCache : QObject
175175
QgsSvgCache( QObject * parent /TransferThis/ = 0 );
176176

177177
/** Creates new cache entry and returns pointer to it
178-
* @param file Absolute or relative path to SVG file. If the path is relative the file is searched by QgsSymbolLayerV2Utils::symbolNameToPath() in SVG paths.
178+
* @param file Absolute or relative path to SVG file. If the path is relative the file is searched by QgsSymbolLayerUtils::symbolNameToPath() in SVG paths.
179179
* in settings svg/searchPathsForSVG
180180
* @param size size of cached image
181181
* @param fill color of fill

‎python/core/symbology-ng/qgssymbollayerv2.sip renamed to ‎python/core/symbology-ng/qgssymbollayer.sip

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
class QgsSymbolLayerV2
1+
class QgsSymbolLayer
22
{
33
%TypeHeaderCode
4-
#include <qgssymbollayerv2.h>
4+
#include <qgssymbollayer.h>
55
#include <qgslinesymbollayerv2.h>
66
%End
77

@@ -70,7 +70,7 @@ class QgsSymbolLayerV2
7070

7171
public:
7272

73-
virtual ~QgsSymbolLayerV2();
73+
virtual ~QgsSymbolLayer();
7474

7575
/**
7676
* The fill color.
@@ -109,7 +109,7 @@ class QgsSymbolLayerV2
109109
/**
110110
* Shall be reimplemented by subclasses to create a deep copy of the instance.
111111
*/
112-
virtual QgsSymbolLayerV2* clone() const = 0 /Factory/;
112+
virtual QgsSymbolLayer* clone() const = 0 /Factory/;
113113

114114
virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;
115115

@@ -299,7 +299,7 @@ class QgsSymbolLayerV2
299299
void setPaintEffect( QgsPaintEffect* effect /Transfer/);
300300

301301
protected:
302-
QgsSymbolLayerV2( QgsSymbolV2::SymbolType type, bool locked = false );
302+
QgsSymbolLayer( QgsSymbolV2::SymbolType type, bool locked = false );
303303

304304
/** Prepares all data defined property expressions for evaluation. This should
305305
* be called prior to evaluating data defined properties.
@@ -329,13 +329,13 @@ class QgsSymbolLayerV2
329329
/** Copies all data defined properties of this layer to another symbol layer.
330330
* @param destLayer destination layer
331331
*/
332-
void copyDataDefinedProperties( QgsSymbolLayerV2* destLayer ) const;
332+
void copyDataDefinedProperties( QgsSymbolLayer* destLayer ) const;
333333

334334
/** Copies paint effect of this layer to another symbol layer
335335
* @param destLayer destination layer
336336
* @note added in QGIS 2.9
337337
*/
338-
void copyPaintEffect( QgsSymbolLayerV2* destLayer ) const;
338+
void copyPaintEffect( QgsSymbolLayer* destLayer ) const;
339339

340340
};
341341

@@ -345,10 +345,10 @@ class QgsSymbolLayerV2
345345
* \class QgsMarkerSymbolLayerV2
346346
* \brief Abstract base class for marker symbol layers.
347347
*/
348-
class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
348+
class QgsMarkerSymbolLayerV2 : QgsSymbolLayer
349349
{
350350
%TypeHeaderCode
351-
#include <qgssymbollayerv2.h>
351+
#include <qgssymbollayer.h>
352352
%End
353353
public:
354354

@@ -598,10 +598,10 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
598598
static QPointF _rotatedOffset( QPointF offset, double angle );
599599
};
600600

601-
class QgsLineSymbolLayerV2 : QgsSymbolLayerV2
601+
class QgsLineSymbolLayerV2 : QgsSymbolLayer
602602
{
603603
%TypeHeaderCode
604-
#include <qgssymbollayerv2.h>
604+
#include <qgssymbollayer.h>
605605
%End
606606

607607
public:
@@ -658,10 +658,10 @@ class QgsLineSymbolLayerV2 : QgsSymbolLayerV2
658658
QgsLineSymbolLayerV2( bool locked = false );
659659
};
660660

661-
class QgsFillSymbolLayerV2 : QgsSymbolLayerV2
661+
class QgsFillSymbolLayerV2 : QgsSymbolLayer
662662
{
663663
%TypeHeaderCode
664-
#include <qgssymbollayerv2.h>
664+
#include <qgssymbollayer.h>
665665
%End
666666

667667
public:

0 commit comments

Comments
 (0)