From 9a1e972edbe5a1cf10f2b3da7c25c35cf4a741e2 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 21 Aug 2013 11:44:08 +0200 Subject: [PATCH] Remove dependency on TEX2LYX #define in ModuleList.cpp --- src/ModuleList.cpp | 8 -------- src/tex2lyx/tex2lyx.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp index 6b693b16e6..d442d204a5 100644 --- a/src/ModuleList.cpp +++ b/src/ModuleList.cpp @@ -48,21 +48,14 @@ LyXModule::LyXModule(string const & n, string const & i, vector LyXModule::prerequisites() const { -#ifdef TEX2LYX - return vector(); -#else if (!checked_) isAvailable(); return prerequisites_; -#endif } bool LyXModule::isAvailable() const { -#ifdef TEX2LYX - return true; -#else if (package_list_.empty()) return true; if (checked_) @@ -79,7 +72,6 @@ bool LyXModule::isAvailable() const } } return available_; -#endif } diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 1f5b14d96b..f750f424c2 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -18,6 +18,7 @@ #include "Context.h" #include "Encoding.h" #include "Format.h" +#include "LaTeXFeatures.h" #include "Layout.h" #include "LayoutFile.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 void lyx_exit(int) {}