Rename color ramp dialogs to match new ramp class names

doc/api_break.dox

@@ -126,18 +126,18 @@ This page tries to maintain a list with incompatible changes that happened in pr
 <tr><td>QgsSymbolV2SelectorWidget<td>QgsSymbolSelectorWidget
 <tr><td>QgsSymbologyV2Conversion<td>QgsSymbologyConversion
 <tr><td>QgsVectorColorBrewerColorRampV2<td>QgsColorBrewerColorRamp
-<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsVectorColorBrewerColorRampDialog
+<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsColorBrewerColorRampDialog
-<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsVectorColorBrewerColorRampDialogBase
+<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsColorBrewerColorRampDialogBase
 <tr><td>QgsVectorColorRampV2<td>QgsColorRamp
 <tr><td>QgsVectorColorRampV2Map<td>QgsVectorColorRampMap
 <tr><td>QgsVectorGradientColorRampV2<td>QgsGradientColorRamp
-<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsVectorGradientColorRampDialog
+<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsGradientColorRampDialog
-<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsVectorGradientColorRampDialogBase
+<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsGradientColorRampDialogBase
 <tr><td>QgsVectorGradientRampV2<td>QgsVectorGradientRamp
 <tr><td>QgsVectorLayersetRendererV2<td>QgsVectorLayersetRenderer
 <tr><td>QgsVectorRandomColorRampV2<td>QgsLimitedRandomColorRamp
-<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsVectorRandomColorRampDialog
+<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsLimitedRandomColorRampDialog
-<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsVectorRandomColorRampDialogBase
+<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsLimitedRandomColorRampDialogBase
 <tr><th>QgsSymbolV2<th>QgsSymbol
 </table>
 

python/gui/gui.sip

@@ -45,6 +45,7 @@
 %Include qgscodeeditorcss.sip
 %End
 %Include qgscharacterselectdialog.sip
+%Include qgscolorbrewercolorrampdialog.sip
 %Include qgscolorbutton.sip
 %Include qgscolorbutton.sip
 %Include qgscolordialog.sip
@@ -87,6 +88,7 @@
 %Include qgsformannotationitem.sip
 %Include qgsgenericprojectionselector.sip
 %Include qgsgeometryrubberband.sip
+%Include qgsgradientcolorrampdialog.sip
 %Include qgsgradientstopeditor.sip
 %Include qgsgroupwmsdatadialog.sip
 %Include qgshighlight.sip
@@ -95,6 +97,7 @@
 %Include qgsidentifymenu.sip
 %Include qgslegendfilterbutton.sip
 %Include qgslegendinterface.sip
+%Include qgslimitedrandomcolorrampdialog.sip
 %Include qgslonglongvalidator.sip
 %Include qgsludialog.sip
 %Include qgsmanageconnectionsdialog.sip
@@ -249,10 +252,7 @@
 %Include symbology-ng/qgssymbollevelsdialog.sip
 %Include symbology-ng/qgssymbolslistwidget.sip
 %Include symbology-ng/qgssymbolselectordialog.sip
-%Include symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip
 %Include symbology-ng/qgsvectorfieldsymbollayerwidget.sip
-%Include symbology-ng/qgsvectorgradientcolorrampdialog.sip
-%Include symbology-ng/qgsvectorrandomcolorrampdialog.sip
 
 %Include effects/qgseffectdrawmodecombobox.sip
 %Include effects/qgseffectstackpropertieswidget.sip

python/gui/qgscolorbrewercolorrampdialog.sip

@@ -0,0 +1,19 @@
+class QgsColorBrewerColorRampDialog : QDialog
+{
+%TypeHeaderCode
+#include <qgscolorbrewercolorrampdialog.h>
+%End
+
+  public:
+    QgsColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
+
+  public slots:
+    void setSchemeName();
+    void setColors();
+
+    void populateVariants();
+
+  protected:
+
+    void updatePreview();
+};

python/gui/qgsgradientcolorrampdialog.sip

