fix crash due to invalidated iterator

[lyx.git] / src / frontends / controllers / helper_funcs.h

diff --git a/src/frontends/controllers/helper_funcs.h b/src/frontends/controllers/helper_funcs.h
index 0530656eb1fcad6a8f1d773ee216d37aae7ed5fc..36def74d207e43bc6f45c97b371d475ea7fc4304 100644 (file)
--- a/src/frontends/controllers/helper_funcs.h
+++ b/src/frontends/controllers/helper_funcs.h
@@ -12,9 +12,20 @@
 #ifndef HELPERFUNCS_H
 #define HELPERFUNCS_H
 
-#include "support/std_string.h"
+#include <boost/bind.hpp>
 #include <utility>
 #include <vector>
+#include <string>
+
+
+namespace lyx {
+
+namespace support {
+class FileFilterList;
+} // namespace support
+
+
+namespace frontend {
 
 /** Launch a file dialog and return the chosen file.
     filename: a suggested filename.
@@ -22,33 +33,46 @@
     pattern: *.ps etc.
     dir1 = (name, dir), dir2 = (name, dir): extra buttons on the dialog.
 */
-string const
-browseFile(string const & filename,
-          string const & title,
-          string const & pattern,
+std::string const
+browseFile(std::string const & filename,
+          std::string const & title,
+          support::FileFilterList const & filters,
           bool save = false,
-          std::pair<string,string> const & dir1 =
-          std::make_pair(string(), string()),
-          std::pair<string,string> const & dir2 =
-          std::make_pair(string(), string()));
+          std::pair<std::string,std::string> const & dir1 =
+          std::make_pair(std::string(), std::string()),
+          std::pair<std::string,std::string> const & dir2 =
+          std::make_pair(std::string(), std::string()));
 
 
-/* Wrapper around browseFile which tries to provide a filename
-   relative to relpath.  If the relative path is of the form "foo.txt"
-   or "bar/foo.txt", then it is returned as relative. OTOH, if it is
-   of the form "../baz/foo.txt", an absolute path is returned. This is
-   intended to be useful for insets which encapsulate files/
+/** Wrapper around browseFile which tries to provide a filename
+    relative to relpath.  If the relative path is of the form "foo.txt"
+    or "bar/foo.txt", then it is returned as relative. OTOH, if it is
+    of the form "../baz/foo.txt", an absolute path is returned. This is
+    intended to be useful for insets which encapsulate files/
 */
-string const
-browseRelFile(string const & filename,
-             string const & refpath,
-             string const & title,
-             string const & pattern,
+std::string const
+browseRelFile(std::string const & filename,
+             std::string const & refpath,
+             std::string const & title,
+             support::FileFilterList const & filters,
              bool save = false,
-             std::pair<string,string> const & dir1 =
-             std::make_pair(string(), string()),
-             std::pair<string,string> const & dir2 =
-             std::make_pair(string(), string()));
+             std::pair<std::string,std::string> const & dir1 =
+             std::make_pair(std::string(), std::string()),
+             std::pair<std::string,std::string> const & dir2 =
+             std::make_pair(std::string(), std::string()));
+
+
+/** Wrapper around browseFile which tries to provide a filename
+ *  relative to the user or system directory. The dir, name and ext
+ *  parameters have the same meaning as in the
+ *  lyx::support::LibFileSearch function.
+ */
+std::string const
+browseLibFile(std::string const & dir,
+             std::string const & name,
+             std::string const & ext,
+             std::string const & title,
+             support::FileFilterList const & filters);
 
 
 /** Launch a file dialog and return the chosen directory.
@@ -56,60 +80,43 @@ browseRelFile(string const & filename,
     title: the title of the dialog.
     dir1 = (name, dir), dir2 = (name, dir): extra buttons on the dialog.
 */
-string const
-browseDir(string const & pathname,
-          string const & title,
-          std::pair<string,string> const & dir1 =
-          std::make_pair(string(), string()),
-          std::pair<string,string> const & dir2 =
-          std::make_pair(string(), string()));
+std::string const
+browseDir(std::string const & pathname,
+          std::string const & title,
+          std::pair<std::string,std::string> const & dir1 =
+          std::make_pair(std::string(), std::string()),
+          std::pair<std::string,std::string> const & dir2 =
+          std::make_pair(std::string(), std::string()));
 
 
 /// Returns a vector of units that can be used to create a valid LaTeX length.
-std::vector<string> const getLatexUnits();
+std::vector<std::string> const getLatexUnits();
 
 
 /** Functions to extract vectors of the first and second elems from a
     vector<pair<A,B> >
 */
-
-namespace detail {
-
-template<class Pair>
-struct firster {
-       typedef typename Pair::first_type first_type;
-       first_type const & operator()(Pair const & p) { return p.first; }
-};
-
-template<class Pair>
-struct seconder {
-       typedef typename Pair::second_type second_type;
-       second_type const & operator()(Pair const & p) { return p.second; }
-};
-
-} // namespace detail
-
-///
 template<class Pair>
 std::vector<typename Pair::first_type> const
 getFirst(std::vector<Pair> const & pr)
 {
        std::vector<typename Pair::first_type> tmp(pr.size());
        std::transform(pr.begin(), pr.end(), tmp.begin(),
-                      detail::firster<Pair>());
+                      boost::bind(&Pair::first, _1));
        return tmp;
 }
 
-///
 template<class Pair>
 std::vector<typename Pair::second_type> const
 getSecond(std::vector<Pair> const & pr)
 {
        std::vector<typename Pair::second_type> tmp(pr.size());
        std::transform(pr.begin(), pr.end(), tmp.begin(),
-                      detail::seconder<Pair>());
+                      boost::bind(&Pair::second, _1));
        return tmp;
 }
 
+} // namespace frontend
+} // namespace lyx
 
-#endif // HELPERFUNCS_H
+#endif // NOT HELPERFUNCS_H