More rendererv2 cleanup

scripts/widgets_tree.py

@@ -53,7 +53,7 @@ sys.modules['qwt_plot'] = qwt_plot
 # QgsRendererRulesTreeWidget
 # and QgsProjectionSelector cannot open db file
 from qgis import gui
-for m in ['qgscolorbutton', 'qgscolorrampcombobox', 'qgsprojectionselector', 'qgslabelpreview', 'qgsrulebasedrendererv2widget', 'qgscollapsiblegroupbox', 'qgsblendmodecombobox', 'qgsexpressionbuilderwidget', 'qgsrasterformatsaveoptionswidget', 'qgsrasterpyramidsoptionswidget', 'qgsscalecombobox', 'qgsfilterlineedit', 'qgsdualview']:
+for m in ['qgscolorbutton', 'qgscolorrampcombobox', 'qgsprojectionselector', 'qgslabelpreview', 'qgsrulebasedrendererwidget', 'qgscollapsiblegroupbox', 'qgsblendmodecombobox', 'qgsexpressionbuilderwidget', 'qgsrasterformatsaveoptionswidget', 'qgsrasterpyramidsoptionswidget', 'qgsscalecombobox', 'qgsfilterlineedit', 'qgsdualview']:
     sys.modules[m] = gui
 
 

src/core/qgsdiagramrenderer.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSDIAGRAMRENDERERV2_H
+#ifndef QGSDIAGRAMRENDERER_H
-#define QGSDIAGRAMRENDERERV2_H
+#define QGSDIAGRAMRENDERER_H
 
 #include "qgis_core.h"
 #include "qgis.h"
@@ -760,4 +760,4 @@ class CORE_EXPORT QgsLinearlyInterpolatedDiagramRenderer : public QgsDiagramRend
     QgsDataDefinedSizeLegend *mDataDefinedSizeLegend = nullptr;
 };
 
-#endif // QGSDIAGRAMRENDERERV2_H
+#endif // QGSDIAGRAMRENDERER_H

src/core/symbology/qgscategorizedsymbolrenderer.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSCATEGORIZEDSYMBOLRENDERERV2_H
+#ifndef QGSCATEGORIZEDSYMBOLRENDERER_H
-#define QGSCATEGORIZEDSYMBOLRENDERERV2_H
+#define QGSCATEGORIZEDSYMBOLRENDERER_H
 
 #include "qgis_core.h"
 #include "qgis.h"
@@ -306,4 +306,4 @@ class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer
     QgsLegendSymbolList baseLegendSymbolItems() const;
 };
 
-#endif // QGSCATEGORIZEDSYMBOLRENDERERV2_H
+#endif // QGSCATEGORIZEDSYMBOLRENDERER_H

src/core/symbology/qgsgraduatedsymbolrenderer.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSGRADUATEDSYMBOLRENDERERV2_H
+#ifndef QGSGRADUATEDSYMBOLRENDERER_H
-#define QGSGRADUATEDSYMBOLRENDERERV2_H
+#define QGSGRADUATEDSYMBOLRENDERER_H
 
 #include "qgis_core.h"
 #include "qgis_sip.h"
@@ -527,4 +527,4 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
 
 };
 
-#endif // QGSGRADUATEDSYMBOLRENDERERV2_H
+#endif // QGSGRADUATEDSYMBOLRENDERER_H

src/core/symbology/qgsinvertedpolygonrenderer.h

@@ -201,4 +201,4 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRenderer
 };
 
 
-#endif // QGSMASKRENDERERV2_H
+#endif // QGSINVERTEDPOLYGONRENDERER_H

src/core/symbology/qgsrenderer.h

@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSRENDERERV2_H
+#ifndef QGSRENDERER_H
-#define QGSRENDERERV2_H
+#define QGSRENDERER_H
 
 #include "qgis_core.h"
 #include "qgis_sip.h"
@@ -299,7 +299,7 @@ class CORE_EXPORT QgsFeatureRenderer
     //! used from subclasses to create SLD Rule elements following SLD v1.1 specs
     virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const
     {
-      element.appendChild( doc.createComment( QStringLiteral( "FeatureRendererV2 %1 not implemented yet" ).arg( type() ) ) );
+      element.appendChild( doc.createComment( QStringLiteral( "FeatureRenderer %1 not implemented yet" ).arg( type() ) ) );
       ( void ) props; // warning avoidance
     }
 
@@ -547,4 +547,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( QgsFeatureRenderer::Capabilities )
 class QgsRendererWidget;
 class QgsPaintEffectWidget;
 
-#endif // QGSRENDERERV2_H
+#endif // QGSRENDERER_H

