Remove a few includes from Text.h

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

diff --git a/src/Layout.h b/src/Layout.h
index 669aeb364e5cad7a2a7b9d46cb822012c49d7038..ee5905f141490de89a2050e5f765dfce626a3005 100644 (file)
--- a/src/Layout.h
+++ b/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)

diff --git a/src/Text.h b/src/Text.h
index ba665b7f3bdc4667314701d61ab7c1e6d0fd11ca..a28353c2b07537b17c7f5dda8cc78cd0f320b8de 100644 (file)
--- a/src/Text.h
+++ b/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;

diff --git a/src/Text3.cpp b/src/Text3.cpp
index c6f1e707b7f5106a24e4c19017792e7383d5da52..3da55c9caabcc8b3074919f378b94512a6fb2cb1 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -17,6 +17,7 @@
 
 #include "Text.h"
 
+#include "Bidi.h"
 #include "BranchList.h"
 #include "FloatList.h"
 #include "FuncStatus.h"

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index b1e116057ed9b3ee052dd09e873ef8da0aaa0232..837a4b682e032b8d4c7f15c133384ad116f143ff 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -19,6 +19,7 @@
 
 #include "TextMetrics.h"
 
+#include "Bidi.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index ee2a68a37911bd9d7e71d6b2cbddb756024ec885..99d03cd960b8bd30776f0bbaf14a01ce93a3ab06 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/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"

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index 044db3fc84ab5bcbe05644b607048760022b6182..1316fc1afd07996c4fa90d022ef823e68a0106e7 100644 (file)
--- a/src/buffer_funcs.h
+++ b/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>

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 90df5c8121bb8f02b920ff82e95638d06a232915..22d4a0fcae3a5170f50cdc60d1cc24a965d8455b 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/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>
 

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index d4c280a7c5ffad0edb4d038d202968fca5943b5a..28b799ffb7b8aeea186595f079af1130c898e40e 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/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"