From a317391e3d1333979d0294ee62cc898bd0e3e85c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 8 Oct 2013 19:08:06 -0400 Subject: [PATCH] [Android] Change the names of the functions responsible for loading/saving config values in UserPreferences.java. Makes readability better, since they have names that actually go with each other now. LoadIniToPrefs() and SavePrefsToIni(). --- .../src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 2 +- .../dolphinemu/settings/CPUSettingsFragment.java | 2 +- .../dolphinemu/dolphinemu/settings/UserPreferences.java | 8 ++++---- .../dolphinemu/settings/VideoSettingsFragment.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 836cb9f857..b06669f8f7 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -83,7 +83,7 @@ public final class DolphinEmulator extends Activity // Load the configuration keys set in the Dolphin ini and gfx ini files // into the application's shared preferences. - UserPreferences.LoadDolphinConfigToPrefs(this); + UserPreferences.LoadIniToPrefs(this); } } } \ No newline at end of file diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java index eb81e53fc3..309412c2f4 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java @@ -67,6 +67,6 @@ public final class CPUSettingsFragment extends PreferenceFragment super.onDestroy(); // When this fragment is destroyed, force the settings to be saved to the ini file. - UserPreferences.SaveConfigToDolphinIni(m_activity); + UserPreferences.SavePrefsToIni(m_activity); } } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java index eadd95bde4..3811f96a0c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java @@ -22,11 +22,11 @@ import android.preference.PreferenceManager; public final class UserPreferences { /** - * Loads the set config items from the Dolphin config files to the shared preferences of this front-end + * Loads the settings stored in the Dolphin ini config files to the shared preferences of this front-end. * * @param ctx The context used to retrieve the SharedPreferences instance. */ - public static void LoadDolphinConfigToPrefs(Context ctx) + public static void LoadIniToPrefs(Context ctx) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx); @@ -106,11 +106,11 @@ public final class UserPreferences } /** - * Writes the config to the Dolphin ini file. + * Writes the preferences set in the front-end to the Dolphin ini files. * * @param ctx The context used to retrieve the user settings. * */ - public static void SaveConfigToDolphinIni(Context ctx) + public static void SavePrefsToIni(Context ctx) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx); diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index 94d11f5a9c..ef8bafb34c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -294,6 +294,6 @@ public final class VideoSettingsFragment extends PreferenceFragment super.onDestroy(); // When the fragment is done being used, save the settings to the Dolphin ini file. - UserPreferences.SaveConfigToDolphinIni(m_activity); + UserPreferences.SavePrefsToIni(m_activity); } }