The branch, kill-tex2lyx-define, has been updated.

- Log -----------------------------------------------------------------

commit 9b63fdf69de97722059d5131a15c06764d88beac
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Fri Aug 23 12:21:20 2013 +0200

    Use slightly better replacement for LyXRC.

diff --git a/src/tex2lyx/dummy_impl.cpp b/src/tex2lyx/dummy_impl.cpp
index c2df5b8..6fb1a84 100644
--- a/src/tex2lyx/dummy_impl.cpp
+++ b/src/tex2lyx/dummy_impl.cpp
@@ -20,6 +20,7 @@
 
 #include "Format.h"
 #include "LaTeXFeatures.h"
+#include "LyXRC.h"
 #include "output_xhtml.h"
 
 #include "support/Messages.h"
@@ -63,11 +64,15 @@ void TexRow::newlines(int)
 // Dummy LyXRC support
 //
 
-//FIXME This does not seem to be needed after all
-class LyXRC {
-public:
-       string icon_set;
-} lyxrc;
+LyXRC lyxrc;
+
+/** Note that some variables are not initialized correctly. Hopefully
+ * they are not used in our code (currently valgrind does not complain).
+ * Linking against the full LyXRC.cpp forces us to pull too much
+ * stuff.
+ */
+LyXRC::LyXRC()
+{}
 
 
 //

-----------------------------------------------------------------------

Summary of changes:
 src/tex2lyx/dummy_impl.cpp |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Repository for new features

Reply via email to