From c50cecdc642eec35cffa39c404b4ffd334d42c5e Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Tue, 1 Jul 2014 21:13:27 +0200
Subject: [PATCH] Small cleanup
---
apps/opencs/model/world/idtable.cpp | 8 +++++---
apps/opencs/view/world/nestedtable.cpp | 2 --
apps/opencs/view/world/nestedtable.hpp | 5 -----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index a4e4972b4c..29d2a543e7 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -127,12 +127,10 @@ bool CSMWorld::IdTable::removeRows (int row, int count, const QModelIndex& paren
{
if (parent.isValid())
{
- beginRemoveRows(parent, row, row+count-1);
for (int i = 0; i < count; ++i)
{
mIdCollection->removeNestedRows(parent.row(), parent.column(), row+i);
}
- endRemoveRows();
return true;
}
@@ -149,7 +147,11 @@ void CSMWorld::IdTable::addNestedRow(const QModelIndex& parent, int position)
{
assert(parent.isValid());
- mIdCollection->addNestedRow(parent.row(), parent.column(), position);
+ int row = parent.row();
+ mIdCollection->addNestedRow(row, parent.column(), position);
+
+ emit dataChanged (CSMWorld::IdTable::index (row, 0),
+ CSMWorld::IdTable::index (row, mIdCollection->getColumns()-1));
}
QModelIndex CSMWorld::IdTable::index (int row, int column, const QModelIndex& parent) const
diff --git a/apps/opencs/view/world/nestedtable.cpp b/apps/opencs/view/world/nestedtable.cpp
index ebcce15d5b..2eef2e9158 100644
--- a/apps/opencs/view/world/nestedtable.cpp
+++ b/apps/opencs/view/world/nestedtable.cpp
@@ -77,7 +77,6 @@ void CSVWorld::NestedTable::removeRowActionTriggered()
mModel->getParentId(),
selectionModel()->selectedRows().begin()->row(),
mModel->getParentColumn()));
-
}
void CSVWorld::NestedTable::addNewRowActionTriggered()
@@ -86,5 +85,4 @@ void CSVWorld::NestedTable::addNewRowActionTriggered()
mModel->getParentId(),
selectionModel()->selectedRows().size(),
mModel->getParentColumn()));
-
}
diff --git a/apps/opencs/view/world/nestedtable.hpp b/apps/opencs/view/world/nestedtable.hpp
index eb73cd885a..35fa224949 100644
--- a/apps/opencs/view/world/nestedtable.hpp
+++ b/apps/opencs/view/world/nestedtable.hpp
@@ -47,11 +47,6 @@ namespace CSVWorld
void removeRowActionTriggered();
void addNewRowActionTriggered();
-
- signals:
- void addNewRow();
-
- void removeRow(int row);
};
}