From fd2a599778e2d9143db841513acbc5514edb8029 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Sat, 3 Nov 2018 17:17:01 +0100 Subject: [PATCH] More rendererv2 cleanup --- scripts/widgets_tree.py | 2 +- src/core/qgsdiagramrenderer.h | 6 +++--- src/core/symbology/qgscategorizedsymbolrenderer.h | 6 +++--- src/core/symbology/qgsgraduatedsymbolrenderer.h | 6 +++--- src/core/symbology/qgsinvertedpolygonrenderer.h | 2 +- src/core/symbology/qgsrenderer.h | 8 ++++---- src/core/symbology/qgsrendererregistry.h | 6 +++--- src/core/symbology/qgsrulebasedrenderer.h | 6 +++--- src/core/symbology/qgssinglesymbolrenderer.h | 6 +++--- src/gui/symbology/qgsellipsesymbollayerwidget.h | 6 +++--- src/gui/symbology/qgsinvertedpolygonrendererwidget.h | 2 +- src/gui/symbology/qgsrendererwidget.h | 6 +++--- src/gui/symbology/qgssinglesymbolrendererwidget.h | 6 +++--- tests/src/gui/testrenderergui.h | 6 +++--- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/scripts/widgets_tree.py b/scripts/widgets_tree.py index 486768042f4..70d74af91b5 100644 --- a/scripts/widgets_tree.py +++ b/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 diff --git a/src/core/qgsdiagramrenderer.h b/src/core/qgsdiagramrenderer.h index b9d8093582c..c6dc943a43f 100644 --- a/src/core/qgsdiagramrenderer.h +++ b/src/core/qgsdiagramrenderer.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QGSDIAGRAMRENDERERV2_H -#define QGSDIAGRAMRENDERERV2_H +#ifndef QGSDIAGRAMRENDERER_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 diff --git a/src/core/symbology/qgscategorizedsymbolrenderer.h b/src/core/symbology/qgscategorizedsymbolrenderer.h index 3db44e54196..d58e32c37b8 100644 --- a/src/core/symbology/qgscategorizedsymbolrenderer.h +++ b/src/core/symbology/qgscategorizedsymbolrenderer.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QGSCATEGORIZEDSYMBOLRENDERERV2_H -#define QGSCATEGORIZEDSYMBOLRENDERERV2_H +#ifndef QGSCATEGORIZEDSYMBOLRENDERER_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 diff --git a/src/core/symbology/qgsgraduatedsymbolrenderer.h b/src/core/symbology/qgsgraduatedsymbolrenderer.h index 343028067a0..40d5f170af9 100644 --- a/src/core/symbology/qgsgraduatedsymbolrenderer.h +++ b/src/core/symbology/qgsgraduatedsymbolrenderer.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QGSGRADUATEDSYMBOLRENDERERV2_H -#define QGSGRADUATEDSYMBOLRENDERERV2_H +#ifndef QGSGRADUATEDSYMBOLRENDERER_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 diff --git a/src/core/symbology/qgsinvertedpolygonrenderer.h b/src/core/symbology/qgsinvertedpolygonrenderer.h index bc699456d89..3a37725d94d 100644 --- a/src/core/symbology/qgsinvertedpolygonrenderer.h +++ b/src/core/symbology/qgsinvertedpolygonrenderer.h @@ -201,4 +201,4 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRenderer }; -#endif // QGSMASKRENDERERV2_H +#endif // QGSINVERTEDPOLYGONRENDERER_H diff --git a/src/core/symbology/qgsrenderer.h b/src/core/symbology/qgsrenderer.h index 30e2699e665..c6048bef585 100644 --- a/src/core/symbology/qgsrenderer.h +++ b/src/core/symbology/qgsrenderer.h @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSRENDERERV2_H -#define QGSRENDERERV2_H +#ifndef QGSRENDERER_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 diff --git a/src/core/symbology/qgsrendererregistry.h b/src/core/symbology/qgsrendererregistry.h index 0f7f08559a4..7c8217d99a5 100644 --- a/src/core/symbology/qgsrendererregistry.h +++ b/src/core/symbology/qgsrendererregistry.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QGSRENDERERV2REGISTRY_H -#define QGSRENDERERV2REGISTRY_H +#ifndef QGSRENDERERREGISTRY_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 diff --git a/src/core/symbology/qgsrulebasedrenderer.h b/src/core/symbology/qgsrulebasedrenderer.h index 882f40ea905..68e9c3af652 100644 --- a/src/core/symbology/qgsrulebasedrenderer.h +++ b/src/core/symbology/qgsrulebasedrenderer.h @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSRULEBASEDRENDERERV2_H -#define QGSRULEBASEDRENDERERV2_H +#ifndef QGSRULEBASEDRENDERER_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 diff --git a/src/core/symbology/qgssinglesymbolrenderer.h b/src/core/symbology/qgssinglesymbolrenderer.h index 6c424e2ad15..0e8a587bc73 100644 --- a/src/core/symbology/qgssinglesymbolrenderer.h +++ b/src/core/symbology/qgssinglesymbolrenderer.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QGSSINGLESYMBOLRENDERERV2_H -#define QGSSINGLESYMBOLRENDERERV2_H +#ifndef QGSSINGLESYMBOLRENDERER_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 diff --git a/src/gui/symbology/qgsellipsesymbollayerwidget.h b/src/gui/symbology/qgsellipsesymbollayerwidget.h index 1e38287c9ec..265509955a6 100644 --- a/src/gui/symbology/qgsellipsesymbollayerwidget.h +++ b/src/gui/symbology/qgsellipsesymbollayerwidget.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QGSELLIPSESYMBOLLAYERV2WIDGET_H -#define QGSELLIPSESYMBOLLAYERV2WIDGET_H +#ifndef QGSELLIPSESYMBOLLAYERWIDGET_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 diff --git a/src/gui/symbology/qgsinvertedpolygonrendererwidget.h b/src/gui/symbology/qgsinvertedpolygonrendererwidget.h index cd126bef912..b67b68437b0 100644 --- a/src/gui/symbology/qgsinvertedpolygonrendererwidget.h +++ b/src/gui/symbology/qgsinvertedpolygonrendererwidget.h @@ -67,4 +67,4 @@ class GUI_EXPORT QgsInvertedPolygonRendererWidget : public QgsRendererWidget, pr }; -#endif // QGSMASKRENDERERV2WIDGET_H +#endif // QGSINVERTEDPOLYGONRENDERERWIDGET_H diff --git a/src/gui/symbology/qgsrendererwidget.h b/src/gui/symbology/qgsrendererwidget.h index d384ee3fc00..62c7135de71 100644 --- a/src/gui/symbology/qgsrendererwidget.h +++ b/src/gui/symbology/qgsrendererwidget.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QGSRENDERERV2WIDGET_H -#define QGSRENDERERV2WIDGET_H +#ifndef QGSRENDERERWIDGET_H +#define QGSRENDERERWIDGET_H #include #include @@ -297,4 +297,4 @@ class GUI_EXPORT QgsDataDefinedWidthDialog : public QgsDataDefinedValueDialog -#endif // QGSRENDERERV2WIDGET_H +#endif // QGSRENDERERWIDGET_H diff --git a/src/gui/symbology/qgssinglesymbolrendererwidget.h b/src/gui/symbology/qgssinglesymbolrendererwidget.h index 50a431383a6..5b062d432cb 100644 --- a/src/gui/symbology/qgssinglesymbolrendererwidget.h +++ b/src/gui/symbology/qgssinglesymbolrendererwidget.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef QGSSINGLESYMBOLRENDERERV2WIDGET_H -#define QGSSINGLESYMBOLRENDERERV2WIDGET_H +#ifndef QGSSINGLESYMBOLRENDERERWIDGET_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 diff --git a/tests/src/gui/testrenderergui.h b/tests/src/gui/testrenderergui.h index d26c938eb48..80583df28dc 100644 --- a/tests/src/gui/testrenderergui.h +++ b/tests/src/gui/testrenderergui.h @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef TESTRENDERERV2GUI_H -#define TESTRENDERERV2GUI_H +#ifndef TESTRENDERERGUI_H +#define TESTRENDERERGUI_H #include @@ -35,4 +35,4 @@ class TestRendererGUI : public QMainWindow QgsMapCanvas *mMapCanvas = nullptr; }; -#endif // TESTRENDERERV2GUI_H +#endif // TESTRENDERERGUI_H