From 47911eff215e52ded2d8ed42b09c19cf0e207416 Mon Sep 17 00:00:00 2001 From: stephena Date: Fri, 4 Dec 2015 19:08:14 +0000 Subject: [PATCH] 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 --- src/common/EventHandlerSDL2.hxx | 2 +- src/common/SoundNull.hxx | 6 +++--- src/common/SoundSDL2.hxx | 2 +- src/debugger/gui/CartBFWidget.cxx | 2 +- src/debugger/gui/CartDFWidget.cxx | 2 +- src/emucore/Cart.hxx | 4 ++-- src/emucore/Cart0840.cxx | 3 ++- src/emucore/Cart0840.hxx | 2 +- src/emucore/Cart2K.hxx | 2 +- src/emucore/Cart3E.hxx | 2 +- src/emucore/Cart3F.hxx | 2 +- src/emucore/Cart4A50.hxx | 2 +- src/emucore/Cart4K.hxx | 2 +- src/emucore/Cart4KSC.hxx | 2 +- src/emucore/CartBFSC.cxx | 2 +- src/emucore/CartCM.hxx | 2 +- src/emucore/CartCTY.hxx | 2 +- src/emucore/CartDFSC.cxx | 2 +- src/emucore/CartDPC.hxx | 2 +- src/emucore/CartDPCPlus.hxx | 2 +- src/emucore/CartE0.hxx | 2 +- src/emucore/CartE7.hxx | 2 +- src/emucore/CartEFSC.cxx | 2 +- src/emucore/CartF4.hxx | 2 +- src/emucore/CartF4SC.hxx | 2 +- src/emucore/CartF6.hxx | 2 +- src/emucore/CartF6SC.hxx | 2 +- src/emucore/CartF8SC.hxx | 2 +- src/emucore/CartFA.cxx | 4 ++-- src/emucore/CartFA.hxx | 2 +- src/emucore/CartFA2.cxx | 4 ++-- src/emucore/CartFA2.hxx | 2 +- src/emucore/CartFE.hxx | 2 +- src/emucore/CartMC.hxx | 2 +- src/emucore/CartMDM.hxx | 2 +- src/emucore/CartSB.hxx | 2 +- src/emucore/CartUA.hxx | 2 +- src/emucore/CartWD.hxx | 2 +- src/emucore/CartX07.hxx | 4 ++-- src/emucore/Console.cxx | 4 ++-- src/emucore/Console.hxx | 2 +- src/emucore/Control.cxx | 2 +- src/emucore/Control.hxx | 2 +- src/emucore/Driving.cxx | 2 +- src/emucore/EventHandler.hxx | 2 +- src/emucore/M6532.cxx | 4 ++-- src/emucore/M6532.hxx | 2 +- src/emucore/MT24LC256.cxx | 2 +- src/emucore/MT24LC256.hxx | 2 +- src/emucore/NullDev.hxx | 2 +- src/emucore/Props.hxx | 2 +- src/emucore/Switches.hxx | 2 +- src/emucore/System.hxx | 4 ++-- src/emucore/TIA.cxx | 2 +- src/emucore/TIA.hxx | 2 +- src/gui/EventMappingWidget.hxx | 1 - src/gui/SnapshotDialog.cxx | 2 +- src/tools/scrom.asm | 2 +- 58 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/common/EventHandlerSDL2.hxx b/src/common/EventHandlerSDL2.hxx index d645ff493..af9fa5376 100644 --- a/src/common/EventHandlerSDL2.hxx +++ b/src/common/EventHandlerSDL2.hxx @@ -38,7 +38,7 @@ class EventHandlerSDL2 : public EventHandler Create a new SDL2 event handler object */ EventHandlerSDL2(OSystem& osystem); - + /** Destructor */ diff --git a/src/common/SoundNull.hxx b/src/common/SoundNull.hxx index 1128957af..848b86aad 100644 --- a/src/common/SoundNull.hxx +++ b/src/common/SoundNull.hxx @@ -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 diff --git a/src/common/SoundSDL2.hxx b/src/common/SoundSDL2.hxx index 7afe6f3aa..8e0440132 100644 --- a/src/common/SoundSDL2.hxx +++ b/src/common/SoundSDL2.hxx @@ -44,7 +44,7 @@ class SoundSDL2 : public Sound using the object. */ SoundSDL2(OSystem& osystem); - + /** Destructor */ diff --git a/src/debugger/gui/CartBFWidget.cxx b/src/debugger/gui/CartBFWidget.cxx index e0310d7a8..e0a4717bb 100644 --- a/src/debugger/gui/CartBFWidget.cxx +++ b/src/debugger/gui/CartBFWidget.cxx @@ -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: ", diff --git a/src/debugger/gui/CartDFWidget.cxx b/src/debugger/gui/CartDFWidget.cxx index f47c42bc0..1f0d6782d 100644 --- a/src/debugger/gui/CartDFWidget.cxx +++ b/src/debugger/gui/CartDFWidget.cxx @@ -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: ", diff --git a/src/emucore/Cart.hxx b/src/emucore/Cart.hxx index 1867fc5a6..ca95bd5da 100644 --- a/src/emucore/Cart.hxx +++ b/src/emucore/Cart.hxx @@ -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 */ diff --git a/src/emucore/Cart0840.cxx b/src/emucore/Cart0840.cxx index 0fa163d85..a76c60080 100644 --- a/src/emucore/Cart0840.cxx +++ b/src/emucore/Cart0840.cxx @@ -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)); diff --git a/src/emucore/Cart0840.hxx b/src/emucore/Cart0840.hxx index 7a44085b8..ea398ad48 100644 --- a/src/emucore/Cart0840.hxx +++ b/src/emucore/Cart0840.hxx @@ -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 */ diff --git a/src/emucore/Cart2K.hxx b/src/emucore/Cart2K.hxx index acdbeaf92..59da3f6c9 100644 --- a/src/emucore/Cart2K.hxx +++ b/src/emucore/Cart2K.hxx @@ -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 */ diff --git a/src/emucore/Cart3E.hxx b/src/emucore/Cart3E.hxx index 4d542968b..c8fce2002 100644 --- a/src/emucore/Cart3E.hxx +++ b/src/emucore/Cart3E.hxx @@ -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 */ diff --git a/src/emucore/Cart3F.hxx b/src/emucore/Cart3F.hxx index b0ca24ca3..8bca1d991 100644 --- a/src/emucore/Cart3F.hxx +++ b/src/emucore/Cart3F.hxx @@ -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 */ diff --git a/src/emucore/Cart4A50.hxx b/src/emucore/Cart4A50.hxx index 0b9dc8e8d..a40c08eff 100644 --- a/src/emucore/Cart4A50.hxx +++ b/src/emucore/Cart4A50.hxx @@ -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 */ diff --git a/src/emucore/Cart4K.hxx b/src/emucore/Cart4K.hxx index c4831c798..5925a57e6 100644 --- a/src/emucore/Cart4K.hxx +++ b/src/emucore/Cart4K.hxx @@ -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 */ diff --git a/src/emucore/Cart4KSC.hxx b/src/emucore/Cart4KSC.hxx index fedb08075..101418e44 100644 --- a/src/emucore/Cart4KSC.hxx +++ b/src/emucore/Cart4KSC.hxx @@ -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 */ diff --git a/src/emucore/CartBFSC.cxx b/src/emucore/CartBFSC.cxx index 15919277a..7a69e47f9 100644 --- a/src/emucore/CartBFSC.cxx +++ b/src/emucore/CartBFSC.cxx @@ -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; diff --git a/src/emucore/CartCM.hxx b/src/emucore/CartCM.hxx index 5a65b38b2..a2492f4fe 100644 --- a/src/emucore/CartCM.hxx +++ b/src/emucore/CartCM.hxx @@ -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 */ diff --git a/src/emucore/CartCTY.hxx b/src/emucore/CartCTY.hxx index 2c1f143a7..7403d4eaa 100644 --- a/src/emucore/CartCTY.hxx +++ b/src/emucore/CartCTY.hxx @@ -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 */ diff --git a/src/emucore/CartDFSC.cxx b/src/emucore/CartDFSC.cxx index 60afd4a15..0d4dc0303 100644 --- a/src/emucore/CartDFSC.cxx +++ b/src/emucore/CartDFSC.cxx @@ -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; diff --git a/src/emucore/CartDPC.hxx b/src/emucore/CartDPC.hxx index 40971e19f..f40091f65 100644 --- a/src/emucore/CartDPC.hxx +++ b/src/emucore/CartDPC.hxx @@ -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 */ diff --git a/src/emucore/CartDPCPlus.hxx b/src/emucore/CartDPCPlus.hxx index d90066896..060153ee5 100644 --- a/src/emucore/CartDPCPlus.hxx +++ b/src/emucore/CartDPCPlus.hxx @@ -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 */ diff --git a/src/emucore/CartE0.hxx b/src/emucore/CartE0.hxx index a9d414f56..9a32000e2 100644 --- a/src/emucore/CartE0.hxx +++ b/src/emucore/CartE0.hxx @@ -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 */ diff --git a/src/emucore/CartE7.hxx b/src/emucore/CartE7.hxx index 608b7c66b..c7b9c2b54 100644 --- a/src/emucore/CartE7.hxx +++ b/src/emucore/CartE7.hxx @@ -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 */ diff --git a/src/emucore/CartEFSC.cxx b/src/emucore/CartEFSC.cxx index 5a0e6ce64..1bdb49ffa 100644 --- a/src/emucore/CartEFSC.cxx +++ b/src/emucore/CartEFSC.cxx @@ -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; diff --git a/src/emucore/CartF4.hxx b/src/emucore/CartF4.hxx index 99bccf26c..95dc8796d 100644 --- a/src/emucore/CartF4.hxx +++ b/src/emucore/CartF4.hxx @@ -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 */ diff --git a/src/emucore/CartF4SC.hxx b/src/emucore/CartF4SC.hxx index 4a3432695..fa0c83738 100644 --- a/src/emucore/CartF4SC.hxx +++ b/src/emucore/CartF4SC.hxx @@ -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 */ diff --git a/src/emucore/CartF6.hxx b/src/emucore/CartF6.hxx index 49944fbd9..e2351c209 100644 --- a/src/emucore/CartF6.hxx +++ b/src/emucore/CartF6.hxx @@ -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 */ diff --git a/src/emucore/CartF6SC.hxx b/src/emucore/CartF6SC.hxx index a630ab0b7..af1878b87 100644 --- a/src/emucore/CartF6SC.hxx +++ b/src/emucore/CartF6SC.hxx @@ -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 */ diff --git a/src/emucore/CartF8SC.hxx b/src/emucore/CartF8SC.hxx index c1f230ab4..51f9298c5 100644 --- a/src/emucore/CartF8SC.hxx +++ b/src/emucore/CartF8SC.hxx @@ -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 */ diff --git a/src/emucore/CartFA.cxx b/src/emucore/CartFA.cxx index 0be1d0e28..d62d316c7 100644 --- a/src/emucore/CartFA.cxx +++ b/src/emucore/CartFA.cxx @@ -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; diff --git a/src/emucore/CartFA.hxx b/src/emucore/CartFA.hxx index 251c1e6c5..792291453 100644 --- a/src/emucore/CartFA.hxx +++ b/src/emucore/CartFA.hxx @@ -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 */ diff --git a/src/emucore/CartFA2.cxx b/src/emucore/CartFA2.cxx index 801c3376e..fe972dd3c 100644 --- a/src/emucore/CartFA2.cxx +++ b/src/emucore/CartFA2.cxx @@ -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; diff --git a/src/emucore/CartFA2.hxx b/src/emucore/CartFA2.hxx index c3183b73f..d2f461e23 100644 --- a/src/emucore/CartFA2.hxx +++ b/src/emucore/CartFA2.hxx @@ -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 */ diff --git a/src/emucore/CartFE.hxx b/src/emucore/CartFE.hxx index ef906eab3..fd8cf7e50 100644 --- a/src/emucore/CartFE.hxx +++ b/src/emucore/CartFE.hxx @@ -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 */ diff --git a/src/emucore/CartMC.hxx b/src/emucore/CartMC.hxx index 3b3dc0603..e97852a32 100644 --- a/src/emucore/CartMC.hxx +++ b/src/emucore/CartMC.hxx @@ -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 */ diff --git a/src/emucore/CartMDM.hxx b/src/emucore/CartMDM.hxx index 89ad843e0..750d3965d 100644 --- a/src/emucore/CartMDM.hxx +++ b/src/emucore/CartMDM.hxx @@ -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 */ diff --git a/src/emucore/CartSB.hxx b/src/emucore/CartSB.hxx index 20938fd15..0590fd80f 100644 --- a/src/emucore/CartSB.hxx +++ b/src/emucore/CartSB.hxx @@ -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 */ diff --git a/src/emucore/CartUA.hxx b/src/emucore/CartUA.hxx index 6f2f08561..a26ac284c 100644 --- a/src/emucore/CartUA.hxx +++ b/src/emucore/CartUA.hxx @@ -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 */ diff --git a/src/emucore/CartWD.hxx b/src/emucore/CartWD.hxx index 7f6106271..23fb84d67 100644 --- a/src/emucore/CartWD.hxx +++ b/src/emucore/CartWD.hxx @@ -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 */ diff --git a/src/emucore/CartX07.hxx b/src/emucore/CartX07.hxx index e3cacda29..e4f6bcc4a 100644 --- a/src/emucore/CartX07.hxx +++ b/src/emucore/CartX07.hxx @@ -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 */ diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index d6345efa9..bf097acd1 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -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(Controller::Left, myEvent, *mySystem); } - + // Construct right controller if(right == "BOOSTERGRIP") { diff --git a/src/emucore/Console.hxx b/src/emucore/Console.hxx index e0a771999..f4fb437f3 100644 --- a/src/emucore/Console.hxx +++ b/src/emucore/Console.hxx @@ -71,7 +71,7 @@ class Console : public Serializable */ Console(OSystem& osystem, unique_ptr& cart, const Properties& props); - + /** Destructor */ diff --git a/src/emucore/Control.cxx b/src/emucore/Control.cxx index d637c5c56..5d4f05e20 100644 --- a/src/emucore/Control.cxx +++ b/src/emucore/Control.cxx @@ -85,7 +85,7 @@ Controller::Controller(Jack jack, const Event& event, const System& system, break; } } - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Controller::~Controller() { diff --git a/src/emucore/Control.hxx b/src/emucore/Control.hxx index 6ddafe2bd..fbffe22a6 100644 --- a/src/emucore/Control.hxx +++ b/src/emucore/Control.hxx @@ -106,7 +106,7 @@ class Controller : public Serializable */ Controller(Jack jack, const Event& event, const System& system, Type type); - + /** Destructor */ diff --git a/src/emucore/Driving.cxx b/src/emucore/Driving.cxx index 98af8855b..c31e6eeb2 100644 --- a/src/emucore/Driving.cxx +++ b/src/emucore/Driving.cxx @@ -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); diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx index d3adc9a1e..840615feb 100644 --- a/src/emucore/EventHandler.hxx +++ b/src/emucore/EventHandler.hxx @@ -85,7 +85,7 @@ class EventHandler Create a new event handler object */ EventHandler(OSystem& osystem); - + /** Destructor */ diff --git a/src/emucore/M6532.cxx b/src/emucore/M6532.cxx index b71ea3430..93398f7f6 100644 --- a/src/emucore/M6532.cxx +++ b/src/emucore/M6532.cxx @@ -35,12 +35,12 @@ M6532::M6532(const Console& console, const Settings& settings) myEdgeDetectPositive(false) { } - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - M6532::~M6532() { } - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void M6532::reset() { diff --git a/src/emucore/M6532.hxx b/src/emucore/M6532.hxx index 4dbcf7412..d6f5ffa6a 100644 --- a/src/emucore/M6532.hxx +++ b/src/emucore/M6532.hxx @@ -55,7 +55,7 @@ class M6532 : public Device @param settings The settings used by the system */ M6532(const Console& console, const Settings& settings); - + /** Destructor */ diff --git a/src/emucore/MT24LC256.cxx b/src/emucore/MT24LC256.cxx index f811aa7d1..9a99d4835 100644 --- a/src/emucore/MT24LC256.cxx +++ b/src/emucore/MT24LC256.cxx @@ -91,7 +91,7 @@ MT24LC256::MT24LC256(const string& filename, const System& system) // Then initialize the I2C state jpee_init(); } - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MT24LC256::~MT24LC256() { diff --git a/src/emucore/MT24LC256.hxx b/src/emucore/MT24LC256.hxx index 29774cf60..ce1ef78ff 100644 --- a/src/emucore/MT24LC256.hxx +++ b/src/emucore/MT24LC256.hxx @@ -43,7 +43,7 @@ class MT24LC256 @param system The system using the controller of this device */ MT24LC256(const string& filename, const System& system); - + /** Destructor */ diff --git a/src/emucore/NullDev.hxx b/src/emucore/NullDev.hxx index 4c764884d..4df422ded 100644 --- a/src/emucore/NullDev.hxx +++ b/src/emucore/NullDev.hxx @@ -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$ */ diff --git a/src/emucore/Props.hxx b/src/emucore/Props.hxx index 23e522c85..799712d3f 100644 --- a/src/emucore/Props.hxx +++ b/src/emucore/Props.hxx @@ -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 diff --git a/src/emucore/Switches.hxx b/src/emucore/Switches.hxx index e35b776c7..1625450c0 100644 --- a/src/emucore/Switches.hxx +++ b/src/emucore/Switches.hxx @@ -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 */ diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx index 4f0a51c5a..86825af33 100644 --- a/src/emucore/System.hxx +++ b/src/emucore/System.hxx @@ -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. diff --git a/src/emucore/TIA.cxx b/src/emucore/TIA.cxx index 1bff7708d..a78df2465 100644 --- a/src/emucore/TIA.cxx +++ b/src/emucore/TIA.cxx @@ -246,7 +246,7 @@ void TIA::systemCyclesReset() myClockAtLastUpdate -= clocks; myVSYNCFinishClock -= clocks; } - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void TIA::install(System& system) { diff --git a/src/emucore/TIA.hxx b/src/emucore/TIA.hxx index 07dd5ac60..d49b99c9f 100644 --- a/src/emucore/TIA.hxx +++ b/src/emucore/TIA.hxx @@ -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 */ diff --git a/src/gui/EventMappingWidget.hxx b/src/gui/EventMappingWidget.hxx index e42127ad1..bffefb016 100644 --- a/src/gui/EventMappingWidget.hxx +++ b/src/gui/EventMappingWidget.hxx @@ -46,7 +46,6 @@ class EventMappingWidget : public Widget, public CommandSender const StringList& actions, EventMode mode); ~EventMappingWidget(); - bool remapMode() { return myRemapStatus; } void setDefaults(); diff --git a/src/gui/SnapshotDialog.cxx b/src/gui/SnapshotDialog.cxx index 0cdc099ea..52d02b453 100644 --- a/src/gui/SnapshotDialog.cxx +++ b/src/gui/SnapshotDialog.cxx @@ -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"); diff --git a/src/tools/scrom.asm b/src/tools/scrom.asm index c656c5ed3..914ffd77f 100644 --- a/src/tools/scrom.asm +++ b/src/tools/scrom.asm @@ -47,7 +47,7 @@ ENABL equ $1f HMP0 equ $20 HMP1 equ $21 HMOVE equ $2a - + ;; ;; Entry point for multi-load reading ;;