Compil fix.

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

diff --git a/src/frontends/qt4/FileDialog.h b/src/frontends/qt4/FileDialog.h
index a4e69da2f286cdf31ff1429bc459f317a9d897dd..f5da6eb73e0e4506bfedd4fb5016f381a580275b 100644 (file)
--- a/src/frontends/qt4/FileDialog.h
+++ b/src/frontends/qt4/FileDialog.h
@@ -13,17 +13,14 @@
 #ifndef FILEDIALOG_H
 #define FILEDIALOG_H
 
-#include "lfuns.h"
-#include "support/docstring.h"
+#include "FuncCode.h"
 
-#include <string>
+#include <QString>
 
+#include <utility>
 
 namespace lyx {
 
-namespace support { class FileFilterList; }
-
-
 /**
  * \class FileDialog
  * \brief GUI-I definition of file dialog interface
@@ -32,7 +29,7 @@ class FileDialog
 {
 public:
        /// label, directory path button
-       typedef std::pair<docstring, docstring> Button;
+       typedef std::pair<QString, QString> Button;
 
        /// result type
        enum ResultType {
@@ -41,7 +38,7 @@ public:
        };
 
        /// result return
-       typedef std::pair<FileDialog::ResultType, docstring> Result;
+       typedef std::pair<FileDialog::ResultType, QString> Result;
 
        /**
         * Constructs a file dialog with title \param title.
@@ -54,26 +51,24 @@ public:
         * additional directories in the navigation (an empty
         * directory is interpreted as FileName::getcwd())
         */
-       FileDialog(docstring const & title, kb_action a = LFUN_SELECT_FILE_SYNC);
+       FileDialog(QString const & title, FuncCode a = LFUN_SELECT_FILE_SYNC);
 
        ~FileDialog();
 
-       void setButton1(docstring const & label, docstring const & dir);
-       void setButton2(docstring const & label, docstring const & dir);
+       void setButton1(QString const & label, QString const & dir);
+       void setButton2(QString const & label, QString const & dir);
 
        /// Choose a file for opening, starting in directory \c path.
-       Result const open(docstring const & path,
-                         support::FileFilterList const & filters,
-                         docstring const & suggested);
+       Result open(QString const & path, QStringList const & filters,
+                         QString const & suggested = QString());
 
        /// Choose a directory, starting in directory \c path.
-       Result const opendir(docstring const & path = docstring(),
-                            docstring const & suggested = docstring());
+       Result opendir(QString const & path = QString(),
+                            QString const & suggested = QString());
 
        /// Choose a file for saving, starting in directory \c  path.
-       Result const save(docstring const & path,
-                         support::FileFilterList const & filters,
-                         docstring const & suggested);
+       Result save(QString const & path, QStringList const & filters,
+                         QString const & suggested = QString());
 
 private:
        class Private;
@@ -81,10 +76,10 @@ private:
        Private * private_;
 
        /// the dialog title
-       docstring title_;
+       QString title_;
 
        /// success action to perform if not synchronous
-       kb_action success_;
+       FuncCode success_;
 };
 
 } // namespace lyx