Avoid a string copy and a small tweak.

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 90e23c493b9a193c1f6d718907affc04511137c4..e2471ed5e5bbec2ca04e3e501f5acbae462c3493 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -45,6 +45,9 @@ LyXModule::LyXModule(string const & n, string const & i,
 
 
 bool LyXModule::isAvailable() {
+#ifdef TEX2LYX
+       return true;
+#else
        if (packageList.empty())
                return true;
        if (checked)
@@ -61,9 +64,42 @@ bool LyXModule::isAvailable() {
        }
        available = true;
        return available;
+#endif
 }
 
 
+bool LyXModule::isCompatible(string const & modName) const
+{
+       // do we exclude it?
+       if (find(excludedModules.begin(), excludedModules.end(), modName) !=
+                       excludedModules.end())
+               return false;
+
+       LyXModule const * const lm = moduleList[modName];
+       if (!lm)
+               return true;
+
+       // does it exclude us?
+       vector<string> const excMods = lm->getExcludedModules();
+       if (find(excMods.begin(), excMods.end(), id) != excMods.end())
+               return false;
+
+       return true;
+}
+
+
+bool LyXModule::areCompatible(string const & mod1, string const & mod2)
+{
+       LyXModule const * const lm1 = moduleList[mod1];
+       if (lm1)
+               return lm1->isCompatible(mod2);
+       LyXModule const * const lm2 = moduleList[mod2];
+       if (lm2)
+               return lm2->isCompatible(mod1);
+       // Can't check it either way.
+       return true;
+}
+
 // used when sorting the module list.
 class ModuleSorter
 {
@@ -76,33 +112,29 @@ public:
 
 
 //Much of this is borrowed from LayoutFileList::read()
-bool ModuleList::load()
+bool ModuleList::read()
 {
        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 "
-                               "modules file  `"
-                               << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
-                               << "'.\nNo modules will be available." << endl;
+               LYXERR0("unable to find modules file  `"
+                       << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
+                       << "'.\nNo modules will be available.");
                return false;
        }
 
        Lexer lex;
        if (!lex.setFile(real_file)) {
-               lyxerr << "ModuleList::load():"
-                               "lyxlex was not able to set file: "
-                               << real_file << ".\nNo modules will be available." << endl;
+               LYXERR0("lyxlex was not able to set file: "
+                       << real_file << ".\nNo modules will be available.");
                return false;
        }
 
        if (!lex.isOK()) {
-               lyxerr << "ModuleList::load():" <<
-                               "unable to open modules file  `"
-                               << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
-                               << "'\nNo modules will be available."
-                               << endl;
+               LYXERR0("unable to open modules file  `"
+                       << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
+                       << "'\nNo modules will be available.");
                return false;
        }
 
@@ -205,17 +237,6 @@ LyXModuleList::iterator ModuleList::end()
 }
 
 
-LyXModule * ModuleList::getModuleByName(string const & str)
-{
-       LyXModuleList::iterator it = modlist_.begin();
-       for (; it != modlist_.end(); ++it)
-               if (it->getName() == str) {
-                       LyXModule & mod = *it;
-                       return &mod;
-               }
-       return 0;
-}
-
 LyXModule * ModuleList::operator[](string const & str)
 {
        LyXModuleList::iterator it = modlist_.begin();