From 0a868fb846f5b1196e5572eca0bdff3bbf12b707 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 28 Oct 2009 10:07:10 +0000
Subject: [PATCH] remove special TEX2LYX code in Spacing,h

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31783 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/scons/scons_manifest.py |  2 +-
 src/Spacing.h                       |  5 ----
 src/tex2lyx/Makefile.am             |  6 +---
 src/tex2lyx/Spacing.h               | 43 -----------------------------
 4 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 src/tex2lyx/Spacing.h

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 4f989b4b8c..784b1ae34d 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -589,7 +589,6 @@ src_mathed_extra_files = Split('''
 src_tex2lyx_header_files = Split('''
     Context.h
     Parser.h
-    Spacing.h
     tex2lyx.h
 ''')
 
@@ -628,6 +627,7 @@ src_tex2lyx_copied_files = Split('''
     lengthcommon.cpp
     Lexer.cpp
     ModuleList.cpp
+    Spacing.cpp
     TextClass.cpp
     insets/InsetLayout.cpp
 ''')
diff --git a/src/Spacing.h b/src/Spacing.h
index afdcda1773..274cfc20f2 100644
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -12,10 +12,6 @@
 #ifndef SPACING_H
 #define SPACING_H
 
-#ifdef TEX2LYX
-#include "tex2lyx/Spacing.h"
-#else
-
 #include "support/strfwd.h"
 
 #include <string>
@@ -95,5 +91,4 @@ bool operator!=(Spacing const & a, Spacing const & b)
 
 } // namespace lyx
 
-#endif // TEX2LYX
 #endif // SPACING_H
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 26d342ce14..975195e352 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -36,15 +36,12 @@ LINKED_FILES = \
 	../Floating.cpp \
 	../FontInfo.cpp \
 	../insets/InsetLayout.cpp \
-	../LayoutFile.h \
-	../Layout.h \
 	../Layout.cpp \
-	../LayoutModuleList.h \
 	../LayoutModuleList.cpp \
 	../lengthcommon.cpp \
 	../Lexer.cpp \
-	../ModuleList.h \
 	../ModuleList.cpp \
+	../Spacing.cpp \
 	../TextClass.cpp \
 	../TextClass.h
 
@@ -59,7 +56,6 @@ tex2lyx_SOURCES = \
 	Parser.cpp \
 	Parser.h \
 	preamble.cpp \
-	Spacing.h \
 	table.cpp \
 	tex2lyx.cpp \
 	tex2lyx.h \
diff --git a/src/tex2lyx/Spacing.h b/src/tex2lyx/Spacing.h
deleted file mode 100644
index c425460892..0000000000
--- a/src/tex2lyx/Spacing.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-/**
- * \file tex2lyx/Spacing.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- *
- * This class is just a dummy version of that in the main LyX source tree
- * to enable tex2lyx to use LyX's textclass classes and not have to
- * re-invent the wheel.
- */
-
-#ifndef TEX2LYX_SPACING_H
-#define TEX2LYX_SPACING_H
-
-#include <string>
-
-
-namespace lyx {
-
-class Spacing {
-public:
-	///
-	enum Space {
-		Single,
-		Onehalf,
-		Double,
-		Other,
-		Default
-	};
-	///
-	void set(Spacing::Space, double = 1.0) {}
-	///
-	void set(Spacing::Space, std::string const &) {}
-};
-
-
-} // namespace lyx
-
-#endif // TEX2LYX_SPACING_H