diff --git a/src/emucore/AtariVox.cxx b/src/emucore/AtariVox.cxx index d17d71c08..2898891f8 100644 --- a/src/emucore/AtariVox.cxx +++ b/src/emucore/AtariVox.cxx @@ -119,4 +119,4 @@ void AtariVox::reset() { myLastDataWriteCycle = 0; SaveKey::reset(); -} \ No newline at end of file +} diff --git a/src/emucore/SaveKey.cxx b/src/emucore/SaveKey.cxx index f987d3c8d..77f717101 100644 --- a/src/emucore/SaveKey.cxx +++ b/src/emucore/SaveKey.cxx @@ -31,11 +31,8 @@ SaveKey::SaveKey(Jack jack, const Event& event, const System& system, // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SaveKey::SaveKey(Jack jack, const Event& event, const System& system, const string& eepromfile) - : Controller(jack, event, system, Controller::SaveKey) + : SaveKey(jack, event, system, eepromfile, Controller::SaveKey) { - myEEPROM = make_unique(eepromfile, system); - - myDigitalPinState[One] = myDigitalPinState[Two] = true; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -79,4 +76,4 @@ void SaveKey::write(DigitalPin pin, bool value) default: break; } -} \ No newline at end of file +} diff --git a/src/emucore/SaveKey.hxx b/src/emucore/SaveKey.hxx index d3a88aecd..d7b24620d 100644 --- a/src/emucore/SaveKey.hxx +++ b/src/emucore/SaveKey.hxx @@ -33,18 +33,6 @@ class SaveKey : public Controller { public: - /** - Create a new SaveKey controller plugged into the specified jack - - @param jack The jack the controller is plugged into - @param event The event object to use for events - @param system The system using this controller - @param eepromfile The file containing the EEPROM data - @param type The type for this controller - */ - SaveKey(Jack jack, const Event& event, const System& system, - const string& eepromfile, Type type); - /** Create a new SaveKey controller plugged into the specified jack @@ -55,9 +43,17 @@ class SaveKey : public Controller */ SaveKey(Jack jack, const Event& event, const System& system, const string& eepromfile); - + virtual ~SaveKey() = default; + protected: + /** + Delegating constructor currently used by both this class and classes + that inherit from SaveKey (currently, AtariVox) + */ + SaveKey(Jack jack, const Event& event, const System& system, + const string& eepromfile, Type type); + public: using Controller::read;