Minipage is no more (long live the box inset)

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

diff --git a/src/frontends/FileDialog.h b/src/frontends/FileDialog.h
index 6355bd39cf39c014dd1c648986a2c91d06b1c72d..423e8404e1e887f4e207fe7ccd5bbe1596b99248 100644 (file)
--- a/src/frontends/FileDialog.h
+++ b/src/frontends/FileDialog.h
@@ -7,18 +7,17 @@
  * \author unknown
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FILEDIALOG_H
 #define FILEDIALOG_H
 
+#include "lfuns.h"
 
 #include <utility>
+#include <string>
 
-#include "commandtags.h"
-
-#include "LString.h"
 
 /**
  * \class FileDialog
@@ -28,7 +27,7 @@ class FileDialog
 {
 public:
        /// label, directory path button
-       typedef std::pair<string, string> Button;
+       typedef std::pair<std::string, std::string> Button;
 
        /// result type
        enum ResultType {
@@ -37,7 +36,7 @@ public:
        };
 
        /// result return
-       typedef std::pair<FileDialog::ResultType, string> Result;
+       typedef std::pair<FileDialog::ResultType, std::string> Result;
 
        /**
         * Constructs a file dialog with title \param title.
@@ -50,10 +49,10 @@ public:
         * additional directories in the navigation (an empty
         * directory is interpreted as getcwd())
         */
-       FileDialog(string const & title,
+       FileDialog(std::string const & title,
                   kb_action a = LFUN_SELECT_FILE_SYNC,
-                  Button b1 = Button(string(), string()),
-                  Button b2 = Button(string(), string()));
+                  Button b1 = Button(std::string(), std::string()),
+                  Button b2 = Button(std::string(), std::string()));
 
 
        ~FileDialog();
@@ -69,16 +68,16 @@ public:
         *
         * 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());
-               
+       Result const open(std::string const & path = std::string(),
+               std::string const & mask = std::string(),
+               std::string const & suggested = std::string());
+
        /**
         * Choose a directory, starting in directory \param
         * path.
         */
-       Result const opendir(string const & path = string(),
-               string const & suggested = string());
+       Result const opendir(std::string const & path = std::string(),
+               std::string const & suggested = std::string());
 
        /**
         * Choose a file for saving, starting in directory \param
@@ -89,9 +88,9 @@ public:
         *
         * for example, "*.ps | PostScript files (*.ps)".
         */
-       Result const save(string const & path = string(),
-               string const & mask = string(),
-               string const & suggested = string());
+       Result const save(std::string const & path = std::string(),
+               std::string const & mask = std::string(),
+               std::string const & suggested = std::string());
 
 
        /* This *has* to be public because there is no way to specify extern "C" functions
@@ -103,7 +102,7 @@ public:
 
 private:
        /// the dialog title
-       string title_;
+       std::string title_;
 
        /// success action to perform if not synchronous
        kb_action success_;