removed V2 from QgsSymbolLayerV2*

doc/api_break.dox

@@ -18,6 +18,20 @@ This page tries to maintain a list with incompatible changes that happened in pr
 
 \section qgis_api_break_3_0 QGIS 3.0
 
+\subsection qgis_api_break_3_0_renamed_classes Renamed Classes
+
+<table>
+<caption id="renamed_classes">Renamed classes</caption>
+<tr><th>API 2.x<th>API 3.X   
+<tr><td>QgsColorButtonV2                 <tr><td>QgsColorButton   
+<tr><td>QgsSymbolLayerV2                 <tr><td>QgsSymbolLayer   
+<tr><td>QgsSymbolLayerV2AbstractMetadata <tr><td>QgsSymbolLayerAbstractMetadata  
+<tr><td>QgsSymbolLayerV2Metadata         <tr><td>QgsSymbolLayerMetadata   
+<tr><td>QgsSymbolLayerV2Registry         <tr><td>QgsSymbolLayerRegistry   
+<tr><td>QgsSymbolLayerV2Utils            <tr><td>QgsSymbolLayerUtils   
+<tr><td>QgsSymbolLayerV2Widget           <tr><td>QgsSymbolLayerWidget  
+</table>
+
 \subsection qgis_api_break_3_0_removed_classes Removed Classes
 
 <ul>
@@ -540,7 +554,7 @@ parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::Rend
 <li>startRender() now accepts a QgsFields reference, not a pointer.</li>
 </ul>
 
-\subsection qgis_api_break_3_0_QgsSymbolLayerV2 QgsSymbolLayerV2
+\subsection qgis_api_break_3_0_QgsSymbolLayer QgsSymbolLayer (renamed from QgsSymbolLayerV2)
 
 <ul>
 <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>
 <li>fields() now returns a QgsFields value, not a pointer.</li>
 </ul>
 
-\subsection qgis_api_break_3_0_QgsSymbolLayerV2Utils QgsSymbolLayerV2Utils
+\subsection qgis_api_break_3_0_QgsSymbolLayerUtils QgsSymbolLayerUtils (renamed from QgsSymbolLayerUtilsV2)
 
 <ul>
 <li>encodeOutputUnit() and decodeOutputUnit() were removed. QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should be used instead.</li>

python/core/core.sip

@@ -312,9 +312,9 @@
 %Include symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
 %Include symbology-ng/qgslinesymbollayerv2.sip
 %Include symbology-ng/qgsmarkersymbollayerv2.sip
-%Include symbology-ng/qgssymbollayerv2.sip
-%Include symbology-ng/qgssymbollayerv2registry.sip
-%Include symbology-ng/qgssymbollayerv2utils.sip
+%Include symbology-ng/qgssymbollayer.sip
+%Include symbology-ng/qgssymbollayerregistry.sip
+%Include symbology-ng/qgssymbollayerutils.sip
 %Include symbology-ng/qgsvectorfieldsymbollayer.sip
 %Include symbology-ng/qgsarrowsymbollayer.sip
 

python/core/symbology-ng/qgsarrowsymbollayer.sip

@@ -20,7 +20,7 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
      *
      * @return A new QgsArrowSymbolLayer
      */
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
 
     /** Virtual constructor */
     virtual QgsArrowSymbolLayer* clone() const /Factory/;

python/core/symbology-ng/qgsellipsesymbollayerv2.sip

@@ -8,8 +8,8 @@ class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
     QgsEllipseSymbolLayerV2();
     ~QgsEllipseSymbolLayerV2();
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     void renderPoint( QPointF point, QgsSymbolV2RenderContext& context );
     QString layerType() const;

python/core/symbology-ng/qgsfillsymbollayerv2.sip

@@ -15,8 +15,8 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
 
     // static stuff
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     // implemented from base classes
 
@@ -156,7 +156,7 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
 
     // static stuff
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
 
     // implemented from base classes
 
@@ -254,7 +254,7 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
 
     // static stuff
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
 
     // implemented from base classes
 
@@ -510,7 +510,7 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
     QgsRasterFillSymbolLayer( const QString& imageFilePath = QString() );
     ~QgsRasterFillSymbolLayer();
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() );
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() );
 
     // implemented from base classes
     QString layerType() const;
@@ -671,8 +671,8 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
     QgsSVGFillSymbolLayer( const QByteArray& svgData, double width = 20, double rotation = 0.0 );
     ~QgsSVGFillSymbolLayer();
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     // implemented from base classes
 
@@ -747,8 +747,8 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
     QgsLinePatternFillSymbolLayer();
     ~QgsLinePatternFillSymbolLayer();
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     QString layerType() const;
 
@@ -855,8 +855,8 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
     QgsPointPatternFillSymbolLayer();
     ~QgsPointPatternFillSymbolLayer();
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     QString layerType() const;
 
@@ -959,8 +959,8 @@ class QgsCentroidFillSymbolLayerV2 : QgsFillSymbolLayerV2
 
     // static stuff
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     // implemented from base classes
 

python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip

@@ -12,13 +12,13 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayerV2
+class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayer
 {
 %TypeHeaderCode
 #include "qgsgeometrygeneratorsymbollayerv2.h"
 %End
   public:
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() );
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() );
 
     QString layerType() const;
 
@@ -42,7 +42,7 @@ class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayerV2
 
     void stopRender( QgsSymbolV2RenderContext& context );
 
-    QgsSymbolLayerV2* clone() const;
+    QgsSymbolLayer* clone() const;
 
     QgsStringMap properties() const;
 

python/core/symbology-ng/qgslinesymbollayerv2.sip

@@ -11,8 +11,8 @@ class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2
 
     // static stuff
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     // implemented from base classes
 
