Move InsetLayout definition to insets/InsetLayout.h

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

diff --git a/src/Makefile.am b/src/Makefile.am
index a5ecd478a4e63f83d4f3e3dee32ed0f5a95bc758..639834ed75e0e5bcbba2baeb7396652003b17951 100644 (file)
--- 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 554b3b53d9460d6721719d6a14388db2779e0492..42e0b8e85e17729e3bfe6f216932d266fdfb480a 100644 (file)
--- 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 <boost/shared_ptr.hpp>
@@ -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<docstring, InsetLayout> InsetLayouts;
 

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 941d54d2d086535e7a9ac7915e23d77ec7197174..999315a50657ef4f49deb60d051a1fc82b035f04 100644 (file)
--- 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 (file)
index 0000000..0e118f1
--- /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