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
This commit is contained in:
majcosta
2023-01-03 15:51:48 +02:00
committed by GitHub
parent 6024ed62b0
commit 24425a82b1
563 changed files with 45 additions and 6564 deletions
-6
View File
@@ -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"
-127
View File
@@ -1,127 +0,0 @@
#include "BuildDefines.h"
#ifndef __EDITOR_ALL_H
#define __EDITOR_ALL_H
#ifdef JA2EDITOR
#pragma message("GENERATED PCH FOR EDITOR PROJECT.")
//external
#include "types.h"
#include <stdio.h>
#include <windows.h>
#include "Action Items.h"
#include "Button System.h"
#include "debug.h"
#include "english.h"
#include "environment.h"
#include "Exit Grids.h"
#include "font.h"
#include "Font Control.h"
#include "Keys.h"
#include "input.h"
#include "interface.h"
#include "Interface Items.h"
#include "Isometric Utils.h"
#include "interface panels.h"
#include "lighting.h"
#include "Map Information.h"
#include "mousesystem.h"
#include "Overhead.h"
#include "Overhead map.h"
#include "overhead types.h"
#include "pits.h"
#include "random.h"
#include "Render Fun.h"
#include "Render Dirty.h"
#include "renderworld.h"
#include "Simple Render Utils.h"
#include "Soldier Create.h"
#include "Soldier Find.h"
#include "sysutil.h"
#include "Text.h"
#include "Text Input.h"
#include "tiledef.h"
#include "utilities.h"
#include "video.h"
#include "vobject.h"
#include "vobject_blitters.h"
#include "vsurface.h"
#include "wcheck.h"
#include "weapons.h"
#include "wordwrap.h"
#include "WorldDat.h"
#include "worlddef.h"
#include "World Items.h"
#include "worldman.h"
#include "line.h"
#include "Animation Data.h"
#include "Animation Control.h"
#include "Soldier Init List.h"
#include "StrategicMap.h"
#include "Soldier Add.h"
#include "Soldier Control.h"
#include "soldier profile type.h"
#include "Soldier Profile.h"
#include "Inventory Choosing.h"
#include "Scheduling.h"
#include "Timer Control.h"
#include "sgp.h"
#include "screenids.h"
#include "Sys Globals.h"
#include "Interactive Tiles.h"
#include "Handle UI.h"
#include "Event Pump.h"
#include "message.h"
#include "Game Clock.h"
#include "Game Init.h"
#include "Map Edgepoints.h"
#include "Music Control.h"
#include <memory.h>
#include "Item Types.h"
#include "Items.h"
#include "Handle Items.h"
#include "Animated ProgressBar.h"
#include "gameloop.h"
#include <stdlib.h>
#include "Structure Internals.h"
#include "Cursors.h"
#include "FileMan.h"
#include "Summary Info.h"
#include "time.h"
#include "structure wrap.h"
#include "MessageBoxScreen.h"
#include "GameSettings.h"
//internal
#include "Cursor Modes.h"
#include "edit_sys.h"
#include "Editor Callback Prototypes.h"
#include "Editor Modes.h"
#include "Editor Taskbar Creation.h"
#include "Editor Taskbar Utils.h"
#include "Editor Undo.h"
#include "EditorBuildings.h"
#include "EditorDefines.h"
#include "EditorItems.h"
#include "EditorMapInfo.h"
#include "EditorMercs.h"
#include "EditorTerrain.h"
#include "editscreen.h"
#include "Item Statistics.h"
#include "LoadScreen.h"
#include "messagebox.h"
#include "newsmooth.h"
#include "popupmenu.h"
#include "Road Smoothing.h"
#include "Sector Summary.h"
#include "selectwin.h"
#include "SmartMethod.h"
#include "smooth.h"
#include "Smoothing Utils.h"
#endif
#endif
-6
View File
@@ -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"
-6
View File
@@ -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;
-6
View File
@@ -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();
-6
View File
@@ -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();
-6
View File
@@ -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:
-6
View File
@@ -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;
-6
View File
@@ -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>
-6
View File
@@ -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;
-6
View File
@@ -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;
-6
View File
@@ -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];
-4
View File
@@ -350,10 +350,6 @@
RelativePath=".\edit_sys.h"
>
</File>
<File
RelativePath=".\Editor All.h"
>
</File>
<File
RelativePath=".\Editor Callback Prototypes.h"
>
-4
View File
@@ -350,10 +350,6 @@
RelativePath="edit_sys.h"
>
</File>
<File
RelativePath="Editor All.h"
>
</File>
<File
RelativePath="Editor Callback Prototypes.h"
>
-1
View File
@@ -25,7 +25,6 @@
<ItemGroup>
<ClInclude Include="Button Defines.h" />
<ClInclude Include="Cursor Modes.h" />
<ClInclude Include="Editor All.h" />
<ClInclude Include="Editor Callback Prototypes.h" />
<ClInclude Include="Editor Modes.h" />
<ClInclude Include="Editor Taskbar Creation.h" />
-1
View File
@@ -18,7 +18,6 @@
<ClInclude Include="edit_sys.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Editor All.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Editor Callback Prototypes.h">
-1
View File
@@ -25,7 +25,6 @@
<ItemGroup>
<ClInclude Include="Button Defines.h" />
<ClInclude Include="Cursor Modes.h" />
<ClInclude Include="Editor All.h" />
<ClInclude Include="Editor Callback Prototypes.h" />
<ClInclude Include="Editor Modes.h" />
<ClInclude Include="Editor Taskbar Creation.h" />
-1
View File
@@ -18,7 +18,6 @@
<ClInclude Include="edit_sys.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Editor All.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Editor Callback Prototypes.h">
-1
View File
@@ -25,7 +25,6 @@
<ItemGroup>
<ClInclude Include="Button Defines.h" />
<ClInclude Include="Cursor Modes.h" />
<ClInclude Include="Editor All.h" />
<ClInclude Include="Editor Callback Prototypes.h" />
<ClInclude Include="Editor Modes.h" />
<ClInclude Include="Editor Taskbar Creation.h" />
-1
View File
@@ -45,7 +45,6 @@
<ItemGroup>
<ClInclude Include="Button Defines.h" />
<ClInclude Include="Cursor Modes.h" />
<ClInclude Include="Editor All.h" />
<ClInclude Include="Editor Callback Prototypes.h" />
<ClInclude Include="Editor Modes.h" />
<ClInclude Include="Editor Taskbar Creation.h" />
-6
View File
@@ -1,12 +1,7 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include <memory.h>
#include <stdio.h>
#include "types.h"
@@ -31,7 +26,6 @@
#include "PopupMenu.h"
#include "pits.h"
#include "Text.h"
#endif
#include "soldier profile type.h"
#include "LuaInitNPCs.h"
-6
View File
@@ -1,12 +1,7 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include <stdio.h>
#include "Font Control.h"
#include "renderworld.h"
@@ -45,7 +40,6 @@
#include "MessageBoxScreen.h"
#include <vfs/Core/vfs.h>//dnl ch37 110909
#include "Exit Grids.h"//dnl ch86 190214
#endif
//===========================================================================
-6
View File
@@ -1,19 +1,13 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include "types.h"
#include "Road Smoothing.h"
#include "tiledat.h"
#include "worlddef.h"
#include "worldman.h"
#include "Editor Undo.h"
#endif
typedef struct MACROSTRUCT
-6
View File
@@ -1,13 +1,8 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include <stdio.h>
#include "types.h"
#include "Sector Summary.h"
@@ -42,7 +37,6 @@
#include "GameSettings.h"
#include "EditorTerrain.h"//dnl ch78 261113
#include "Render Dirty.h"//dnl ch78 271113
#endif
#include <vfs/Core/vfs.h>
#include <vfs/Core/vfs_file_raii.h>
-6
View File
@@ -1,18 +1,12 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include "worlddef.h" //LEVELNODE def
#include "worldman.h" //ReplaceStructIndex
#include "SmartMethod.h"
#include "Smoothing Utils.h"
#include "Editor Undo.h"
#endif
UINT8 gubDoorUIValue = 0;
UINT8 gubWindowUIValue = 0;
-6
View File
@@ -1,12 +1,7 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include <stdlib.h>
#include "worlddef.h" //for LEVELNODE def
#include "worldman.h" //for RemoveXXXX()
@@ -17,7 +12,6 @@
#include "EditorDefines.h"
#include "edit_sys.h"
#include "environment.h"
#endif
extern UINT16 PickAWallPiece( UINT16 usWallPieceType );
-7
View File
@@ -1,9 +1,3 @@
#ifdef PRECOMPILEDHEADERS
#include "Tactical All.h"
#include "Editor All.h"
#include "LuaInitNPCs.h"
#else
#include "Editor All.h"
#include "sgp.h"
#include "Debug Control.h"
#include "expat.h"
@@ -11,7 +5,6 @@
#include "Interface.h"
#include "Item Statistics.h"
#include "LuaInitNPCs.h"
#endif
#include "Action Items.h"
-6
View File
@@ -1,13 +1,8 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include "worlddef.h"
#include "worldman.h"
#include "smooth.h"
@@ -32,7 +27,6 @@
#include "Keys.h"
#include "EditorMapInfo.h"
#include "EditorItems.h"
#endif
#include "input.h"
-6
View File
@@ -1,12 +1,7 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include "sgp.h"
#include "vobject.h"
#include "worlddef.h"
@@ -79,7 +74,6 @@
#include "Cursor Control.h"//dnl ch2 210909
#include "maputility.h"//dnl ch49 061009
#include "Text.h"
#endif
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
-6
View File
@@ -1,12 +1,7 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include "vobject.h"
#include "video.h"
#include "font.h"
@@ -14,7 +9,6 @@
#include "messagebox.h"
#include "input.h"
#include "english.h"
#endif
//internal variables.
INT32 iMsgBoxNum;
-6
View File
@@ -1,12 +1,7 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include <stdlib.h>
#include "tiledef.h"
#include "worlddef.h"
@@ -21,7 +16,6 @@
#include "environment.h"
#include "Random.h"
#include "Render Fun.h"
#endif
BOOLEAN CaveAtGridNo( INT32 iMapIndex );
-6
View File
@@ -10,15 +10,10 @@
//supported. Just remove the commented line of code (search for UNCOMMENT), and it's fixed -- it is
//currently disabled.
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include "tiledef.h"
#include "sysutil.h"
#include "font.h"
@@ -37,7 +32,6 @@
#include "Scheduling.h"
#include "english.h"
#include "Item Statistics.h"
#endif
CurrentPopupMenuInformation gPopupData;
-6
View File
@@ -1,14 +1,9 @@
// WANNE: EDITOR: todo
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include "tiledef.h"
#include "vsurface.h"
#include "worlddat.h"
@@ -18,7 +13,6 @@
#include "selectwin.h"
#include "EditorDefines.h"
#include "Editor Taskbar Utils.h"
#endif
#include "vobject_blitters.h"
#include "Text.h"
-6
View File
@@ -1,12 +1,7 @@
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
#include "builddefines.h"
#endif
#ifdef JA2EDITOR
#ifndef PRECOMPILEDHEADERS
#include "stdlib.h"
#include "FileMan.h"
#include "time.h"
@@ -21,7 +16,6 @@
#include "structure wrap.h"
#include "Exit Grids.h"
#include "Editor Undo.h"
#endif
INT16 gbSmoothStruct[] =