fix typo that put too many include paths for most people

[lyx.git] / src / converter.h

diff --git a/src/converter.h b/src/converter.h
index 013370c3935517471d3d7cb73fc5f269ee4dbc10..0f507af1ac66fde8c46f878cb98d21dff8b7f0d2 100644 (file)
--- a/src/converter.h
+++ b/src/converter.h
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -34,9 +34,9 @@ public:
        ///
        bool dummy() const;
        ///
-       bool IsChildFormat() const;
+       bool isChildFormat() const;
        ///
-       string const ParentFormat() const;
+       string const parentFormat() const;
        ///
        string const & name() const {
                return name_;
@@ -61,9 +61,6 @@ public:
        void setViewer(string const & v) {
                viewer_ = v;
        }
-       friend bool operator<(Format const & a, Format const & b) {
-               return compare_no_case(a.prettyname(),b.prettyname()) < 0;
-       }
 private:
        string name_;
        ///
@@ -77,39 +74,46 @@ private:
 };
 
 
+inline
+bool operator<(Format const & a, Format const & b)
+{
+       return compare_no_case(a.prettyname(), b.prettyname()) < 0;
+}
+
+
 ///
 class Formats {
 public:
-        ///
-        typedef std::vector<Format> FormatList;
+       ///
+       typedef std::vector<Format> FormatList;
        ///
        typedef FormatList::const_iterator const_iterator;
        ///
-       Format const & Get(int i) const {
+       Format const & get(FormatList::size_type i) const {
                return formatlist[i];
        }
        ///
-       Format const * GetFormat(string const & name) const;
+       Format const * getFormat(string const & name) const;
        ///
-       int GetNumber(string const & name) const;
+       int getNumber(string const & name) const;
        ///
-       void Add(string const & name);
+       void add(string const & name);
        ///
-       void Add(string const & name, string const & extension, 
+       void add(string const & name, string const & extension,
                 string const & prettyname, string const & shortcut);
        ///
-       void Delete(string const & name);
+       void erase(string const & name);
        ///
-       void Sort();
+       void sort();
        ///
-       void SetViewer(string const & name, string const & command);
+       void setViewer(string const & name, string const & command);
        ///
-       bool View(Buffer const * buffer, string const & filename,
+       bool view(Buffer const * buffer, string const & filename,
                  string const & format_name) const;
        ///
-       string const PrettyName(string const & name) const;
+       string const prettyName(string const & name) const;
        ///
-       string const Extension(string const & name) const;
+       string const extension(string const & name) const;
        ///
        const_iterator begin() const {
                return formatlist.begin();
@@ -138,7 +142,7 @@ public:
                : from(f), to(t), command(c), flags(l), From(0), To(0),
                  latex(false), original_dir(false), need_aux(false) {}
        ///
-       void ReadFlags();
+       void readFlags();
        ///
        string from;
        ///
@@ -172,77 +176,79 @@ public:
 ///
 class Converters {
 public:
-        typedef std::vector<Converter> ConverterList;
+       typedef std::vector<Converter> ConverterList;
        ///
        typedef ConverterList::const_iterator const_iterator;
        ///
        typedef std::vector<int> EdgePath;
        ///
-       Converter const & Get(int i) const {
-               return converterlist[i];
+       Converter const & get(int i) const {
+               return converterlist_[i];
        }
        ///
-       Converter const * GetConverter(string const & from, string const & to);
+       Converter const * getConverter(string const & from, string const & to);
        ///
-       int GetNumber(string const & from, string const & to);
+       int getNumber(string const & from, string const & to);
        ///
-       void Add(string const & from, string const & to,
+       void add(string const & from, string const & to,
                 string const & command, string const & flags);
        //
-       void Delete(string const & from, string const & to);
+       void erase(string const & from, string const & to);
        ///
-       void Sort();
+       void sort();
        ///
        std::vector<Format const *> const
-       GetReachableTo(string const & target, bool clear_visited);
+       getReachableTo(string const & target, bool clear_visited);
        ///
        std::vector<Format const *> const
-       GetReachable(string const & from, bool only_viewable,
+       getReachable(string const & from, bool only_viewable,
                     bool clear_visited);
        ///
-       bool IsReachable(string const & from, string const & to);
+       bool isReachable(string const & from, string const & to);
        ///
-       EdgePath const GetPath(string const & from, string const & to);
+       EdgePath const getPath(string const & from, string const & to);
        ///
-       bool UsePdflatex(EdgePath const & path);
+       bool usePdflatex(EdgePath const & path);
        ///
-       bool Convert(Buffer const * buffer,
+       bool convert(Buffer const * buffer,
                     string const & from_file, string const & to_file_base,
                     string const & from_format, string const & to_format,
                     string & to_file);
        ///
-       bool Convert(Buffer const * buffer,
+       bool convert(Buffer const * buffer,
                     string const & from_file, string const & to_file_base,
                     string const & from_format, string const & to_format);
        ///
-       string const dvi_papersize(Buffer const * buffer);
+       string const papersize(Buffer const * buffer);
        ///
        string const dvips_options(Buffer const * buffer);
        ///
-       void Update(Formats const & formats);
+       string const dvipdfm_options(Buffer const * buffer);
+       ///
+       void update(Formats const & formats);
        ///
-       void UpdateLast(Formats const & formats);
+       void updateLast(Formats const & formats);
        ///
-       void BuildGraph();
+       void buildGraph();
        ///
-       bool FormatIsUsed(string const & format);
+       bool formatIsUsed(string const & format);
        ///
        const_iterator begin() const {
-               return converterlist.begin();
+               return converterlist_.begin();
        }
        const_iterator end() const {
-               return converterlist.end();
+               return converterlist_.end();
        }
 private:
        ///
-       bool scanLog(Buffer const * buffer, string const & command, 
+       bool scanLog(Buffer const * buffer, string const & command,
                     string const & filename);
        ///
        bool runLaTeX(Buffer const * buffer, string const & command);
        ///
-       ConverterList converterlist;
+       ConverterList converterlist_;
        ///
-       string latex_command;
+       string latex_command_;
        ///
        struct Vertex {
                std::vector<int> in_vertices;
@@ -251,15 +257,15 @@ private:
        };
        ///
        static
-       std::vector<Vertex> vertices;
+       std::vector<Vertex> vertices_;
        ///
-       std::vector<bool> visited;
+       std::vector<bool> visited_;
        ///
-       std::queue<int> Q;
+       std::queue<int> Q_;
        ///
-       int BFS_init(string const & start, bool clear_visited = true);
+       int bfs_init(string const & start, bool clear_visited = true);
        ///
-       bool Move(string const & from, string const & to, bool copy);
+       bool move(string const & from, string const & to, bool copy);
 };
 
 extern Formats formats;