Skip to content

Commit

Permalink
Forgot Bools that weren't referenced by the project
Browse files Browse the repository at this point in the history
  • Loading branch information
sasq64 committed Jan 20, 2017
1 parent 2460271 commit dcb71d2
Show file tree
Hide file tree
Showing 22 changed files with 191 additions and 191 deletions.
4 changes: 2 additions & 2 deletions stella/src/cheat/BankRomCheat.cxx
Expand Up @@ -45,14 +45,14 @@ BankRomCheat::~BankRomCheat()
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool BankRomCheat::enable()
bool BankRomCheat::enable()
{
evaluate();
return myEnabled;
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool BankRomCheat::disable()
bool BankRomCheat::disable()
{
int oldBank = myOSystem->console().cartridge().bank();
myOSystem->console().cartridge().bank(bank);
Expand Down
4 changes: 2 additions & 2 deletions stella/src/cheat/BankRomCheat.hxx
Expand Up @@ -28,8 +28,8 @@ class BankRomCheat : public Cheat
BankRomCheat(OSystem* os, const string& name, const string& code);
~BankRomCheat();

virtual Bool enable();
virtual Bool disable();
virtual bool enable();
virtual bool disable();

virtual void evaluate();

Expand Down
8 changes: 4 additions & 4 deletions stella/src/cheat/Cheat.hxx
Expand Up @@ -39,12 +39,12 @@ class Cheat
}
virtual ~Cheat() { }

Bool enabled() const { return myEnabled; }
bool enabled() const { return myEnabled; }
const string& name() const { return myName; }
const string& code() const { return myCode; }

virtual Bool enable() = 0;
virtual Bool disable() = 0;
virtual bool enable() = 0;
virtual bool disable() = 0;

virtual void evaluate() = 0;

Expand Down Expand Up @@ -73,7 +73,7 @@ class Cheat
string myName;
string myCode;

Bool myEnabled;
bool myEnabled;
};

#endif
6 changes: 3 additions & 3 deletions stella/src/cheat/CheatCodeDialog.cxx
Expand Up @@ -116,14 +116,14 @@ void CheatCodeDialog::loadConfig()
for(unsigned int i = 0; i < list.size(); ++i)
{
l.push_back(list[i]->name());
b.push_back(Bool(list[i]->enabled()));
b.push_back(bool(list[i]->enabled()));
}
myCheatList->setList(l, b);

// Redraw the list, auto-selecting the first item if possible
myCheatList->setSelected(l.size() > 0 ? 0 : -1);

Bool enabled = (list.size() > 0);
bool enabled = (list.size() > 0);
myEditButton->setEnabled(enabled);
myRemoveButton->setEnabled(enabled);
}
Expand Down Expand Up @@ -236,7 +236,7 @@ void CheatCodeDialog::handleCommand(CommandSender* sender, int cmd,
{
const string& name = myCheatInput->getResult(0);
const string& code = myCheatInput->getResult(1);
Bool enable = myCheatList->getSelectedState();
bool enable = myCheatList->getSelectedState();
int idx = myCheatList->getSelected();
if(instance().cheat().isValidCode(code))
{
Expand Down
12 changes: 6 additions & 6 deletions stella/src/cheat/CheatManager.cxx
Expand Up @@ -48,7 +48,7 @@ CheatManager::~CheatManager()

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const Cheat* CheatManager::add(const string& name, const string& code,
Bool enable, int idx)
bool enable, int idx)
{
Cheat* cheat = (Cheat*) createCheat(name, code);
if(!cheat)
Expand Down Expand Up @@ -97,13 +97,13 @@ void CheatManager::remove(int idx)
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CheatManager::addPerFrame(Cheat* cheat, Bool enable)
void CheatManager::addPerFrame(Cheat* cheat, bool enable)
{
if(!cheat)
return;

// Make sure there are no duplicates
Bool found = false;
bool found = false;
unsigned int i;
for(i = 0; i < myPerFrameList.size(); i++)
{
Expand Down Expand Up @@ -217,7 +217,7 @@ void CheatManager::parse(const string& cheats)
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CheatManager::enable(const string& code, Bool enable)
void CheatManager::enable(const string& code, bool enable)
{
for(unsigned int i = 0; i < myCheatList.size(); i++)
{
Expand Down Expand Up @@ -326,7 +326,7 @@ void CheatManager::saveCheats(const string& md5sum)
cheats << ",";
}

Bool changed = cheats.str() != myCurrentCheat;
bool changed = cheats.str() != myCurrentCheat;

// Only update the list if absolutely necessary
if(changed)
Expand Down Expand Up @@ -360,7 +360,7 @@ void CheatManager::clear()
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CheatManager::isValidCode(const string& code)
bool CheatManager::isValidCode(const string& code)
{
for(unsigned int i = 0; i < code.size(); i++)
if(!isxdigit(code[i]))
Expand Down
4 changes: 2 additions & 2 deletions stella/src/cheat/CheetahCheat.cxx
Expand Up @@ -41,14 +41,14 @@ CheetahCheat::~CheetahCheat()
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CheetahCheat::enable()
bool CheetahCheat::enable()
{
evaluate();
return myEnabled;
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CheetahCheat::disable()
bool CheetahCheat::disable()
{
for(int i = 0; i < count; ++i)
myOSystem->console().cartridge().patch(address + i, savedRom[i]);
Expand Down
4 changes: 2 additions & 2 deletions stella/src/cheat/CheetahCheat.hxx
Expand Up @@ -28,8 +28,8 @@ class CheetahCheat : public Cheat
CheetahCheat(OSystem* os, const string& name, const string& code);
~CheetahCheat();

virtual Bool enable();
virtual Bool disable();
virtual bool enable();
virtual bool disable();

virtual void evaluate();

Expand Down
4 changes: 2 additions & 2 deletions stella/src/cheat/RamCheat.cxx
Expand Up @@ -38,7 +38,7 @@ RamCheat::~RamCheat()
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool RamCheat::enable()
bool RamCheat::enable()
{
if(!myEnabled)
{
Expand All @@ -49,7 +49,7 @@ Bool RamCheat::enable()
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool RamCheat::disable()
bool RamCheat::disable()
{
if(myEnabled)
{
Expand Down
4 changes: 2 additions & 2 deletions stella/src/cheat/RamCheat.hxx
Expand Up @@ -28,8 +28,8 @@ class RamCheat : public Cheat
RamCheat(OSystem* os, const string& name, const string& code);
virtual ~RamCheat();

virtual Bool enable();
virtual Bool disable();
virtual bool enable();
virtual bool disable();

virtual void evaluate();

Expand Down
8 changes: 4 additions & 4 deletions stella/src/common/MouseControl.cxx
Expand Up @@ -145,7 +145,7 @@ MouseControl::MouseControl(Console& console, const string& mode)

// Now consider the possible modes for the mouse based on the left
// and right controllers
Bool noswap = BSPF_equalsIgnoreCase(myProps.get(Console_SwapPorts), "NO");
bool noswap = BSPF_equalsIgnoreCase(myProps.get(Console_SwapPorts), "NO");
if(noswap)
{
addLeftControllerModes(noswap);
Expand Down Expand Up @@ -185,7 +185,7 @@ const string& MouseControl::next()
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void MouseControl::addLeftControllerModes(Bool noswap)
void MouseControl::addLeftControllerModes(bool noswap)
{
if(controllerSupportsMouse(myLeftController))
{
Expand All @@ -206,7 +206,7 @@ void MouseControl::addLeftControllerModes(Bool noswap)
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void MouseControl::addRightControllerModes(Bool noswap)
void MouseControl::addRightControllerModes(bool noswap)
{
if(controllerSupportsMouse(myRightController))
{
Expand Down Expand Up @@ -251,7 +251,7 @@ void MouseControl::addPaddleModes(int lport, int rport, int lname, int rname)
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool MouseControl::controllerSupportsMouse(Controller& controller)
bool MouseControl::controllerSupportsMouse(Controller& controller)
{
// Test whether the controller uses the mouse at all
// We can pass in dummy values here, since the controllers will be
Expand Down
30 changes: 15 additions & 15 deletions stella/src/debugger/CartDebug.cxx
Expand Up @@ -254,19 +254,19 @@ string CartDebug::toString()
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CartDebug::disassemble(Bool force)
bool CartDebug::disassemble(bool force)
{
// Test current disassembly; don't re-disassemble if it hasn't changed
// Also check if the current PC is in the current list
Bool bankChanged = myConsole.cartridge().bankChanged();
bool bankChanged = myConsole.cartridge().bankChanged();
uInt16 PC = myDebugger.cpuDebug().pc();
int pcline = addressToLine(PC);
Bool pcfound = (pcline != -1) && ((uInt32)pcline < myDisassembly.list.size()) &&
bool pcfound = (pcline != -1) && ((uInt32)pcline < myDisassembly.list.size()) &&
(myDisassembly.list[pcline].disasm[0] != '.');
Bool pagedirty = (PC & 0x1000) ? mySystem.isPageDirty(0x1000, 0x1FFF) :
bool pagedirty = (PC & 0x1000) ? mySystem.isPageDirty(0x1000, 0x1FFF) :
mySystem.isPageDirty(0x80, 0xFF);

Bool changed = (force || bankChanged || !pcfound || pagedirty);
bool changed = (force || bankChanged || !pcfound || pagedirty);
if(changed)
{
// Are we disassembling from ROM or ZP RAM?
Expand Down Expand Up @@ -304,7 +304,7 @@ Bool CartDebug::disassemble(Bool force)

// Always attempt to resolve code sections unless it's been
// specifically disabled
Bool found = fillDisassemblyList(info, PC);
bool found = fillDisassemblyList(info, PC);
if(!found && DiStella::settings.resolve_code)
{
// Temporarily turn off code resolution
Expand All @@ -318,7 +318,7 @@ Bool CartDebug::disassemble(Bool force)
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CartDebug::fillDisassemblyList(BankInfo& info, uInt16 search)
bool CartDebug::fillDisassemblyList(BankInfo& info, uInt16 search)
{
myDisassembly.list.clear(false);
myDisassembly.fieldwidth = 14 + myLabelLength;
Expand All @@ -327,7 +327,7 @@ Bool CartDebug::fillDisassemblyList(BankInfo& info, uInt16 search)

// Parts of the disassembly will be accessed later in different ways
// We place those parts in separate maps, to speed up access
Bool found = false;
bool found = false;
myAddrToLineList.clear();
myAddrToLineIsROM = info.offset & 0x1000;
for(uInt32 i = 0; i < myDisassembly.list.size(); ++i)
Expand Down Expand Up @@ -405,7 +405,7 @@ string CartDebug::disassemble(uInt16 start, uInt16 lines) const
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CartDebug::addDirective(CartDebug::DisasmType type,
bool CartDebug::addDirective(CartDebug::DisasmType type,
uInt16 start, uInt16 end, int bank)
{
#define PRINT_TAG(tag) \
Expand Down Expand Up @@ -498,7 +498,7 @@ Bool CartDebug::addDirective(CartDebug::DisasmType type,
{
if(tag.end < i->start) // node should be inserted *before* this one
{
Bool createNode = true;
bool createNode = true;

// Is the new range ending consecutive with the old range beginning?
// If so, a merge will suffice
Expand Down Expand Up @@ -562,7 +562,7 @@ string CartDebug::getCartType() const
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CartDebug::addLabel(const string& label, uInt16 address)
bool CartDebug::addLabel(const string& label, uInt16 address)
{
// Only user-defined labels can be added or redefined
switch(addressType(address))
Expand All @@ -581,7 +581,7 @@ Bool CartDebug::addLabel(const string& label, uInt16 address)
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CartDebug::removeLabel(const string& label)
bool CartDebug::removeLabel(const string& label)
{
// Only user-defined labels can be removed
LabelToAddr::iterator iter = myUserAddresses.find(label);
Expand All @@ -602,7 +602,7 @@ Bool CartDebug::removeLabel(const string& label)
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bool CartDebug::getLabel(ostream& buf, uInt16 addr, Bool isRead, int places) const
bool CartDebug::getLabel(ostream& buf, uInt16 addr, bool isRead, int places) const
{
switch(addressType(addr))
{
Expand Down Expand Up @@ -708,7 +708,7 @@ Bool CartDebug::getLabel(ostream& buf, uInt16 addr, Bool isRead, int places) con
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartDebug::getLabel(uInt16 addr, Bool isRead, int places) const
string CartDebug::getLabel(uInt16 addr, bool isRead, int places) const
{
ostringstream buf;
getLabel(buf, addr, isRead, places);
Expand Down Expand Up @@ -1140,7 +1140,7 @@ string CartDebug::saveDisassembly()
<< "; P = PGFX directive, shown as '*' (stored in playfield)\n\n"
<< " processor 6502\n\n";

Bool addrUsed = false;
bool addrUsed = false;
for(uInt16 addr = 0x00; addr <= 0x0F; ++addr)
addrUsed = addrUsed || myReserved.TIARead[addr];
for(uInt16 addr = 0x00; addr <= 0x3F; ++addr)
Expand Down
14 changes: 7 additions & 7 deletions stella/src/debugger/CpuDebug.cxx
Expand Up @@ -109,43 +109,43 @@ void CpuDebug::setY(int y)
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setN(Bool on)
void CpuDebug::setN(bool on)
{
my6502.N = on;
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setV(Bool on)
void CpuDebug::setV(bool on)
{
my6502.V = on;
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setB(Bool on)
void CpuDebug::setB(bool on)
{
// nop - B is always true
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setD(Bool on)
void CpuDebug::setD(bool on)
{
my6502.D = on;
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setI(Bool on)
void CpuDebug::setI(bool on)
{
my6502.I = on;
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setZ(Bool on)
void CpuDebug::setZ(bool on)
{
my6502.notZ = !on;
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CpuDebug::setC(Bool on)
void CpuDebug::setC(bool on)
{
my6502.C = on;
}
Expand Down

0 comments on commit dcb71d2

Please sign in to comment.