remove special TEX2LYX code in Spacing,h

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31783 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 4f989b4b8ccf5a8c609936b911d845f276fcecd7..784b1ae34d40c97c91eeca0839f7b222206aaa1d 100644 (file)
--- 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 afdcda1773cfdaed577afefead22647907a38081..274cfc20f220ef5682da932170af294f750ecc1d 100644 (file)
--- 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 26d342ce14c656ea7c784afc3021084ee0a88e14..975195e3525ab9c6704cb2d3c9fbf04fe000ebcb 100644 (file)
--- 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 (file)
index c425460..0000000
--- 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