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

[mduggan]

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

Summary:
79e2b0ceba CREATE_PROJECT: Add override keyword to remove build warnings
e3a8524818 MACOSX: Remove unused variable
c71ac4748b TTS: Fix compiler warning


Commit: 79e2b0cebaa864d1409578c5a58085c60fdd8738
    https://github.com/scummvm/scummvm/commit/79e2b0cebaa864d1409578c5a58085c60fdd8738
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-10T14:58:44+09:00

Commit Message:
CREATE_PROJECT: Add override keyword to remove build warnings

Changed paths:
    devtools/create_project/msbuild.h


diff --git a/devtools/create_project/msbuild.h b/devtools/create_project/msbuild.h
index 12c2b25e57..e2c1b46bf8 100644
--- a/devtools/create_project/msbuild.h
+++ b/devtools/create_project/msbuild.h
@@ -33,21 +33,21 @@ public:
 
 protected:
 	void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir,
-	                       const StringList &includeList, const StringList &excludeList);
+	                       const StringList &includeList, const StringList &excludeList) override;
 
 	void outputProjectSettings(std::ofstream &project, const std::string &name, const BuildSetup &setup, bool isRelease, MSVC_Architecture arch, const std::string &configuration);
 
 	void writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int indentation,
-	                            const StringList &duplicate, const std::string &objPrefix, const std::string &filePrefix);
+	                            const StringList &duplicate, const std::string &objPrefix, const std::string &filePrefix) override;
 
-	void writeReferences(const BuildSetup &setup, std::ofstream &output);
+	void writeReferences(const BuildSetup &setup, std::ofstream &output) override;
 
 	void outputGlobalPropFile(const BuildSetup &setup, std::ofstream &properties, MSVC_Architecture arch, const StringList &defines, const std::string &prefix, bool runBuildEvents) override;
 
 	void createBuildProp(const BuildSetup &setup, bool isRelease, MSVC_Architecture arch, const std::string &configuration) override;
 
-	const char *getProjectExtension();
-	const char *getPropertiesExtension();
+	const char *getProjectExtension() override;
+	const char *getPropertiesExtension() override;
 
 private:
 	struct FileEntry {


Commit: e3a85248186fb281b626d5d660b27bcc54a16617
    https://github.com/scummvm/scummvm/commit/e3a85248186fb281b626d5d660b27bcc54a16617
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-10T15:03:08+09:00

Commit Message:
MACOSX: Remove unused variable

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.mm


diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 07e9a0047b..914b3e5dea 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -204,7 +204,6 @@ void replaceApplicationMenuItems() {
 		[[NSApp mainMenu] removeItemAtIndex:0];
 	}
 
-	NSString *nsString = NULL;
 	NSMenu *appleMenu = addMenu(Common::U32String("ScummVM"), @"", @selector(setAppleMenu:));
 	if (appleMenu) {
 		addMenuItem(_("About ScummVM"), nil, @selector(orderFrontStandardAboutPanel:), @"", appleMenu);


Commit: c71ac4748bdcaa76e513000c357674251221b947
    https://github.com/scummvm/scummvm/commit/c71ac4748bdcaa76e513000c357674251221b947
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-10T15:11:49+09:00

Commit Message:
TTS: Fix compiler warning

Changed paths:
    backends/text-to-speech/macosx/macosx-text-to-speech.mm


diff --git a/backends/text-to-speech/macosx/macosx-text-to-speech.mm b/backends/text-to-speech/macosx/macosx-text-to-speech.mm
index aa91c4dba5..336132c2f9 100644
--- a/backends/text-to-speech/macosx/macosx-text-to-speech.mm
+++ b/backends/text-to-speech/macosx/macosx-text-to-speech.mm
@@ -240,7 +240,7 @@ int MacOSXTextToSpeechManager::getDefaultVoice() {
 	NSString *defaultVoice = [NSSpeechSynthesizer defaultVoice];
 	if (defaultVoice == nil)
 		return 0;
-	for (int i = 0 ; i < _ttsState->_availableVoices.size() ; ++i) {
+	for (unsigned int i = 0 ; i < _ttsState->_availableVoices.size() ; ++i) {
 		if ([defaultVoice isEqualToString:(NSString*)(_ttsState->_availableVoices[i].getData())])
 			return i;
 	}