mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-11-01 13:56:38 +00:00 
			
		
		
		
	Merge branch 'includes_mwgui' into 'master'
Remove some useless includes from apps/openmw/mwgui See merge request OpenMW/openmw!870
This commit is contained in:
		
						commit
						38db2f8810
					
				
					 12 changed files with 6 additions and 21 deletions
				
			
		|  | @ -10,7 +10,6 @@ | ||||||
| #include <stdint.h> | #include <stdint.h> | ||||||
| 
 | 
 | ||||||
| #include <components/settings/settings.hpp> | #include <components/settings/settings.hpp> | ||||||
| #include <components/widgets/widgets.hpp> |  | ||||||
| 
 | 
 | ||||||
| #include "../mwbase/environment.hpp" | #include "../mwbase/environment.hpp" | ||||||
| #include "../mwbase/windowmanager.hpp" | #include "../mwbase/windowmanager.hpp" | ||||||
|  |  | ||||||
|  | @ -9,6 +9,10 @@ | ||||||
| 
 | 
 | ||||||
| #include <components/compiler/exception.hpp> | #include <components/compiler/exception.hpp> | ||||||
| #include <components/compiler/extensions0.hpp> | #include <components/compiler/extensions0.hpp> | ||||||
|  | #include <components/compiler/lineparser.hpp> | ||||||
|  | #include <components/compiler/scanner.hpp> | ||||||
|  | #include <components/compiler/locals.hpp> | ||||||
|  | #include <components/interpreter/interpreter.hpp> | ||||||
| 
 | 
 | ||||||
| #include "../mwscript/extensions.hpp" | #include "../mwscript/extensions.hpp" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -6,12 +6,8 @@ | ||||||
| #include <vector> | #include <vector> | ||||||
| 
 | 
 | ||||||
| #include <components/compiler/errorhandler.hpp> | #include <components/compiler/errorhandler.hpp> | ||||||
| #include <components/compiler/lineparser.hpp> |  | ||||||
| #include <components/compiler/scanner.hpp> |  | ||||||
| #include <components/compiler/locals.hpp> |  | ||||||
| #include <components/compiler/output.hpp> | #include <components/compiler/output.hpp> | ||||||
| #include <components/compiler/extensions.hpp> | #include <components/compiler/extensions.hpp> | ||||||
| #include <components/interpreter/interpreter.hpp> |  | ||||||
| 
 | 
 | ||||||
| #include "../mwscript/compilercontext.hpp" | #include "../mwscript/compilercontext.hpp" | ||||||
| #include "../mwscript/interpretercontext.hpp" | #include "../mwscript/interpretercontext.hpp" | ||||||
|  |  | ||||||
|  | @ -5,9 +5,7 @@ | ||||||
| #include <MyGUI_FactoryManager.h> | #include <MyGUI_FactoryManager.h> | ||||||
| #include <MyGUI_Gui.h> | #include <MyGUI_Gui.h> | ||||||
| #include <MyGUI_ImageBox.h> | #include <MyGUI_ImageBox.h> | ||||||
| #include <MyGUI_TextBox.h> |  | ||||||
| #include <MyGUI_ScrollView.h> | #include <MyGUI_ScrollView.h> | ||||||
| #include <MyGUI_Button.h> |  | ||||||
| 
 | 
 | ||||||
| #include "../mwworld/class.hpp" | #include "../mwworld/class.hpp" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,7 +3,6 @@ | ||||||
| 
 | 
 | ||||||
| #include <memory> | #include <memory> | ||||||
| 
 | 
 | ||||||
| #include <osg/Camera> |  | ||||||
| #include <osg/Timer> | #include <osg/Timer> | ||||||
| #include <osg/ref_ptr> | #include <osg/ref_ptr> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,7 +1,6 @@ | ||||||
| #include "recharge.hpp" | #include "recharge.hpp" | ||||||
| 
 | 
 | ||||||
| #include <MyGUI_ScrollView.h> | #include <MyGUI_ScrollView.h> | ||||||
| #include <MyGUI_Gui.h> |  | ||||||
| 
 | 
 | ||||||
| #include <components/widgets/box.hpp> | #include <components/widgets/box.hpp> | ||||||
| 
 | 
 | ||||||
|  | @ -18,6 +17,7 @@ | ||||||
| #include "../mwmechanics/actorutil.hpp" | #include "../mwmechanics/actorutil.hpp" | ||||||
| #include "../mwmechanics/recharge.hpp" | #include "../mwmechanics/recharge.hpp" | ||||||
| 
 | 
 | ||||||
|  | #include "itemselection.hpp" | ||||||
| #include "itemwidget.hpp" | #include "itemwidget.hpp" | ||||||
| #include "itemchargeview.hpp" | #include "itemchargeview.hpp" | ||||||
| #include "sortfilteritemmodel.hpp" | #include "sortfilteritemmodel.hpp" | ||||||
|  |  | ||||||
|  | @ -3,8 +3,6 @@ | ||||||
| 
 | 
 | ||||||
