Minor code shuffle.

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index fe64dbe3cba7b87d88947b5733d14db4a788304d..1cd0e364477c797c9dba758c63c86f3b4ecfbbf6 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -6,10 +6,14 @@
 #include "ShareContainer.h"
 #include "LString.h"
 #include "layout.h"
+#include "ParameterStruct.h"
 
 class VSpace;
 class Spacing;
-struct ParameterStruct;
+
+
+// Not yet... lyx 1.3.x or so
+//#define NO_PEXTRA_REALLY 1
 
 ///
 class ParagraphParameters {
@@ -21,8 +25,6 @@ public:
        ///
        bool sameLayout(ParagraphParameters const &) const;
        ///
-       void makeSame(ParagraphParameters const & pp);
-       ///
        VSpace const & spaceTop() const;
        ///
        void spaceTop(VSpace const &);
@@ -59,9 +61,11 @@ public:
        ///
        void align(LyXAlignment);
        ///
-       char depth() const;
+       typedef ParameterStruct::depth_type depth_type;
+       ///
+       depth_type depth() const;
        ///
-       void depth(char);
+       void depth(depth_type);
        ///
        bool startOfAppendix() const;
        ///
@@ -78,6 +82,7 @@ public:
        string const & labelWidthString() const;
        ///
        void labelWidthString(string const &);
+#ifndef NO_PEXTRA_REALLY
        ///
        int pextraType() const;
        ///
@@ -102,6 +107,7 @@ public:
        bool pextraStartMinipage() const;
        ///
        void pextraStartMinipage(bool);
+#endif
 private:
        ///
        void set_from_struct(ParameterStruct const &);
@@ -110,4 +116,11 @@ private:
        ///
        static ShareContainer<ParameterStruct> container;
 };
+
+
+inline
+ParagraphParameters::depth_type ParagraphParameters::depth() const
+{
+       return param->depth;
+}
 #endif