diff --git a/src/common/JoyMap.hxx b/src/common/JoyMap.hxx index 6448de1ff..e3cc7ff7a 100644 --- a/src/common/JoyMap.hxx +++ b/src/common/JoyMap.hxx @@ -19,6 +19,7 @@ #define CONTROLLERMAP_HXX #include + #include "Event.hxx" #include "EventHandlerConstants.hxx" diff --git a/src/common/RewindManager.cxx b/src/common/RewindManager.cxx index d16bbd6c3..6bafbeeaa 100644 --- a/src/common/RewindManager.cxx +++ b/src/common/RewindManager.cxx @@ -18,6 +18,7 @@ #include #include "OSystem.hxx" +#include "Console.hxx" #include "Serializer.hxx" #include "StateManager.hxx" #include "TIA.hxx" diff --git a/src/common/SoundNull.hxx b/src/common/SoundNull.hxx index 87ba7736a..f2aafbff8 100644 --- a/src/common/SoundNull.hxx +++ b/src/common/SoundNull.hxx @@ -18,12 +18,13 @@ #ifndef SOUND_NULL_HXX #define SOUND_NULL_HXX +class OSystem; +class AudioQueue; +class EmulationTiming; + #include "bspf.hxx" #include "Logger.hxx" #include "Sound.hxx" -#include "OSystem.hxx" -#include "AudioQueue.hxx" -#include "EmulationTiming.hxx" /** This class implements a Null sound object, where-by sound generation diff --git a/src/common/SoundSDL2.hxx b/src/common/SoundSDL2.hxx index 85fb86031..613e6980d 100644 --- a/src/common/SoundSDL2.hxx +++ b/src/common/SoundSDL2.hxx @@ -24,12 +24,12 @@ class OSystem; class AudioQueue; class EmulationTiming; class AudioSettings; +class Resampler; #include "SDL_lib.hxx" #include "bspf.hxx" #include "Sound.hxx" -#include "audio/Resampler.hxx" /** This class implements the sound API for SDL. diff --git a/src/common/sdl_blitter/BilinearBlitter.cxx b/src/common/sdl_blitter/BilinearBlitter.cxx index bae05207c..295d8e8e2 100644 --- a/src/common/sdl_blitter/BilinearBlitter.cxx +++ b/src/common/sdl_blitter/BilinearBlitter.cxx @@ -15,9 +15,9 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "BilinearBlitter.hxx" - +#include "FrameBufferSDL2.hxx" #include "ThreadDebugging.hxx" +#include "BilinearBlitter.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BilinearBlitter::BilinearBlitter(FrameBufferSDL2& fb, bool interpolate) diff --git a/src/common/sdl_blitter/BilinearBlitter.hxx b/src/common/sdl_blitter/BilinearBlitter.hxx index e18cba6bf..84c550ad1 100644 --- a/src/common/sdl_blitter/BilinearBlitter.hxx +++ b/src/common/sdl_blitter/BilinearBlitter.hxx @@ -18,8 +18,9 @@ #ifndef BILINEAR_BLITTER_HXX #define BILINEAR_BLITTER_HXX +class FrameBufferSDL2; + #include "Blitter.hxx" -#include "FrameBufferSDL2.hxx" #include "SDL_lib.hxx" class BilinearBlitter : public Blitter { diff --git a/src/common/sdl_blitter/QisBlitter.cxx b/src/common/sdl_blitter/QisBlitter.cxx index 95d958565..c68c4bff9 100644 --- a/src/common/sdl_blitter/QisBlitter.cxx +++ b/src/common/sdl_blitter/QisBlitter.cxx @@ -15,9 +15,9 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "QisBlitter.hxx" - +#include "FrameBufferSDL2.hxx" #include "ThreadDebugging.hxx" +#include "QisBlitter.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - QisBlitter::QisBlitter(FrameBufferSDL2& fb) diff --git a/src/common/sdl_blitter/QisBlitter.hxx b/src/common/sdl_blitter/QisBlitter.hxx index 77ab2b51d..14ee84fcc 100644 --- a/src/common/sdl_blitter/QisBlitter.hxx +++ b/src/common/sdl_blitter/QisBlitter.hxx @@ -18,8 +18,9 @@ #ifndef QIS_BLITTER_HXX #define QIS_BLITTER_HXX +class FrameBufferSDL2; + #include "Blitter.hxx" -#include "FrameBufferSDL2.hxx" #include "SDL_lib.hxx" class QisBlitter : public Blitter { diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx index da3b0bc5f..d6be07b68 100644 --- a/src/debugger/DebuggerParser.cxx +++ b/src/debugger/DebuggerParser.cxx @@ -30,6 +30,7 @@ #include "M6502.hxx" #include "Expression.hxx" #include "FSNode.hxx" +#include "OSystem.hxx" #include "Settings.hxx" #include "PromptWidget.hxx" #include "RomWidget.hxx" diff --git a/src/debugger/gui/CartARWidget.cxx b/src/debugger/gui/CartARWidget.cxx index aa552d78e..ec4c4037a 100644 --- a/src/debugger/gui/CartARWidget.cxx +++ b/src/debugger/gui/CartARWidget.cxx @@ -16,6 +16,7 @@ //============================================================================ #include "CartAR.hxx" +#include "OSystem.hxx" #include "Debugger.hxx" #include "CartDebug.hxx" #include "PopUpWidget.hxx" diff --git a/src/debugger/gui/CartCMWidget.cxx b/src/debugger/gui/CartCMWidget.cxx index 8fa72f0bb..e4d11ba55 100644 --- a/src/debugger/gui/CartCMWidget.cxx +++ b/src/debugger/gui/CartCMWidget.cxx @@ -16,6 +16,7 @@ //============================================================================ #include "CartCM.hxx" +#include "OSystem.hxx" #include "Debugger.hxx" #include "CartDebug.hxx" #include "RiotDebug.hxx" diff --git a/src/debugger/gui/CartCTYWidget.cxx b/src/debugger/gui/CartCTYWidget.cxx index 76230fa21..659fb9bea 100644 --- a/src/debugger/gui/CartCTYWidget.cxx +++ b/src/debugger/gui/CartCTYWidget.cxx @@ -15,6 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "OSystem.hxx" #include "Debugger.hxx" #include "CartDebug.hxx" #include "CartCTY.hxx" diff --git a/src/debugger/gui/CartEnhancedWidget.cxx b/src/debugger/gui/CartEnhancedWidget.cxx index d955a803a..0bf38f529 100644 --- a/src/debugger/gui/CartEnhancedWidget.cxx +++ b/src/debugger/gui/CartEnhancedWidget.cxx @@ -15,8 +15,8 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ - #include "PopUpWidget.hxx" +#include "OSystem.hxx" #include "Debugger.hxx" #include "CartDebug.hxx" #include "CartEnhanced.hxx" diff --git a/src/debugger/gui/CartEnhancedWidget.hxx b/src/debugger/gui/CartEnhancedWidget.hxx index 968a4bbf0..a367e8def 100644 --- a/src/debugger/gui/CartEnhancedWidget.hxx +++ b/src/debugger/gui/CartEnhancedWidget.hxx @@ -25,6 +25,7 @@ namespace GUI { class Font; } +#include "Variant.hxx" #include "CartDebugWidget.hxx" class CartridgeEnhancedWidget : public CartDebugWidget diff --git a/src/debugger/gui/ControllerWidget.hxx b/src/debugger/gui/ControllerWidget.hxx index e552be284..d14c1ba69 100644 --- a/src/debugger/gui/ControllerWidget.hxx +++ b/src/debugger/gui/ControllerWidget.hxx @@ -23,6 +23,7 @@ class ButtonWidget; #include "Font.hxx" #include "Widget.hxx" +#include "OSystem.hxx" #include "Console.hxx" #include "Command.hxx" #include "ControlLowLevel.hxx" diff --git a/src/debugger/gui/DataGridWidget.cxx b/src/debugger/gui/DataGridWidget.cxx index 6b663609c..719eebef2 100644 --- a/src/debugger/gui/DataGridWidget.cxx +++ b/src/debugger/gui/DataGridWidget.cxx @@ -18,6 +18,7 @@ #include "Widget.hxx" #include "Dialog.hxx" #include "Font.hxx" +#include "OSystem.hxx" #include "Debugger.hxx" #include "FrameBuffer.hxx" #include "FBSurface.hxx" diff --git a/src/debugger/gui/DebuggerDialog.cxx b/src/debugger/gui/DebuggerDialog.cxx index f62df7724..6674311f6 100644 --- a/src/debugger/gui/DebuggerDialog.cxx +++ b/src/debugger/gui/DebuggerDialog.cxx @@ -47,6 +47,8 @@ #include "OptionsDialog.hxx" #include "StateManager.hxx" #include "FrameManager.hxx" +#include "OSystem.hxx" +#include "Console.hxx" #include "DebuggerDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/gui/PromptWidget.cxx b/src/debugger/gui/PromptWidget.cxx index b803adc17..eb27f5258 100644 --- a/src/debugger/gui/PromptWidget.cxx +++ b/src/debugger/gui/PromptWidget.cxx @@ -20,6 +20,7 @@ #include "Font.hxx" #include "StellaKeys.hxx" #include "Version.hxx" +#include "OSystem.hxx" #include "Debugger.hxx" #include "DebuggerDialog.hxx" #include "DebuggerParser.hxx" diff --git a/src/debugger/gui/RiotRamWidget.cxx b/src/debugger/gui/RiotRamWidget.cxx index 2666182ec..5f3d5c0ab 100644 --- a/src/debugger/gui/RiotRamWidget.cxx +++ b/src/debugger/gui/RiotRamWidget.cxx @@ -15,6 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "OSystem.hxx" #include "Debugger.hxx" #include "CartDebug.hxx" diff --git a/src/debugger/gui/RomListWidget.cxx b/src/debugger/gui/RomListWidget.cxx index 64ca2df9d..6e450e334 100644 --- a/src/debugger/gui/RomListWidget.cxx +++ b/src/debugger/gui/RomListWidget.cxx @@ -16,6 +16,7 @@ //============================================================================ #include "bspf.hxx" +#include "OSystem.hxx" #include "Debugger.hxx" #include "DiStella.hxx" #include "Widget.hxx" diff --git a/src/debugger/gui/RomWidget.cxx b/src/debugger/gui/RomWidget.cxx index 3279ca5d9..bf459d8f7 100644 --- a/src/debugger/gui/RomWidget.cxx +++ b/src/debugger/gui/RomWidget.cxx @@ -15,6 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "OSystem.hxx" #include "Settings.hxx" #include "Debugger.hxx" #include "CartDebug.hxx" diff --git a/src/emucore/AtariVox.cxx b/src/emucore/AtariVox.cxx index 3314ac08c..700789352 100644 --- a/src/emucore/AtariVox.cxx +++ b/src/emucore/AtariVox.cxx @@ -36,6 +36,11 @@ AtariVox::AtariVox(Jack jack, const Event& event, const System& system, setPin(DigitalPin::Four, true); } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +AtariVox::~AtariVox() +{ +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool AtariVox::read(DigitalPin pin) { diff --git a/src/emucore/AtariVox.hxx b/src/emucore/AtariVox.hxx index b21ec38b0..e0c2e72c7 100644 --- a/src/emucore/AtariVox.hxx +++ b/src/emucore/AtariVox.hxx @@ -19,10 +19,10 @@ #define ATARIVOX_HXX class OSystem; +class SerialPort; #include "Control.hxx" #include "SaveKey.hxx" -#include "SerialPort.hxx" /** Richard Hutchinson's AtariVox "controller": A speech synthesizer and @@ -49,7 +49,7 @@ class AtariVox : public SaveKey AtariVox(Jack jack, const Event& event, const System& system, const string& portname, const string& eepromfile, const onMessageCallback& callback); - virtual ~AtariVox() = default; + virtual ~AtariVox(); public: using Controller::read; diff --git a/src/emucore/Cart.hxx b/src/emucore/Cart.hxx index 6fbf1a68d..b04a95f10 100644 --- a/src/emucore/Cart.hxx +++ b/src/emucore/Cart.hxx @@ -23,15 +23,18 @@ class Properties; class CartDebugWidget; class CartRamWidget; class GuiObject; +class Settings; + +#include #include "bspf.hxx" #include "Device.hxx" -#include "Settings.hxx" #ifdef DEBUGGER_SUPPORT - #include "Font.hxx" + namespace GUI { + class Font; + } #endif - /** A cartridge is a device which contains the machine code for a game and handles any bankswitching performed by the cartridge. diff --git a/src/emucore/Cart3EPlus.hxx b/src/emucore/Cart3EPlus.hxx index c2ce64cd8..fe6a0a263 100644 --- a/src/emucore/Cart3EPlus.hxx +++ b/src/emucore/Cart3EPlus.hxx @@ -24,7 +24,6 @@ class System; #include "Cart3E.hxx" #ifdef DEBUGGER_SUPPORT -class Cartridge3EPlusWidget; #include "Cart3EPlusWidget.hxx" #endif diff --git a/src/emucore/Cart3EX.hxx b/src/emucore/Cart3EX.hxx index 7df53593e..c949a0c9c 100644 --- a/src/emucore/Cart3EX.hxx +++ b/src/emucore/Cart3EX.hxx @@ -19,7 +19,9 @@ #define CARTRIDGE3EX_HXX class System; +class Settings; +#include "bspf.hxx" #include "Cart3E.hxx" /** @@ -30,39 +32,38 @@ class System; class Cartridge3EX : public Cartridge3E { + public: + /** + Create a new cartridge using the specified image and size -public: - /** - Create a new cartridge using the specified image and size + @param image Pointer to the ROM image + @param size The size of the ROM image + @param md5 The md5sum of the ROM image + @param settings A reference to the various settings (read-only) + */ + Cartridge3EX(const ByteBuffer& image, size_t size, const string& md5, + const Settings& settings); + virtual ~Cartridge3EX() = default; - @param image Pointer to the ROM image - @param size The size of the ROM image - @param md5 The md5sum of the ROM image - @param settings A reference to the various settings (read-only) - */ - Cartridge3EX(const ByteBuffer& image, size_t size, const string& md5, - const Settings& settings); - virtual ~Cartridge3EX() = default; + public: + /** + Get a descriptor for the device name (used in error checking). -public: - /** - Get a descriptor for the device name (used in error checking). + @return The name of the object + */ + string name() const override { return "Cartridge3EX"; } - @return The name of the object - */ - string name() const override { return "Cartridge3EX"; } + private: + // RAM size + static constexpr size_t RAM_SIZE = RAM_BANKS << (BANK_SHIFT - 1); // = 256K = 0x40000; -private: - // RAM size - static constexpr size_t RAM_SIZE = RAM_BANKS << (BANK_SHIFT - 1); // = 256K = 0x40000; - -private: - // Following constructors and assignment operators not supported - Cartridge3EX() = delete; - Cartridge3EX(const Cartridge3EX&) = delete; - Cartridge3EX(Cartridge3EX&&) = delete; - Cartridge3EX& operator=(const Cartridge3EX&) = delete; - Cartridge3EX& operator=(Cartridge3EX&&) = delete; + private: + // Following constructors and assignment operators not supported + Cartridge3EX() = delete; + Cartridge3EX(const Cartridge3EX&) = delete; + Cartridge3EX(Cartridge3EX&&) = delete; + Cartridge3EX& operator=(const Cartridge3EX&) = delete; + Cartridge3EX& operator=(Cartridge3EX&&) = delete; }; #endif diff --git a/src/emucore/CartAR.cxx b/src/emucore/CartAR.cxx index 2d8b204b6..a0eea7486 100644 --- a/src/emucore/CartAR.cxx +++ b/src/emucore/CartAR.cxx @@ -17,6 +17,7 @@ #include "M6502.hxx" #include "System.hxx" +#include "Settings.hxx" #include "CartAR.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CartDPC.cxx b/src/emucore/CartDPC.cxx index 481e385be..bc8962b1b 100644 --- a/src/emucore/CartDPC.cxx +++ b/src/emucore/CartDPC.cxx @@ -15,6 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "Settings.hxx" #include "System.hxx" #include "AudioSettings.hxx" #include "CartDPC.hxx" diff --git a/src/emucore/CartDetector.cxx b/src/emucore/CartDetector.cxx index 6c68bf6e4..976d56579 100644 --- a/src/emucore/CartDetector.cxx +++ b/src/emucore/CartDetector.cxx @@ -62,6 +62,7 @@ #include "MD5.hxx" #include "Props.hxx" #include "Logger.hxx" +#include "OSystem.hxx" #include "CartDetector.hxx" diff --git a/src/emucore/CartDetector.hxx b/src/emucore/CartDetector.hxx index 706731b0f..9ff193c87 100644 --- a/src/emucore/CartDetector.hxx +++ b/src/emucore/CartDetector.hxx @@ -20,10 +20,10 @@ class Cartridge; class Properties; +class Settings; #include "Bankswitch.hxx" #include "bspf.hxx" -#include "Settings.hxx" /** Auto-detect cart type based on various attributes (file size, signatures, diff --git a/src/emucore/CompuMate.cxx b/src/emucore/CompuMate.cxx index b39e46ab4..a3a0367cc 100644 --- a/src/emucore/CompuMate.cxx +++ b/src/emucore/CompuMate.cxx @@ -15,6 +15,9 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "Console.hxx" +#include "Event.hxx" +#include "System.hxx" #include "CompuMate.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/CompuMate.hxx b/src/emucore/CompuMate.hxx index ff0e0f781..8b8d772e8 100644 --- a/src/emucore/CompuMate.hxx +++ b/src/emucore/CompuMate.hxx @@ -18,11 +18,12 @@ #ifndef COMPUMATE_HXX #define COMPUMATE_HXX +class Console; +class Event; +class System; + #include "bspf.hxx" -#include "CartCM.hxx" #include "Control.hxx" -#include "Event.hxx" -#include "Console.hxx" /** Handler for SpectraVideo CompuMate bankswitched games. diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index bf7d20abf..dda0c9fdd 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -24,6 +24,7 @@ #include "Cart.hxx" #include "Control.hxx" #include "Cart.hxx" +#include "CartCM.hxx" #include "Driving.hxx" #include "Event.hxx" #include "EventHandler.hxx" diff --git a/src/emucore/ConsoleIO.hxx b/src/emucore/ConsoleIO.hxx index d8ae106a6..2fde50ed8 100644 --- a/src/emucore/ConsoleIO.hxx +++ b/src/emucore/ConsoleIO.hxx @@ -15,12 +15,12 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include "Control.hxx" -#include "Switches.hxx" - #ifndef CONSOLE_IO_HXX #define CONSOLE_IO_HXX +class Controller; +class Switches; + class ConsoleIO { public: diff --git a/src/emucore/Control.hxx b/src/emucore/Control.hxx index 3647d1bc0..a670f39f6 100644 --- a/src/emucore/Control.hxx +++ b/src/emucore/Control.hxx @@ -25,8 +25,8 @@ class System; #include -#include "Serializable.hxx" #include "bspf.hxx" +#include "Serializable.hxx" /** A controller is a device that plugs into either the left or right diff --git a/src/emucore/ControllerDetector.hxx b/src/emucore/ControllerDetector.hxx index 737ea36f2..d37076eb1 100644 --- a/src/emucore/ControllerDetector.hxx +++ b/src/emucore/ControllerDetector.hxx @@ -18,6 +18,8 @@ #ifndef CONTROLLER_DETECTOR_HXX #define CONTROLLER_DETECTOR_HXX +class Settings; + #include "Control.hxx" /** diff --git a/src/emucore/Device.hxx b/src/emucore/Device.hxx index 7c175852b..fb2423a35 100644 --- a/src/emucore/Device.hxx +++ b/src/emucore/Device.hxx @@ -20,9 +20,9 @@ class System; -#include "Console.hxx" -#include "Serializable.hxx" #include "bspf.hxx" +#include "ConsoleTiming.hxx" +#include "Serializable.hxx" /** Abstract base class for devices which can be attached to a 6502 diff --git a/src/emucore/Joystick.hxx b/src/emucore/Joystick.hxx index 7acd631bc..505294456 100644 --- a/src/emucore/Joystick.hxx +++ b/src/emucore/Joystick.hxx @@ -19,8 +19,8 @@ #define JOYSTICK_HXX #include "bspf.hxx" -#include "Control.hxx" #include "Event.hxx" +#include "Control.hxx" /** The standard Atari 2600 joystick controller. diff --git a/src/emucore/Keyboard.hxx b/src/emucore/Keyboard.hxx index a241cbc37..9ec176d71 100644 --- a/src/emucore/Keyboard.hxx +++ b/src/emucore/Keyboard.hxx @@ -19,8 +19,8 @@ #define KEYBOARD_HXX #include "bspf.hxx" -#include "Control.hxx" #include "Event.hxx" +#include "Control.hxx" /** The standard Atari 2600 keyboard controller diff --git a/src/emucore/Lightgun.hxx b/src/emucore/Lightgun.hxx index 7bec4f4e2..facdffe1e 100644 --- a/src/emucore/Lightgun.hxx +++ b/src/emucore/Lightgun.hxx @@ -18,6 +18,11 @@ #ifndef LIGHTGUN_HXX #define LIGHTGUN_HXX +class FrameBuffer; + +#include "bspf.hxx" +#include "Control.hxx" + /** This class handles the lightgun controller diff --git a/src/emucore/PointingDevice.hxx b/src/emucore/PointingDevice.hxx index 4f0a007b5..11b9fcd2d 100644 --- a/src/emucore/PointingDevice.hxx +++ b/src/emucore/PointingDevice.hxx @@ -18,7 +18,6 @@ #ifndef POINTING_DEVICE_HXX #define POINTING_DEVICE_HXX -class Controller; class Event; #include "Control.hxx" diff --git a/src/emucore/ProfilingRunner.cxx b/src/emucore/ProfilingRunner.cxx index f561dc7a1..e7d81b997 100644 --- a/src/emucore/ProfilingRunner.cxx +++ b/src/emucore/ProfilingRunner.cxx @@ -54,7 +54,6 @@ namespace { } } - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ProfilingRunner::ProfilingRunner(int argc, char* argv[]) : profilingRuns(std::max(argc - 2, 0)) diff --git a/src/emucore/ProfilingRunner.hxx b/src/emucore/ProfilingRunner.hxx index 1194cfdda..a3523b98f 100644 --- a/src/emucore/ProfilingRunner.hxx +++ b/src/emucore/ProfilingRunner.hxx @@ -18,10 +18,9 @@ #ifndef PROFILING_RUNNER #define PROFILING_RUNNER -class Control; -class Switches; - #include "bspf.hxx" +#include "Control.hxx" +#include "Switches.hxx" #include "Settings.hxx" #include "ConsoleIO.hxx" #include "Props.hxx" @@ -41,13 +40,13 @@ class ProfilingRunner { }; struct IO: public ConsoleIO { - Controller& leftController() const override { return *myLeftControl; } - Controller& rightController() const override { return *myRightControl; } - Switches& switches() const override { return *mySwitches; } + Controller& leftController() const override { return *myLeftControl; } + Controller& rightController() const override { return *myRightControl; } + Switches& switches() const override { return *mySwitches; } - unique_ptr myLeftControl; - unique_ptr myRightControl; - unique_ptr mySwitches; + unique_ptr myLeftControl; + unique_ptr myRightControl; + unique_ptr mySwitches; }; private: diff --git a/src/emucore/Switches.hxx b/src/emucore/Switches.hxx index fb7ae4539..16c4dba74 100644 --- a/src/emucore/Switches.hxx +++ b/src/emucore/Switches.hxx @@ -22,8 +22,8 @@ class Event; class Properties; class Settings; -#include "Serializable.hxx" #include "bspf.hxx" +#include "Serializable.hxx" /** This class represents the console switches of the game console. diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx index 1c36acf53..dab87b28a 100644 --- a/src/emucore/System.hxx +++ b/src/emucore/System.hxx @@ -18,11 +18,10 @@ #ifndef SYSTEM_HXX #define SYSTEM_HXX -class Device; class M6502; class M6532; class TIA; -class NullDevice; +class Cartridge; #include "bspf.hxx" #include "Device.hxx" diff --git a/src/emucore/tia/Audio.hxx b/src/emucore/tia/Audio.hxx index 92e854a0d..5ab53ecae 100644 --- a/src/emucore/tia/Audio.hxx +++ b/src/emucore/tia/Audio.hxx @@ -18,12 +18,12 @@ #ifndef TIA_AUDIO_HXX #define TIA_AUDIO_HXX +class AudioQueue; + #include "bspf.hxx" #include "AudioChannel.hxx" #include "Serializable.hxx" -class AudioQueue; - class Audio : public Serializable { public: diff --git a/src/emucore/tia/Background.hxx b/src/emucore/tia/Background.hxx index 3004c7978..ea84aed96 100644 --- a/src/emucore/tia/Background.hxx +++ b/src/emucore/tia/Background.hxx @@ -18,11 +18,11 @@ #ifndef TIA_BACKGROUND #define TIA_BACKGROUND +class TIA; + #include "Serializable.hxx" #include "bspf.hxx" -class TIA; - class Background : public Serializable { public: diff --git a/src/emucore/tia/Ball.hxx b/src/emucore/tia/Ball.hxx index 5b9b3a604..0a40250e2 100644 --- a/src/emucore/tia/Ball.hxx +++ b/src/emucore/tia/Ball.hxx @@ -18,11 +18,11 @@ #ifndef TIA_BALL #define TIA_BALL -#include "Serializable.hxx" +class TIA; + #include "bspf.hxx" #include "TIAConstants.hxx" - -class TIA; +#include "Serializable.hxx" class Ball : public Serializable { diff --git a/src/emucore/tia/DelayQueueIterator.hxx b/src/emucore/tia/DelayQueueIterator.hxx index 31e5251e8..3b615e3d4 100644 --- a/src/emucore/tia/DelayQueueIterator.hxx +++ b/src/emucore/tia/DelayQueueIterator.hxx @@ -19,8 +19,6 @@ #define TIA_DELAY_QUEUE_ITERATOR #include "bspf.hxx" -#include "DelayQueue.hxx" -#include "DelayQueueMember.hxx" class DelayQueueIterator { diff --git a/src/emucore/tia/DelayQueueIteratorImpl.hxx b/src/emucore/tia/DelayQueueIteratorImpl.hxx index b556cb279..9f9e4d4c7 100644 --- a/src/emucore/tia/DelayQueueIteratorImpl.hxx +++ b/src/emucore/tia/DelayQueueIteratorImpl.hxx @@ -20,7 +20,6 @@ #include "bspf.hxx" #include "DelayQueue.hxx" -#include "DelayQueueMember.hxx" #include "DelayQueueIterator.hxx" template diff --git a/src/emucore/tia/DelayQueueMember.hxx b/src/emucore/tia/DelayQueueMember.hxx index f87c9b459..653167b6f 100644 --- a/src/emucore/tia/DelayQueueMember.hxx +++ b/src/emucore/tia/DelayQueueMember.hxx @@ -18,8 +18,8 @@ #ifndef TIA_DELAY_QUEUE_MEMBER #define TIA_DELAY_QUEUE_MEMBER -#include "Serializable.hxx" #include "bspf.hxx" +#include "Serializable.hxx" template class DelayQueueMember : public Serializable { diff --git a/src/emucore/tia/Missile.hxx b/src/emucore/tia/Missile.hxx index dda9b493c..cd5cce582 100644 --- a/src/emucore/tia/Missile.hxx +++ b/src/emucore/tia/Missile.hxx @@ -18,13 +18,13 @@ #ifndef TIA_MISSILE #define TIA_MISSILE +class TIA; +class Player; + #include "Serializable.hxx" #include "bspf.hxx" -#include "Player.hxx" #include "TIAConstants.hxx" -class TIA; - class Missile : public Serializable { public: diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx index abbc013c6..8071617c6 100644 --- a/src/emucore/tia/PaddleReader.hxx +++ b/src/emucore/tia/PaddleReader.hxx @@ -20,7 +20,7 @@ #include "bspf.hxx" #include "Serializable.hxx" -#include "Console.hxx" +#include "ConsoleTiming.hxx" class PaddleReader : public Serializable { diff --git a/src/emucore/tia/Player.hxx b/src/emucore/tia/Player.hxx index 454bfcd9f..60dfbe3c5 100644 --- a/src/emucore/tia/Player.hxx +++ b/src/emucore/tia/Player.hxx @@ -18,12 +18,12 @@ #ifndef TIA_PLAYER #define TIA_PLAYER +class TIA; + #include "bspf.hxx" #include "Serializable.hxx" #include "TIAConstants.hxx" -class TIA; - class Player : public Serializable { public: diff --git a/src/emucore/tia/Playfield.hxx b/src/emucore/tia/Playfield.hxx index fe811d53a..4a1376991 100644 --- a/src/emucore/tia/Playfield.hxx +++ b/src/emucore/tia/Playfield.hxx @@ -18,11 +18,11 @@ #ifndef TIA_PLAYFIELD #define TIA_PLAYFIELD -#include "Serializable.hxx" +class TIA; + #include "bspf.hxx" #include "TIAConstants.hxx" - -class TIA; +#include "Serializable.hxx" class Playfield : public Serializable { diff --git a/src/emucore/tia/frame-manager/FrameLayoutDetector.hxx b/src/emucore/tia/frame-manager/FrameLayoutDetector.hxx index fa7e50308..443b9c20c 100644 --- a/src/emucore/tia/frame-manager/FrameLayoutDetector.hxx +++ b/src/emucore/tia/frame-manager/FrameLayoutDetector.hxx @@ -18,8 +18,8 @@ #ifndef TIA_FRAME_LAYOUT_DETECTOR #define TIA_FRAME_LAYOUT_DETECTOR -#include "AbstractFrameManager.hxx" #include "FrameLayout.hxx" +#include "AbstractFrameManager.hxx" /** * This frame manager performs frame layout autodetection. It counts the scanlines diff --git a/src/gui/CommandMenu.cxx b/src/gui/CommandMenu.cxx index 68e9a0fef..1a6708f71 100644 --- a/src/gui/CommandMenu.cxx +++ b/src/gui/CommandMenu.cxx @@ -16,6 +16,8 @@ //============================================================================ #include "Dialog.hxx" +#include "OSystem.hxx" +#include "Settings.hxx" #include "CommandDialog.hxx" #include "MinUICommandDialog.hxx" #include "CommandMenu.hxx" diff --git a/src/gui/EditTextWidget.hxx b/src/gui/EditTextWidget.hxx index f752ae385..c7a346804 100644 --- a/src/gui/EditTextWidget.hxx +++ b/src/gui/EditTextWidget.hxx @@ -21,7 +21,6 @@ #include "Rect.hxx" #include "EditableWidget.hxx" - /* EditTextWidget */ class EditTextWidget : public EditableWidget { diff --git a/src/gui/EmulationDialog.cxx b/src/gui/EmulationDialog.cxx index ad86e2e60..e9bb3804a 100644 --- a/src/gui/EmulationDialog.cxx +++ b/src/gui/EmulationDialog.cxx @@ -15,6 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "OSystem.hxx" #include "Console.hxx" #include "FrameBuffer.hxx" #include "RadioButtonWidget.hxx" diff --git a/src/gui/GuiObject.hxx b/src/gui/GuiObject.hxx index 3f473867b..fc8f77285 100644 --- a/src/gui/GuiObject.hxx +++ b/src/gui/GuiObject.hxx @@ -27,7 +27,6 @@ class Widget; class OSystem; #include "Command.hxx" -#include "OSystem.hxx" #include "Vec.hxx" using WidgetArray = vector; diff --git a/src/gui/InputDialog.hxx b/src/gui/InputDialog.hxx index 1c8c04367..48e1629a3 100644 --- a/src/gui/InputDialog.hxx +++ b/src/gui/InputDialog.hxx @@ -62,7 +62,6 @@ class InputDialog : public Dialog void addDevicePortTab(); void addMouseTab(); - void handleMouseControlState(); void handleCursorState(); void updateDejitterAveraging(); diff --git a/src/gui/LauncherDialog.hxx b/src/gui/LauncherDialog.hxx index bfa0cecba..faeea2598 100644 --- a/src/gui/LauncherDialog.hxx +++ b/src/gui/LauncherDialog.hxx @@ -32,6 +32,9 @@ class EditTextWidget; class FileListWidget; class RomInfoWidget; class StaticTextWidget; +namespace Common { + struct Size; +} namespace GUI { class MessageBox; } @@ -41,7 +44,6 @@ namespace GUI { #include "bspf.hxx" #include "Dialog.hxx" #include "FSNode.hxx" -#include "Stack.hxx" class LauncherDialog : public Dialog { diff --git a/src/gui/Menu.cxx b/src/gui/Menu.cxx index c2976857f..547f8e2ac 100644 --- a/src/gui/Menu.cxx +++ b/src/gui/Menu.cxx @@ -19,6 +19,7 @@ #include "FrameBufferConstants.hxx" #include "OptionsDialog.hxx" #include "StellaSettingsDialog.hxx" +#include "OSystem.hxx" #include "FrameBuffer.hxx" #include "bspf.hxx" #include "Menu.hxx" diff --git a/src/gui/MessageDialog.cxx b/src/gui/MessageDialog.cxx index d00acc5a5..ca52c99e6 100644 --- a/src/gui/MessageDialog.cxx +++ b/src/gui/MessageDialog.cxx @@ -15,6 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "OSystem.hxx" #include "Console.hxx" #include "EventHandler.hxx" #include "Font.hxx" diff --git a/src/gui/MessageMenu.cxx b/src/gui/MessageMenu.cxx index f7c7f0faa..19b700ae7 100644 --- a/src/gui/MessageMenu.cxx +++ b/src/gui/MessageMenu.cxx @@ -16,6 +16,7 @@ //============================================================================ #include "Dialog.hxx" +#include "OSystem.hxx" #include "FrameBuffer.hxx" #include "MessageDialog.hxx" #include "MessageMenu.hxx" diff --git a/src/gui/RomAuditDialog.cxx b/src/gui/RomAuditDialog.cxx index 890da7e95..58b9acaba 100644 --- a/src/gui/RomAuditDialog.cxx +++ b/src/gui/RomAuditDialog.cxx @@ -25,6 +25,7 @@ #include "FSNode.hxx" #include "Font.hxx" #include "MessageBox.hxx" +#include "OSystem.hxx" #include "FrameBuffer.hxx" #include "MD5.hxx" #include "Props.hxx" diff --git a/src/gui/SnapshotDialog.cxx b/src/gui/SnapshotDialog.cxx index 2c0534ffa..870a82b54 100644 --- a/src/gui/SnapshotDialog.cxx +++ b/src/gui/SnapshotDialog.cxx @@ -21,6 +21,7 @@ #include "FSNode.hxx" #include "Font.hxx" #include "LauncherDialog.hxx" +#include "OSystem.hxx" #include "Settings.hxx" #include "SnapshotDialog.hxx" diff --git a/src/gui/StellaSettingsDialog.cxx b/src/gui/StellaSettingsDialog.cxx index fbd93dc7d..b5c1e5106 100644 --- a/src/gui/StellaSettingsDialog.cxx +++ b/src/gui/StellaSettingsDialog.cxx @@ -15,6 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "OSystem.hxx" #include "Console.hxx" #include "EventHandler.hxx" #include "Launcher.hxx" @@ -88,6 +89,11 @@ StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& pa addToFocusList(wid); } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +StellaSettingsDialog::~StellaSettingsDialog() +{ +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void StellaSettingsDialog::addUIOptions(WidgetArray& wid, int& xpos, int& ypos) { diff --git a/src/gui/StellaSettingsDialog.hxx b/src/gui/StellaSettingsDialog.hxx index 791db381c..6f7cfe8a8 100644 --- a/src/gui/StellaSettingsDialog.hxx +++ b/src/gui/StellaSettingsDialog.hxx @@ -23,7 +23,6 @@ class PopUpWidget; #include "Props.hxx" #include "Menu.hxx" #include "Dialog.hxx" -#include "MessageBox.hxx" #if defined(RETRON77) #include "R77HelpDialog.hxx" @@ -33,6 +32,7 @@ class PopUpWidget; namespace GUI { class Font; + class MessageBox; } class StellaSettingsDialog : public Dialog @@ -40,7 +40,7 @@ class StellaSettingsDialog : public Dialog public: StellaSettingsDialog(OSystem& osystem, DialogContainer& parent, int max_w, int max_h, Menu::AppMode mode); - virtual ~StellaSettingsDialog() = default; + virtual ~StellaSettingsDialog(); private: void loadConfig() override; diff --git a/src/gui/Widget.hxx b/src/gui/Widget.hxx index c2a0b6b65..b20b8b159 100644 --- a/src/gui/Widget.hxx +++ b/src/gui/Widget.hxx @@ -23,14 +23,12 @@ class Dialog; -namespace GUI { - class Font; -} - #include #include "bspf.hxx" #include "Event.hxx" +#include "EventHandlerConstants.hxx" +#include "FrameBufferConstants.hxx" #include "StellaKeys.hxx" #include "GuiObject.hxx" #include "Font.hxx" diff --git a/src/libretro/SoundLIBRETRO.hxx b/src/libretro/SoundLIBRETRO.hxx index 9709e4b3d..aa98780e1 100644 --- a/src/libretro/SoundLIBRETRO.hxx +++ b/src/libretro/SoundLIBRETRO.hxx @@ -27,7 +27,6 @@ class AudioSettings; #include "bspf.hxx" #include "Sound.hxx" -#include "AudioQueue.hxx" /** This class implements the sound API for LIBRTRO. diff --git a/src/libretro/StellaLIBRETRO.cxx b/src/libretro/StellaLIBRETRO.cxx index e86709490..0759f9349 100644 --- a/src/libretro/StellaLIBRETRO.cxx +++ b/src/libretro/StellaLIBRETRO.cxx @@ -23,6 +23,7 @@ #include "AtariNTSC.hxx" #include "PaletteHandler.hxx" #include "AudioSettings.hxx" +#include "PaletteHandler.hxx" #include "Serializer.hxx" #include "StateManager.hxx" #include "Switches.hxx"