mirror of https://github.com/stella-emu/stella.git
Fix warnings from Clang 11.
Apparently d'tors in child classes should now be marked override rather than virtual (to match other methods). So we do that specifically now.
This commit is contained in:
parent
cc1af55a6b
commit
bc8b34e923
|
@ -24,7 +24,7 @@ class BankRomCheat : public Cheat
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BankRomCheat(OSystem& os, const string& name, const string& code);
|
BankRomCheat(OSystem& os, const string& name, const string& code);
|
||||||
virtual ~BankRomCheat() = default;
|
~BankRomCheat() override = default;
|
||||||
|
|
||||||
bool enable() override;
|
bool enable() override;
|
||||||
bool disable() override;
|
bool disable() override;
|
||||||
|
|
|
@ -36,7 +36,7 @@ class CheatCodeDialog : public Dialog
|
||||||
public:
|
public:
|
||||||
CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
|
CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
|
||||||
const GUI::Font& font);
|
const GUI::Font& font);
|
||||||
virtual ~CheatCodeDialog();
|
~CheatCodeDialog() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
|
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
|
||||||
|
|
|
@ -24,7 +24,7 @@ class CheetahCheat : public Cheat
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CheetahCheat(OSystem& os, const string& name, const string& code);
|
CheetahCheat(OSystem& os, const string& name, const string& code);
|
||||||
virtual ~CheetahCheat() = default;
|
~CheetahCheat() override = default;
|
||||||
|
|
||||||
bool enable() override;
|
bool enable() override;
|
||||||
bool disable() override;
|
bool disable() override;
|
||||||
|
|
|
@ -24,7 +24,7 @@ class RamCheat : public Cheat
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
RamCheat(OSystem& os, const string& name, const string& code);
|
RamCheat(OSystem& os, const string& name, const string& code);
|
||||||
virtual ~RamCheat() = default;
|
~RamCheat() override = default;
|
||||||
|
|
||||||
bool enable() override;
|
bool enable() override;
|
||||||
bool disable() override;
|
bool disable() override;
|
||||||
|
|
|
@ -220,7 +220,6 @@ void EventHandlerSDL2::pollEvent()
|
||||||
|
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
EventHandlerSDL2::JoystickSDL2::JoystickSDL2(int idx)
|
EventHandlerSDL2::JoystickSDL2::JoystickSDL2(int idx)
|
||||||
: myStick(nullptr)
|
|
||||||
{
|
{
|
||||||
ASSERT_MAIN_THREAD;
|
ASSERT_MAIN_THREAD;
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ class EventHandlerSDL2 : public EventHandler
|
||||||
Create a new SDL2 event handler object
|
Create a new SDL2 event handler object
|
||||||
*/
|
*/
|
||||||
explicit EventHandlerSDL2(OSystem& osystem);
|
explicit EventHandlerSDL2(OSystem& osystem);
|
||||||
virtual ~EventHandlerSDL2();
|
~EventHandlerSDL2() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/**
|
/**
|
||||||
|
@ -61,7 +61,7 @@ class EventHandlerSDL2 : public EventHandler
|
||||||
virtual ~JoystickSDL2();
|
virtual ~JoystickSDL2();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SDL_Joystick* myStick;
|
SDL_Joystick* myStick{nullptr};
|
||||||
};
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -35,7 +35,7 @@ class FBSurfaceSDL2 : public FBSurface
|
||||||
FBSurfaceSDL2(FrameBufferSDL2& buffer, uInt32 width, uInt32 height,
|
FBSurfaceSDL2(FrameBufferSDL2& buffer, uInt32 width, uInt32 height,
|
||||||
FrameBuffer::ScalingInterpolation interpolation,
|
FrameBuffer::ScalingInterpolation interpolation,
|
||||||
const uInt32* staticData);
|
const uInt32* staticData);
|
||||||
virtual ~FBSurfaceSDL2();
|
~FBSurfaceSDL2() override;
|
||||||
|
|
||||||
// Most of the surface drawing primitives are implemented in FBSurface;
|
// Most of the surface drawing primitives are implemented in FBSurface;
|
||||||
// the ones implemented here use SDL-specific code for extra performance
|
// the ones implemented here use SDL-specific code for extra performance
|
||||||
|
|
|
@ -39,7 +39,7 @@ class FrameBufferSDL2 : public FrameBuffer
|
||||||
Creates a new SDL2 framebuffer
|
Creates a new SDL2 framebuffer
|
||||||
*/
|
*/
|
||||||
explicit FrameBufferSDL2(OSystem& osystem);
|
explicit FrameBufferSDL2(OSystem& osystem);
|
||||||
virtual ~FrameBufferSDL2();
|
~FrameBufferSDL2() override;
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
// The following are derived from public methods in FrameBuffer.hxx
|
// The following are derived from public methods in FrameBuffer.hxx
|
||||||
|
|
|
@ -54,7 +54,6 @@ class PaletteHandler
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PaletteHandler(OSystem& system);
|
PaletteHandler(OSystem& system);
|
||||||
virtual ~PaletteHandler() = default;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Cycle through available palettes.
|
Cycle through available palettes.
|
||||||
|
|
|
@ -43,11 +43,7 @@ class SoundNull : public Sound
|
||||||
{
|
{
|
||||||
Logger::info("Sound disabled.\n");
|
Logger::info("Sound disabled.\n");
|
||||||
}
|
}
|
||||||
|
~SoundNull() override = default;
|
||||||
/**
|
|
||||||
Destructor
|
|
||||||
*/
|
|
||||||
virtual ~SoundNull() = default;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -48,7 +48,7 @@ class SoundSDL2 : public Sound
|
||||||
/**
|
/**
|
||||||
Destructor
|
Destructor
|
||||||
*/
|
*/
|
||||||
virtual ~SoundSDL2();
|
~SoundSDL2() override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -29,7 +29,7 @@ class BilinearBlitter : public Blitter {
|
||||||
|
|
||||||
BilinearBlitter(FrameBufferSDL2& fb, bool interpolate);
|
BilinearBlitter(FrameBufferSDL2& fb, bool interpolate);
|
||||||
|
|
||||||
virtual ~BilinearBlitter();
|
~BilinearBlitter() override;
|
||||||
|
|
||||||
virtual void reinitialize(
|
virtual void reinitialize(
|
||||||
SDL_Rect srcRect,
|
SDL_Rect srcRect,
|
||||||
|
|
|
@ -31,7 +31,7 @@ class QisBlitter : public Blitter {
|
||||||
|
|
||||||
static bool isSupported(FrameBufferSDL2 &fb);
|
static bool isSupported(FrameBufferSDL2 &fb);
|
||||||
|
|
||||||
virtual ~QisBlitter();
|
~QisBlitter() override;
|
||||||
|
|
||||||
virtual void reinitialize(
|
virtual void reinitialize(
|
||||||
SDL_Rect srcRect,
|
SDL_Rect srcRect,
|
||||||
|
|
|
@ -70,7 +70,7 @@ class CartDebug : public DebuggerSystem
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CartDebug(Debugger& dbg, Console& console, const OSystem& osystem);
|
CartDebug(Debugger& dbg, Console& console, const OSystem& osystem);
|
||||||
virtual ~CartDebug() = default;
|
~CartDebug() override = default;
|
||||||
|
|
||||||
const DebuggerState& getState() override;
|
const DebuggerState& getState() override;
|
||||||
const DebuggerState& getOldState() override { return myOldState; }
|
const DebuggerState& getOldState() override { return myOldState; }
|
||||||
|
|
|
@ -73,7 +73,7 @@ class Debugger : public DialogContainer
|
||||||
Create a new debugger parent object
|
Create a new debugger parent object
|
||||||
*/
|
*/
|
||||||
Debugger(OSystem& osystem, Console& console);
|
Debugger(OSystem& osystem, Console& console);
|
||||||
virtual ~Debugger();
|
~Debugger() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static const Int8 ANY_BANK = -1;
|
static const Int8 ANY_BANK = -1;
|
||||||
|
|
|
@ -31,7 +31,7 @@ class DebuggerState
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DebuggerState() = default;
|
DebuggerState() = default;
|
||||||
~DebuggerState() = default;
|
virtual ~DebuggerState() = default;
|
||||||
|
|
||||||
DebuggerState(const DebuggerState&) = default;
|
DebuggerState(const DebuggerState&) = default;
|
||||||
DebuggerState(DebuggerState&&) = delete;
|
DebuggerState(DebuggerState&&) = delete;
|
||||||
|
|
|
@ -28,7 +28,7 @@ class AmigaMouseWidget : public PointingDeviceWidget
|
||||||
AmigaMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
AmigaMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
|
|
||||||
virtual ~AmigaMouseWidget() = default;
|
~AmigaMouseWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b10, 0b11, 0b01 };
|
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b10, 0b11, 0b01 };
|
||||||
|
|
|
@ -27,8 +27,7 @@ class AtariMouseWidget : public PointingDeviceWidget
|
||||||
public:
|
public:
|
||||||
AtariMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
AtariMouseWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
|
~AtariMouseWidget() override = default;
|
||||||
virtual ~AtariMouseWidget() = default;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b01, 0b11, 0b10 };
|
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b01, 0b11, 0b10 };
|
||||||
|
|
|
@ -27,7 +27,7 @@ class AtariVoxWidget : public FlashWidget
|
||||||
public:
|
public:
|
||||||
AtariVoxWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
AtariVoxWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~AtariVoxWidget() = default;
|
~AtariVoxWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void eraseCurrent() override;
|
void eraseCurrent() override;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class AudioWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
AudioWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
AudioWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~AudioWidget() = default;
|
~AudioWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// ID's for the various widgets
|
// ID's for the various widgets
|
||||||
|
|
|
@ -26,7 +26,7 @@ class BoosterWidget : public ControllerWidget
|
||||||
public:
|
public:
|
||||||
BoosterWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
BoosterWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~BoosterWidget() = default;
|
~BoosterWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire, kJBooster, kJTrigger };
|
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire, kJBooster, kJTrigger };
|
||||||
|
|
|
@ -29,7 +29,7 @@ class Cartridge0840Widget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
Cartridge0840& cart);
|
Cartridge0840& cart);
|
||||||
virtual ~Cartridge0840Widget() = default;
|
~Cartridge0840Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Fred X. Quimby"; }
|
string manufacturer() override { return "Fred X. Quimby"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class Cartridge2KWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
Cartridge2K& cart);
|
Cartridge2K& cart);
|
||||||
virtual ~Cartridge2KWidget() = default;
|
~Cartridge2KWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Atari"; }
|
string manufacturer() override { return "Atari"; }
|
||||||
|
|
|
@ -32,7 +32,7 @@ class Cartridge3EPlusWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
Cartridge3EPlus& cart);
|
Cartridge3EPlus& cart);
|
||||||
virtual ~Cartridge3EPlusWidget() = default;
|
~Cartridge3EPlusWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Thomas Jentzsch"; }
|
string manufacturer() override { return "Thomas Jentzsch"; }
|
||||||
|
|
|
@ -31,7 +31,7 @@ class Cartridge3EWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
Cartridge3E& cart);
|
Cartridge3E& cart);
|
||||||
virtual ~Cartridge3EWidget() = default;
|
~Cartridge3EWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -29,7 +29,7 @@ class Cartridge3FWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
Cartridge3F& cart);
|
Cartridge3F& cart);
|
||||||
virtual ~Cartridge3FWidget() = default;
|
~Cartridge3FWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "TigerVision"; }
|
string manufacturer() override { return "TigerVision"; }
|
||||||
|
|
|
@ -30,7 +30,7 @@ class Cartridge4A50Widget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
Cartridge4A50& cart);
|
Cartridge4A50& cart);
|
||||||
virtual ~Cartridge4A50Widget() = default;
|
~Cartridge4A50Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Cartridge4A50& myCart;
|
Cartridge4A50& myCart;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class Cartridge4KSCWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
Cartridge4KSC& cart);
|
Cartridge4KSC& cart);
|
||||||
virtual ~Cartridge4KSCWidget() = default;
|
~Cartridge4KSCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "homebrew intermediate format"; }
|
string manufacturer() override { return "homebrew intermediate format"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class Cartridge4KWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
Cartridge4K& cart);
|
Cartridge4K& cart);
|
||||||
virtual ~Cartridge4KWidget() = default;
|
~Cartridge4KWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Atari"; }
|
string manufacturer() override { return "Atari"; }
|
||||||
|
|
|
@ -30,7 +30,7 @@ class CartridgeARWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeAR& cart);
|
CartridgeAR& cart);
|
||||||
virtual ~CartridgeARWidget() = default;
|
~CartridgeARWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CartridgeAR& myCart;
|
CartridgeAR& myCart;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeBFSCWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeBFSC& cart);
|
CartridgeBFSC& cart);
|
||||||
virtual ~CartridgeBFSCWidget() = default;
|
~CartridgeBFSCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "CPUWIZ"; }
|
string manufacturer() override { return "CPUWIZ"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeBFWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeBF& cart);
|
CartridgeBF& cart);
|
||||||
virtual ~CartridgeBFWidget() = default;
|
~CartridgeBFWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "CPUWIZ"; }
|
string manufacturer() override { return "CPUWIZ"; }
|
||||||
|
|
|
@ -32,7 +32,7 @@ class CartridgeBUSWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeBUS& cart);
|
CartridgeBUS& cart);
|
||||||
virtual ~CartridgeBUSWidget() = default;
|
~CartridgeBUSWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct CartState {
|
struct CartState {
|
||||||
|
|
|
@ -28,7 +28,7 @@ class CartridgeCDFInfoWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeCDF& cart);
|
CartridgeCDF& cart);
|
||||||
virtual ~CartridgeCDFInfoWidget() = default;
|
~CartridgeCDFInfoWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static string describeCDFVersion(CartridgeCDF::CDFSubtype subtype);
|
static string describeCDFVersion(CartridgeCDF::CDFSubtype subtype);
|
||||||
|
|
|
@ -33,7 +33,7 @@ class CartridgeCDFWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeCDF& cart);
|
CartridgeCDF& cart);
|
||||||
virtual ~CartridgeCDFWidget() = default;
|
~CartridgeCDFWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct CartState {
|
struct CartState {
|
||||||
|
|
|
@ -34,7 +34,7 @@ class CartridgeCMWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeCM& cart);
|
CartridgeCM& cart);
|
||||||
virtual ~CartridgeCMWidget() = default;
|
~CartridgeCMWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct CartState {
|
struct CartState {
|
||||||
|
|
|
@ -30,7 +30,7 @@ class CartridgeCTYWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeCTY& cart);
|
CartridgeCTY& cart);
|
||||||
virtual ~CartridgeCTYWidget() = default;
|
~CartridgeCTYWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CartridgeCTY& myCart;
|
CartridgeCTY& myCart;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeCVWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeCV& cart);
|
CartridgeCV& cart);
|
||||||
virtual ~CartridgeCVWidget() = default;
|
~CartridgeCVWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "CommaVid"; }
|
string manufacturer() override { return "CommaVid"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeDFSCWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeDFSC& cart);
|
CartridgeDFSC& cart);
|
||||||
virtual ~CartridgeDFSCWidget() = default;
|
~CartridgeDFSCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "CPUWIZ"; }
|
string manufacturer() override { return "CPUWIZ"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeDFWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeDF& cart);
|
CartridgeDF& cart);
|
||||||
virtual ~CartridgeDFWidget() = default;
|
~CartridgeDFWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "CPUWIZ"; }
|
string manufacturer() override { return "CPUWIZ"; }
|
||||||
|
|
|
@ -32,7 +32,7 @@ class CartridgeDPCPlusWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeDPCPlus& cart);
|
CartridgeDPCPlus& cart);
|
||||||
virtual ~CartridgeDPCPlusWidget() = default;
|
~CartridgeDPCPlusWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct CartState {
|
struct CartState {
|
||||||
|
|
|
@ -31,7 +31,7 @@ class CartridgeDPCWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeDPC& cart);
|
CartridgeDPC& cart);
|
||||||
virtual ~CartridgeDPCWidget() = default;
|
~CartridgeDPCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct CartState {
|
struct CartState {
|
||||||
|
|
|
@ -35,7 +35,7 @@ class CartDebugWidget : public Widget, public CommandSender
|
||||||
CartDebugWidget(GuiObject* boss, const GUI::Font& lfont,
|
CartDebugWidget(GuiObject* boss, const GUI::Font& lfont,
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~CartDebugWidget() = default;
|
~CartDebugWidget() override = default;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
int addBaseInformation(size_t bytes, const string& manufacturer,
|
int addBaseInformation(size_t bytes, const string& manufacturer,
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeE0Widget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeE0& cart);
|
CartridgeE0& cart);
|
||||||
virtual ~CartridgeE0Widget() = default;
|
~CartridgeE0Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Parker Brothers"; }
|
string manufacturer() override { return "Parker Brothers"; }
|
||||||
|
|
|
@ -27,7 +27,7 @@ class CartridgeE78KWidget : public CartridgeMNetworkWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeMNetwork& cart);
|
CartridgeMNetwork& cart);
|
||||||
virtual ~CartridgeE78KWidget() = default;
|
~CartridgeE78KWidget() override = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
const char* getSpotLower(int idx) override;
|
const char* getSpotLower(int idx) override;
|
||||||
|
|
|
@ -27,7 +27,7 @@ class CartridgeE7Widget : public CartridgeMNetworkWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeMNetwork& cart);
|
CartridgeMNetwork& cart);
|
||||||
virtual ~CartridgeE7Widget() = default;
|
~CartridgeE7Widget() override = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
const char* getSpotLower(int idx) override;
|
const char* getSpotLower(int idx) override;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeEFSCWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeEFSC& cart);
|
CartridgeEFSC& cart);
|
||||||
virtual ~CartridgeEFSCWidget() = default;
|
~CartridgeEFSCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Paul Slocum / Homestar Runner"; }
|
string manufacturer() override { return "Paul Slocum / Homestar Runner"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeEFWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeEF& cart);
|
CartridgeEF& cart);
|
||||||
virtual ~CartridgeEFWidget() = default;
|
~CartridgeEFWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Paul Slocum / Homestar Runner"; }
|
string manufacturer() override { return "Paul Slocum / Homestar Runner"; }
|
||||||
|
|
|
@ -35,7 +35,7 @@ class CartridgeEnhancedWidget : public CartDebugWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeEnhanced& cart);
|
CartridgeEnhanced& cart);
|
||||||
virtual ~CartridgeEnhancedWidget() = default;
|
~CartridgeEnhancedWidget() override = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
int initialize();
|
int initialize();
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeF0Widget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeF0& cart);
|
CartridgeF0& cart);
|
||||||
virtual ~CartridgeF0Widget() = default;
|
~CartridgeF0Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Dynacom Megaboy"; }
|
string manufacturer() override { return "Dynacom Megaboy"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeF4SCWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeF4SC& cart);
|
CartridgeF4SC& cart);
|
||||||
virtual ~CartridgeF4SCWidget() = default;
|
~CartridgeF4SCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Atari"; }
|
string manufacturer() override { return "Atari"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeF4Widget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeF4& cart);
|
CartridgeF4& cart);
|
||||||
virtual ~CartridgeF4Widget() = default;
|
~CartridgeF4Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Atari"; }
|
string manufacturer() override { return "Atari"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeF6SCWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeF6SC& cart);
|
CartridgeF6SC& cart);
|
||||||
virtual ~CartridgeF6SCWidget() = default;
|
~CartridgeF6SCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Atari"; }
|
string manufacturer() override { return "Atari"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeF6Widget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeF6& cart);
|
CartridgeF6& cart);
|
||||||
virtual ~CartridgeF6Widget() = default;
|
~CartridgeF6Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Atari"; }
|
string manufacturer() override { return "Atari"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeF8SCWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeF8SC& cart);
|
CartridgeF8SC& cart);
|
||||||
virtual ~CartridgeF8SCWidget() = default;
|
~CartridgeF8SCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Atari"; }
|
string manufacturer() override { return "Atari"; }
|
||||||
|
|
|
@ -30,7 +30,7 @@ class CartridgeF8Widget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeF8& cart);
|
CartridgeF8& cart);
|
||||||
virtual ~CartridgeF8Widget() = default;
|
~CartridgeF8Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Atari"; }
|
string manufacturer() override { return "Atari"; }
|
||||||
|
|
|
@ -30,7 +30,7 @@ class CartridgeFA2Widget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeFA2& cart);
|
CartridgeFA2& cart);
|
||||||
virtual ~CartridgeFA2Widget() = default;
|
~CartridgeFA2Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CartridgeFA2& myCartFA2;
|
CartridgeFA2& myCartFA2;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeFAWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeFA& cart);
|
CartridgeFA& cart);
|
||||||
virtual ~CartridgeFAWidget() = default;
|
~CartridgeFAWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "CBS"; }
|
string manufacturer() override { return "CBS"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeFCWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeFC& cart);
|
CartridgeFC& cart);
|
||||||
virtual ~CartridgeFCWidget() = default;
|
~CartridgeFCWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Amiga Corp."; }
|
string manufacturer() override { return "Amiga Corp."; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeFEWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeFE& cart);
|
CartridgeFE& cart);
|
||||||
virtual ~CartridgeFEWidget() = default;
|
~CartridgeFEWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Activision"; }
|
string manufacturer() override { return "Activision"; }
|
||||||
|
|
|
@ -30,7 +30,7 @@ class CartridgeMDMWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeMDM& cart);
|
CartridgeMDM& cart);
|
||||||
virtual ~CartridgeMDMWidget() = default;
|
~CartridgeMDMWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Edwin Blink"; }
|
string manufacturer() override { return "Edwin Blink"; }
|
||||||
|
|
|
@ -31,7 +31,7 @@ class CartridgeMNetworkWidget : public CartDebugWidget
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
//CartridgeE7& cart);
|
//CartridgeE7& cart);
|
||||||
CartridgeMNetwork& cart);
|
CartridgeMNetwork& cart);
|
||||||
virtual ~CartridgeMNetworkWidget() = default;
|
~CartridgeMNetworkWidget() override = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
//CartridgeE7& myCart;
|
//CartridgeE7& myCart;
|
||||||
|
|
|
@ -34,7 +34,7 @@ class CartRamWidget : public Widget, public CommandSender
|
||||||
CartRamWidget(GuiObject* boss, const GUI::Font& lfont,
|
CartRamWidget(GuiObject* boss, const GUI::Font& lfont,
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h, CartDebugWidget& cartDebug);
|
int x, int y, int w, int h, CartDebugWidget& cartDebug);
|
||||||
virtual ~CartRamWidget() = default;
|
~CartRamWidget() override = default;
|
||||||
|
|
||||||
void loadConfig() override;
|
void loadConfig() override;
|
||||||
void setOpsWidget(DataGridOpsWidget* w);
|
void setOpsWidget(DataGridOpsWidget* w);
|
||||||
|
@ -66,7 +66,7 @@ class CartRamWidget : public Widget, public CommandSender
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartDebugWidget& cartDebug);
|
CartDebugWidget& cartDebug);
|
||||||
virtual ~InternalRamWidget() = default;
|
~InternalRamWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uInt8 getValue(int addr) const override;
|
uInt8 getValue(int addr) const override;
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeSBWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeSB& cart);
|
CartridgeSB& cart);
|
||||||
virtual ~CartridgeSBWidget() = default;
|
~CartridgeSBWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Fred X. Quimby"; }
|
string manufacturer() override { return "Fred X. Quimby"; }
|
||||||
|
|
|
@ -30,7 +30,7 @@ class CartridgeTVBoyWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeTVBoy& cart);
|
CartridgeTVBoy& cart);
|
||||||
virtual ~CartridgeTVBoyWidget() = default;
|
~CartridgeTVBoyWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "Akor"; }
|
string manufacturer() override { return "Akor"; }
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeUAWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeUA& cart, bool swapHotspots);
|
CartridgeUA& cart, bool swapHotspots);
|
||||||
virtual ~CartridgeUAWidget() = default;
|
~CartridgeUAWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "UA Limited"; }
|
string manufacturer() override { return "UA Limited"; }
|
||||||
|
|
|
@ -29,9 +29,9 @@ class CartridgeWDWidget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeWD& cart);
|
CartridgeWD& cart);
|
||||||
virtual ~CartridgeWDWidget() = default;
|
~CartridgeWDWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CartridgeWD& myCartWD;
|
CartridgeWD& myCartWD;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -29,7 +29,7 @@ class CartridgeX07Widget : public CartridgeEnhancedWidget
|
||||||
const GUI::Font& nfont,
|
const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
CartridgeX07& cart);
|
CartridgeX07& cart);
|
||||||
virtual ~CartridgeX07Widget() = default;
|
~CartridgeX07Widget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
string manufacturer() override { return "AtariAge / John Payson / Fred Quimby"; }
|
string manufacturer() override { return "AtariAge / John Payson / Fred Quimby"; }
|
||||||
|
|
|
@ -40,7 +40,7 @@ class ControllerWidget : public Widget, public CommandSender, public ControllerL
|
||||||
_w = 18 * font.getMaxCharWidth();
|
_w = 18 * font.getMaxCharWidth();
|
||||||
_h = 8 * font.getLineHeight();
|
_h = 8 * font.getLineHeight();
|
||||||
}
|
}
|
||||||
virtual ~ControllerWidget() = default;
|
~ControllerWidget() override = default;
|
||||||
|
|
||||||
virtual void loadConfig() override { }
|
virtual void loadConfig() override { }
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ class CpuWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
CpuWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
CpuWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int max_w);
|
int x, int y, int max_w);
|
||||||
virtual ~CpuWidget() = default;
|
~CpuWidget() override = default;
|
||||||
|
|
||||||
void setOpsWidget(DataGridOpsWidget* w);
|
void setOpsWidget(DataGridOpsWidget* w);
|
||||||
void loadConfig() override;
|
void loadConfig() override;
|
||||||
|
|
|
@ -36,7 +36,7 @@ class DataGridOpsWidget : public Widget, public CommandSender
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DataGridOpsWidget(GuiObject* boss, const GUI::Font& font, int x, int y);
|
DataGridOpsWidget(GuiObject* boss, const GUI::Font& font, int x, int y);
|
||||||
virtual ~DataGridOpsWidget() = default;
|
~DataGridOpsWidget() override = default;
|
||||||
|
|
||||||
void setTarget(CommandReceiver* target);
|
void setTarget(CommandReceiver* target);
|
||||||
void setEnabled(bool e);
|
void setEnabled(bool e);
|
||||||
|
|
|
@ -45,7 +45,7 @@ class DataGridWidget : public EditableWidget
|
||||||
int colchars, int bits,
|
int colchars, int bits,
|
||||||
Common::Base::Fmt format = Common::Base::Fmt::_DEFAULT,
|
Common::Base::Fmt format = Common::Base::Fmt::_DEFAULT,
|
||||||
bool useScrollbar = false);
|
bool useScrollbar = false);
|
||||||
virtual ~DataGridWidget() = default;
|
~DataGridWidget() override = default;
|
||||||
|
|
||||||
void setList(const IntArray& alist, const IntArray& vlist,
|
void setList(const IntArray& alist, const IntArray& vlist,
|
||||||
const BoolArray& changed);
|
const BoolArray& changed);
|
||||||
|
|
|
@ -57,7 +57,7 @@ class DebuggerDialog : public Dialog
|
||||||
|
|
||||||
DebuggerDialog(OSystem& osystem, DialogContainer& parent,
|
DebuggerDialog(OSystem& osystem, DialogContainer& parent,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~DebuggerDialog();
|
~DebuggerDialog() override;
|
||||||
|
|
||||||
const GUI::Font& lfont() const { return *myLFont; }
|
const GUI::Font& lfont() const { return *myLFont; }
|
||||||
const GUI::Font& nfont() const { return *myNFont; }
|
const GUI::Font& nfont() const { return *myNFont; }
|
||||||
|
|
|
@ -28,7 +28,7 @@ class DelayQueueWidget : public Widget
|
||||||
const GUI::Font& font,
|
const GUI::Font& font,
|
||||||
int x, int y
|
int x, int y
|
||||||
);
|
);
|
||||||
virtual ~DelayQueueWidget() = default;
|
~DelayQueueWidget() override = default;
|
||||||
|
|
||||||
void loadConfig() override;
|
void loadConfig() override;
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ class DrivingWidget : public ControllerWidget
|
||||||
public:
|
public:
|
||||||
DrivingWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
DrivingWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~DrivingWidget() = default;
|
~DrivingWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -28,7 +28,7 @@ class FlashWidget : public ControllerWidget
|
||||||
public:
|
public:
|
||||||
FlashWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
FlashWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~FlashWidget() = default;
|
~FlashWidget() override = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void init(GuiObject* boss, const GUI::Font& font, int x, int y);
|
void init(GuiObject* boss, const GUI::Font& font, int x, int y);
|
||||||
|
|
|
@ -26,7 +26,7 @@ class GenesisWidget : public ControllerWidget
|
||||||
public:
|
public:
|
||||||
GenesisWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
GenesisWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~GenesisWidget() = default;
|
~GenesisWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJBbtn, kJCbtn };
|
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJBbtn, kJCbtn };
|
||||||
|
|
|
@ -26,7 +26,7 @@ class JoystickWidget : public ControllerWidget
|
||||||
public:
|
public:
|
||||||
JoystickWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
JoystickWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~JoystickWidget() = default;
|
~JoystickWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire };
|
enum { kJUp = 0, kJDown, kJLeft, kJRight, kJFire };
|
||||||
|
|
|
@ -26,7 +26,7 @@ class KeyboardWidget : public ControllerWidget
|
||||||
public:
|
public:
|
||||||
KeyboardWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
KeyboardWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~KeyboardWidget() = default;
|
~KeyboardWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::array<CheckboxWidget*, 12> myBox{nullptr};
|
std::array<CheckboxWidget*, 12> myBox{nullptr};
|
||||||
|
|
|
@ -44,7 +44,7 @@ class NullControlWidget : public ControllerWidget
|
||||||
TextAlign::Center);
|
TextAlign::Center);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~NullControlWidget() = default;
|
~NullControlWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Following constructors and assignment operators not supported
|
// Following constructors and assignment operators not supported
|
||||||
|
|
|
@ -27,7 +27,7 @@ class PaddleWidget : public ControllerWidget
|
||||||
public:
|
public:
|
||||||
PaddleWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
PaddleWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~PaddleWidget() = default;
|
~PaddleWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum { kP0Changed = 'P0ch', kP1Changed = 'P1ch',
|
enum { kP0Changed = 'P0ch', kP1Changed = 'P1ch',
|
||||||
|
|
|
@ -28,8 +28,7 @@ class PointingDeviceWidget : public ControllerWidget
|
||||||
public:
|
public:
|
||||||
PointingDeviceWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
PointingDeviceWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
|
~PointingDeviceWidget() override = default;
|
||||||
virtual ~PointingDeviceWidget() = default;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -39,7 +39,7 @@ class PromptWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
PromptWidget(GuiObject* boss, const GUI::Font& font,
|
PromptWidget(GuiObject* boss, const GUI::Font& font,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~PromptWidget() = default;
|
~PromptWidget() override = default;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ATTRIBUTE_FMT_PRINTF int printf(const char* format, ...);
|
ATTRIBUTE_FMT_PRINTF int printf(const char* format, ...);
|
||||||
|
|
|
@ -35,7 +35,7 @@ class RamWidget : public Widget, public CommandSender
|
||||||
RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h,
|
int x, int y, int w, int h,
|
||||||
uInt32 ramsize, uInt32 numrows, uInt32 pagesize);
|
uInt32 ramsize, uInt32 numrows, uInt32 pagesize);
|
||||||
virtual ~RamWidget();
|
~RamWidget() override;
|
||||||
|
|
||||||
void loadConfig() override;
|
void loadConfig() override;
|
||||||
void setOpsWidget(DataGridOpsWidget* w);
|
void setOpsWidget(DataGridOpsWidget* w);
|
||||||
|
|
|
@ -34,7 +34,7 @@ class RiotRamWidget : public RamWidget
|
||||||
public:
|
public:
|
||||||
RiotRamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
RiotRamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int w);
|
int x, int y, int w);
|
||||||
virtual ~RiotRamWidget() = default;
|
~RiotRamWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uInt8 getValue(int addr) const override;
|
uInt8 getValue(int addr) const override;
|
||||||
|
|
|
@ -34,7 +34,7 @@ class RiotWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
RiotWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
RiotWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~RiotWidget() = default;
|
~RiotWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ControllerWidget* addControlWidget(GuiObject* boss, const GUI::Font& font,
|
ControllerWidget* addControlWidget(GuiObject* boss, const GUI::Font& font,
|
||||||
|
|
|
@ -32,7 +32,7 @@ class RomListSettings : public Dialog, public CommandSender
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
RomListSettings(GuiObject* boss, const GUI::Font& font);
|
RomListSettings(GuiObject* boss, const GUI::Font& font);
|
||||||
virtual ~RomListSettings() = default;
|
~RomListSettings() override = default;
|
||||||
|
|
||||||
/** Show dialog onscreen at the specified coordinates
|
/** Show dialog onscreen at the specified coordinates
|
||||||
('data' will be the currently selected line number in RomListWidget) */
|
('data' will be the currently selected line number in RomListWidget) */
|
||||||
|
|
|
@ -47,7 +47,7 @@ class RomListWidget : public EditableWidget
|
||||||
public:
|
public:
|
||||||
RomListWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
RomListWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~RomListWidget() = default;
|
~RomListWidget() override = default;
|
||||||
|
|
||||||
void setList(const CartDebug::Disassembly& disasm);
|
void setList(const CartDebug::Disassembly& disasm);
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ class RomWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
RomWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
RomWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~RomWidget() = default;
|
~RomWidget() override = default;
|
||||||
|
|
||||||
void invalidate(bool forcereload = true)
|
void invalidate(bool forcereload = true)
|
||||||
{ myListIsDirty = true; if(forcereload) loadConfig(); }
|
{ myListIsDirty = true; if(forcereload) loadConfig(); }
|
||||||
|
|
|
@ -27,7 +27,7 @@ class SaveKeyWidget : public FlashWidget
|
||||||
public:
|
public:
|
||||||
SaveKeyWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
SaveKeyWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
virtual ~SaveKeyWidget() = default;
|
~SaveKeyWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void eraseCurrent() override;
|
void eraseCurrent() override;
|
||||||
|
|
|
@ -31,7 +31,7 @@ class TiaInfoWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
TiaInfoWidget(GuiObject *boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
TiaInfoWidget(GuiObject *boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int max_w);
|
int x, int y, int max_w);
|
||||||
virtual ~TiaInfoWidget() = default;
|
~TiaInfoWidget() override = default;
|
||||||
|
|
||||||
void loadConfig() override;
|
void loadConfig() override;
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ class TiaOutputWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
TiaOutputWidget(GuiObject *boss, const GUI::Font& font,
|
TiaOutputWidget(GuiObject *boss, const GUI::Font& font,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~TiaOutputWidget() = default;
|
~TiaOutputWidget() override = default;
|
||||||
|
|
||||||
void loadConfig() override;
|
void loadConfig() override;
|
||||||
void setZoomWidget(TiaZoomWidget* w) { myZoom = w; }
|
void setZoomWidget(TiaZoomWidget* w) { myZoom = w; }
|
||||||
|
|
|
@ -36,7 +36,7 @@ class TiaWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
TiaWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
TiaWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~TiaWidget() = default;
|
~TiaWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DataGridWidget* myColorRegs{nullptr};
|
DataGridWidget* myColorRegs{nullptr};
|
||||||
|
|
|
@ -29,7 +29,7 @@ class TiaZoomWidget : public Widget, public CommandSender
|
||||||
public:
|
public:
|
||||||
TiaZoomWidget(GuiObject *boss, const GUI::Font& font,
|
TiaZoomWidget(GuiObject *boss, const GUI::Font& font,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
virtual ~TiaZoomWidget() = default;
|
~TiaZoomWidget() override = default;
|
||||||
|
|
||||||
void loadConfig() override;
|
void loadConfig() override;
|
||||||
void setPos(int x, int y);
|
void setPos(int x, int y);
|
||||||
|
|
|
@ -26,7 +26,7 @@ class ToggleBitWidget : public ToggleWidget
|
||||||
public:
|
public:
|
||||||
ToggleBitWidget(GuiObject* boss, const GUI::Font& font,
|
ToggleBitWidget(GuiObject* boss, const GUI::Font& font,
|
||||||
int x, int y, int cols, int rows, int colchars = 1);
|
int x, int y, int cols, int rows, int colchars = 1);
|
||||||
virtual ~ToggleBitWidget() = default;
|
~ToggleBitWidget() override = default;
|
||||||
|
|
||||||
void setList(const StringList& off, const StringList& on);
|
void setList(const StringList& off, const StringList& on);
|
||||||
void setState(const BoolArray& state, const BoolArray& changed);
|
void setState(const BoolArray& state, const BoolArray& changed);
|
||||||
|
|
|
@ -26,7 +26,7 @@ class TogglePixelWidget : public ToggleWidget
|
||||||
public:
|
public:
|
||||||
TogglePixelWidget(GuiObject* boss, const GUI::Font& font,
|
TogglePixelWidget(GuiObject* boss, const GUI::Font& font,
|
||||||
int x, int y, int cols, int rows);
|
int x, int y, int cols, int rows);
|
||||||
virtual ~TogglePixelWidget() = default;
|
~TogglePixelWidget() override = default;
|
||||||
|
|
||||||
void setColor(ColorId color) { _pixelColor = color; }
|
void setColor(ColorId color) { _pixelColor = color; }
|
||||||
void clearColor() { _pixelColor = kDlgColor; }
|
void clearColor() { _pixelColor = kDlgColor; }
|
||||||
|
|
|
@ -35,7 +35,7 @@ class ToggleWidget : public Widget, public CommandSender
|
||||||
ToggleWidget(GuiObject* boss, const GUI::Font& font,
|
ToggleWidget(GuiObject* boss, const GUI::Font& font,
|
||||||
int x, int y, int cols, int rows,
|
int x, int y, int cols, int rows,
|
||||||
int clicksToChange = 2);
|
int clicksToChange = 2);
|
||||||
virtual ~ToggleWidget() = default;
|
~ToggleWidget() override = default;
|
||||||
|
|
||||||
const BoolArray& getState() { return _stateList; }
|
const BoolArray& getState() { return _stateList; }
|
||||||
bool getSelectedState() const { return _stateList[_selectedItem]; }
|
bool getSelectedState() const { return _stateList[_selectedItem]; }
|
||||||
|
|
|
@ -28,7 +28,7 @@ class TrakBallWidget : public PointingDeviceWidget
|
||||||
TrakBallWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
TrakBallWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
|
||||||
Controller& controller);
|
Controller& controller);
|
||||||
|
|
||||||
virtual ~TrakBallWidget() = default;
|
~TrakBallWidget() override = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b10, 0b01, 0b11 };
|
const std::array<uInt8, 4> myGrayCodeTable = { 0b00, 0b10, 0b01, 0b11 };
|
||||||
|
|
|
@ -33,7 +33,7 @@ class AmigaMouse : public PointingDevice
|
||||||
AmigaMouse(Jack jack, const Event& event, const System& system)
|
AmigaMouse(Jack jack, const Event& event, const System& system)
|
||||||
: PointingDevice(jack, event, system, Controller::Type::AmigaMouse,
|
: PointingDevice(jack, event, system, Controller::Type::AmigaMouse,
|
||||||
trackballSensitivity) { }
|
trackballSensitivity) { }
|
||||||
virtual ~AmigaMouse() = default;
|
~AmigaMouse() override = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns the name of this controller.
|
Returns the name of this controller.
|
||||||
|
|
|
@ -33,7 +33,7 @@ class AtariMouse : public PointingDevice
|
||||||
AtariMouse(Jack jack, const Event& event, const System& system)
|
AtariMouse(Jack jack, const Event& event, const System& system)
|
||||||
: PointingDevice(jack, event, system, Controller::Type::AtariMouse,
|
: PointingDevice(jack, event, system, Controller::Type::AtariMouse,
|
||||||
trackballSensitivity) { }
|
trackballSensitivity) { }
|
||||||
virtual ~AtariMouse() = default;
|
~AtariMouse() override = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns the name of this controller.
|
Returns the name of this controller.
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue