mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-19 12:40:49 +00:00
Code Issues Projects Releases Wiki Activity

Include cleanup

Browse Source
This commit is contained in:
scrawl 2015-01-31 23:27:34 +01:00
parent 056a01a05b
commit 0c6e2170db
30 changed files with 66 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/launcher/graphicspage.cpp
View File

@ -10,7 +10,7 @@
#define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
#endif // MAC_OS_X_VERSION_MIN_REQUIRED
#include <SDL.h>
#include <SDL_video.h>
#include <OgreRoot.h>
#include <OgreRenderSystem.h>

4
apps/openmw/mwbase/environment.hpp
View File

@ -1,5 +1,5 @@
#ifndef GAME_BASE_INVIRONMENT_H
#define GAME_BASE_INVIRONMENT_H
#ifndef GAME_BASE_ENVIRONMENT_H
#define GAME_BASE_ENVIRONMENT_H
namespace MWBase
{

4
apps/openmw/mwbase/inputmanager.hpp
View File

@ -3,8 +3,6 @@
#include <string>
#include <components/settings/settings.hpp>
namespace MWBase
{
/// \brief Interface for input manager (implemented in MWInput)
@ -29,7 +27,7 @@ namespace MWBase
virtual void changeInputMode(bool guiMode) = 0;
virtual void processChangedSettings(const Settings::CategorySettingVector& changed) = 0;
virtual void processChangedSettings(const std::vector< std::pair<std::string, std::string> >& changed) = 0;
virtual void setDragDrop(bool dragDrop) = 0;

4
apps/openmw/mwbase/soundmanager.hpp
View File

@ -5,8 +5,6 @@
#include <boost/shared_ptr.hpp>
#include <components/settings/settings.hpp>
#include "../mwworld/ptr.hpp"
namespace Ogre
@ -74,7 +72,7 @@ namespace MWBase
virtual ~SoundManager() {}
virtual void processChangedSettings(const Settings::CategorySettingVector& settings) = 0;
virtual void processChangedSettings(const std::vector< std::pair<std::string, std::string> >& settings) = 0;
virtual void stopMusic() = 0;
///< Stops music if it's playing

18
apps/openmw/mwbase/windowmanager.hpp
View File

@ -5,16 +5,20 @@
#include <vector>
#include <map>
#include <components/settings/settings.hpp>
#include <components/translation/translation.hpp>
#include <components/loadinglistener/loadinglistener.hpp>
#include "../mwmechanics/stat.hpp"
#include "../mwgui/mode.hpp"
namespace Loading
{
class Listener;
}
namespace Translation
{
class Storage;
}
namespace MyGUI
{
class Gui;
@ -267,7 +271,7 @@ namespace MWBase
*/
virtual std::string getGameSettingString(const std::string &id, const std::string &default_) = 0;
virtual void processChangedSettings(const Settings::CategorySettingVector& changed) = 0;
virtual void processChangedSettings(const std::vector< std::pair<std::string, std::string> >& changed) = 0;
virtual void windowResized(int x, int y) = 0;

14
apps/openmw/mwbase/world.hpp
View File

@ -4,25 +4,21 @@
#include <vector>
#include <map>
#include <components/settings/settings.hpp>
#include <components/esm/cellid.hpp>
#include "../mwworld/globals.hpp"
#include "../mwworld/ptr.hpp"
namespace Ogre
{
class Vector2;
class Vector3;
class Quaternion;
class Image;
}
namespace OEngine
namespace Loading
{
namespace Physic
{
class PhysicEngine;
}
class Listener;
}
namespace ESM
@ -390,7 +386,7 @@ namespace MWBase
virtual bool canPlaceObject (float cursorX, float cursorY) = 0;
///< @return true if it is possible to place on object at specified cursor location
virtual void processChangedSettings (const Settings::CategorySettingVector& settings) = 0;
virtual void processChangedSettings (const std::vector< std::pair<std::string, std::string> >& settings) = 0;
virtual bool isFlying(const MWWorld::Ptr &ptr) const = 0;
virtual bool isSlowFalling(const MWWorld::Ptr &ptr) const = 0;

2
apps/openmw/mwdialogue/scripttest.cpp
View File

@ -1,5 +1,7 @@
#include "scripttest.hpp"
#include <iostream>
#include "../mwworld/manualref.hpp"
#include "../mwworld/class.hpp"

1
apps/openmw/mwgui/hud.cpp
View File

@ -10,6 +10,7 @@
#include <MyGUI_ScrollView.h>
#include <components/misc/resourcehelpers.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp"

2
apps/openmw/mwgui/inventorywindow.cpp
View File

@ -8,6 +8,8 @@
#include <MyGUI_InputManager.h>
#include <MyGUI_Button.h>
#include <components/settings/settings.hpp>
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp"

2
apps/openmw/mwgui/itemmodel.cpp
View File

@ -1,5 +1,7 @@
#include "itemmodel.hpp"
#include <set>
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwworld/store.hpp"

2
apps/openmw/mwgui/journalviewmodel.cpp
View File

@ -8,6 +8,8 @@
#include <components/misc/utf8stream.hpp>
#include <components/translation/translation.hpp>
#include "../mwbase/world.hpp"
#include "../mwbase/journal.hpp"
#include "../mwbase/environment.hpp"

2
apps/openmw/mwgui/loadingscreen.cpp
View File

@ -15,6 +15,8 @@
#include <MyGUI_Gui.h>
#include <MyGUI_TextBox.h>
#include <components/settings/settings.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/statemanager.hpp"

1
apps/openmw/mwgui/mainmenu.cpp
View File

@ -9,6 +9,7 @@
#include <components/version/version.hpp>
#include <components/widgets/imagebutton.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"

1
apps/openmw/mwgui/mapwindow.cpp
View File

@ -13,6 +13,7 @@
#include <MyGUI_FactoryManager.h>
#include <components/esm/globalmap.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/world.hpp"

1
apps/openmw/mwgui/settingswindow.cpp
View File

@ -15,6 +15,7 @@
#include <SDL_video.h>
#include <components/widgets/sharedstatebutton.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"

1
apps/openmw/mwgui/tooltips.cpp
View File

@ -8,6 +8,7 @@
#include <MyGUI_ImageBox.h>
#include <components/misc/resourcehelpers.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"

1
apps/openmw/mwgui/waitdialog.cpp
View File

@ -3,6 +3,7 @@
#include <MyGUI_ProgressBar.h>
#include <components/widgets/box.hpp>
#include <components/settings/settings.hpp>
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/world.hpp"

2
apps/openmw/mwgui/windowbase.cpp
View File

@ -2,6 +2,8 @@
#include <MyGUI_InputManager.h>
#include <components/settings/settings.hpp>
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/environment.hpp"

5
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -19,6 +19,9 @@
#include <MyGUI_ClipboardManager.h>
#include <MyGUI_RenderManager.h>
#include <SDL_keyboard.h>
#include <SDL_clipboard.h>
#include <openengine/ogre/renderer.hpp>
#include <openengine/gui/manager.hpp>
@ -26,6 +29,8 @@
#include <components/fontloader/fontloader.hpp>
#include <components/translation/translation.hpp>
#include <components/widgets/widgets.hpp>
#include <components/widgets/tags.hpp>

7
apps/openmw/mwgui/windowmanagerimp.hpp
View File

@ -5,13 +5,14 @@
This class owns and controls all the MW specific windows in the
GUI. It can enable/disable Gui mode, and is responsible for sending
and retrieving information from the Gui.
MyGUI should be initialized separately before creating instances of
this class.
**/
#include <stack>
#include "../mwbase/windowmanager.hpp"
#include <components/settings/settings.hpp>
#include "mapwindow.hpp"
#include <MyGUI_KeyCode.h>

1
apps/openmw/mwmechanics/actors.hpp
View File

@ -5,6 +5,7 @@
#include <vector>
#include <string>
#include <map>
#include <list>
#include "movement.hpp"
#include "../mwbase/world.hpp"

2
apps/openmw/mwmechanics/character.cpp
View File

@ -27,6 +27,8 @@
#include "creaturestats.hpp"
#include "security.hpp"
#include <components/settings/settings.hpp>
#include "../mwrender/animation.hpp"
#include "../mwbase/environment.hpp"

1
apps/openmw/mwrender/animation.cpp
View File

@ -18,6 +18,7 @@
#include <components/esm/loadench.hpp>
#include <components/esm/loadstat.hpp>
#include <components/misc/resourcehelpers.hpp>
#include <components/settings/settings.hpp>
#include <libs/openengine/ogre/lights.hpp>

1
apps/openmw/mwrender/globalmap.cpp
View File

@ -11,6 +11,7 @@
#include <OgreHardwarePixelBuffer.h>
#include <components/loadinglistener/loadinglistener.hpp>
#include <components/settings/settings.hpp>
#include <components/esm/globalmap.hpp>

1
apps/openmw/mwscript/animationextensions.cpp
View File

@ -2,6 +2,7 @@
#include "animationextensions.hpp"
#include <stdexcept>
#include <limits>
#include <components/compiler/extensions.hpp>
#include <components/compiler/opcodes.hpp>

1
apps/openmw/mwstate/statemanagerimp.cpp
View File

@ -13,6 +13,7 @@
#include <OgreImage.h>
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/operations.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"

3
apps/openmw/mwworld/livecellref.cpp
View File

@ -1,6 +1,7 @@
#include "livecellref.hpp"
#include <iostream>
#include <components/esm/objectstate.hpp>
#include "../mwbase/environment.hpp"

6
extern/sdl4ogre/events.h vendored
View File

@ -1,8 +1,8 @@
#ifndef _SFO_EVENTS_H
#define _SFO_EVENTS_H
#include <SDL.h>
#include <SDL_types.h>
#include <SDL_events.h>
////////////
// Events //
@ -65,7 +65,7 @@ public:
virtual ~WindowListener() {}
/** @remarks The window's visibility changed */
virtual void windowVisibilityChange( bool visible ) {};
virtual void windowVisibilityChange( bool visible ) {}
/** @remarks The window got / lost input focus */
virtual void windowFocusChange( bool have_focus ) {}

3
extern/sdl4ogre/sdlcursormanager.cpp vendored
View File

@ -4,6 +4,9 @@
#include <OgreTextureManager.h>
#include <OgreRoot.h>
#include <SDL_mouse.h>
#include <SDL_endian.h>
#include <openengine/ogre/imagerotate.hpp>
namespace SFO

5
extern/sdl4ogre/sdlcursormanager.hpp vendored
View File

@ -1,11 +1,12 @@
#ifndef SDL4OGRE_CURSORMANAGER_H
#define SDL4OGRE_CURSORMANAGER_H
#include <SDL.h>
#include "cursormanager.hpp"
#include <map>
struct SDL_Cursor;
struct SDL_Surface;
namespace SFO
{
class SDLCursorManager :