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
This commit is contained in:
Angus Leeming 2003-09-06 20:32:37 +00:00
parent 6e4ee366a9
commit d727b8e95e
7 changed files with 34 additions and 13 deletions

View File

@ -1,3 +1,9 @@
2003-09-06 Angus Leeming <leeming@lyx.org>
* ParagraphParameters.h: forward declare ParameterStruct rather than
'including the its file.
(depth): moved out-of-line.
2003-09-06 Angus Leeming <leeming@lyx.org> 2003-09-06 Angus Leeming <leeming@lyx.org>
* BufferView_pimpl.h: * BufferView_pimpl.h:

View File

@ -22,6 +22,7 @@
#include "lyxlex.h" #include "lyxlex.h"
#include "lyxtext.h" #include "lyxtext.h"
#include "paragraph.h" #include "paragraph.h"
#include "ParameterStruct.h"
#include "tex-strings.h" #include "tex-strings.h"
#include "frontends/LyXView.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 bool ParagraphParameters::sameLayout(ParagraphParameters const & pp) const
{ {
return param->align == pp.param->align && return param->align == pp.param->align &&

View File

@ -14,19 +14,21 @@
#ifndef PARAGRAPHPARAMETERS_H #ifndef PARAGRAPHPARAMETERS_H
#define PARAGRAPHPARAMETERS_H #define PARAGRAPHPARAMETERS_H
#include "support/std_string.h"
#include "ShareContainer.h"
#include "layout.h" #include "layout.h"
#include "ShareContainer.h"
#include "ParameterStruct.h" #include "support/types.h"
#include "support/std_string.h"
#include <iosfwd> #include <iosfwd>
class VSpace; class BufferView;
class Spacing; class LyXLength;
class LyXLex; class LyXLex;
class Paragraph; class Paragraph;
class ParameterStruct;
class Spacing;
class VSpace;
/// ///
class ParagraphParameters { 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. /** Generate a string \param data from \param par's ParagraphParameters.
The function also generates some additional info needed by the The function also generates some additional info needed by the
Paragraph dialog. Paragraph dialog.

View File

@ -1,3 +1,7 @@
2003-09-06 Angus Leeming <leeming@lyx.org>
* QParagraph.C: add Spacing.h and vspace.h includes.
2003-09-06 Angus Leeming <leeming@lyx.org> 2003-09-06 Angus Leeming <leeming@lyx.org>
* QContentPane.C: add a typedef for LyXKeySymPtr. * QContentPane.C: add a typedef for LyXKeySymPtr.

View File

@ -19,6 +19,9 @@
#include "qt_helpers.h" #include "qt_helpers.h"
#include "helper_funcs.h" #include "helper_funcs.h"
#include "Spacing.h"
#include "vspace.h"
#include "support/lstrings.h" #include "support/lstrings.h"
#include "support/tostr.h" #include "support/tostr.h"

View File

@ -1,3 +1,7 @@
2003-09-06 Angus Leeming <leeming@lyx.org>
* FormParagraph.C: add Spacing.h and vspace.h includes.
2003-09-05 Martin Vermeer <martin.vermeer@hut.fi> 2003-09-05 Martin Vermeer <martin.vermeer@hut.fi>
* Color.C: * Color.C:

View File

@ -25,6 +25,8 @@
#include "lyxrc.h" // to set the deafult length values #include "lyxrc.h" // to set the deafult length values
#include "ParagraphParameters.h" #include "ParagraphParameters.h"
#include "Spacing.h"
#include "vspace.h"
#include "support/LAssert.h" #include "support/LAssert.h"
#include "support/lstrings.h" #include "support/lstrings.h"