ws changes only

[lyx.git] / src / ParameterStruct.h

diff --git a/src/ParameterStruct.h b/src/ParameterStruct.h
index 38bde8212f29814e3c37f7e7adf47b3a9892ee2c..a45d00fbfcbcf87b3a561df8b0a2da1feb5f4123 100644 (file)
--- a/src/ParameterStruct.h
+++ b/src/ParameterStruct.h
@@ -1,23 +1,31 @@
 // -*- C++ -*-
+/**
+ * \file ParameterStruct.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef PARAMETERSTRUCT_H
 #define PARAMETERSTRUCT_H
 
-#include "vspace.h"
-#include "Spacing.h"
 #include "layout.h"
 #include "lyxlength.h"
+#include "Spacing.h"
+#include "vspace.h"
+
+#include "support/types.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 ///
 struct ParameterStruct {
        ///
-       ParameterStruct();
+       typedef lyx::depth_type depth_type;
        ///
-       typedef unsigned int depth_type;
+       ParameterStruct();
        ///
        VSpace added_space_top;
        ///
@@ -43,26 +51,11 @@ struct ParameterStruct {
        ///
        bool appendix;
        ///
-       string labelstring;
+       std::string labelstring;
        ///
-       string labelwidthstring;
+       std::string labelwidthstring;
        ///
        LyXLength leftindent;
-       ///
-#ifndef NO_PEXTRA_REALLY
-       ///
-       int pextra_type;
-       ///
-       string pextra_width;
-       ///
-       string pextra_widthp;
-       ///
-       int pextra_alignment;
-       ///
-       bool pextra_hfill;
-       ///
-       bool pextra_start_minipage;
-#endif
 };
 
 
@@ -72,10 +65,6 @@ ParameterStruct::ParameterStruct()
          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
 {}
 
 
@@ -97,16 +86,7 @@ bool operator==(ParameterStruct const & ps1,
                && ps1.appendix == ps2.appendix
                && ps1.labelstring == ps2.labelstring
                && ps1.labelwidthstring == ps2.labelwidthstring
-               && ps1.leftindent == ps2.leftindent
-#ifndef NO_PEXTRA_REALLY
-               && 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
-#endif
-       ;
+               && ps1.leftindent == ps2.leftindent;
 
 }