From 40edf15ab095f11c5485ff9a36912ac9e6cb7ce2 Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Thu, 31 Jul 2014 12:18:24 +0200
Subject: [PATCH] cleaning up the code
---
apps/opencs/model/world/collection.hpp | 1 +
apps/opencs/model/world/columnimp.hpp | 1 +
apps/opencs/model/world/idtable.cpp | 13 ++++++++-----
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/apps/opencs/model/world/collection.hpp b/apps/opencs/model/world/collection.hpp
index 252e84c382..5c32e7716d 100644
--- a/apps/opencs/model/world/collection.hpp
+++ b/apps/opencs/model/world/collection.hpp
@@ -2,6 +2,7 @@
#define CSM_WOLRD_COLLECTION_H
#include <vector>
+#include <iostream>
#include <map>
#include <algorithm>
#include <cctype>
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 3fad05f651..e416c332b9 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -4,6 +4,7 @@
#include <sstream>
#include <boost/lexical_cast.hpp>
+#include <iostream>
#include <QColor>
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 4e4ccb1c1b..410e0d3f02 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -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();
}