[Scummvm-git-logs] scummvm master -> 3dac89a267c024ddd44f8fdeb4e01f21a4ca9104

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3dac89a267 BACKENDS: Sprinkle some overrides


Commit: 3dac89a267c024ddd44f8fdeb4e01f21a4ca9104
    https://github.com/scummvm/scummvm/commit/3dac89a267c024ddd44f8fdeb4e01f21a4ca9104
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-31T02:04:47+03:00

Commit Message:
BACKENDS: Sprinkle some overrides

Changed paths:
    backends/platform/dc/vmsave.cpp
    backends/platform/n64/framfs_save_manager.h
    backends/platform/n64/pakfs_save_manager.h
    common/memstream.h
    common/substream.h


diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index aaff2c241b..c10144d41c 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -243,9 +243,9 @@ private:
   int _pos, _size;
   bool _eos;
 
-  uint32 read(void *buf, uint32 cnt);
-  bool skip(uint32 offset);
-  bool seek(int32 offs, int whence);
+  uint32 read(void *buf, uint32 cnt) override;
+  bool skip(uint32 offset) override;
+  bool seek(int32 offs, int whence) override;
 
 public:
   InVMSave()
@@ -257,10 +257,10 @@ public:
     delete[] buffer;
   }
 
-  bool eos() const { return _eos; }
-  void clearErr() { _eos = false; }
-  int32 pos() const { return _pos; }
-  int32 size() const { return _size; }
+  bool eos() const override { return _eos; }
+  void clearErr() override { _eos = false; }
+  int32 pos() const override { return _pos; }
+  int32 size() const override { return _size; }
 
   bool readSaveGame(const char *filename)
   { return ::readSaveGame(buffer, _size, filename); }
diff --git a/backends/platform/n64/framfs_save_manager.h b/backends/platform/n64/framfs_save_manager.h
index 24f9bf10ce..86a275511c 100644
--- a/backends/platform/n64/framfs_save_manager.h
+++ b/backends/platform/n64/framfs_save_manager.h
@@ -34,9 +34,9 @@ class InFRAMSave : public Common::InSaveFile {
 private:
 	FRAMFILE *fd;
 
-	uint32 read(void *buf, uint32 cnt);
-	bool skip(uint32 offset);
-	bool seek(int32 offs, int whence);
+	uint32 read(void *buf, uint32 cnt) override;
+	bool skip(uint32 offset) override;
+	bool seek(int32 offs, int whence) override;
 
 public:
 	InFRAMSave() : fd(NULL) { }
@@ -46,16 +46,16 @@ public:
 			framfs_close(fd);
 	}
 
-	bool eos() const {
+	bool eos() const override {
 		return framfs_eof(fd);
 	}
-	void clearErr() {
+	void clearErr() override {
 		framfs_clearerr(fd);
 	}
-	int32 pos() const {
+	int32 pos() const override {
 		return framfs_tell(fd);
 	}
-	int32 size() const {
+	int32 size() const override {
 		return fd->size;
 	}
 
diff --git a/backends/platform/n64/pakfs_save_manager.h b/backends/platform/n64/pakfs_save_manager.h
index 8e16d1fce4..3303c67384 100644
--- a/backends/platform/n64/pakfs_save_manager.h
+++ b/backends/platform/n64/pakfs_save_manager.h
@@ -34,9 +34,9 @@ class InPAKSave : public Common::InSaveFile {
 private:
 	PAKFILE *fd;
 
-	uint32 read(void *buf, uint32 cnt);
-	bool skip(uint32 offset);
-	bool seek(int32 offs, int whence);
+	uint32 read(void *buf, uint32 cnt) override;
+	bool skip(uint32 offset) override;
+	bool seek(int32 offs, int whence) override;
 
 public:
 	InPAKSave() : fd(NULL) { }
@@ -46,16 +46,16 @@ public:
 			pakfs_close(fd);
 	}
 
-	bool eos() const {
+	bool eos() const override {
 		return pakfs_eof(fd);
 	}
-	void clearErr() {
+	void clearErr() override {
 		pakfs_clearerr(fd);
 	}
-	int32 pos() const {
+	int32 pos() const override {
 		return pakfs_tell(fd);
 	}
-	int32 size() const {
+	int32 size() const override {
 		return fd->size;
 	}
 
diff --git a/common/memstream.h b/common/memstream.h
index c96b4cc1ff..a842cf2137 100644
--- a/common/memstream.h
+++ b/common/memstream.h
@@ -91,12 +91,12 @@ public:
 	MemoryReadStreamEndian(const byte *buf, uint32 len, bool bigEndian, DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO)
 		: MemoryReadStream(buf, len, disposeMemory), SeekableReadStreamEndian(bigEndian), ReadStreamEndian(bigEndian) {}
 
-	int32 pos() const { return MemoryReadStream::pos(); }
-	int32 size() const { return MemoryReadStream::size(); }
+	int32 pos() const override { return MemoryReadStream::pos(); }
+	int32 size() const override { return MemoryReadStream::size(); }
 
-	bool seek(int32 offs, int whence = SEEK_SET) { return MemoryReadStream::seek(offs, whence); }
+	bool seek(int32 offs, int whence = SEEK_SET) override { return MemoryReadStream::seek(offs, whence); }
 
-	bool skip(uint32 offset) { return MemoryReadStream::seek(offset, SEEK_CUR); }
+	bool skip(uint32 offset) override { return MemoryReadStream::seek(offset, SEEK_CUR); }
 };
 
 /**
diff --git a/common/substream.h b/common/substream.h
index 01cecf1bb5..3a3c17377d 100644
--- a/common/substream.h
+++ b/common/substream.h
@@ -103,12 +103,12 @@ public:
 		  ReadStreamEndian(bigEndian) {
 	}
 
-	virtual int32 pos() const { return SeekableSubReadStream::pos(); }
-	virtual int32 size() const { return SeekableSubReadStream::size(); }
+	virtual int32 pos() const override { return SeekableSubReadStream::pos(); }
+	virtual int32 size() const override { return SeekableSubReadStream::size(); }
 
-	virtual bool seek(int32 offset, int whence = SEEK_SET) { return SeekableSubReadStream::seek(offset, whence); }
+	virtual bool seek(int32 offset, int whence = SEEK_SET) override { return SeekableSubReadStream::seek(offset, whence); }
 	void hexdump(int len, int bytesPerLine = 16, int startOffset = 0) { SeekableSubReadStream::hexdump(len, bytesPerLine, startOffset); }
-	bool skip(uint32 offset) { return SeekableSubReadStream::seek(offset, SEEK_CUR); }
+	bool skip(uint32 offset) override { return SeekableSubReadStream::seek(offset, SEEK_CUR); }
 };
 
 /**