Remove unused Counters::copy

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 0c541c894b8fa730f6c95a7abef24930dbfe4568..747dd88ada8e5824d29ced4da4a50e1d938c6a1c 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"
@@ -105,7 +104,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 +121,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() ?
@@ -260,7 +259,7 @@ void Converters::updateLast(Formats const & formats)
 
 
 OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
-                                          Buffer const * buffer)
+                                          Buffer const * buffer) const
 {
        for (auto const & edge : path) {
                Converter const & conv = converterlist_[edge];
@@ -276,15 +275,15 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
                        if (conv.latex_flavor() == "pdflatex")
                                return OutputParams::PDFLATEX;
                }
-               if (conv.xml())
-                       return OutputParams::XML;
+               if (conv.docbook())
+                       return OutputParams::DOCBOOK5;
        }
        return buffer ? buffer->params().getOutputFlavor()
                      : OutputParams::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];
@@ -481,8 +480,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                runparams.bibtex_command = bp.bibtexCommand();
                runparams.index_command = (bp.index_command == "default") ?
                        string() : bp.index_command;
-               runparams.document_language = bp.language->babel();
-               runparams.xindy_language = bp.language->xindy();
+               runparams.document_language = bp.language->lang();
                // Some macros rely on font encoding
                runparams.main_fontenc = bp.main_font_encoding();
                runparams.only_childbibs = !bp.useBiblatex()
@@ -820,7 +818,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)