Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / FileDialog.cpp

diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp
index eb956cdf374aa05754f2ac20f8900786acb8d356..c6e8b85c8da0a8cc57a413b2b04ccf133e4a032f 100644 (file)
--- a/src/frontends/qt4/FileDialog.cpp
+++ b/src/frontends/qt4/FileDialog.cpp
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "frontends/FileDialog.h"
+#include "FileDialog.h"
 
 #include "LyXFileDialog.h"
 #include "qt_helpers.h"
@@ -57,7 +57,7 @@ public:
 };
 
 
-FileDialog::FileDialog(docstring const & t, kb_action s)
+FileDialog::FileDialog(QString const & t, FuncCode s)
        : private_(new FileDialog::Private), title_(t), success_(s)
 {}
 
@@ -68,41 +68,41 @@ FileDialog::~FileDialog()
 }
 
 
-void FileDialog::setButton1(docstring const & label, docstring const & dir)
+void FileDialog::setButton1(QString const & label, QString const & dir)
 {
        private_->b1.first = label;
        private_->b1.second = dir;
 }
 
 
-void FileDialog::setButton2(docstring const & label, docstring const & dir)
+void FileDialog::setButton2(QString const & label, QString const & dir)
 {
        private_->b2.first = label;
        private_->b2.second = dir;
 }
 
 
-FileDialog::Result const FileDialog::save(docstring const & path,
+FileDialog::Result FileDialog::save(QString const & path,
                                          FileFilterList const & filters,
-                                         docstring const & suggested)
+                                         QString const & suggested)
 {
-       LYXERR(Debug::GUI, "Select with path \"" << to_utf8(path)
+       LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
                           << "\", mask \"" << to_utf8(filters.as_string())
-                          << "\", suggested \"" << to_utf8(suggested) << '"');
+                          << "\", suggested \"" << fromqstr(suggested) << '"');
        FileDialog::Result result;
        result.first = FileDialog::Chosen;
 
 #ifdef USE_NATIVE_FILEDIALOG
-       docstring 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
@@ -111,69 +111,67 @@ FileDialog::Result const FileDialog::save(docstring const & path,
        dlg.setAcceptMode(QFileDialog::AcceptSave);
        dlg.setConfirmOverwrite(false);
 
-       if (!suggested.empty())
-               dlg.selectFile(toqstr(suggested));
+       if (!suggested.isEmpty())
+               dlg.selectFile(suggested);
 
        LYXERR(Debug::GUI, "Synchronous FileDialog: ");
        int res = dlg.exec();
        LYXERR(Debug::GUI, "result " << res);
        if (res == QDialog::Accepted)
-               result.second = from_utf8(internal_path(
-                                       fromqstr(dlg.selectedFiles()[0])));
+               result.second = internalPath(dlg.selectedFiles()[0]);
        dlg.hide();
 #endif
        return result;
 }
 
 
-FileDialog::Result const FileDialog::open(docstring const & path,
+FileDialog::Result FileDialog::open(QString const & path,
                                          FileFilterList const & filters,
-                                         docstring const & suggested)
+                                         QString const & suggested)
 {
-       LYXERR(Debug::GUI, "Select with path \"" << to_utf8(path)
-                          << "\", mask \"" << to_utf8(filters.as_string())
-                          << "\", suggested \"" << to_utf8(suggested) << '"');
+       LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
+                          << "\", mask \"" << filters.as_string()
+                          << "\", suggested \"" << fromqstr(suggested) << '"');
        FileDialog::Result result;
        result.first = FileDialog::Chosen;
 
 #ifdef USE_NATIVE_FILEDIALOG
-       docstring const startsWith = from_utf8(
-               makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
-       result.second = from_utf8(internal_path(fromqstr(
+       QString const startsWith = toqstr(
+               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);
 
-       if (!suggested.empty())
-               dlg.selectFile(toqstr(suggested));
+       if (!suggested.isEmpty())
+               dlg.selectFile(suggested);
 
        LYXERR(Debug::GUI, "Synchronous FileDialog: ");
        int res = dlg.exec();
        LYXERR(Debug::GUI, "result " << res);
        if (res == QDialog::Accepted)
-               result.second = from_utf8(internal_path(
-                                       fromqstr(dlg.selectedFiles()[0])));
+               result.second = internalPath(dlg.selectedFiles()[0]);
        dlg.hide();
 #endif
        return result;
 }
 
 
-FileDialog::Result const FileDialog::opendir(docstring const & path,
-                                           docstring const & suggested)
+FileDialog::Result FileDialog::opendir(QString const & path,
+                                           QString const & suggested)
 {
-       LYXERR(Debug::GUI, "Select with path \"" << to_utf8(path)
-                          << "\", suggested \"" << to_utf8(suggested) << '"');
+       LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
+                          << "\", suggested \"" << fromqstr(suggested) << '"');
        FileDialog::Result result;
        result.first = FileDialog::Chosen;
 
 #ifdef USE_NATIVE_FILEDIALOG
-       docstring const startsWith = from_utf8(
-               makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
-       result.second = from_utf8(internal_path(fromqstr(
+       QString const startsWith = toqstr(
+               makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
+       result.second = toqstr(internal_path(fromqstr(
                QFileDialog::getExistingDirectory(qApp->focusWidget(),
-               toqstr(title_),toqstr(startsWith)))));
+               title_, startsWith))));
 #else
        FileFilterList const filter(_("Directories"));
 
@@ -181,15 +179,14 @@ FileDialog::Result const FileDialog::opendir(docstring const & path,
 
        dlg.setFileMode(QFileDialog::DirectoryOnly);
 
-       if (!suggested.empty())
-               dlg.selectFile(toqstr(suggested));
+       if (!suggested.isEmpty())
+               dlg.selectFile(suggested);
 
        LYXERR(Debug::GUI, "Synchronous FileDialog: ");
        int res = dlg.exec();
        LYXERR(Debug::GUI, "result " << res);
        if (res == QDialog::Accepted)
-               result.second = from_utf8(internal_path(
-                                       fromqstr(dlg.selectedFiles()[0])));
+               result.second = internalPath(dlg.selectedFiles()[0]);
        dlg.hide();
 #endif
        return result;