Fixed some lines that were too long. It compiled afterwards.

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

diff --git a/src/frontends/FileDialog.h b/src/frontends/FileDialog.h
index 4ee3aa68f0f4a0c4995990a98b2463e1f79d45f3..bd97a66dc4419fbd3ab562ed2d09898515f55494 100644 (file)
--- a/src/frontends/FileDialog.h
+++ b/src/frontends/FileDialog.h
@@ -13,12 +13,17 @@
 #ifndef FILEDIALOG_H
 #define FILEDIALOG_H
 
+#include "lfuns.h"
+#include "support/docstring.h"
 
 #include <utility>
+#include <string>
 
-#include "lfuns.h"
 
-#include "LString.h"
+namespace lyx {
+
+namespace support { class FileFilterList; }
+
 
 /**
  * \class FileDialog
@@ -28,7 +33,7 @@ class FileDialog
 {
 public:
        /// label, directory path button
-       typedef std::pair<string, string> Button;
+       typedef std::pair<docstring, docstring> Button;
 
        /// result type
        enum ResultType {
@@ -37,7 +42,7 @@ public:
        };
 
        /// result return
-       typedef std::pair<FileDialog::ResultType, string> Result;
+       typedef std::pair<FileDialog::ResultType, docstring> Result;
 
        /**
         * Constructs a file dialog with title \param title.
@@ -50,64 +55,40 @@ public:
         * additional directories in the navigation (an empty
         * directory is interpreted as getcwd())
         */
-       FileDialog(string const & title,
+       FileDialog(docstring const & title,
                   kb_action a = LFUN_SELECT_FILE_SYNC,
-                  Button b1 = Button(string(), string()),
-                  Button b2 = Button(string(), string()));
+                  Button b1 = Button(docstring(), docstring()),
+                  Button b2 = Button(docstring(), docstring()));
 
 
        ~FileDialog();
 
-       /**
-        * Choose a file for opening, starting in directory \param
-        * path, with the file selection \param mask. The \param mask
-        * string is of the form :
-        *
-        * <glob to match> | <description>
-        *
-        * for example, "*.ps | PostScript files (*.ps)".
-        *
-        * FIXME: should support multiple lines of these for different file types.
-        */
-       Result const open(string const & path = string(),
-               string const & mask = string(),
-               string const & suggested = string());
+       /// Choose a file for opening, starting in directory \c path.
+       Result const open(docstring const & path,
+                         support::FileFilterList const & filters,
+                         docstring const & suggested);
 
-       /**
-        * Choose a directory, starting in directory \param
-        * path.
-        */
-       Result const opendir(string const & path = string(),
-               string const & suggested = string());
-
-       /**
-        * Choose a file for saving, starting in directory \param
-        * path, with the file selection \param mask. The \param mask
-        * string is of the form :
-        *
-        * <glob to match> | <description>
-        *
-        * for example, "*.ps | PostScript files (*.ps)".
-        */
-       Result const save(string const & path = string(),
-               string const & mask = string(),
-               string const & suggested = string());
+       /// Choose a directory, starting in directory \c path.
+       Result const opendir(docstring const & path = docstring(),
+                            docstring const & suggested = docstring());
 
+       /// Choose a file for saving, starting in directory \c  path.
+       Result const save(docstring const & path,
+                         support::FileFilterList const & filters,
+                         docstring const & suggested);
 
-       /* This *has* to be public because there is no way to specify extern "C" functions
-        * as friends of Private implementation for the xforms implementation ... grr
-        */
+private:
        class Private;
        friend class Private;
        Private * private_;
 
-private:
        /// the dialog title
-       string title_;
+       docstring title_;
 
        /// success action to perform if not synchronous
        kb_action success_;
-
 };
 
+} // namespace lyx
+
 #endif // FILEDIALOG_H