diff --git a/src/frontends/qt4/qt_helpers.C b/src/frontends/qt4/qt_helpers.C index e8ed5bbfc9..c1ede0f9c9 100644 --- a/src/frontends/qt4/qt_helpers.C +++ b/src/frontends/qt4/qt_helpers.C @@ -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)))); } diff --git a/src/support/os.h b/src/support/os.h index dffedb5fa5..0fce6c1d16 100644 --- a/src/support/os.h +++ b/src/support/os.h @@ -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); diff --git a/src/support/os_cygwin.C b/src/support/os_cygwin.C index 63afa5bdb7..d281294ab7 100644 --- a/src/support/os_cygwin.C +++ b/src/support/os_cygwin.C @@ -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)); diff --git a/src/support/os_unix.C b/src/support/os_unix.C index 4fb46c2e6e..aff294b7b4 100644 --- a/src/support/os_unix.C +++ b/src/support/os_unix.C @@ -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; diff --git a/src/support/os_win32.C b/src/support/os_win32.C index 3dc6ab652a..468e8491c2 100644 --- a/src/support/os_win32.C +++ b/src/support/os_win32.C @@ -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, '/', '\\');