diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt index 3050a8705..f63d6cbf8 100644 --- a/apps/opencs/CMakeLists.txt +++ b/apps/opencs/CMakeLists.txt @@ -28,7 +28,7 @@ opencs_units_noqt (model/world ) opencs_hdrs_noqt (model/world - columns idcollection collection + columnimp idcollection collection ) diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columnimp.hpp similarity index 99% rename from apps/opencs/model/world/columns.hpp rename to apps/opencs/model/world/columnimp.hpp index 23837959d..55492ea16 100644 --- a/apps/opencs/model/world/columns.hpp +++ b/apps/opencs/model/world/columnimp.hpp @@ -1,5 +1,5 @@ -#ifndef CSM_WOLRD_COLUMNS_H -#define CSM_WOLRD_COLUMNS_H +#ifndef CSM_WOLRD_COLUMNIMP_H +#define CSM_WOLRD_COLUMNIMP_H #include diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp index 79bae0db4..0bd8753d4 100644 --- a/apps/opencs/model/world/data.cpp +++ b/apps/opencs/model/world/data.cpp @@ -10,7 +10,7 @@ #include #include "idtable.hpp" -#include "columns.hpp" +#include "columnimp.hpp" #include "regionmap.hpp" void CSMWorld::Data::addModel (QAbstractItemModel *model, UniversalId::Type type1,