Rebase and incorporate suggestions from review

qgis · Feb 19, 2025 · 3c94b36 · 3c94b36
1 parent a0abeaf
commit 3c94b36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
@@ -900,8 +900,8 @@ void QgsCategorizedSymbolRendererWidget::changeCategorySymbol()
 
 void QgsCategorizedSymbolRendererWidget::addCategories()
 {
-  QString attrName = mExpressionWidget->currentField();
-  QList<QVariant> uniqueValues = layerUniqueValues( attrName );
+  const QString attrName = mExpressionWidget->currentField();
+  const QList<QVariant> uniqueValues = layerUniqueValues( attrName );
 
   // ask to abort if too many classes
   if ( uniqueValues.size() >= 1000 )
@@ -1071,16 +1071,16 @@ void QgsCategorizedSymbolRendererWidget::deleteUnusedCategories()
 {
   if ( !mRenderer )
     return;
-  QString attrName = mExpressionWidget->currentField();
-  QList<QVariant> uniqueValues = layerUniqueValues( attrName );
+  const QString attrName = mExpressionWidget->currentField();
+  const QList<QVariant> uniqueValues = layerUniqueValues( attrName );
 
   const QgsCategoryList catList = mRenderer->categories();
 
   QList<int> unusedIndexes;
 
   for ( int i = 0; i < catList.size(); ++i )
   {
-    QgsRendererCategory cat = catList.at( i );
+    const QgsRendererCategory cat = catList.at( i );
     if ( !uniqueValues.contains( cat.value() ) )
     {
       unusedIndexes.append( i );
@@ -1090,7 +1090,7 @@ void QgsCategorizedSymbolRendererWidget::deleteUnusedCategories()
   emit widgetChanged();
 }
 
-QList<QVariant> QgsCategorizedSymbolRendererWidget::layerUniqueValues( QString attrName )
+QList<QVariant> QgsCategorizedSymbolRendererWidget::layerUniqueValues( const QString attrName )
 {
   const int idx = mLayer->fields().lookupField( attrName );
   QList<QVariant> uniqueValues;

diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.h b/src/gui/symbology/qgscategorizedsymbolrendererwidget.h
@@ -237,11 +237,11 @@ class GUI_EXPORT QgsCategorizedSymbolRendererWidget : public QgsRendererWidget,
     void applyChangeToSymbol();
 
     /**
-     * Returns the list of unique values in the widget's layer.
+     * Returns the list of unique values in the current widget's layer for attribute name \a attrName.
      *
      * Called by addCategories() and deleteUnusedCategories()
      */
-    QList<QVariant> layerUniqueValues( QString attrName );
+    QList<QVariant> layerUniqueValues( const QString attrName );
 
     QList<QgsSymbol *> selectedSymbols() override;
     QgsCategoryList selectedCategoryList();