mirror of https://github.com/stella-emu/stella.git
Added 'override' keyword to Windows and OSX-specific classes,
even though their respective compilers don't yet support detecting errors with inconsistent override usage. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3184 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
parent
84b225206d
commit
4c8fb3c17d
|
@ -44,8 +44,8 @@ class OSystemMACOSX : public OSystem
|
|||
/**
|
||||
Returns the default paths for the snapshot directory.
|
||||
*/
|
||||
string defaultSnapSaveDir();
|
||||
string defaultSnapLoadDir();
|
||||
string defaultSnapSaveDir() override;
|
||||
string defaultSnapLoadDir() override;
|
||||
|
||||
private:
|
||||
// Following constructors and assignment operators not supported
|
||||
|
|
|
@ -48,13 +48,13 @@ class SettingsMACOSX : public Settings
|
|||
This method should be called to load the current settings from the
|
||||
standard Mac preferences.
|
||||
*/
|
||||
void loadConfig();
|
||||
void loadConfig() override;
|
||||
|
||||
/**
|
||||
This method should be called to save the current settings to the
|
||||
standard Mac preferences.
|
||||
*/
|
||||
void saveConfig();
|
||||
void saveConfig() override;
|
||||
|
||||
private:
|
||||
// Following constructors and assignment operators not supported
|
||||
|
|
|
@ -59,6 +59,13 @@ class SerialPortUNIX : public SerialPort
|
|||
private:
|
||||
// File descriptor for serial connection
|
||||
int myHandle;
|
||||
|
||||
private:
|
||||
// Following constructors and assignment operators not supported
|
||||
SerialPortUNIX(const SerialPortUNIX&) = delete;
|
||||
SerialPortUNIX(SerialPortUNIX&&) = delete;
|
||||
SerialPortUNIX& operator=(const SerialPortUNIX&) = delete;
|
||||
SerialPortUNIX& operator=(SerialPortUNIX&&) = delete;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -59,19 +59,19 @@ class FilesystemNodeWINDOWS : public AbstractFSNode
|
|||
*/
|
||||
FilesystemNodeWINDOWS(const string& path);
|
||||
|
||||
bool exists() const;
|
||||
const string& getName() const { return _displayName; }
|
||||
const string& getPath() const { return _path; }
|
||||
string getShortPath() const;
|
||||
bool isDirectory() const { return _isDirectory; }
|
||||
bool isFile() const { return _isFile; }
|
||||
bool isReadable() const;
|
||||
bool isWritable() const;
|
||||
bool makeDir();
|
||||
bool rename(const string& newfile);
|
||||
bool exists() const override;
|
||||
const string& getName() const override { return _displayName; }
|
||||
const string& getPath() const override { return _path; }
|
||||
string getShortPath() const override;
|
||||
bool isDirectory() const override { return _isDirectory; }
|
||||
bool isFile() const override { return _isFile; }
|
||||
bool isReadable() const override;
|
||||
bool isWritable() const override;
|
||||
bool makeDir() override;
|
||||
bool rename(const string& newfile) override;
|
||||
|
||||
bool getChildren(AbstractFSList& list, ListMode mode, bool hidden) const;
|
||||
AbstractFSNode* getParent() const;
|
||||
bool getChildren(AbstractFSList& list, ListMode mode, bool hidden) const override;
|
||||
AbstractFSNode* getParent() const override;
|
||||
|
||||
protected:
|
||||
string _displayName;
|
||||
|
|
|
@ -45,8 +45,8 @@ class OSystemWINDOWS : public OSystem
|
|||
/**
|
||||
Returns the default paths for the snapshot directory.
|
||||
*/
|
||||
string defaultSnapSaveDir();
|
||||
string defaultSnapLoadDir();
|
||||
string defaultSnapSaveDir() override;
|
||||
string defaultSnapLoadDir() override;
|
||||
|
||||
private:
|
||||
// Following constructors and assignment operators not supported
|
||||
|
|
|
@ -42,12 +42,12 @@ class SerialPortWINDOWS : public SerialPort
|
|||
@param device The name of the port
|
||||
@return False on any errors, else true
|
||||
*/
|
||||
bool openPort(const string& device);
|
||||
bool openPort(const string& device) override;
|
||||
|
||||
/**
|
||||
Close a previously opened serial port.
|
||||
*/
|
||||
void closePort();
|
||||
void closePort() override;
|
||||
|
||||
/**
|
||||
Write a byte to the serial port.
|
||||
|
@ -55,7 +55,7 @@ class SerialPortWINDOWS : public SerialPort
|
|||
@param data The byte to write to the port
|
||||
@return True if a byte was written, else false
|
||||
*/
|
||||
bool writeByte(const uInt8* data);
|
||||
bool writeByte(const uInt8* data) override;
|
||||
|
||||
private:
|
||||
// Handle to serial port
|
||||
|
|
Loading…
Reference in New Issue