Commit c2a1ef59 authored by David Fuhrmann's avatar David Fuhrmann

macosx: Rename preferences helpers to better describe purpose

parent 2b5f3a43
......@@ -83,7 +83,7 @@
- (void)toggleFullscreen;
- (BOOL)fixPreferences;
- (BOOL)fixIntfSettings;
- (void)setVideoFilter: (const char *)psz_name on:(BOOL)b_on;
- (void)setVideoFilterProperty: (const char *)psz_property forFilter: (const char *)psz_filter withValue: (vlc_value_t)value;
......
......@@ -674,7 +674,7 @@ static int BossCallback(vlc_object_t *p_this, const char *psz_var,
#pragma mark - uncommon stuff
- (BOOL)fixPreferences
- (BOOL)fixIntfSettings
{
NSMutableString * o_workString;
NSRange returnedRange;
......
......@@ -26,6 +26,6 @@
@interface VLCMain (OldPrefs)
- (void)resetAndReinitializeUserDefaults;
- (void)removeOldPreferences;
- (void)migrateOldPreferences;
@end
......@@ -53,7 +53,7 @@ static const int kCurrentPreferencesVersion = 3;
[[NSUserDefaults standardUserDefaults] synchronize];
}
- (void)removeOldPreferences
- (void)migrateOldPreferences
{
NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
int version = [defaults integerForKey:kVLCPreferencesVersion];
......@@ -71,7 +71,7 @@ static const int kCurrentPreferencesVersion = 3;
[defaults setInteger:kCurrentPreferencesVersion forKey:kVLCPreferencesVersion];
[defaults synchronize];
if (![[VLCCoreInteraction sharedInstance] fixPreferences])
if (![[VLCCoreInteraction sharedInstance] fixIntfSettings])
return;
else
config_SaveConfigFile(getIntf()); // we need to do manually, since we won't quit libvlc cleanly
......
......@@ -292,7 +292,7 @@ static VLCMain *sharedInstance = nil;
[_coreinteraction updateCurrentlyUsedHotkeys];
[self removeOldPreferences];
[self migrateOldPreferences];
/* Handle sleep notification */
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:)
......
......@@ -1022,7 +1022,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
_hotkeyChanged = NO;
}
[[VLCCoreInteraction sharedInstance] fixPreferences];
[[VLCCoreInteraction sharedInstance] fixIntfSettings];
/* okay, let's save our changes to vlcrc */
config_SaveConfigFile(p_intf);
......
......@@ -214,7 +214,7 @@
{
/* TODO: call savePrefs on Root item */
[_rootTreeItem applyChanges];
[[VLCCoreInteraction sharedInstance] fixPreferences];
[[VLCCoreInteraction sharedInstance] fixIntfSettings];
config_SaveConfigFile(getIntf());
[self.window orderOut:self];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment