krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

cleaning up the code

Browse source
This commit is contained in:
Marek Kochanowicz 2014-07-31 12:18:24 +02:00
parent c6194e7ea3
commit 40edf15ab0
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/model/world/collection.hpp
View file

@ -2,6 +2,7 @@
#define CSM_WOLRD_COLLECTION_H
#include <vector>
#include <iostream>
#include <map>
#include <algorithm>
#include <cctype>

1
apps/opencs/model/world/columnimp.hpp
View file

@ -4,6 +4,7 @@
#include <sstream>
#include <boost/lexical_cast.hpp>
#include <iostream>
#include <QColor>

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

@ -2,6 +2,7 @@
#include <QDebug>
#include <cassert>
#include <iostream>
#include "nestedtablewrapper.hpp"
#include "collectionbase.hpp"
@ -30,7 +31,7 @@ int CSMWorld::IdTable::columnCount (const QModelIndex & parent) const
{
return dynamic_cast<NestedCollection*>(mIdCollection)->getNestedColumnsCount(parent.row(), parent.column());
}
return mIdCollection->getColumns();
}
@ -46,9 +47,9 @@ QVariant CSMWorld::IdTable::data (const QModelIndex & index, int role) const
{
std::pair<int, int> parentAdress(unfoldIndexAdress(index.internalId()));
return dynamic_cast<NestedCollection*>(mIdCollection)->getNestedData(parentAdress.first,
parentAdress.second,
index.row(),
index.column());
parentAdress.second,
index.row(),
index.column());
} else {
return mIdCollection->getData (index.row(), index.column());
}
@ -68,8 +69,10 @@ QVariant CSMWorld::IdTable::headerData (int section,
return mIdCollection->getColumn (section).mFlags;
if (role==ColumnBase::Role_Display)
{
return mIdCollection->getColumn (section).mDisplayType;
}
return QVariant();
}