Update Win installer for new dictionary links. Untested.

[lyx.git] / src / Converter.h

diff --git a/src/Converter.h b/src/Converter.h
index fe95be6ed8948e099df16fac6990c4037e7df432..091dbcd394e4b8075f3d4d04af6ad279c96a3d7d 100644 (file)
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -13,7 +13,6 @@
 #define CONVERTER_H
 
 #include "Graph.h"
-#include "OutputParams.h"
 #include "support/trivstring.h"
 
 #include <vector>
@@ -29,12 +28,15 @@ class Buffer;
 class ErrorList;
 class Format;
 class Formats;
+class OutputParams;
+
+enum class Flavor : int;
 
 class ConversionException : public std::exception {
 public:
        ConversionException() {}
-       virtual ~ConversionException() throw() {}
-       virtual const char * what() const throw() 
+       virtual ~ConversionException() noexcept {}
+       const char * what() const noexcept override
                { return "Exception caught in conversion routine!"; }
 };
 
@@ -56,7 +58,7 @@ public:
        ///
        std::string const command() const { return command_; }
        ///
-       void setCommand(std::string const & command) { command_ = command; }
+       void setCommand(std::string const & command);
        ///
        std::string const flags() const { return flags_; }
        ///
@@ -142,7 +144,7 @@ public:
                FAILURE = 1,
                KILLED  = 1000
        };
-       
+
        ///
        Converter const & get(int i) const { return converterlist_[i]; }
        ///
@@ -175,10 +177,10 @@ public:
        ///
        Graph::EdgePath getPath(std::string const & from, std::string const & to);
        ///
-       OutputParams::FLAVOR getFlavor(Graph::EdgePath const & path,
-                                          Buffer const * buffer = nullptr);
+       Flavor getFlavor(Graph::EdgePath const & path,
+                                          Buffer const * buffer = nullptr) const;
        ///
-       std::string getHyperrefDriver(Graph::EdgePath const & path);
+       std::string getHyperrefDriver(Graph::EdgePath const & path) const;
        /// Flags for converting files
        enum ConversionFlags {
                /// No special flags
@@ -199,7 +201,7 @@ public:
        ///
        void updateLast(Formats const & formats);
        ///
-       bool formatIsUsed(std::string const & format);
+       bool formatIsUsed(std::string const & format) const;
        ///
        const_iterator begin() const { return converterlist_.begin(); }
        ///