[Scummvm-git-logs] scummvm master -> 56d1305f9d50ded07bfc866f3bda0f673e423c88

criezy criezy at scummvm.org
Tue Dec 18 00:06:54 CET 2018


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:
56d1305f9d COMMON: Rename enum variable for native browser feature


Commit: 56d1305f9d50ded07bfc866f3bda0f673e423c88
    https://github.com/scummvm/scummvm/commit/56d1305f9d50ded07bfc866f3bda0f673e423c88
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-12-17T23:06:07Z

Commit Message:
COMMON: Rename enum variable for native browser feature

There was a typo in the name (missing 'r' in browser).

Changed paths:
    backends/platform/sdl/macosx/macosx.cpp
    backends/platform/sdl/win32/win32.cpp
    common/system.h
    gui/options.cpp


diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index b58255c..ae9203f 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -112,7 +112,7 @@ bool OSystem_MacOSX::hasFeature(Feature f) {
 		return true;
 
 #ifdef USE_SYSDIALOGS
-	if (f == kFeatureNativeFileBowserDialog)
+	if (f == kFeatureSystemBrowserDialog)
 		return true;
 #endif
 
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index e837bbae..93159a7 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -109,7 +109,7 @@ bool OSystem_Win32::hasFeature(Feature f) {
 		return true;
 
 #ifdef USE_SYSDIALOGS
-	if (f == kFeatureNativeFileBowserDialog)
+	if (f == kFeatureSystemBrowserDialog)
 		return true;
 #endif
 
diff --git a/common/system.h b/common/system.h
index 73a4ad6..b336708 100644
--- a/common/system.h
+++ b/common/system.h
@@ -409,7 +409,7 @@ public:
 		* Supports for using the native system file browser dialog
 		 through the DialogManager.
 		*/
-		kFeatureNativeFileBowserDialog
+		kFeatureSystemBrowserDialog
 
 	};
 
diff --git a/gui/options.cpp b/gui/options.cpp
index 3e6183c..f1efacd 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1705,7 +1705,7 @@ void GlobalOptionsDialog::build() {
 
 #endif // USE_TRANSLATION
 
-	if (g_system->hasFeature(OSystem::kFeatureNativeFileBowserDialog)) {
+	if (g_system->hasFeature(OSystem::kFeatureSystemBrowserDialog)) {
 		_useSystemDialogsCheckbox = new CheckboxWidget(tab, "GlobalOptions_Misc.UseSystemDialogs",
 			_("Use native system file browser"),
 			_("Use the native system file browser instead of the ScummVM one to select a file or directory.")





More information about the Scummvm-git-logs mailing list