From bb675ff41d1a7a5f38d8a18d6f6d5fd188c9c074 Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Wed, 2 Jul 2014 13:29:25 +0200
Subject: [PATCH] Removing rows and undo works

---
 apps/opencs/model/world/idtable.cpp          | 13 +++++++-----
 apps/opencs/model/world/nestedtablemodel.cpp | 21 ++++++++++++++++++++
 apps/opencs/model/world/nestedtablemodel.hpp |  4 ++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index f71c367f0..a74bd629b 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -125,19 +125,22 @@ Qt::ItemFlags CSMWorld::IdTable::flags (const QModelIndex & index) const
 
 bool CSMWorld::IdTable::removeRows (int row, int count, const QModelIndex& parent)
 {
+    beginRemoveRows (parent, row, row+count-1);
+
     if (parent.isValid())
     {
         for (int i = 0; i < count; ++i)
         {
             mIdCollection->removeNestedRows(parent.row(), parent.column(), row+i); 
         }
-        return true;
+    } else 
+    {
+
+        beginRemoveRows (parent, row, row+count-1);
+
+        mIdCollection->removeRows (row, count);
     }
 
-    beginRemoveRows (parent, row, row+count-1);
-
-    mIdCollection->removeRows (row, count);
-
     endRemoveRows();
 
     return true;
diff --git a/apps/opencs/model/world/nestedtablemodel.cpp b/apps/opencs/model/world/nestedtablemodel.cpp
index 17bf7b30c..6d6618590 100644
--- a/apps/opencs/model/world/nestedtablemodel.cpp
+++ b/apps/opencs/model/world/nestedtablemodel.cpp
@@ -22,6 +22,11 @@ CSMWorld::NestedTableModel::NestedTableModel(const QModelIndex& parent,
     connect(mMainModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
             this, SLOT(forwardRowsInserted(const QModelIndex &, int, int)));
 
+    connect(mMainModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
+            this, SLOT(forwardRowsAboutToRemoved(const QModelIndex &, int, int)));
+
+    connect(mMainModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+            this, SLOT(forwardRowsRemoved(const QModelIndex &, int, int)));
 }
 
 QModelIndex CSMWorld::NestedTableModel::mapFromSource(const QModelIndex& sourceIndex) const
@@ -142,3 +147,19 @@ bool CSMWorld::NestedTableModel::indexIsParent(const QModelIndex& index)
             index.column() == mParentColumn &&
             mMainModel->data(mMainModel->index(index.row(), 0)).toString().toUtf8().constData() == mId);
 }
+
+void CSMWorld::NestedTableModel::forwardRowsAboutToRemoved(const QModelIndex& parent, int first, int last)
+{
+    if (indexIsParent(parent))
+    {
+        beginRemoveRows(QModelIndex(), first, last);
+    }
+}
+
+void CSMWorld::NestedTableModel::forwardRowsRemoved(const QModelIndex& parent, int first, int last)
+{
+    if (indexIsParent(parent))
+    {
+        endRemoveRows();
+    }
+}
diff --git a/apps/opencs/model/world/nestedtablemodel.hpp b/apps/opencs/model/world/nestedtablemodel.hpp
index 2263524cf..dfb231124 100644
--- a/apps/opencs/model/world/nestedtablemodel.hpp
+++ b/apps/opencs/model/world/nestedtablemodel.hpp
@@ -66,6 +66,10 @@ namespace CSMWorld
         void forwardRowsAboutToInserted(const QModelIndex & parent, int first, int last);
         
         void forwardRowsInserted(const QModelIndex & parent, int first, int last);
+
+        void forwardRowsAboutToRemoved(const QModelIndex & parent, int first, int last);
+
+        void forwardRowsRemoved(const QModelIndex & parent, int first, int last);
     };
 }