From: Abdelrazak Younes <younes@lyx.org>
Date: Thu, 6 Mar 2008 09:07:41 +0000 (+0000)
Subject: compile fixes
X-Git-Tag: 1.6.10~5841
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=902b41c919aadf08a81456c189c902513e687420;p=features.git

compile fixes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23506 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp
index 964820b164..8c5ae98140 100644
--- a/src/frontends/qt4/FileDialog.cpp
+++ b/src/frontends/qt4/FileDialog.cpp
@@ -93,16 +93,16 @@ FileDialog::Result FileDialog::save(QString const & path,
 	result.first = FileDialog::Chosen;
 
 #ifdef USE_NATIVE_FILEDIALOG
-	QString const startsWith = from_utf8(
-		makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
+	QString const startsWith = toqstr(
+		makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
 	QString const name = 
 		QFileDialog::getSaveFileName(qApp->focusWidget(),
-					     toqstr(title_), 
-					     toqstr(startsWith), 
+					     title_, 
+					     startsWith, 
 					     toqstr(filters.as_string()),
 					     0, 
 					     QFileDialog::DontConfirmOverwrite);
-	result.second = from_utf8(internal_path(fromqstr(name)));
+	result.second = toqstr(internal_path(fromqstr(name)));
 #else
 	LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
 #if QT_VERSION != 0x040203
@@ -140,7 +140,7 @@ FileDialog::Result FileDialog::open(QString const & path,
 		makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
 	result.second = internalPath(
 		QFileDialog::getOpenFileName(qApp->focusWidget(),
-		toqstr(title_), toqstr(startsWith), toqstr(filters.as_string()) ));
+		title_, startsWith, toqstr(filters.as_string()) ));
 #else
 	LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
 
@@ -169,9 +169,9 @@ FileDialog::Result FileDialog::opendir(QString const & path,
 #ifdef USE_NATIVE_FILEDIALOG
 	QString const startsWith = toqstr(
 		makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
-	result.second = from_utf8(internal_path(fromqstr(
+	result.second = toqstr(internal_path(fromqstr(
 		QFileDialog::getExistingDirectory(qApp->focusWidget(),
-		toqstr(title_),toqstr(startsWith)))));
+		title_, startsWith))));
 #else
 	FileFilterList const filter(_("Directories"));