@@ -1,11 +1,11 @@
-class QgsVectorGradientColorRampDialog : QDialog
+class QgsGradientColorRampDialog : QDialog
 {
 %TypeHeaderCode
-#include <qgsvectorgradientcolorrampdialog.h>
+#include <qgsgradientcolorrampdialog.h>
 %End
 
   public:
-    QgsVectorGradientColorRampDialog( QgsGradientColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
+    QgsGradientColorRampDialog( QgsGradientColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
 
   public slots:
     void setColor1( const QColor& color );

python/gui/qgslimitedrandomcolorrampdialog.sip

@@ -1,11 +1,11 @@
-class QgsVectorRandomColorRampDialog : QDialog
+class QgsLimitedRandomColorRampDialog : QDialog
 {
 %TypeHeaderCode
-#include <qgsvectorrandomcolorrampdialog.h>
+#include <qgslimitedrandomcolorrampdialog.h>
 %End
 
   public:
-    QgsVectorRandomColorRampDialog( QgsLimitedRandomColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
+    QgsLimitedRandomColorRampDialog( QgsLimitedRandomColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
 
   public slots:
     void setCount( int val );

python/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip

@@ -1,19 +0,0 @@
-class QgsVectorColorBrewerColorRampDialog : QDialog
-{
-%TypeHeaderCode
-#include <qgsvectorcolorbrewercolorrampdialog.h>
-%End
-
-  public:
-    QgsVectorColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
-
-  public slots:
-    void setSchemeName();
-    void setColors();
-
-    void populateVariants();
-
-  protected:
-
-    void updatePreview();
-};

src/gui/CMakeLists.txt

@@ -42,10 +42,7 @@ SET(QGIS_GUI_SRCS
   symbology-ng/qgssymbollevelsdialog.cpp
   symbology-ng/qgssymbolslistwidget.cpp
   symbology-ng/qgssymbolselectordialog.cpp
-  symbology-ng/qgsvectorcolorbrewercolorrampdialog.cpp
   symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
-  symbology-ng/qgsvectorgradientcolorrampdialog.cpp
-  symbology-ng/qgsvectorrandomcolorrampdialog.cpp
 
   effects/qgseffectdrawmodecombobox.cpp
   effects/qgseffectstackpropertieswidget.cpp
@@ -182,6 +179,7 @@ SET(QGIS_GUI_SRCS
   qgscodeeditorpython.cpp
   qgscodeeditorsql.cpp
   qgscollapsiblegroupbox.cpp
+  qgscolorbrewercolorrampdialog.cpp
   qgscolorbutton.cpp
   qgscolordialog.cpp
   qgscolorschemelist.cpp
@@ -225,6 +223,7 @@ SET(QGIS_GUI_SRCS
   qgsformannotationitem.cpp
   qgsgenericprojectionselector.cpp
   qgsgeometryrubberband.cpp
+  qgsgradientcolorrampdialog.cpp
   qgsgradientstopeditor.cpp
   qgsgroupwmsdatadialog.cpp
   qgshighlight.cpp
@@ -233,6 +232,7 @@ SET(QGIS_GUI_SRCS
   qgsidentifymenu.cpp
   qgslegendfilterbutton.cpp
   qgslegendinterface.cpp
+  qgslimitedrandomcolorrampdialog.cpp
   qgsludialog.cpp
   qgsmanageconnectionsdialog.cpp
   qgsmapcanvas.cpp
@@ -343,6 +343,7 @@ SET(QGIS_GUI_MOC_HDRS
   qgscodeeditorpython.h
   qgscodeeditorsql.h
   qgscollapsiblegroupbox.h
+  qgscolorbrewercolorrampdialog.h
   qgscolorbutton.h
   qgscolordialog.h
   qgscolorschemelist.h
@@ -382,6 +383,7 @@ SET(QGIS_GUI_MOC_HDRS
   qgsfocuswatcher.h
   qgsformannotationitem.h
   qgsgenericprojectionselector.h
+  qgsgradientcolorrampdialog.h
   qgsgradientstopeditor.h
   qgsgroupwmsdatadialog.h
   qgshistogramwidget.h
@@ -389,6 +391,7 @@ SET(QGIS_GUI_MOC_HDRS
   qgsidentifymenu.h
   qgslegendfilterbutton.h
   qgslegendinterface.h
+  qgslimitedrandomcolorrampdialog.h
   qgslonglongvalidator.h
   qgsludialog.h
   qgsmanageconnectionsdialog.h
@@ -494,10 +497,7 @@ SET(QGIS_GUI_MOC_HDRS
   symbology-ng/qgssymbollevelsdialog.h
   symbology-ng/qgssymbolslistwidget.h
   symbology-ng/qgssymbolselectordialog.h
-  symbology-ng/qgsvectorcolorbrewercolorrampdialog.h
   symbology-ng/qgsvectorfieldsymbollayerwidget.h
-  symbology-ng/qgsvectorgradientcolorrampdialog.h
-  symbology-ng/qgsvectorrandomcolorrampdialog.h
 
   attributetable/qgsattributetabledelegate.h
   attributetable/qgsattributetablefiltermodel.h

src/gui/qgscolorbrewercolorrampdialog.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgsvectorcolorbrewercolorrampdialog.cpp
+    qgscolorbrewercolorrampdialog.cpp
     ---------------------
     begin                : November 2009
     copyright            : (C) 2009 by Martin Dobias
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsvectorcolorbrewercolorrampdialog.h"
+#include "qgscolorbrewercolorrampdialog.h"
 
 #include "qgscolorramp.h"
 #include "qgssymbollayerutils.h"
@@ -31,7 +31,7 @@ static void updateColorButton( QAbstractButton* button, QColor color )
 /////////
 
 
-QgsVectorColorBrewerColorRampDialog::QgsVectorColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent )
+QgsColorBrewerColorRampDialog::QgsColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent )
     : QDialog( parent )
     , mRamp( ramp )
 {
@@ -61,7 +61,7 @@ QgsVectorColorBrewerColorRampDialog::QgsVectorColorBrewerColorRampDialog( QgsCol
   updatePreview();
 }
 
-void QgsVectorColorBrewerColorRampDialog::populateVariants()
+void QgsColorBrewerColorRampDialog::populateVariants()
 {
   QString oldVariant = cboColors->currentText();
 
@@ -83,13 +83,13 @@ void QgsVectorColorBrewerColorRampDialog::populateVariants()
   cboColors->setCurrentIndex( idx );
 }
 
-void QgsVectorColorBrewerColorRampDialog::updatePreview()
+void QgsColorBrewerColorRampDialog::updatePreview()
 {
   QSize size( 300, 40 );
   lblPreview->setPixmap( QgsSymbolLayerUtils::colorRampPreviewPixmap( mRamp, size ) );
 }
 
-void QgsVectorColorBrewerColorRampDialog::setSchemeName()
+void QgsColorBrewerColorRampDialog::setSchemeName()
 {
   // populate list of variants
   populateVariants();
@@ -98,7 +98,7 @@ void QgsVectorColorBrewerColorRampDialog::setSchemeName()
   updatePreview();
 }
 
-void QgsVectorColorBrewerColorRampDialog::setColors()
+void QgsColorBrewerColorRampDialog::setColors()
 {
   int num = cboColors->currentText().toInt();
   mRamp->setColors( num );

src/gui/qgscolorbrewercolorrampdialog.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgsvectorcolorbrewercolorrampdialog.h
+    qgscolorbrewercolorrampdialog.h
     ---------------------
     begin                : November 2009
     copyright            : (C) 2009 by Martin Dobias
@@ -13,24 +13,24 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSVECTORCOLORBREWERCOLORRAMPV2DIALOG_H
+#ifndef QGSCOLORBREWERCOLORRAMPDIALOG_H
-#define QGSVECTORCOLORBREWERCOLORRAMPV2DIALOG_H
+#define QGSCOLORBREWERCOLORRAMPDIALOG_H
 
 #include <QDialog>
 
-#include "ui_qgsvectorcolorbrewercolorrampv2dialogbase.h"
+#include "ui_qgscolorbrewercolorrampdialogbase.h"
 
 class QgsColorBrewerColorRamp;
 
 /** \ingroup gui
- * \class QgsVectorColorBrewerColorRampDialog
+ * \class QgsColorBrewerColorRampDialog
  */
-class GUI_EXPORT QgsVectorColorBrewerColorRampDialog : public QDialog, private Ui::QgsVectorColorBrewerColorRampDialogBase
+class GUI_EXPORT QgsColorBrewerColorRampDialog : public QDialog, private Ui::QgsColorBrewerColorRampDialogBase
 {
     Q_OBJECT
 
   public:
-    QgsVectorColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent = nullptr );
+    QgsColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent = nullptr );
 
   public slots:
     void setSchemeName();

src/gui/qgsgradientcolorrampdialog.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgsvectorgradientcolorrampdialog.cpp
+    qgsgradientcolorrampdialog.cpp
     ---------------------
     begin                : November 2009
     copyright            : (C) 2009 by Martin Dobias
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsvectorgradientcolorrampdialog.h"
+#include "qgsgradientcolorrampdialog.h"
 
 #include "qgscolorramp.h"
 #include "qgsdialog.h"
@@ -40,7 +40,7 @@
 #include <qwt_symbol.h>
 #include <qwt_legend.h>
 
-QgsVectorGradientColorRampDialog::QgsVectorGradientColorRampDialog( QgsGradientColorRamp* ramp, QWidget* parent )
+QgsGradientColorRampDialog::QgsGradientColorRampDialog( QgsGradientColorRamp* ramp, QWidget* parent )
     : QDialog( parent )
     , mRamp( ramp )
     , mCurrentPlotColorComponent( -1 )
@@ -144,7 +144,7 @@ QgsVectorGradientColorRampDialog::QgsVectorGradientColorRampDialog( QgsGradientC
   mStopEditor->selectStop( 0 );
 }
 
-QgsVectorGradientColorRampDialog::~QgsVectorGradientColorRampDialog()
+QgsGradientColorRampDialog::~QgsGradientColorRampDialog()
 {
   QSettings settings;
   settings.setValue( "/Windows/GradientEditor/geometry", saveGeometry() );
@@ -155,7 +155,7 @@ QgsVectorGradientColorRampDialog::~QgsVectorGradientColorRampDialog()
 
 }
 
-void QgsVectorGradientColorRampDialog::on_cboType_currentIndexChanged( int index )
+void QgsGradientColorRampDialog::on_cboType_currentIndexChanged( int index )
 {
   if (( index == 0 && mRamp->isDiscrete() ) ||
       ( index == 1 && !mRamp->isDiscrete() ) )
@@ -166,7 +166,7 @@ void QgsVectorGradientColorRampDialog::on_cboType_currentIndexChanged( int index
   updatePlot();
 }
 
-void QgsVectorGradientColorRampDialog::on_btnInformation_pressed()
+void QgsGradientColorRampDialog::on_btnInformation_pressed()
 {
   if ( mRamp->info().isEmpty() )
     return;
@@ -252,7 +252,7 @@ void QgsVectorGradientColorRampDialog::on_btnInformation_pressed()
   dlg->show(); //non modal
 }
 
-void QgsVectorGradientColorRampDialog::updateColorButtons()
+void QgsGradientColorRampDialog::updateColorButtons()
 {
   btnColor1->blockSignals( true );
   btnColor1->setColor( mRamp->color1() );
@@ -262,14 +262,14 @@ void QgsVectorGradientColorRampDialog::updateColorButtons()
   btnColor2->blockSignals( false );
 }
 
-void QgsVectorGradientColorRampDialog::updateStopEditor()
+void QgsGradientColorRampDialog::updateStopEditor()
 {
   mStopEditor->blockSignals( true );
   mStopEditor->setGradientRamp( *mRamp );
   mStopEditor->blockSignals( false );
 }
 
-void QgsVectorGradientColorRampDialog::selectedStopChanged( const QgsGradientStop& stop )
+void QgsGradientColorRampDialog::selectedStopChanged( const QgsGradientStop& stop )
 {
   mColorWidget->blockSignals( true );
   mColorWidget->setColor( stop.color );
@@ -293,41 +293,41 @@ void QgsVectorGradientColorRampDialog::selectedStopChanged( const QgsGradientSto
   updatePlot();
 }
 
-void QgsVectorGradientColorRampDialog::colorWidgetChanged( const QColor &color )
+void QgsGradientColorRampDialog::colorWidgetChanged( const QColor &color )
 {
   mStopEditor->setSelectedStopColor( color );
 }
 
-void QgsVectorGradientColorRampDialog::on_mPositionSpinBox_valueChanged( double val )
+void QgsGradientColorRampDialog::on_mPositionSpinBox_valueChanged( double val )
 {
   mStopEditor->setSelectedStopOffset( val / 100.0 );
 }
 
-void QgsVectorGradientColorRampDialog::on_mPlotHueCheckbox_toggled( bool checked )
+void QgsGradientColorRampDialog::on_mPlotHueCheckbox_toggled( bool checked )
 {
   mHueCurve->setVisible( checked );
   updatePlot();
 }
 
-void QgsVectorGradientColorRampDialog::on_mPlotLightnessCheckbox_toggled( bool checked )
+void QgsGradientColorRampDialog::on_mPlotLightnessCheckbox_toggled( bool checked )
 {
   mLightnessCurve->setVisible( checked );
   updatePlot();
 }
 
-void QgsVectorGradientColorRampDialog::on_mPlotSaturationCheckbox_toggled( bool checked )
+void QgsGradientColorRampDialog::on_mPlotSaturationCheckbox_toggled( bool checked )
 {
   mSaturationCurve->setVisible( checked );
   updatePlot();
 }
 
-void QgsVectorGradientColorRampDialog::on_mPlotAlphaCheckbox_toggled( bool checked )
+void QgsGradientColorRampDialog::on_mPlotAlphaCheckbox_toggled( bool checked )
 {
   mAlphaCurve->setVisible( checked );
   updatePlot();
 }
 
-void QgsVectorGradientColorRampDialog::plotMousePress( QPointF point )
+void QgsGradientColorRampDialog::plotMousePress( QPointF point )
 {
   //find closest part
 
@@ -404,12 +404,12 @@ void QgsVectorGradientColorRampDialog::plotMousePress( QPointF point )
     mStopEditor->selectStop( mCurrentPlotMarkerIndex );
 }
 
-void QgsVectorGradientColorRampDialog::plotMouseRelease( QPointF )
+void QgsGradientColorRampDialog::plotMouseRelease( QPointF )
 {
   mCurrentPlotColorComponent = -1;
 }
 
-void QgsVectorGradientColorRampDialog::plotMouseMove( QPointF point )
+void QgsGradientColorRampDialog::plotMouseMove( QPointF point )
 {
   QColor newColor = mStopEditor->selectedStop().color;
 
@@ -430,7 +430,7 @@ bool byX( QPointF p1, QPointF p2 )
   return p1.x() < p2.x();
 }
 
-void QgsVectorGradientColorRampDialog::addPlotMarker( double x, double y, const QColor& color, bool isSelected )
+void QgsGradientColorRampDialog::addPlotMarker( double x, double y, const QColor& color, bool isSelected )
 {
   QColor borderColor = color.darker( 200 );
   borderColor.setAlpha( 255 );
@@ -450,7 +450,7 @@ void QgsVectorGradientColorRampDialog::addPlotMarker( double x, double y, const
   mMarkers << marker;
 }
 
-void QgsVectorGradientColorRampDialog::addMarkersForColor( double x, const QColor& color, bool isSelected )
+void QgsGradientColorRampDialog::addMarkersForColor( double x, const QColor& color, bool isSelected )
 {
   if ( mPlotHueCheckbox->isChecked() )
     addPlotMarker( x, color.hslHueF(), color, isSelected && mCurrentPlotColorComponent == 0 );
@@ -462,7 +462,7 @@ void QgsVectorGradientColorRampDialog::addMarkersForColor( double x, const QColo
     addPlotMarker( x, color.alphaF(), color, isSelected && mCurrentPlotColorComponent == 3 );
 }
 
-void QgsVectorGradientColorRampDialog::updatePlot()
+void QgsGradientColorRampDialog::updatePlot()
 {
   // remove existing markers
   Q_FOREACH ( QwtPlotMarker* marker, mMarkers )
@@ -529,7 +529,7 @@ void QgsVectorGradientColorRampDialog::updatePlot()
   mPlot->replot();
 }
 
-void QgsVectorGradientColorRampDialog::updateRampFromStopEditor()
+void QgsGradientColorRampDialog::updateRampFromStopEditor()
 {
   *mRamp = mStopEditor->gradientRamp();
   mPositionSpinBox->blockSignals( true );
@@ -543,13 +543,13 @@ void QgsVectorGradientColorRampDialog::updateRampFromStopEditor()
   updatePlot();
 }
 
-void QgsVectorGradientColorRampDialog::setColor1( const QColor& color )
+void QgsGradientColorRampDialog::setColor1( const QColor& color )
 {
   mStopEditor->setColor1( color );
   updateColorButtons();
 }
 
-void QgsVectorGradientColorRampDialog::setColor2( const QColor& color )
+void QgsGradientColorRampDialog::setColor2( const QColor& color )
 {
   mStopEditor->setColor2( color );
   updateColorButtons();

src/gui/qgsgradientcolorrampdialog.h

@@ -1,6 +1,6 @@
 /***************************************************************************
-    qgsvectorgradientcolorrampdialog.h
+    qgsgradientcolorrampdialog.h
-    ---------------------
+    ----------------------------
     begin                : December 2009
     copyright            : (C) 2009 by Martin Dobias
     email                : wonder dot sk at gmail dot com
@@ -13,12 +13,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSVECTORGRADIENTCOLORRAMPV2DIALOG_H
+#ifndef QGSGRADIENTCOLORRAMPDIALOG_H
-#define QGSVECTORGRADIENTCOLORRAMPV2DIALOG_H
+#define QGSGRADIENTCOLORRAMPDIALOG_H
 
 #include <QDialog>
 
-#include "ui_qgsvectorgradientcolorrampv2dialogbase.h"
+#include "ui_qgsgradientcolorrampdialogbase.h"
 
 class QgsGradientColorRamp;
 class QwtPlot;
@@ -27,15 +27,15 @@ class QwtPlotMarker;
 class QgsGradientPlotEventFilter;
 
 /** \ingroup gui
- * \class QgsVectorGradientColorRampDialog
+ * \class QgsGradientColorRampDialog
  */
-class GUI_EXPORT QgsVectorGradientColorRampDialog : public QDialog, private Ui::QgsVectorGradientColorRampDialogBase
+class GUI_EXPORT QgsGradientColorRampDialog : public QDialog, private Ui::QgsGradientColorRampDialogBase
 {
     Q_OBJECT
 
   public:
-    QgsVectorGradientColorRampDialog( QgsGradientColorRamp* ramp, QWidget* parent = nullptr );
+    QgsGradientColorRampDialog( QgsGradientColorRamp* ramp, QWidget* parent = nullptr );
-    ~QgsVectorGradientColorRampDialog();
+    ~QgsGradientColorRampDialog();
 
   public slots:
     void setColor1( const QColor& color );

src/gui/qgslimitedrandomcolorrampdialog.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgsvectorrandomcolorrampdialog.cpp
+    qgslimitedrandomcolorrampdialog.cpp
     ---------------------
     begin                : November 2009
     copyright            : (C) 2009 by Martin Dobias
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsvectorrandomcolorrampdialog.h"
+#include "qgslimitedrandomcolorrampdialog.h"
 
 #include "qgssymbollayerutils.h"
 #include "qgscolorramp.h"
@@ -21,7 +21,7 @@
 #include <QColorDialog>
 
 
-QgsVectorRandomColorRampDialog::QgsVectorRandomColorRampDialog( QgsLimitedRandomColorRamp* ramp, QWidget* parent )
+QgsLimitedRandomColorRampDialog::QgsLimitedRandomColorRampDialog( QgsLimitedRandomColorRamp* ramp, QWidget* parent )
     : QDialog( parent )
     , mRamp( ramp )
 {
@@ -46,7 +46,7 @@ QgsVectorRandomColorRampDialog::QgsVectorRandomColorRampDialog( QgsLimitedRandom
   updatePreview();
 }
 
-void QgsVectorRandomColorRampDialog::updatePreview()
+void QgsLimitedRandomColorRampDialog::updatePreview()
 {
   mRamp->updateColors();
 
@@ -54,43 +54,43 @@ void QgsVectorRandomColorRampDialog::updatePreview()
   lblPreview->setPixmap( QgsSymbolLayerUtils::colorRampPreviewPixmap( mRamp, size ) );
 }
 
-void QgsVectorRandomColorRampDialog::setCount( int val )
+void QgsLimitedRandomColorRampDialog::setCount( int val )
 {
   mRamp->setCount( val );
   updatePreview();
 }
 
-void QgsVectorRandomColorRampDialog::setHue1( int val )
+void QgsLimitedRandomColorRampDialog::setHue1( int val )
 {
   mRamp->setHueMin( val );
   updatePreview();
 }
 
-void QgsVectorRandomColorRampDialog::setHue2( int val )
+void QgsLimitedRandomColorRampDialog::setHue2( int val )
 {
   mRamp->setHueMax( val );
   updatePreview();
 }
 
-void QgsVectorRandomColorRampDialog::setSat1( int val )
+void QgsLimitedRandomColorRampDialog::setSat1( int val )
 {
   mRamp->setSatMin( val );
   updatePreview();
 }
 
-void QgsVectorRandomColorRampDialog::setSat2( int val )
+void QgsLimitedRandomColorRampDialog::setSat2( int val )
 {
   mRamp->setSatMax( val );
   updatePreview();
 }
 
-void QgsVectorRandomColorRampDialog::setVal1( int val )
+void QgsLimitedRandomColorRampDialog::setVal1( int val )
 {
   mRamp->setValMin( val );
   updatePreview();
 }
 
-void QgsVectorRandomColorRampDialog::setVal2( int val )
+void QgsLimitedRandomColorRampDialog::setVal2( int val )
 {
   mRamp->setValMax( val );
   updatePreview();

src/gui/qgslimitedrandomcolorrampdialog.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgsvectorrandomcolorrampdialog.h
+    qgslimitedrandomcolorrampdialog.h
     ---------------------
     begin                : December 2009
     copyright            : (C) 2009 by Martin Dobias
@@ -13,24 +13,24 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSVECTORRANDOMCOLORRAMPV2DIALOG_H
+#ifndef QGsLIMITEDRANDOMCOLORRAMPDIALOG_H
-#define QGSVECTORRANDOMCOLORRAMPV2DIALOG_H
+#define QGsLIMITEDRANDOMCOLORRAMPDIALOG_H
 
 #include <QDialog>
 
-#include "ui_qgsvectorrandomcolorrampv2dialogbase.h"
+#include "ui_qgslimitedrandomcolorrampdialogbase.h"
 
 class QgsLimitedRandomColorRamp;
 
 /** \ingroup gui
- * \class QgsVectorRandomColorRampDialog
+ * \class QgsLimitedRandomColorRampDialog
  */
-class GUI_EXPORT QgsVectorRandomColorRampDialog : public QDialog, private Ui::QgsVectorRandomColorRampDialogBase
+class GUI_EXPORT QgsLimitedRandomColorRampDialog : public QDialog, private Ui::QgsLimitedRandomColorRampDialogBase
 {
     Q_OBJECT
 
   public:
-    QgsVectorRandomColorRampDialog( QgsLimitedRandomColorRamp* ramp, QWidget* parent = nullptr );
+    QgsLimitedRandomColorRampDialog( QgsLimitedRandomColorRamp* ramp, QWidget* parent = nullptr );
 
   public slots:
     void setCount( int val );

src/gui/symbology-ng/qgscolorrampcombobox.cpp

@@ -19,9 +19,9 @@
 #include "qgsstyle.h"
 #include "qgsstylemanagerdialog.h"
 
-#include "qgsvectorgradientcolorrampdialog.h"
+#include "qgsgradientcolorrampdialog.h"
-#include "qgsvectorrandomcolorrampdialog.h"
+#include "qgslimitedrandomcolorrampdialog.h"
-#include "qgsvectorcolorbrewercolorrampdialog.h"
+#include "qgscolorbrewercolorrampdialog.h"
 #include "qgscptcitycolorrampdialog.h"
 
 QSize QgsColorRampComboBox::rampIconSize( 50, 16 );
@@ -147,7 +147,7 @@ void QgsColorRampComboBox::editSourceRamp()
   if ( newRamp->type() == "gradient" )
   {
     QgsGradientColorRamp* gradRamp = static_cast<QgsGradientColorRamp*>( newRamp.data() );
-    QgsVectorGradientColorRampDialog dlg( gradRamp, this );
+    QgsGradientColorRampDialog dlg( gradRamp, this );
     if ( dlg.exec() && gradRamp )
     {
       setSourceColorRamp( gradRamp );
@@ -157,7 +157,7 @@ void QgsColorRampComboBox::editSourceRamp()
   else if ( newRamp->type() == "random" )
   {
     QgsLimitedRandomColorRamp* randRamp = static_cast<QgsLimitedRandomColorRamp*>( newRamp.data() );
-    QgsVectorRandomColorRampDialog dlg( randRamp, this );
+    QgsLimitedRandomColorRampDialog dlg( randRamp, this );
     if ( dlg.exec() )
     {
       setSourceColorRamp( randRamp );
@@ -167,7 +167,7 @@ void QgsColorRampComboBox::editSourceRamp()
   else if ( newRamp->type() == "colorbrewer" )
   {
     QgsColorBrewerColorRamp* brewerRamp = static_cast<QgsColorBrewerColorRamp*>( newRamp.data() );
-    QgsVectorColorBrewerColorRampDialog dlg( brewerRamp, this );
+    QgsColorBrewerColorRampDialog dlg( brewerRamp, this );
     if ( dlg.exec() )
     {
       setSourceColorRamp( brewerRamp );

src/gui/symbology-ng/qgsstylemanagerdialog.cpp

@@ -21,9 +21,9 @@
 #include "qgscolorramp.h"
 
 #include "qgssymbolselectordialog.h"
-#include "qgsvectorgradientcolorrampdialog.h"
+#include "qgsgradientcolorrampdialog.h"
-#include "qgsvectorrandomcolorrampdialog.h"
+#include "qgslimitedrandomcolorrampdialog.h"
-#include "qgsvectorcolorbrewercolorrampdialog.h"
+#include "qgscolorbrewercolorrampdialog.h"
 #include "qgscptcitycolorrampdialog.h"
 #include "qgsstyleexportimportdialog.h"
 #include "qgssmartgroupeditordialog.h"
@@ -458,7 +458,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget* parent, QgsStyle* st
   if ( rampType == tr( "Gradient" ) )
   {
     QgsGradientColorRamp* gradRamp = new QgsGradientColorRamp();
-    QgsVectorGradientColorRampDialog dlg( gradRamp, parent );
+    QgsGradientColorRampDialog dlg( gradRamp, parent );
     if ( !dlg.exec() )
     {
       delete gradRamp;
@@ -470,7 +470,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget* parent, QgsStyle* st
   else if ( rampType == tr( "Random" ) )
   {
     QgsLimitedRandomColorRamp* randRamp = new QgsLimitedRandomColorRamp();
-    QgsVectorRandomColorRampDialog dlg( randRamp, parent );
+    QgsLimitedRandomColorRampDialog dlg( randRamp, parent );
     if ( !dlg.exec() )
     {
       delete randRamp;
@@ -482,7 +482,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget* parent, QgsStyle* st
   else if ( rampType == tr( "ColorBrewer" ) )
   {
     QgsColorBrewerColorRamp* brewerRamp = new QgsColorBrewerColorRamp();
-    QgsVectorColorBrewerColorRampDialog dlg( brewerRamp, parent );
+    QgsColorBrewerColorRampDialog dlg( brewerRamp, parent );
     if ( !dlg.exec() )
     {
       delete brewerRamp;
@@ -638,7 +638,7 @@ bool QgsStyleManagerDialog::editColorRamp()
   if ( ramp->type() == "gradient" )
   {
     QgsGradientColorRamp* gradRamp = static_cast<QgsGradientColorRamp*>( ramp );
-    QgsVectorGradientColorRampDialog dlg( gradRamp, this );
+    QgsGradientColorRampDialog dlg( gradRamp, this );
     if ( !dlg.exec() )
     {
       delete ramp;
@@ -648,7 +648,7 @@ bool QgsStyleManagerDialog::editColorRamp()
   else if ( ramp->type() == "random" )
   {
     QgsLimitedRandomColorRamp* randRamp = static_cast<QgsLimitedRandomColorRamp*>( ramp );
-    QgsVectorRandomColorRampDialog dlg( randRamp, this );
+    QgsLimitedRandomColorRampDialog dlg( randRamp, this );
     if ( !dlg.exec() )
     {
       delete ramp;
@@ -658,7 +658,7 @@ bool QgsStyleManagerDialog::editColorRamp()
   else if ( ramp->type() == "colorbrewer" )
   {
     QgsColorBrewerColorRamp* brewerRamp = static_cast<QgsColorBrewerColorRamp*>( ramp );
-    QgsVectorColorBrewerColorRampDialog dlg( brewerRamp, this );
+    QgsColorBrewerColorRampDialog dlg( brewerRamp, this );
     if ( !dlg.exec() )
     {
       delete ramp;

src/gui/symbology-ng/qgssymbollayerwidget.cpp

@@ -28,7 +28,7 @@
 #include "qgssvgcache.h"
 #include "qgssymbollayerutils.h"
 #include "qgscolorramp.h"
-#include "qgsvectorgradientcolorrampdialog.h"
+#include "qgsgradientcolorrampdialog.h"
 #include "qgsdatadefined.h"
 #include "qgsstyle.h" //for symbol selector dialog
 #include "qgsmapcanvas.h"

src/ui/qgscolorbrewercolorrampdialogbase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QgsVectorColorBrewerColorRampDialogBase</class>
+ <class>QgsColorBrewerColorRampDialogBase</class>
- <widget class="QDialog" name="QgsVectorColorBrewerColorRampDialogBase">
+ <widget class="QDialog" name="QgsColorBrewerColorRampDialogBase">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -120,7 +120,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>QgsVectorColorBrewerColorRampDialogBase</receiver>
+   <receiver>QgsColorBrewerColorRampDialogBase</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -136,7 +136,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>QgsVectorColorBrewerColorRampDialogBase</receiver>
+   <receiver>QgsColorBrewerColorRampDialogBase</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

src/ui/qgsgradientcolorrampdialogbase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QgsVectorGradientColorRampDialogBase</class>
+ <class>QgsGradientColorRampDialogBase</class>
- <widget class="QDialog" name="QgsVectorGradientColorRampDialogBase">
+ <widget class="QDialog" name="QgsGradientColorRampDialogBase">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -330,6 +330,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsColorButton</class>
    <extends>QToolButton</extends>
@@ -342,11 +347,6 @@
    <header>qgsgradientstopeditor.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QgsDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>qgsdoublespinbox.h</header>
-  </customwidget>
   <customwidget>
    <class>QgsCompoundColorWidget</class>
    <extends>QWidget</extends>
@@ -381,7 +381,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>QgsVectorGradientColorRampDialogBase</receiver>
+   <receiver>QgsGradientColorRampDialogBase</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -397,7 +397,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>QgsVectorGradientColorRampDialogBase</receiver>
+   <receiver>QgsGradientColorRampDialogBase</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

src/ui/qgslimitedrandomcolorrampdialogbase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QgsVectorRandomColorRampDialogBase</class>
+ <class>QgsLimitedRandomColorRampDialogBase</class>
- <widget class="QDialog" name="QgsVectorRandomColorRampDialogBase">
+ <widget class="QDialog" name="QgsLimitedRandomColorRampDialogBase">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -224,7 +224,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>QgsVectorRandomColorRampDialogBase</receiver>
+   <receiver>QgsLimitedRandomColorRampDialogBase</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -240,7 +240,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>QgsVectorRandomColorRampDialogBase</receiver>
+   <receiver>QgsLimitedRandomColorRampDialogBase</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">