src/core/symbology/qgsrendererregistry.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSRENDERERV2REGISTRY_H
+#ifndef QGSRENDERERREGISTRY_H
-#define QGSRENDERERV2REGISTRY_H
+#define QGSRENDERERREGISTRY_H
 
 #include "qgis_core.h"
 #include "qgis_sip.h"
@@ -254,4 +254,4 @@ class CORE_EXPORT QgsRendererRegistry
     QStringList mRenderersOrder;
 };
 
-#endif // QGSRENDERERV2REGISTRY_H
+#endif // QGSRENDERERREGISTRY_H

src/core/symbology/qgsrulebasedrenderer.h

@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSRULEBASEDRENDERERV2_H
+#ifndef QGSRULEBASEDRENDERER_H
-#define QGSRULEBASEDRENDERERV2_H
+#define QGSRULEBASEDRENDERER_H
 
 #include "qgis_core.h"
 #include "qgis_sip.h"
@@ -550,4 +550,4 @@ class CORE_EXPORT QgsRuleBasedRenderer : public QgsFeatureRenderer
 #endif
 };
 
-#endif // QGSRULEBASEDRENDERERV2_H
+#endif // QGSRULEBASEDRENDERER_H

src/core/symbology/qgssinglesymbolrenderer.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSSINGLESYMBOLRENDERERV2_H
+#ifndef QGSSINGLESYMBOLRENDERER_H
-#define QGSSINGLESYMBOLRENDERERV2_H
+#define QGSSINGLESYMBOLRENDERER_H
 
 #include "qgis_core.h"
 #include "qgis.h"
@@ -126,4 +126,4 @@ class CORE_EXPORT QgsSingleSymbolRenderer : public QgsFeatureRenderer
 };
 
 
-#endif // QGSSINGLESYMBOLRENDERERV2_H
+#endif // QGSSINGLESYMBOLRENDERER_H

src/gui/symbology/qgsellipsesymbollayerwidget.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSELLIPSESYMBOLLAYERV2WIDGET_H
+#ifndef QGSELLIPSESYMBOLLAYERWIDGET_H
-#define QGSELLIPSESYMBOLLAYERV2WIDGET_H
+#define QGSELLIPSESYMBOLLAYERWIDGET_H
 
 #include "ui_widget_ellipse.h"
 #include "qgis.h"
@@ -77,4 +77,4 @@ class GUI_EXPORT QgsEllipseSymbolLayerWidget: public QgsSymbolLayerWidget, priva
     void setOffset();
 };
 
-#endif // QGSELLIPSESYMBOLLAYERV2WIDGET_H
+#endif // QGSELLIPSESYMBOLLAYERWIDGET_H

src/gui/symbology/qgsinvertedpolygonrendererwidget.h

@@ -67,4 +67,4 @@ class GUI_EXPORT QgsInvertedPolygonRendererWidget : public QgsRendererWidget, pr
 };
 
 
-#endif // QGSMASKRENDERERV2WIDGET_H
+#endif // QGSINVERTEDPOLYGONRENDERERWIDGET_H

src/gui/symbology/qgsrendererwidget.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSRENDERERV2WIDGET_H
+#ifndef QGSRENDERERWIDGET_H
-#define QGSRENDERERV2WIDGET_H
+#define QGSRENDERERWIDGET_H
 
 #include <QWidget>
 #include <QMenu>
@@ -297,4 +297,4 @@ class GUI_EXPORT QgsDataDefinedWidthDialog : public QgsDataDefinedValueDialog
 
 
 
-#endif // QGSRENDERERV2WIDGET_H
+#endif // QGSRENDERERWIDGET_H

src/gui/symbology/qgssinglesymbolrendererwidget.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSSINGLESYMBOLRENDERERV2WIDGET_H
+#ifndef QGSSINGLESYMBOLRENDERERWIDGET_H
-#define QGSSINGLESYMBOLRENDERERV2WIDGET_H
+#define QGSSINGLESYMBOLRENDERERWIDGET_H
 
 #include "qgsrendererwidget.h"
 #include "qgis.h"
@@ -64,4 +64,4 @@ class GUI_EXPORT QgsSingleSymbolRendererWidget : public QgsRendererWidget
 };
 
 
-#endif // QGSSINGLESYMBOLRENDERERV2WIDGET_H
+#endif // QGSSINGLESYMBOLRENDERERWIDGET_H

tests/src/gui/testrenderergui.h

@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef TESTRENDERERV2GUI_H
+#ifndef TESTRENDERERGUI_H
-#define TESTRENDERERV2GUI_H
+#define TESTRENDERERGUI_H
 
 #include <QMainWindow>
 
@@ -35,4 +35,4 @@ class TestRendererGUI : public QMainWindow
     QgsMapCanvas *mMapCanvas = nullptr;
 };
 
-#endif // TESTRENDERERV2GUI_H
+#endif // TESTRENDERERGUI_H