RCS case is more complicated

[lyx.git] / src / ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index f5412b8ead7ae96e9971a830ba54676dfe3ac1d5..4ed97de91431d8e23a91a366252edd04717b8012 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -30,7 +30,7 @@ namespace lyx {
 
 
 //global variable: module list
-ModuleList moduleList;
+ModuleList theModuleList;
 
 
 LyXModule::LyXModule(string const & n, string const & i, 
@@ -45,7 +45,7 @@ LyXModule::LyXModule(string const & n, string const & i,
 }
 
 
-bool LyXModule::isAvailable() {
+bool LyXModule::isAvailable() const {
 #ifdef TEX2LYX
        return true;
 #else
@@ -76,7 +76,7 @@ bool LyXModule::isCompatible(string const & modname) const
                        excluded_modules_.end())
                return false;
 
-       LyXModule const * const lm = moduleList[modname];
+       LyXModule const * const lm = theModuleList[modname];
        if (!lm)
                return true;
 
@@ -91,10 +91,10 @@ bool LyXModule::isCompatible(string const & modname) const
 
 bool LyXModule::areCompatible(string const & mod1, string const & mod2)
 {
-       LyXModule const * const lm1 = moduleList[mod1];
+       LyXModule const * const lm1 = theModuleList[mod1];
        if (lm1)
                return lm1->isCompatible(mod2);
-       LyXModule const * const lm2 = moduleList[mod2];
+       LyXModule const * const lm2 = theModuleList[mod2];
        if (lm2)
                return lm2->isCompatible(mod1);
        // Can't check it either way.
@@ -119,9 +119,8 @@ bool ModuleList::read()
        LYXERR(Debug::TCLASS, "Reading modules from `" << real_file << '\'');
 
        if (real_file.empty()) {
-               LYXERR0("unable to find modules file  `"
-                       << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
-                       << "'.\nNo modules will be available.");
+               LYXERR0("unable to find modules file `lyxmodules.lst'.\n"
+                       << "No modules will be available.");
                return false;
        }
 
@@ -134,7 +133,7 @@ bool ModuleList::read()
 
        if (!lex.isOK()) {
                LYXERR0("unable to open modules file  `"
-                       << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
+                       << to_utf8(makeDisplayPath(real_file.absFileName(), 1000))
                        << "'\nNo modules will be available.");
                return false;
        }
@@ -202,8 +201,8 @@ bool ModuleList::read()
        
        LYXERR(Debug::TCLASS, "End of parsing of lyxmodules.lst");
 
-       if (!moduleList.empty())
-               sort(moduleList.begin(), moduleList.end(), ModuleSorter());
+       if (!theModuleList.empty())
+               sort(theModuleList.begin(), theModuleList.end(), ModuleSorter());
        return true;
 }
 
@@ -242,15 +241,26 @@ LyXModuleList::iterator ModuleList::end()
 }
 
 
-LyXModule * ModuleList::operator[](string const & str)
+LyXModule const * ModuleList::operator[](string const & str) const
 {
-       LyXModuleList::iterator it = modlist_.begin();
+       LyXModuleList::const_iterator it = modlist_.begin();
        for (; it != modlist_.end(); ++it)
                if (it->getID() == str) {
-                       LyXModule & mod = *it;
+                       LyXModule const & mod = *it;
                        return &mod;
                }
        return 0;
 }
 
+LyXModule * ModuleList::operator[](string const & str)
+{
+       LyXModuleList::iterator it = modlist_.begin();
+       for (; it != modlist_.end(); ++it)
+               if (it->getID() == str) {
+               LyXModule & mod = *it;
+               return &mod;
+               }
+               return 0;
+}
+
 } // namespace lyx