Remove todo

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 71e1aaf0d0a262643a69e2be2b29d394d3344fb3..d1ff3bee0a368d5d23767bc1939eb676b16d51d7 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -11,49 +11,69 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "Lexer.h"
 #include "ModuleList.h"
 
-#include "support/docstring.h"
+#include "support/debug.h"
+#include "LaTeXFeatures.h"
+#include "Lexer.h"
+
+#include "support/FileName.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;
+using namespace std;
+using namespace lyx::support;
 
-namespace lyx{
+namespace lyx {
 
-using support::FileName;
-using support::libFileSearch;
-using support::makeDisplayPath;
 
 //global variable: module list
 ModuleList moduleList;
 
 
+LyXModule::LyXModule(string const & n, string const & f, 
+                          string const & d, vector<string> const & p) : 
+       name(n), filename(f), description(d), packageList(p), checked(false)
+{}
+
+
+bool LyXModule::isAvailable() {
+       if (packageList.empty())
+               return true;
+       if (checked)
+               return available;
+       checked = true;
+       vector<string>::const_iterator it  = packageList.begin();
+       vector<string>::const_iterator end = packageList.end(); 
+       for (; it != end; ++it) {
+               if (!LaTeXFeatures::isAvailable(*it))
+                       available = false;
+                       return available;
+       }
+       available = true;
+       return available;
+}
+
+
 // 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() {
-       support::FileName const real_file = libFileSearch("", "lyxmodules.lst");
-       LYXERR(Debug::TCLASS) << "Reading modules from `"
-                       << real_file << '\'' << endl;
+bool ModuleList::load()
+{
+       FileName const real_file = libFileSearch("", "lyxmodules.lst");
+       LYXERR(Debug::TCLASS, "Reading modules from `" << real_file << '\'');
 
        if (real_file.empty()) {
                lyxerr << "ModuleList::load(): unable to find "
@@ -82,33 +102,33 @@ 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;
-                               packages = support::split(packages, p, ',');
+                               packages = split(packages, p, ',');
                                pkgs.push_back(p);
                        }
                        // This code is run when we have
@@ -117,21 +137,19 @@ 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());
+               sort(moduleList.begin(), moduleList.end(), ModuleSorter());
        return true;
 }
 
 
-void ModuleList::addLayoutModule(string moduleName, 
-               string filename, string description, vector<string> pkgs) {
-       LyXModule lm;
-       lm.name = moduleName;
-       lm.filename = filename;
-       lm.description = description;
-       lm.packageList = pkgs;
+void ModuleList::addLayoutModule(string const & moduleName, 
+       string const & filename, string const & description,
+       vector<string> const & pkgs)
+{
+       LyXModule lm(moduleName, filename, description, pkgs);
        modlist_.push_back(lm);
 }
 
@@ -160,7 +178,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 +189,4 @@ LyXModule * ModuleList::operator[](string const str) {
        return 0;
 }
 
-}
+} // namespace lyx