Move Dialog.{h,cpp} and ButtonPolicy.{h,cpp} to frontends/qt4/

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 52348c44cd0648a24770833a8c1ae48cfd6dd4e0..085a6f1ccdf21cc077eaa855cac740d31781941b 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -24,6 +24,7 @@
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
+#include "TextClass.h"
 #include "TexRow.h"
 #include "VSpace.h"
 
@@ -69,7 +70,7 @@ TeXDeeper(Buffer const & buf,
          odocstream & os, TexRow & texrow,
          OutputParams const & runparams)
 {
-       LYXERR(Debug::LATEX) << "TeXDeeper...     " << &*pit << endl;
+       LYXERR(Debug::LATEX, "TeXDeeper...     " << &*pit);
        ParagraphList::const_iterator par = pit;
 
        while (par != paragraphs.end() &&
@@ -82,7 +83,7 @@ TeXDeeper(Buffer const & buf,
                                             os, texrow, runparams);
                }
        }
-       LYXERR(Debug::LATEX) << "TeXDeeper...done " << endl;
+       LYXERR(Debug::LATEX, "TeXDeeper...done ");
 
        return par;
 }
@@ -95,7 +96,7 @@ TeXEnvironment(Buffer const & buf,
               odocstream & os, TexRow & texrow,
               OutputParams const & runparams)
 {
-       LYXERR(Debug::LATEX) << "TeXEnvironment...     " << &*pit << endl;
+       LYXERR(Debug::LATEX, "TeXEnvironment...     " << &*pit);
 
        BufferParams const & bparams = buf.params();
 
@@ -210,9 +211,9 @@ TeXEnvironment(Buffer const & buf,
                texrow.newline();
        }
 
-       if (par != paragraphs.end()) {
-               LYXERR(Debug::LATEX) << "TeXEnvironment...done " << &*par << endl;
-       }
+       if (par != paragraphs.end())
+               LYXERR(Debug::LATEX, "TeXEnvironment...done " << &*par);
+
        return par;
 }
 
@@ -248,8 +249,8 @@ TeXOnePar(Buffer const & buf,
          OutputParams const & runparams_in,
          string const & everypar)
 {
-       LYXERR(Debug::LATEX) << "TeXOnePar...     " << &*pit << " '"
-               << everypar << "'" << endl;
+       LYXERR(Debug::LATEX, "TeXOnePar...     " << &*pit << " '"
+               << everypar << "'");
        BufferParams const & bparams = buf.params();
        LayoutPtr style;
 
@@ -605,9 +606,8 @@ TeXOnePar(Buffer const & buf,
                texrow.newline();
        }
 
-       if (boost::next(pit) != paragraphs.end()) {
-               LYXERR(Debug::LATEX) << "TeXOnePar...done " << &*boost::next(pit) << endl;
-       }
+       if (boost::next(pit) != paragraphs.end())
+               LYXERR(Debug::LATEX, "TeXOnePar...done " << &*boost::next(pit));
 
        return ++pit;
 }
@@ -733,14 +733,13 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
                || newEnc.package() == Encoding::none)
                return make_pair(false, 0);
 
-       LYXERR(Debug::LATEX) << "Changing LaTeX encoding from "
-               << oldEnc.name() << " to "
-               << newEnc.name() << endl;
+       LYXERR(Debug::LATEX, "Changing LaTeX encoding from "
+               << oldEnc.name() << " to " << newEnc.name());
        os << setEncoding(newEnc.iconvName());
        if (bparams.inputenc == "default")
                return make_pair(true, 0);
 
-       docstring const inputenc(from_ascii(newEnc.latexName()));
+       docstring const inputenc = from_ascii(newEnc.latexName());
        switch (newEnc.package()) {
                case Encoding::none:
                        // shouldn't ever reach here, see above
@@ -753,7 +752,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
                        }
                        os << "\\inputencoding{" << inputenc << '}';
                        return make_pair(true, count + 16);
-                }
+               }
                case Encoding::CJK: {
                        int count = inputenc.length();
                        if (oldEnc.package() == Encoding::CJK) {