more cursor dispatch

[lyx.git] / src / ParameterStruct.h

diff --git a/src/ParameterStruct.h b/src/ParameterStruct.h
index 03fd3fffc08d9d9241781f98dbb709fc7209aafb..5b0543e44152976974e69db258b879a212f276f1 100644 (file)
--- a/src/ParameterStruct.h
+++ b/src/ParameterStruct.h
@@ -12,10 +12,10 @@
 #ifndef PARAMETERSTRUCT_H
 #define PARAMETERSTRUCT_H
 
-#include "vspace.h"
-#include "Spacing.h"
 #include "layout.h"
 #include "lyxlength.h"
+#include "Spacing.h"
+
 #include "support/types.h"
 
 
@@ -26,22 +26,10 @@ struct ParameterStruct {
        ///
        ParameterStruct();
        ///
-       VSpace added_space_top;
-       ///
-       VSpace added_space_bottom;
-       ///
        Spacing spacing;
        ///
        bool noindent;
        ///
-       bool line_top;
-       ///
-       bool line_bottom;
-       ///
-       bool pagebreak_top;
-       ///
-       bool pagebreak_bottom;
-       ///
        LyXAlignment align;
        ///
        depth_type depth;
@@ -50,9 +38,9 @@ struct ParameterStruct {
        ///
        bool appendix;
        ///
-       string labelstring;
+       std::string labelstring;
        ///
-       string labelwidthstring;
+       std::string labelwidthstring;
        ///
        LyXLength leftindent;
 };
@@ -60,8 +48,7 @@ struct ParameterStruct {
 
 inline
 ParameterStruct::ParameterStruct()
-       : noindent(false), line_top(false), line_bottom(false),
-         pagebreak_top(false), pagebreak_bottom(false),
+       : noindent(false),
          align(LYX_ALIGN_BLOCK), depth(0), start_of_appendix(false),
          appendix(false)
 {}
@@ -71,14 +58,9 @@ inline
 bool operator==(ParameterStruct const & ps1,
                ParameterStruct const & ps2)
 {
-       return ps1.added_space_top == ps2.added_space_top
-               && ps1.added_space_bottom == ps2.added_space_bottom
-               && ps1.spacing == ps2.spacing
+       return
+                  ps1.spacing == ps2.spacing
                && ps1.noindent == ps2.noindent
-               && ps1.line_top == ps2.line_top
-               && ps1.line_bottom == ps2.line_bottom
-               && ps1.pagebreak_top == ps2.pagebreak_top
-               && ps1.pagebreak_bottom == ps2.pagebreak_bottom
                && ps1.align == ps2.align
                && ps1.depth == ps2.depth
                && ps1.start_of_appendix == ps2.start_of_appendix
@@ -86,7 +68,6 @@ bool operator==(ParameterStruct const & ps1,
                && ps1.labelstring == ps2.labelstring
                && ps1.labelwidthstring == ps2.labelwidthstring
                && ps1.leftindent == ps2.leftindent;
-
 }
 
 #endif