John's character.C patch (bug fix).

[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 4e6be14a621b88f8672e881c3d1fb9b7f63c244e..daadcdaa33ed4fc9227898ff9a6937633da7a9c8 100644 (file)
--- a/src/frontends/controllers/helper_funcs.h
+++ b/src/frontends/controllers/helper_funcs.h
@@ -15,6 +15,8 @@
 #ifndef HELPERFUNCS_H
 #define HELPERFUNCS_H
 
+#include <utility> // pair
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -29,40 +31,24 @@ getStringFromVector(std::vector<string> const & vec, string const & delim=",");
 std::vector<string> const
 getVectorFromString(string const & str, string const & delim=",");
 
+class LyXView;
+ 
+/** Launch a file dialog and return the chosen file.
+    filename: a suggested filename.
+    title: the title of the dialog.
+    pattern: *.ps etc.
+    dir1 = (name, dir), dir2 = (name, dir): extra buttons on the dialog.
+*/
+string const browseFile(LyXView *lv, string const & filename,
+                       string const & title,
+                       string const & pattern, 
+                       std::pair<string,string> const & dir1,
+                       std::pair<string,string> const & dir2);
+
 /** Functions to extract vectors of the first and second elems from a
     vector<pair<A,B> >
 */
 
-///
-template <class A, class B>
-std::vector<A> const getFirst(std::vector<std::pair<A,B> > const & pairVec)
-{
-       typedef std::vector<std::pair<A,B> > PV;
-
-       std::vector<A> first(pairVec.size());
-
-       for (PV::size_type i = 0; i < pairVec.size(); ++i) {
-               first[i] = pairVec[i].first;
-       }
-
-       return first;
-}
-///
-template <class A, class B>
-std::vector<B> const getSecond(std::vector<std::pair<A,B> > const & pairVec)
-{
-       typedef std::vector<std::pair<A,B> > PV;
-
-       std::vector<B> second(pairVec.size());
-
-       for (PV::size_type i = 0; i < pairVec.size(); ++i) {
-               second[i] = pairVec[i].second;
-       }
-
-       return second;
-}
-
-
 template<class Pair>
 struct firster {
        typedef typename Pair::first_type first_type;
@@ -75,23 +61,25 @@ struct seconder {
        second_type const & operator()(Pair const & p) { return p.second; }
 };
 
+///
 template<class Pair>
-typename Pair::first_type const getFirst(std::vector<Pair> const & pr)
+std::vector<typename Pair::first_type> const
+getFirst(std::vector<Pair> const & pr)
 {
-       std::vector<typename Pair::first_type> tmp(pr.size);
+       std::vector<typename Pair::first_type> tmp(pr.size());
        std::transform(pr.begin(), pr.end(), tmp.begin(), firster<Pair>());
        return tmp;
 }
 
+///
 template<class Pair>
-typename Pair::second_type const getSecond(std::vector<Pair> const & pr)
+std::vector<typename Pair::second_type> const
+getSecond(std::vector<Pair> const & pr)
 {
-       std::vector<typename Pair::second_type> tmp(pr.size);
+       std::vector<typename Pair::second_type> tmp(pr.size());
        std::transform(pr.begin(), pr.end(), tmp.begin(), seconder<Pair>());
        return tmp;
 }
 
 
-
 #endif // HELPERFUNCS_H
-