* lyxfunctional.h: delete compare_memfun and helper classes

[lyx.git] / src / support / globbing.C

diff --git a/src/support/globbing.C b/src/support/globbing.C
index b0d16e88e46e39772e7545478e656909de9240c5..eb25cc50b4f7eb426cd5d024d1ffc8dbd00ddeea 100644 (file)
--- a/src/support/globbing.C
+++ b/src/support/globbing.C
@@ -16,12 +16,13 @@
 
 #include "lstrings.h"
 #include "path.h"
-#include "std_sstream.h"
 
 #include <boost/regex.hpp>
 #include <boost/tokenizer.hpp>
 
-#include "glob.h"
+#include <glob.h>
+
+#include <sstream>
 
 using std::distance;
 using std::ostringstream;
@@ -113,8 +114,9 @@ vector<string> const expand_globs(string const & mask,
 
 FileFilterList::FileFilterList(string const & qt_style_filter)
 {
-       string const filter = qt_style_filter.empty() ?
-               _("All files (*)") : qt_style_filter;
+       string const filter = qt_style_filter
+               + (qt_style_filter.empty() ? string() : ";;")
+               + _("All files (*)");
 
        // Split data such as "TeX documents (*.tex);;LyX Documents (*.lyx)"
        // into individual filters.