From 0fa4b7e736a6cc9c22620dcebbab457c219f79c8 Mon Sep 17 00:00:00 2001 From: Stephan Witt Date: Mon, 3 Aug 2020 14:15:09 +0200 Subject: [PATCH] #9376 prepare use of Length in lyxrc - move the class Length to support --- src/BufferParams.cpp | 2 +- src/BufferView.cpp | 2 +- src/LyXRC.h | 2 +- src/Makefile.am | 12 ++---------- src/Paragraph.cpp | 2 +- src/ParagraphParameters.h | 2 +- src/Text.cpp | 2 +- src/VSpace.cpp | 2 +- src/VSpace.h | 2 +- src/frontends/qt/GuiBox.cpp | 2 +- src/frontends/qt/GuiExternal.cpp | 2 +- src/frontends/qt/GuiGraphics.cpp | 2 +- src/frontends/qt/LengthCombo.h | 2 +- src/frontends/qt/Validator.h | 3 ++- src/frontends/qt/qt_helpers.cpp | 2 +- src/frontends/qt/qt_helpers.h | 2 +- src/graphics/GraphicsParams.h | 3 +-- src/insets/ExternalTransforms.h | 3 +-- src/insets/InsetBox.h | 3 ++- src/insets/InsetGraphics.cpp | 2 +- src/insets/InsetInfo.cpp | 2 +- src/insets/InsetLine.cpp | 2 +- src/insets/InsetListingsParams.cpp | 2 +- src/insets/InsetNomencl.cpp | 2 +- src/insets/InsetSpace.cpp | 2 +- src/insets/InsetSpace.h | 3 ++- src/insets/InsetTabular.h | 3 ++- src/insets/InsetWrap.h | 3 ++- src/mathed/InsetMathGrid.h | 3 ++- src/mathed/InsetMathKern.h | 3 ++- src/mathed/InsetMathSpace.h | 3 ++- src/mathed/InsetMathXYMatrix.h | 3 ++- src/mathed/MathSupport.cpp | 2 +- src/{ => support}/Length.cpp | 2 +- src/{ => support}/Length.h | 0 src/support/Makefile.am | 3 +++ src/{ => support}/lengthcommon.cpp | 3 +-- src/tests/CMakeLists.txt | 4 ++-- src/tex2lyx/CMakeLists.txt | 5 ++--- src/tex2lyx/Makefile.am | 2 -- src/tex2lyx/text.cpp | 2 +- 41 files changed, 53 insertions(+), 55 deletions(-) rename src/{ => support}/Length.cpp (99%) rename src/{ => support}/Length.h (100%) rename src/{ => support}/lengthcommon.cpp (99%) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index f678e73a7f..6e0d9f91c6 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -32,7 +32,6 @@ #include "Language.h" #include "LaTeXFeatures.h" #include "LaTeXFonts.h" -#include "Length.h" #include "ModuleList.h" #include "Font.h" #include "Lexer.h" @@ -54,6 +53,7 @@ #include "support/FileName.h" #include "support/filetools.h" #include "support/gettext.h" +#include "support/Length.h" #include "support/Messages.h" #include "support/mutex.h" #include "support/Package.h" diff --git a/src/BufferView.cpp b/src/BufferView.cpp index fe02be5019..e316aab02e 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -35,7 +35,6 @@ #include "Language.h" #include "LaTeXFeatures.h" #include "LayoutFile.h" -#include "Length.h" #include "Lexer.h" #include "LyX.h" #include "LyXAction.h" @@ -81,6 +80,7 @@ #include "support/filetools.h" #include "support/gettext.h" #include "support/lassert.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/lyxlib.h" #include "support/Package.h" diff --git a/src/LyXRC.h b/src/LyXRC.h index ed7511a6d1..955826bcf6 100644 --- a/src/LyXRC.h +++ b/src/LyXRC.h @@ -18,9 +18,9 @@ #ifndef LYXRC_H #define LYXRC_H -#include "Length.h" #include "LyX.h" +#include "support/Length.h" #include "support/strfwd.h" #include "support/userinfo.h" diff --git a/src/Makefile.am b/src/Makefile.am index 4a74c6eef4..be8e478007 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -147,8 +147,6 @@ SOURCEFILESCORE = \ LaTeXPackages.cpp \ LayoutFile.cpp \ LayoutModuleList.cpp \ - Length.cpp \ - lengthcommon.cpp \ Lexer.cpp \ LyX.cpp \ LyXAction.cpp \ @@ -251,7 +249,6 @@ HEADERFILESCORE = \ LayoutEnums.h \ LayoutFile.h \ LayoutModuleList.h \ - Length.h \ Lexer.h \ LyXAction.h \ lyxfind.h \ @@ -733,20 +730,15 @@ check_ExternalTransforms_SOURCES = \ tests/boost.cpp check_ExternalTransforms_LYX_OBJS = \ graphics/GraphicsParams.o \ - insets/ExternalTransforms.o \ - Length.o \ - lengthcommon.o + insets/ExternalTransforms.o check_Length_CPPFLAGS = $(AM_CPPFLAGS) -check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS) +check_Length_LDADD = $(TESTS_LIBS) check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS) check_Length_SOURCES = \ tests/check_Length.cpp \ tests/dummy_functions.cpp \ tests/boost.cpp -check_Length_LYX_OBJS = \ - Length.o \ - lengthcommon.o check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS) check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 1c8f03057a..133ddd15b8 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -30,7 +30,6 @@ #include "Language.h" #include "LaTeXFeatures.h" #include "Layout.h" -#include "Length.h" #include "Font.h" #include "FontList.h" #include "LyXRC.h" @@ -62,6 +61,7 @@ #include "support/ExceptionMessage.h" #include "support/gettext.h" #include "support/lassert.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/textutils.h" #include "output_docbook.h" diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h index ccb131c9c6..b4608e0b3b 100644 --- a/src/ParagraphParameters.h +++ b/src/ParagraphParameters.h @@ -15,12 +15,12 @@ #define PARAGRAPHPARAMETERS_H #include "LayoutEnums.h" -#include "Length.h" #include "Spacing.h" #include "support/debug.h" #include "support/types.h" #include "support/docstring.h" +#include "support/Length.h" namespace lyx { diff --git a/src/Text.cpp b/src/Text.cpp index 60705c0b34..e03c2cb57c 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -37,7 +37,6 @@ #include "InsetList.h" #include "Language.h" #include "Layout.h" -#include "Length.h" #include "Lexer.h" #include "lyxfind.h" #include "LyXRC.h" @@ -65,6 +64,7 @@ #include "support/docstream.h" #include "support/gettext.h" #include "support/lassert.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/lyxalgo.h" #include "support/lyxtime.h" diff --git a/src/VSpace.cpp b/src/VSpace.cpp index a2d4a3d398..d176850c87 100644 --- a/src/VSpace.cpp +++ b/src/VSpace.cpp @@ -16,11 +16,11 @@ #include "BufferParams.h" #include "BufferView.h" #include "support/gettext.h" -#include "Length.h" #include "Text.h" #include "TextMetrics.h" // for defaultRowHeight() #include "support/convert.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/lassert.h" diff --git a/src/VSpace.h b/src/VSpace.h index 2bce154e33..7cd1a2b131 100644 --- a/src/VSpace.h +++ b/src/VSpace.h @@ -12,7 +12,7 @@ #ifndef VSPACE_H #define VSPACE_H -#include "Length.h" +#include "support/Length.h" namespace lyx { diff --git a/src/frontends/qt/GuiBox.cpp b/src/frontends/qt/GuiBox.cpp index 67a1b0c52b..5b504ddbda 100644 --- a/src/frontends/qt/GuiBox.cpp +++ b/src/frontends/qt/GuiBox.cpp @@ -19,13 +19,13 @@ #include "ColorCache.h" #include "ColorSet.h" #include "LengthCombo.h" -#include "Length.h" #include "qt_helpers.h" #include "Validator.h" #include "insets/InsetBox.h" #include "support/gettext.h" +#include "support/Length.h" #include "support/lstrings.h" #include diff --git a/src/frontends/qt/GuiExternal.cpp b/src/frontends/qt/GuiExternal.cpp index d850c2d8a5..eb71aad4d1 100644 --- a/src/frontends/qt/GuiExternal.cpp +++ b/src/frontends/qt/GuiExternal.cpp @@ -17,7 +17,6 @@ #include "Buffer.h" #include "FuncRequest.h" #include "support/gettext.h" -#include "Length.h" #include "LyXRC.h" #include "insets/ExternalSupport.h" @@ -31,6 +30,7 @@ #include "support/convert.h" #include "support/filetools.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/lyxlib.h" #include "support/os.h" diff --git a/src/frontends/qt/GuiGraphics.cpp b/src/frontends/qt/GuiGraphics.cpp index e0a1b20b32..142f433759 100644 --- a/src/frontends/qt/GuiGraphics.cpp +++ b/src/frontends/qt/GuiGraphics.cpp @@ -22,7 +22,6 @@ #include "Buffer.h" #include "FuncRequest.h" #include "LengthCombo.h" -#include "Length.h" #include "LyXRC.h" #include "graphics/epstools.h" @@ -36,6 +35,7 @@ #include "support/debug.h" #include "support/filetools.h" #include "support/gettext.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/os.h" #include "support/Package.h" diff --git a/src/frontends/qt/LengthCombo.h b/src/frontends/qt/LengthCombo.h index 2545a96606..eb1a38769b 100644 --- a/src/frontends/qt/LengthCombo.h +++ b/src/frontends/qt/LengthCombo.h @@ -14,7 +14,7 @@ #include -#include "Length.h" +#include "support/Length.h" namespace lyx { diff --git a/src/frontends/qt/Validator.h b/src/frontends/qt/Validator.h index bf77795918..cce7cf5f75 100644 --- a/src/frontends/qt/Validator.h +++ b/src/frontends/qt/Validator.h @@ -25,9 +25,10 @@ #ifndef VALIDATOR_H #define VALIDATOR_H -#include "Length.h" #include "Dialog.h" // KernelDocType +#include "support/Length.h" + #include class QWidget; diff --git a/src/frontends/qt/qt_helpers.cpp b/src/frontends/qt/qt_helpers.cpp index 26c0df0ffc..d3da0ee7de 100644 --- a/src/frontends/qt/qt_helpers.cpp +++ b/src/frontends/qt/qt_helpers.cpp @@ -22,12 +22,12 @@ #include "BufferParams.h" #include "FloatList.h" #include "Language.h" -#include "Length.h" #include "TextClass.h" #include "support/convert.h" #include "support/debug.h" #include "support/gettext.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/lyxalgo.h" #include "support/os.h" diff --git a/src/frontends/qt/qt_helpers.h b/src/frontends/qt/qt_helpers.h index 754b6bf913..92872e0808 100644 --- a/src/frontends/qt/qt_helpers.h +++ b/src/frontends/qt/qt_helpers.h @@ -14,7 +14,7 @@ #define QTHELPERS_H #include "ColorSet.h" -#include "Length.h" +#include "support/Length.h" #include "support/qstring_helpers.h" #include "support/filetools.h" #include "qt_i18n.h" diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h index 052b006bff..e05bb67c5a 100644 --- a/src/graphics/GraphicsParams.h +++ b/src/graphics/GraphicsParams.h @@ -14,9 +14,8 @@ #ifndef GRAPHICSPARAMS_H #define GRAPHICSPARAMS_H -#include "Length.h" - #include "support/FileName.h" +#include "support/Length.h" #include #include diff --git a/src/insets/ExternalTransforms.h b/src/insets/ExternalTransforms.h index d6735b60b5..6d0f9afedb 100644 --- a/src/insets/ExternalTransforms.h +++ b/src/insets/ExternalTransforms.h @@ -12,10 +12,9 @@ #ifndef EXTERNALTRANSFORMS_H #define EXTERNALTRANSFORMS_H -#include "Length.h" - #include "graphics/GraphicsParams.h" +#include "support/Length.h" #include "support/unique_ptr.h" #include diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h index 418a242772..3398a52ed6 100644 --- a/src/insets/InsetBox.h +++ b/src/insets/InsetBox.h @@ -15,7 +15,8 @@ #define INSETBOX_H #include "InsetCollapsible.h" -#include "Length.h" + +#include "support/Length.h" namespace lyx { diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index 62efa84dc0..99fcf3d6fc 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -62,7 +62,6 @@ TODO #include "FuncStatus.h" #include "InsetIterator.h" #include "LaTeXFeatures.h" -#include "Length.h" #include "Lexer.h" #include "MetricsInfo.h" #include "Mover.h" @@ -86,6 +85,7 @@ TODO #include "support/ExceptionMessage.h" #include "support/filetools.h" #include "support/gettext.h" +#include "support/Length.h" #include "support/lyxlib.h" #include "support/lstrings.h" #include "support/os.h" diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 699d878bb1..4edf0eb1e0 100644 --- a/src/insets/InsetInfo.cpp +++ b/src/insets/InsetInfo.cpp @@ -25,7 +25,6 @@ #include "LaTeXFeatures.h" #include "Language.h" #include "LayoutFile.h" -#include "Length.h" #include "LyXAction.h" #include "LyXRC.h" #include "LyXVC.h" @@ -45,6 +44,7 @@ #include "support/FileName.h" #include "support/filetools.h" #include "support/gettext.h" +#include "support/Length.h" #include "support/Messages.h" #include "support/lstrings.h" #include "support/qstring_helpers.h" diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp index e6964aad79..8d6a4ada2f 100644 --- a/src/insets/InsetLine.cpp +++ b/src/insets/InsetLine.cpp @@ -21,7 +21,6 @@ #include "FuncRequest.h" #include "FuncStatus.h" #include "LaTeXFeatures.h" -#include "Length.h" #include "MetricsInfo.h" #include "OutputParams.h" #include "output_docbook.h" @@ -35,6 +34,7 @@ #include "support/debug.h" #include "support/docstream.h" #include "support/gettext.h" +#include "support/Length.h" #include "support/lstrings.h" #include diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp index 2e2f4c6e53..9c87a58c77 100644 --- a/src/insets/InsetListingsParams.cpp +++ b/src/insets/InsetListingsParams.cpp @@ -13,7 +13,7 @@ #include "InsetListingsParams.h" -#include "Length.h" +#include "support/Length.h" #include "Lexer.h" #include "support/convert.h" diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp index e7fc8a7d98..c762e33d67 100644 --- a/src/insets/InsetNomencl.cpp +++ b/src/insets/InsetNomencl.cpp @@ -26,7 +26,6 @@ #include "InsetList.h" #include "Language.h" #include "LaTeXFeatures.h" -#include "Length.h" #include "LyX.h" #include "OutputParams.h" #include "xml.h" @@ -38,6 +37,7 @@ #include "support/debug.h" #include "support/docstream.h" #include "support/gettext.h" +#include "support/Length.h" #include "support/lstrings.h" using namespace std; diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp index 04b515cdcc..5a4f46801a 100644 --- a/src/insets/InsetSpace.cpp +++ b/src/insets/InsetSpace.cpp @@ -22,7 +22,6 @@ #include "FuncStatus.h" #include "Language.h" #include "LaTeXFeatures.h" -#include "Length.h" #include "Lexer.h" #include "MetricsInfo.h" #include "OutputParams.h" @@ -33,6 +32,7 @@ #include "support/docstream.h" #include "support/gettext.h" #include "support/lassert.h" +#include "support/Length.h" #include "support/lstrings.h" #include "frontends/Application.h" diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h index 1111aa1e82..0ebcec1f54 100644 --- a/src/insets/InsetSpace.h +++ b/src/insets/InsetSpace.h @@ -16,7 +16,8 @@ #define INSET_SPACE_H #include "Inset.h" -#include "Length.h" + +#include "support/Length.h" namespace lyx { diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index d917ab8370..028da97969 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -25,7 +25,8 @@ #define INSET_TABULAR_H #include "InsetText.h" -#include "Length.h" + +#include "support/Length.h" #include #include diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h index 934e3bd101..5619dc042b 100644 --- a/src/insets/InsetWrap.h +++ b/src/insets/InsetWrap.h @@ -13,7 +13,8 @@ #define INSETWRAP_H #include "InsetCaptionable.h" -#include "Length.h" + +#include "support/Length.h" namespace lyx { diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h index 1c8efd1814..fa7c2f2691 100644 --- a/src/mathed/InsetMathGrid.h +++ b/src/mathed/InsetMathGrid.h @@ -13,7 +13,8 @@ #define MATH_GRID_H #include "InsetMathNest.h" -#include "Length.h" + +#include "support/Length.h" #include diff --git a/src/mathed/InsetMathKern.h b/src/mathed/InsetMathKern.h index e985ad4dc3..58d540d1fc 100644 --- a/src/mathed/InsetMathKern.h +++ b/src/mathed/InsetMathKern.h @@ -13,7 +13,8 @@ #define MATH_CHEATINSET_H #include "InsetMath.h" -#include "Length.h" + +#include "support/Length.h" namespace lyx { diff --git a/src/mathed/InsetMathSpace.h b/src/mathed/InsetMathSpace.h index 4f16f1640b..32147dbe25 100644 --- a/src/mathed/InsetMathSpace.h +++ b/src/mathed/InsetMathSpace.h @@ -13,7 +13,8 @@ #define MATH_SPACEINSET_H #include "InsetMath.h" -#include "Length.h" + +#include "support/Length.h" namespace lyx { diff --git a/src/mathed/InsetMathXYMatrix.h b/src/mathed/InsetMathXYMatrix.h index a5be7c0af3..68de02813a 100644 --- a/src/mathed/InsetMathXYMatrix.h +++ b/src/mathed/InsetMathXYMatrix.h @@ -12,9 +12,10 @@ #ifndef MATH_XYMATRIX_H #define MATH_XYMATRIX_H -#include "Length.h" #include "InsetMathGrid.h" +#include "support/Length.h" + namespace lyx { diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp index 45ca429681..ef93cb0bf1 100644 --- a/src/mathed/MathSupport.cpp +++ b/src/mathed/MathSupport.cpp @@ -15,7 +15,6 @@ #include "InsetMathFont.h" #include "InsetMathSymbol.h" -#include "Length.h" #include "MathData.h" #include "MathFactory.h" #include "MathParser.h" @@ -31,6 +30,7 @@ #include "support/debug.h" #include "support/docstream.h" #include "support/lassert.h" +#include "support/Length.h" #include "support/lyxlib.h" #include diff --git a/src/Length.cpp b/src/support/Length.cpp similarity index 99% rename from src/Length.cpp rename to src/support/Length.cpp index d2868828b3..d23ea9bf98 100644 --- a/src/Length.cpp +++ b/src/support/Length.cpp @@ -15,11 +15,11 @@ #include -#include "Length.h" #include "LyXRC.h" #include "support/debug.h" #include "support/docstream.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/lyxlib.h" diff --git a/src/Length.h b/src/support/Length.h similarity index 100% rename from src/Length.h rename to src/support/Length.h diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 3d92b62db0..8b7d211fa0 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -71,6 +71,9 @@ liblyxsupport_a_SOURCES = \ kill.cpp \ lassert.h \ lassert.cpp \ + Length.cpp \ + Length.h \ + lengthcommon.cpp \ limited_stack.h \ lstrings.cpp \ lstrings.h \ diff --git a/src/lengthcommon.cpp b/src/support/lengthcommon.cpp similarity index 99% rename from src/lengthcommon.cpp rename to src/support/lengthcommon.cpp index 4478d84ae5..303dbcbc1f 100644 --- a/src/lengthcommon.cpp +++ b/src/support/lengthcommon.cpp @@ -12,11 +12,10 @@ #include -#include "Length.h" - #include "support/convert.h" #include "support/gettext.h" #include "support/lassert.h" +#include "support/Length.h" #include "support/lstrings.h" using namespace std; diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index df83d0441b..957e4c0cd7 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -66,7 +66,7 @@ endforeach() set(check_ExternalTransforms_SOURCES) foreach(_f graphics/GraphicsParams.cpp insets/ExternalTransforms.cpp - Length.cpp lengthcommon.cpp tests/check_ExternalTransforms.cpp + tests/check_ExternalTransforms.cpp tests/boost.cpp tests/dummy_functions.cpp) list(APPEND check_ExternalTransforms_SOURCES ${TOP_SRC_DIR}/src/${_f}) endforeach() @@ -90,7 +90,7 @@ add_test(NAME "check_ExternalTransforms" add_dependencies(lyx_run_tests check_ExternalTransforms) set(check_Length_SOURCES) -foreach(_f Length.cpp lengthcommon.cpp tests/check_Length.cpp tests/boost.cpp tests/dummy_functions.cpp) +foreach(_f tests/check_Length.cpp tests/boost.cpp tests/dummy_functions.cpp) list(APPEND check_Length_SOURCES ${TOP_SRC_DIR}/src/${_f}) endforeach() add_executable(check_Length ${check_Length_SOURCES}) diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt index cb129af158..2a68e71150 100644 --- a/src/tex2lyx/CMakeLists.txt +++ b/src/tex2lyx/CMakeLists.txt @@ -7,14 +7,13 @@ project(${_tex2lyx}) -# There is no header file lengthcommon.h -set(LINKED_sources ${TOP_SRC_DIR}/src/lengthcommon.cpp) +set(LINKED_sources) set(LINKED_headers) foreach(_src graphics/GraphicsParams insets/ExternalTemplate insets/ExternalTransforms insets/InsetLayout Author CiteEnginesList Color Counters Encoding FloatList Floating FontInfo LaTeXPackages Layout - LayoutFile LayoutModuleList Length Lexer ModuleList TextClass + LayoutFile LayoutModuleList Lexer ModuleList TextClass Spacing version) list(APPEND LINKED_sources ${TOP_SRC_DIR}/src/${_src}.cpp) list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h) diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 87bb3355e0..05a3efc55a 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -102,8 +102,6 @@ LYX_OBJS = \ ../Layout.o \ ../LayoutFile.o \ ../LayoutModuleList.o \ - ../Length.o \ - ../lengthcommon.o \ ../Lexer.o \ ../ModuleList.o \ ../Spacing.o \ diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index fdcab6333f..6744d78157 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -21,7 +21,6 @@ #include "FloatList.h" #include "LaTeXPackages.h" #include "Layout.h" -#include "Length.h" #include "Preamble.h" #include "insets/ExternalTemplate.h" @@ -30,6 +29,7 @@ #include "support/convert.h" #include "support/FileName.h" #include "support/filetools.h" +#include "support/Length.h" #include "support/lstrings.h" #include "support/lyxtime.h" -- 2.39.5