From b7cc721833b9bce07aad2c622f24d7aa1b200ce4 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Wed, 7 Nov 2007 22:31:07 +0000 Subject: [PATCH] Move InsetLayout definition to insets/InsetLayout.h git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21502 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Makefile.am | 1 + src/TextClass.h | 26 ++------------------- src/insets/InsetCollapsable.h | 2 +- src/insets/InsetLayout.h | 44 +++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 src/insets/InsetLayout.h diff --git a/src/Makefile.am b/src/Makefile.am index a5ecd478a4..639834ed75 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -517,6 +517,7 @@ liblyxinsets_la_SOURCES = \ insets/InsetInfo.h \ insets/InsetLabel.cpp \ insets/InsetLabel.h \ + insets/InsetLayout.h \ insets/InsetLine.cpp \ insets/InsetLine.h \ insets/InsetListings.h \ diff --git a/src/TextClass.h b/src/TextClass.h index 554b3b53d9..42e0b8e85e 100644 --- a/src/TextClass.h +++ b/src/TextClass.h @@ -15,6 +15,8 @@ #include "LayoutEnums.h" #include "LayoutPtr.h" +#include "insets/InsetLayout.h" + #include "support/docstring.h" #include @@ -32,30 +34,6 @@ class Lexer; class Counters; class FloatList; - -/// -class InsetLayout { -public: - std::string name; - std::string lyxtype; - docstring labelstring; - std::string decoration; - std::string latextype; - std::string latexname; - std::string latexparam; - FontInfo font; - FontInfo labelfont; - ColorCode bgcolor; - std::string preamble; - bool multipar; - bool passthru; - bool needprotect; - bool freespacing; - bool keepempty; - bool forceltr; -}; - - /// List of inset layouts typedef std::map InsetLayouts; diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h index 941d54d2d0..999315a506 100644 --- a/src/insets/InsetCollapsable.h +++ b/src/insets/InsetCollapsable.h @@ -15,8 +15,8 @@ #define INSETCOLLAPSABLE_H #include "Inset.h" +#include "InsetLayout.h" #include "InsetText.h" -#include "TextClass.h" #include "Box.h" diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h new file mode 100644 index 0000000000..0e118f1c5a --- /dev/null +++ b/src/insets/InsetLayout.h @@ -0,0 +1,44 @@ +// -*- C++ -*- +/** + * \file InsetLayout.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * Full author contact details are available in file CREDITS. + */ + +#ifndef INSET_LAYOUT_H +#define INSET_LAYOUT_H + +#include "ColorCode.h" +#include "FontInfo.h" + +#include "support/docstring.h" + +namespace lyx { + +/// +class InsetLayout { +public: + std::string name; + std::string lyxtype; + docstring labelstring; + std::string decoration; + std::string latextype; + std::string latexname; + std::string latexparam; + FontInfo font; + FontInfo labelfont; + ColorCode bgcolor; + std::string preamble; + bool multipar; + bool passthru; + bool needprotect; + bool freespacing; + bool keepempty; + bool forceltr; +}; + +} // namespace lyx + +#endif -- 2.39.2