X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParameterStruct.h;h=0f332b5a2a023fdf1eaadd84a690fb3a03f870fc;hb=539d0d16648f3ceabcc4d4b8f2300ebdcbb8369c;hp=0ac0cb42fc4a654b0467898df28448c94b638779;hpb=1a32c26a5ee4af362e249418dc6d441b7ab5d695;p=lyx.git diff --git a/src/ParameterStruct.h b/src/ParameterStruct.h index 0ac0cb42fc..0f332b5a2a 100644 --- a/src/ParameterStruct.h +++ b/src/ParameterStruct.h @@ -7,8 +7,16 @@ #include "Spacing.h" #include "layout.h" +#ifdef __GNUG__ +#pragma interface +#endif + /// struct ParameterStruct { + /// + ParameterStruct(); + /// + typedef unsigned int depth_type; /// VSpace added_space_top; /// @@ -28,7 +36,7 @@ struct ParameterStruct { /// LyXAlignment align; /// - char depth; // wrong type (Lgb) + depth_type depth; /// bool start_of_appendix; /// @@ -38,25 +46,38 @@ struct ParameterStruct { /// string labelwidthstring; #ifndef NO_PEXTRA_REALLY - /// - int pextra_type; - /// - string pextra_width; - /// - string pextra_widthp; - /// - int pextra_alignment; - /// - bool pextra_hfill; - /// - bool pextra_start_minipage; + /// + int pextra_type; + /// + string pextra_width; + /// + string pextra_widthp; + /// + int pextra_alignment; + /// + bool pextra_hfill; + /// + bool pextra_start_minipage; #endif }; +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) +#ifndef NO_PEXTRA_REALLY + , pextra_type(0), pextra_alignment(0), pextra_hfill(false), + pextra_start_minipage(false) +#endif +{} + + 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 @@ -81,7 +102,7 @@ bool operator==(ParameterStruct const & ps1, && ps1.pextra_start_minipage == ps2.pextra_start_minipage #endif ; - + } #endif