From 4803b5be6cdbf4b6fc5e8a9b34288ed68b390cbf Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Tue, 10 Oct 2006 15:56:41 +0000 Subject: [PATCH] MacOSX compilation fixes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15295 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/FileDialog.C | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/frontends/qt4/FileDialog.C b/src/frontends/qt4/FileDialog.C index 719cd17f49..ff2610a48f 100644 --- a/src/frontends/qt4/FileDialog.C +++ b/src/frontends/qt4/FileDialog.C @@ -79,10 +79,11 @@ FileDialog::Result const FileDialog::save(docstring const & path, result.first = FileDialog::Chosen; #ifdef USE_NATIVE_FILEDIALOG - docstring const startsWith = makeAbsPath(suggested, path); + docstring const startsWith + = lyx::from_utf8(makeAbsPath(lyx::to_utf8(suggested), lyx::to_utf8(path))); result.second = qstring_to_ucs4(QFileDialog::getSaveFileName( qApp->focusWidget(), - title_.c_str(), toqstr(startsWith), toqstr(filters.as_string()) )); + toqstr(title_), toqstr(startsWith), toqstr(filters.as_string()) )); #else LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2); dlg.setFileMode(QFileDialog::AnyFile); @@ -113,10 +114,11 @@ FileDialog::Result const FileDialog::open(docstring const & path, result.first = FileDialog::Chosen; #ifdef USE_NATIVE_FILEDIALOG - docstring const startsWith = makeAbsPath(suggested, path); + docstring const startsWith = + lyx::from_utf8(makeAbsPath(lyx::to_utf8(suggested), lyx::to_utf8(path))); result.second = qstring_to_ucs4(QFileDialog::getOpenFileName( qApp->focusWidget(), - title_.c_str(), toqstr(startsWith), toqstr(filters.as_string()) )); + toqstr(title_), toqstr(startsWith), toqstr(filters.as_string()) )); #else LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2); @@ -143,10 +145,11 @@ FileDialog::Result const FileDialog::opendir(docstring const & path, result.first = FileDialog::Chosen; #ifdef USE_NATIVE_FILEDIALOG - docstring const startsWith = makeAbsPath(suggested, path); + docstring const startsWith + = lyx::from_utf8(makeAbsPath(lyx::to_utf8(suggested), lyx::to_utf8(path))); result.second = qstring_to_ucs4(QFileDialog::getExistingDirectory( qApp->focusWidget(), - title_.c_str(),toqstr(startsWith) )); + toqstr(title_),toqstr(startsWith) )); #else FileFilterList const filter(_("Directories"));