]> git.lyx.org Git - lyx.git/blobdiff - src/ModuleList.cpp
* docstream: factorize out some code and introduce odocfstream::reset()
[lyx.git] / src / ModuleList.cpp
index ae7acb338392d667a76a42cdbf0e6e2ea0d4c7db..258b71c585f9cff1159019ca8d5e17881363ca90 100644 (file)
 
 #include <config.h>
 
-#include "debug.h"
-#include "Lexer.h"
 #include "ModuleList.h"
 
-#include "support/docstring.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;
 using std::string;
 using std::vector;
 
-namespace lyx{
+namespace lyx {
 
 using support::FileName;
 using support::libFileSearch;
@@ -37,23 +38,21 @@ ModuleList moduleList;
 
 
 // used when sorting the module list.
-class moduleSorter
-       : public std::binary_function<LyXModule, LyXModule, int>
+class ModuleSorter
 {
-       public:
-               int operator()(LyXModule const & lm1,
-                                                                LyXModule const & lm2) const
-               {
-                       return (lm1.name < lm2.name);
-               }
+public:
+       int operator()(LyXModule const & lm1, LyXModule const & lm2) const
+       {
+               return lm1.name < lm2.name;
+       }
 };
 
 
 //Much of this is borrowed from TextClassList::read()
-bool ModuleList::load() {
+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 "
@@ -82,51 +81,53 @@ 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;
-                       if (lex.next()) {
-                               string const fname = lex.getString();
-                               LYXERR(Debug::TCLASS) << "Filename: " << fname << endl;
-                               if (lex.next()) {
-                                       string const desc = lex.getString();
-                                       LYXERR(Debug::TCLASS) << "Description: " << desc << endl;
-                                       //FIXME Add packages
-                                       if (lex.next()) {
-                                               string packages = lex.getString();
-                                               LYXERR(Debug::TCLASS) << "Packages: " << packages << endl;
-                                               vector<string> pkgs;
-                                               while (!packages.empty()) {
-                                                       string p;
-                                                       packages = support::split(packages, p, ',');
-                                                       pkgs.push_back(p);
-                                               }
-                                               // This code is run when we have
-                                               // modName, fname, desc, and pkgs
-                                               addLayoutModule(modName, fname, desc, pkgs);
-                                       }
-                               }
+                       LYXERR(Debug::TCLASS, "Module name: " << modName);
+                       if (!lex.next())
+                               break;
+                       string const fname = lex.getString();
+                       LYXERR(Debug::TCLASS, "Filename: " << fname);
+                       if (!lex.next())
+                               break;
+                       string const desc = lex.getString();
+                       LYXERR(Debug::TCLASS, "Description: " << desc);
+                       //FIXME Add packages
+                       if (!lex.next())
+                               break;
+                       string packages = lex.getString();
+                       LYXERR(Debug::TCLASS, "Packages: " << packages);
+                       vector<string> pkgs;
+                       while (!packages.empty()) {
+                               string p;
+                               packages = support::split(packages, p, ',');
+                               pkgs.push_back(p);
                        }
+                       // This code is run when we have
+                       // modName, fname, desc, and pkgs
+                       addLayoutModule(modName, fname, desc, pkgs);
                } // 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());
+               std::sort(moduleList.begin(), moduleList.end(), ModuleSorter());
        return true;
 }
 
 
-void ModuleList::addLayoutModule(string moduleName, 
-               string filename, string description, vector<string> pkgs) {
+void ModuleList::addLayoutModule(string const & moduleName, 
+       string const & filename, string const & description,
+       vector<string> const & pkgs)
+{
        LyXModule lm;
        lm.name = moduleName;
        lm.filename = filename;
@@ -160,7 +161,8 @@ LyXModuleList::iterator ModuleList::end()
 }
 
 
-LyXModule * ModuleList::operator[](string const str) {
+LyXModule * ModuleList::operator[](string const & str)
+{
        LyXModuleList::iterator it = modlist_.begin();
        for (; it != modlist_.end(); ++it)
                if (it->name == str) {
@@ -170,4 +172,4 @@ LyXModule * ModuleList::operator[](string const str) {
        return 0;
 }
 
-}
+} // namespace lyx