Do not show master's errors if compiling child

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

diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp
index 133fd09bfb807286296d6a34368858f7a610bd1f..f1156348d4497349ea5fe8710c09f4cf7c0b6c1e 100644 (file)
--- a/src/frontends/qt4/FileDialog.cpp
+++ b/src/frontends/qt4/FileDialog.cpp
@@ -35,7 +35,7 @@
  *
  * Therefore there is a tradeoff in enabling or disabling this (JMarc)
  */
-#if defined(Q_WS_MACX) || (defined(Q_WS_WIN) && !defined(Q_OS_CYGWIN))
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 #define USE_NATIVE_FILEDIALOG 1
 #endif
 
@@ -55,8 +55,8 @@ public:
 };
 
 
-FileDialog::FileDialog(QString const & t, FuncCode s)
-       : private_(new FileDialog::Private), title_(t), success_(s)
+FileDialog::FileDialog(QString const & t)
+       : private_(new FileDialog::Private), title_(t)
 {}
 
 
@@ -82,7 +82,7 @@ void FileDialog::setButton2(QString const & label, QString const & dir)
 
 FileDialog::Result FileDialog::save(QString const & path,
        QStringList const & filters, QString const & suggested,
-       QString & selectedFilter)
+       QString * selectedFilter)
 {
        LYXERR(Debug::GUI, "Select with path \"" << path
                           << "\", mask \"" << filters.join(";;")
@@ -93,21 +93,21 @@ FileDialog::Result FileDialog::save(QString const & path,
 
 #ifdef USE_NATIVE_FILEDIALOG
        QString const startsWith = makeAbsPath(suggested, path);
-       QString const name = 
+       QString const name =
                QFileDialog::getSaveFileName(qApp->focusWidget(),
-            title_, startsWith, filters.join(";;"),
-                        &selectedFilter, QFileDialog::DontConfirmOverwrite);
+               title_, startsWith, filters.join(";;"),
+               selectedFilter, QFileDialog::DontConfirmOverwrite);
        if (name.isNull())
                result.first = FileDialog::Later;
        else
                result.second = toqstr(os::internal_path(fromqstr(name)));
 #else
        LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
-#if QT_VERSION != 0x040203
        dlg.setFileMode(QFileDialog::AnyFile);
-#endif
        dlg.setAcceptMode(QFileDialog::AcceptSave);
        dlg.setConfirmOverwrite(false);
+       if (selectedFilter != 0 && !selectedFilter->isEmpty())
+               dlg.selectNameFilter(*selectedFilter);
 
        if (!suggested.isEmpty())
                dlg.selectFile(suggested);
@@ -119,7 +119,8 @@ FileDialog::Result FileDialog::save(QString const & path,
                result.second = internalPath(dlg.selectedFiles()[0]);
        else
                result.first = FileDialog::Later;
-       selectedFilter = dlg.selectedNameFilter();
+       if (selectedFilter != 0)
+               *selectedFilter = dlg.selectedNameFilter();
        dlg.hide();
 #endif
        return result;
@@ -129,8 +130,7 @@ FileDialog::Result FileDialog::save(QString const & path,
 FileDialog::Result FileDialog::save(QString const & path,
        QStringList const & filters, QString const & suggested)
 {
-       QString selectedFilter;
-       return save(path, filters, suggested, selectedFilter);
+       return save(path, filters, suggested, 0);
 }