mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Partly revert revision 16744. Georg doesn't want to mix string/docstring in there.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16745 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0c496dc535
commit
200db1541a
@ -182,7 +182,9 @@ docstring const formatted(docstring const & text, int w)
|
||||
|
||||
docstring const internal_path(QString const & input)
|
||||
{
|
||||
return lyx::support::os::internal_path(qstring_to_ucs4(input));
|
||||
// FIXME UNICODE
|
||||
return from_utf8(lyx::support::os::internal_path(
|
||||
to_utf8(qstring_to_ucs4(input))));
|
||||
}
|
||||
|
||||
|
||||
|
@ -52,9 +52,6 @@ std::string external_path(std::string const & p);
|
||||
/// Converts a host OS style path to unix style.
|
||||
std::string internal_path(std::string const & p);
|
||||
|
||||
/// Converts a host OS style path to unix style.
|
||||
docstring internal_path(docstring const & p);
|
||||
|
||||
/// Converts a unix style path list to host OS style.
|
||||
std::string external_path_list(std::string const & p);
|
||||
|
||||
|
@ -211,13 +211,6 @@ string internal_path(string const & p)
|
||||
}
|
||||
|
||||
|
||||
docstring internal_path(docstring const & p)
|
||||
{
|
||||
// FIXME UNICODE
|
||||
return from_utf8(convert_path(to_utf8(p), PathStyle(posix)));
|
||||
}
|
||||
|
||||
|
||||
string external_path_list(string const & p)
|
||||
{
|
||||
return convert_path_list(p, PathStyle(posix));
|
||||
|
@ -70,12 +70,6 @@ string internal_path(string const & p)
|
||||
}
|
||||
|
||||
|
||||
docstring internal_path(docstring const & p)
|
||||
{
|
||||
return p;
|
||||
}
|
||||
|
||||
|
||||
string external_path_list(string const & p)
|
||||
{
|
||||
return p;
|
||||
|
@ -240,13 +240,6 @@ string internal_path(string const & p)
|
||||
}
|
||||
|
||||
|
||||
docstring internal_path(docstring const & p)
|
||||
{
|
||||
// FIXME UNICODE
|
||||
return from_utf8(subst(get_long_path(to_utf8(p)), "\\", "/"));
|
||||
}
|
||||
|
||||
|
||||
string external_path_list(string const & p)
|
||||
{
|
||||
return subst(p, '/', '\\');
|
||||
|
Loading…
Reference in New Issue
Block a user