Some cleanup of redundant spacing. Now that I'm free for basically the next month,

I'll be starting work on Stella again.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3233 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2015-12-04 19:08:14 +00:00
parent bfdaeadd55
commit 47911eff21
58 changed files with 67 additions and 67 deletions

View File

@ -38,7 +38,7 @@ class EventHandlerSDL2 : public EventHandler
Create a new SDL2 event handler object
*/
EventHandlerSDL2(OSystem& osystem);
/**
Destructor
*/

View File

@ -44,7 +44,7 @@ class SoundNull : public Sound
{
myOSystem->logMessage("Sound disabled.\n", 1);
}
/**
Destructor
*/
@ -143,7 +143,7 @@ class SoundNull : public Sound
{
out.putString("TIASound");
for(int = 0; i < 6; ++i)
for(int i = 0; i < 6; ++i)
out.putByte(0);
// myLastRegisterSetCycle
@ -164,7 +164,7 @@ class SoundNull : public Sound
return false;
// Read sound registers and discard
for(int = 0; i < 6; ++i)
for(int i = 0; i < 6; ++i)
in.getByte();
// myLastRegisterSetCycle

View File

@ -44,7 +44,7 @@ class SoundSDL2 : public Sound
using the object.
*/
SoundSDL2(OSystem& osystem);
/**
Destructor
*/

View File

@ -111,7 +111,7 @@ CartridgeBFWidget::CartridgeBFWidget(
VarList::push_back(items, "61 ($FBD)");
VarList::push_back(items, "62 ($FBE)");
VarList::push_back(items, "63 ($FBF)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("64 ($FBF) "),
myLineHeight, items, "Set bank: ",

View File

@ -79,7 +79,7 @@ CartridgeDFWidget::CartridgeDFWidget(
VarList::push_back(items, "29 ($FDD)");
VarList::push_back(items, "30 ($FDE)");
VarList::push_back(items, "31 ($FDF)");
myBank =
new PopUpWidget(boss, _font, xpos, ypos-2, _font.getStringWidth("31 ($FDF) "),
myLineHeight, items, "Set bank: ",

View File

@ -39,7 +39,7 @@ class GuiObject;
game and handles any bankswitching performed by the cartridge.
A 'bank' is defined as a 4K block that is visible in the
0x1000-0x2000 area (or its mirrors).
@author Bradford W. Mott
@version $Id$
*/
@ -71,7 +71,7 @@ class Cartridge : public Device
@param settings A reference to the various settings (read-only)
*/
Cartridge(const Settings& settings);
/**
Destructor
*/

View File

@ -24,7 +24,8 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge0840::Cartridge0840(const uInt8* image, uInt32 size, const Settings& settings)
: Cartridge(settings)
: Cartridge(settings),
myCurrentBank(0)
{
// Copy the ROM image into my buffer
memcpy(myImage, image, BSPF_min(8192u, size));

View File

@ -46,7 +46,7 @@ class Cartridge0840 : public Cartridge
@param settings A reference to the various settings (read-only)
*/
Cartridge0840(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -49,7 +49,7 @@ class Cartridge2K : public Cartridge
@param settings A reference to the various settings (read-only)
*/
Cartridge2K(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -77,7 +77,7 @@ class Cartridge3E : public Cartridge
@param settings A reference to the various settings (read-only)
*/
Cartridge3E(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -54,7 +54,7 @@ class Cartridge3F : public Cartridge
@param settings A reference to the various settings (read-only)
*/
Cartridge3F(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -62,7 +62,7 @@ class Cartridge4A50 : public Cartridge
@param settings A reference to the various settings (read-only)
*/
Cartridge4A50(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -48,7 +48,7 @@ class Cartridge4K : public Cartridge
@param settings A reference to the various settings (read-only)
*/
Cartridge4K(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -46,7 +46,7 @@ class Cartridge4KSC : public Cartridge
@param settings A reference to the various settings (read-only)
*/
Cartridge4KSC(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -68,7 +68,7 @@ void CartridgeBFSC::install(System& system)
access.codeAccessBase = &myCodeAccessBase[j & 0x007F];
mySystem->setPageAccess(j >> System::PAGE_SHIFT, access);
}
// Set the page accessing method for the RAM reading pages
access.directPokeBase = 0;
access.type = System::PA_READ;

View File

@ -120,7 +120,7 @@ class CartridgeCM : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeCM(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -123,7 +123,7 @@ class CartridgeCTY : public Cartridge
@param osystem A reference to the OSystem currently in use
*/
CartridgeCTY(const uInt8* image, uInt32 size, const OSystem& osystem);
/**
Destructor
*/

View File

@ -68,7 +68,7 @@ void CartridgeDFSC::install(System& system)
access.codeAccessBase = &myCodeAccessBase[j & 0x007F];
mySystem->setPageAccess(j >> System::PAGE_SHIFT, access);
}
// Set the page accessing method for the RAM reading pages
access.directPokeBase = 0;
access.type = System::PA_READ;

View File

@ -53,7 +53,7 @@ class CartridgeDPC : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeDPC(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -57,7 +57,7 @@ class CartridgeDPCPlus : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeDPCPlus(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -57,7 +57,7 @@ class CartridgeE0 : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeE0(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -74,7 +74,7 @@ class CartridgeE7 : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeE7(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -68,7 +68,7 @@ void CartridgeEFSC::install(System& system)
access.codeAccessBase = &myCodeAccessBase[j & 0x007F];
mySystem->setPageAccess(j >> System::PAGE_SHIFT, access);
}
// Set the page accessing method for the RAM reading pages
access.directPokeBase = 0;
access.type = System::PA_READ;

View File

@ -48,7 +48,7 @@ class CartridgeF4 : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeF4(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -48,7 +48,7 @@ class CartridgeF4SC : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeF4SC(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -48,7 +48,7 @@ class CartridgeF6 : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeF6(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -48,7 +48,7 @@ class CartridgeF6SC : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeF6SC(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -48,7 +48,7 @@ class CartridgeF8SC : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeF8SC(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -33,7 +33,7 @@ CartridgeFA::CartridgeFA(const uInt8* image, uInt32 size, const Settings& settin
// Remember startup bank
myStartBank = 2;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeFA::~CartridgeFA()
{
@ -68,7 +68,7 @@ void CartridgeFA::install(System& system)
access.codeAccessBase = &myCodeAccessBase[j & 0x00FF];
mySystem->setPageAccess(j >> System::PAGE_SHIFT, access);
}
// Set the page accessing method for the RAM reading pages
access.directPokeBase = 0;
access.type = System::PA_READ;

View File

@ -48,7 +48,7 @@ class CartridgeFA : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeFA(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -45,7 +45,7 @@ CartridgeFA2::CartridgeFA2(const uInt8* image, uInt32 size, const OSystem& osyst
// Remember startup bank
myStartBank = 0;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeFA2::~CartridgeFA2()
{
@ -80,7 +80,7 @@ void CartridgeFA2::install(System& system)
access.codeAccessBase = &myCodeAccessBase[j & 0x00FF];
mySystem->setPageAccess(j >> System::PAGE_SHIFT, access);
}
// Set the page accessing method for the RAM reading pages
access.directPokeBase = 0;
access.type = System::PA_READ;

View File

@ -56,7 +56,7 @@ class CartridgeFA2 : public Cartridge
@param osystem A reference to the OSystem currently in use
*/
CartridgeFA2(const uInt8* image, uInt32 size, const OSystem& osystem);
/**
Destructor
*/

View File

@ -63,7 +63,7 @@ class CartridgeFE : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeFE(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -154,7 +154,7 @@ class CartridgeMC : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeMC(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -59,7 +59,7 @@ class CartridgeMDM : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeMDM(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -48,7 +48,7 @@ class CartridgeSB : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeSB(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -48,7 +48,7 @@ class CartridgeUA : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeUA(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -76,7 +76,7 @@ class CartridgeWD : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeWD(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -39,7 +39,7 @@ class System;
0 1xxx nnnn 1101 -- Switch to bank nnnn
0 0xxx 0nxx xxxx -- If in bank 111x, switch to bank 111n.
In any other bank, do not switch.
Note that the latter will hit on almost any TIA access.
@author Eckhard Stolberg
@ -58,7 +58,7 @@ class CartridgeX07 : public Cartridge
@param settings A reference to the various settings (read-only)
*/
CartridgeX07(const uInt8* image, uInt32 size, const Settings& settings);
/**
Destructor
*/

View File

@ -290,7 +290,7 @@ void Console::togglePalette()
{
string palette, message;
palette = myOSystem.settings().getString("palette");
if(palette == "standard") // switch to z26
{
palette = "z26";
@ -658,7 +658,7 @@ void Console::setControllers(const string& rommd5)
{
leftC = make_ptr<Joystick>(Controller::Left, myEvent, *mySystem);
}
// Construct right controller
if(right == "BOOSTERGRIP")
{

View File

@ -71,7 +71,7 @@ class Console : public Serializable
*/
Console(OSystem& osystem, unique_ptr<Cartridge>& cart,
const Properties& props);
/**
Destructor
*/

View File

@ -85,7 +85,7 @@ Controller::Controller(Jack jack, const Event& event, const System& system,
break;
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Controller::~Controller()
{

View File

@ -106,7 +106,7 @@ class Controller : public Serializable
*/
Controller(Jack jack, const Event& event, const System& system,
Type type);
/**
Destructor
*/

View File

@ -109,7 +109,7 @@ void Driving::update()
// Only consider the lower-most bits (corresponding to pins 1 & 2)
myCounter &= 0x0f;
myGrayIndex = myCounter >> 2;
// Stelladaptor is the only controller that should set this
int yaxis = myEvent.get(myYAxisValue);

View File

@ -85,7 +85,7 @@ class EventHandler
Create a new event handler object
*/
EventHandler(OSystem& osystem);
/**
Destructor
*/

View File

@ -35,12 +35,12 @@ M6532::M6532(const Console& console, const Settings& settings)
myEdgeDetectPositive(false)
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
M6532::~M6532()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void M6532::reset()
{

View File

@ -55,7 +55,7 @@ class M6532 : public Device
@param settings The settings used by the system
*/
M6532(const Console& console, const Settings& settings);
/**
Destructor
*/

View File

@ -91,7 +91,7 @@ MT24LC256::MT24LC256(const string& filename, const System& system)
// Then initialize the I2C state
jpee_init();
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MT24LC256::~MT24LC256()
{

View File

@ -43,7 +43,7 @@ class MT24LC256
@param system The system using the controller of this device
*/
MT24LC256(const string& filename, const System& system);
/**
Destructor
*/

View File

@ -29,7 +29,7 @@ class System;
Class that represents a "null" device. The basic idea is that a
null device is installed in a 6502 based system anywhere there are
holes in the address space (i.e. no real device attached).
@author Bradford W. Mott
@version $Id$
*/

View File

@ -103,7 +103,7 @@ class Properties
@param p The Properties object to write to
*/
friend istream& operator>>(istream& is, Properties& p);
/**
Save properties to the specified output stream

View File

@ -47,7 +47,7 @@ class Switches : public Serializable
@param event The event object to use for events
*/
Switches(const Event& event, const Properties& properties);
/**
Destructor
*/

View File

@ -68,7 +68,7 @@ class System : public Serializable
// Mask to apply to an address to obtain its page offset
static const uInt16 PAGE_MASK = (1 << PAGE_SHIFT) - 1;
// Number of pages in the system
static const uInt16 NUM_PAGES = 1 << (13 - PAGE_SHIFT);
@ -326,7 +326,7 @@ class System : public Serializable
const PageAccess& getPageAccess(uInt16 page) const {
return myPageAccessTable[page];
}
/**
Get the page type for the given address.

View File

@ -246,7 +246,7 @@ void TIA::systemCyclesReset()
myClockAtLastUpdate -= clocks;
myVSYNCFinishClock -= clocks;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TIA::install(System& system)
{

View File

@ -57,7 +57,7 @@ class TIA : public Device
@param settings The settings object for this TIA device
*/
TIA(Console& console, Sound& sound, Settings& settings);
/**
Destructor
*/

View File

@ -46,7 +46,6 @@ class EventMappingWidget : public Widget, public CommandSender
const StringList& actions, EventMode mode);
~EventMappingWidget();
bool remapMode() { return myRemapStatus; }
void setDefaults();

View File

@ -170,7 +170,7 @@ void SnapshotDialog::setDefaults()
{
mySnapSavePath->setText(instance().defaultSnapSaveDir());
mySnapLoadPath->setText(instance().defaultSnapLoadDir());
mySnapSingle->setState(false);
mySnap1x->setState(false);
mySnapInterval->setSelected("2", "2");

View File

@ -47,7 +47,7 @@ ENABL equ $1f
HMP0 equ $20
HMP1 equ $21
HMOVE equ $2a
;;
;; Entry point for multi-load reading
;;