Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/FileDialog.h b/src/frontends/qt4/FileDialog.h
index a20fb40ba8d5b9c627475991ccb186101587ffcf..d60d9a4b0012b3a5ce2eadd502666f9238ae0ae5 100644 (file)
--- a/src/frontends/qt4/FileDialog.h
+++ b/src/frontends/qt4/FileDialog.h
@@ -13,7 +13,7 @@
 #ifndef FILEDIALOG_H
 #define FILEDIALOG_H
 
-#include "lfuns.h"
+#include "FuncCode.h"
 
 #include <QString>
 
@@ -21,9 +21,6 @@
 
 namespace lyx {
 
-namespace support { class FileFilterList; }
-
-
 /**
  * \class FileDialog
  * \brief GUI-I definition of file dialog interface
@@ -54,7 +51,7 @@ public:
         * additional directories in the navigation (an empty
         * directory is interpreted as FileName::getcwd())
         */
-       FileDialog(QString const & title, kb_action a = LFUN_SELECT_FILE_SYNC);
+       FileDialog(QString const & title, FuncCode a = LFUN_SELECT_FILE_SYNC);
 
        ~FileDialog();
 
@@ -62,8 +59,7 @@ public:
        void setButton2(QString const & label, QString const & dir);
 
        /// Choose a file for opening, starting in directory \c path.
-       Result open(QString const & path,
-                         support::FileFilterList const & filters,
+       Result open(QString const & path, QStringList const & filters,
                          QString const & suggested = QString());
 
        /// Choose a directory, starting in directory \c path.
@@ -71,10 +67,14 @@ public:
                             QString const & suggested = QString());
 
        /// Choose a file for saving, starting in directory \c  path.
-       Result save(QString const & path,
-                         support::FileFilterList const & filters,
+       Result save(QString const & path, QStringList const & filters,
                          QString const & suggested = QString());
 
+       /// Also retrieve the selected filter (selectedFilter can be 0 if
+       /// that output is not needed).
+       Result save(QString const & path, QStringList const & filters,
+                   QString const & suggested, QString *selectedFilter);
+
 private:
        class Private;
        friend class Private;
@@ -84,7 +84,7 @@ private:
        QString title_;
 
        /// success action to perform if not synchronous
-       kb_action success_;
+       FuncCode success_;
 };
 
 } // namespace lyx