X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FModuleList.cpp;h=6b693b16e624a93fa3c71651c9bb5d3ed1f2a63b;hb=a9409b47851e57afb2a9c1b1262e60c6963d9dc4;hp=49895e6d4df32af6b452d3236fa7834268f99fff;hpb=e2f6bd6d45fad4a32554d9d882250b8fd6d8a2f5;p=lyx.git diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp index 49895e6d4d..6b693b16e6 100644 --- a/src/ModuleList.cpp +++ b/src/ModuleList.cpp @@ -23,7 +23,7 @@ #include "support/lstrings.h" #include - + using namespace std; using namespace lyx::support; @@ -34,11 +34,11 @@ namespace lyx { ModuleList theModuleList; -LyXModule::LyXModule(string const & n, string const & i, +LyXModule::LyXModule(string const & n, string const & i, string const & d, vector const & p, vector const & r, vector const & e, string const & c): - name_(n), id_(i), description_(d), package_list_(p), + name_(n), id_(i), description_(d), package_list_(p), required_modules_(r), excluded_modules_(e), category_(c), checked_(false) { @@ -46,7 +46,8 @@ LyXModule::LyXModule(string const & n, string const & i, } -vector LyXModule::prerequisites() const { +vector LyXModule::prerequisites() const +{ #ifdef TEX2LYX return vector(); #else @@ -57,7 +58,8 @@ vector LyXModule::prerequisites() const { } -bool LyXModule::isAvailable() const { +bool LyXModule::isAvailable() const +{ #ifdef TEX2LYX return true; #else @@ -69,7 +71,7 @@ bool LyXModule::isAvailable() const { available_ = true; //check whether all of the required packages are available vector::const_iterator it = package_list_.begin(); - vector::const_iterator end = package_list_.end(); + vector::const_iterator end = package_list_.end(); for (; it != end; ++it) { if (!LaTeXFeatures::isAvailable(*it)) { available_ = false; @@ -115,8 +117,7 @@ bool LyXModule::areCompatible(string const & mod1, string const & mod2) // used when sorting the module list. -class ModuleSorter -{ +class ModuleSorter { public: int operator()(LyXModule const & lm1, LyXModule const & lm2) const { @@ -211,7 +212,7 @@ bool ModuleList::read() addLayoutModule(modname, fname, desc, pkgs, req, exc, catgy); } // end switch } //end while - + LYXERR(Debug::TCLASS, "End of parsing of lyxmodules.lst"); if (!theModuleList.empty()) @@ -220,7 +221,7 @@ bool ModuleList::read() } -void ModuleList::addLayoutModule(string const & modname, +void ModuleList::addLayoutModule(string const & modname, string const & filename, string const & description, vector const & pkgs, vector const & req, vector const & exc, string const & catgy) @@ -265,6 +266,7 @@ LyXModule const * ModuleList::operator[](string const & str) const return 0; } + LyXModule * ModuleList::operator[](string const & str) { LyXModuleList::iterator it = modlist_.begin();