remove unused includes: part1

remove unused imports: part2 revert one tidy we will keep for c++20
2025-03-03 07:09:40 +00:00 · 2022-01-22 22:44:02 +01:00 · 2022-01-22 22:44:02 +01:00 · 74e7cfc023
commit 74e7cfc023
parent cdbab2325f
70 changed files with 28 additions and 159 deletions
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@ -4,7 +4,6 @@
 #include <list>
 #include <unordered_set>
 #include <map>
-#include <set>
 #include <fstream>
 #include <cmath>

--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@ -2,7 +2,6 @@

 #include <iomanip>

-#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>

 #include <osgDB/ReadFile>
--- a/apps/essimporter/importscpt.cpp
+++ b/apps/essimporter/importscpt.cpp
@ -3,7 +3,6 @@
 #include <components/esm3/esmreader.hpp>


-
 namespace ESSImport
 {

--- a/apps/essimporter/importscri.cpp
+++ b/apps/essimporter/importscri.cpp
@ -2,6 +2,7 @@

 #include <components/esm3/esmreader.hpp>

+
 namespace ESSImport
 {

--- a/apps/essimporter/main.cpp
+++ b/apps/essimporter/main.cpp
@ -11,7 +11,6 @@ namespace bpo = boost::program_options;
 namespace bfs = boost::filesystem;


-
 int main(int argc, char** argv)
 {
    try
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@ -21,7 +21,6 @@
 #include <components/config/launchersettings.hpp>

 #include "utils/textinputdialog.hpp"
-#include "utils/profilescombobox.hpp"


 const char *Launcher::DataFilesPage::mDefaultContentListName = "Default";
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@ -6,8 +6,6 @@
 #include <components/process/processinvoker.hpp>

 #include <QWidget>
-
-
 #include <QDir>
 #include <QStringList>

--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@ -5,7 +5,6 @@
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>

-
 #include <components/process/processinvoker.hpp>

 #include <components/config/gamesettings.hpp>
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@ -1,13 +1,12 @@
 #include "importer.hpp"

 #include <iostream>
-#include <sstream>
 #include <components/misc/stringops.hpp>
 #include <components/esm3/esmreader.hpp>

 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <boost/version.hpp>
+

 namespace bfs = boost::filesystem;

--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@ -28,7 +28,6 @@

 #include <cstddef>
 #include <stdexcept>
-#include <string>
 #include <thread>
 #include <vector>

--- a/apps/navmeshtool/navmesh.cpp
+++ b/apps/navmeshtool/navmesh.cpp
@ -2,37 +2,25 @@

 #include "worldspacedata.hpp"

-#include <components/bullethelpers/aabb.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/detournavigator/generatenavmeshtile.hpp>
 #include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/navmeshdb.hpp>
 #include <components/detournavigator/navmeshdbutils.hpp>
-#include <components/detournavigator/offmeshconnection.hpp>
-#include <components/detournavigator/offmeshconnectionsmanager.hpp>
 #include <components/detournavigator/preparednavmeshdata.hpp>
 #include <components/detournavigator/recastmesh.hpp>
 #include <components/detournavigator/recastmeshprovider.hpp>
 #include <components/detournavigator/serialization.hpp>
-#include <components/detournavigator/tilecachedrecastmeshmanager.hpp>
 #include <components/detournavigator/tileposition.hpp>
-#include <components/esm3/loadcell.hpp>
-#include <components/misc/guarded.hpp>
 #include <components/misc/progressreporter.hpp>
 #include <components/sceneutil/workqueue.hpp>
 #include <components/sqlite3/transaction.hpp>

-#include <DetourNavMesh.h>
-
 #include <osg/Vec3f>

-#include <algorithm>
 #include <atomic>
 #include <chrono>
 #include <cstddef>
-#include <stdexcept>
-#include <string>
-#include <string_view>
 #include <utility>
 #include <vector>

--- a/apps/navmeshtool/worldspacedata.cpp
+++ b/apps/navmeshtool/worldspacedata.cpp
@ -1,7 +1,6 @@
 #include "worldspacedata.hpp"

 #include <components/bullethelpers/aabb.hpp>
-#include <components/bullethelpers/heightfield.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/detournavigator/gettilespositions.hpp>
 #include <components/detournavigator/objectid.hpp>
@ -14,7 +13,6 @@
 #include <components/esmloader/esmdata.hpp>
 #include <components/esmloader/lessbyid.hpp>
 #include <components/esmloader/record.hpp>
-#include <components/misc/coordinateconverter.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
 #include <components/resource/bulletshapemanager.hpp>
@ -24,7 +22,6 @@
 #include <LinearMath/btVector3.h>

 #include <osg/Vec2i>
-#include <osg/Vec3f>
 #include <osg/ref_ptr>

 #include <algorithm>
@ -32,7 +29,6 @@
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <tuple>
 #include <utility>
 #include <vector>
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@ -1,7 +1,6 @@
 ///Program to test .nif files both on the FileSystem and in BSA archives.

 #include <iostream>
-#include <fstream>

 #include <components/misc/stringops.hpp>
 #include <components/nif/niffile.hpp>
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@ -2,8 +2,6 @@

 #include <boost/filesystem.hpp>

-#include <QUndoStack>
-
 #include <components/esm3/loaddial.hpp>

 #include "../world/infocollection.hpp"
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@ -7,7 +7,6 @@

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

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

 CSMTools::ClassCheckStage::ClassCheckStage (const CSMWorld::IdCollection<ESM::Class>& classes)
 : mClasses (classes)
--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@ -6,7 +6,6 @@

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

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

 CSMTools::FactionCheckStage::FactionCheckStage (const CSMWorld::IdCollection<ESM::Faction>& factions)
 : mFactions (factions)
--- a/apps/opencs/model/tools/mergestate.hpp
+++ b/apps/opencs/model/tools/mergestate.hpp
@ -1,7 +1,7 @@
 #ifndef CSM_TOOLS_MERGESTATE_H
 #define CSM_TOOLS_MERGESTATE_H

-#include <stdint.h>
+#include <cstdint>

 #include <memory>
 #include <map>
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@ -1,13 +1,9 @@
 #include "spellcheck.hpp"

-#include <sstream>
-#include <map>
-
 #include <components/esm3/loadspel.hpp>

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

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

 CSMTools::SpellCheckStage::SpellCheckStage (const CSMWorld::IdCollection<ESM::Spell>& spells)
 : mSpells (spells)
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@ -8,7 +8,6 @@
 #include <components/esm3/esmreader.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm3/loadglob.hpp>
-#include <components/esm3/cellref.hpp>

 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/shadow.hpp>
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@ -1,7 +1,6 @@
 #include "idtable.hpp"

 #include <algorithm>
-#include <cctype>
 #include <cstdint>
 #include <limits>
 #include <map>
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@ -1,8 +1,6 @@
 #include "refidadapterimp.hpp"

-#include <cassert>
 #include <stdexcept>
-#include <utility>

 #include <components/esm3/loadcont.hpp>
 #include <components/esm3/loadmgef.hpp>
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@ -1,15 +1,10 @@
 #include "filedialog.hpp"

-#include <QCheckBox>
 #include <QPushButton>
 #include <QDialogButtonBox>
 #include <QSortFilterProxyModel>
-#include <QRegExpValidator>
 #include <QRegExp>
-#include <QSpacerItem>
-#include <QPushButton>
 #include <QLabel>
-#include <QGroupBox>

 #include "components/contentselector/model/esmfile.hpp"
 #include "components/contentselector/view/contentselector.hpp"
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@ -1,23 +1,15 @@
 #include "cell.hpp"

-#include <math.h>
-
 #include <osg/PositionAttitudeTransform>
 #include <osg/Geode>
-#include <osg/Geometry>
 #include <osg/Group>

 #include <components/misc/stringops.hpp>
 #include <components/esm3/loadcell.hpp>
 #include <components/esm3/loadland.hpp>
-#include <components/sceneutil/pathgridutil.hpp>
 #include <components/terrain/terraingrid.hpp>

 #include "../../model/world/idtable.hpp"
-#include "../../model/world/columns.hpp"
-#include "../../model/world/data.hpp"
-#include "../../model/world/refcollection.hpp"
-#include "../../model/world/cellcoordinates.hpp"

 #include "cellwater.hpp"
 #include "cellborder.hpp"
--- a/apps/opencs/view/render/commands.cpp
+++ b/apps/opencs/view/render/commands.cpp
@ -1,14 +1,8 @@
 #include "commands.hpp"

-#include <QPointer>
-
 #include <components/debug/debuglog.hpp>
-#include <components/esm3/loadland.hpp>

-#include "editmode.hpp"
-#include "terrainselection.hpp"
 #include "terrainshapemode.hpp"
-#include "terraintexturemode.hpp"
 #include "worldspacewidget.hpp"

 CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(WorldspaceWidget* worldspaceWidget, QUndoCommand* parent)
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@ -4,11 +4,9 @@

 #include <osg/Group>
 #include <osg/Geometry>
-#include <osg/PositionAttitudeTransform>

 #include <components/esm3/loadland.hpp>

-#include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/columnimp.hpp"
 #include "../../model/world/idtable.hpp"

--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@ -2,15 +2,12 @@

 #include <algorithm>
 #include <string>
-#include <sstream>
 #include <memory>

 #include <QWidget>
 #include <QIcon>
 #include <QEvent>
 #include <QDropEvent>
-#include <QDragEnterEvent>
-#include <QDrag>

 #include <osg/Group>
 #include <osg/Vec3f>
@ -18,20 +15,12 @@
 #include <components/esm3/loadland.hpp>
 #include <components/debug/debuglog.hpp>

-#include "../widget/brushshapes.hpp"
-#include "../widget/modebutton.hpp"
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolshapebrush.hpp"

-#include "../../model/doc/document.hpp"
 #include "../../model/prefs/state.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/tablemimedata.hpp"
-#include "../../model/world/universalid.hpp"

 #include "brushdraw.hpp"
 #include "commands.hpp"
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@ -1,5 +1,8 @@
 #include "terrainstorage.hpp"

+#include <components/esm3terrain/storage.hpp>
+
+
 namespace CSVRender
 {
    TerrainStorage::TerrainStorage(const CSMWorld::Data &data)
--- a/apps/opencs/view/render/terrainstorage.hpp
+++ b/apps/opencs/view/render/terrainstorage.hpp
@ -25,7 +25,7 @@ namespace CSVRender

    private:
        const CSMWorld::Data& mData;
-        std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight{};
+        std::array<float, ESM::Land::LAND_SIZE * ESM::Land::LAND_SIZE> mAlteredHeight;

        osg::ref_ptr<const ESMTerrain::LandObject> getLand (int cellX, int cellY) override;
        const ESM::LandTexture* getLandTexture(int index, short plugin) override;
--- a/apps/opencs/view/world/dialoguecreator.cpp
+++ b/apps/opencs/view/world/dialoguecreator.cpp
@ -2,11 +2,7 @@

 #include <components/esm3/loaddial.hpp>

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

 void CSVWorld::DialogueCreator::configureCreateCommand (CSMWorld::CreateCommand& command) const
--- a/apps/opencs/view/world/globalcreator.cpp
+++ b/apps/opencs/view/world/globalcreator.cpp
@ -2,9 +2,7 @@

 #include <components/esm3/variant.hpp>

-#include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
-#include "../../model/world/columns.hpp"
 #include "../../model/world/idtable.hpp"

 namespace CSVWorld
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@ -16,12 +16,9 @@

 #include "../../model/world/commands.hpp"
 #include "../../model/world/infotableproxymodel.hpp"
-#include "../../model/world/idtableproxymodel.hpp"
 #include "../../model/world/idtablebase.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/landtexturetableproxymodel.hpp"
-#include "../../model/world/record.hpp"
-#include "../../model/world/columns.hpp"
 #include "../../model/world/commanddispatcher.hpp"

 #include "../../model/prefs/state.hpp"
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@ -1,8 +1,6 @@
 #include "engine.hpp"

-#include <condition_variable>
 #include <iomanip>
-#include <fstream>
 #include <chrono>
 #include <thread>

@ -11,7 +9,6 @@
 #include <osg/Version>

 #include <osgViewer/ViewerEventHandlers>
-#include <osgDB/ReadFile>
 #include <osgDB/WriteFile>

 #include <SDL.h>
--- a/apps/openmw/mwbase/dialoguemanager.hpp
+++ b/apps/openmw/mwbase/dialoguemanager.hpp
@ -5,7 +5,7 @@
 #include <vector>
 #include <list>

-#include <stdint.h>
+#include <cstdint>

 namespace Loading
 {
--- a/apps/openmw/mwbase/inputmanager.hpp
+++ b/apps/openmw/mwbase/inputmanager.hpp
@ -6,7 +6,7 @@
 #include <vector>

 #include <SDL_gamecontroller.h>
-#include <stdint.h>
+#include <cstdint>

 namespace Loading
 {
--- a/apps/openmw/mwbase/journal.hpp
+++ b/apps/openmw/mwbase/journal.hpp
@ -5,7 +5,7 @@
 #include <deque>
 #include <map>

-#include <stdint.h>
+#include <cstdint>

 #include "../mwdialogue/journalentry.hpp"
 #include "../mwdialogue/topic.hpp"
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@ -5,7 +5,7 @@
 #include <vector>
 #include <list>
 #include <set>
-#include <stdint.h>
+#include <cstdint>

 #include "../mwmechanics/actorutil.hpp"
 // For MWMechanics::GreetingState
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@ -1,7 +1,7 @@
 #ifndef GAME_MWBASE_WINDOWMANAGER_H
 #define GAME_MWBASE_WINDOWMANAGER_H

-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <map>
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@ -9,11 +9,8 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"

-#include "../mwworld/ptr.hpp"
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/nullaction.hpp"
-#include "../mwworld/containerstore.hpp"
-#include "../mwworld/customdata.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/actionharvest.hpp"
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@ -16,7 +16,6 @@
 #include "../mwmechanics/actorutil.hpp"

 #include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"

 #include <MyGUI_Macros.h>
 #include <components/esm/records.hpp>
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@ -10,8 +10,6 @@
 #include <components/misc/utf8stream.hpp>
 #include <components/sceneutil/depth.hpp>

-#include "../mwbase/environment.hpp"
-#include "../mwbase/windowmanager.hpp"

 namespace MWGui
 {
--- a/apps/openmw/mwgui/bookpage.hpp
+++ b/apps/openmw/mwgui/bookpage.hpp
@ -7,7 +7,7 @@

 #include <functional>
 #include <memory>
-#include <stdint.h>
+#include <cstdint>

 #include <components/settings/settings.hpp>

--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@ -15,9 +15,7 @@

 #include "../mwscript/interpretercontext.hpp"

-namespace MWGui
-{
-    namespace Formatting
+namespace MWGui::Formatting
    {
        /* BookTextParser */
        BookTextParser::BookTextParser(const std::string & text)
@ -489,4 +487,3 @@ namespace MWGui
            return mPaginator.getCurrentTop();
        }
    }
-}
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@ -16,7 +16,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"

-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"

--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@ -27,8 +27,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/actionequip.hpp"

-#include "../mwmechanics/actorutil.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"

 #include "itemview.hpp"
@ -38,7 +36,6 @@
 #include "countdialog.hpp"
 #include "tradewindow.hpp"
 #include "draganddrop.hpp"
-#include "widgets.hpp"
 #include "tooltips.hpp"

 namespace
--- a/apps/openmw/mwgui/journalviewmodel.hpp
+++ b/apps/openmw/mwgui/journalviewmodel.hpp
@ -4,7 +4,7 @@
 #include <string>
 #include <memory>
 #include <functional>
-#include <stdint.h>
+#include <cstdint>

 #include <components/misc/utf8stream.hpp>

--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@ -1,7 +1,7 @@
 #ifndef MWGUI_MAPWINDOW_H
 #define MWGUI_MAPWINDOW_H

-#include <stdint.h>
+#include <cstdint>
 #include <memory>

 #include <osg/Vec2f>
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@ -11,10 +11,7 @@

 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/esmstore.hpp"

-#include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/actorutil.hpp"

 namespace MWGui
 {
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@ -8,16 +8,10 @@

 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"

-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/spellutil.hpp"

 #include "tooltips.hpp"
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@ -11,15 +11,12 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"

-#include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/actorutil.hpp"
-
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/actionteleport.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"

+
 namespace MWGui
 {
    TravelWindow::TravelWindow() :
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@ -1,6 +1,5 @@
 #include "widgets.hpp"

-#include <sstream>
 #include <iomanip>

 #include <MyGUI_ProgressBar.h>
@ -15,9 +14,7 @@

 #include "controllers.hpp"

-namespace MWGui
-{
-    namespace Widgets
+namespace MWGui::Widgets
    {
        /* MWSkill */

@ -535,4 +532,3 @@ namespace MWGui
            assignWidget(mBarTextWidget, "BarText");
        }
    }
-}
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@ -9,13 +9,10 @@

 #include "../mwworld/ptr.hpp"

-namespace ESM
-{
-namespace AiSequence
+namespace ESM::AiSequence
 {
    struct AiFollow;
 }
-}

 namespace MWMechanics
 {
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@ -1,6 +1,6 @@
 #include "localmap.hpp"

-#include <stdint.h>
+#include <cstdint>

 #include <osg/Fog>
 #include <osg/LightModel>
@ -31,7 +31,6 @@
 #include "../mwworld/cellstore.hpp"

 #include "vismask.hpp"
-#include "util.hpp"

 namespace
 {
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@ -11,7 +11,6 @@
 #include <osg/Group>
 #include <osg/UserDataContainer>
 #include <osg/ComputeBoundsVisitor>
-#include <osg/Depth>
 #include <osg/ClipControl>

 #include <osgUtil/LineSegmentIntersector>
@ -24,7 +23,6 @@

 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
-#include <components/resource/scenemanager.hpp>
 #include <components/resource/keyframemanager.hpp>

 #include <components/shader/removedalphafunc.hpp>
@ -51,7 +49,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/groundcoverstore.hpp"
 #include "../mwgui/loadingscreen.hpp"
-#include "../mwbase/windowmanager.hpp"
 #include "../mwmechanics/actorutil.hpp"

 #include "sky.hpp"
--- a/apps/openmw/mwscript/globalscripts.hpp
+++ b/apps/openmw/mwscript/globalscripts.hpp
@ -8,7 +8,7 @@
 #include <memory>
 #include <utility>

-#include <stdint.h>
+#include <cstdint>

 #include "locals.hpp"

--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@ -1,7 +1,7 @@
 #ifndef GAME_SOUND_FFMPEG_DECODER_H
 #define GAME_SOUND_FFMPEG_DECODER_H

-#include <stdint.h>
+#include <cstdint>

 #if defined(_MSC_VER)
    #pragma warning (push)
--- a/apps/openmw/mwsound/loudness.cpp
+++ b/apps/openmw/mwsound/loudness.cpp
@ -1,6 +1,6 @@
 #include "loudness.hpp"

-#include <stdint.h>
+#include <cstdint>
 #include <limits>
 #include <algorithm>

--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@ -6,10 +6,9 @@
 #include <atomic>
 #include <condition_variable>
 #include <thread>
-#include <mutex>
 #include <chrono>

-#include <stdint.h>
+#include <cstdint>

 #include <components/debug/debuglog.hpp>
 #include <components/misc/constants.hpp>
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@ -1,6 +1,6 @@
 #include "cellref.hpp"

-#include <assert.h>
+#include <cassert>

 #include <components/debug/debuglog.hpp>
 #include <components/esm3/objectstate.hpp>
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@ -10,7 +10,6 @@
 #include "../mwworld/esmstore.hpp"

 #include "ptr.hpp"
-#include "refdata.hpp"
 #include "nullaction.hpp"
 #include "failedaction.hpp"
 #include "actiontake.hpp"
@ -18,7 +17,6 @@

 #include "../mwgui/tooltips.hpp"

-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"

 namespace MWWorld
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@ -2,7 +2,6 @@

 #include <algorithm>
 #include <fstream>
-#include <set>

 #include <components/debug/debuglog.hpp>
 #include <components/esm3/esmreader.hpp>
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@ -5,7 +5,7 @@
 #include <string>
 #include <map>

-#include <stdint.h>
+#include <cstdint>

 #include <components/esm3/loadglob.hpp>

--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@ -25,7 +25,6 @@

 #include "cellstore.hpp"
 #include "class.hpp"
-#include "esmloader.hpp"
 #include "ptr.hpp"

 namespace MWWorld
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@ -2,11 +2,9 @@

 #include <limits>
 #include <chrono>
-#include <thread>
 #include <atomic>

 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>

 #include <components/debug/debuglog.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
@ -14,7 +12,6 @@
 #include <components/settings/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/resource/bulletshape.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/detournavigator/debug.hpp>
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@ -1,7 +1,7 @@
 #ifndef GAME_MWWORLD_WEATHER_H
 #define GAME_MWWORLD_WEATHER_H

-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <map>

--- a/apps/openmw/options.cpp
+++ b/apps/openmw/options.cpp
@ -4,7 +4,6 @@
 #include <components/files/configurationmanager.hpp>
 #include <components/misc/rng.hpp>

-#include <boost/program_options.hpp>

 namespace
 {
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@ -3,7 +3,6 @@
 #include <QDebug>

 #include <QTime>
-#include <QCloseEvent>
 #include <QMessageBox>
 #include <QTextCodec>
 #include <QDir>
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@ -3,7 +3,6 @@
 #include <QDebug>

 #include <QReadLocker>
-#include <QWriteLocker>
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QStringList>
--- a/components/misc/convert.hpp
+++ b/components/misc/convert.hpp
@ -10,9 +10,7 @@
 #include <osg/Vec3f>
 #include <osg/Quat>

-namespace Misc
-{
-namespace Convert
+namespace Misc::Convert
 {
    inline osg::Vec3f makeOsgVec3f(const float* values)
    {
@ -73,6 +71,5 @@ namespace Convert
        return btTransform(makeBulletQuaternion(position), toBullet(position.asVec3()));
    }
 }
-}

 #endif
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@ -6,7 +6,6 @@

 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
-#include <BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>

 #include <components/debug/debuglog.hpp>

--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@ -6,7 +6,6 @@
 #include <osg/Material>

 #include <limits>
-#include <sstream>

 #include <components/misc/constants.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>