Rename classes

python/PyQt6/core/auto_generated/raster/qgsrasterinterface.sip.in

@@ -125,7 +125,7 @@ Base class for processing filters like renderers, reprojector, resampler etc.
 #include <qgssinglebandcolordatarenderer.h>
 #include <qgssinglebandgrayrenderer.h>
 #include <qgssinglebandpseudocolorrenderer.h>
-#include <qgssinglecolorrenderer.h>
+#include <qgsrastersinglecolorrenderer.h>
 #include <qgsrastercontourrenderer.h>
 %End
 %ConvertToSubClassCode
@@ -158,8 +158,8 @@ Base class for processing filters like renderers, reprojector, resampler etc.
         sipType = sipType_QgsSingleBandGrayRenderer;
       else if ( dynamic_cast<QgsSingleBandPseudoColorRenderer *>( sipCpp ) )
         sipType = sipType_QgsSingleBandPseudoColorRenderer;
-      else if ( dynamic_cast<QgsSingleColorRenderer *>( sipCpp ) )
+      else if ( dynamic_cast<QgsRasterSingleColorRenderer *>( sipCpp ) )
-        sipType = sipType_QgsSingleColorRenderer;
+        sipType = sipType_QgsRasterSingleColorRenderer;
       else if ( dynamic_cast<QgsRasterContourRenderer *>( sipCpp ) )
         sipType = sipType_QgsRasterContourRenderer;
       else

python/PyQt6/core/auto_generated/raster/qgsrastersinglecolorrenderer.sip.in

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/raster/qgssinglecolorrenderer.h                             *
+ * src/core/raster/qgsrastersinglecolorrenderer.h                       *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -11,7 +11,7 @@
 
 
 
-class QgsSingleColorRenderer: QgsRasterRenderer
+class QgsRasterSingleColorRenderer: QgsRasterRenderer
 {
 %Docstring(signature="appended")
 Raster single color renderer pipe.
@@ -20,20 +20,20 @@ Raster single color renderer pipe.
 %End
 
 %TypeHeaderCode
-#include "qgssinglecolorrenderer.h"
+#include "qgsrastersinglecolorrenderer.h"
 %End
   public:
 
-    QgsSingleColorRenderer( QgsRasterInterface *input, QColor color );
+    QgsRasterSingleColorRenderer( QgsRasterInterface *input, QColor color );
 %Docstring
 Creates a single ``color`` renderer
 %End
 
 
-    virtual QgsSingleColorRenderer *clone() const /Factory/;
+    virtual QgsRasterSingleColorRenderer *clone() const /Factory/;
 
 %Docstring
-QgsSingleColorRenderer cannot be copied. Use :py:func:`~QgsSingleColorRenderer.clone` instead.
+QgsRasterSingleColorRenderer cannot be copied. Use :py:func:`~QgsRasterSingleColorRenderer.clone` instead.
 %End
     virtual Qgis::RasterRendererFlags flags() const;
 
@@ -63,14 +63,14 @@ Sets the single color used by the renderer.
 
 
   private:
-    QgsSingleColorRenderer( const QgsSingleColorRenderer & );
+    QgsRasterSingleColorRenderer( const QgsRasterSingleColorRenderer & );
-    const QgsSingleColorRenderer &operator=( const QgsSingleColorRenderer & );
+    const QgsRasterSingleColorRenderer &operator=( const QgsRasterSingleColorRenderer & );
 };
 
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/raster/qgssinglecolorrenderer.h                             *
+ * src/core/raster/qgsrastersinglecolorrenderer.h                       *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

python/PyQt6/core/core_auto.sip

@@ -654,7 +654,7 @@
 %Include auto_generated/raster/qgssinglebandcolordatarenderer.sip
 %Include auto_generated/raster/qgssinglebandgrayrenderer.sip
 %Include auto_generated/raster/qgssinglebandpseudocolorrenderer.sip
-%Include auto_generated/raster/qgssinglecolorrenderer.sip
+%Include auto_generated/raster/qgsrastersinglecolorrenderer.sip
 %Include auto_generated/scalebar/qgsdoubleboxscalebarrenderer.sip
 %Include auto_generated/scalebar/qgshollowscalebarrenderer.sip
 %Include auto_generated/scalebar/qgsnumericscalebarrenderer.sip

python/PyQt6/gui/auto_generated/raster/qgsrastersinglecolorrendererwidget.sip.in

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/gui/raster/qgssinglecolorrendererwidget.h                        *
+ * src/gui/raster/qgsrastersinglecolorrendererwidget.h                  *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -10,7 +10,7 @@
 
 
 
-class QgsSingleColorRendererWidget: QgsRasterRendererWidget
+class QgsRasterSingleColorRendererWidget: QgsRasterRendererWidget
 {
 %Docstring(signature="appended")
 Renderer widget for the single color renderer.
@@ -19,10 +19,10 @@ Renderer widget for the single color renderer.
 %End
 
 %TypeHeaderCode
-#include "qgssinglecolorrendererwidget.h"
+#include "qgsrastersinglecolorrendererwidget.h"
 %End
   public:
-    QgsSingleColorRendererWidget( QgsRasterLayer *layer, const QgsRectangle &extent = QgsRectangle() );
+    QgsRasterSingleColorRendererWidget( QgsRasterLayer *layer, const QgsRectangle &extent = QgsRectangle() );
 %Docstring
 Constructs the widget
 %End
@@ -45,7 +45,7 @@ Sets the widget state from the specified renderer.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/gui/raster/qgssinglecolorrendererwidget.h                        *
+ * src/gui/raster/qgsrastersinglecolorrendererwidget.h                  *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

python/PyQt6/gui/gui_auto.sip

@@ -461,7 +461,7 @@
 %Include auto_generated/raster/qgsrendererrasterpropertieswidget.sip
 %Include auto_generated/raster/qgssinglebandgrayrendererwidget.sip
 %Include auto_generated/raster/qgssinglebandpseudocolorrendererwidget.sip
-%Include auto_generated/raster/qgssinglecolorrendererwidget.sip
+%Include auto_generated/raster/qgsrastersinglecolorrendererwidget.sip
 %Include auto_generated/raster/qgsrasterlayerproperties.sip
 %Include auto_generated/raster/qgsrasterlayertemporalpropertieswidget.sip
 %Include auto_generated/vector/qgsfieldcalculator.sip

python/core/auto_generated/raster/qgsrasterinterface.sip.in

@@ -125,7 +125,7 @@ Base class for processing filters like renderers, reprojector, resampler etc.
 #include <qgssinglebandcolordatarenderer.h>
 #include <qgssinglebandgrayrenderer.h>
 #include <qgssinglebandpseudocolorrenderer.h>
-#include <qgssinglecolorrenderer.h>
+#include <qgsrastersinglecolorrenderer.h>
 #include <qgsrastercontourrenderer.h>
 %End
 %ConvertToSubClassCode
@@ -158,8 +158,8 @@ Base class for processing filters like renderers, reprojector, resampler etc.
         sipType = sipType_QgsSingleBandGrayRenderer;
       else if ( dynamic_cast<QgsSingleBandPseudoColorRenderer *>( sipCpp ) )
         sipType = sipType_QgsSingleBandPseudoColorRenderer;
-      else if ( dynamic_cast<QgsSingleColorRenderer *>( sipCpp ) )
+      else if ( dynamic_cast<QgsRasterSingleColorRenderer *>( sipCpp ) )
-        sipType = sipType_QgsSingleColorRenderer;
+        sipType = sipType_QgsRasterSingleColorRenderer;
       else if ( dynamic_cast<QgsRasterContourRenderer *>( sipCpp ) )
         sipType = sipType_QgsRasterContourRenderer;
       else

python/core/auto_generated/raster/qgsrastersinglecolorrenderer.sip.in

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/raster/qgssinglecolorrenderer.h                             *
+ * src/core/raster/qgsrastersinglecolorrenderer.h                       *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -11,7 +11,7 @@
 
 
 
-class QgsSingleColorRenderer: QgsRasterRenderer
+class QgsRasterSingleColorRenderer: QgsRasterRenderer
 {
 %Docstring(signature="appended")
 Raster single color renderer pipe.
@@ -20,20 +20,20 @@ Raster single color renderer pipe.
 %End
 
 %TypeHeaderCode
-#include "qgssinglecolorrenderer.h"
+#include "qgsrastersinglecolorrenderer.h"
 %End
   public:
 
-    QgsSingleColorRenderer( QgsRasterInterface *input, QColor color );
+    QgsRasterSingleColorRenderer( QgsRasterInterface *input, QColor color );
 %Docstring
 Creates a single ``color`` renderer
 %End
 
 
-    virtual QgsSingleColorRenderer *clone() const /Factory/;
+    virtual QgsRasterSingleColorRenderer *clone() const /Factory/;
 
 %Docstring
-QgsSingleColorRenderer cannot be copied. Use :py:func:`~QgsSingleColorRenderer.clone` instead.
+QgsRasterSingleColorRenderer cannot be copied. Use :py:func:`~QgsRasterSingleColorRenderer.clone` instead.
 %End
     virtual Qgis::RasterRendererFlags flags() const;
 
@@ -63,14 +63,14 @@ Sets the single color used by the renderer.
 
 
   private:
-    QgsSingleColorRenderer( const QgsSingleColorRenderer & );
+    QgsRasterSingleColorRenderer( const QgsRasterSingleColorRenderer & );
-    const QgsSingleColorRenderer &operator=( const QgsSingleColorRenderer & );
+    const QgsRasterSingleColorRenderer &operator=( const QgsRasterSingleColorRenderer & );
 };
 
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/raster/qgssinglecolorrenderer.h                             *
+ * src/core/raster/qgsrastersinglecolorrenderer.h                       *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

python/core/core_auto.sip

@@ -654,7 +654,7 @@
 %Include auto_generated/raster/qgssinglebandcolordatarenderer.sip
 %Include auto_generated/raster/qgssinglebandgrayrenderer.sip
 %Include auto_generated/raster/qgssinglebandpseudocolorrenderer.sip
-%Include auto_generated/raster/qgssinglecolorrenderer.sip
+%Include auto_generated/raster/qgsrastersinglecolorrenderer.sip
 %Include auto_generated/scalebar/qgsdoubleboxscalebarrenderer.sip
 %Include auto_generated/scalebar/qgshollowscalebarrenderer.sip
 %Include auto_generated/scalebar/qgsnumericscalebarrenderer.sip

python/gui/auto_generated/raster/qgsrastersinglecolorrendererwidget.sip.in

@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/gui/raster/qgssinglecolorrendererwidget.h                        *
+ * src/gui/raster/qgsrastersinglecolorrendererwidget.h                  *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -10,7 +10,7 @@
 
 
 
-class QgsSingleColorRendererWidget: QgsRasterRendererWidget
+class QgsRasterSingleColorRendererWidget: QgsRasterRendererWidget
 {
 %Docstring(signature="appended")
 Renderer widget for the single color renderer.
@@ -19,10 +19,10 @@ Renderer widget for the single color renderer.
 %End
 
 %TypeHeaderCode
-#include "qgssinglecolorrendererwidget.h"
+#include "qgsrastersinglecolorrendererwidget.h"
 %End
   public:
-    QgsSingleColorRendererWidget( QgsRasterLayer *layer, const QgsRectangle &extent = QgsRectangle() );
+    QgsRasterSingleColorRendererWidget( QgsRasterLayer *layer, const QgsRectangle &extent = QgsRectangle() );
 %Docstring
 Constructs the widget
 %End
@@ -45,7 +45,7 @@ Sets the widget state from the specified renderer.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/gui/raster/qgssinglecolorrendererwidget.h                        *
+ * src/gui/raster/qgsrastersinglecolorrendererwidget.h                  *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/

python/gui/gui_auto.sip

@@ -461,7 +461,7 @@
 %Include auto_generated/raster/qgsrendererrasterpropertieswidget.sip
 %Include auto_generated/raster/qgssinglebandgrayrendererwidget.sip
 %Include auto_generated/raster/qgssinglebandpseudocolorrendererwidget.sip
-%Include auto_generated/raster/qgssinglecolorrendererwidget.sip
+%Include auto_generated/raster/qgsrastersinglecolorrendererwidget.sip
 %Include auto_generated/raster/qgsrasterlayerproperties.sip
 %Include auto_generated/raster/qgsrasterlayertemporalpropertieswidget.sip
 %Include auto_generated/vector/qgsfieldcalculator.sip

src/core/CMakeLists.txt

@@ -784,7 +784,7 @@ set(QGIS_CORE_SRCS
   raster/qgssinglebandcolordatarenderer.cpp
   raster/qgssinglebandgrayrenderer.cpp
   raster/qgssinglebandpseudocolorrenderer.cpp
-  raster/qgssinglecolorrenderer.cpp
+  raster/qgsrastersinglecolorrenderer.cpp
   raster/qgshillshaderenderer.cpp
 
   mesh/qgsmesh3daveraging.cpp
@@ -1882,7 +1882,7 @@ set(QGIS_CORE_HDRS
   raster/qgssinglebandcolordatarenderer.h
   raster/qgssinglebandgrayrenderer.h
   raster/qgssinglebandpseudocolorrenderer.h
-  raster/qgssinglecolorrenderer.h
+  raster/qgsrastersinglecolorrenderer.h
 
   scalebar/qgsdoubleboxscalebarrenderer.h
   scalebar/qgshollowscalebarrenderer.h

src/core/raster/qgsrasterinterface.h

@@ -151,7 +151,7 @@ class CORE_EXPORT QgsRasterInterface
 #include <qgssinglebandcolordatarenderer.h>
 #include <qgssinglebandgrayrenderer.h>
 #include <qgssinglebandpseudocolorrenderer.h>
-#include <qgssinglecolorrenderer.h>
+#include <qgsrastersinglecolorrenderer.h>
 #include <qgsrastercontourrenderer.h>
 #endif
 
@@ -187,8 +187,8 @@ class CORE_EXPORT QgsRasterInterface
         sipType = sipType_QgsSingleBandGrayRenderer;
       else if ( dynamic_cast<QgsSingleBandPseudoColorRenderer *>( sipCpp ) )
         sipType = sipType_QgsSingleBandPseudoColorRenderer;
-      else if ( dynamic_cast<QgsSingleColorRenderer *>( sipCpp ) )
+      else if ( dynamic_cast<QgsRasterSingleColorRenderer *>( sipCpp ) )
-        sipType = sipType_QgsSingleColorRenderer;
+        sipType = sipType_QgsRasterSingleColorRenderer;
       else if ( dynamic_cast<QgsRasterContourRenderer *>( sipCpp ) )
         sipType = sipType_QgsRasterContourRenderer;
       else

src/core/raster/qgsrasterrendererregistry.cpp

@@ -26,7 +26,7 @@
 #include "qgssinglebandcolordatarenderer.h"
 #include "qgssinglebandgrayrenderer.h"
 #include "qgssinglebandpseudocolorrenderer.h"
-#include "qgssinglecolorrenderer.h"
+#include "qgsrastersinglecolorrenderer.h"
 #include "qgshillshaderenderer.h"
 #include "qgsapplication.h"
 #include "qgssettings.h"
@@ -64,7 +64,7 @@ QgsRasterRendererRegistry::QgsRasterRendererRegistry()
   insert( QgsRasterRendererRegistryEntry( QStringLiteral( "singlebandcolordata" ), QObject::tr( "Singleband color data" ),
                                           QgsSingleBandColorDataRenderer::create, nullptr ) );
   insert( QgsRasterRendererRegistryEntry( QStringLiteral( "singlecolor" ), QObject::tr( "Single color" ),
-                                          QgsSingleColorRenderer::create, nullptr ) );
+                                          QgsRasterSingleColorRenderer::create, nullptr ) );
   insert( QgsRasterRendererRegistryEntry( QStringLiteral( "hillshade" ), QObject::tr( "Hillshade" ),
                                           QgsHillshadeRenderer::create, nullptr ) );
   insert( QgsRasterRendererRegistryEntry( QStringLiteral( "contour" ), QObject::tr( "Contours" ),

src/core/raster/qgsrastersinglecolorrenderer.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-                         qgssinglecolorrenderer.cpp
+                         qgsrastersinglecolorrenderer.cpp
                          -----------------------------
     begin                : April 2024
     copyright            : (C) 2024 by Mathieu Pellerin
@@ -15,32 +15,32 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgssinglecolorrenderer.h"
+#include "qgsrastersinglecolorrenderer.h"
 #include "qgsrastertransparency.h"
 #include "qgscolorutils.h"
 
 #include <QDomDocument>
 #include <QDomElement>
 
-QgsSingleColorRenderer::QgsSingleColorRenderer( QgsRasterInterface *input, QColor color )
+QgsRasterSingleColorRenderer::QgsRasterSingleColorRenderer( QgsRasterInterface *input, QColor color )
   : QgsRasterRenderer( input, QStringLiteral( "singlecolor" ) )
   , mColor( color )
 {
 }
 
-QgsSingleColorRenderer *QgsSingleColorRenderer::clone() const
+QgsRasterSingleColorRenderer *QgsRasterSingleColorRenderer::clone() const
 {
-  QgsSingleColorRenderer *renderer = new QgsSingleColorRenderer( nullptr, mColor );
+  QgsRasterSingleColorRenderer *renderer = new QgsRasterSingleColorRenderer( nullptr, mColor );
   renderer->copyCommonProperties( this );
   return renderer;
 }
 
-Qgis::RasterRendererFlags QgsSingleColorRenderer::flags() const
+Qgis::RasterRendererFlags QgsRasterSingleColorRenderer::flags() const
 {
   return Qgis::RasterRendererFlag::InternalLayerOpacityHandling;
 }
 
-QgsRasterRenderer *QgsSingleColorRenderer::create( const QDomElement &elem, QgsRasterInterface *input )
+QgsRasterRenderer *QgsRasterSingleColorRenderer::create( const QDomElement &elem, QgsRasterInterface *input )
 {
   if ( elem.isNull() )
   {
@@ -48,13 +48,13 @@ QgsRasterRenderer *QgsSingleColorRenderer::create( const QDomElement &elem, QgsR
   }
 
   const QColor color = QgsColorUtils::colorFromString( elem.attribute( QStringLiteral( "color" ), QStringLiteral( "0,0,0" ) ) );
-  QgsSingleColorRenderer *r = new QgsSingleColorRenderer( input, color );
+  QgsRasterSingleColorRenderer *r = new QgsRasterSingleColorRenderer( input, color );
   r->readXml( elem );
 
   return r;
 }
 
-QgsRasterBlock *QgsSingleColorRenderer::block( int bandNo, const QgsRectangle &extent, int width, int height, QgsRasterBlockFeedback *feedback )
+QgsRasterBlock *QgsRasterSingleColorRenderer::block( int bandNo, const QgsRectangle &extent, int width, int height, QgsRasterBlockFeedback *feedback )
 {
   QgsDebugMsgLevel( QStringLiteral( "width = %1 height = %2" ).arg( width ).arg( height ), 4 );
 
@@ -128,17 +128,17 @@ QgsRasterBlock *QgsSingleColorRenderer::block( int bandNo, const QgsRectangle &e
   return outputBlock.release();
 }
 
-void QgsSingleColorRenderer::setColor( QColor &color )
+void QgsRasterSingleColorRenderer::setColor( QColor &color )
 {
   mColor = color;;
 }
 
-QColor QgsSingleColorRenderer::color() const
+QColor QgsRasterSingleColorRenderer::color() const
 {
   return mColor;
 }
 
-void QgsSingleColorRenderer::writeXml( QDomDocument &doc, QDomElement &parentElem ) const
+void QgsRasterSingleColorRenderer::writeXml( QDomDocument &doc, QDomElement &parentElem ) const
 {
   if ( parentElem.isNull() )
   {
@@ -153,7 +153,7 @@ void QgsSingleColorRenderer::writeXml( QDomDocument &doc, QDomElement &parentEle
   parentElem.appendChild( rasterRendererElem );
 }
 
-QList<int> QgsSingleColorRenderer::usesBands() const
+QList<int> QgsRasterSingleColorRenderer::usesBands() const
 {
   QList<int> bandList;
   for ( int i = 0; i <= bandCount(); i++ )

src/core/raster/qgsrastersinglecolorrenderer.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-                         qgssinglecolorrenderer.h
+                         qgsrastersinglecolorrenderer.h
                          ---------------------------
     begin                : April 2024
     copyright            : (C) 2024 by Mathieu Pellerin
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSSINGLECOLORRENDERER_H
+#ifndef QGSRASTERSINGLECOLORRENDERER_H
-#define QGSSINGLECOLORRENDERER_H
+#define QGSRASTERSINGLECOLORRENDERER_H
 
 #include "qgis_core.h"
 #include "qgis_sip.h"
@@ -31,19 +31,19 @@ class QDomElement;
   * \brief Raster single color renderer pipe.
   * \since QGIS 3.38
   */
-class CORE_EXPORT QgsSingleColorRenderer: public QgsRasterRenderer
+class CORE_EXPORT QgsRasterSingleColorRenderer: public QgsRasterRenderer
 {
   public:
 
     //! Creates a single \a color renderer
-    QgsSingleColorRenderer( QgsRasterInterface *input, QColor color );
+    QgsRasterSingleColorRenderer( QgsRasterInterface *input, QColor color );
 
-    //! QgsSingleColorRenderer cannot be copied. Use clone() instead.
+    //! QgsRasterSingleColorRenderer cannot be copied. Use clone() instead.
-    QgsSingleColorRenderer( const QgsSingleColorRenderer & ) = delete;
+    QgsRasterSingleColorRenderer( const QgsRasterSingleColorRenderer & ) = delete;
-    //! QgsSingleColorRenderer cannot be copied. Use clone() instead.
+    //! QgsRasterSingleColorRenderer cannot be copied. Use clone() instead.
-    const QgsSingleColorRenderer &operator=( const QgsSingleColorRenderer & ) = delete;
+    const QgsRasterSingleColorRenderer &operator=( const QgsRasterSingleColorRenderer & ) = delete;
 
-    QgsSingleColorRenderer *clone() const override SIP_FACTORY;
+    QgsRasterSingleColorRenderer *clone() const override SIP_FACTORY;
     Qgis::RasterRendererFlags flags() const override;
 
     //! Creates an instance of the renderer based on definition from XML (used by the renderer registry)
@@ -67,11 +67,11 @@ class CORE_EXPORT QgsSingleColorRenderer: public QgsRasterRenderer
 
   private:
 #ifdef SIP_RUN
-    QgsSingleColorRenderer( const QgsSingleColorRenderer & );
+    QgsRasterSingleColorRenderer( const QgsRasterSingleColorRenderer & );
-    const QgsSingleColorRenderer &operator=( const QgsSingleColorRenderer & );
+    const QgsRasterSingleColorRenderer &operator=( const QgsRasterSingleColorRenderer & );
 #endif
 
     QColor mColor;
 };
 
-#endif // QGSSINGLECOLORRENDERER_H
+#endif // QGSRASTERSINGLECOLORRENDERER_H

src/gui/CMakeLists.txt

@@ -24,7 +24,7 @@ set(QGIS_GUI_SRCS
   raster/qgsrasterrendererwidget.cpp
   raster/qgssinglebandgrayrendererwidget.cpp
   raster/qgssinglebandpseudocolorrendererwidget.cpp
-  raster/qgssinglecolorrendererwidget.cpp
+  raster/qgsrastersinglecolorrendererwidget.cpp
   raster/qgsrendererrasterpropertieswidget.cpp
   raster/qgsrastertransparencywidget.cpp
   raster/qgshillshaderendererwidget.cpp
@@ -1457,7 +1457,7 @@ set(QGIS_GUI_HDRS
   raster/qgsrendererrasterpropertieswidget.h
   raster/qgssinglebandgrayrendererwidget.h
   raster/qgssinglebandpseudocolorrendererwidget.h
-  raster/qgssinglecolorrendererwidget.h
+  raster/qgsrastersinglecolorrendererwidget.h
   raster/qgsrasterlayerproperties.h
   raster/qgsrasterlayertemporalpropertieswidget.h
   raster/qgsresamplingutils.h

src/gui/raster/qgsrasterlayerproperties.cpp

@@ -49,7 +49,7 @@
 #include "qgsrastertransparency.h"
 #include "qgssinglebandgrayrendererwidget.h"
 #include "qgssinglebandpseudocolorrendererwidget.h"
-#include "qgssinglecolorrendererwidget.h"
+#include "qgsrastersinglecolorrendererwidget.h"
 #include "qgshuesaturationfilter.h"
 #include "qgshillshaderendererwidget.h"
 #include "qgssettings.h"
@@ -463,7 +463,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanv
   QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "singlebandgray" ), QgsSingleBandGrayRendererWidget::create );
   QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "hillshade" ), QgsHillshadeRendererWidget::create );
   QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "contour" ), QgsRasterContourRendererWidget::create );
-  QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "singlecolor" ), QgsSingleColorRendererWidget::create );
+  QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "singlecolor" ), QgsRasterSingleColorRendererWidget::create );
 
   //fill available renderers into combo box
   QgsRasterRendererRegistryEntry entry;

src/gui/raster/qgsrastersinglecolorrendererwidget.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-                         qgssinglecolorrendererwidget.cpp
+                         qgsrastersinglecolorrendererwidget.cpp
                          ---------------------------------
     begin                : April 2024
     copyright            : (C) 2024 by Mathieu Pellerin
@@ -15,12 +15,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgssinglecolorrendererwidget.h"
+#include "qgsrastersinglecolorrendererwidget.h"
-#include "qgssinglecolorrenderer.h"
+#include "qgsrastersinglecolorrenderer.h"
 #include "qgsrasterlayer.h"
 #include "qgsrasterdataprovider.h"
 
-QgsSingleColorRendererWidget::QgsSingleColorRendererWidget( QgsRasterLayer *layer, const QgsRectangle &extent )
+QgsRasterSingleColorRendererWidget::QgsRasterSingleColorRendererWidget( QgsRasterLayer *layer, const QgsRectangle &extent )
   : QgsRasterRendererWidget( layer, extent )
 {
   setupUi( this );
@@ -33,13 +33,13 @@ QgsSingleColorRendererWidget::QgsSingleColorRendererWidget( QgsRasterLayer *laye
       return;
     }
 
-    connect( mColor, &QgsColorButton::colorChanged, this, &QgsSingleColorRendererWidget::colorChanged );
+    connect( mColor, &QgsColorButton::colorChanged, this, &QgsRasterSingleColorRendererWidget::colorChanged );
 
     setFromRenderer( layer->renderer() );
   }
 }
 
