Commit bb19532a authored by David Fuhrmann's avatar David Fuhrmann

macosx: remove completely unsensical and unneeded delocalize method

parent 9bd42d7e
...@@ -39,7 +39,6 @@ unsigned int CocoaKeyToVLC(unichar i_key); ...@@ -39,7 +39,6 @@ unsigned int CocoaKeyToVLC(unichar i_key);
+ (VLCStringUtility *)sharedInstance; + (VLCStringUtility *)sharedInstance;
- (NSString *)localizedString:(const char *)psz; - (NSString *)localizedString:(const char *)psz;
- (char *)delocalizeString:(NSString *)psz;
- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width; - (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
- (NSString *)OSXStringKeyToString:(NSString *)theString; - (NSString *)OSXStringKeyToString:(NSString *)theString;
- (NSString *)getCurrentTimeAsString:(input_thread_t *)p_input negative:(BOOL)b_negative; - (NSString *)getCurrentTimeAsString:(input_thread_t *)p_input negative:(BOOL)b_negative;
......
...@@ -70,31 +70,6 @@ static VLCStringUtility *_o_sharedInstance = nil; ...@@ -70,31 +70,6 @@ static VLCStringUtility *_o_sharedInstance = nil;
return(o_str); return(o_str);
} }
- (char *)delocalizeString:(NSString *)id
{
NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
allowLossyConversion: NO];
char * psz_string;
if (o_data == nil) {
o_data = [id dataUsingEncoding: NSUTF8StringEncoding
allowLossyConversion: YES];
psz_string = malloc([o_data length] + 1);
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
msg_Err(VLCIntf, "cannot convert to the requested encoding: %s",
psz_string);
} else {
psz_string = malloc([o_data length] + 1);
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
}
return psz_string;
}
/* i_width is in pixels */ /* i_width is in pixels */
- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int) i_width - (NSString *)wrapString: (NSString *)o_in_string toWidth: (int) i_width
{ {
......
...@@ -1075,10 +1075,8 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -1075,10 +1075,8 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
if ([o_popup indexOfSelectedItem] >= 0) { if ([o_popup indexOfSelectedItem] >= 0) {
if (p_item->list.psz[[o_popup indexOfSelectedItem]] != NULL) if (p_item->list.psz[[o_popup indexOfSelectedItem]] != NULL)
return strdup(p_item->list.psz[[o_popup indexOfSelectedItem]]); return strdup(p_item->list.psz[[o_popup indexOfSelectedItem]]);
} else {
if ([[VLCStringUtility sharedInstance] delocalizeString: [o_popup stringValue]] != NULL)
return strdup([[VLCStringUtility sharedInstance] delocalizeString: [o_popup stringValue]]);
} }
return NULL; return NULL;
} }
......
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