Use <cstdint> instead of <boost/cstdint.hpp>

[lyx.git] / src / frontends / qt4 / GuiLog.cpp

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 97e19e353692c6bc888e226a0c09fb37da3214bd..81c05d3a70c0e5ad6200e6487d5b0867088bdae2 100644 (file)
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -45,9 +45,9 @@ namespace frontend {
 // FIXME: These regexes are incomplete. It would be good if we could collect those used in LaTeX::scanLogFile
 //        and LaTeX::scanBlgFile and re-use them here!(spitz, 2013-05-27)
 // Information
-QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|Underfull|Overfull|.*> INFO - |\\(|\\\\).*$");
+QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|.*> INFO - |\\(|\\\\).*$");
 // Warnings
-QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning|Warning--|.*> WARN - ).*$");
+QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning|Warning--|Underfull|Overfull|.*> WARN - ).*$");
 // Errors
 QRegExp exprError("^(!|.*---line [0-9]+ of file|.*> FATAL - |.*> ERROR - |Missing character: There is no ).*$");
 
@@ -120,7 +120,8 @@ GuiLog::GuiLog(GuiView & lv)
 {
        setupUi(this);
 
-       connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
        connect(updatePB, SIGNAL(clicked()), this, SLOT(updateContents()));
        connect(findPB, SIGNAL(clicked()), this, SLOT(find()));
        // FIXME: find via returnPressed() does not work!
@@ -219,9 +220,9 @@ bool GuiLog::contains(QRegExp const & exp) const
 }
 
 
-bool GuiLog::initialiseParams(string const & data)
+bool GuiLog::initialiseParams(string const & sdata)
 {
-       istringstream is(data);
+       istringstream is(sdata);
        Lexer lex;
        lex.setStream(is);
 
@@ -237,9 +238,9 @@ bool GuiLog::initialiseParams(string const & data)
 
        logTypeCO->setEnabled(logtype == "latex");
        logTypeCO->clear();
-       
+
        FileName log(logfile);
-       
+
        if (logtype == "latex") {
                type_ = LatexLog;
                logTypeCO->addItem(qt_("LaTeX"), toqstr(logtype));
@@ -307,6 +308,8 @@ void GuiLog::getContents(ostream & ss) const
        // FIXME UNICODE
        // Our caller interprets the file contents as UTF8, but is that
        // correct?
+       // spitz: No it isn't (generally). The log file encoding depends on the TeX
+       // _output_ encoding (T1 etc.). We should account for that. See #10728.
        if (in) {
                ss << in.rdbuf();
                success = ss.good();