reduce line noise

[features.git] / src / insets / InsetInclude.cpp

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index bc23d534ae24e8d3db5bbd58cba60f8e983f0d50..ecab91e252318c35e5ce651e299a2255d47b6821 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -32,6 +32,7 @@
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "TocBackend.h"
+#include "TextClass.h"
 
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
@@ -74,7 +75,6 @@ using support::prefixIs;
 using support::subst;
 using support::sum;
 
-using std::endl;
 using std::find;
 using std::string;
 using std::istringstream;
@@ -276,6 +276,7 @@ docstring const InsetInclude::getScreenLabel(Buffer const & buf) const
                        break;
                case LISTINGS:
                        temp = listings_label_;
+                       break;
                case NONE:
                        BOOST_ASSERT(false);
        }
@@ -395,9 +396,9 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                                           "when running the exported file through LaTeX: ") +
                                            from_utf8(incfile));
        }
-       LYXERR(Debug::LATEX) << "incfile:" << incfile << endl;
-       LYXERR(Debug::LATEX) << "exportfile:" << exportfile << endl;
-       LYXERR(Debug::LATEX) << "writefile:" << writefile << endl;
+       LYXERR(Debug::LATEX, "incfile:" << incfile);
+       LYXERR(Debug::LATEX, "exportfile:" << exportfile);
+       LYXERR(Debug::LATEX, "writefile:" << writefile);
 
        if (runparams.inComment || runparams.dryrun) {
                //Don't try to load or copy the file if we're
@@ -468,11 +469,10 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                if (checksum_in != checksum_out) {
                        if (!copy(included_file, writefile)) {
                                // FIXME UNICODE
-                               LYXERR(Debug::LATEX)
-                                       << to_utf8(bformat(_("Could not copy the file\n%1$s\n"
+                               LYXERR(Debug::LATEX,
+                                       to_utf8(bformat(_("Could not copy the file\n%1$s\n"
                                                                  "into the temporary directory."),
-                                                  from_utf8(included_file.absFilename())))
-                                       << endl;
+                                                  from_utf8(included_file.absFilename()))));
                                return 0;
                        }
                }
@@ -581,9 +581,9 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
                if (!runparams.nice)
                        incfile = mangled;
 
-               LYXERR(Debug::LATEX) << "incfile:" << incfile << endl;
-               LYXERR(Debug::LATEX) << "exportfile:" << exportfile << endl;
-               LYXERR(Debug::LATEX) << "writefile:" << writefile << endl;
+               LYXERR(Debug::LATEX, "incfile:" << incfile);
+               LYXERR(Debug::LATEX, "exportfile:" << exportfile);
+               LYXERR(Debug::LATEX, "writefile:" << writefile);
 
                tmp->makeDocBookFile(writefile, runparams, true);
        }