Merge branch 'misc_cleanup' into 'master'

Misc cleanup (no functional change)

See merge request OpenMW/openmw!729

apps/openmw/engine.hpp

@@ -33,26 +33,6 @@ namespace Compiler
     class Context;
 }
 
-namespace MWScript
-{
-    class ScriptManager;
-}
-
-namespace MWSound
-{
-    class SoundManager;
-}
-
-namespace MWWorld
-{
-    class World;
-}
-
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace Files
 {
     struct ConfigurationManager;

apps/openmw/mwbase/windowmanager.hpp

@@ -32,7 +32,6 @@ namespace MyGUI
 
 namespace ESM
 {
-    struct Class;
     class ESMReader;
     class ESMWriter;
     struct CellId;

apps/openmw/mwgui/container.hpp

@@ -6,11 +6,6 @@
 
 #include "itemmodel.hpp"
 
-namespace MWWorld
-{
-    class Environment;
-}
-
 namespace MyGUI
 {
     class Gui;
@@ -19,7 +14,6 @@ namespace MyGUI
 
 namespace MWGui
 {
-    class WindowManager;
     class ContainerWindow;
     class ItemView;
     class SortFilterItemModel;

apps/openmw/mwgui/dialogue.hpp

@@ -15,11 +15,6 @@ namespace Gui
     class MWList;
 }
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class ResponseCallback;

apps/openmw/mwgui/race.hpp

@@ -7,11 +7,6 @@
 #include <MyGUI_RenderManager.h>
 
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWRender
 {
     class RaceSelectionPreview;

apps/openmw/mwgui/review.hpp

@@ -11,11 +11,6 @@ namespace ESM
     struct Spell;
 }
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class ReviewDialog : public WindowModal

apps/openmw/mwgui/settingswindow.hpp

@@ -3,11 +3,6 @@
 
 #include "windowbase.hpp"
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class SettingsWindow : public WindowBase

apps/openmw/mwgui/spellbuyingwindow.hpp

@@ -15,11 +15,6 @@ namespace MyGUI
   class Widget;
 }
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class SpellBuyingWindow : public ReferenceInterface, public WindowBase

apps/openmw/mwgui/statswindow.hpp

@@ -6,8 +6,6 @@
 
 namespace MWGui
 {
-    class WindowManager;
-
     class StatsWindow : public WindowPinnableBase, public NoDrop, public StatsListener
     {
         public:

apps/openmw/mwgui/textinput.hpp

@@ -3,11 +3,6 @@
 
 #include "windowbase.hpp"
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
 namespace MWGui
 {
     class TextInputDialog : public WindowModal

apps/openmw/mwgui/timeadvancer.cpp

@@ -58,12 +58,12 @@ namespace MWGui
         }
     }
 
-    int TimeAdvancer::getHours()
+    int TimeAdvancer::getHours() const
     {
         return mHours;
     }
 
-    bool TimeAdvancer::isRunning()
+    bool TimeAdvancer::isRunning() const
     {
         return mRunning;
     }

apps/openmw/mwgui/timeadvancer.hpp

@@ -14,8 +14,8 @@ namespace MWGui
             void stop();
             void onFrame(float dt);
 
-            int getHours();
-            bool isRunning();
+            int getHours() const;
+            bool isRunning() const;
 
             // signals
             typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;

apps/openmw/mwgui/travelwindow.hpp

@@ -11,12 +11,6 @@ namespace MyGUI
   class Widget;
 }
 
-namespace MWGui
-{
-    class WindowManager;
-}
-
-
 namespace MWGui
 {
     class TravelWindow : public ReferenceInterface, public WindowBase

apps/openmw/mwgui/windowbase.hpp

@@ -3,11 +3,6 @@
 
 #include "layout.hpp"
 
-namespace MWBase
-{
-    class WindowManager;
-}
-
 namespace MWWorld
 {
     class Ptr;
@@ -15,7 +10,6 @@ namespace MWWorld
 
 namespace MWGui
 {
-    class WindowManager;
     class DragAndDrop;
 
     class WindowBase: public Layout

apps/openmw/mwgui/windowmanagerimp.hpp

@@ -114,7 +114,6 @@ namespace MWGui
   class TrainingWindow;
   class SpellIcons;
   class MerchantRepair;
-  class Repair;
   class SoulgemDialog;
   class Recharge;
   class CompanionWindow;

apps/openmw/mwgui/windowpinnablebase.hpp

@@ -5,8 +5,6 @@
 
 namespace MWGui
 {
-    class WindowManager;
-
     class WindowPinnableBase: public WindowBase
     {
     public:

apps/openmw/mwrender/objectpaging.hpp

@@ -63,7 +63,7 @@ namespace MWRender
         {
             std::set<ESM::RefNum> mDisabled;
             std::set<ESM::RefNum> mBlacklist;
-            bool operator==(const RefTracker&other) { return mDisabled == other.mDisabled && mBlacklist == other.mBlacklist; }
+            bool operator==(const RefTracker&other) const { return mDisabled == other.mDisabled && mBlacklist == other.mBlacklist; }
         };
         RefTracker mRefTracker;
         RefTracker mRefTrackerNew;

apps/openmw/mwscript/interpretercontext.hpp

@@ -10,16 +10,6 @@
 
 #include "../mwworld/ptr.hpp"
 
-namespace MWSound
-{
-    class SoundManager;
-}
-
-namespace MWInput
-{
-    struct MWInputManager;
-}
-
 namespace MWScript
 {
     class Locals;

apps/openmw/mwsound/soundmanagerimp.hpp

@@ -141,7 +141,7 @@ namespace MWSound
 
     public:
         SoundManager(const VFS::Manager* vfs, bool useSound);
-        virtual ~SoundManager();
+        ~SoundManager() override;
 
         void processChangedSettings(const Settings::CategorySettingVector& settings) override;
 

apps/openmw/mwstate/quicksavemanager.cpp

@@ -18,14 +18,14 @@ void MWState::QuickSaveManager::visitSave(const Slot *saveSlot)
     }
 }
 
-bool MWState::QuickSaveManager::isOldestSave(const Slot *compare)
+bool MWState::QuickSaveManager::isOldestSave(const Slot *compare) const
 {
     if(mOldestSlotVisited == nullptr)
         return true;
     return (compare->mTimeStamp <= mOldestSlotVisited->mTimeStamp);
 }
 
-bool MWState::QuickSaveManager::shouldCreateNewSlot()
+bool MWState::QuickSaveManager::shouldCreateNewSlot() const
 {
     return (mSlotsVisited < mMaxSaves);
 }

apps/openmw/mwstate/quicksavemanager.hpp

@@ -13,8 +13,8 @@ namespace MWState{
         unsigned int mSlotsVisited;
         const Slot *mOldestSlotVisited;
     private:
-        bool shouldCreateNewSlot();
-        bool isOldestSave(const Slot *compare);
+        bool shouldCreateNewSlot() const;
+        bool isOldestSave(const Slot *compare) const;
     public:
         QuickSaveManager(std::string &saveName, unsigned int maxSaves);
         ///< A utility class to manage multiple quicksave slots

apps/openmw/mwworld/scene.hpp

@@ -36,7 +36,6 @@ namespace Loading
 namespace DetourNavigator
 {
     struct Navigator;
-    class Water;
 }
 
 namespace MWRender

apps/openmw/mwworld/worldimp.hpp

@@ -60,8 +60,6 @@ namespace ToUTF8
     class Utf8Encoder;
 }
 
-struct ContentLoader;
-
 namespace MWPhysics
 {
     class Object;

components/nifosg/controller.hpp

@@ -24,11 +24,6 @@ namespace osg
     class Material;
 }
 
-namespace osgParticle
-{
-    class Emitter;
-}
-
 namespace NifOsg
 {