mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 04:09:41 +00:00
Code Issues Releases Wiki Activity

Trying to merge.

Browse source
This commit is contained in:
Marek Kochanowicz 2014-06-17 11:14:12 +02:00
parent 21a1f6f4ae
commit 32fcc9ad61
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/opencs/model/world/idtable.cpp
View file

@ -43,9 +43,6 @@ QVariant CSMWorld::IdTable::data (const QModelIndex & index, int role) const
if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable()) if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable())
return QVariant(); return QVariant();
<<<<<<< Updated upstream
return mIdCollection->getData (index.row(), index.column());
=======
if (index.internalId() != 0) if (index.internalId() != 0)
{ {
std::pair<int, int> parentAdress(unfoldIndexAdress(index.internalId())); std::pair<int, int> parentAdress(unfoldIndexAdress(index.internalId()));
@ -53,7 +50,6 @@ QVariant CSMWorld::IdTable::data (const QModelIndex & index, int role) const
} else { } else {
return mIdCollection->getData (index.row(), index.column()); return mIdCollection->getData (index.row(), index.column());
} }
>>>>>>> Stashed changes
} }
QVariant CSMWorld::IdTable::headerData (int section, Qt::Orientation orientation, int role) const QVariant CSMWorld::IdTable::headerData (int section, Qt::Orientation orientation, int role) const
@ -135,9 +131,6 @@ QModelIndex CSMWorld::IdTable::index (int row, int column, const QModelIndex& pa
QModelIndex CSMWorld::IdTable::parent (const QModelIndex& index) const QModelIndex CSMWorld::IdTable::parent (const QModelIndex& index) const
{ {
<<<<<<< Updated upstream
return QModelIndex();
=======
if (index.internalId() == 0) //0 is used for indexs with invalid parent (top level data) if (index.internalId() == 0) //0 is used for indexs with invalid parent (top level data)
{ {
return QModelIndex(); return QModelIndex();
@ -151,7 +144,6 @@ QModelIndex CSMWorld::IdTable::parent (const QModelIndex& index) const
throw "Parent index is not present in the model"; throw "Parent index is not present in the model";
} }
return createIndex(adress.first, adress.second, 0); return createIndex(adress.first, adress.second, 0);
>>>>>>> Stashed changes
} }
void CSMWorld::IdTable::addRecord (const std::string& id, UniversalId::Type type) void CSMWorld::IdTable::addRecord (const std::string& id, UniversalId::Type type)
@ -280,9 +272,6 @@ std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row)
int CSMWorld::IdTable::getColumnId(int column) const int CSMWorld::IdTable::getColumnId(int column) const
{ {
return mIdCollection->getColumn(column).getId(); return mIdCollection->getColumn(column).getId();
<<<<<<< Updated upstream
}
=======
} }
bool CSMWorld::IdTable::hasChildren(const QModelIndex& index) const bool CSMWorld::IdTable::hasChildren(const QModelIndex& index) const
@ -313,4 +302,3 @@ std::pair< int, int > CSMWorld::IdTable::unfoldIndexAdress (unsigned int id) con
int column = id - row * this->columnCount(); int column = id - row * this->columnCount();
return std::make_pair<int, int>(row, column); return std::make_pair<int, int>(row, column);
} }
>>>>>>> Stashed changes