Remove a few includes from Text.h

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

src/Layout.h

@@ -205,9 +205,9 @@ public:
 	///
 	std::string const & latexname() const { return latexname_; }
 	///
-	lyx::docstring const & labelstring() const { return labelstring_; }
+	docstring const & labelstring() const { return labelstring_; }
 	///
-	lyx::docstring const & endlabelstring() const { return endlabelstring_; }
+	docstring const & endlabelstring() const { return endlabelstring_; }
 	///
 	docstring const & preamble() const { return preamble_; }
 	///
@@ -219,7 +219,7 @@ public:
 	///
 	std::string const & itemtag() const { return itemtag_; }
 	///
-	lyx::docstring const & labelstring_appendix() const {
+	docstring const & labelstring_appendix() const {
 		return labelstring_appendix_;
 	}
 	/** Default font for this layout/environment.
@@ -341,7 +341,7 @@ public:
 	/// Does this layout allow for an optional parameter?
 	int optionalargs;
 	/// Which counter to step
-	lyx::docstring counter;
+	docstring counter;
 	/// Depth of XML command
 	int commanddepth;
 
@@ -369,11 +369,11 @@ private:
 	/// LaTeX name for environment
 	std::string latexname_;
 	/// Label string. "Abstract", "Reference", "Caption"...
-	lyx::docstring labelstring_;
+	docstring labelstring_;
 	///
-	lyx::docstring endlabelstring_;
+	docstring endlabelstring_;
 	/// Label string inside appendix. "Appendix", ...
-	lyx::docstring labelstring_appendix_;
+	docstring labelstring_appendix_;
 	/// LaTeX parameter for environment
 	std::string latexparam_;
 	/// Internal tag to use (e.g., <title></title> for sect header)

src/Text.h

@@ -14,16 +14,8 @@
 #ifndef TEXT_H
 #define TEXT_H
 
-#include "Bidi.h"
-#include "DispatchResult.h"
-#include "Font.h"
-#include "Layout.h"
-#include "lyxlayout_ptr_fwd.h"
 #include "ParagraphList.h"
 
-#include <iosfwd>
-
-
 namespace lyx {
 
 class Buffer;
@@ -32,6 +24,7 @@ class BufferView;
 class CursorSlice;
 class DocIterator;
 class ErrorList;
+class Font;
 class FuncRequest;
 class FuncStatus;
 class Inset;

src/Text3.cpp

@@ -17,6 +17,7 @@
 
 #include "Text.h"
 
+#include "Bidi.h"
 #include "BranchList.h"
 #include "FloatList.h"
 #include "FuncStatus.h"

src/TextMetrics.cpp

@@ -19,6 +19,7 @@
 
 #include "TextMetrics.h"
 
+#include "Bidi.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"

src/buffer_funcs.cpp

@@ -27,6 +27,7 @@
 #include "Language.h"
 #include "LaTeX.h"
 #include "LyX.h"
+#include "lyxlayout_ptr_fwd.h"
 #include "TextClass.h"
 #include "TextClassList.h"
 #include "Paragraph.h"

src/buffer_funcs.h

@@ -12,7 +12,6 @@
 #ifndef BUFFER_FUNCS_H
 #define BUFFER_FUNCS_H
 
-#include "lyxlayout_ptr_fwd.h"
 #include "support/docstring.h"
 
 #include <string>

src/insets/InsetTabular.h

@@ -37,10 +37,10 @@
 #define INSETTABULAR_H
 
 #include "Inset.h"
-#include "MailInset.h"
-#include "Length.h"
 #include "InsetText.h"
-
+#include "Layout.h"
+#include "Length.h"
+#include "MailInset.h"
 
 #include <boost/shared_ptr.hpp>
 

src/mathed/InsetMathNest.cpp

@@ -33,6 +33,7 @@
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "Bidi.h"
 #include "bufferview_funcs.h"
 #include "BufferView.h"
 #include "Color.h"