* docstream: factorize out some code and introduce odocfstream::reset()

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index b530706f07db4cacbb7f4f853bdeff1c28c53708..258b71c585f9cff1159019ca8d5e17881363ca90 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -13,13 +13,14 @@
 
 #include "ModuleList.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "Lexer.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
 #include <algorithm>
+#include <ostream>
        
 using std::endl;
 using std::map;
@@ -51,8 +52,7 @@ public:
 bool ModuleList::load()
 {
        support::FileName const real_file = libFileSearch("", "lyxmodules.lst");
-       LYXERR(Debug::TCLASS) << "Reading modules from `"
-                       << real_file << '\'' << endl;
+       LYXERR(Debug::TCLASS, "Reading modules from `" << real_file << '\'');
 
        if (real_file.empty()) {
                lyxerr << "ModuleList::load(): unable to find "
@@ -81,29 +81,29 @@ bool ModuleList::load()
 
        bool finished = false;
        // Parse modules files
-       LYXERR(Debug::TCLASS) << "Starting parsing of lyxmodules.lst" << endl;
+       LYXERR(Debug::TCLASS, "Starting parsing of lyxmodules.lst");
        while (lex.isOK() && !finished) {
-               LYXERR(Debug::TCLASS) << "\tline by line" << endl;
+               LYXERR(Debug::TCLASS, "\tline by line");
                switch (lex.lex()) {
                case Lexer::LEX_FEOF:
                        finished = true;
                        break;
                default:
                        string const modName = lex.getString();
-                       LYXERR(Debug::TCLASS) << "Module name: " << modName << endl;
+                       LYXERR(Debug::TCLASS, "Module name: " << modName);
                        if (!lex.next())
                                break;
                        string const fname = lex.getString();
-                       LYXERR(Debug::TCLASS) << "Filename: " << fname << endl;
+                       LYXERR(Debug::TCLASS, "Filename: " << fname);
                        if (!lex.next())
                                break;
                        string const desc = lex.getString();
-                       LYXERR(Debug::TCLASS) << "Description: " << desc << endl;
+                       LYXERR(Debug::TCLASS, "Description: " << desc);
                        //FIXME Add packages
                        if (!lex.next())
                                break;
                        string packages = lex.getString();
-                       LYXERR(Debug::TCLASS) << "Packages: " << packages << endl;
+                       LYXERR(Debug::TCLASS, "Packages: " << packages);
                        vector<string> pkgs;
                        while (!packages.empty()) {
                                string p;
@@ -116,7 +116,7 @@ bool ModuleList::load()
                } // end switch
        } //end while
        
-       LYXERR(Debug::TCLASS) << "End of parsing of lyxmodules.lst" << endl;
+       LYXERR(Debug::TCLASS, "End of parsing of lyxmodules.lst");
 
        if (!moduleList.empty())
                std::sort(moduleList.begin(), moduleList.end(), ModuleSorter());