[Scummvm-git-logs] scummvm master -> febe9ef39b4e96c5a02927ba6902a92d800c2a8c

[sev-]

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

Summary:
838bdf1ba5 GRAPHICS: MACGUI: Fix warnings
febe9ef39b JANITORIAL: Formatting fixes


Commit: 838bdf1ba546d57bbf87206ebd81f7e4cb0d55c9
    https://github.com/scummvm/scummvm/commit/838bdf1ba546d57bbf87206ebd81f7e4cb0d55c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-12T09:07:21+02:00

Commit Message:
GRAPHICS: MACGUI: Fix warnings

Changed paths:
    graphics/macgui/macmenu.h


diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h
index b41d081683..dbf6144fe7 100644
--- a/graphics/macgui/macmenu.h
+++ b/graphics/macgui/macmenu.h
@@ -77,11 +77,11 @@ public:
 
 	MacMenuSubMenu *getSubmenu(MacMenuSubMenu *submenu, int index);
 
-	virtual bool draw(ManagedSurface *g, bool forceRedraw = false);
-	virtual bool draw(bool forceRedraw = false) { return false; }
-	virtual void blit(ManagedSurface *g, Common::Rect &dest) {}
+	virtual bool draw(ManagedSurface *g, bool forceRedraw = false) override;
+	virtual bool draw(bool forceRedraw = false) override { return false; }
+	virtual void blit(ManagedSurface *g, Common::Rect &dest) override {}
 
-	bool processEvent(Common::Event &event);
+	bool processEvent(Common::Event &event) override;
 
 	void enableCommand(int menunum, int action, bool state);
 	void enableCommand(const char *menuitem, const char *menuaction, bool state);
@@ -89,7 +89,7 @@ public:
 	void disableAllMenus();
 
 	bool isVisible() { return _isVisible; }
-	void setVisible(bool visible, bool silent = false) { _isVisible = visible; _contentIsDirty = true; }
+	void setVisible(bool visible, bool silent = false) override { _isVisible = visible; _contentIsDirty = true; }
 
 	void printMenu(int level = 0, MacMenuSubMenu *submenu = nullptr);
 


Commit: febe9ef39b4e96c5a02927ba6902a92d800c2a8c
    https://github.com/scummvm/scummvm/commit/febe9ef39b4e96c5a02927ba6902a92d800c2a8c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-12T09:16:51+02:00

Commit Message:
JANITORIAL: Formatting fixes

Changed paths:
    engines/director/archive.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 266bb549ac..eb835964d4 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -391,7 +391,7 @@ Common::SeekableSubReadStreamEndian *RIFFArchive::getResource(uint32 tag, uint16
 
 // RIFX Archive code
 
-RIFXArchive::RIFXArchive() : Archive(){
+RIFXArchive::RIFXArchive() : Archive() {
 	_isBigEndian = true;
 	_rifxType = 0;
 }
@@ -642,7 +642,7 @@ bool RIFXArchive::readAfterburnerMap(Common::SeekableSubReadStreamEndian &stream
 	uint32 abmpUncompLength = readVarInt(stream);
 	debug(3, "ABMP: length: %d compressionType: %d uncompressedLength: %d",
 		abmpLength, abmpCompressionType, abmpUncompLength);
-	
+
 	Common::SeekableReadStreamEndian *abmpStream = readZlibData(stream, abmpLength, abmpUncompLength, _isBigEndian);
 	if (!abmpStream) {
 		warning("RIFXArchive::readAfterburnerMap(): Could not uncompress ABMP");
@@ -687,7 +687,7 @@ bool RIFXArchive::readAfterburnerMap(Common::SeekableSubReadStreamEndian &stream
 
 		debug(3, "Found RIFX resource index %d: '%s', %d bytes (%d uncompressed) @ pos 0x%08x (%d), compressionType: %d",
 			resId, tag2str(tag), compSize, uncompSize, offset, offset, compressionType);
-		
+
 		Resource &res = _types[tag][resId];
 		res.index = resId;
 		res.offset = offset;