-QgsRasterRenderer *QgsSingleColorRendererWidget::renderer()
+QgsRasterRenderer *QgsRasterSingleColorRendererWidget::renderer()
 {
   if ( !mRasterLayer )
   {
@@ -52,18 +52,18 @@ QgsRasterRenderer *QgsSingleColorRendererWidget::renderer()
     return nullptr;
   }
 
-  QgsSingleColorRenderer *renderer = new QgsSingleColorRenderer( provider, mColor->color() );
+  QgsRasterSingleColorRenderer *renderer = new QgsRasterSingleColorRenderer( provider, mColor->color() );
   return renderer;
 }
 
-void QgsSingleColorRendererWidget::colorChanged( const QColor & )
+void QgsRasterSingleColorRendererWidget::colorChanged( const QColor & )
 {
   emit widgetChanged();
 }
 
-void QgsSingleColorRendererWidget::setFromRenderer( const QgsRasterRenderer *r )
+void QgsRasterSingleColorRendererWidget::setFromRenderer( const QgsRasterRenderer *r )
 {
-  const QgsSingleColorRenderer *scr = dynamic_cast<const QgsSingleColorRenderer *>( r );
+  const QgsRasterSingleColorRenderer *scr = dynamic_cast<const QgsRasterSingleColorRenderer *>( r );
   if ( scr )
   {
     mColor->setColor( scr->color() );

src/gui/raster/qgsrastersinglecolorrendererwidget.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-                         qgssinglecolorrendererwidget.h
+                         qgsrastersinglecolorrendererwidget.h
                          ---------------------------------
     begin                : April 2024
     copyright            : (C) 2024 by Mathieu Pellerin
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSSINGLECOLORRENDERERWIDGET_H
+#ifndef QGSRASTERSINGLECOLORRENDERERWIDGET_H
-#define QGSSINGLECOLORRENDERERWIDGET_H
+#define QGSRASTERSINGLECOLORRENDERERWIDGET_H
 
-#include "ui_qgssinglecolorrendererwidgetbase.h"
+#include "ui_qgsrastersinglecolorrendererwidgetbase.h"
 
 #include "qgsrasterrendererwidget.h"
 #include "qgis_sip.h"
@@ -29,15 +29,15 @@
  * \ingroup gui
  * \since QGIS 3.38
  */
-class GUI_EXPORT QgsSingleColorRendererWidget: public QgsRasterRendererWidget, private Ui::QgsSingleColorRendererWidgetBase
+class GUI_EXPORT QgsRasterSingleColorRendererWidget: public QgsRasterRendererWidget, private Ui::QgsRasterSingleColorRendererWidgetBase
 {
     Q_OBJECT
   public:
     //! Constructs the widget
-    QgsSingleColorRendererWidget( QgsRasterLayer *layer, const QgsRectangle &extent = QgsRectangle() );
+    QgsRasterSingleColorRendererWidget( QgsRasterLayer *layer, const QgsRectangle &extent = QgsRectangle() );
 
     //! Widget creation function (use by the renderer registry)
-    static QgsRasterRendererWidget *create( QgsRasterLayer *layer, const QgsRectangle &extent ) SIP_FACTORY { return new QgsSingleColorRendererWidget( layer, extent ); }
+    static QgsRasterRendererWidget *create( QgsRasterLayer *layer, const QgsRectangle &extent ) SIP_FACTORY { return new QgsRasterSingleColorRendererWidget( layer, extent ); }
 
     QgsRasterRenderer *renderer() SIP_FACTORY override;
 
@@ -51,4 +51,4 @@ class GUI_EXPORT QgsSingleColorRendererWidget: public QgsRasterRendererWidget, p
 
 };
 
-#endif // QGSSINGLECOLORRENDERERWIDGET_H
+#endif // QGSRASTERSINGLECOLORRENDERERWIDGET_H

src/gui/raster/qgsrendererrasterpropertieswidget.cpp

@@ -24,7 +24,7 @@
 #include "qgsrasterrendererregistry.h"
 #include "qgssinglebandgrayrendererwidget.h"
 #include "qgssinglebandpseudocolorrendererwidget.h"
-#include "qgssinglecolorrendererwidget.h"
+#include "qgsrastersinglecolorrendererwidget.h"
 #include "qgsmultibandcolorrendererwidget.h"
 #include "qgspalettedrendererwidget.h"
 #include "qgshillshaderendererwidget.h"
@@ -44,7 +44,7 @@ void QgsRendererRasterPropertiesWidget::initRendererWidgetFunctions()
   QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "multibandcolor" ), QgsMultiBandColorRendererWidget::create );
   QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "singlebandpseudocolor" ), QgsSingleBandPseudoColorRendererWidget::create );
   QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "singlebandgray" ), QgsSingleBandGrayRendererWidget::create );
