X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayoutModuleList.cpp;h=a6507212a89c46d5bc17db028a1c15d544487cbe;hb=3588f2f69675df8dbf829800b0ed6e4a455c68b4;hp=b05fc120692602fef21330f404503717449dd7b9;hpb=90c64a5f5e41c8680a9c08bf78e1bb0cee558291;p=lyx.git diff --git a/src/LayoutModuleList.cpp b/src/LayoutModuleList.cpp index b05fc12069..a6507212a8 100644 --- a/src/LayoutModuleList.cpp +++ b/src/LayoutModuleList.cpp @@ -59,11 +59,11 @@ bool LayoutModuleList::moduleCanBeAdded(string const & modName, // Is the module already present? const_iterator it = begin(); const_iterator const en = end(); - for (; it != en; it++) + for (; it != en; ++it) if (*it == modName) return false; - LyXModule const * const lm = moduleList[modName]; + LyXModule const * const lm = theModuleList[modName]; if (!lm) return true; @@ -131,7 +131,7 @@ void LayoutModuleList::addDefaultModules(LayoutFile const * const lay, iterator insertpos = begin(); int numinserts = 0; - for (; mit != men; mit++) { + for (; mit != men; ++mit) { string const & modName = *mit; // make sure the user hasn't removed it if (find(removedModules.begin(), removedModules.end(), modName) != @@ -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.");