Merge branch 'clean_includes' into 'master'

Cleanup includes

See merge request OpenMW/openmw!2307
crashfix_debugdraw
psi29a 2 years ago
commit 5aa1ab2c62

@ -3,6 +3,7 @@
#include <vector>
#include <optional>
#include <string>
#include <components/esm/format.hpp>

@ -14,7 +14,6 @@
#include <components/esm3/esmreader.hpp>
#include <components/esm3/esmwriter.hpp>
#include <components/esm/records.hpp>
#include <components/esm/format.hpp>
#include <components/files/openfile.hpp>
#include <components/misc/strings/algorithm.hpp>

@ -14,11 +14,8 @@
#include "importnpcc.hpp"
#include "importcrec.hpp"
#include "importcntc.hpp"
#include "importplayer.hpp"
#include "importsplm.h"
namespace ESSImport
{

@ -8,8 +8,6 @@
#include <components/esm3/cellref.hpp>
#include <components/esm/esmcommon.hpp>
#include "importacdt.hpp"
namespace ESM
{
class ESMReader;

@ -1,5 +1,7 @@
#include "graphicspage.hpp"
#include "sdlinit.hpp"
#include <QMessageBox>
#include <QScreen>

@ -5,8 +5,6 @@
#include <components/settings/settings.hpp>
#include "sdlinit.hpp"
namespace Files { struct ConfigurationManager; }
namespace Launcher

@ -14,7 +14,6 @@
#include <components/esm3/loadbody.hpp>
#include <components/misc/weakcache.hpp>
#include "refidcollection.hpp"
#include "idcollection.hpp"
namespace ESM
@ -25,6 +24,7 @@ namespace ESM
namespace CSMWorld
{
class Data;
class RefIdCollection;
/// Adapts multiple collections to provide the data needed to render
/// an npc or creature.

@ -5,6 +5,8 @@
#include <ostream>
#include <sstream>
#include <osg/Vec3d>
#include <components/esm3/loadland.hpp>
#include <components/misc/constants.hpp>

@ -7,7 +7,10 @@
#include <QMetaType>
#include <osg/Vec3d>
namespace osg
{
class Vec3d;
}
namespace CSMWorld
{

@ -1,5 +1,7 @@
#include "cellselection.hpp"
#include "cellcoordinates.hpp"
#include <cmath>
#include <stdexcept>
#include <limits>

@ -5,10 +5,10 @@
#include <QMetaType>
#include "cellcoordinates.hpp"
namespace CSMWorld
{
class CellCoordinates;
/// \brief Selection of cells in a paged worldspace
///
/// \note The CellSelection does not specify the worldspace it applies to.

@ -1,5 +1,7 @@
#include "resourcesmanager.hpp"
#include "resources.hpp"
#include <stdexcept>
CSMWorld::ResourcesManager::ResourcesManager()
@ -7,6 +9,8 @@ CSMWorld::ResourcesManager::ResourcesManager()
{
}
CSMWorld::ResourcesManager::~ResourcesManager() = default;
void CSMWorld::ResourcesManager::addResources (const Resources& resources)
{
mResources.insert (std::make_pair (resources.getType(), resources));

@ -4,7 +4,6 @@
#include <map>
#include "universalid.hpp"
#include "resources.hpp"
namespace VFS
{
@ -13,6 +12,8 @@ namespace VFS
namespace CSMWorld
{
class Resources;
class ResourcesManager
{
std::map<UniversalId::Type, Resources> mResources;
@ -27,6 +28,7 @@ namespace CSMWorld
public:
ResourcesManager();
~ResourcesManager();
const VFS::Manager* getVFS() const;

@ -60,7 +60,6 @@
#include "mwsound/soundmanagerimp.hpp"
#include "mwworld/class.hpp"
#include "mwworld/player.hpp"
#include "mwworld/worldimp.hpp"
#include "mwrender/vismask.hpp"

@ -11,8 +11,6 @@
#include "mwbase/environment.hpp"
#include "mwworld/ptr.hpp"
namespace Resource
{
class ResourceSystem;

@ -5,15 +5,7 @@
#include <components/resource/resourcesystem.hpp>
#include "world.hpp"
#include "scriptmanager.hpp"
#include "dialoguemanager.hpp"
#include "journal.hpp"
#include "soundmanager.hpp"
#include "mechanicsmanager.hpp"
#include "inputmanager.hpp"
#include "windowmanager.hpp"
#include "statemanager.hpp"
#include "luamanager.hpp"
MWBase::Environment *MWBase::Environment::sThis = nullptr;

@ -2,6 +2,9 @@
#define GAME_MWBASE_LUAMANAGER_H
#include <variant>
#include <string>
#include <map>
#include <SDL_events.h>
#include <components/sdlutil/events.hpp>

@ -19,7 +19,6 @@
#include "../mwworld/esmstore.hpp"
#include <MyGUI_Macros.h>
#include <components/esm/records.hpp>
#include "inventoryitemmodel.hpp"
#include "sortfilteritemmodel.hpp"

@ -5,7 +5,6 @@
#include <MyGUI_Gui.h>
#include <MyGUI_ScrollBar.h>
#include <components/esm/records.hpp>
#include <components/widgets/list.hpp>
#include <components/misc/resourcehelpers.hpp>
#include <components/resource/resourcesystem.hpp>

@ -3,11 +3,14 @@
#include "activespells.hpp"
#include "../mwworld/ptr.hpp"
// These functions should probably be split up into separate Lua functions for each magic effect when magic is dehardcoded.
// That way ESM::MGEF could point to two Lua scripts for each effect. Needs discussion.
namespace MWWorld
{
class Ptr;
}
namespace MWMechanics
{
enum class MagicApplicationResult

@ -1,13 +1,15 @@
#ifndef OPENMW_MECHANICS_SUMMONING_H
#define OPENMW_MECHANICS_SUMMONING_H
#include <set>
#include "../mwworld/ptr.hpp"
#include <string>
#include <utility>
#include <components/esm3/magiceffects.hpp>
#include "magiceffects.hpp"
namespace MWWorld
{
class Ptr;
}
namespace MWMechanics
{

@ -1,7 +1,10 @@
#ifndef OPENMW_WEAPON_PRIORITY_H
#define OPENMW_WEAPON_PRIORITY_H
#include "../mwworld/ptr.hpp"
namespace MWWorld
{
class Ptr;
}
namespace MWMechanics
{

@ -1,7 +1,20 @@
#ifndef GAME_MWMECHANICS_WEAPONTYPE_H
#define GAME_MWMECHANICS_WEAPONTYPE_H
#include "../mwworld/inventorystore.hpp"
namespace ESM
{
struct WeaponType;
}
namespace MWWorld
{
class Ptr;
template <class PtrType>
class ContainerStoreIteratorBase;
using ContainerStoreIterator = ContainerStoreIteratorBase<Ptr>;
}
namespace MWMechanics
{

@ -6,6 +6,8 @@
#include <components/esm3/readerscache.hpp>
#include <components/misc/resourcehelpers.hpp>
#include <components/resource/resourcesystem.hpp>
#include <components/esm3/loadstat.hpp>
#include <components/esm3/loadcell.hpp>
#include <apps/openmw/mwbase/environment.hpp>

@ -4,6 +4,7 @@
#include <components/esm3/esmreader.hpp>
#include <components/esm3/esmwriter.hpp>
#include <components/esm/records.hpp>
#include <components/loadinglistener/loadinglistener.hpp>
#include <components/misc/rng.hpp>
@ -330,6 +331,9 @@ namespace MWWorld
}
return ptr;
}
void Store<ESM::LandTexture>::resize(std::size_t num) { mStatic.resize(num); }
size_t Store<ESM::LandTexture>::getSize() const
{
return mStatic.size();

@ -8,7 +8,10 @@
#include <unordered_map>
#include <set>
#include <components/esm/records.hpp>
#include <components/esm3/loadland.hpp>
#include <components/esm3/loaddial.hpp>
#include <components/esm3/loadpgrd.hpp>
#include <components/esm3/loadcell.hpp>
#include <components/misc/strings/algorithm.hpp>
#include <components/misc/rng.hpp>
@ -16,7 +19,13 @@
namespace ESM
{
struct Land;
struct Attribute;
struct LandTexture;
struct MagicEffect;
struct Skill;
struct WeaponType;
class ESMReader;
class ESMWriter;
}
namespace Loading
@ -227,7 +236,7 @@ namespace MWWorld
const ESM::LandTexture *search(size_t index, size_t plugin) const;
const ESM::LandTexture *find(size_t index, size_t plugin) const;
void resize(size_t num) { mStatic.resize(num); }
void resize(std::size_t num);
size_t getSize() const override;
size_t getSize(size_t plugin) const;

Loading…
Cancel
Save