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

renamed CartridgeEnhancedWidget class

This commit is contained in:
thrust26 2020-04-21 12:40:19 +02:00
parent 20c6998e71
commit 8e3e0479b1
57 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/debugger/gui/Cart0840Widget.cxx
View File

@ -22,7 +22,7 @@
Cartridge0840Widget::Cartridge0840Widget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, Cartridge0840& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
myHotspotDelta = 0x40;
initialize();
@ -34,7 +34,7 @@ string Cartridge0840Widget::description()
ostringstream info;
info << "0840 ECONObanking, two 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/Cart0840Widget.hxx
View File

@ -22,7 +22,7 @@ class Cartridge0840;
#include "CartEnhancedWidget.hxx"
class Cartridge0840Widget : public CartEnhancedWidget
class Cartridge0840Widget : public CartridgeEnhancedWidget
{
public:
Cartridge0840Widget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/Cart2KWidget.cxx
View File

@ -22,7 +22,7 @@
Cartridge2KWidget::Cartridge2KWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, Cartridge2K& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string Cartridge2KWidget::description()
ostringstream info;
info << "Standard 2K cartridge, non-bankswitched\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/Cart2KWidget.hxx
View File

@ -22,7 +22,7 @@ class Cartridge2K;
#include "CartEnhancedWidget.hxx"
class Cartridge2KWidget : public CartEnhancedWidget
class Cartridge2KWidget : public CartridgeEnhancedWidget
{
public:
Cartridge2KWidget(GuiObject* boss, const GUI::Font& lfont,

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

@ -22,7 +22,7 @@
Cartridge3FWidget::Cartridge3FWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, Cartridge3F& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
myHotspotDelta = 0;
initialize();

2
src/debugger/gui/Cart3FWidget.hxx
View File

@ -22,7 +22,7 @@ class Cartridge3F;
#include "CartEnhancedWidget.hxx"
class Cartridge3FWidget : public CartEnhancedWidget
class Cartridge3FWidget : public CartridgeEnhancedWidget
{
public:
Cartridge3FWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/Cart4KSCWidget.cxx
View File

@ -22,7 +22,7 @@
Cartridge4KSCWidget::Cartridge4KSCWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, Cartridge4KSC& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string Cartridge4KSCWidget::description()
ostringstream info;
info << "4KSC cartridge, non-bankswitched\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/Cart4KSCWidget.hxx
View File

@ -22,7 +22,7 @@ class Cartridge4KSC;
#include "CartEnhancedWidget.hxx"
class Cartridge4KSCWidget : public CartEnhancedWidget
class Cartridge4KSCWidget : public CartridgeEnhancedWidget
{
public:
Cartridge4KSCWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/Cart4KWidget.cxx
View File

@ -22,7 +22,7 @@
Cartridge4KWidget::Cartridge4KWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, Cartridge4K& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
@ -43,7 +43,7 @@ string Cartridge4KWidget::description()
ostringstream info;
info << "Standard 4K cartridge, non-bankswitched\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/Cart4KWidget.hxx
View File

@ -22,7 +22,7 @@ class Cartridge4K;
#include "CartEnhanced.hxx"
class Cartridge4KWidget : public CartEnhancedWidget
class Cartridge4KWidget : public CartridgeEnhancedWidget
{
public:
Cartridge4KWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartBFSCWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeBFSCWidget::CartridgeBFSCWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeBFSC& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeBFSCWidget::description()
ostringstream info;
info << "256K BFSC + RAM, 64 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartBFSCWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeBFSC;
#include "CartEnhancedWidget.hxx"
class CartridgeBFSCWidget : public CartEnhancedWidget
class CartridgeBFSCWidget : public CartridgeEnhancedWidget
{
public:
CartridgeBFSCWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartBFWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeBFWidget::CartridgeBFWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeBF& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeBFWidget::description()
ostringstream info;
info << "256K BF cartridge, 64 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartBFWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeBF;
#include "CartEnhancedWidget.hxx"
class CartridgeBFWidget : public CartEnhancedWidget
class CartridgeBFWidget : public CartridgeEnhancedWidget
{
public:
CartridgeBFWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartCVWidget.cxx
View File

@ -24,7 +24,7 @@
CartridgeCVWidget::CartridgeCVWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeCV& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -35,7 +35,7 @@ string CartridgeCVWidget::description()
ostringstream info;
info << "CV 2K ROM + 1K RAM, non-bankswitched\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartCVWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeCV;
#include "CartEnhancedWidget.hxx"
class CartridgeCVWidget : public CartEnhancedWidget
class CartridgeCVWidget : public CartridgeEnhancedWidget
{
public:
CartridgeCVWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartDFSCWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeDFSCWidget::CartridgeDFSCWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeDFSC& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeDFSCWidget::description()
ostringstream info;
info << "128K DFSC + RAM, 32 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartDFSCWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeDFSC;
#include "CartEnhancedWidget.hxx"
class CartridgeDFSCWidget : public CartEnhancedWidget
class CartridgeDFSCWidget : public CartridgeEnhancedWidget
{
public:
CartridgeDFSCWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartDFWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeDFWidget::CartridgeDFWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeDF& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeDFWidget::description()
ostringstream info;
info << "128K DF, 32 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartDFWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeDF;
#include "CartEnhancedWidget.hxx"
class CartridgeDFWidget : public CartEnhancedWidget
class CartridgeDFWidget : public CartridgeEnhancedWidget
{
public:
CartridgeDFWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartE0Widget.cxx
View File

@ -22,7 +22,7 @@
CartridgeE0Widget::CartridgeE0Widget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeE0& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeE0Widget::description()
ostringstream info;
info << "E0 cartridge,\n eight 1K banks mapped into four segments\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartE0Widget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeE0;
#include "CartEnhancedWidget.hxx"
class CartridgeE0Widget : public CartEnhancedWidget
class CartridgeE0Widget : public CartridgeEnhancedWidget
{
public:
CartridgeE0Widget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartEFSCWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeEFSCWidget::CartridgeEFSCWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeEFSC& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeEFSCWidget::description()
ostringstream info;
info << "64K H. Runner EFSC + RAM, 16 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartEFSCWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeEFSC;
#include "CartEnhancedWidget.hxx"
class CartridgeEFSCWidget : public CartEnhancedWidget
class CartridgeEFSCWidget : public CartridgeEnhancedWidget
{
public:
CartridgeEFSCWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartEFWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeEFWidget::CartridgeEFWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeEF& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeEFWidget::description()
ostringstream info;
info << "64K H. Runner EF cartridge, 16 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartEFWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeEF;
#include "CartEnhancedWidget.hxx"
class CartridgeEFWidget : public CartEnhancedWidget
class CartridgeEFWidget : public CartridgeEnhancedWidget
{
public:
CartridgeEFWidget(GuiObject* boss, const GUI::Font& lfont,

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

@ -21,7 +21,7 @@
#include "CartEnhancedWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartEnhancedWidget::CartEnhancedWidget(GuiObject* boss, const GUI::Font& lfont,
CartridgeEnhancedWidget::CartridgeEnhancedWidget(GuiObject* boss, const GUI::Font& lfont,
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeEnhanced& cart)
@ -31,7 +31,7 @@ CartEnhancedWidget::CartEnhancedWidget(GuiObject* boss, const GUI::Font& lfont,
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int CartEnhancedWidget::initialize()
int CartridgeEnhancedWidget::initialize()
{
int ypos = addBaseInformation(size(), manufacturer(), description(), descriptionLines())
+ myLineHeight;
@ -42,7 +42,7 @@ int CartEnhancedWidget::initialize()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
size_t CartEnhancedWidget::size()
size_t CartridgeEnhancedWidget::size()
{
size_t size;
@ -52,7 +52,7 @@ size_t CartEnhancedWidget::size()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartEnhancedWidget::description()
string CartridgeEnhancedWidget::description()
{
ostringstream info;
@ -64,13 +64,13 @@ string CartEnhancedWidget::description()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int CartEnhancedWidget::descriptionLines()
int CartridgeEnhancedWidget::descriptionLines()
{
return 18; // should be enough for almost all types
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartEnhancedWidget::ramDescription()
string CartridgeEnhancedWidget::ramDescription()
{
ostringstream info;
@ -86,7 +86,7 @@ string CartEnhancedWidget::ramDescription()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartEnhancedWidget::romDescription()
string CartridgeEnhancedWidget::romDescription()
{
ostringstream info;
size_t size;
@ -134,7 +134,7 @@ string CartEnhancedWidget::romDescription()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartEnhancedWidget::bankSelect(int& ypos)
void CartridgeEnhancedWidget::bankSelect(int& ypos)
{
if(myCart.romBankCount() > 1)
{
@ -182,7 +182,7 @@ void CartEnhancedWidget::bankSelect(int& ypos)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartEnhancedWidget::bankState()
string CartridgeEnhancedWidget::bankState()
{
if(myCart.romBankCount() > 1)
{
@ -228,7 +228,7 @@ string CartEnhancedWidget::bankState()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartEnhancedWidget::hotspotStr(int bank, int segment, bool prefix)
string CartridgeEnhancedWidget::hotspotStr(int bank, int segment, bool prefix)
{
ostringstream info;
uInt16 hotspot = myCart.hotspot();
@ -244,13 +244,13 @@ string CartEnhancedWidget::hotspotStr(int bank, int segment, bool prefix)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int CartEnhancedWidget::bankSegs()
int CartridgeEnhancedWidget::bankSegs()
{
return myCart.myBankSegs;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartEnhancedWidget::saveOldState()
void CartridgeEnhancedWidget::saveOldState()
{
myOldState.internalRam.clear();
for(uInt32 i = 0; i < myCart.myRamSize; ++i)
@ -265,7 +265,7 @@ void CartEnhancedWidget::saveOldState()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartEnhancedWidget::loadConfig()
void CartridgeEnhancedWidget::loadConfig()
{
if(myBankWidgets != nullptr)
{
@ -281,7 +281,7 @@ void CartEnhancedWidget::loadConfig()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartEnhancedWidget::handleCommand(CommandSender* sender,
void CartridgeEnhancedWidget::handleCommand(CommandSender* sender,
int cmd, int data, int id)
{
if(cmd == kBankChanged)
@ -294,19 +294,19 @@ void CartEnhancedWidget::handleCommand(CommandSender* sender,
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 CartEnhancedWidget::internalRamSize()
uInt32 CartridgeEnhancedWidget::internalRamSize()
{
return myCart.myRamSize;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 CartEnhancedWidget::internalRamRPort(int start)
uInt32 CartridgeEnhancedWidget::internalRamRPort(int start)
{
return ADDR_BASE + myCart.myReadOffset + start;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartEnhancedWidget::internalRamDescription()
string CartridgeEnhancedWidget::internalRamDescription()
{
ostringstream desc;
@ -334,7 +334,7 @@ string CartEnhancedWidget::internalRamDescription()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const ByteArray& CartEnhancedWidget::internalRamOld(int start, int count)
const ByteArray& CartridgeEnhancedWidget::internalRamOld(int start, int count)
{
myRamOld.clear();
for(int i = 0; i < count; i++)
@ -343,7 +343,7 @@ const ByteArray& CartEnhancedWidget::internalRamOld(int start, int count)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const ByteArray& CartEnhancedWidget::internalRamCurrent(int start, int count)
const ByteArray& CartridgeEnhancedWidget::internalRamCurrent(int start, int count)
{
myRamCurrent.clear();
for(int i = 0; i < count; i++)
@ -352,19 +352,19 @@ const ByteArray& CartEnhancedWidget::internalRamCurrent(int start, int count)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartEnhancedWidget::internalRamSetValue(int addr, uInt8 value)
void CartridgeEnhancedWidget::internalRamSetValue(int addr, uInt8 value)
{
myCart.myRAM[addr] = value;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 CartEnhancedWidget::internalRamGetValue(int addr)
uInt8 CartridgeEnhancedWidget::internalRamGetValue(int addr)
{
return myCart.myRAM[addr];
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartEnhancedWidget::internalRamLabel(int addr)
string CartridgeEnhancedWidget::internalRamLabel(int addr)
{
CartDebug& dbg = instance().debugger().cartDebug();
return dbg.getLabel(addr + ADDR_BASE + myCart.myReadOffset, false);

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

@ -27,14 +27,14 @@ namespace GUI {
#include "CartDebugWidget.hxx"
class CartEnhancedWidget : public CartDebugWidget
class CartridgeEnhancedWidget : public CartDebugWidget
{
public:
CartEnhancedWidget(GuiObject* boss, const GUI::Font& lfont,
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeEnhanced& cart);
virtual ~CartEnhancedWidget() = default;
CartridgeEnhancedWidget(GuiObject* boss, const GUI::Font& lfont,
const GUI::Font& nfont,
int x, int y, int w, int h,
CartridgeEnhanced& cart);
virtual ~CartridgeEnhancedWidget() = default;
protected:
int initialize();
@ -97,11 +97,11 @@ class CartEnhancedWidget : public CartDebugWidget
private:
// Following constructors and assignment operators not supported
CartEnhancedWidget() = delete;
CartEnhancedWidget(const CartEnhancedWidget&) = delete;
CartEnhancedWidget(CartEnhancedWidget&&) = delete;
CartEnhancedWidget& operator=(const CartEnhancedWidget&) = delete;
CartEnhancedWidget& operator=(CartEnhancedWidget&&) = delete;
CartridgeEnhancedWidget() = delete;
CartridgeEnhancedWidget(const CartridgeEnhancedWidget&) = delete;
CartridgeEnhancedWidget(CartridgeEnhancedWidget&&) = delete;
CartridgeEnhancedWidget& operator=(const CartridgeEnhancedWidget&) = delete;
CartridgeEnhancedWidget& operator=(CartridgeEnhancedWidget&&) = delete;
};
#endif

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

@ -22,7 +22,7 @@
CartridgeF0Widget::CartridgeF0Widget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeF0& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
myHotspotDelta = 0;
initialize();

2
src/debugger/gui/CartF0Widget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeF0;
#include "CartEnhancedWidget.hxx"
class CartridgeF0Widget : public CartEnhancedWidget
class CartridgeF0Widget : public CartridgeEnhancedWidget
{
public:
CartridgeF0Widget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartF4SCWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeF4SCWidget::CartridgeF4SCWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeF4SC& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeF4SCWidget::description()
ostringstream info;
info << "Standard F4SC cartridge, eight 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartF4SCWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeF4SC;
#include "CartEnhancedWidget.hxx"
class CartridgeF4SCWidget : public CartEnhancedWidget
class CartridgeF4SCWidget : public CartridgeEnhancedWidget
{
public:
CartridgeF4SCWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartF4Widget.cxx
View File

@ -22,7 +22,7 @@
CartridgeF4Widget::CartridgeF4Widget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeF4& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeF4Widget::description()
ostringstream info;
info << "Standard F4 cartridge, eight 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartF4Widget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeF4;
#include "CartEnhancedWidget.hxx"
class CartridgeF4Widget : public CartEnhancedWidget
class CartridgeF4Widget : public CartridgeEnhancedWidget
{
public:
CartridgeF4Widget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartF6SCWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeF6SCWidget::CartridgeF6SCWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeF6SC& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeF6SCWidget::description()
ostringstream info;
info << "Standard F6SC cartridge, four 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartF6SCWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeF6SC;
#include "CartEnhancedWidget.hxx"
class CartridgeF6SCWidget : public CartEnhancedWidget
class CartridgeF6SCWidget : public CartridgeEnhancedWidget
{
public:
CartridgeF6SCWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartF6Widget.cxx
View File

@ -22,7 +22,7 @@
CartridgeF6Widget::CartridgeF6Widget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeF6& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeF6Widget::description()
ostringstream info;
info << "Standard F6 cartridge, four 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartF6Widget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeF6;
#include "CartEnhancedWidget.hxx"
class CartridgeF6Widget : public CartEnhancedWidget
class CartridgeF6Widget : public CartridgeEnhancedWidget
{
public:
CartridgeF6Widget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartF8SCWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeF8SCWidget::CartridgeF8SCWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeF8SC& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeF8SCWidget::description()
ostringstream info;
info << "Standard F8SC cartridge, two 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartF8SCWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeF8SC;
#include "CartEnhancedWidget.hxx"
class CartridgeF8SCWidget : public CartEnhancedWidget
class CartridgeF8SCWidget : public CartridgeEnhancedWidget
{
public:
CartridgeF8SCWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartF8Widget.cxx
View File

@ -22,7 +22,7 @@
CartridgeF8Widget::CartridgeF8Widget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeF8& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeF8Widget::description()
ostringstream info;
info << "Standard F8 cartridge, two 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartF8Widget.hxx
View File

@ -23,7 +23,7 @@ class PopUpWidget;
#include "CartEnhancedWidget.hxx"
class CartridgeF8Widget : public CartEnhancedWidget
class CartridgeF8Widget : public CartridgeEnhancedWidget
{
public:
CartridgeF8Widget(GuiObject* boss, const GUI::Font& lfont,

6
src/debugger/gui/CartFA2Widget.cxx
View File

@ -22,7 +22,7 @@
CartridgeFA2Widget::CartridgeFA2Widget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeFA2& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
int xpos = 2,
ypos = initialize();
@ -65,7 +65,7 @@ string CartridgeFA2Widget::description()
info << "Modified FA RAM+, six or seven 4K banks\n";
info << "RAM+ can be loaded/saved to Harmony flash memory by accessing $"
<< Common::Base::HEX4 << 0xFFF4 << "\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}
@ -91,6 +91,6 @@ void CartridgeFA2Widget::handleCommand(CommandSender* sender,
break;
default:
CartEnhancedWidget::handleCommand(sender, cmd, data, id);
CartridgeEnhancedWidget::handleCommand(sender, cmd, data, id);
}
}

2
src/debugger/gui/CartFA2Widget.hxx
View File

@ -23,7 +23,7 @@ class ButtonWidget;
#include "CartEnhancedWidget.hxx"
class CartridgeFA2Widget : public CartEnhancedWidget
class CartridgeFA2Widget : public CartridgeEnhancedWidget
{
public:
CartridgeFA2Widget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartFAWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeFAWidget::CartridgeFAWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeFA& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -33,7 +33,7 @@ string CartridgeFAWidget::description()
ostringstream info;
info << "CBS RAM+ FA cartridge, three 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartFAWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeFA;
#include "CartEnhancedWidget.hxx"
class CartridgeFAWidget : public CartEnhancedWidget
class CartridgeFAWidget : public CartridgeEnhancedWidget
{
public:
CartridgeFAWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartFCWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeFCWidget::CartridgeFCWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeFC& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -39,7 +39,7 @@ string CartridgeFCWidget::description()
<< " $" << Common::Base::HEX4 << (hotspot + 1) << " (defines high bits)\n"
<< " $" << Common::Base::HEX4 << (hotspot + 4) << " (triggers bank switch)\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartFCWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeFC;
#include "CartEnhancedWidget.hxx"
class CartridgeFCWidget : public CartEnhancedWidget
class CartridgeFCWidget : public CartridgeEnhancedWidget
{
public:
CartridgeFCWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartFEWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeFEWidget::CartridgeFEWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeFE& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -35,7 +35,7 @@ string CartridgeFEWidget::description()
info << "FE cartridge, two 4K banks\n"
<< "Monitors access to hotspot $01FE, and uses "
<< "upper 3 bits of databus for bank number:\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartFEWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeFE;
#include "CartEnhancedWidget.hxx"
class CartridgeFEWidget : public CartEnhancedWidget
class CartridgeFEWidget : public CartridgeEnhancedWidget
{
public:
CartridgeFEWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartUAWidget.cxx
View File

@ -22,7 +22,7 @@
CartridgeUAWidget::CartridgeUAWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeUA& cart, bool swapHotspots)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart),
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart),
mySwappedHotspots(swapHotspots)
{
myHotspotDelta = 0x20;
@ -35,7 +35,7 @@ string CartridgeUAWidget::description()
ostringstream info;
info << "8K UA cartridge" << (mySwappedHotspots ? " (swapped banks)" : "") << ", two 4K banks\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartUAWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeUA;
#include "CartEnhancedWidget.hxx"
class CartridgeUAWidget : public CartEnhancedWidget
class CartridgeUAWidget : public CartridgeEnhancedWidget
{
public:
CartridgeUAWidget(GuiObject* boss, const GUI::Font& lfont,

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

@ -22,7 +22,7 @@
CartridgeWDWidget::CartridgeWDWidget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeWD& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}

2
src/debugger/gui/CartWDWidget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeWD;
#include "CartEnhancedWidget.hxx"
class CartridgeWDWidget : public CartEnhancedWidget
class CartridgeWDWidget : public CartridgeEnhancedWidget
{
public:
CartridgeWDWidget(GuiObject* boss, const GUI::Font& lfont,

4
src/debugger/gui/CartX07Widget.cxx
View File

@ -22,7 +22,7 @@
CartridgeX07Widget::CartridgeX07Widget(
GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
int x, int y, int w, int h, CartridgeX07& cart)
: CartEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
: CartridgeEnhancedWidget(boss, lfont, nfont, x, y, w, h, cart)
{
initialize();
}
@ -35,7 +35,7 @@ string CartridgeX07Widget::description()
info << "64K X07 cartridge, 16 4K banks\n"
<< "Multiple hotspots, all below $1000\n"
<< "See documentation for further details\n";
info << CartEnhancedWidget::description();
info << CartridgeEnhancedWidget::description();
return info.str();
}

2
src/debugger/gui/CartX07Widget.hxx
View File

@ -22,7 +22,7 @@ class CartridgeX07;
#include "CartEnhancedWidget.hxx"
class CartridgeX07Widget : public CartEnhancedWidget
class CartridgeX07Widget : public CartridgeEnhancedWidget
{
public:
CartridgeX07Widget(GuiObject* boss, const GUI::Font& lfont,

2
src/emucore/CartEnhanced.hxx
View File

@ -33,7 +33,7 @@ class System;
*/
class CartridgeEnhanced : public Cartridge
{
friend class CartEnhancedWidget;
friend class CartridgeEnhancedWidget;
public:
/**