Remove unused argument (always set to false)

qgis · Sep 28, 2021 · 5660e70 · 5660e70
1 parent b30c17f
commit 5660e70
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/src/app/labeling/qgsmaptoolchangelabelproperties.cpp b/src/app/labeling/qgsmaptoolchangelabelproperties.cpp
@@ -76,7 +76,7 @@ void QgsMapToolChangeLabelProperties::canvasPressEvent( QgsMapMouseEvent *e )
   if ( !mCurrentLabel.layer->isEditable() )
   {
     QgsPalIndexes indexes;
-    const bool newAuxiliaryLayer = createAuxiliaryFields( indexes, false );
+    const bool newAuxiliaryLayer = createAuxiliaryFields( indexes );
 
     if ( !newAuxiliaryLayer && !mCurrentLabel.layer->auxiliaryLayer() )
     {

diff --git a/src/app/labeling/qgsmaptoollabel.cpp b/src/app/labeling/qgsmaptoollabel.cpp
@@ -848,12 +848,12 @@ QgsMapToolLabel::LabelDetails::LabelDetails( const QgsLabelPosition &p )
   }
 }
 
-bool QgsMapToolLabel::createAuxiliaryFields( QgsPalIndexes &indexes, bool overwriteExpression )
+bool QgsMapToolLabel::createAuxiliaryFields( QgsPalIndexes &indexes )
 {
-  return createAuxiliaryFields( mCurrentLabel, indexes, overwriteExpression );
+  return createAuxiliaryFields( mCurrentLabel, indexes );
 }
 
-bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsPalIndexes &indexes, bool overwriteExpression ) const
+bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsPalIndexes &indexes ) const
 {
   bool newAuxiliaryLayer = false;
   QgsVectorLayer *vlayer = details.layer;
@@ -886,7 +886,7 @@ bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsPalIndexe
     }
     else
     {
-      index = QgsAuxiliaryLayer::createProperty( p, vlayer, overwriteExpression );
+      index = QgsAuxiliaryLayer::createProperty( p, vlayer, false );
       changed = true;
     }
 
@@ -900,12 +900,12 @@ bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsPalIndexe
   return newAuxiliaryLayer;
 }
 
-bool QgsMapToolLabel::createAuxiliaryFields( QgsDiagramIndexes &indexes, bool overwriteExpression )
+bool QgsMapToolLabel::createAuxiliaryFields( QgsDiagramIndexes &indexes )
 {
-  return createAuxiliaryFields( mCurrentLabel, indexes, overwriteExpression );
+  return createAuxiliaryFields( mCurrentLabel, indexes );
 }
 
-bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsDiagramIndexes &indexes, bool overwriteExpression )
+bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsDiagramIndexes &indexes )
 {
   bool newAuxiliaryLayer = false;
   QgsVectorLayer *vlayer = details.layer;
@@ -937,7 +937,7 @@ bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsDiagramIn
     }
     else
     {
-      index = QgsAuxiliaryLayer::createProperty( p, vlayer, overwriteExpression );
+      index = QgsAuxiliaryLayer::createProperty( p, vlayer, false );
       changed = true;
     }
 
@@ -949,12 +949,12 @@ bool QgsMapToolLabel::createAuxiliaryFields( LabelDetails &details, QgsDiagramIn
   return newAuxiliaryLayer;
 }
 
-bool QgsMapToolLabel::createAuxiliaryFields( QgsCalloutIndexes &calloutIndexes, bool overwriteExpression )
+bool QgsMapToolLabel::createAuxiliaryFields( QgsCalloutIndexes &calloutIndexes )
 {
-  return createAuxiliaryFields( mCurrentCallout, calloutIndexes, overwriteExpression );
+  return createAuxiliaryFields( mCurrentCallout, calloutIndexes );
 }
 
-bool QgsMapToolLabel::createAuxiliaryFields( QgsCalloutPosition &details, QgsCalloutIndexes &calloutIndexes, bool overwriteExpression )
+bool QgsMapToolLabel::createAuxiliaryFields( QgsCalloutPosition &details, QgsCalloutIndexes &calloutIndexes )
 {
   bool newAuxiliaryLayer = false;
   QgsVectorLayer *vlayer = QgsProject::instance()->mapLayer<QgsVectorLayer *>( details.layerID );
@@ -987,7 +987,7 @@ bool QgsMapToolLabel::createAuxiliaryFields( QgsCalloutPosition &details, QgsCal
     }
     else
     {
-      index = QgsAuxiliaryLayer::createProperty( p, vlayer, overwriteExpression );
+      index = QgsAuxiliaryLayer::createProperty( p, vlayer, false );
       changed = true;
     }
     calloutIndexes[p] = index;

diff --git a/src/app/labeling/qgsmaptoollabel.h b/src/app/labeling/qgsmaptoollabel.h
@@ -219,12 +219,12 @@ class APP_EXPORT QgsMapToolLabel: public QgsMapToolAdvancedDigitizing
     */
     bool isPinned();
 
-    bool createAuxiliaryFields( QgsPalIndexes &palIndexes, bool overwriteExpression = true );
-    bool createAuxiliaryFields( LabelDetails &details, QgsPalIndexes &palIndexes, bool overwriteExpression = true ) const;
-    bool createAuxiliaryFields( QgsDiagramIndexes &diagIndexes, bool overwriteExpression = true );
-    bool createAuxiliaryFields( LabelDetails &details, QgsDiagramIndexes &diagIndexes, bool overwriteExpression = true );
-    bool createAuxiliaryFields( QgsCalloutIndexes &calloutIndexes, bool overwriteExpression = true );
-    bool createAuxiliaryFields( QgsCalloutPosition &details, QgsCalloutIndexes &calloutIndexes, bool overwriteExpression = true );
+    bool createAuxiliaryFields( QgsPalIndexes &palIndexes );
+    bool createAuxiliaryFields( LabelDetails &details, QgsPalIndexes &palIndexes ) const;
+    bool createAuxiliaryFields( QgsDiagramIndexes &diagIndexes );
+    bool createAuxiliaryFields( LabelDetails &details, QgsDiagramIndexes &diagIndexes );
+    bool createAuxiliaryFields( QgsCalloutIndexes &calloutIndexes );
+    bool createAuxiliaryFields( QgsCalloutPosition &details, QgsCalloutIndexes &calloutIndexes );
 
     void updateHoveredLabel( QgsMapMouseEvent *e );
     void clearHoveredLabel();

diff --git a/src/app/labeling/qgsmaptoolmovelabel.cpp b/src/app/labeling/qgsmaptoolmovelabel.cpp
@@ -111,7 +111,7 @@ void QgsMapToolMoveLabel::cadCanvasPressEvent( QgsMapMouseEvent *e )
       {
         QgsCalloutIndexes indexes;
 
-        if ( createAuxiliaryFields( calloutPosition, indexes, false ) )
+        if ( createAuxiliaryFields( calloutPosition, indexes ) )
           return;
 
         if ( !canModifyCallout( calloutPosition, mCurrentCalloutMoveOrigin, xCol, yCol ) )
@@ -188,7 +188,7 @@ void QgsMapToolMoveLabel::cadCanvasPressEvent( QgsMapMouseEvent *e )
       {
         QgsPalIndexes indexes;
 
-        if ( createAuxiliaryFields( indexes, false ) )
+        if ( createAuxiliaryFields( indexes ) )
           return;
 
         if ( !labelMoveable( vlayer, mCurrentLabel.settings, xCol, yCol ) )
@@ -211,7 +211,7 @@ void QgsMapToolMoveLabel::cadCanvasPressEvent( QgsMapMouseEvent *e )
       {
         QgsDiagramIndexes indexes;
 
-        if ( createAuxiliaryFields( indexes, false ) )
+        if ( createAuxiliaryFields( indexes ) )
           return;
 
         if ( !diagramMoveable( vlayer, xCol, yCol ) )

diff --git a/src/app/labeling/qgsmaptoolrotatelabel.cpp b/src/app/labeling/qgsmaptoolrotatelabel.cpp
@@ -117,7 +117,7 @@ void QgsMapToolRotateLabel::canvasPressEvent( QgsMapMouseEvent *e )
       if ( !labelIsRotatable( mCurrentLabel.layer, mCurrentLabel.settings, rotationCol ) )
       {
         QgsPalIndexes indexes;
-        if ( createAuxiliaryFields( indexes, false ) )
+        if ( createAuxiliaryFields( indexes ) )
           return;
 
         if ( !labelIsRotatable( mCurrentLabel.layer, mCurrentLabel.settings, rotationCol ) )

diff --git a/src/app/labeling/qgsmaptoolshowhidelabels.cpp b/src/app/labeling/qgsmaptoolshowhidelabels.cpp
@@ -331,7 +331,7 @@ bool QgsMapToolShowHideLabels::showHide( const QgsLabelPosition &pos, bool show
     if ( !diagramCanShowHide( vlayer, showCol ) )
     {
       QgsDiagramIndexes indexes;
-      createAuxiliaryFields( details, indexes, false );
+      createAuxiliaryFields( details, indexes );
 
       showCol = indexes[ QgsDiagramLayerSettings::Show ];
     }
@@ -341,7 +341,7 @@ bool QgsMapToolShowHideLabels::showHide( const QgsLabelPosition &pos, bool show
     if ( !labelCanShowHide( vlayer, showCol ) )
     {
       QgsPalIndexes indexes;
-      createAuxiliaryFields( details, indexes, false );
+      createAuxiliaryFields( details, indexes );
 
       showCol = indexes[ QgsPalLayerSettings::Show ];
     }