From d727b8e95ec40c854429cb82d49e10e4f0a6cff4 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Sat, 6 Sep 2003 20:32:37 +0000 Subject: [PATCH] Don't #include ParameterStruct.h in ParagraphParameters.h. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7698 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 6 ++++++ src/ParagraphParameters.C | 7 +++++++ src/ParagraphParameters.h | 21 ++++++++------------- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/QParagraph.C | 3 +++ src/frontends/xforms/ChangeLog | 4 ++++ src/frontends/xforms/FormParagraph.C | 2 ++ 7 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 52df927f65..f4ff6eb607 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2003-09-06 Angus Leeming + + * ParagraphParameters.h: forward declare ParameterStruct rather than + 'including the its file. + (depth): moved out-of-line. + 2003-09-06 Angus Leeming * BufferView_pimpl.h: diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C index 23c0097d4f..ef62737f6d 100644 --- a/src/ParagraphParameters.C +++ b/src/ParagraphParameters.C @@ -22,6 +22,7 @@ #include "lyxlex.h" #include "lyxtext.h" #include "paragraph.h" +#include "ParameterStruct.h" #include "tex-strings.h" #include "frontends/LyXView.h" @@ -67,6 +68,12 @@ void ParagraphParameters::clear() } +ParagraphParameters::depth_type ParagraphParameters::depth() const +{ + return param->depth; +} + + bool ParagraphParameters::sameLayout(ParagraphParameters const & pp) const { return param->align == pp.param->align && diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h index a2722660be..03cd251c89 100644 --- a/src/ParagraphParameters.h +++ b/src/ParagraphParameters.h @@ -14,19 +14,21 @@ #ifndef PARAGRAPHPARAMETERS_H #define PARAGRAPHPARAMETERS_H -#include "support/std_string.h" -#include "ShareContainer.h" #include "layout.h" +#include "ShareContainer.h" -#include "ParameterStruct.h" +#include "support/types.h" +#include "support/std_string.h" #include -class VSpace; -class Spacing; +class BufferView; +class LyXLength; class LyXLex; class Paragraph; - +class ParameterStruct; +class Spacing; +class VSpace; /// class ParagraphParameters { @@ -116,13 +118,6 @@ private: }; -inline -ParagraphParameters::depth_type ParagraphParameters::depth() const -{ - return param->depth; -} - - /** Generate a string \param data from \param par's ParagraphParameters. The function also generates some additional info needed by the Paragraph dialog. diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 82a99cf89e..6c45a383d5 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2003-09-06 Angus Leeming + + * QParagraph.C: add Spacing.h and vspace.h includes. + 2003-09-06 Angus Leeming * QContentPane.C: add a typedef for LyXKeySymPtr. diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C index 11e9ed2e6e..fb1434b82e 100644 --- a/src/frontends/qt2/QParagraph.C +++ b/src/frontends/qt2/QParagraph.C @@ -19,6 +19,9 @@ #include "qt_helpers.h" #include "helper_funcs.h" +#include "Spacing.h" +#include "vspace.h" + #include "support/lstrings.h" #include "support/tostr.h" diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index df86059187..4b1bef4c87 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2003-09-06 Angus Leeming + + * FormParagraph.C: add Spacing.h and vspace.h includes. + 2003-09-05 Martin Vermeer * Color.C: diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index d4323fbf22..bde1a2be7d 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -25,6 +25,8 @@ #include "lyxrc.h" // to set the deafult length values #include "ParagraphParameters.h" +#include "Spacing.h" +#include "vspace.h" #include "support/LAssert.h" #include "support/lstrings.h" -- 2.39.5