More unused stuff removal (#49)

* More unused stuff removal delete: - giant 'metaheaders' (JA2 All.h, Laptop All.h, etc), preferring to add #includes directly where needed - unused ExceptionHandling and DbMan translation units - unused WizShare.h, Bitmap.h, trle.h, video_private.h headers * remove mentions from vc proj files too * remove preprocessor conditionals for unused definitions find . -iname '*.h' -o -iname '*.cpp' -exec unifdef.exe -m -UPRECOMPILED_HEADERS -UJA2_PRECOMPILED_HEADERS -UWIZ8_PRECOMPILED_HEADERS -UPRECOMPILEDHEADERS {} ';' then manually fixed a couple files the tool errored out on * yes, the comments too as title
1dot13 · Jan 3, 2023 · 24425a8 · 24425a8
1 parent 6024ed6
commit 24425a8
Show file tree

Hide file tree

Showing 563 changed files with 45 additions and 6,564 deletions.
diff --git a/Credits.cpp b/Credits.cpp
@@ -1,9 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-	#include "Credits.h"
-	#include "Encrypted File.h"
-	#include "Language Defines.h"
-#else
 	#include "Types.h"
 	#include "Credits.h"
 	#include "Language Defines.h"
@@ -26,7 +20,6 @@
 	#include "english.h"
 	#include "encrypted file.h"
 	#include "Random.h"
-#endif
 
 //externals
 extern HVSURFACE ghFrameBuffer;

diff --git a/Editor/Cursor Modes.cpp b/Editor/Cursor Modes.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "types.h"
 	#include "Cursor Modes.h"
 	#include "renderworld.h"
@@ -22,7 +17,6 @@
 	#include "Overhead.h"
 	#include "EditorMercs.h"
 	#include "EditorBuildings.h"
-#endif
 
 #include "Text.h"
 

diff --git a/Editor/Editor All.h b/Editor/Editor All.h
diff --git a/Editor/Editor Callbacks.cpp b/Editor/Editor Callbacks.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "types.h"
 	#include "Button System.h"
 	#include "EditorDefines.h"
@@ -31,7 +26,6 @@
 	#include "input.h"
 	#include "Map Information.h"
 	#include "EditorMapInfo.h"
-#endif
 
 #include "LoadScreen.h"
 #include "Text Input.h"

diff --git a/Editor/Editor Modes.cpp b/Editor/Editor Modes.cpp
@@ -1,13 +1,8 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "types.h"
 	#include "Editor Modes.h"
 	#include "Editor Taskbar Utils.h"
@@ -23,7 +18,6 @@
 	#include "worlddef.h"
 	#include "Exit Grids.h"
 	#include "Worldman.h"
-#endif
 
 BOOLEAN gfShowExitGrids = FALSE;
 

diff --git a/Editor/Editor Taskbar Creation.cpp b/Editor/Editor Taskbar Creation.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	//sgp
 	#include "Button System.h"
 	#include "Font Control.h"
@@ -22,7 +17,6 @@
 	#include "overhead types.h"
 	#include "local.h"
 	#include "Text.h"
-#endif
 
 //Category tabs of the editor buttons
 void InitEditorTerrainToolbar();

diff --git a/Editor/Editor Taskbar Utils.cpp b/Editor/Editor Taskbar Utils.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <stdio.h>
 	#include "types.h"
 	#include "mousesystem.h"
@@ -47,7 +42,6 @@
 	#include "Keys.h"
 	#include "InterfaceItemImages.h"
 	#include "renderworld.h"//dnl ch78 271113
-#endif
 
 void RenderEditorInfo();
 

diff --git a/Editor/Editor Undo.cpp b/Editor/Editor Undo.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "worlddef.h"
 	#include "worldman.h"
 	#include "smooth.h"
@@ -23,7 +18,6 @@
 	#include "keys.h"
 	#include "EditorItems.h"
 	#include "EditorMapInfo.h"
-#endif
 
 /*
 Kris -- Notes on how the undo code works:

diff --git a/Editor/EditorBuildings.cpp b/Editor/EditorBuildings.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include "tiledef.h"
 	#include "edit_sys.h"
 	#include "sysutil.h"
@@ -34,7 +29,6 @@
 	#include "editscreen.h"
 	#include "EditorItems.h"
 	#include "EditorMapInfo.h"
-#endif
 
 BOOLEAN fBuildingShowRoofs, fBuildingShowWalls, fBuildingShowRoomInfo;
 UINT16 usCurrentMode;

diff --git a/Editor/EditorItems.cpp b/Editor/EditorItems.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -44,7 +39,6 @@
 	#include "keys.h"
 	#include "InterfaceItemImages.h"
 	#include "Editor Undo.h"//dnl ch86 220214
-#endif
 
 #include <vfs/Tools/vfs_log.h>
 

diff --git a/Editor/EditorMapInfo.cpp b/Editor/EditorMapInfo.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -57,7 +52,6 @@
 	#include "environment.h"
 	#include "Simple Render Utils.h"
 	#include "Text.h"
-#endif
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;

diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -64,7 +59,6 @@
 	#include "message.h"
 	#include "InterfaceItemImages.h"
 	#include "english.h"
-#endif
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;

diff --git a/Editor/EditorTerrain.cpp b/Editor/EditorTerrain.cpp
@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -32,7 +27,6 @@
 	#include "Editor Taskbar Utils.h"
 	#include "Cursor Modes.h"
 	#include "english.h"
-#endif
 
 BOOLEAN gfShowTerrainTileButtons;
 UINT8 ubTerrainTileButtonWeight[NUM_TERRAIN_TILE_REGIONS];

diff --git a/Editor/Editor_VS2005.vcproj b/Editor/Editor_VS2005.vcproj
@@ -350,10 +350,6 @@
 				RelativePath=".\edit_sys.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Editor All.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Editor Callback Prototypes.h"
 				>

diff --git a/Editor/Editor_VS2008.vcproj b/Editor/Editor_VS2008.vcproj
@@ -350,10 +350,6 @@
 				RelativePath="edit_sys.h"
 				>
 			</File>
-			<File
-				RelativePath="Editor All.h"
-				>
-			</File>
 			<File
 				RelativePath="Editor Callback Prototypes.h"
 				>
-Original file line number
+Diff line change
@@ Expand Up / @@ -350,10 +350,6 @@ @@
     				RelativePath=".\edit_sys.h"
     				>
     			</File>
-    			<File
-    				RelativePath=".\Editor All.h"
-    				>
-    			</File>
     			<File
     				RelativePath=".\Editor Callback Prototypes.h"
     				>
@@ Expand Down @@