Fix build

qgis · Jun 14, 2021 · f07dff0 · f07dff0
1 parent 6d1c55f
commit f07dff0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/src/gui/symbology/qgsheatmaprendererwidget.cpp b/src/gui/symbology/qgsheatmaprendererwidget.cpp
@@ -109,7 +109,7 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer *layer, QgsSt
   }
   if ( !mRenderer )
   {
-    mRenderer = std::make_unique< QgsHeatmapRenderer >();
+    mRenderer = qgis::make_unique< QgsHeatmapRenderer >();
   }
 
   btnColorRamp->setShowGradientOnly( true );

diff --git a/src/gui/symbology/qgsnullsymbolrendererwidget.cpp b/src/gui/symbology/qgsnullsymbolrendererwidget.cpp
@@ -33,7 +33,7 @@ QgsNullSymbolRendererWidget::QgsNullSymbolRendererWidget( QgsVectorLayer *layer,
   }
   if ( !mRenderer )
   {
-    mRenderer = std::make_unique< QgsNullSymbolRenderer >();
+    mRenderer = qgis::make_unique< QgsNullSymbolRenderer >();
   }
 
   QGridLayout *layout = new QGridLayout( this );

diff --git a/src/gui/symbology/qgspointclusterrendererwidget.cpp b/src/gui/symbology/qgspointclusterrendererwidget.cpp
@@ -66,7 +66,7 @@ QgsPointClusterRendererWidget::QgsPointClusterRendererWidget( QgsVectorLayer *la
   }
   if ( !mRenderer )
   {
-    mRenderer = std::make_unique< QgsPointClusterRenderer >();
+    mRenderer = qgis::make_unique< QgsPointClusterRenderer >();
   }
 
   blockAllSignals( true );

diff --git a/src/gui/symbology/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology/qgspointdisplacementrendererwidget.cpp
@@ -74,7 +74,7 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto
   }
   if ( !mRenderer )
   {
-    mRenderer = std::make_unique< QgsPointDisplacementRenderer >();
+    mRenderer = qgis::make_unique< QgsPointDisplacementRenderer >();
   }
 
   blockAllSignals( true );

diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.cpp b/src/gui/symbology/qgsrulebasedrendererwidget.cpp
@@ -353,7 +353,7 @@ void QgsRuleBasedRendererWidget::setSymbolLevels( const QList<QgsLegendSymbolIte
   if ( !mRenderer )
     return;
 
-  for ( const QgsLegendSymbolItem &legendSymbol : std::as_const( levels ) )
+  for ( const QgsLegendSymbolItem &legendSymbol : qgis::as_const( levels ) )
   {
     QgsSymbol *sym = legendSymbol.symbol();
     for ( int layer = 0; layer < sym->symbolLayerCount(); layer++ )

diff --git a/src/gui/symbology/qgssinglesymbolrendererwidget.cpp b/src/gui/symbology/qgssinglesymbolrendererwidget.cpp
@@ -47,7 +47,7 @@ QgsSingleSymbolRendererWidget::QgsSingleSymbolRendererWidget( QgsVectorLayer *la
     QgsSymbol *symbol = QgsSymbol::defaultSymbol( mLayer->geometryType() );
 
     if ( symbol )
-      mRenderer = std::make_unique< QgsSingleSymbolRenderer >( symbol );
+      mRenderer = qgis::make_unique< QgsSingleSymbolRenderer >( symbol );
   }
 
   // load symbol from it
@@ -67,7 +67,7 @@ QgsSingleSymbolRendererWidget::QgsSingleSymbolRendererWidget( QgsVectorLayer *la
   QMenu *advMenu = mSelector->advancedMenu();
 
   mActionLevels = advMenu->addAction( tr( "Symbol Levels…" ) );
-  connect( actionLevels, &QAction::triggered, this, &QgsSingleSymbolRendererWidget::showSymbolLevels );
+  connect( mActionLevels, &QAction::triggered, this, &QgsSingleSymbolRendererWidget::showSymbolLevels );
   if ( mSingleSymbol && mSingleSymbol->type() == QgsSymbol::Marker )
   {
     QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined Size Legend…" ) );

diff --git a/src/gui/symbology/qgssymbollevelsdialog.cpp b/src/gui/symbology/qgssymbollevelsdialog.cpp
@@ -37,7 +37,6 @@ QgsSymbolLevelsWidget::QgsSymbolLevelsWidget( QgsFeatureRenderer *renderer, bool
 
 QgsSymbolLevelsWidget::QgsSymbolLevelsWidget( const QgsLegendSymbolList &symbols, bool usingSymbolLevels, QWidget *parent )
   : QgsPanelWidget( parent )
-  , mRenderer( renderer )
   , mForceOrderingEnabled( false )
 {
   setupUi( this );