From c781d1f8edee2a27cc1c001103c6333694c5069b Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Sun, 7 May 2017 01:04:24 +0200 Subject: [PATCH] purge unnecessary imports add fstream back add fstream back add fstream back add fstream back add fstream back add fstream back add fstream back --- apps/esmtool/labels.cpp | 1 - apps/essimporter/importer.cpp | 2 +- apps/mwiniimporter/importer.cpp | 7 +------ apps/mwiniimporter/main.cpp | 2 -- apps/opencs/model/doc/document.cpp | 1 + apps/opencs/model/doc/documentmanager.cpp | 3 --- apps/opencs/model/doc/savingstages.cpp | 5 ----- apps/opencs/model/doc/savingstate.cpp | 2 ++ apps/opencs/view/doc/adjusterwidget.cpp | 3 --- apps/openmw/engine.cpp | 2 -- apps/openmw/main.cpp | 3 ++- apps/openmw/mwgui/race.cpp | 3 --- apps/openmw/mwmechanics/npcstats.cpp | 6 ------ apps/openmw/mwrender/water.cpp | 2 -- apps/openmw/mwscript/containerextensions.cpp | 1 - apps/openmw/mwstate/character.cpp | 6 ------ apps/openmw/mwstate/charactermanager.cpp | 2 -- apps/openmw/mwstate/statemanagerimp.cpp | 3 --- components/bsa/bsa_file.cpp | 1 - components/files/configurationmanager.cpp | 5 ----- components/files/escape.cpp | 1 - components/files/linuxpath.cpp | 3 --- components/files/multidircollection.cpp | 6 ------ components/myguiplatform/myguiloglistener.cpp | 3 --- components/settings/settings.cpp | 2 -- components/translation/translation.cpp | 2 -- 26 files changed, 7 insertions(+), 70 deletions(-) diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp index 883a9e7280..ea7b501295 100644 --- a/apps/esmtool/labels.cpp +++ b/apps/esmtool/labels.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp index 2c05f9ecb6..d38069d891 100644 --- a/apps/essimporter/importer.cpp +++ b/apps/essimporter/importer.cpp @@ -1,8 +1,8 @@ #include "importer.hpp" #include -#include +#include #include #include diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp index fb31448140..24646b8446 100644 --- a/apps/mwiniimporter/importer.cpp +++ b/apps/mwiniimporter/importer.cpp @@ -1,17 +1,12 @@ #include "importer.hpp" -#include #include -#include -#include -#include -#include #include #include -#include #include #include +#include namespace bfs = boost::filesystem; diff --git a/apps/mwiniimporter/main.cpp b/apps/mwiniimporter/main.cpp index a3f115fcf5..8a2aeb603b 100644 --- a/apps/mwiniimporter/main.cpp +++ b/apps/mwiniimporter/main.cpp @@ -1,11 +1,9 @@ #include "importer.hpp" -#include #include #include #include -#include #include namespace bpo = boost::program_options; diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp index ea32a84571..ef984c0ca4 100644 --- a/apps/opencs/model/doc/document.cpp +++ b/apps/opencs/model/doc/document.cpp @@ -5,6 +5,7 @@ #include #include +#include #include "../world/defaultgmsts.hpp" diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp index 87fb960c1a..098d7bad5a 100644 --- a/apps/opencs/model/doc/documentmanager.cpp +++ b/apps/opencs/model/doc/documentmanager.cpp @@ -1,8 +1,5 @@ #include "documentmanager.hpp" -#include -#include - #include #ifndef Q_MOC_RUN diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp index 82a965ae40..f9c028e29e 100644 --- a/apps/opencs/model/doc/savingstages.cpp +++ b/apps/opencs/model/doc/savingstages.cpp @@ -1,20 +1,15 @@ #include "savingstages.hpp" -#include - #include #include #include -#include - #include "../world/infocollection.hpp" #include "../world/cellcoordinates.hpp" #include "document.hpp" -#include "savingstate.hpp" CSMDoc::OpenSaveStage::OpenSaveStage (Document& document, SavingState& state, bool projectFile) : mDocument (document), mState (state), mProjectFile (projectFile) diff --git a/apps/opencs/model/doc/savingstate.cpp b/apps/opencs/model/doc/savingstate.cpp index 10539c1b55..7214735f07 100644 --- a/apps/opencs/model/doc/savingstate.cpp +++ b/apps/opencs/model/doc/savingstate.cpp @@ -1,5 +1,7 @@ #include "savingstate.hpp" +#include + #include "operation.hpp" #include "document.hpp" diff --git a/apps/opencs/view/doc/adjusterwidget.cpp b/apps/opencs/view/doc/adjusterwidget.cpp index 620d853ac4..06da68ed80 100644 --- a/apps/opencs/view/doc/adjusterwidget.cpp +++ b/apps/opencs/view/doc/adjusterwidget.cpp @@ -1,8 +1,5 @@ #include "adjusterwidget.hpp" -#include -#include - #include #include diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 81fb2e6a7e..b1c1311bca 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -1,6 +1,5 @@ #include "engine.hpp" -#include #include #include @@ -28,7 +27,6 @@ #include #include -#include #include diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index be860118e2..a7e522acdc 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -8,6 +8,8 @@ #include #include "engine.hpp" +#include + #if defined(_WIN32) // For OutputDebugString #ifndef WIN32_LEAN_AND_MEAN @@ -31,7 +33,6 @@ extern int cc_install_handlers(int argc, char **argv, int num_signals, int *sigs extern int is_debugger_attached(void); #endif -#include /** * Workaround for problems with whitespaces in paths in older versions of Boost library */ diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index c4a27f7ed6..047f652639 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/apps/openmw/mwgui/race.cpp @@ -2,13 +2,10 @@ #include #include -#include #include #include -#include - #include #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp index 41f2a9b513..5f8967cf44 100644 --- a/apps/openmw/mwmechanics/npcstats.cpp +++ b/apps/openmw/mwmechanics/npcstats.cpp @@ -1,15 +1,9 @@ #include "npcstats.hpp" -#include -#include -#include -#include - #include #include -#include #include #include #include diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp index 02882adbe6..0ed389bdf7 100644 --- a/apps/openmw/mwrender/water.cpp +++ b/apps/openmw/mwrender/water.cpp @@ -10,8 +10,6 @@ #include #include #include -#include -#include #include diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp index a65c275d61..dfc066bcd7 100644 --- a/apps/openmw/mwscript/containerextensions.cpp +++ b/apps/openmw/mwscript/containerextensions.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp index 733ac1171c..4f7d365b41 100644 --- a/apps/openmw/mwstate/character.cpp +++ b/apps/openmw/mwstate/character.cpp @@ -1,18 +1,12 @@ #include "character.hpp" -#include - #include -#include -#include #include #include #include -#include - bool MWState::operator< (const Slot& left, const Slot& right) { return left.mTimeStamp -#include -#include // std::isalnum #include diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp index 64c543fb1d..68b0e4ecbc 100644 --- a/apps/openmw/mwstate/statemanagerimp.cpp +++ b/apps/openmw/mwstate/statemanagerimp.cpp @@ -7,8 +7,6 @@ #include -#include - #include #include @@ -35,7 +33,6 @@ #include "../mwworld/inventorystore.hpp" #include "../mwmechanics/npcstats.hpp" -#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwscript/globalscripts.hpp" diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp index 50b3374e5f..c4be428b32 100644 --- a/components/bsa/bsa_file.cpp +++ b/components/bsa/bsa_file.cpp @@ -23,7 +23,6 @@ #include "bsa_file.hpp" -#include #include #include diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp index 46dbca8dc1..5316255ad7 100644 --- a/components/files/configurationmanager.cpp +++ b/components/files/configurationmanager.cpp @@ -1,17 +1,12 @@ #include "configurationmanager.hpp" -#include #include -#include -#include #include #include #include #include -#include - /** * \namespace Files */ diff --git a/components/files/escape.cpp b/components/files/escape.cpp index c5d2c041e9..f28870c703 100644 --- a/components/files/escape.cpp +++ b/components/files/escape.cpp @@ -1,7 +1,6 @@ #include "escape.hpp" #include -#include namespace Files { diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp index 89b4bf45a5..fce7cd02ce 100644 --- a/components/files/linuxpath.cpp +++ b/components/files/linuxpath.cpp @@ -2,10 +2,7 @@ #if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) -#include -#include #include -#include #include #include diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp index b37a95b2fc..93db6834d0 100644 --- a/components/files/multidircollection.cpp +++ b/components/files/multidircollection.cpp @@ -1,15 +1,9 @@ #include "multidircollection.hpp" -#include - -#include -#include #include #include -#include - namespace Files { struct NameEqual diff --git a/components/myguiplatform/myguiloglistener.cpp b/components/myguiplatform/myguiloglistener.cpp index b36e0d852c..a22ac8fc5d 100644 --- a/components/myguiplatform/myguiloglistener.cpp +++ b/components/myguiplatform/myguiloglistener.cpp @@ -1,9 +1,6 @@ #include "myguiloglistener.hpp" #include -#include - -#include namespace osgMyGUI { diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp index 0c0600cc03..e93642ee2c 100644 --- a/components/settings/settings.cpp +++ b/components/settings/settings.cpp @@ -1,13 +1,11 @@ #include "settings.hpp" -#include #include #include #include #include -#include #include namespace diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp index 51947f6f9e..14a32f178d 100644 --- a/components/translation/translation.cpp +++ b/components/translation/translation.cpp @@ -2,8 +2,6 @@ #include -#include - namespace Translation { Storage::Storage()