X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FModuleList.cpp;h=51a942776610d4cd131db854deb3f886b0b267d9;hb=0b54650f0e7f1eae39f93444cac6c8525811975b;hp=f5d5dd54b47efeb81323efeea9cd2ec208f82140;hpb=488b9ae3a20395e66411329c4a5e262d30e0c771;p=lyx.git diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp index f5d5dd54b4..51a9427766 100644 --- a/src/ModuleList.cpp +++ b/src/ModuleList.cpp @@ -40,27 +40,22 @@ LyXModule::LyXModule(string const & n, string const & i, string const & c): name_(n), id_(i), description_(d), package_list_(p), required_modules_(r), excluded_modules_(e), category_(c), - checked_(false) + checked_(false), available_(false) { filename_ = id_ + ".module"; } -vector LyXModule::prerequisites() const { -#ifdef TEX2LYX - return vector(); -#else +vector LyXModule::prerequisites() const +{ if (!checked_) isAvailable(); return prerequisites_; -#endif } -bool LyXModule::isAvailable() const { -#ifdef TEX2LYX - return true; -#else +bool LyXModule::isAvailable() const +{ if (package_list_.empty()) return true; if (checked_) @@ -77,7 +72,6 @@ bool LyXModule::isAvailable() const { } } return available_; -#endif } @@ -115,8 +109,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 { @@ -265,15 +258,16 @@ LyXModule const * ModuleList::operator[](string const & str) const 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; + LyXModule & mod = *it; + return &mod; } - return 0; + return 0; } } // namespace lyx