We only support gcc >= 4.9.

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 5de38b6cca0a1a7d69a00003ddeae67befcc20c4..b4340c8f520ba8b7deee261c8623561401e7c320 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -13,7 +13,6 @@
 #include "Converter.h"
 
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "ConverterCache.h"
 #include "Encoding.h"
@@ -24,6 +23,7 @@
 #include "LaTeX.h"
 #include "LyXRC.h"
 #include "Mover.h"
+#include "OutputParams.h"
 #include "ParagraphList.h"
 #include "Session.h"
 
@@ -105,7 +105,7 @@ private:
 Converter::Converter(string const & f, string const & t,
                     string const & c, string const & l)
        : from_(f), to_(t), command_(c), flags_(l),
-         From_(nullptr), To_(nullptr), latex_(false), xml_(false),
+         From_(nullptr), To_(nullptr), latex_(false), docbook_(false),
          need_aux_(false), nice_(false), need_auth_(false)
 {}
 
@@ -122,7 +122,7 @@ void Converter::readFlags()
                        latex_flavor_ = flag_value.empty() ?
                                "latex" : flag_value;
                } else if (flag_name == "xml")
-                       xml_ = true;
+                       docbook_ = true;
                else if (flag_name == "needaux") {
                        need_aux_ = true;
                        latex_flavor_ = flag_value.empty() ?
@@ -259,32 +259,32 @@ void Converters::updateLast(Formats const & formats)
 }
 
 
-OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
-                                          Buffer const * buffer)
+Flavor Converters::getFlavor(Graph::EdgePath const & path,
+                                          Buffer const * buffer) const
 {
        for (auto const & edge : path) {
                Converter const & conv = converterlist_[edge];
                if (conv.latex() || conv.need_aux()) {
                        if (conv.latex_flavor() == "latex")
-                               return OutputParams::LATEX;
+                               return Flavor::LaTeX;
                        if (conv.latex_flavor() == "xelatex")
-                               return OutputParams::XETEX;
+                               return Flavor::XeTeX;
                        if (conv.latex_flavor() == "lualatex")
-                               return OutputParams::LUATEX;
+                               return Flavor::LuaTeX;
                        if (conv.latex_flavor() == "dvilualatex")
-                               return OutputParams::DVILUATEX;
+                               return Flavor::DviLuaTeX;
                        if (conv.latex_flavor() == "pdflatex")
-                               return OutputParams::PDFLATEX;
+                               return Flavor::PdfLaTeX;
                }
-               if (conv.xml())
-                       return OutputParams::DOCBOOK5;
+               if (conv.docbook())
+                       return Flavor::DocBook5;
        }
        return buffer ? buffer->params().getOutputFlavor()
-                     : OutputParams::LATEX;
+                     : Flavor::LaTeX;
 }
 
 
-string Converters::getHyperrefDriver(Graph::EdgePath const & path)
+string Converters::getHyperrefDriver(Graph::EdgePath const & path) const
 {
        for (auto const & edge : path) {
                Converter const & conv = converterlist_[edge];
@@ -602,16 +602,16 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                                LASSERT(buffer, return FAILURE);
                                string command;
                                switch (runparams.flavor) {
-                               case OutputParams::DVILUATEX:
+                               case Flavor::DviLuaTeX:
                                        command = dvilualatex_command_;
                                        break;
-                               case OutputParams::LUATEX:
+                               case Flavor::LuaTeX:
                                        command = lualatex_command_;
                                        break;
-                               case OutputParams::PDFLATEX:
+                               case Flavor::PdfLaTeX:
                                        command = pdflatex_command_;
                                        break;
-                               case OutputParams::XETEX:
+                               case Flavor::XeTeX:
                                        command = xelatex_command_;
                                        break;
                                default:
@@ -819,7 +819,7 @@ bool Converters::move(string const & fmt,
 }
 
 
-bool Converters::formatIsUsed(string const & format)
+bool Converters::formatIsUsed(string const & format) const
 {
        for (auto const & cvt : converterlist_) {
                if (cvt.from() == format || cvt.to() == format)
@@ -833,7 +833,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
                         FileName const & filename, ErrorList & errorList)
 {
        OutputParams runparams(nullptr);
-       runparams.flavor = OutputParams::LATEX;
+       runparams.flavor = Flavor::LaTeX;
        LaTeX latex("", runparams, filename);
        TeXErrors terr;
        int const result = latex.scanLogFile(terr);