MaskGraphicsScene: cleanup

GUI/View/Mask/MaskGraphicsScene.cpp

@@ -40,7 +40,7 @@ MaskGraphicsScene::MaskGraphicsScene(QObject* parent)
 {
     setSceneRect(default_scene_rect);
     connect(this, &MaskGraphicsScene::selectionChanged, this,
-            &MaskGraphicsScene::onSceneSelectionChanged);
+            &MaskGraphicsScene::onSceneSelectionChanged, Qt::UniqueConnection);
 }
 
 MaskGraphicsScene::~MaskGraphicsScene()
@@ -85,7 +85,7 @@ void MaskGraphicsScene::connectMaskContainer(MaskContainerModel* maskContainerMo
     connect(maskContainerModel, &QAbstractListModel::rowsAboutToBeRemoved, this,
             &MaskGraphicsScene::onRowsAboutToBeRemoved);
     connect(maskContainerModel, &QAbstractListModel::rowsRemoved, this,
-            &MaskGraphicsScene::onRowsRemoved);
+            &MaskGraphicsScene::updateScene);
     connect(maskContainerModel, &QAbstractListModel::modelReset, this,
             &MaskGraphicsScene::updateScene);
     connect(maskContainerModel, &QAbstractListModel::rowsMoved, this,
@@ -104,7 +104,7 @@ void MaskGraphicsScene::disconnectMaskContainer(MaskContainerModel* maskContaine
     disconnect(maskContainerModel, &QAbstractListModel::rowsAboutToBeRemoved, this,
                &MaskGraphicsScene::onRowsAboutToBeRemoved);
     disconnect(maskContainerModel, &QAbstractListModel::rowsRemoved, this,
-               &MaskGraphicsScene::onRowsRemoved);
+               &MaskGraphicsScene::updateScene);
     disconnect(maskContainerModel, &QAbstractListModel::modelReset, this,
                &MaskGraphicsScene::updateScene);
     disconnect(maskContainerModel, &QAbstractListModel::rowsMoved, this,
@@ -168,11 +168,6 @@ void MaskGraphicsScene::onRowsAboutToBeRemoved(const QModelIndex&, int first, in
     m_block_selection = false;
 }
 
-void MaskGraphicsScene::onRowsRemoved(const QModelIndex&, int, int)
-{
-    updateScene();
-}
-
 void MaskGraphicsScene::cancelCurrentDrawing()
 {
     if (isDrawingInProgress()) {
@@ -732,13 +727,14 @@ void MaskGraphicsScene::processMaskAllItem(QGraphicsSceneMouseEvent* event)
 
 void MaskGraphicsScene::subscribeMaskItem(MaskItemObject* item)
 {
-    auto* maskItem = dynamic_cast<MaskItem*>(item);
-    if (!maskItem)
+    if (!item)
         return;
 
-    connect(maskItem, &MaskItemObject::maskGeometryChanged, this, &MaskGraphicsScene::lineItemMoved,
+    connect(item, &MaskItemObject::maskGeometryChanged, this, &MaskGraphicsScene::lineItemMoved,
+            Qt::UniqueConnection);
+    connect(item, &MaskItemObject::maskGeometryChanged, this, &MaskGraphicsScene::onMaskMove,
             Qt::UniqueConnection);
-    connect(maskItem, &MaskItem::maskToBeDestroyed, this, &MaskGraphicsScene::lineItemDeleted,
+    connect(item, &MaskItemObject::maskToBeDestroyed, this, &MaskGraphicsScene::lineItemDeleted,
             Qt::UniqueConnection);
 }
 

GUI/View/Mask/MaskGraphicsScene.h

@@ -60,7 +60,6 @@ public slots:
     void onMaskValueChanged(MaskEditorFlags::MaskValue value);
     void onRowsInserted(const QModelIndex&, int, int);
     void onRowsAboutToBeRemoved(const QModelIndex&, int first, int last);
-    void onRowsRemoved(const QModelIndex&, int, int);
     void cancelCurrentDrawing();
     void resetScene();
     void updateScene();