Remove dependency on TEX2LYX #define in ModuleList.cpp

This commit is contained in:
Jean-Marc Lasgouttes 2013-08-21 11:44:08 +02:00 committed by Vincent van Ravesteijn
parent aef31d666e
commit 9a1e972edb
2 changed files with 7 additions and 8 deletions

View File

@ -48,21 +48,14 @@ LyXModule::LyXModule(string const & n, string const & i,
vector<string> LyXModule::prerequisites() const vector<string> LyXModule::prerequisites() const
{ {
#ifdef TEX2LYX
return vector<string>();
#else
if (!checked_) if (!checked_)
isAvailable(); isAvailable();
return prerequisites_; return prerequisites_;
#endif
} }
bool LyXModule::isAvailable() const bool LyXModule::isAvailable() const
{ {
#ifdef TEX2LYX
return true;
#else
if (package_list_.empty()) if (package_list_.empty())
return true; return true;
if (checked_) if (checked_)
@ -79,7 +72,6 @@ bool LyXModule::isAvailable() const
} }
} }
return available_; return available_;
#endif
} }

View File

@ -18,6 +18,7 @@
#include "Context.h" #include "Context.h"
#include "Encoding.h" #include "Encoding.h"
#include "Format.h" #include "Format.h"
#include "LaTeXFeatures.h"
#include "Layout.h" #include "Layout.h"
#include "LayoutFile.h" #include "LayoutFile.h"
#include "LayoutModuleList.h" #include "LayoutModuleList.h"
@ -101,6 +102,12 @@ bool Formats::isZippedFile(FileName const&) const
} }
bool LaTeXFeatures::isAvailable(string const &)
{
return true;
}
// Keep the linker happy on Windows // Keep the linker happy on Windows
void lyx_exit(int) void lyx_exit(int)
{} {}