mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

TableEditIdAction: prevent creation of a UniversalId with Type_None

Browse Source
This commit is contained in:
Stanislav Bas 2015-07-04 19:39:53 +03:00
parent 86dc5a2c67
commit 30fd711a47
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/opencs/view/world/tableeditidaction.cpp
View File

@ -25,9 +25,13 @@ CSVWorld::TableEditIdAction::TableEditIdAction(const QTableView &table, QWidget
void CSVWorld::TableEditIdAction::setCell(int row, int column) void CSVWorld::TableEditIdAction::setCell(int row, int column)
{ {
CellData data = getCellData(row, column); CellData data = getCellData(row, column);
mCurrentId = CSMWorld::UniversalId(CSMWorld::TableMimeData::convertEnums(data.first), CSMWorld::UniversalId::Type idType = CSMWorld::TableMimeData::convertEnums(data.first);
data.second.toUtf8().constData());
setText("Edit '" + data.second + "'"); if (idType != CSMWorld::UniversalId::Type_None)
{
mCurrentId = CSMWorld::UniversalId(idType, data.second.toUtf8().constData());
setText("Edit '" + data.second + "'");
}
} }
CSMWorld::UniversalId CSVWorld::TableEditIdAction::getCurrentId() const CSMWorld::UniversalId CSVWorld::TableEditIdAction::getCurrentId() const
@ -38,5 +42,8 @@ CSMWorld::UniversalId CSVWorld::TableEditIdAction::getCurrentId() const
bool CSVWorld::TableEditIdAction::isValidIdCell(int row, int column) const bool CSVWorld::TableEditIdAction::isValidIdCell(int row, int column) const
{ {
CellData data = getCellData(row, column); CellData data = getCellData(row, column);
return CSMWorld::ColumnBase::isId(data.first) && !data.second.isEmpty(); CSMWorld::UniversalId::Type idType = CSMWorld::TableMimeData::convertEnums(data.first);
return CSMWorld::ColumnBase::isId(data.first) &&
idType != CSMWorld::UniversalId::Type_None &&
!data.second.isEmpty();
} }