moved ColumnBase and Column struct into a separate translation unit

apps/opencs/model/world/columnbase.cpp

@@ -0,0 +1,13 @@
+
+#include "columnbase.hpp"
+
+CSMWorld::ColumnBase::ColumnBase (const std::string& title, int flags)
+: mTitle (title), mFlags (flags)
+{}
+
+CSMWorld::ColumnBase::~ColumnBase() {}
+
+bool CSMWorld::ColumnBase::isUserEditable() const
+{
+    return isEditable();
+}

apps/opencs/model/world/columnbase.hpp

@@ -0,0 +1,57 @@
+#ifndef CSM_WOLRD_COLUMNBASE_H
+#define CSM_WOLRD_COLUMNBASE_H
+
+#include <string>
+
+#include <Qt>
+#include <QVariant>
+
+#include "record.hpp"
+
+namespace CSMWorld
+{
+    struct ColumnBase
+    {
+        enum Roles
+        {
+            Role_Flags = Qt::UserRole
+        };
+
+        enum Flags
+        {
+            Flag_Table = 1, // column should be displayed in table view
+            Flag_Dialogue = 2 // column should be displayed in dialogue view
+        };
+
+        std::string mTitle;
+        int mFlags;
+
+        ColumnBase (const std::string& title, int flag);
+
+        virtual ~ColumnBase();
+
+        virtual bool isEditable() const = 0;
+
+        virtual bool isUserEditable() const;
+        ///< Can this column be edited directly by the user?
+    };
+
+    template<typename ESXRecordT>
+    struct Column : public ColumnBase
+    {
+        std::string mTitle;
+        int mFlags;
+
+        Column (const std::string& title, int flags = Flag_Table | Flag_Dialogue)
+        : ColumnBase (title, flags) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const = 0;
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            throw std::logic_error ("Column " + mTitle + " is not editable");
+        }
+    };
+}
+
+#endif

apps/opencs/model/world/idcollection.cpp

@@ -1,17 +1,6 @@
 
 #include "idcollection.hpp"
 
-CSMWorld::ColumnBase::ColumnBase (const std::string& title, int flags)
-: mTitle (title), mFlags (flags)
-{}
-
-CSMWorld::ColumnBase::~ColumnBase() {}
-
-bool CSMWorld::ColumnBase::isUserEditable() const
-{
-    return isEditable();
-}
-
 CSMWorld::IdCollectionBase::IdCollectionBase() {}
 
 CSMWorld::IdCollectionBase::~IdCollectionBase() {}

apps/opencs/model/world/idcollection.hpp

@@ -11,53 +11,10 @@
 
 #include <QVariant>
 
-#include "record.hpp"
+#include "columnbase.hpp"
 
 namespace CSMWorld
 {
-    struct ColumnBase
-    {
-        enum Roles
-        {
-                Role_Flags = Qt::UserRole
-        };
-
-        enum Flags
-        {
-            Flag_Table = 1, // column should be displayed in table view
-            Flag_Dialogue = 2 // column should be displayed in dialogue view
-        };
-
-        std::string mTitle;
-        int mFlags;
-
-        ColumnBase (const std::string& title, int flag);
-
-        virtual ~ColumnBase();
-
-        virtual bool isEditable() const = 0;
-
-        virtual bool isUserEditable() const;
-        ///< Can this column be edited directly by the user?
-    };
-
-    template<typename ESXRecordT>
-    struct Column : public ColumnBase
-    {
-        std::string mTitle;
-        int mFlags;
-
-        Column (const std::string& title, int flags = Flag_Table | Flag_Dialogue)
-        : ColumnBase (title, flags) {}
-
-        virtual QVariant get (const Record<ESXRecordT>& record) const = 0;
-
-        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
-        {
-            throw std::logic_error ("Column " + mTitle + " is not editable");
-        }
-    };
-
     class IdCollectionBase
     {
             // not implemented