anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

s/moduleList/theModuleList/ for style purposes.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31036 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-08-14 15:37:34 +00:00
parent 05e00b9341
commit ea0501025e
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/LayoutModuleList.cpp
View File

@ -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;
@ -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.");

2
src/LyX.cpp
View File

@ -750,7 +750,7 @@ bool LyX::init()
if (!LyXSetStyle())
return false;
//...and the modules
moduleList.read();
theModuleList.read();
// read keymap and ui files in batch mode as well
// because InsetInfo needs to know these to produce

12
src/ModuleList.cpp
View File

@ -30,7 +30,7 @@ namespace lyx {
//global variable: module list
ModuleList moduleList;
ModuleList theModuleList;
LyXModule::LyXModule(string const & n, string const & i,
@ -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.
@ -202,8 +202,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;
}

2
src/ModuleList.h
View File

@ -147,6 +147,6 @@ private:
std::vector<LyXModule> modlist_;
};
extern ModuleList moduleList;
extern ModuleList theModuleList;
}
#endif

2
src/TextClass.cpp
View File

@ -1198,7 +1198,7 @@ DocumentClass & DocumentClassBundle::makeDocumentClass(
LayoutModuleList::const_iterator en = modlist.end();
for (; it != en; it++) {
string const modName = *it;
LyXModule * lm = moduleList[modName];
LyXModule * lm = theModuleList[modName];
if (!lm) {
docstring const msg =
bformat(_("The module %1$s has been requested by\n"

18
src/frontends/qt4/GuiDocument.cpp
View File

@ -206,7 +206,7 @@ namespace {
vector<string> getRequiredList(string const & modName)
{
LyXModule const * const mod = moduleList[modName];
LyXModule const * const mod = theModuleList[modName];
if (!mod)
return vector<string>(); //empty such thing
return mod->getRequiredModules();
@ -215,7 +215,7 @@ vector<string> getRequiredList(string const & modName)
vector<string> getExcludedList(string const & modName)
{
LyXModule const * const mod = moduleList[modName];
LyXModule const * const mod = theModuleList[modName];
if (!mod)
return vector<string>(); //empty such thing
return mod->getExcludedModules();
@ -224,7 +224,7 @@ vector<string> getExcludedList(string const & modName)
docstring getModuleDescription(string const & modName)
{
LyXModule const * const mod = moduleList[modName];
LyXModule const * const mod = theModuleList[modName];
if (!mod)
return _("Module not found!");
// FIXME Unicode
@ -234,7 +234,7 @@ docstring getModuleDescription(string const & modName)
vector<string> getPackageList(string const & modName)
{
LyXModule const * const mod = moduleList[modName];
LyXModule const * const mod = theModuleList[modName];
if (!mod)
return vector<string>(); //empty such thing
return mod->getPackageList();
@ -243,7 +243,7 @@ vector<string> getPackageList(string const & modName)
bool isModuleAvailable(string const & modName)
{
LyXModule * mod = moduleList[modName];
LyXModule * mod = theModuleList[modName];
if (!mod)
return false;
return mod->isAvailable();
@ -1606,7 +1606,7 @@ namespace {
vector<string>::const_iterator it = idList.begin();
vector<string>::const_iterator end = idList.end();
for (; it != end; ++it) {
LyXModule const * const mod = moduleList[*it];
LyXModule const * const mod = theModuleList[*it];
if (!mod)
retval.push_back(*it + " (Unavailable)");
else
@ -2694,7 +2694,7 @@ list<GuiDocument::modInfoStruct> const
for (; it != end; ++it) {
modInfoStruct m;
m.id = *it;
LyXModule * mod = moduleList[*it];
LyXModule * mod = theModuleList[*it];
if (mod)
// FIXME Unicode
m.name = toqstr(translateIfPossible(from_utf8(mod->getName())));
@ -2886,8 +2886,8 @@ bool GuiDocument::providesScale(string const & font) const
void GuiDocument::loadModuleInfo()
{
moduleNames_.clear();
LyXModuleList::const_iterator it = moduleList.begin();
LyXModuleList::const_iterator end = moduleList.end();
LyXModuleList::const_iterator it = theModuleList.begin();
LyXModuleList::const_iterator end = theModuleList.end();
for (; it != end; ++it) {
modInfoStruct m;
m.id = it->getID();