couple more fixes

[lyx.git] / src / ParameterStruct.h

diff --git a/src/ParameterStruct.h b/src/ParameterStruct.h
index 86bc6f1e15f43d2151cd3a34134f97c6cf42f6f7..9a766d027ed8886e1e0f1e2a43a99e80ac114c6b 100644 (file)
--- a/src/ParameterStruct.h
+++ b/src/ParameterStruct.h
@@ -6,9 +6,18 @@
 #include "vspace.h"
 #include "Spacing.h"
 #include "layout.h"
+#include "lyxlength.h"
+
+#ifdef __GNUG__
+#pragma interface
+#endif
 
 ///
 struct ParameterStruct {
+       ///
+       ParameterStruct();
+       ///
+       typedef unsigned int depth_type;
        ///
        VSpace added_space_top;
        ///
@@ -28,7 +37,7 @@ struct ParameterStruct {
        ///
        LyXAlignment align;
        ///
-       char depth; // wrong type (Lgb)
+       depth_type depth;
        ///
        bool start_of_appendix;
        ///
@@ -37,24 +46,23 @@ struct ParameterStruct {
        string labelstring;
        ///
        string labelwidthstring;
-        ///
-        int pextra_type;
-        ///
-        string pextra_width;
-        ///
-        string pextra_widthp;
-        ///
-        int pextra_alignment;
-        ///
-        bool pextra_hfill;
-        ///
-        bool pextra_start_minipage;
+       ///
+       LyXLength leftindent;
 };
 
 
+inline
+ParameterStruct::ParameterStruct()
+       : noindent(false), line_top(false), line_bottom(false),
+         pagebreak_top(false), pagebreak_bottom(false),
+         align(LYX_ALIGN_BLOCK), depth(0), start_of_appendix(false),
+         appendix(false)
+{}
+
+
 inline
 bool operator==(ParameterStruct const & ps1,
-               ParameterStruct const & ps2) 
+               ParameterStruct const & ps2)
 {
        return ps1.added_space_top == ps2.added_space_top
                && ps1.added_space_bottom == ps2.added_space_bottom
@@ -70,12 +78,8 @@ bool operator==(ParameterStruct const & ps1,
                && ps1.appendix == ps2.appendix
                && ps1.labelstring == ps2.labelstring
                && ps1.labelwidthstring == ps2.labelwidthstring
-               && ps1.pextra_type == ps2.pextra_type
-               && ps1.pextra_width == ps2.pextra_width
-               && ps1.pextra_widthp == ps2.pextra_widthp
-               && ps1.pextra_alignment == ps2.pextra_alignment
-               && ps1.pextra_hfill == ps2.pextra_hfill
-               && ps1.pextra_start_minipage == ps2.pextra_start_minipage;
+               && ps1.leftindent == ps2.leftindent;
+
 }
 
 #endif