Continue to improve GtkLengthEntry

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 66d23e6485d5f7d1adb8db22e010a57996c27576..fc6d9acf3b5152a9d17b51f7d70ebc3335ba9b19 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -15,7 +15,8 @@
 #define PARAGRAPHPARAMETERS_H
 
 #include "layout.h"
-#include "ShareContainer.h"
+#include "lyxlength.h"
+#include "Spacing.h"
 
 #include "support/types.h"
 
@@ -26,9 +27,8 @@ class BufferView;
 class LyXLength;
 class LyXLex;
 class Paragraph;
-class ParameterStruct;
 class Spacing;
-class VSpace;
+
 
 ///
 class ParagraphParameters {
@@ -40,14 +40,6 @@ public:
        ///
        bool sameLayout(ParagraphParameters const &) const;
        ///
-       VSpace const & spaceTop() const;
-       ///
-       void spaceTop(VSpace const &);
-       ///
-       VSpace const & spaceBottom() const;
-       ///
-       void spaceBottom(VSpace const &);
-       ///
        Spacing const & spacing() const;
        ///
        void spacing(Spacing const &);
@@ -92,26 +84,36 @@ public:
        /// write out the parameters to a stream
        void write(std::ostream & os) const;
 
+       //friend bool operator==(ParameterStruct const & ps1,
+       //ParameterStruct const & ps2);
+
 private:
        ///
-       void set_from_struct(ParameterStruct const &);
+       Spacing spacing_;
+       ///
+       bool noindent_;
+       ///
+       bool start_of_appendix_;
        ///
-       boost::shared_ptr<ParameterStruct> param;
+       bool appendix_;
        ///
-       static ShareContainer<ParameterStruct> container;
+       LyXAlignment align_;
+       ///
+       depth_type depth_;
+       ///
+       std::string labelstring_;
+       ///
+       std::string labelwidthstring_;
+       ///
+       LyXLength leftindent_;
 };
 
 
+
 /** Generate a string \param data from \param par's ParagraphParameters.
     The function also generates some additional info needed by the
     Paragraph dialog.
  */
 void params2string(Paragraph const & par, std::string & data);
 
-/** Given \param data, an encoding of the ParagraphParameters generated
-    in the Paragraph dialog, this function sets the current paragraph
-    appropriately.
- */
-void setParagraphParams(BufferView & bv, std::string const & data);
-
 #endif