From 27c3e09b94f29088f955d58df34f1fd5ccdb05d1 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Thu, 16 Nov 2023 12:26:39 -0330 Subject: [PATCH] clang-tidy: Remove redundant header includes. --- src/cheat/CheatCodeDialog.cxx | 1 - src/cheat/CheatManager.cxx | 1 - src/common/FBBackendSDL2.cxx | 1 - src/common/FSNodeZIP.cxx | 1 - src/common/JoyMap.cxx | 2 +- src/common/KeyMap.cxx | 1 - src/common/PJoystickHandler.cxx | 2 -- src/common/PhysicalJoystick.cxx | 5 ----- src/common/SoundSDL2.cxx | 5 ----- src/common/StateManager.cxx | 3 --- src/common/main.cxx | 4 ---- src/common/repository/CompositeKVRJsonAdapter.cxx | 2 -- src/common/repository/KeyValueRepositoryConfigfile.cxx | 1 - src/common/repository/sqlite/KeyValueRepositorySqlite.cxx | 1 - src/common/repository/sqlite/SqliteDatabase.cxx | 2 -- src/common/repository/sqlite/StellaDb.cxx | 5 ++--- src/common/sdl_blitter/BlitterFactory.cxx | 1 - src/common/tv_filters/NTSCFilter.cxx | 1 - src/debugger/CartDebug.cxx | 1 - src/debugger/CpuDebug.cxx | 2 -- src/debugger/Debugger.cxx | 6 ------ src/debugger/gui/CartBUSWidget.cxx | 1 - src/debugger/gui/CartBUSWidget.hxx | 1 - src/debugger/gui/CartCDFWidget.cxx | 2 -- src/debugger/gui/CartCDFWidget.hxx | 1 - src/debugger/gui/CartCVWidget.cxx | 2 -- src/debugger/gui/CartDPCPlusWidget.cxx | 1 - src/debugger/gui/CartDPCPlusWidget.hxx | 1 - src/debugger/gui/CartRamWidget.cxx | 1 - src/debugger/gui/CpuWidget.cxx | 2 -- src/debugger/gui/DelayQueueWidget.cxx | 1 - src/debugger/gui/RamWidget.cxx | 1 - src/debugger/gui/RomWidget.cxx | 2 -- src/debugger/gui/TiaInfoWidget.cxx | 1 - src/debugger/gui/TiaWidget.cxx | 2 -- src/debugger/gui/TiaWidget.hxx | 1 - src/debugger/gui/ToggleBitWidget.cxx | 2 -- src/debugger/gui/TogglePixelWidget.cxx | 3 +-- src/debugger/gui/ToggleWidget.cxx | 1 - src/debugger/yacc/YaccParser.cxx | 1 - src/emucore/AtariVox.cxx | 1 - src/emucore/Cart.cxx | 1 - src/emucore/Cart3EPlus.cxx | 1 - src/emucore/Cart3F.cxx | 1 - src/emucore/Cart4K.cxx | 1 - src/emucore/Cart4KSC.cxx | 1 - src/emucore/CartBF.cxx | 1 - src/emucore/CartBFSC.cxx | 1 - src/emucore/CartCDF.cxx | 2 +- src/emucore/CartCV.cxx | 1 - src/emucore/CartCreator.cxx | 2 -- src/emucore/CartCreator.hxx | 1 - src/emucore/CartDF.cxx | 1 - src/emucore/CartDFSC.cxx | 1 - src/emucore/CartDPCPlus.cxx | 2 +- src/emucore/CartEF.cxx | 1 - src/emucore/CartEFSC.cxx | 1 - src/emucore/CartFA.cxx | 1 - src/emucore/CartFA.hxx | 2 -- src/emucore/CartFC.cxx | 1 - src/emucore/CartTVBoy.cxx | 1 - src/emucore/Console.cxx | 4 ---- src/emucore/Control.cxx | 1 - src/emucore/EventHandler.cxx | 4 ---- src/emucore/FSNode.cxx | 1 - src/emucore/FrameBuffer.cxx | 3 --- src/emucore/M6532.cxx | 2 -- src/emucore/MT24LC256.cxx | 2 -- src/emucore/OSystem.cxx | 6 ------ src/emucore/PlusROM.cxx | 1 - src/emucore/ProfilingRunner.cxx | 1 - src/emucore/PropsSet.cxx | 1 - src/emucore/QuadTari.cxx | 1 - src/emucore/SaveKey.cxx | 1 - src/emucore/System.cxx | 2 -- src/emucore/TIASurface.cxx | 2 -- src/emucore/tia/TIA.cxx | 2 -- src/emucore/tia/frame-manager/FrameManager.cxx | 1 - src/gui/ColorWidget.cxx | 2 -- src/gui/ComboDialog.cxx | 1 - src/gui/ComboDialog.hxx | 1 - src/gui/DeveloperDialog.cxx | 3 --- src/gui/DeveloperDialog.hxx | 1 - src/gui/Dialog.cxx | 3 --- src/gui/DialogContainer.cxx | 1 - src/gui/EditTextWidget.cxx | 1 - src/gui/EventMappingWidget.cxx | 4 +--- src/gui/FavoritesManager.cxx | 2 +- src/gui/FileListWidget.cxx | 6 ++---- src/gui/GameInfoDialog.cxx | 1 - src/gui/GlobalPropsDialog.cxx | 1 - src/gui/InputDialog.cxx | 2 -- src/gui/InputDialog.hxx | 1 - src/gui/LauncherDialog.cxx | 1 - src/gui/MessageBox.cxx | 2 -- src/gui/OptionsDialog.cxx | 2 -- src/gui/RomAuditDialog.cxx | 1 - src/gui/RomImageWidget.cxx | 1 - src/gui/ScrollBarWidget.cxx | 1 - src/gui/TabWidget.cxx | 1 - src/gui/TimeLineWidget.cxx | 2 -- src/gui/VideoAudioDialog.cxx | 2 -- src/os/unix/OSystemUNIX.cxx | 1 - src/os/unix/SerialPortUNIX.cxx | 2 -- 104 files changed, 10 insertions(+), 171 deletions(-) diff --git a/src/cheat/CheatCodeDialog.cxx b/src/cheat/CheatCodeDialog.cxx index be1706fea..a190cd5fe 100644 --- a/src/cheat/CheatCodeDialog.cxx +++ b/src/cheat/CheatCodeDialog.cxx @@ -25,7 +25,6 @@ #include "Font.hxx" #include "InputTextDialog.hxx" #include "OSystem.hxx" -#include "Props.hxx" #include "Widget.hxx" #include "CheatCodeDialog.hxx" diff --git a/src/cheat/CheatManager.cxx b/src/cheat/CheatManager.cxx index 17d974cad..23e6483da 100644 --- a/src/cheat/CheatManager.cxx +++ b/src/cheat/CheatManager.cxx @@ -16,7 +16,6 @@ //============================================================================ #include "OSystem.hxx" -#include "Console.hxx" #include "Cheat.hxx" #include "Settings.hxx" #include "CheetahCheat.hxx" diff --git a/src/common/FBBackendSDL2.cxx b/src/common/FBBackendSDL2.cxx index 94ef23dc6..804360c99 100644 --- a/src/common/FBBackendSDL2.cxx +++ b/src/common/FBBackendSDL2.cxx @@ -17,7 +17,6 @@ #include -#include "SDL_lib.hxx" #include "bspf.hxx" #include "Logger.hxx" diff --git a/src/common/FSNodeZIP.cxx b/src/common/FSNodeZIP.cxx index d90ad2576..a122da148 100644 --- a/src/common/FSNodeZIP.cxx +++ b/src/common/FSNodeZIP.cxx @@ -21,7 +21,6 @@ #include "bspf.hxx" #include "Bankswitch.hxx" -#include "OSystem.hxx" #include "FSNodeFactory.hxx" #include "FSNodeZIP.hxx" diff --git a/src/common/JoyMap.cxx b/src/common/JoyMap.cxx index f5b09967f..f45a03e5f 100644 --- a/src/common/JoyMap.cxx +++ b/src/common/JoyMap.cxx @@ -16,8 +16,8 @@ //============================================================================ #include "JoyMap.hxx" -#include "jsonDefinitions.hxx" #include "Logger.hxx" +#include "jsonDefinitions.hxx" using json = nlohmann::json; diff --git a/src/common/KeyMap.cxx b/src/common/KeyMap.cxx index a6a7a3246..163e9d9f8 100644 --- a/src/common/KeyMap.cxx +++ b/src/common/KeyMap.cxx @@ -18,7 +18,6 @@ #include "KeyMap.hxx" #include "Logger.hxx" #include "jsonDefinitions.hxx" -#include using json = nlohmann::json; diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx index 52e3e96ba..bb34af6e2 100644 --- a/src/common/PJoystickHandler.cxx +++ b/src/common/PJoystickHandler.cxx @@ -17,9 +17,7 @@ #include "OSystem.hxx" #include "Console.hxx" -#include "Joystick.hxx" #include "Paddles.hxx" -#include "MindLink.hxx" #include "PointingDevice.hxx" #include "Driving.hxx" #include "Settings.hxx" diff --git a/src/common/PhysicalJoystick.cxx b/src/common/PhysicalJoystick.cxx index 73bd323c8..4306a6bcc 100644 --- a/src/common/PhysicalJoystick.cxx +++ b/src/common/PhysicalJoystick.cxx @@ -15,11 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - -#include "OSystem.hxx" -#include "Settings.hxx" -#include "Vec.hxx" #include "bspf.hxx" #include "PhysicalJoystick.hxx" #include "jsonDefinitions.hxx" diff --git a/src/common/SoundSDL2.cxx b/src/common/SoundSDL2.cxx index b082e5b83..7a0b1d206 100644 --- a/src/common/SoundSDL2.cxx +++ b/src/common/SoundSDL2.cxx @@ -17,15 +17,11 @@ #ifdef SOUND_SUPPORT -#include -#include #include #include "SDL_lib.hxx" #include "Logger.hxx" #include "FrameBuffer.hxx" -#include "Settings.hxx" -#include "System.hxx" #include "OSystem.hxx" #include "Console.hxx" #include "AudioQueue.hxx" @@ -33,7 +29,6 @@ #include "AudioSettings.hxx" #include "audio/SimpleResampler.hxx" #include "audio/LanczosResampler.hxx" -#include "StaggeredLogger.hxx" #include "ThreadDebugging.hxx" #include "SoundSDL2.hxx" diff --git a/src/common/StateManager.cxx b/src/common/StateManager.cxx index 7508aac10..439156810 100644 --- a/src/common/StateManager.cxx +++ b/src/common/StateManager.cxx @@ -19,10 +19,7 @@ #include "Settings.hxx" #include "Console.hxx" #include "Cart.hxx" -#include "Control.hxx" #include "Switches.hxx" -#include "System.hxx" -#include "Serializable.hxx" #include "RewindManager.hxx" #include "StateManager.hxx" diff --git a/src/common/main.cxx b/src/common/main.cxx index 66f081388..d686da88e 100644 --- a/src/common/main.cxx +++ b/src/common/main.cxx @@ -15,13 +15,10 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "bspf.hxx" #include "Logger.hxx" #include "MediaFactory.hxx" #include "Console.hxx" -#include "Event.hxx" #include "EventHandler.hxx" #include "FrameBuffer.hxx" #include "PropsSet.hxx" @@ -30,7 +27,6 @@ #include "FSNode.hxx" #include "OSystem.hxx" #include "PNGLibrary.hxx" -#include "System.hxx" #include "TIASurface.hxx" #include "ProfilingRunner.hxx" diff --git a/src/common/repository/CompositeKVRJsonAdapter.cxx b/src/common/repository/CompositeKVRJsonAdapter.cxx index e1df0670d..847d80173 100644 --- a/src/common/repository/CompositeKVRJsonAdapter.cxx +++ b/src/common/repository/CompositeKVRJsonAdapter.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "CompositeKVRJsonAdapter.hxx" #include "repository/KeyValueRepositoryJsonFile.hxx" diff --git a/src/common/repository/KeyValueRepositoryConfigfile.cxx b/src/common/repository/KeyValueRepositoryConfigfile.cxx index 91df40862..31d5ae58c 100644 --- a/src/common/repository/KeyValueRepositoryConfigfile.cxx +++ b/src/common/repository/KeyValueRepositoryConfigfile.cxx @@ -16,7 +16,6 @@ //============================================================================ #include "KeyValueRepositoryConfigfile.hxx" -#include "Logger.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KeyValueRepositoryConfigfile::KeyValueRepositoryConfigfile(const FSNode& file) diff --git a/src/common/repository/sqlite/KeyValueRepositorySqlite.cxx b/src/common/repository/sqlite/KeyValueRepositorySqlite.cxx index a5cfa739f..32a4e95f8 100644 --- a/src/common/repository/sqlite/KeyValueRepositorySqlite.cxx +++ b/src/common/repository/sqlite/KeyValueRepositorySqlite.cxx @@ -16,7 +16,6 @@ //============================================================================ #include "KeyValueRepositorySqlite.hxx" -#include "Logger.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KeyValueRepositorySqlite::KeyValueRepositorySqlite( diff --git a/src/common/repository/sqlite/SqliteDatabase.cxx b/src/common/repository/sqlite/SqliteDatabase.cxx index 849365cef..011520364 100644 --- a/src/common/repository/sqlite/SqliteDatabase.cxx +++ b/src/common/repository/sqlite/SqliteDatabase.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "FSNode.hxx" #include "SqliteDatabase.hxx" #include "Logger.hxx" diff --git a/src/common/repository/sqlite/StellaDb.cxx b/src/common/repository/sqlite/StellaDb.cxx index bd2138c5a..e5e051b41 100644 --- a/src/common/repository/sqlite/StellaDb.cxx +++ b/src/common/repository/sqlite/StellaDb.cxx @@ -15,9 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - -#include "StellaDb.hxx" #include "Logger.hxx" #include "SqliteError.hxx" #include "repository/KeyValueRepositoryNoop.hxx" @@ -34,6 +31,8 @@ #include "SettingsRepositoryMACOS.hxx" #endif +#include "StellaDb.hxx" + namespace { constexpr Int32 CURRENT_VERSION = 1; } // namespace diff --git a/src/common/sdl_blitter/BlitterFactory.cxx b/src/common/sdl_blitter/BlitterFactory.cxx index c5c7d8cee..20734fb0c 100644 --- a/src/common/sdl_blitter/BlitterFactory.cxx +++ b/src/common/sdl_blitter/BlitterFactory.cxx @@ -17,7 +17,6 @@ #include "BlitterFactory.hxx" -#include "SDL_lib.hxx" #include "BilinearBlitter.hxx" #include "QisBlitter.hxx" diff --git a/src/common/tv_filters/NTSCFilter.cxx b/src/common/tv_filters/NTSCFilter.cxx index 76b77076a..6e9b838f2 100644 --- a/src/common/tv_filters/NTSCFilter.cxx +++ b/src/common/tv_filters/NTSCFilter.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "TIASurface.hxx" #include "Settings.hxx" #include "NTSCFilter.hxx" diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx index aa2707919..507aa7efe 100644 --- a/src/debugger/CartDebug.cxx +++ b/src/debugger/CartDebug.cxx @@ -33,7 +33,6 @@ #include "RomWidget.hxx" #include "Base.hxx" #include "Device.hxx" -#include "exception/EmulationWarning.hxx" #include "TIA.hxx" #include "M6532.hxx" diff --git a/src/debugger/CpuDebug.cxx b/src/debugger/CpuDebug.cxx index ee3def0c5..cb9222860 100644 --- a/src/debugger/CpuDebug.cxx +++ b/src/debugger/CpuDebug.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "M6502.hxx" #include "System.hxx" #include "Debugger.hxx" diff --git a/src/debugger/Debugger.cxx b/src/debugger/Debugger.cxx index b1fbcb298..8803677a7 100644 --- a/src/debugger/Debugger.cxx +++ b/src/debugger/Debugger.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "bspf.hxx" #include "Version.hxx" @@ -37,15 +35,11 @@ #include "Cart.hxx" #include "CartDebug.hxx" -#include "CartDebugWidget.hxx" -#include "CartRamWidget.hxx" #include "CpuDebug.hxx" #include "RiotDebug.hxx" #include "TIADebug.hxx" #include "TiaInfoWidget.hxx" -#include "TiaOutputWidget.hxx" -#include "TiaZoomWidget.hxx" #include "EditTextWidget.hxx" #include "RomWidget.hxx" diff --git a/src/debugger/gui/CartBUSWidget.cxx b/src/debugger/gui/CartBUSWidget.cxx index 1e07c0c40..b4459747a 100644 --- a/src/debugger/gui/CartBUSWidget.cxx +++ b/src/debugger/gui/CartBUSWidget.cxx @@ -18,7 +18,6 @@ #include "CartBUS.hxx" #include "DataGridWidget.hxx" #include "PopUpWidget.hxx" -#include "EditTextWidget.hxx" #include "CartBUSWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/gui/CartBUSWidget.hxx b/src/debugger/gui/CartBUSWidget.hxx index e3937d86b..a4773a7ff 100644 --- a/src/debugger/gui/CartBUSWidget.hxx +++ b/src/debugger/gui/CartBUSWidget.hxx @@ -22,7 +22,6 @@ class CartridgeBUS; class PopUpWidget; class CheckboxWidget; class DataGridWidget; -class EditTextWidget; #include "CartARMWidget.hxx" diff --git a/src/debugger/gui/CartCDFWidget.cxx b/src/debugger/gui/CartCDFWidget.cxx index f0cfe00a4..0bd62024d 100644 --- a/src/debugger/gui/CartCDFWidget.cxx +++ b/src/debugger/gui/CartCDFWidget.cxx @@ -15,10 +15,8 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "OSystem.hxx" #include "DataGridWidget.hxx" #include "PopUpWidget.hxx" -#include "EditTextWidget.hxx" #include "CartCDFWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/gui/CartCDFWidget.hxx b/src/debugger/gui/CartCDFWidget.hxx index bdad987c1..2f583171b 100644 --- a/src/debugger/gui/CartCDFWidget.hxx +++ b/src/debugger/gui/CartCDFWidget.hxx @@ -22,7 +22,6 @@ class PopUpWidget; class CheckboxWidget; class DataGridWidget; class StaticTextWidget; -class EditTextWidget; class SliderWidget; #include "CartCDF.hxx" diff --git a/src/debugger/gui/CartCVWidget.cxx b/src/debugger/gui/CartCVWidget.cxx index b4909e7b8..22d05c75b 100644 --- a/src/debugger/gui/CartCVWidget.cxx +++ b/src/debugger/gui/CartCVWidget.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "Debugger.hxx" -#include "CartDebug.hxx" #include "CartCV.hxx" #include "CartCVWidget.hxx" diff --git a/src/debugger/gui/CartDPCPlusWidget.cxx b/src/debugger/gui/CartDPCPlusWidget.cxx index f725c8b92..afa518290 100644 --- a/src/debugger/gui/CartDPCPlusWidget.cxx +++ b/src/debugger/gui/CartDPCPlusWidget.cxx @@ -18,7 +18,6 @@ #include "CartDPCPlus.hxx" #include "DataGridWidget.hxx" #include "PopUpWidget.hxx" -#include "EditTextWidget.hxx" #include "CartDPCPlusWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/gui/CartDPCPlusWidget.hxx b/src/debugger/gui/CartDPCPlusWidget.hxx index df087ab20..825639ef1 100644 --- a/src/debugger/gui/CartDPCPlusWidget.hxx +++ b/src/debugger/gui/CartDPCPlusWidget.hxx @@ -22,7 +22,6 @@ class CartridgeDPCPlus; class PopUpWidget; class CheckboxWidget; class DataGridWidget; -class EditTextWidget; #include "CartARMWidget.hxx" diff --git a/src/debugger/gui/CartRamWidget.cxx b/src/debugger/gui/CartRamWidget.cxx index 2bc2563d6..2c3333e84 100644 --- a/src/debugger/gui/CartRamWidget.cxx +++ b/src/debugger/gui/CartRamWidget.cxx @@ -17,7 +17,6 @@ #include "EditTextWidget.hxx" #include "GuiObject.hxx" -#include "OSystem.hxx" #include "CartDebug.hxx" #include "StringParser.hxx" #include "Widget.hxx" diff --git a/src/debugger/gui/CpuWidget.cxx b/src/debugger/gui/CpuWidget.cxx index afe925774..d7aef92fd 100644 --- a/src/debugger/gui/CpuWidget.cxx +++ b/src/debugger/gui/CpuWidget.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "OSystem.hxx" #include "GuiObject.hxx" #include "Debugger.hxx" diff --git a/src/debugger/gui/DelayQueueWidget.cxx b/src/debugger/gui/DelayQueueWidget.cxx index 85193b3b2..b5371db21 100644 --- a/src/debugger/gui/DelayQueueWidget.cxx +++ b/src/debugger/gui/DelayQueueWidget.cxx @@ -21,7 +21,6 @@ #include "Debugger.hxx" #include "CartDebug.hxx" #include "TIADebug.hxx" -#include "TIAConstants.hxx" #include "FBSurface.hxx" #include "Font.hxx" #include "Base.hxx" diff --git a/src/debugger/gui/RamWidget.cxx b/src/debugger/gui/RamWidget.cxx index d31be50c9..c0f2409ec 100644 --- a/src/debugger/gui/RamWidget.cxx +++ b/src/debugger/gui/RamWidget.cxx @@ -21,7 +21,6 @@ #include "InputTextDialog.hxx" #include "OSystem.hxx" #include "Debugger.hxx" -#include "CartDebug.hxx" #include "Font.hxx" #include "FBSurface.hxx" #include "Widget.hxx" diff --git a/src/debugger/gui/RomWidget.cxx b/src/debugger/gui/RomWidget.cxx index 58f491fa6..120fc8c23 100644 --- a/src/debugger/gui/RomWidget.cxx +++ b/src/debugger/gui/RomWidget.cxx @@ -25,8 +25,6 @@ #include "Font.hxx" #include "DataGridWidget.hxx" #include "EditTextWidget.hxx" -#include "PopUpWidget.hxx" -#include "ContextMenu.hxx" #include "RomListWidget.hxx" #include "RomWidget.hxx" diff --git a/src/debugger/gui/TiaInfoWidget.cxx b/src/debugger/gui/TiaInfoWidget.cxx index 49edf0422..efb408013 100644 --- a/src/debugger/gui/TiaInfoWidget.cxx +++ b/src/debugger/gui/TiaInfoWidget.cxx @@ -21,7 +21,6 @@ #include "Debugger.hxx" #include "RiotDebug.hxx" #include "TIADebug.hxx" -#include "TIA.hxx" #include "Widget.hxx" #include "EditTextWidget.hxx" #include "GuiObject.hxx" diff --git a/src/debugger/gui/TiaWidget.cxx b/src/debugger/gui/TiaWidget.cxx index 5c2164099..c9ccc5e47 100644 --- a/src/debugger/gui/TiaWidget.cxx +++ b/src/debugger/gui/TiaWidget.cxx @@ -23,10 +23,8 @@ #include "GuiObject.hxx" #include "OSystem.hxx" #include "Debugger.hxx" -#include "CartDebug.hxx" #include "TIA.hxx" #include "TIADebug.hxx" -#include "ToggleBitWidget.hxx" #include "TogglePixelWidget.hxx" #include "Widget.hxx" #include "DelayQueueWidget.hxx" diff --git a/src/debugger/gui/TiaWidget.hxx b/src/debugger/gui/TiaWidget.hxx index 0da1cc8b3..66a436f5e 100644 --- a/src/debugger/gui/TiaWidget.hxx +++ b/src/debugger/gui/TiaWidget.hxx @@ -22,7 +22,6 @@ class GuiObject; class ButtonWidget; class DataGridWidget; class StaticTextWidget; -class ToggleBitWidget; class TogglePixelWidget; class EditTextWidget; class ColorWidget; diff --git a/src/debugger/gui/ToggleBitWidget.cxx b/src/debugger/gui/ToggleBitWidget.cxx index dbe7b2365..67c1776d6 100644 --- a/src/debugger/gui/ToggleBitWidget.cxx +++ b/src/debugger/gui/ToggleBitWidget.cxx @@ -15,10 +15,8 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "OSystem.hxx" #include "Widget.hxx" #include "Dialog.hxx" -#include "Debugger.hxx" #include "FBSurface.hxx" #include "Font.hxx" #include "ToggleBitWidget.hxx" diff --git a/src/debugger/gui/TogglePixelWidget.cxx b/src/debugger/gui/TogglePixelWidget.cxx index b57d45859..8c636eeb4 100644 --- a/src/debugger/gui/TogglePixelWidget.cxx +++ b/src/debugger/gui/TogglePixelWidget.cxx @@ -15,10 +15,9 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "OSystem.hxx" +#include "Dialog.hxx" #include "Widget.hxx" #include "Font.hxx" -#include "Debugger.hxx" #include "FBSurface.hxx" #include "TogglePixelWidget.hxx" diff --git a/src/debugger/gui/ToggleWidget.cxx b/src/debugger/gui/ToggleWidget.cxx index 0908e0ca2..d71fbedd9 100644 --- a/src/debugger/gui/ToggleWidget.cxx +++ b/src/debugger/gui/ToggleWidget.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "OSystem.hxx" #include "Base.hxx" #include "StellaKeys.hxx" #include "Widget.hxx" diff --git a/src/debugger/yacc/YaccParser.cxx b/src/debugger/yacc/YaccParser.cxx index b06e56156..d69102da7 100644 --- a/src/debugger/yacc/YaccParser.cxx +++ b/src/debugger/yacc/YaccParser.cxx @@ -21,7 +21,6 @@ #include "YaccParser.hxx" namespace YaccParser { -#include #include #include "y.tab.h" diff --git a/src/emucore/AtariVox.cxx b/src/emucore/AtariVox.cxx index bea2a49f0..0d8fa415f 100644 --- a/src/emucore/AtariVox.cxx +++ b/src/emucore/AtariVox.cxx @@ -17,7 +17,6 @@ #include "MediaFactory.hxx" #include "System.hxx" -#include "OSystem.hxx" #include "AtariVox.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/Cart.cxx b/src/emucore/Cart.cxx index 31906fa1a..7e35ea14d 100644 --- a/src/emucore/Cart.cxx +++ b/src/emucore/Cart.cxx @@ -18,7 +18,6 @@ #include "FSNode.hxx" #include "Settings.hxx" #include "System.hxx" -#include "MD5.hxx" #ifdef DEBUGGER_SUPPORT #include "Debugger.hxx" #include "Base.hxx" diff --git a/src/emucore/Cart3EPlus.cxx b/src/emucore/Cart3EPlus.cxx index 31f4e9dd2..ef6a4d1d9 100644 --- a/src/emucore/Cart3EPlus.cxx +++ b/src/emucore/Cart3EPlus.cxx @@ -16,7 +16,6 @@ //============================================================================ #include "System.hxx" -#include "TIA.hxx" #include "Cart3EPlus.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/Cart3F.cxx b/src/emucore/Cart3F.cxx index 0e0c3c929..4e04fedc0 100644 --- a/src/emucore/Cart3F.cxx +++ b/src/emucore/Cart3F.cxx @@ -16,7 +16,6 @@ //============================================================================ #include "System.hxx" -#include "TIA.hxx" #include "Cart3F.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/Cart4K.cxx b/src/emucore/Cart4K.cxx index a6353b1cd..9f66f296c 100644 --- a/src/emucore/Cart4K.cxx +++ b/src/emucore/Cart4K.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "Cart4K.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/Cart4KSC.cxx b/src/emucore/Cart4KSC.cxx index c6cfe6915..070e8c336 100644 --- a/src/emucore/Cart4KSC.cxx +++ b/src/emucore/Cart4KSC.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "Cart4KSC.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartBF.cxx b/src/emucore/CartBF.cxx index b806258c0..4c6c70e82 100644 --- a/src/emucore/CartBF.cxx +++ b/src/emucore/CartBF.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartBF.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartBFSC.cxx b/src/emucore/CartBFSC.cxx index 06dd942d9..287bbfe3f 100644 --- a/src/emucore/CartBFSC.cxx +++ b/src/emucore/CartBFSC.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartBFSC.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartCDF.cxx b/src/emucore/CartCDF.cxx index a2ad31fb5..b609cde8c 100644 --- a/src/emucore/CartCDF.cxx +++ b/src/emucore/CartCDF.cxx @@ -23,9 +23,9 @@ #include "CartCDFInfoWidget.hxx" #endif +#include "Settings.hxx" #include "System.hxx" #include "CartCDF.hxx" -#include "TIA.hxx" #include "exception/FatalEmulationError.hxx" namespace { diff --git a/src/emucore/CartCV.cxx b/src/emucore/CartCV.cxx index cdcb5cef3..fd04aa959 100644 --- a/src/emucore/CartCV.cxx +++ b/src/emucore/CartCV.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartCV.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartCreator.cxx b/src/emucore/CartCreator.cxx index 53cb152a7..ce8597619 100644 --- a/src/emucore/CartCreator.cxx +++ b/src/emucore/CartCreator.cxx @@ -64,8 +64,6 @@ #include "CartWD.hxx" #include "CartX07.hxx" #include "MD5.hxx" -#include "Props.hxx" -#include "Logger.hxx" #include "Settings.hxx" #include "CartDetector.hxx" diff --git a/src/emucore/CartCreator.hxx b/src/emucore/CartCreator.hxx index 480c5f24f..c4e71b52d 100644 --- a/src/emucore/CartCreator.hxx +++ b/src/emucore/CartCreator.hxx @@ -19,7 +19,6 @@ #define CARTRIDGE_CREATOR_HXX class Cartridge; -class Properties; class Settings; #include "Bankswitch.hxx" diff --git a/src/emucore/CartDF.cxx b/src/emucore/CartDF.cxx index a4262524b..6623fb4a6 100644 --- a/src/emucore/CartDF.cxx +++ b/src/emucore/CartDF.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartDF.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartDFSC.cxx b/src/emucore/CartDFSC.cxx index dc39af508..b108a8b34 100644 --- a/src/emucore/CartDFSC.cxx +++ b/src/emucore/CartDFSC.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartDFSC.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartDPCPlus.cxx b/src/emucore/CartDPCPlus.cxx index 8c634b07d..d090dd76f 100644 --- a/src/emucore/CartDPCPlus.cxx +++ b/src/emucore/CartDPCPlus.cxx @@ -19,9 +19,9 @@ #include "Debugger.hxx" #endif #include "MD5.hxx" +#include "Settings.hxx" #include "System.hxx" #include "CartDPCPlus.hxx" -#include "TIA.hxx" #include "exception/FatalEmulationError.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartEF.cxx b/src/emucore/CartEF.cxx index 766072e87..3bc5d995c 100644 --- a/src/emucore/CartEF.cxx +++ b/src/emucore/CartEF.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartEF.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartEFSC.cxx b/src/emucore/CartEFSC.cxx index 6f4ff94e7..ba59b6e36 100644 --- a/src/emucore/CartEFSC.cxx +++ b/src/emucore/CartEFSC.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartEFSC.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartFA.cxx b/src/emucore/CartFA.cxx index bde723f5a..a5416b94d 100644 --- a/src/emucore/CartFA.cxx +++ b/src/emucore/CartFA.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartFA.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartFA.hxx b/src/emucore/CartFA.hxx index bb36dcb44..28d0eccda 100644 --- a/src/emucore/CartFA.hxx +++ b/src/emucore/CartFA.hxx @@ -18,8 +18,6 @@ #ifndef CARTRIDGEFA_HXX #define CARTRIDGEFA_HXX -class System; - #include "bspf.hxx" #include "CartEnhanced.hxx" #ifdef DEBUGGER_SUPPORT diff --git a/src/emucore/CartFC.cxx b/src/emucore/CartFC.cxx index 03a98fb1a..4fa195006 100644 --- a/src/emucore/CartFC.cxx +++ b/src/emucore/CartFC.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartFC.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartTVBoy.cxx b/src/emucore/CartTVBoy.cxx index c72553d5b..ae1ada5f9 100644 --- a/src/emucore/CartTVBoy.cxx +++ b/src/emucore/CartTVBoy.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "System.hxx" #include "CartTVBoy.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index d5c2bfd81..5ab1b62f6 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include -#include #include #include "AtariVox.hxx" @@ -25,7 +23,6 @@ #include "Control.hxx" #include "CartCM.hxx" #include "Driving.hxx" -#include "Event.hxx" #include "EventHandler.hxx" #include "ControllerDetector.hxx" #include "Joystick.hxx" @@ -55,7 +52,6 @@ #include "FrameBuffer.hxx" #include "TIASurface.hxx" #include "OSystem.hxx" -#include "Serializable.hxx" #include "Serializer.hxx" #include "TimerManager.hxx" #include "Version.hxx" diff --git a/src/emucore/Control.cxx b/src/emucore/Control.cxx index 4e2ba99e7..61c79a851 100644 --- a/src/emucore/Control.cxx +++ b/src/emucore/Control.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include #include #include "System.hxx" diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 1ab4ca0e5..a654bba2d 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -16,7 +16,6 @@ //============================================================================ #include -#include #include "Logger.hxx" @@ -24,11 +23,8 @@ #include "Console.hxx" #include "PaletteHandler.hxx" #include "FrameBuffer.hxx" -#include "FSNode.hxx" #include "OSystem.hxx" -#include "Joystick.hxx" #include "Paddles.hxx" -#include "MindLink.hxx" #include "Lightgun.hxx" #include "PointingDevice.hxx" #include "Driving.hxx" diff --git a/src/emucore/FSNode.cxx b/src/emucore/FSNode.cxx index cf7f1a618..fd41dff26 100644 --- a/src/emucore/FSNode.cxx +++ b/src/emucore/FSNode.cxx @@ -17,7 +17,6 @@ #include "FSNodeFactory.hxx" #include "FSNode.hxx" -#include "CartDetector.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FSNode::FSNode(const AbstractFSNodePtr& realNode) diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx index c91f26629..13c471f60 100644 --- a/src/emucore/FrameBuffer.cxx +++ b/src/emucore/FrameBuffer.cxx @@ -20,7 +20,6 @@ #include "Console.hxx" #include "EventHandler.hxx" -#include "Event.hxx" #include "OSystem.hxx" #include "Settings.hxx" #include "TIA.hxx" @@ -33,7 +32,6 @@ #include "TIASurface.hxx" #include "Bezel.hxx" #include "FrameBuffer.hxx" -#include "PaletteHandler.hxx" #include "StateManager.hxx" #include "RewindManager.hxx" @@ -51,7 +49,6 @@ #include "Stella14x28tFont.hxx" #include "Stella16x32tFont.hxx" #include "ConsoleFont.hxx" - #include "ConsoleBFont.hxx" #include "Launcher.hxx" #include "OptionsMenu.hxx" #include "CommandMenu.hxx" diff --git a/src/emucore/M6532.cxx b/src/emucore/M6532.cxx index 88be655fe..722d328f1 100644 --- a/src/emucore/M6532.cxx +++ b/src/emucore/M6532.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "Console.hxx" #include "Settings.hxx" #include "Switches.hxx" diff --git a/src/emucore/MT24LC256.cxx b/src/emucore/MT24LC256.cxx index 65604bcd1..5314821df 100644 --- a/src/emucore/MT24LC256.cxx +++ b/src/emucore/MT24LC256.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "System.hxx" #include "MT24LC256.hxx" diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx index 7eee095c5..d83571e3c 100644 --- a/src/emucore/OSystem.cxx +++ b/src/emucore/OSystem.cxx @@ -15,9 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include -#include - #include "bspf.hxx" #include "Logger.hxx" @@ -39,7 +36,6 @@ #include "PlusRomsMenu.hxx" #include "Launcher.hxx" #include "TimeMachine.hxx" - #include "Widget.hxx" #endif #include "FSNode.hxx" @@ -67,8 +63,6 @@ #include "DispatchResult.hxx" #include "EmulationWorker.hxx" #include "AudioSettings.hxx" -#include "repository/KeyValueRepositoryNoop.hxx" -#include "repository/CompositeKeyValueRepositoryNoop.hxx" #include "M6532.hxx" #include "OSystem.hxx" diff --git a/src/emucore/PlusROM.cxx b/src/emucore/PlusROM.cxx index 62a3b95d5..397a00375 100644 --- a/src/emucore/PlusROM.cxx +++ b/src/emucore/PlusROM.cxx @@ -17,7 +17,6 @@ #include #include -#include #include #include "bspf.hxx" diff --git a/src/emucore/ProfilingRunner.cxx b/src/emucore/ProfilingRunner.cxx index c6593fe8a..299e0e2d9 100644 --- a/src/emucore/ProfilingRunner.cxx +++ b/src/emucore/ProfilingRunner.cxx @@ -16,7 +16,6 @@ //============================================================================ #include -#include #include "ProfilingRunner.hxx" #include "FSNode.hxx" diff --git a/src/emucore/PropsSet.cxx b/src/emucore/PropsSet.cxx index 2d26be26b..812c0468a 100644 --- a/src/emucore/PropsSet.cxx +++ b/src/emucore/PropsSet.cxx @@ -19,7 +19,6 @@ #include "bspf.hxx" #include "FSNode.hxx" -#include "Logger.hxx" #include "DefProps.hxx" #include "Props.hxx" #include "PropsSet.hxx" diff --git a/src/emucore/QuadTari.cxx b/src/emucore/QuadTari.cxx index 81f55929f..3e9ae7026 100644 --- a/src/emucore/QuadTari.cxx +++ b/src/emucore/QuadTari.cxx @@ -17,7 +17,6 @@ #include "OSystem.hxx" #include "EventHandler.hxx" -#include "Event.hxx" #include "Console.hxx" #include "System.hxx" #include "TIA.hxx" diff --git a/src/emucore/SaveKey.cxx b/src/emucore/SaveKey.cxx index 2442e19b8..e8893826b 100644 --- a/src/emucore/SaveKey.cxx +++ b/src/emucore/SaveKey.cxx @@ -16,7 +16,6 @@ //============================================================================ #include "MT24LC256.hxx" -#include "OSystem.hxx" #include "System.hxx" #include "SaveKey.hxx" diff --git a/src/emucore/System.cxx b/src/emucore/System.cxx index 4109377ed..39e8dbbc2 100644 --- a/src/emucore/System.cxx +++ b/src/emucore/System.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include #include #include "Device.hxx" @@ -23,7 +22,6 @@ #include "M6532.hxx" #include "TIA.hxx" #include "Cart.hxx" -#include "TimerManager.hxx" #include "System.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/TIASurface.cxx b/src/emucore/TIASurface.cxx index f36f15067..b8f93e740 100644 --- a/src/emucore/TIASurface.cxx +++ b/src/emucore/TIASurface.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "FBSurface.hxx" #include "Settings.hxx" #include "OSystem.hxx" diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx index b5c5ed47a..2aa54e39e 100644 --- a/src/emucore/tia/TIA.cxx +++ b/src/emucore/tia/TIA.cxx @@ -19,10 +19,8 @@ #include "M6502.hxx" #include "M6532.hxx" #include "Control.hxx" -#include "Paddles.hxx" #include "DelayQueueIteratorImpl.hxx" #include "TIAConstants.hxx" -#include "frame-manager/FrameManager.hxx" #include "AudioQueue.hxx" #include "DispatchResult.hxx" #include "Base.hxx" diff --git a/src/emucore/tia/frame-manager/FrameManager.cxx b/src/emucore/tia/frame-manager/FrameManager.cxx index 442d03511..eebf43c3a 100644 --- a/src/emucore/tia/frame-manager/FrameManager.cxx +++ b/src/emucore/tia/frame-manager/FrameManager.cxx @@ -17,7 +17,6 @@ // #define TIA_FRAMEMANAGER_DEBUG_LOG -#include #include #include "FrameManager.hxx" diff --git a/src/gui/ColorWidget.cxx b/src/gui/ColorWidget.cxx index 5153b9c2e..d9a6fe6f3 100644 --- a/src/gui/ColorWidget.cxx +++ b/src/gui/ColorWidget.cxx @@ -15,12 +15,10 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "bspf.hxx" #include "Command.hxx" #include "Dialog.hxx" #include "FBSurface.hxx" #include "GuiObject.hxx" -#include "OSystem.hxx" #include "ColorWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/ComboDialog.cxx b/src/gui/ComboDialog.cxx index b91d4c3ac..83627d951 100644 --- a/src/gui/ComboDialog.cxx +++ b/src/gui/ComboDialog.cxx @@ -20,7 +20,6 @@ #include "Dialog.hxx" #include "EventHandler.hxx" #include "OSystem.hxx" -#include "EditTextWidget.hxx" #include "PopUpWidget.hxx" #include "Widget.hxx" #include "Font.hxx" diff --git a/src/gui/ComboDialog.hxx b/src/gui/ComboDialog.hxx index 40cbaad97..a4c2f48c4 100644 --- a/src/gui/ComboDialog.hxx +++ b/src/gui/ComboDialog.hxx @@ -19,7 +19,6 @@ #define COMBO_DIALOG_HXX class PopUpWidget; -class EditTextWidget; class StaticTextWidget; class OSystem; diff --git a/src/gui/DeveloperDialog.cxx b/src/gui/DeveloperDialog.cxx index ae384995c..6e94c95e3 100644 --- a/src/gui/DeveloperDialog.cxx +++ b/src/gui/DeveloperDialog.cxx @@ -17,14 +17,11 @@ #include "bspf.hxx" #include "OSystem.hxx" -#include "Joystick.hxx" -#include "Paddles.hxx" #include "PointingDevice.hxx" #include "SaveKey.hxx" #include "AtariVox.hxx" #include "Settings.hxx" #include "DevSettingsHandler.hxx" -#include "EditTextWidget.hxx" #include "PopUpWidget.hxx" #include "RadioButtonWidget.hxx" #include "ColorWidget.hxx" diff --git a/src/gui/DeveloperDialog.hxx b/src/gui/DeveloperDialog.hxx index d61cba07e..3679b22f9 100644 --- a/src/gui/DeveloperDialog.hxx +++ b/src/gui/DeveloperDialog.hxx @@ -22,7 +22,6 @@ class OSystem; class GuiObject; class TabWidget; class CheckboxWidget; -class EditTextWidget; class PopUpWidget; class RadioButtonGroup; class RadioButtonWidget; diff --git a/src/gui/Dialog.cxx b/src/gui/Dialog.cxx index b4f9e37f9..0f42a1299 100644 --- a/src/gui/Dialog.cxx +++ b/src/gui/Dialog.cxx @@ -29,13 +29,10 @@ #include "TabWidget.hxx" #include "ToolTip.hxx" -#include "ContextMenu.hxx" -#include "PopUpWidget.hxx" #include "Settings.hxx" #include "Console.hxx" #include "Vec.hxx" -#include "TIA.hxx" #include "MediaFactory.hxx" /* diff --git a/src/gui/DialogContainer.cxx b/src/gui/DialogContainer.cxx index a1935b4f0..a8fc92c43 100644 --- a/src/gui/DialogContainer.cxx +++ b/src/gui/DialogContainer.cxx @@ -22,7 +22,6 @@ #include "EventHandler.hxx" #include "FrameBuffer.hxx" #include "FBSurface.hxx" -#include "Joystick.hxx" #include "bspf.hxx" #include "DialogContainer.hxx" diff --git a/src/gui/EditTextWidget.cxx b/src/gui/EditTextWidget.cxx index fd0219ee4..40b914cd4 100644 --- a/src/gui/EditTextWidget.cxx +++ b/src/gui/EditTextWidget.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "OSystem.hxx" #include "FBSurface.hxx" #include "Dialog.hxx" #include "ToolTip.hxx" diff --git a/src/gui/EventMappingWidget.cxx b/src/gui/EventMappingWidget.cxx index 0a34baca6..0cc33df8e 100644 --- a/src/gui/EventMappingWidget.cxx +++ b/src/gui/EventMappingWidget.cxx @@ -15,10 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "bspf.hxx" - #include "OSystem.hxx" #include "GuiObject.hxx" #include "PopUpWidget.hxx" @@ -31,6 +28,7 @@ #include "Font.hxx" #include "ComboDialog.hxx" #include "Variant.hxx" + #include "EventMappingWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/FavoritesManager.cxx b/src/gui/FavoritesManager.cxx index 57505d3b1..3e20373f6 100644 --- a/src/gui/FavoritesManager.cxx +++ b/src/gui/FavoritesManager.cxx @@ -16,8 +16,8 @@ //============================================================================ #include "FSNode.hxx" -#include "json_lib.hxx" #include "Settings.hxx" +#include "json_lib.hxx" #include "FavoritesManager.hxx" diff --git a/src/gui/FileListWidget.cxx b/src/gui/FileListWidget.cxx index 205ffe53a..da45d953e 100644 --- a/src/gui/FileListWidget.cxx +++ b/src/gui/FileListWidget.cxx @@ -15,16 +15,14 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - +#include "bspf.hxx" #include "ScrollBarWidget.hxx" -#include "FileListWidget.hxx" #include "TimerManager.hxx" #include "ProgressDialog.hxx" #include "FBSurface.hxx" #include "Bankswitch.hxx" -#include "bspf.hxx" +#include "FileListWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FileListWidget::FileListWidget(GuiObject* boss, const GUI::Font& font, diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index 1f3d2ab19..c9ae21942 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -39,7 +39,6 @@ #include "repository/KeyValueRepositoryPropertyFile.hxx" #include "FrameBuffer.hxx" #include "TIASurface.hxx" -#include "TIA.hxx" #include "Switches.hxx" #include "AudioSettings.hxx" #include "bspf.hxx" diff --git a/src/gui/GlobalPropsDialog.cxx b/src/gui/GlobalPropsDialog.cxx index 0e642a124..710a51f2f 100644 --- a/src/gui/GlobalPropsDialog.cxx +++ b/src/gui/GlobalPropsDialog.cxx @@ -17,7 +17,6 @@ #include "bspf.hxx" #include "Bankswitch.hxx" -#include "Control.hxx" #include "Dialog.hxx" #include "OSystem.hxx" #include "FrameBuffer.hxx" diff --git a/src/gui/InputDialog.cxx b/src/gui/InputDialog.cxx index b9b34dc1c..7fa375aaa 100644 --- a/src/gui/InputDialog.cxx +++ b/src/gui/InputDialog.cxx @@ -19,7 +19,6 @@ #include "OSystem.hxx" #include "Console.hxx" #include "EventHandler.hxx" -#include "Joystick.hxx" #include "Paddles.hxx" #include "MindLink.hxx" #include "PointingDevice.hxx" @@ -28,7 +27,6 @@ #include "AtariVox.hxx" #include "Settings.hxx" #include "EventMappingWidget.hxx" -#include "EditTextWidget.hxx" #include "JoystickDialog.hxx" #include "PopUpWidget.hxx" #include "TabWidget.hxx" diff --git a/src/gui/InputDialog.hxx b/src/gui/InputDialog.hxx index a2ad81aa0..20c9965e1 100644 --- a/src/gui/InputDialog.hxx +++ b/src/gui/InputDialog.hxx @@ -23,7 +23,6 @@ class GuiObject; class TabWidget; class EventMappingWidget; class CheckboxWidget; -class EditTextWidget; class JoystickDialog; class PopUpWidget; class SliderWidget; diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx index c7356ed22..5b0fd56f9 100644 --- a/src/gui/LauncherDialog.cxx +++ b/src/gui/LauncherDialog.cxx @@ -26,7 +26,6 @@ #include "LauncherFileListWidget.hxx" #include "NavigationWidget.hxx" #include "FSNode.hxx" -#include "MD5.hxx" #include "OptionsDialog.hxx" #include "GameInfoDialog.hxx" #include "HighScoresDialog.hxx" diff --git a/src/gui/MessageBox.cxx b/src/gui/MessageBox.cxx index 3735661cd..c6b7853ee 100644 --- a/src/gui/MessageBox.cxx +++ b/src/gui/MessageBox.cxx @@ -16,8 +16,6 @@ //============================================================================ #include "Dialog.hxx" -#include "OSystem.hxx" -#include "Version.hxx" #include "Widget.hxx" #include "Font.hxx" #include "StringParser.hxx" diff --git a/src/gui/OptionsDialog.cxx b/src/gui/OptionsDialog.cxx index b6880fa86..ee1f5a9b5 100644 --- a/src/gui/OptionsDialog.cxx +++ b/src/gui/OptionsDialog.cxx @@ -21,8 +21,6 @@ #include "Dialog.hxx" #include "DialogContainer.hxx" #include "Widget.hxx" -#include "Font.hxx" -#include "Control.hxx" #include "EmulationDialog.hxx" #include "VideoAudioDialog.hxx" #include "InputDialog.hxx" diff --git a/src/gui/RomAuditDialog.cxx b/src/gui/RomAuditDialog.cxx index ec2355f27..0a071b862 100644 --- a/src/gui/RomAuditDialog.cxx +++ b/src/gui/RomAuditDialog.cxx @@ -27,7 +27,6 @@ #include "MessageBox.hxx" #include "OSystem.hxx" #include "FrameBuffer.hxx" -#include "MD5.hxx" #include "Props.hxx" #include "PropsSet.hxx" #include "Settings.hxx" diff --git a/src/gui/RomImageWidget.cxx b/src/gui/RomImageWidget.cxx index 878115c48..3cd75d10e 100644 --- a/src/gui/RomImageWidget.cxx +++ b/src/gui/RomImageWidget.cxx @@ -26,7 +26,6 @@ #include "Props.hxx" #include "PropsSet.hxx" #include "TimerManager.hxx" -#include "FBSurfaceSDL2.hxx" #include "RomImageWidget.hxx" diff --git a/src/gui/ScrollBarWidget.cxx b/src/gui/ScrollBarWidget.cxx index aea827048..dcd286596 100644 --- a/src/gui/ScrollBarWidget.cxx +++ b/src/gui/ScrollBarWidget.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "OSystem.hxx" #include "Dialog.hxx" #include "FBSurface.hxx" #include "ScrollBarWidget.hxx" diff --git a/src/gui/TabWidget.cxx b/src/gui/TabWidget.cxx index 635b7b760..cd89c4411 100644 --- a/src/gui/TabWidget.cxx +++ b/src/gui/TabWidget.cxx @@ -20,7 +20,6 @@ #include "FBSurface.hxx" #include "Font.hxx" #include "GuiObject.hxx" -#include "OSystem.hxx" #include "Widget.hxx" #include "TabWidget.hxx" diff --git a/src/gui/TimeLineWidget.cxx b/src/gui/TimeLineWidget.cxx index 2aae3dbe5..ad46d3afd 100644 --- a/src/gui/TimeLineWidget.cxx +++ b/src/gui/TimeLineWidget.cxx @@ -16,12 +16,10 @@ //============================================================================ #include "bspf.hxx" -#include "Command.hxx" #include "Dialog.hxx" #include "Font.hxx" #include "FBSurface.hxx" #include "GuiObject.hxx" -#include "OSystem.hxx" #include "TimeLineWidget.hxx" diff --git a/src/gui/VideoAudioDialog.cxx b/src/gui/VideoAudioDialog.cxx index 02d91f359..8a52ec9f5 100644 --- a/src/gui/VideoAudioDialog.cxx +++ b/src/gui/VideoAudioDialog.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "bspf.hxx" #include "Base.hxx" #include "Control.hxx" diff --git a/src/os/unix/OSystemUNIX.cxx b/src/os/unix/OSystemUNIX.cxx index 1216c474a..04bf4744e 100644 --- a/src/os/unix/OSystemUNIX.cxx +++ b/src/os/unix/OSystemUNIX.cxx @@ -18,7 +18,6 @@ #include #include "FSNode.hxx" -#include "Version.hxx" #include "OSystemUNIX.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/os/unix/SerialPortUNIX.cxx b/src/os/unix/SerialPortUNIX.cxx index d706b7974..3781b040c 100644 --- a/src/os/unix/SerialPortUNIX.cxx +++ b/src/os/unix/SerialPortUNIX.cxx @@ -15,8 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include -#include #include #include #include