Rename some rendererV2 ui files

qgis · Nov 3, 2018 · a3db4e3 · a3db4e3
1 parent ec98dfc
commit a3db4e3
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.h b/src/gui/symbology/qgscategorizedsymbolrendererwidget.h
@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
-#define QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
+#ifndef QGSCATEGORIZEDSYMBOLRENDERERWIDGET_H
+#define QGSCATEGORIZEDSYMBOLRENDERERWIDGET_H
 
 #include "qgscategorizedsymbolrenderer.h"
 #include "qgis.h"
@@ -25,7 +25,7 @@
 class QgsCategorizedSymbolRenderer;
 class QgsRendererCategory;
 
-#include "ui_qgscategorizedsymbolrendererv2widget.h"
+#include "ui_qgscategorizedsymbolrendererwidget.h"
 #include "qgis_gui.h"
 
 
@@ -195,4 +195,4 @@ class GUI_EXPORT QgsCategorizedSymbolRendererWidget : public QgsRendererWidget,
     QgsExpressionContext createExpressionContext() const override;
 };
 
-#endif // QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
+#endif // QGSCATEGORIZEDSYMBOLRENDERERWIDGET_H
diff --git a/src/gui/symbology/qgscptcitycolorrampdialog.h b/src/gui/symbology/qgscptcitycolorrampdialog.h
@@ -13,11 +13,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSCPTCITYCOLORRAMPV2DIALOG_H
-#define QGSCPTCITYCOLORRAMPV2DIALOG_H
+#ifndef QGSCPTCITYCOLORRAMPDIALOG_H
+#define QGSCPTCITYCOLORRAMPDIALOG_H
 
 
-#include "ui_qgscptcitycolorrampv2dialogbase.h"
+#include "ui_qgscptcitycolorrampdialogbase.h"
 #include "qgis.h"
 #include <QDialog>
 

diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h
@@ -13,16 +13,16 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H
-#define QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H
+#ifndef QGSGRADUATEDSYMBOLRENDERERWIDGET_H
+#define QGSGRADUATEDSYMBOLRENDERERWIDGET_H
 
 #include "qgsgraduatedsymbolrenderer.h"
 #include "qgis.h"
 #include "qgsrendererwidget.h"
 #include "qgsproxystyle.h"
 #include <QStandardItem>
 
-#include "ui_qgsgraduatedsymbolrendererv2widget.h"
+#include "ui_qgsgraduatedsymbolrendererwidget.h"
 #include "qgis_gui.h"
 
 #ifndef SIP_RUN
@@ -170,4 +170,4 @@ class GUI_EXPORT QgsGraduatedSymbolRendererWidget : public QgsRendererWidget, pr
 };
 
 
-#endif // QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H
+#endif // QGSGRADUATEDSYMBOLRENDERERWIDGET_H
diff --git a/src/gui/symbology/qgsrendererpropertiesdialog.h b/src/gui/symbology/qgsrendererpropertiesdialog.h
@@ -14,13 +14,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSRENDERERV2PROPERTIESDIALOG_H
-#define QGSRENDERERV2PROPERTIESDIALOG_H
+#ifndef QGSRENDERERPROPERTIESDIALOG_H
+#define QGSRENDERERPROPERTIESDIALOG_H
 
 #include <QDialog>
 #include "qgis.h"
 
-#include "ui_qgsrendererv2propsdialogbase.h"
+#include "ui_qgsrendererpropsdialogbase.h"
 
 #include "qgsfeaturerequest.h"
 #include "qgis_gui.h"

diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.h b/src/gui/symbology/qgsrulebasedrendererwidget.h
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSRULEBASEDRENDERERV2WIDGET_H
-#define QGSRULEBASEDRENDERERV2WIDGET_H
+#ifndef QGSRULEBASEDRENDERERWIDGET_H
+#define QGSRULEBASEDRENDERERWIDGET_H
 
 #include "qgsrendererwidget.h"
 #include "qgis.h"
@@ -100,7 +100,7 @@ class GUI_EXPORT QgsRuleBasedRendererModel : public QAbstractItemModel
 
 ///////
 
-#include "ui_qgsrulebasedrendererv2widget.h"
+#include "ui_qgsrulebasedrendererwidget.h"
 
 /**
  * \ingroup gui
@@ -282,4 +282,4 @@ class GUI_EXPORT QgsRendererRulePropsDialog : public QDialog
 };
 
 
-#endif // QGSRULEBASEDRENDERERV2WIDGET_H
+#endif // QGSRULEBASEDRENDERERWIDGET_H
diff --git a/...i/qgscategorizedsymbolrendererv2widget.ui → src/ui/qgscategorizedsymbolrendererwidget.ui b/...i/qgscategorizedsymbolrendererv2widget.ui → src/ui/qgscategorizedsymbolrendererwidget.ui
diff --git a/src/ui/qgscptcitycolorrampv2dialogbase.ui → src/ui/qgscptcitycolorrampdialogbase.ui b/src/ui/qgscptcitycolorrampv2dialogbase.ui → src/ui/qgscptcitycolorrampdialogbase.ui
diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui → src/ui/qgsgraduatedsymbolrendererwidget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui → src/ui/qgsgraduatedsymbolrendererwidget.ui
diff --git a/src/ui/qgsrendererv2propsdialogbase.ui → src/ui/qgsrendererpropsdialogbase.ui b/src/ui/qgsrendererv2propsdialogbase.ui → src/ui/qgsrendererpropsdialogbase.ui
diff --git a/src/ui/qgsrulebasedrendererv2widget.ui → src/ui/qgsrulebasedrendererwidget.ui b/src/ui/qgsrulebasedrendererv2widget.ui → src/ui/qgsrulebasedrendererwidget.ui