Remove duplicate map canvas member in subclass, use base class member…

… instead
qgis · Dec 18, 2024 · f708cbd · f708cbd
1 parent 1c3d2ae
commit f708cbd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/gui/labeling/qgslabelinggui.cpp b/src/gui/labeling/qgslabelinggui.cpp
@@ -41,9 +41,9 @@
 QgsExpressionContext QgsLabelingGui::createExpressionContext() const
 {
   QgsExpressionContext expContext;
-  if ( mCanvas )
+  if ( mMapCanvas )
   {
-    expContext = mCanvas->createExpressionContext();
+    expContext = mMapCanvas->createExpressionContext();
   }
   else
   {
@@ -275,9 +275,9 @@ QgsLabelingGui::QgsLabelingGui( QgsMapLayer *layer, QgsMapCanvas *mapCanvas, con
 
   mFieldExpressionWidget->registerExpressionContextGenerator( this );
 
-  mMinScaleWidget->setMapCanvas( mCanvas );
+  mMinScaleWidget->setMapCanvas( mMapCanvas );
   mMinScaleWidget->setShowCurrentScaleButton( true );
-  mMaxScaleWidget->setMapCanvas( mCanvas );
+  mMaxScaleWidget->setMapCanvas( mMapCanvas );
   mMaxScaleWidget->setShowCurrentScaleButton( true );
 
   mGeometryGeneratorExpressionButton->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );

diff --git a/src/gui/labeling/qgslabelinggui.h b/src/gui/labeling/qgslabelinggui.h
@@ -87,7 +87,6 @@ class GUI_EXPORT QgsLabelingGui : public QgsTextFormatWidget
     QgsPalLayerSettings mSettings;
     LabelMode mMode;
     QgsFeature mPreviewFeature;
-    QgsMapCanvas *mCanvas = nullptr;
 
     QgsLabelObstacleSettings mObstacleSettings;
     QgsLabelLineSettings mLineSettings;