ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some more header file cleanups, hopefully resulting in faster compile 

times.
This commit is contained in:
Stephen Anthony 2020-05-12 13:52:33 -02:30
parent 8807e91d04
commit 7532fbf88a
72 changed files with 148 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/JoyMap.hxx
View File

@ -19,6 +19,7 @@
#define CONTROLLERMAP_HXX #define CONTROLLERMAP_HXX
#include <unordered_map> #include <unordered_map>
#include "Event.hxx" #include "Event.hxx"
#include "EventHandlerConstants.hxx" #include "EventHandlerConstants.hxx"

1
src/common/RewindManager.cxx
View File

@ -18,6 +18,7 @@
#include <cmath> #include <cmath>
#include "OSystem.hxx" #include "OSystem.hxx"
#include "Console.hxx"
#include "Serializer.hxx" #include "Serializer.hxx"
#include "StateManager.hxx" #include "StateManager.hxx"
#include "TIA.hxx" #include "TIA.hxx"

7
src/common/SoundNull.hxx
View File

@ -18,12 +18,13 @@
#ifndef SOUND_NULL_HXX #ifndef SOUND_NULL_HXX
#define SOUND_NULL_HXX #define SOUND_NULL_HXX
class OSystem;
class AudioQueue;
class EmulationTiming;
#include "bspf.hxx" #include "bspf.hxx"
#include "Logger.hxx" #include "Logger.hxx"
#include "Sound.hxx" #include "Sound.hxx"
#include "OSystem.hxx"
#include "AudioQueue.hxx"
#include "EmulationTiming.hxx"
/** /**
This class implements a Null sound object, where-by sound generation This class implements a Null sound object, where-by sound generation

2
src/common/SoundSDL2.hxx
View File

@ -24,12 +24,12 @@ class OSystem;
class AudioQueue; class AudioQueue;
class EmulationTiming; class EmulationTiming;
class AudioSettings; class AudioSettings;
class Resampler;
#include "SDL_lib.hxx" #include "SDL_lib.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "Sound.hxx" #include "Sound.hxx"
#include "audio/Resampler.hxx"
/** /**
This class implements the sound API for SDL. This class implements the sound API for SDL.

4
src/common/sdl_blitter/BilinearBlitter.cxx
View File

@ -15,9 +15,9 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "BilinearBlitter.hxx" #include "FrameBufferSDL2.hxx"
#include "ThreadDebugging.hxx" #include "ThreadDebugging.hxx"
#include "BilinearBlitter.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BilinearBlitter::BilinearBlitter(FrameBufferSDL2& fb, bool interpolate) BilinearBlitter::BilinearBlitter(FrameBufferSDL2& fb, bool interpolate)

3
src/common/sdl_blitter/BilinearBlitter.hxx
View File

@ -18,8 +18,9 @@
#ifndef BILINEAR_BLITTER_HXX #ifndef BILINEAR_BLITTER_HXX
#define BILINEAR_BLITTER_HXX #define BILINEAR_BLITTER_HXX
class FrameBufferSDL2;
#include "Blitter.hxx" #include "Blitter.hxx"
#include "FrameBufferSDL2.hxx"
#include "SDL_lib.hxx" #include "SDL_lib.hxx"
class BilinearBlitter : public Blitter { class BilinearBlitter : public Blitter {

4
src/common/sdl_blitter/QisBlitter.cxx
View File

@ -15,9 +15,9 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "QisBlitter.hxx" #include "FrameBufferSDL2.hxx"
#include "ThreadDebugging.hxx" #include "ThreadDebugging.hxx"
#include "QisBlitter.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
QisBlitter::QisBlitter(FrameBufferSDL2& fb) QisBlitter::QisBlitter(FrameBufferSDL2& fb)

3
src/common/sdl_blitter/QisBlitter.hxx
View File

@ -18,8 +18,9 @@
#ifndef QIS_BLITTER_HXX #ifndef QIS_BLITTER_HXX
#define QIS_BLITTER_HXX #define QIS_BLITTER_HXX
class FrameBufferSDL2;
#include "Blitter.hxx" #include "Blitter.hxx"
#include "FrameBufferSDL2.hxx"
#include "SDL_lib.hxx" #include "SDL_lib.hxx"
class QisBlitter : public Blitter { class QisBlitter : public Blitter {

1
src/debugger/DebuggerParser.cxx
View File

@ -30,6 +30,7 @@
#include "M6502.hxx" #include "M6502.hxx"
#include "Expression.hxx" #include "Expression.hxx"
#include "FSNode.hxx" #include "FSNode.hxx"
#include "OSystem.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "PromptWidget.hxx" #include "PromptWidget.hxx"
#include "RomWidget.hxx" #include "RomWidget.hxx"

1
src/debugger/gui/CartARWidget.cxx
View File

@ -16,6 +16,7 @@
//============================================================================ //============================================================================
#include "CartAR.hxx" #include "CartAR.hxx"
#include "OSystem.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"

1
src/debugger/gui/CartCMWidget.cxx
View File

@ -16,6 +16,7 @@
//============================================================================ //============================================================================
#include "CartCM.hxx" #include "CartCM.hxx"
#include "OSystem.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "RiotDebug.hxx" #include "RiotDebug.hxx"

1
src/debugger/gui/CartCTYWidget.cxx
View File

@ -15,6 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "CartCTY.hxx" #include "CartCTY.hxx"

2
src/debugger/gui/CartEnhancedWidget.cxx
View File

@ -15,8 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "OSystem.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "CartEnhanced.hxx" #include "CartEnhanced.hxx"

1
src/debugger/gui/CartEnhancedWidget.hxx
View File

@ -25,6 +25,7 @@ namespace GUI {
class Font; class Font;
} }
#include "Variant.hxx"
#include "CartDebugWidget.hxx" #include "CartDebugWidget.hxx"
class CartridgeEnhancedWidget : public CartDebugWidget class CartridgeEnhancedWidget : public CartDebugWidget

1
src/debugger/gui/ControllerWidget.hxx
View File

@ -23,6 +23,7 @@ class ButtonWidget;
#include "Font.hxx" #include "Font.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "OSystem.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "ControlLowLevel.hxx" #include "ControlLowLevel.hxx"

1
src/debugger/gui/DataGridWidget.cxx
View File

@ -18,6 +18,7 @@
#include "Widget.hxx" #include "Widget.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "Font.hxx" #include "Font.hxx"
#include "OSystem.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "FBSurface.hxx" #include "FBSurface.hxx"

2
src/debugger/gui/DebuggerDialog.cxx
View File

@ -47,6 +47,8 @@
#include "OptionsDialog.hxx" #include "OptionsDialog.hxx"
#include "StateManager.hxx" #include "StateManager.hxx"
#include "FrameManager.hxx" #include "FrameManager.hxx"
#include "OSystem.hxx"
#include "Console.hxx"
#include "DebuggerDialog.hxx" #include "DebuggerDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/debugger/gui/PromptWidget.cxx
View File

@ -20,6 +20,7 @@
#include "Font.hxx" #include "Font.hxx"
#include "StellaKeys.hxx" #include "StellaKeys.hxx"
#include "Version.hxx" #include "Version.hxx"
#include "OSystem.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "DebuggerDialog.hxx" #include "DebuggerDialog.hxx"
#include "DebuggerParser.hxx" #include "DebuggerParser.hxx"

1
src/debugger/gui/RiotRamWidget.cxx
View File

@ -15,6 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"

1
src/debugger/gui/RomListWidget.cxx
View File

@ -16,6 +16,7 @@
//============================================================================ //============================================================================
#include "bspf.hxx" #include "bspf.hxx"
#include "OSystem.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "DiStella.hxx" #include "DiStella.hxx"
#include "Widget.hxx" #include "Widget.hxx"

1
src/debugger/gui/RomWidget.cxx
View File

@ -15,6 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"

5
src/emucore/AtariVox.cxx
View File

@ -36,6 +36,11 @@ AtariVox::AtariVox(Jack jack, const Event& event, const System& system,
setPin(DigitalPin::Four, true); setPin(DigitalPin::Four, true);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AtariVox::~AtariVox()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool AtariVox::read(DigitalPin pin) bool AtariVox::read(DigitalPin pin)
{ {

4
src/emucore/AtariVox.hxx
View File

@ -19,10 +19,10 @@
#define ATARIVOX_HXX #define ATARIVOX_HXX
class OSystem; class OSystem;
class SerialPort;
#include "Control.hxx" #include "Control.hxx"
#include "SaveKey.hxx" #include "SaveKey.hxx"
#include "SerialPort.hxx"
/** /**
Richard Hutchinson's AtariVox "controller": A speech synthesizer and 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, AtariVox(Jack jack, const Event& event, const System& system,
const string& portname, const string& eepromfile, const string& portname, const string& eepromfile,
const onMessageCallback& callback); const onMessageCallback& callback);
virtual ~AtariVox() = default; virtual ~AtariVox();
public: public:
using Controller::read; using Controller::read;

9
src/emucore/Cart.hxx
View File

@ -23,15 +23,18 @@ class Properties;
class CartDebugWidget; class CartDebugWidget;
class CartRamWidget; class CartRamWidget;
class GuiObject; class GuiObject;
class Settings;
#include <functional>
#include "bspf.hxx" #include "bspf.hxx"
#include "Device.hxx" #include "Device.hxx"
#include "Settings.hxx"
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
#include "Font.hxx" namespace GUI {
class Font;
}
#endif #endif
/** /**
A cartridge is a device which contains the machine code for a A cartridge is a device which contains the machine code for a
game and handles any bankswitching performed by the cartridge. game and handles any bankswitching performed by the cartridge.

1
src/emucore/Cart3EPlus.hxx
View File

@ -24,7 +24,6 @@ class System;
#include "Cart3E.hxx" #include "Cart3E.hxx"
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
class Cartridge3EPlusWidget;
#include "Cart3EPlusWidget.hxx" #include "Cart3EPlusWidget.hxx"
#endif #endif

57
src/emucore/Cart3EX.hxx
View File

@ -19,7 +19,9 @@
#define CARTRIDGE3EX_HXX #define CARTRIDGE3EX_HXX
class System; class System;
class Settings;
#include "bspf.hxx"
#include "Cart3E.hxx" #include "Cart3E.hxx"
/** /**
@ -30,39 +32,38 @@ class System;
class Cartridge3EX : public Cartridge3E class Cartridge3EX : public Cartridge3E
{ {
public:
/**
Create a new cartridge using the specified image and size
public: @param image Pointer to the ROM image
/** @param size The size of the ROM image
Create a new cartridge using the specified image and size @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 public:
@param size The size of the ROM image /**
@param md5 The md5sum of the ROM image Get a descriptor for the device name (used in error checking).
@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: @return The name of the object
/** */
Get a descriptor for the device name (used in error checking). string name() const override { return "Cartridge3EX"; }
@return The name of the object private:
*/ // RAM size
string name() const override { return "Cartridge3EX"; } static constexpr size_t RAM_SIZE = RAM_BANKS << (BANK_SHIFT - 1); // = 256K = 0x40000;
private: private:
// RAM size // Following constructors and assignment operators not supported
static constexpr size_t RAM_SIZE = RAM_BANKS << (BANK_SHIFT - 1); // = 256K = 0x40000; Cartridge3EX() = delete;
Cartridge3EX(const Cartridge3EX&) = delete;
private: Cartridge3EX(Cartridge3EX&&) = delete;
// Following constructors and assignment operators not supported Cartridge3EX& operator=(const Cartridge3EX&) = delete;
Cartridge3EX() = delete; Cartridge3EX& operator=(Cartridge3EX&&) = delete;
Cartridge3EX(const Cartridge3EX&) = delete;
Cartridge3EX(Cartridge3EX&&) = delete;
Cartridge3EX& operator=(const Cartridge3EX&) = delete;
Cartridge3EX& operator=(Cartridge3EX&&) = delete;
}; };
#endif #endif