-  QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "singlecolor" ), QgsSingleColorRendererWidget::create );
+  QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "singlecolor" ), QgsRasterSingleColorRendererWidget::create );
   QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "hillshade" ), QgsHillshadeRendererWidget::create );
   QgsApplication::rasterRendererRegistry()->insertWidgetFunction( QStringLiteral( "contour" ), QgsRasterContourRendererWidget::create );
 

src/ui/qgsrastersinglecolorrendererwidgetbase.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QgsSingleColorRendererWidgetBase</class>
+ <class>QgsRasterSingleColorRendererWidgetBase</class>
- <widget class="QWidget" name="QgsSingleColorRendererWidgetBase">
+ <widget class="QWidget" name="QgsRasterSingleColorRendererWidgetBase">
   <property name="geometry">
    <rect>
     <x>0</x>

tests/src/python/CMakeLists.txt

@@ -291,7 +291,7 @@ ADD_PYTHON_TEST(PyQgsSingleBandColorDataRenderer test_qgssinglebandcolordatarend
 ADD_PYTHON_TEST(PyQgsSingleBandGrayRenderer test_qgssinglebandgrayrenderer.py)
 ADD_PYTHON_TEST(PyQgsSingleBandPseudoColorRenderer test_qgssinglebandpseudocolorrenderer.py)
 ADD_PYTHON_TEST(PyQgsSingleSymbolRenderer test_qgssinglesymbolrenderer.py)
-ADD_PYTHON_TEST(PyQgsSingleColorRenderer test_qgssinglecolorrenderer.py)
+ADD_PYTHON_TEST(PyQgsRasterSingleColorRenderer test_rasterqgssinglecolorrenderer.py)
 ADD_PYTHON_TEST(PyQgsShapefileProvider test_provider_shapefile.py)
 ADD_PYTHON_TEST(PyQgsSphere test_qgssphere.py)
 ADD_PYTHON_TEST(PyQgsSvgCache test_qgssvgcache.py)

tests/src/python/test_qgsrastersinglecolorrenderer.py

@@ -1,4 +1,4 @@
-"""QGIS Unit tests for QgsSingleColorRenderer.
+"""QGIS Unit tests for QgsRasterSingleColorRenderer.
 
 .. note:: This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@ from qgis.PyQt.QtCore import QFileInfo
 from qgis.PyQt.QtGui import QColor
 from qgis.core import (
     QgsRasterLayer,
-    QgsSingleColorRenderer,
+    QgsRasterSingleColorRenderer,
     QgsMapSettings,
 )
 import unittest
@@ -25,7 +25,7 @@ from utilities import unitTestDataPath
 start_app()
 
 
-class TestQgsSingleBandGrayRenderer(QgisTestCase):
+class TestQgsRasterSingleBandGrayRenderer(QgisTestCase):
 
     def testRenderer(self):
         path = os.path.join(unitTestDataPath(),
@@ -35,7 +35,7 @@ class TestQgsSingleBandGrayRenderer(QgisTestCase):
         layer = QgsRasterLayer(path, base_name)
         self.assertTrue(layer.isValid(), f'Raster not loaded: {path}')
 
-        renderer = QgsSingleColorRenderer(layer.dataProvider(),
+        renderer = QgsRasterSingleColorRenderer(layer.dataProvider(),
                                           QColor(255, 0, 0))
 
         self.assertEqual(renderer.color(), QColor(255, 0, 0))
@@ -49,8 +49,8 @@ class TestQgsSingleBandGrayRenderer(QgisTestCase):
 
         self.assertTrue(
             self.render_map_settings_check(
-                'single_color_renderer',
+                'raster_single_color_renderer',
-                'single_color_renderer',
+                'raster_single_color_renderer',
                 ms)
         )