| #include "windowbase.hpp" | #include "windowbase.hpp" | ||||||
| 
 | 
 | ||||||
| #include "itemselection.hpp" |  | ||||||
| 
 |  | ||||||
| namespace MWWorld | namespace MWWorld | ||||||
| { | { | ||||||
|     class Ptr; |     class Ptr; | ||||||
|  |  | ||||||
|  | @ -3,8 +3,6 @@ | ||||||
| #include <iomanip> | #include <iomanip> | ||||||
| 
 | 
 | ||||||
| #include <MyGUI_ScrollView.h> | #include <MyGUI_ScrollView.h> | ||||||
| #include <MyGUI_Gui.h> |  | ||||||
| #include <MyGUI_ItemBox.h> |  | ||||||
| 
 | 
 | ||||||
| #include <components/widgets/box.hpp> | #include <components/widgets/box.hpp> | ||||||
| 
 | 
 | ||||||
|  | @ -17,6 +15,7 @@ | ||||||
| #include "../mwworld/containerstore.hpp" | #include "../mwworld/containerstore.hpp" | ||||||
| #include "../mwworld/class.hpp" | #include "../mwworld/class.hpp" | ||||||
| 
 | 
 | ||||||
|  | #include "itemselection.hpp" | ||||||
| #include "itemwidget.hpp" | #include "itemwidget.hpp" | ||||||
| #include "itemchargeview.hpp" | #include "itemchargeview.hpp" | ||||||
| #include "sortfilteritemmodel.hpp" | #include "sortfilteritemmodel.hpp" | ||||||
|  |  | ||||||
|  | @ -3,8 +3,6 @@ | ||||||
| 
 | 
 | ||||||
| #include "windowbase.hpp" | #include "windowbase.hpp" | ||||||
| 
 | 
 | ||||||
| #include "itemselection.hpp" |  | ||||||
| 
 |  | ||||||
| #include "../mwmechanics/repair.hpp" | #include "../mwmechanics/repair.hpp" | ||||||
| 
 | 
 | ||||||
| namespace MWGui | namespace MWGui | ||||||
|  |  | ||||||
|  | @ -1,9 +1,7 @@ | ||||||
| #include "spellwindow.hpp" | #include "spellwindow.hpp" | ||||||
| 
 | 
 | ||||||
| #include <MyGUI_Button.h> |  | ||||||
| #include <MyGUI_EditBox.h> | #include <MyGUI_EditBox.h> | ||||||
| #include <MyGUI_InputManager.h> | #include <MyGUI_InputManager.h> | ||||||
| #include <MyGUI_Window.h> |  | ||||||
| 
 | 
 | ||||||
| #include <components/misc/stringops.hpp> | #include <components/misc/stringops.hpp> | ||||||
| #include <components/settings/settings.hpp> | #include <components/settings/settings.hpp> | ||||||
|  |  | ||||||
|  | @ -23,8 +23,6 @@ | ||||||
| #include "../mwmechanics/npcstats.hpp" | #include "../mwmechanics/npcstats.hpp" | ||||||
| #include "../mwmechanics/actorutil.hpp" | #include "../mwmechanics/actorutil.hpp" | ||||||
| 
 | 
 | ||||||
| #include "../mwstate/charactermanager.hpp" |  | ||||||
| 
 |  | ||||||
| namespace MWGui | namespace MWGui | ||||||
| { | { | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -9,7 +9,6 @@ | ||||||
| 
 | 
 | ||||||
| #include <MyGUI_UString.h> | #include <MyGUI_UString.h> | ||||||
| #include <MyGUI_IPointer.h> | #include <MyGUI_IPointer.h> | ||||||
| #include <MyGUI_TextureUtility.h> |  | ||||||
| #include <MyGUI_FactoryManager.h> | #include <MyGUI_FactoryManager.h> | ||||||
| #include <MyGUI_LanguageManager.h> | #include <MyGUI_LanguageManager.h> | ||||||
| #include <MyGUI_PointerManager.h> | #include <MyGUI_PointerManager.h> | ||||||
|  | @ -65,7 +64,6 @@ | ||||||
| #include "../mwworld/cellstore.hpp" | #include "../mwworld/cellstore.hpp" | ||||||
| #include "../mwworld/esmstore.hpp" | #include "../mwworld/esmstore.hpp" | ||||||
| 
 | 
 | ||||||
| #include "../mwmechanics/stat.hpp" |  | ||||||
| #include "../mwmechanics/npcstats.hpp" | #include "../mwmechanics/npcstats.hpp" | ||||||
| #include "../mwmechanics/actorutil.hpp" | #include "../mwmechanics/actorutil.hpp" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue