Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
bb19532a
Commit
bb19532a
authored
Apr 20, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: remove completely unsensical and unneeded delocalize method
parent
9bd42d7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
29 deletions
+1
-29
modules/gui/macosx/StringUtility.h
modules/gui/macosx/StringUtility.h
+0
-1
modules/gui/macosx/StringUtility.m
modules/gui/macosx/StringUtility.m
+0
-25
modules/gui/macosx/prefs_widgets.m
modules/gui/macosx/prefs_widgets.m
+1
-3
No files found.
modules/gui/macosx/StringUtility.h
View file @
bb19532a
...
...
@@ -39,7 +39,6 @@ unsigned int CocoaKeyToVLC(unichar i_key);
+
(
VLCStringUtility
*
)
sharedInstance
;
-
(
NSString
*
)
localizedString
:(
const
char
*
)
psz
;
-
(
char
*
)
delocalizeString
:(
NSString
*
)
psz
;
-
(
NSString
*
)
wrapString
:
(
NSString
*
)
o_in_string
toWidth
:
(
int
)
i_width
;
-
(
NSString
*
)
OSXStringKeyToString
:(
NSString
*
)
theString
;
-
(
NSString
*
)
getCurrentTimeAsString
:(
input_thread_t
*
)
p_input
negative
:(
BOOL
)
b_negative
;
...
...
modules/gui/macosx/StringUtility.m
View file @
bb19532a
...
...
@@ -70,31 +70,6 @@ static VLCStringUtility *_o_sharedInstance = nil;
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 */
-
(
NSString
*
)
wrapString
:
(
NSString
*
)
o_in_string
toWidth
:
(
int
)
i_width
{
...
...
modules/gui/macosx/prefs_widgets.m
View file @
bb19532a
...
...
@@ -1075,10 +1075,8 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
if
([
o_popup
indexOfSelectedItem
]
>=
0
)
{
if
(
p_item
->
list
.
psz
[[
o_popup
indexOfSelectedItem
]]
!=
NULL
)
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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment