Merge branch 'opencs_remove_inclde' into 'master'

Remove some superfluous includes in the opencs

See merge request OpenMW/openmw!829

apps/opencs/model/doc/loader.cpp

@@ -5,7 +5,6 @@
 #include "../tools/reportmodel.hpp"
 
 #include "document.hpp"
-#include "state.hpp"
 
 CSMDoc::Loader::Stage::Stage() : mFile (0), mRecordsLoaded (0), mRecordsLeft (false) {}
 

apps/opencs/model/doc/operation.cpp

@@ -7,7 +7,6 @@
 
 #include "../world/universalid.hpp"
 
-#include "state.hpp"
 #include "stage.hpp"
 
 void CSMDoc::Operation::prepareStages()

apps/opencs/model/world/refcollection.cpp

@@ -1,6 +1,5 @@
 #include "refcollection.hpp"
 
-#include <components/misc/stringops.hpp>
 #include <components/esm/loadcell.hpp>
 
 #include "ref.hpp"

apps/opencs/view/doc/viewmanager.cpp

@@ -11,7 +11,6 @@
 #include "../../model/doc/documentmanager.hpp"
 #include "../../model/doc/document.hpp"
 #include "../../model/world/columns.hpp"
-#include "../../model/world/universalid.hpp"
 #include "../../model/world/idcompletionmanager.hpp"
 
 #include "../../model/prefs/state.hpp"

apps/opencs/view/render/orbitcameramode.cpp

@@ -3,7 +3,6 @@
 #include <QMenu>
 
 #include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
 
 #include "worldspacewidget.hpp"
 

apps/opencs/view/render/pagedworldspacewidget.cpp

@@ -7,18 +7,14 @@
 #include <QMouseEvent>
 #include <QApplication>
 
-#include <components/esm/loadland.hpp>
-
 #include <components/misc/constants.hpp>
 
 #include "../../model/prefs/shortcut.hpp"
 
-#include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/idtable.hpp"
 
 #include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolmode.hpp"
-#include "../widget/scenetooltoggle2.hpp"
 
 #include "editmode.hpp"
 #include "mask.hpp"

apps/opencs/view/render/pathgridmode.cpp

@@ -9,8 +9,6 @@
 
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/idtree.hpp"
 
 #include "../widget/scenetoolbar.hpp"
 

apps/opencs/view/render/scenewidget.cpp

@@ -25,7 +25,6 @@
 
 #include "../../model/prefs/state.hpp"
 #include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
 
 #include "lighting.hpp"
 #include "mask.hpp"

apps/opencs/view/render/terrainshapemode.cpp

@@ -25,14 +25,11 @@
 
 #include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
-#include "../../model/world/columnbase.hpp"
-#include "../../model/world/commandmacro.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
 #include "../../model/world/land.hpp"
-#include "../../model/world/resourcetable.hpp"
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/universalid.hpp"
 

apps/opencs/view/render/terraintexturemode.cpp

@@ -12,23 +12,17 @@
 
 #include <osg/Group>
 
-#include <components/esm/loadland.hpp>
-
 #include "../widget/modebutton.hpp"
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetooltexturebrush.hpp"
 
 #include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
-#include "../../model/world/columnbase.hpp"
-#include "../../model/world/commandmacro.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
-#include "../../model/world/land.hpp"
 #include "../../model/world/landtexture.hpp"
-#include "../../model/world/resourcetable.hpp"
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/universalid.hpp"
 #include "../widget/brushshapes.hpp"

apps/opencs/view/render/unpagedworldspacewidget.cpp

@@ -12,7 +12,6 @@
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/tablemimedata.hpp"
 
-#include "../widget/scenetooltoggle.hpp"
 #include "../widget/scenetooltoggle2.hpp"
 
 #include "cameracontroller.hpp"

apps/opencs/view/render/worldspacewidget.cpp

@@ -17,7 +17,6 @@
 #include "../../model/world/idtable.hpp"
 
 #include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
 #include "../../model/prefs/state.hpp"
 
 #include "../render/orbitcameramode.hpp"

apps/opencs/view/widget/scenetoolshapebrush.cpp

@@ -27,11 +27,6 @@
 #include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.hpp"
 #include "../../model/world/commands.hpp"
-#include "../../model/world/data.hpp"
-#include "../../model/world/idcollection.hpp"
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
-#include "../../model/world/universalid.hpp"
 
 
 CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString &title, QWidget *parent)

apps/opencs/view/world/colordelegate.cpp

@@ -3,8 +3,6 @@
 #include <QPainter>
 #include <QPushButton>
 
-#include "../widget/coloreditor.hpp"
-
 CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher,
                                        CSMDoc::Document& document,
                                        QObject *parent)

apps/opencs/view/world/dialoguesubview.cpp

@@ -28,7 +28,6 @@
 #include "../../model/world/columns.hpp"
 #include "../../model/world/record.hpp"
 #include "../../model/world/tablemimedata.hpp"
-#include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/doc/document.hpp"
 

apps/opencs/view/world/scenesubview.cpp

@@ -15,7 +15,6 @@
 
 #include "../render/pagedworldspacewidget.hpp"
 #include "../render/unpagedworldspacewidget.hpp"
-#include "../render/editmode.hpp"
 
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"

apps/opencs/view/world/scriptsubview.cpp

@@ -12,7 +12,6 @@
 #include "../../model/doc/document.hpp"
 #include "../../model/world/universalid.hpp"
 #include "../../model/world/data.hpp"
-#include "../../model/world/columnbase.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/prefs/state.hpp"