1
src/emucore/CartAR.cxx
View File

@ -17,6 +17,7 @@
#include "M6502.hxx" #include "M6502.hxx"
#include "System.hxx" #include "System.hxx"
#include "Settings.hxx"
#include "CartAR.hxx" #include "CartAR.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/emucore/CartDPC.cxx
View File

@ -15,6 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Settings.hxx"
#include "System.hxx" #include "System.hxx"
#include "AudioSettings.hxx" #include "AudioSettings.hxx"
#include "CartDPC.hxx" #include "CartDPC.hxx"

1
src/emucore/CartDetector.cxx
View File

@ -62,6 +62,7 @@
#include "MD5.hxx" #include "MD5.hxx"
#include "Props.hxx" #include "Props.hxx"
#include "Logger.hxx" #include "Logger.hxx"
#include "OSystem.hxx"
#include "CartDetector.hxx" #include "CartDetector.hxx"

2
src/emucore/CartDetector.hxx
View File

@ -20,10 +20,10 @@
class Cartridge; class Cartridge;
class Properties; class Properties;
class Settings;
#include "Bankswitch.hxx" #include "Bankswitch.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "Settings.hxx"
/** /**
Auto-detect cart type based on various attributes (file size, signatures, Auto-detect cart type based on various attributes (file size, signatures,

3
src/emucore/CompuMate.cxx
View File

@ -15,6 +15,9 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Console.hxx"
#include "Event.hxx"
#include "System.hxx"
#include "CompuMate.hxx" #include "CompuMate.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

7
src/emucore/CompuMate.hxx
View File

@ -18,11 +18,12 @@
#ifndef COMPUMATE_HXX #ifndef COMPUMATE_HXX
#define COMPUMATE_HXX #define COMPUMATE_HXX
class Console;
class Event;
class System;
#include "bspf.hxx" #include "bspf.hxx"
#include "CartCM.hxx"
#include "Control.hxx" #include "Control.hxx"
#include "Event.hxx"
#include "Console.hxx"
/** /**
Handler for SpectraVideo CompuMate bankswitched games. Handler for SpectraVideo CompuMate bankswitched games.

1
src/emucore/Console.cxx
View File

@ -24,6 +24,7 @@
#include "Cart.hxx" #include "Cart.hxx"
#include "Control.hxx" #include "Control.hxx"
#include "Cart.hxx" #include "Cart.hxx"
#include "CartCM.hxx"
#include "Driving.hxx" #include "Driving.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "EventHandler.hxx" #include "EventHandler.hxx"

6
src/emucore/ConsoleIO.hxx
View File

@ -15,12 +15,12 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "Control.hxx"
#include "Switches.hxx"
#ifndef CONSOLE_IO_HXX #ifndef CONSOLE_IO_HXX
#define CONSOLE_IO_HXX #define CONSOLE_IO_HXX
class Controller;
class Switches;
class ConsoleIO class ConsoleIO
{ {
public: public:

2
src/emucore/Control.hxx
View File

@ -25,8 +25,8 @@ class System;
#include <functional> #include <functional>
#include "Serializable.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "Serializable.hxx"
/** /**
A controller is a device that plugs into either the left or right A controller is a device that plugs into either the left or right

2
src/emucore/ControllerDetector.hxx
View File

@ -18,6 +18,8 @@
#ifndef CONTROLLER_DETECTOR_HXX #ifndef CONTROLLER_DETECTOR_HXX
#define CONTROLLER_DETECTOR_HXX #define CONTROLLER_DETECTOR_HXX
class Settings;
#include "Control.hxx" #include "Control.hxx"
/** /**

4
src/emucore/Device.hxx
View File

@ -20,9 +20,9 @@
class System; class System;
#include "Console.hxx"
#include "Serializable.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "ConsoleTiming.hxx"
#include "Serializable.hxx"
/** /**
Abstract base class for devices which can be attached to a 6502 Abstract base class for devices which can be attached to a 6502

2
src/emucore/Joystick.hxx
View File

@ -19,8 +19,8 @@
#define JOYSTICK_HXX #define JOYSTICK_HXX
#include "bspf.hxx" #include "bspf.hxx"
#include "Control.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "Control.hxx"
/** /**
The standard Atari 2600 joystick controller. The standard Atari 2600 joystick controller.

2
src/emucore/Keyboard.hxx
View File

@ -19,8 +19,8 @@
#define KEYBOARD_HXX #define KEYBOARD_HXX
#include "bspf.hxx" #include "bspf.hxx"
#include "Control.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "Control.hxx"
/** /**
The standard Atari 2600 keyboard controller The standard Atari 2600 keyboard controller

5
src/emucore/Lightgun.hxx
View File

@ -18,6 +18,11 @@
#ifndef LIGHTGUN_HXX #ifndef LIGHTGUN_HXX
#define LIGHTGUN_HXX #define LIGHTGUN_HXX
class FrameBuffer;
#include "bspf.hxx"
#include "Control.hxx"
/** /**
This class handles the lightgun controller This class handles the lightgun controller

1
src/emucore/PointingDevice.hxx
View File

@ -18,7 +18,6 @@
#ifndef POINTING_DEVICE_HXX #ifndef POINTING_DEVICE_HXX
#define POINTING_DEVICE_HXX #define POINTING_DEVICE_HXX
class Controller;
class Event; class Event;
#include "Control.hxx" #include "Control.hxx"

1
src/emucore/ProfilingRunner.cxx
View File

@ -54,7 +54,6 @@ namespace {
} }
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ProfilingRunner::ProfilingRunner(int argc, char* argv[]) ProfilingRunner::ProfilingRunner(int argc, char* argv[])
: profilingRuns(std::max(argc - 2, 0)) : profilingRuns(std::max(argc - 2, 0))

17
src/emucore/ProfilingRunner.hxx
View File

@ -18,10 +18,9 @@
#ifndef PROFILING_RUNNER #ifndef PROFILING_RUNNER
#define PROFILING_RUNNER #define PROFILING_RUNNER
class Control;
class Switches;
#include "bspf.hxx" #include "bspf.hxx"
#include "Control.hxx"
#include "Switches.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "ConsoleIO.hxx" #include "ConsoleIO.hxx"
#include "Props.hxx" #include "Props.hxx"
@ -41,13 +40,13 @@ class ProfilingRunner {
}; };
struct IO: public ConsoleIO { struct IO: public ConsoleIO {
Controller& leftController() const override { return *myLeftControl; } Controller& leftController() const override { return *myLeftControl; }
Controller& rightController() const override { return *myRightControl; } Controller& rightController() const override { return *myRightControl; }
Switches& switches() const override { return *mySwitches; } Switches& switches() const override { return *mySwitches; }
unique_ptr<Controller> myLeftControl; unique_ptr<Controller> myLeftControl;
unique_ptr<Controller> myRightControl; unique_ptr<Controller> myRightControl;
unique_ptr<Switches> mySwitches; unique_ptr<Switches> mySwitches;
}; };
private: private:

2
src/emucore/Switches.hxx
View File

@ -22,8 +22,8 @@ class Event;
class Properties; class Properties;
class Settings; class Settings;
#include "Serializable.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "Serializable.hxx"
/** /**
This class represents the console switches of the game console. This class represents the console switches of the game console.

3
src/emucore/System.hxx
View File

@ -18,11 +18,10 @@
#ifndef SYSTEM_HXX #ifndef SYSTEM_HXX
#define SYSTEM_HXX #define SYSTEM_HXX
class Device;
class M6502; class M6502;
class M6532; class M6532;
class TIA; class TIA;
class NullDevice; class Cartridge;
#include "bspf.hxx" #include "bspf.hxx"
#include "Device.hxx" #include "Device.hxx"

4
src/emucore/tia/Audio.hxx
View File

@ -18,12 +18,12 @@
#ifndef TIA_AUDIO_HXX #ifndef TIA_AUDIO_HXX
#define TIA_AUDIO_HXX #define TIA_AUDIO_HXX
class AudioQueue;
#include "bspf.hxx" #include "bspf.hxx"
#include "AudioChannel.hxx" #include "AudioChannel.hxx"
#include "Serializable.hxx" #include "Serializable.hxx"
class AudioQueue;
class Audio : public Serializable class Audio : public Serializable
{ {
public: public:

4
src/emucore/tia/Background.hxx
View File

@ -18,11 +18,11 @@
#ifndef TIA_BACKGROUND #ifndef TIA_BACKGROUND
#define TIA_BACKGROUND #define TIA_BACKGROUND
class TIA;
#include "Serializable.hxx" #include "Serializable.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class TIA;
class Background : public Serializable class Background : public Serializable
{ {
public: public:

6
src/emucore/tia/Ball.hxx
View File

@ -18,11 +18,11 @@
#ifndef TIA_BALL #ifndef TIA_BALL
#define TIA_BALL #define TIA_BALL
#include "Serializable.hxx" class TIA;
#include "bspf.hxx" #include "bspf.hxx"
#include "TIAConstants.hxx" #include "TIAConstants.hxx"
#include "Serializable.hxx"
class TIA;
class Ball : public Serializable class Ball : public Serializable
{ {

2
src/emucore/tia/DelayQueueIterator.hxx
View File

@ -19,8 +19,6 @@
#define TIA_DELAY_QUEUE_ITERATOR #define TIA_DELAY_QUEUE_ITERATOR
#include "bspf.hxx" #include "bspf.hxx"
#include "DelayQueue.hxx"
#include "DelayQueueMember.hxx"
class DelayQueueIterator class DelayQueueIterator
{ {

1
src/emucore/tia/DelayQueueIteratorImpl.hxx
View File

@ -20,7 +20,6 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "DelayQueue.hxx" #include "DelayQueue.hxx"
#include "DelayQueueMember.hxx"
#include "DelayQueueIterator.hxx" #include "DelayQueueIterator.hxx"
template<unsigned length, unsigned capacity> template<unsigned length, unsigned capacity>

2
src/emucore/tia/DelayQueueMember.hxx
View File

@ -18,8 +18,8 @@
#ifndef TIA_DELAY_QUEUE_MEMBER #ifndef TIA_DELAY_QUEUE_MEMBER
#define TIA_DELAY_QUEUE_MEMBER #define TIA_DELAY_QUEUE_MEMBER
#include "Serializable.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "Serializable.hxx"
template<unsigned capacity> template<unsigned capacity>
class DelayQueueMember : public Serializable { class DelayQueueMember : public Serializable {

6
src/emucore/tia/Missile.hxx
View File

@ -18,13 +18,13 @@
#ifndef TIA_MISSILE #ifndef TIA_MISSILE
#define TIA_MISSILE #define TIA_MISSILE
class TIA;
class Player;
#include "Serializable.hxx" #include "Serializable.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "Player.hxx"
#include "TIAConstants.hxx" #include "TIAConstants.hxx"
class TIA;
class Missile : public Serializable class Missile : public Serializable
{ {
public: public:

2
src/emucore/tia/PaddleReader.hxx
View File

@ -20,7 +20,7 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Serializable.hxx" #include "Serializable.hxx"
#include "Console.hxx" #include "ConsoleTiming.hxx"
class PaddleReader : public Serializable class PaddleReader : public Serializable
{ {

4
src/emucore/tia/Player.hxx
View File

@ -18,12 +18,12 @@
#ifndef TIA_PLAYER #ifndef TIA_PLAYER
#define TIA_PLAYER #define TIA_PLAYER
class TIA;
#include "bspf.hxx" #include "bspf.hxx"
#include "Serializable.hxx" #include "Serializable.hxx"
#include "TIAConstants.hxx" #include "TIAConstants.hxx"
class TIA;
class Player : public Serializable class Player : public Serializable
{ {
public: public:

6
src/emucore/tia/Playfield.hxx
View File

@ -18,11 +18,11 @@
#ifndef TIA_PLAYFIELD #ifndef TIA_PLAYFIELD
#define TIA_PLAYFIELD #define TIA_PLAYFIELD
#include "Serializable.hxx" class TIA;
#include "bspf.hxx" #include "bspf.hxx"
#include "TIAConstants.hxx" #include "TIAConstants.hxx"
#include "Serializable.hxx"
class TIA;
class Playfield : public Serializable class Playfield : public Serializable
{ {

2
src/emucore/tia/frame-manager/FrameLayoutDetector.hxx
View File

@ -18,8 +18,8 @@
#ifndef TIA_FRAME_LAYOUT_DETECTOR #ifndef TIA_FRAME_LAYOUT_DETECTOR
#define TIA_FRAME_LAYOUT_DETECTOR #define TIA_FRAME_LAYOUT_DETECTOR
#include "AbstractFrameManager.hxx"
#include "FrameLayout.hxx" #include "FrameLayout.hxx"
#include "AbstractFrameManager.hxx"
/** /**
* This frame manager performs frame layout autodetection. It counts the scanlines * This frame manager performs frame layout autodetection. It counts the scanlines

2
src/gui/CommandMenu.cxx
View File

@ -16,6 +16,8 @@
//============================================================================ //============================================================================
#include "Dialog.hxx" #include "Dialog.hxx"
#include "OSystem.hxx"
#include "Settings.hxx"
#include "CommandDialog.hxx" #include "CommandDialog.hxx"
#include "MinUICommandDialog.hxx" #include "MinUICommandDialog.hxx"
#include "CommandMenu.hxx" #include "CommandMenu.hxx"

1
src/gui/EditTextWidget.hxx
View File

@ -21,7 +21,6 @@
#include "Rect.hxx" #include "Rect.hxx"
#include "EditableWidget.hxx" #include "EditableWidget.hxx"
/* EditTextWidget */ /* EditTextWidget */
class EditTextWidget : public EditableWidget class EditTextWidget : public EditableWidget
{ {

1
src/gui/EmulationDialog.cxx
View File

@ -15,6 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "RadioButtonWidget.hxx" #include "RadioButtonWidget.hxx"

1
src/gui/GuiObject.hxx
View File

@ -27,7 +27,6 @@ class Widget;
class OSystem; class OSystem;
#include "Command.hxx" #include "Command.hxx"
#include "OSystem.hxx"
#include "Vec.hxx" #include "Vec.hxx"
using WidgetArray = vector<Widget*>; using WidgetArray = vector<Widget*>;

1
src/gui/InputDialog.hxx
View File

@ -62,7 +62,6 @@ class InputDialog : public Dialog
void addDevicePortTab(); void addDevicePortTab();
void addMouseTab(); void addMouseTab();
void handleMouseControlState(); void handleMouseControlState();
void handleCursorState(); void handleCursorState();
void updateDejitterAveraging(); void updateDejitterAveraging();

4
src/gui/LauncherDialog.hxx
View File

@ -32,6 +32,9 @@ class EditTextWidget;
class FileListWidget; class FileListWidget;
class RomInfoWidget; class RomInfoWidget;
class StaticTextWidget; class StaticTextWidget;
namespace Common {
struct Size;
}
namespace GUI { namespace GUI {
class MessageBox; class MessageBox;
} }
@ -41,7 +44,6 @@ namespace GUI {
#include "bspf.hxx" #include "bspf.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "FSNode.hxx" #include "FSNode.hxx"
#include "Stack.hxx"
class LauncherDialog : public Dialog class LauncherDialog : public Dialog
{ {

1
src/gui/Menu.cxx
View File

@ -19,6 +19,7 @@
#include "FrameBufferConstants.hxx" #include "FrameBufferConstants.hxx"
#include "OptionsDialog.hxx" #include "OptionsDialog.hxx"
#include "StellaSettingsDialog.hxx" #include "StellaSettingsDialog.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "Menu.hxx" #include "Menu.hxx"

1
src/gui/MessageDialog.cxx
View File

@ -15,6 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "EventHandler.hxx" #include "EventHandler.hxx"
#include "Font.hxx" #include "Font.hxx"

1
src/gui/MessageMenu.cxx
View File

@ -16,6 +16,7 @@
//============================================================================ //============================================================================
#include "Dialog.hxx" #include "Dialog.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "MessageDialog.hxx" #include "MessageDialog.hxx"
#include "MessageMenu.hxx" #include "MessageMenu.hxx"

1
src/gui/RomAuditDialog.cxx
View File

@ -25,6 +25,7 @@
#include "FSNode.hxx" #include "FSNode.hxx"
#include "Font.hxx" #include "Font.hxx"
#include "MessageBox.hxx" #include "MessageBox.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "MD5.hxx" #include "MD5.hxx"
#include "Props.hxx" #include "Props.hxx"

1
src/gui/SnapshotDialog.cxx
View File

@ -21,6 +21,7 @@
#include "FSNode.hxx" #include "FSNode.hxx"
#include "Font.hxx" #include "Font.hxx"
#include "LauncherDialog.hxx" #include "LauncherDialog.hxx"
#include "OSystem.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "SnapshotDialog.hxx" #include "SnapshotDialog.hxx"

6
src/gui/StellaSettingsDialog.cxx
View File

@ -15,6 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include "OSystem.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "EventHandler.hxx" #include "EventHandler.hxx"
#include "Launcher.hxx" #include "Launcher.hxx"
@ -88,6 +89,11 @@ StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& pa
addToFocusList(wid); addToFocusList(wid);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StellaSettingsDialog::~StellaSettingsDialog()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void StellaSettingsDialog::addUIOptions(WidgetArray& wid, int& xpos, int& ypos) void StellaSettingsDialog::addUIOptions(WidgetArray& wid, int& xpos, int& ypos)
{ {

4
src/gui/StellaSettingsDialog.hxx
View File

@ -23,7 +23,6 @@ class PopUpWidget;
#include "Props.hxx" #include "Props.hxx"
#include "Menu.hxx" #include "Menu.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "MessageBox.hxx"
#if defined(RETRON77) #if defined(RETRON77)
#include "R77HelpDialog.hxx" #include "R77HelpDialog.hxx"
@ -33,6 +32,7 @@ class PopUpWidget;
namespace GUI { namespace GUI {
class Font; class Font;
class MessageBox;
} }
class StellaSettingsDialog : public Dialog class StellaSettingsDialog : public Dialog
@ -40,7 +40,7 @@ class StellaSettingsDialog : public Dialog
public: public:
StellaSettingsDialog(OSystem& osystem, DialogContainer& parent, StellaSettingsDialog(OSystem& osystem, DialogContainer& parent,
int max_w, int max_h, Menu::AppMode mode); int max_w, int max_h, Menu::AppMode mode);
virtual ~StellaSettingsDialog() = default; virtual ~StellaSettingsDialog();
private: private:
void loadConfig() override; void loadConfig() override;

6
src/gui/Widget.hxx
View File

@ -23,14 +23,12 @@
class Dialog; class Dialog;
namespace GUI {
class Font;
}
#include <cassert> #include <cassert>
#include "bspf.hxx" #include "bspf.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "EventHandlerConstants.hxx"
#include "FrameBufferConstants.hxx"
#include "StellaKeys.hxx" #include "StellaKeys.hxx"
#include "GuiObject.hxx" #include "GuiObject.hxx"
#include "Font.hxx" #include "Font.hxx"

1
src/libretro/SoundLIBRETRO.hxx
View File

@ -27,7 +27,6 @@ class AudioSettings;
#include "bspf.hxx" #include "bspf.hxx"
#include "Sound.hxx" #include "Sound.hxx"
#include "AudioQueue.hxx"
/** /**
This class implements the sound API for LIBRTRO. This class implements the sound API for LIBRTRO.

1
src/libretro/StellaLIBRETRO.cxx
View File

@ -23,6 +23,7 @@
#include "AtariNTSC.hxx" #include "AtariNTSC.hxx"
#include "PaletteHandler.hxx" #include "PaletteHandler.hxx"
#include "AudioSettings.hxx" #include "AudioSettings.hxx"
#include "PaletteHandler.hxx"
#include "Serializer.hxx" #include "Serializer.hxx"
#include "StateManager.hxx" #include "StateManager.hxx"
#include "Switches.hxx" #include "Switches.hxx"