TR1: move TR1 check to config.h / buildsystem

[lyx.git] / src / LayoutModuleList.cpp

diff --git a/src/LayoutModuleList.cpp b/src/LayoutModuleList.cpp
index b05fc120692602fef21330f404503717449dd7b9..83c51fb96764328c07e4d3ded9b97005795c4bd3 100644 (file)
--- a/src/LayoutModuleList.cpp
+++ b/src/LayoutModuleList.cpp
@@ -63,7 +63,7 @@ bool LayoutModuleList::moduleCanBeAdded(string const & modName,
                if (*it == modName) 
                        return false;
 
-       LyXModule const * const lm = moduleList[modName];
+       LyXModule const * const lm = theModuleList[modName];
        if (!lm)
                return true;
 
@@ -192,7 +192,7 @@ bool LayoutModuleList::removeBadModules(LayoutFile const * const lay)
                for (; !excluded && pit != pen; ++pit) {
                        if (!LyXModule::areCompatible(modname, *pit)) {
                                LYXERR0("Module " << modname << 
-                                               " dropped becuase it conflicts with provided module `" << *pit << "'.");
+                                               " dropped because it conflicts with provided module `" << *pit << "'.");
                                consistent = false;
                                excluded = true;
                        }
@@ -236,7 +236,7 @@ bool LayoutModuleList::checkModuleConsistency(LayoutFile const * const lay)
 
                // determine whether some provided module or some prior module
                // satisfies our requirements
-               LyXModule const * const oldmod = moduleList[modname];
+               LyXModule const * const oldmod = theModuleList[modname];
                if (!oldmod) {
                        LYXERR0("Default module " << modname << 
                                        " added although it is unavailable and can't check requirements.");