Amend 3093789e for cmake build

[lyx.git] / src / Converter.h

diff --git a/src/Converter.h b/src/Converter.h
index 0031d023f77b39e6f8b816e4eced9f607fccba7b..b9ee3292bbc2832ae272b92bfaf3405220cca7d0 100644 (file)
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -33,8 +33,8 @@ class Formats;
 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!"; }
 };
 
@@ -74,7 +74,7 @@ public:
        ///
        std::string const latex_flavor() const { return latex_flavor_; }
        ///
-       bool xml() const { return xml_; }
+       bool docbook() const { return docbook_; }
        ///
        bool need_aux() const { return need_aux_; }
        /// Return whether or not the needauth option is set for this converter
@@ -108,8 +108,8 @@ private:
        bool latex_;
        /// The latex derivate
        trivstring latex_flavor_;
-       /// The converter is xml
-       bool xml_;
+       /// The converter is DocBook
+       bool docbook_;
        /// This converter needs the .aux files
        bool need_aux_;
        /// we need a "nice" file from the backend, c.f. OutputParams.nice.
@@ -176,9 +176,9 @@ public:
        Graph::EdgePath getPath(std::string const & from, std::string const & to);
        ///
        OutputParams::FLAVOR getFlavor(Graph::EdgePath const & path,
-                                      Buffer const * buffer = 0);
+                                          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
@@ -193,13 +193,13 @@ public:
                     support::FileName const & from_file, support::FileName const & to_file,
                     support::FileName const & orig_from,
                     std::string const & from_format, std::string const & to_format,
-                    ErrorList & errorList, int conversionflags = none);
+                    ErrorList & errorList, int conversionflags = none, bool includeall = false);
        ///
        void update(Formats const & formats);
        ///
        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(); }
        ///