tostr -> convert and some bformat work

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

diff --git a/src/support/globbing.h b/src/support/globbing.h
index 08f117c47d68d6f4772e4591ecfc4fb76b2a8b2f..d495a9670c8925f768d6a49fc96338ea591c7cb4 100644 (file)
--- a/src/support/globbing.h
+++ b/src/support/globbing.h
@@ -18,71 +18,17 @@
 namespace lyx {
 namespace support {
 
-/** Given a string such as
- *      "<glob> <glob> ... *.{abc,def} <glob>",
- *  convert the csh-style brace expresions:
- *      "<glob> <glob> ... *.abc *.def <glob>".
- *  Requires no system support, so should work equally on Unix, Mac, Win32.
- */
-std::string const convert_brace_glob(std::string const & glob);
-
-
 /** A wrapper for the Posix function 'glob'.
+ *  \param matches files found to match \c pattern are appended.
  *  \param pattern the glob to be expanded. Eg "*.[Ch]".
+ *  \param working_dir the starting directory from which \c pattern
+ *  is to be expanded. Used only if \c pattern is a relative path.
  *  \param flags flags to be passed to the system function. See 'man glob'.
- *  \returns a vector of the files found to match \c pattern.
- */
-std::vector<std::string> const glob(std::string const & pattern, int flags = 0);
-
-
-/** Given a string "<glob> <glob> <glob>", expand each glob in turn.
- *  Any glob that cannot be expanded is ignored silently.
- *  Invokes \c convert_brace_glob and \c glob internally, so use only
- *  on systems supporting the Posix function 'glob'.
- *  \param mask the string "<glob> <glob> <glob>".
- *  \param directory (if not empty) the current working directory from
- *  which \c glob is invoked.
- *  \returns a vector of all matching file names.
  */
-std::vector<std::string> const
-expand_globs(std::string const & mask,
-            std::string const & directory = std::string());
-
-
-/** \c FileFilterList parses a Qt-style list of available file filters
- *  to generate the corresponding vector.
- *  For example "TeX documents (*.tex);;LyX Documents (*.lyx)"
- *  will be parsed to fill a vector of size 2, whilst "*.{p[bgp]m} *.pdf"
- *  will result in a vector of size 1 in which the description field is empty.
- */
-class FileFilterList {
-public:
-       class Filter {
-               std::string desc_;
-               std::string globs_;
-       public:
-               Filter(std::string const & d, std::string const & g)
-                       : desc_(d), globs_(g) {}
-               std::string const & description() const { return desc_; }
-               std::string const & globs() const { return globs_; }
-       };
-
-       /** \param qt_style_filter a list of available file filters.
-        *  Eg. "TeX documents (*.tex);;LyX Documents (*.lyx)"
-        *  If empty, set to "All files (*)".
-        */
-       explicit FileFilterList(std::string const & qt_style_filter = std::string());
-       std::vector<Filter> const & filters() const { return filters_; }
-
-       /** \param expand pass each glob through \c convert_brace_glob.
-        *  \returns the equivalent of the string passed to the c-tor.
-        */
-       std::string const str(bool expand) const;
-
-private:
-       void parse_filter(std::string const & filter);
-       std::vector<Filter> filters_;
-};
+void glob(std::vector<std::string> & matches,
+         std::string const & pattern,
+         std::string const & working_dir,
+         int flags = 0);
 
 } // namespace support
 } // namespace lyx