re-allow circular dependencies (#37641)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
qgis · Jul 7, 2020 · 2c9874c · 2c9874c
1 parent 64a52ea
commit 2c9874c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/python/gui/auto_generated/vector/qgsvectorlayerproperties.sip.in b/python/gui/auto_generated/vector/qgsvectorlayerproperties.sip.in
@@ -42,7 +42,6 @@ Adds a properties page factory to the vector layer properties dialog.
 
 
 
-      public:
 };
 
 

diff --git a/src/gui/vector/qgsvectorlayerproperties.cpp b/src/gui/vector/qgsvectorlayerproperties.cpp
@@ -388,7 +388,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
       dependencySources << layer;
   }
 
-  mLayersDependenciesTreeModel = new DependenciesLayerTreeModel( mLayer, this );
+  mLayersDependenciesTreeModel = new QgsLayerTreeFilterProxyModel( this );
   mLayersDependenciesTreeModel->setLayerTreeModel( new QgsLayerTreeModel( QgsProject::instance()->layerTreeRoot(), mLayersDependenciesTreeModel ) );
   mLayersDependenciesTreeModel->setCheckedLayers( dependencySources );
   connect( QgsProject::instance(), &QObject::destroyed, this, [ = ] {mLayersDependenciesTreeView->setModel( nullptr );} );

diff --git a/src/gui/vector/qgsvectorlayerproperties.h b/src/gui/vector/qgsvectorlayerproperties.h
@@ -160,19 +160,6 @@ class GUI_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
 
   private:
 
-    class DependenciesLayerTreeModel : public QgsLayerTreeFilterProxyModel
-    {
-      public:
-        DependenciesLayerTreeModel( QgsVectorLayer *mainLayer, QObject *parent = nullptr )
-          : QgsLayerTreeFilterProxyModel( parent )
-          , mMainLayer( mainLayer )
-        {}
-
-      private:
-        QgsVectorLayer *mMainLayer = nullptr;
-        bool layerShown( QgsMapLayer *layer ) const override {return layer != mMainLayer;}
-    };
-
     enum PropertyType
     {
       Style = 0,
@@ -241,7 +228,7 @@ class GUI_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
 
     QgsExpressionContext createExpressionContext() const override;
 
-    DependenciesLayerTreeModel *mLayersDependenciesTreeModel;
+    QgsLayerTreeFilterProxyModel *mLayersDependenciesTreeModel;
 
     void showHelp();