Cleanup dead code

qgis · Nov 7, 2022 · 8b42768 · 8b42768
1 parent 50dc408
commit 8b42768
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/src/app/gps/qgsgpstoolbar.cpp b/src/app/gps/qgsgpstoolbar.cpp
@@ -176,7 +176,7 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
   } );
 
   connect( QgsProject::instance()->gpsSettings(), &QgsProjectGpsSettings::destinationLayerChanged,
-           this, &QgsGpsToolBar::updateCloseFeatureButton );
+           this, &QgsGpsToolBar::destinationLayerChanged );
 
   connect( QgsProject::instance()->gpsSettings(), &QgsProjectGpsSettings::automaticallyAddTrackVerticesChanged, this, [ = ]( bool enabled ) { setAddVertexButtonEnabled( !enabled ); } );
   setAddVertexButtonEnabled( !QgsProject::instance()->gpsSettings()->automaticallyAddTrackVertices() );
@@ -206,32 +206,17 @@ void QgsGpsToolBar::updateLocationLabel( const QgsPoint &point )
   }
 }
 
-void QgsGpsToolBar::updateCloseFeatureButton( QgsVectorLayer *vlayer )
+void QgsGpsToolBar::destinationLayerChanged( QgsVectorLayer *vlayer )
 {
-  if ( !( vlayer && vlayer->isValid() ) )
+  if ( vlayer )
   {
-    mAddFeatureAction->setEnabled( false );
-    return;
+
   }
 
-  // Add feature button tracks edit state of layer
-  if ( vlayer != mLastLayer )
+  if ( !( vlayer && vlayer->isValid() ) )
   {
-    if ( mLastLayer )  // disconnect previous layer
-    {
-      disconnect( mLastLayer, &QgsVectorLayer::editingStarted,
-                  this, &QgsGpsToolBar::layerEditStateChanged );
-      disconnect( mLastLayer, &QgsVectorLayer::editingStopped,
-                  this, &QgsGpsToolBar::layerEditStateChanged );
-    }
-    if ( vlayer ) // connect new layer
-    {
-      connect( vlayer, &QgsVectorLayer::editingStarted,
-               this, &QgsGpsToolBar::layerEditStateChanged );
-      connect( vlayer, &QgsVectorLayer::editingStopped,
-               this, &QgsGpsToolBar::layerEditStateChanged );
-    }
-    mLastLayer = vlayer;
+    mAddFeatureAction->setEnabled( false );
+    return;
   }
 
   QString buttonLabel = tr( "Create Feature" );
@@ -279,11 +264,6 @@ void QgsGpsToolBar::updateCloseFeatureButton( QgsVectorLayer *vlayer )
   mAddFeatureAction->setToolTip( buttonToolTip );
 }
 
-void QgsGpsToolBar::layerEditStateChanged()
-{
-  updateCloseFeatureButton( mLastLayer );
-}
-
 void QgsGpsToolBar::destinationMenuAboutToShow()
 {
   mDestinationLayerMenu->clear();

diff --git a/src/app/gps/qgsgpstoolbar.h b/src/app/gps/qgsgpstoolbar.h
@@ -51,8 +51,7 @@ class QgsGpsToolBar : public QToolBar
   private slots:
 
     void updateLocationLabel( const QgsPoint &point );
-    void updateCloseFeatureButton( QgsVectorLayer *lyr );
-    void layerEditStateChanged();
+    void destinationLayerChanged( QgsVectorLayer *lyr );
     void destinationMenuAboutToShow();
 
   private:
@@ -73,8 +72,6 @@ class QgsGpsToolBar : public QToolBar
     QgsCoordinateReferenceSystem mWgs84CRS;
     bool mEnableAddVertexButton = true;
 
-    QPointer< QgsVectorLayer > mLastLayer;
-
     QgsMapLayerProxyModel *mDestinationLayerModel = nullptr;
 };