From 85f91a7de8e088c26744c3d2d81522f15362c264 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Fri, 17 Apr 2020 15:59:37 +0400
Subject: [PATCH] Remove some redundant code

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 19 +------------------
 apps/openmw/mwinput/inputmanagerimp.hpp | 12 ++----------
 apps/openmw/mwinput/keyboardmanager.cpp |  6 +-----
 apps/openmw/mwinput/keyboardmanager.hpp | 10 +---------
 4 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index be58ec265..fb49ff464 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -2,33 +2,16 @@
 
 #include <osgViewer/ViewerEventHandlers>
 
-#include <MyGUI_InputManager.h>
-#include <MyGUI_Widget.h>
-#include <MyGUI_Button.h>
-#include <MyGUI_EditBox.h>
-
-#include <SDL_version.h>
-
-#include <components/debug/debuglog.hpp>
 #include <components/sdlutil/sdlinputwrapper.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/esmreader.hpp>
 #include <components/esm/controlsstate.hpp>
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/statemanager.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwworld/player.hpp"
-#include "../mwworld/class.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/actorutil.hpp"
-
 #include "actionmanager.hpp"
 #include "bindingsmanager.hpp"
 #include "controllermanager.hpp"
@@ -58,7 +41,7 @@ namespace MWInput
 
         mActionManager = new ActionManager(mBindingsManager, screenCaptureOperation, viewer, screenCaptureHandler);
 
-        mKeyboardManager = new KeyboardManager(mBindingsManager, mActionManager);
+        mKeyboardManager = new KeyboardManager(mBindingsManager);
         mInputWrapper->setKeyboardEventCallback(mKeyboardManager);
 
         mMouseManager = new MouseManager(mBindingsManager, mInputWrapper, window);
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index f7e732d99..211a09583 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -1,19 +1,16 @@
 #ifndef MWINPUT_MWINPUTMANAGERIMP_H
 #define MWINPUT_MWINPUTMANAGERIMP_H
 
-#include "../mwgui/mode.hpp"
-
-#include <SDL_sensor.h>
-
 #include <osg/ref_ptr>
 #include <osgViewer/ViewerEventHandlers>
 
 #include <components/settings/settings.hpp>
-#include <components/files/configurationmanager.hpp>
 #include <components/sdlutil/events.hpp>
 
 #include "../mwbase/inputmanager.hpp"
 
+#include "../mwgui/mode.hpp"
+
 #include "actions.hpp"
 
 namespace MWInput
@@ -37,11 +34,6 @@ namespace MWBase
     class WindowManager;
 }
 
-namespace Files
-{
-    struct ConfigurationManager;
-}
-
 namespace SDLUtil
 {
     class InputWrapper;
diff --git a/apps/openmw/mwinput/keyboardmanager.cpp b/apps/openmw/mwinput/keyboardmanager.cpp
index efe911593..159ea388f 100644
--- a/apps/openmw/mwinput/keyboardmanager.cpp
+++ b/apps/openmw/mwinput/keyboardmanager.cpp
@@ -4,22 +4,18 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
-#include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/player.hpp"
 
-#include "actionmanager.hpp"
 #include "actions.hpp"
 #include "bindingsmanager.hpp"
 #include "sdlmappings.hpp"
 
 namespace MWInput
 {
-    KeyboardManager::KeyboardManager(BindingsManager* bindingsManager, ActionManager* actionManager)
+    KeyboardManager::KeyboardManager(BindingsManager* bindingsManager)
         : mBindingsManager(bindingsManager)
-        , mActionManager(actionManager)
         , mControlsDisabled(false)
     {
     }
diff --git a/apps/openmw/mwinput/keyboardmanager.hpp b/apps/openmw/mwinput/keyboardmanager.hpp
index bba2f5dc4..ae473be51 100644
--- a/apps/openmw/mwinput/keyboardmanager.hpp
+++ b/apps/openmw/mwinput/keyboardmanager.hpp
@@ -4,20 +4,14 @@
 #include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>
 
-namespace SDLUtil
-{
-    class InputWrapper;
-}
-
 namespace MWInput
 {
-    class ActionManager;
     class BindingsManager;
 
     class KeyboardManager : public SDLUtil::KeyListener
     {
     public:
-        KeyboardManager(BindingsManager* bindingsManager, ActionManager* actionManager);
+        KeyboardManager(BindingsManager* bindingsManager);
 
         virtual ~KeyboardManager() = default;
 
@@ -30,8 +24,6 @@ namespace MWInput
     private:
         BindingsManager* mBindingsManager;
 
-        ActionManager* mActionManager;
-
         bool mControlsDisabled;
     };
 }