@@ -123,7 +123,7 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
      *
      * @return A new MarkerLineSymbolLayerV2
      */
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
 
     /**
      * Create a new MarkerLineSymbolLayerV2 from SLD
@@ -132,7 +132,7 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
      *
      * @return A new MarkerLineSymbolLayerV2
      */
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     // implemented from base classes
 

python/core/symbology-ng/qgsmarkersymbollayerv2.sip

@@ -193,13 +193,13 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
      * @param properties a property map containing symbol properties (see properties())
      * @returns new QgsSimpleMarkerSymbolLayerV2
      */
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
 
     /** Creates a new QgsSimpleMarkerSymbolLayerV2 from an SLD XML element.
      * @param element XML element containing SLD definition of symbol
      * @returns new QgsSimpleMarkerSymbolLayerV2
      */
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     // reimplemented from base classes
 
@@ -381,7 +381,7 @@ class QgsFilledMarkerSymbolLayer : QgsSimpleMarkerSymbolLayerBase
      * @param properties a property map containing symbol properties (see properties())
      * @returns new QgsFilledMarkerSymbolLayer
      */
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
 
     QString layerType() const;
     void startRender( QgsSymbolV2RenderContext& context );
@@ -417,8 +417,8 @@ class QgsSvgMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
 
     // static stuff
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     // implemented from base classes
 
@@ -490,8 +490,8 @@ class QgsFontMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
 
     // static stuff
 
-    static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
-    static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
+    static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
+    static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
 
     // implemented from base classes
 

python/core/symbology-ng/qgssvgcache.sip

@@ -175,7 +175,7 @@ class QgsSvgCache : QObject
     QgsSvgCache( QObject * parent /TransferThis/ = 0 );
 
     /** Creates new cache entry and returns pointer to it
-     * @param file Absolute or relative path to SVG file. If the path is relative the file is searched by QgsSymbolLayerV2Utils::symbolNameToPath() in SVG paths.
+     * @param file Absolute or relative path to SVG file. If the path is relative the file is searched by QgsSymbolLayerUtils::symbolNameToPath() in SVG paths.
      * in settings svg/searchPathsForSVG
      * @param size size of cached image
      * @param fill color of fill

python/core/symbology-ng/qgssymbollayerv2.sip → python/core/symbology-ng/qgssymbollayer.sip

@@ -1,7 +1,7 @@
-class QgsSymbolLayerV2
+class QgsSymbolLayer
 {
 %TypeHeaderCode
-#include <qgssymbollayerv2.h>
+#include <qgssymbollayer.h>
 #include <qgslinesymbollayerv2.h>
 %End
 
@@ -70,7 +70,7 @@ class QgsSymbolLayerV2
 
   public:
 
-    virtual ~QgsSymbolLayerV2();
+    virtual ~QgsSymbolLayer();
 
     /**
      * The fill color.
@@ -109,7 +109,7 @@ class QgsSymbolLayerV2
     /**
      * Shall be reimplemented by subclasses to create a deep copy of the instance.
      */
-    virtual QgsSymbolLayerV2* clone() const = 0 /Factory/;
+    virtual QgsSymbolLayer* clone() const = 0 /Factory/;
 
     virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;
 
@@ -299,7 +299,7 @@ class QgsSymbolLayerV2
     void setPaintEffect( QgsPaintEffect* effect /Transfer/);
 
   protected:
-    QgsSymbolLayerV2( QgsSymbolV2::SymbolType type, bool locked = false );
+    QgsSymbolLayer( QgsSymbolV2::SymbolType type, bool locked = false );
 
     /** Prepares all data defined property expressions for evaluation. This should
      * be called prior to evaluating data defined properties.
@@ -329,13 +329,13 @@ class QgsSymbolLayerV2
     /** Copies all data defined properties of this layer to another symbol layer.
      * @param destLayer destination layer
      */
-    void copyDataDefinedProperties( QgsSymbolLayerV2* destLayer ) const;
+    void copyDataDefinedProperties( QgsSymbolLayer* destLayer ) const;
 
     /** Copies paint effect of this layer to another symbol layer
      * @param destLayer destination layer
      * @note added in QGIS 2.9
      */
-    void copyPaintEffect( QgsSymbolLayerV2* destLayer ) const;
+    void copyPaintEffect( QgsSymbolLayer* destLayer ) const;
 
 };
 
@@ -345,10 +345,10 @@ class QgsSymbolLayerV2
  * \class QgsMarkerSymbolLayerV2
  * \brief Abstract base class for marker symbol layers.
  */
-class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
+class QgsMarkerSymbolLayerV2 : QgsSymbolLayer
 {
 %TypeHeaderCode
-#include <qgssymbollayerv2.h>
+#include <qgssymbollayer.h>
 %End
   public:
 
@@ -598,10 +598,10 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
     static QPointF _rotatedOffset( QPointF offset, double angle );
 };
 
-class QgsLineSymbolLayerV2 : QgsSymbolLayerV2
+class QgsLineSymbolLayerV2 : QgsSymbolLayer
 {
 %TypeHeaderCode
-#include <qgssymbollayerv2.h>
+#include <qgssymbollayer.h>
 %End
 
   public:
@@ -658,10 +658,10 @@ class QgsLineSymbolLayerV2 : QgsSymbolLayerV2
     QgsLineSymbolLayerV2( bool locked = false );
 };
 
-class QgsFillSymbolLayerV2 : QgsSymbolLayerV2
+class QgsFillSymbolLayerV2 : QgsSymbolLayer
 {
 %TypeHeaderCode
-#include <qgssymbollayerv2.h>
+#include <qgssymbollayer.h>
 %End
 
   public: