Merge branch 'cleanup_opencs_includes' into 'master'

Cleanup opencs includes See merge request OpenMW/openmw!2303
2 years ago · 209550aa84
parent ab2931223e b3882777ab
commit 209550aa84
42 changed files with 111 additions and 71 deletions
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@ -15,7 +15,6 @@
 #include <components/settings/settings.hpp>

 #include "model/doc/document.hpp"
-#include "model/world/data.hpp"

 #ifdef _WIN32
 #include <components/windows.hpp>
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@ -1,5 +1,7 @@
 #include "document.hpp"

+#include "state.hpp"
+
 #include <cassert>
 #include <memory>

--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@ -16,7 +16,6 @@

 #include "../tools/tools.hpp"

-#include "state.hpp"
 #include "saving.hpp"
 #include "blacklist.hpp"
 #include "runner.hpp"
--- a/apps/opencs/model/doc/stage.hpp
+++ b/apps/opencs/model/doc/stage.hpp
@ -4,8 +4,6 @@
 #include <vector>
 #include <string>

-#include "../world/universalid.hpp"
-
 #include "messages.hpp"

 class QString;
--- a/apps/opencs/model/tools/referenceablecheck.hpp
+++ b/apps/opencs/model/tools/referenceablecheck.hpp
@ -1,11 +1,17 @@
 #ifndef REFERENCEABLECHECKSTAGE_H
 #define REFERENCEABLECHECKSTAGE_H

-#include "../world/universalid.hpp"
 #include "../doc/stage.hpp"
-#include "../world/data.hpp"
+
 #include "../world/refiddata.hpp"
 #include "../world/resources.hpp"
+#include "../world/idcollection.hpp"
+
+#include <components/esm3/loadfact.hpp>
+#include <components/esm3/loadclas.hpp>
+#include <components/esm3/loadrace.hpp>
+#include <components/esm3/loadbody.hpp>
+#include <components/esm3/loadscpt.hpp>

 namespace CSMTools
 {
@ -54,31 +60,29 @@ namespace CSMTools
            //Convenience functions
            void inventoryListCheck(const std::vector<ESM::ContItem>& itemList, CSMDoc::Messages& messages, const std::string& id);

-            template<typename ITEM> void inventoryItemCheck(const ITEM& someItem,
-                                                            CSMDoc::Messages& messages,
-                                                            const std::string& someID,
-                                                            bool enchantable); //for all enchantable items.
+            /// for all enchantable items.
+            template <typename Item>
+            inline void inventoryItemCheck(const Item& someItem, CSMDoc::Messages& messages, const std::string& someID,
+                bool enchantable);

-            template<typename ITEM> void inventoryItemCheck(const ITEM& someItem,
-                                                            CSMDoc::Messages& messages,
-                                                            const std::string& someID); //for non-enchantable items.
+            /// for non-enchantable items.
+            template <typename Item>
+            inline void inventoryItemCheck(const Item& someItem, CSMDoc::Messages& messages, const std::string& someID);

-            template<typename TOOL> void toolCheck(const TOOL& someTool,
-                                                   CSMDoc::Messages& messages,
-                                                   const std::string& someID,
-                                                   bool canbebroken); //for tools with uses.
+            /// for tools with uses.
+            template <typename Tool>
+            inline void toolCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID,
+                bool canbebroken);

-            template<typename TOOL> void toolCheck(const TOOL& someTool,
-                                                   CSMDoc::Messages& messages,
-                                                   const std::string& someID); //for tools without uses.
+            /// for tools without uses.
+            template <typename Tool>
+            inline void toolCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID);

-            template<typename LIST> void listCheck(const LIST& someList,
-                                                   CSMDoc::Messages& messages,
-                                                   const std::string& someID);
+            template <typename List>
+            inline void listCheck(const List& someList, CSMDoc::Messages& messages, const std::string& someID);

-            template<typename TOOL> void scriptCheck(const TOOL& someTool,
-                                                   CSMDoc::Messages& messages,
-                                                   const std::string& someID);
+            template <typename Tool>
+            inline void scriptCheck(const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID);

            const CSMWorld::RefIdData& mReferencables;
            const CSMWorld::IdCollection<ESM::Race>& mRaces;
--- a/apps/opencs/model/tools/referencecheck.cpp
+++ b/apps/opencs/model/tools/referencecheck.cpp
@ -2,6 +2,10 @@

 #include "../prefs/state.hpp"

+#include "../../model/world/cell.hpp"
+
+#include <components/esm3/loadfact.hpp>
+
 CSMTools::ReferenceCheckStage::ReferenceCheckStage(
    const CSMWorld::RefCollection& references,
    const CSMWorld::RefIdCollection& referencables,
--- a/apps/opencs/model/tools/referencecheck.hpp
+++ b/apps/opencs/model/tools/referencecheck.hpp
@ -1,8 +1,17 @@
 #ifndef CSM_TOOLS_REFERENCECHECK_H
 #define CSM_TOOLS_REFERENCECHECK_H

-#include "../doc/state.hpp"
-#include "../doc/document.hpp"
+#include "../world/idcollection.hpp"
+#include "../world/refiddata.hpp"
+#include "../world/refidcollection.hpp"
+#include "../world/refcollection.hpp"
+
+#include "../doc/stage.hpp"
+
+namespace ESM
+{
+    struct Faction;
+}

 namespace CSMTools
 {
--- a/apps/opencs/model/tools/soundgencheck.cpp
+++ b/apps/opencs/model/tools/soundgencheck.cpp
@ -5,6 +5,9 @@
 #include "../world/refiddata.hpp"
 #include "../world/universalid.hpp"

+#include <components/esm3/loadsoun.hpp>
+#include <components/esm3/loadsndg.hpp>
+
 CSMTools::SoundGenCheckStage::SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator> &soundGens,
                                                 const CSMWorld::IdCollection<ESM::Sound> &sounds,
                                                 const CSMWorld::RefIdCollection &objects)
--- a/apps/opencs/model/tools/soundgencheck.hpp
+++ b/apps/opencs/model/tools/soundgencheck.hpp
@ -1,10 +1,17 @@
 #ifndef CSM_TOOLS_SOUNDGENCHECK_HPP
 #define CSM_TOOLS_SOUNDGENCHECK_HPP

-#include "../world/data.hpp"
+#include "../world/idcollection.hpp"
+#include "../world/refidcollection.hpp"

 #include "../doc/stage.hpp"

+namespace ESM
+{
+    struct SoundGenerator;
+    struct Sound;
+}
+
 namespace CSMTools
 {
    /// \brief VerifyStage: make sure that sound gen records are internally consistent
--- a/apps/opencs/model/world/cell.hpp
+++ b/apps/opencs/model/world/cell.hpp
@ -1,7 +1,6 @@
 #ifndef CSM_WOLRD_CELL_H
 #define CSM_WOLRD_CELL_H

-#include <vector>
 #include <string>

 #include <components/esm3/loadcell.hpp>
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@ -4,8 +4,6 @@
 #include <string>
 #include <vector>

-#include "columnbase.hpp"
-
 namespace CSMWorld
 {
    namespace Columns
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@ -15,6 +15,8 @@
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>

+#include "../doc/messages.hpp"
+
 #include "idtable.hpp"
 #include "idtree.hpp"
 #include "columnimp.hpp"
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@ -34,8 +34,6 @@
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>

-#include "../doc/stage.hpp"
-
 #include "actoradapter.hpp"
 #include "idcollection.hpp"
 #include "nestedidcollection.hpp"
--- a/apps/opencs/model/world/idtableproxymodel.cpp
+++ b/apps/opencs/model/world/idtableproxymodel.cpp
@ -3,6 +3,7 @@
 #include <vector>

 #include "idtablebase.hpp"
+#include "columnbase.hpp"

 namespace
 {
--- a/apps/opencs/model/world/idtree.hpp
+++ b/apps/opencs/model/world/idtree.hpp
@ -2,7 +2,6 @@
 #define CSM_WOLRD_IDTREE_H

 #include "idtable.hpp"
-#include "universalid.hpp"
 #include "columns.hpp"

 /*! \brief
--- a/apps/opencs/model/world/nestedcollection.cpp
+++ b/apps/opencs/model/world/nestedcollection.cpp
@ -1,5 +1,7 @@
 #include "nestedcollection.hpp"

+#include "columnbase.hpp"
+
 CSMWorld::NestedCollection::NestedCollection()
 {}

--- a/apps/opencs/model/world/nestedidcollection.hpp
+++ b/apps/opencs/model/world/nestedidcollection.hpp
@ -3,9 +3,11 @@

 #include <map>
 #include <stdexcept>
+#include <memory>

 #include "nestedcollection.hpp"
-#include "nestedcoladapterimp.hpp"
+#include "collection.hpp"
+#include "nestedcolumnadapter.hpp"

 namespace ESM
 {
@ -16,10 +18,17 @@ namespace CSMWorld
 {
    struct NestedTableWrapperBase;
    struct Cell;
+    struct ColumnBase;

-    template<typename T, typename AT>
+    template <typename ESXRecordT>
+    struct IdAccessor;
+
+    template <typename ESXRecordT, typename IdAccessorT>
    class IdCollection;

+    template <typename ESXRecordT>
+    class NestedColumnAdapter;
+
    template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
    class NestedIdCollection : public IdCollection<ESXRecordT, IdAccessorT>, public NestedCollection
    {
--- a/apps/opencs/model/world/nestedtableproxymodel.hpp
+++ b/apps/opencs/model/world/nestedtableproxymodel.hpp
@ -5,8 +5,6 @@

 #include <QAbstractProxyModel>

-#include "universalid.hpp"
-#include "columns.hpp"
 #include "columnbase.hpp"

 /*! \brief
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@ -12,6 +12,9 @@ namespace CSMWorld
    template<typename T, typename AT>
    class IdCollection;

+    template<typename ESXRecordT>
+    struct IdAccessor;
+
    /// \brief Wrapper for Pathgrid record
    ///
    /// \attention The mData.mX and mData.mY fields of the ESM::Pathgrid struct are not used.
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@ -7,6 +7,8 @@
 #include "universalid.hpp"
 #include "record.hpp"

+#include "../doc/messages.hpp"
+
 #include <string_view>

 namespace CSMWorld
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@ -4,12 +4,15 @@
 #include <map>
 #include <string_view>

-#include "../doc/stage.hpp"
-
 #include "collection.hpp"
 #include "ref.hpp"
 #include "record.hpp"

+namespace CSMDoc
+{
+    class Messages;
+}
+
 namespace CSMWorld
 {
    struct Cell;
--- a/apps/opencs/model/world/subcellcollection.hpp
+++ b/apps/opencs/model/world/subcellcollection.hpp
@ -11,20 +11,17 @@ namespace ESM
 namespace CSMWorld
 {
    struct Cell;
-    template<typename T, typename AT>
-    class IdCollection;

    /// \brief Single type collection of top level records that are associated with cells
    template<typename ESXRecordT, typename IdAccessorT = IdAccessor<ESXRecordT> >
    class SubCellCollection : public NestedIdCollection<ESXRecordT, IdAccessorT>
    {
-            const IdCollection<Cell>& mCells;
+            const IdCollection<Cell, IdAccessor<Cell>>& mCells;

            void loadRecord (ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted) override;

        public:
-
-            SubCellCollection (const IdCollection<Cell>& cells);
+            SubCellCollection(const IdCollection<Cell, IdAccessor<Cell>>& cells);
    };

    template<typename ESXRecordT, typename IdAccessorT>
@ -37,7 +34,7 @@ namespace CSMWorld

    template<typename ESXRecordT, typename IdAccessorT>
    SubCellCollection<ESXRecordT, IdAccessorT>::SubCellCollection (
-        const IdCollection<Cell>& cells)
+        const IdCollection<Cell, IdAccessor<Cell>>& cells)
    : mCells (cells)
    {}
 }
--- a/apps/opencs/view/doc/operation.cpp
+++ b/apps/opencs/view/doc/operation.cpp
@ -6,7 +6,7 @@
 #include <QPushButton>
 #include <QHBoxLayout>

-#include "../../model/doc/document.hpp"
+#include "../../model/doc/state.hpp"

 void CSVDoc::Operation::updateLabel (int threads)
 {
--- a/apps/opencs/view/doc/runlogsubview.cpp
+++ b/apps/opencs/view/doc/runlogsubview.cpp
@ -1,5 +1,7 @@
 #include "runlogsubview.hpp"

+#include "../../model/doc/document.hpp"
+
 #include <QTextEdit>

 CSVDoc::RunLogSubView::RunLogSubView (const CSMWorld::UniversalId& id,
--- a/apps/opencs/view/doc/runlogsubview.hpp
+++ b/apps/opencs/view/doc/runlogsubview.hpp
@ -3,6 +3,11 @@

 #include "subview.hpp"

+namespace CSMDoc
+{
+    class Document;
+}
+
 namespace CSVDoc
 {
    class RunLogSubView : public SubView
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@ -1,12 +1,8 @@
 #ifndef CSV_DOC_SUBVIEW_H
 #define CSV_DOC_SUBVIEW_H

-#include "../../model/doc/document.hpp"
-
 #include "../../model/world/universalid.hpp"

-#include "subviewfactory.hpp"
-
 #include <QDockWidget>

 class QUndoStack;
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@ -13,6 +13,8 @@
 #include <QScreen>

 #include "../../model/doc/document.hpp"
+#include "../../model/doc/state.hpp"
+
 #include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"

--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@ -9,6 +9,8 @@

 #include "../../model/doc/documentmanager.hpp"
 #include "../../model/doc/document.hpp"
+#include "../../model/doc/state.hpp"
+
 #include "../../model/world/columns.hpp"
 #include "../../model/world/idcompletionmanager.hpp"

--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@ -16,6 +16,7 @@
 #include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/tablemimedata.hpp"
 #include "../../model/prefs/shortcut.hpp"

 #include "../widget/scenetoolbar.hpp"
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@ -8,7 +8,6 @@
 #include <osg/Vec3d>

 #include "../../model/world/cellcoordinates.hpp"
-#include "../../model/world/idcollection.hpp"
 #include "../../model/world/subcellcollection.hpp"

 #include "tagbase.hpp"
--- a/apps/opencs/view/render/selectionmode.hpp
+++ b/apps/opencs/view/render/selectionmode.hpp
@ -3,8 +3,6 @@

 #include "../widget/scenetoolmode.hpp"

-#include "mask.hpp"
-
 class QAction;

 namespace CSVRender
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@ -9,7 +9,6 @@
 #include <osg/PositionAttitudeTransform>

 #include <components/esm3/loadland.hpp>
-#include "../../model/world/cellcoordinates.hpp"

 namespace osg
 {
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@ -20,7 +20,7 @@

 #include "../../model/prefs/state.hpp"
 #include "../../model/world/idtree.hpp"
-#include "../../model/world/tablemimedata.hpp"
+#include "../../model/world/commands.hpp"

 #include "brushdraw.hpp"
 #include "commands.hpp"
--- a/apps/opencs/view/render/terrainshapemode.hpp
+++ b/apps/opencs/view/render/terrainshapemode.hpp
@ -10,12 +10,9 @@
 #include <QEvent>

 #ifndef Q_MOC_RUN
-#include "../../model/world/data.hpp"
-#include "../../model/world/land.hpp"
 #include "../../model/doc/document.hpp"
-#include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
+#include "../../model/world/columnimp.hpp"
 #include "../widget/brushshapes.hpp"
 #endif

@ -27,6 +24,11 @@ namespace CSVWidget
    class SceneToolShapeBrush;
 }

+namespace CSMWorld
+{
+    class CellCoordinates;
+}
+
 namespace CSVRender
 {
    class PagedWorldspaceWidget;
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@ -10,13 +10,9 @@
 #include <QEvent>

 #ifndef Q_MOC_RUN
-#include "../../model/world/data.hpp"
-#include "../../model/world/land.hpp"
-
 #include "../../model/doc/document.hpp"
-#include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
+#include "../../model/world/columnimp.hpp"
 #include "../widget/brushshapes.hpp"
 #include "brushdraw.hpp"
 #endif
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@ -12,6 +12,7 @@

 #include "../../model/world/universalid.hpp"
 #include "../../model/world/idtable.hpp"
+#include "../../model/world/tablemimedata.hpp"

 #include "../../model/prefs/shortcut.hpp"
 #include "../../model/prefs/state.hpp"
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@ -5,11 +5,9 @@
 #include <osg/Vec3>

 #include "../../model/doc/document.hpp"
-#include "../../model/world/tablemimedata.hpp"

 #include "instancedragmodes.hpp"
 #include "scenewidget.hpp"
-#include "mask.hpp"

 namespace CSMPrefs
 {
--- a/apps/opencs/view/tools/merge.cpp
+++ b/apps/opencs/view/tools/merge.cpp
@ -11,6 +11,7 @@

 #include "../../model/doc/document.hpp"
 #include "../../model/doc/documentmanager.hpp"
+#include "../../model/doc/state.hpp"

 #include "../doc/filewidget.hpp"
 #include "../doc/adjusterwidget.hpp"
--- a/apps/opencs/view/tools/reportsubview.cpp
+++ b/apps/opencs/view/tools/reportsubview.cpp
@ -2,6 +2,9 @@

 #include "reporttable.hpp"

+#include "../../model/doc/state.hpp"
+#include "../../model/doc/document.hpp"
+
 CSVTools::ReportSubView::ReportSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
 : CSVDoc::SubView (id), mDocument (document), mRefreshState (0)
 {
--- a/apps/opencs/view/world/idtypedelegate.hpp
+++ b/apps/opencs/view/world/idtypedelegate.hpp
@ -1,9 +1,7 @@
 #ifndef IDTYPEDELEGATE_HPP
 #define IDTYPEDELEGATE_HPP

-#include "enumdelegate.hpp"
 #include "util.hpp"
-#include "../../model/world/universalid.hpp"
 #include "datadisplaydelegate.hpp"

 namespace CSVWorld
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@ -7,6 +7,8 @@
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"

+#include "../../model/doc/document.hpp"
+
 CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
 : SubView (id), mTitle (id.toString().c_str())
 {
--- a/apps/opencs/view/world/recordstatusdelegate.hpp
+++ b/apps/opencs/view/world/recordstatusdelegate.hpp
@ -4,7 +4,6 @@
 #include "util.hpp"

 #include "datadisplaydelegate.hpp"
-#include "../../model/world/record.hpp"

 class QIcon;
 class QFont;