Continue to improve GtkLengthEntry

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 03cd251c8999bcec7c18b99b892cb72dc4fda338..fc6d9acf3b5152a9d17b51f7d70ebc3335ba9b19 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -15,20 +15,20 @@
 #define PARAGRAPHPARAMETERS_H
 
 #include "layout.h"
-#include "ShareContainer.h"
+#include "lyxlength.h"
+#include "Spacing.h"
 
 #include "support/types.h"
 
-#include "support/std_string.h"
 #include <iosfwd>
+#include <string>
 
 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 &);
@@ -56,22 +48,6 @@ public:
        ///
        void noindent(bool);
        ///
-       bool lineTop() const;
-       ///
-       void lineTop(bool);
-       ///
-       bool lineBottom() const;
-       ///
-       void lineBottom(bool);
-       ///
-       bool pagebreakTop() const;
-       ///
-       void pagebreakTop(bool);
-       ///
-       bool pagebreakBottom() const;
-       ///
-       void pagebreakBottom(bool);
-       ///
        LyXAlignment align() const;
        ///
        void align(LyXAlignment);
@@ -90,13 +66,13 @@ public:
        ///
        void appendix(bool);
        ///
-       string const & labelString() const;
+       std::string const & labelString() const;
        ///
-       void labelString(string const &);
+       void labelString(std::string const &);
        ///
-       string const & labelWidthString() const;
+       std::string const & labelWidthString() const;
        ///
-       void labelWidthString(string const &);
+       void labelWidthString(std::string const &);
        ///
        LyXLength const & leftIndent() const;
        ///
@@ -108,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_;
+       ///
+       bool appendix_;
+       ///
+       LyXAlignment align_;
        ///
-       boost::shared_ptr<ParameterStruct> param;
+       depth_type depth_;
        ///
-       static ShareContainer<ParameterStruct> container;
+       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, 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, string const & data);
+void params2string(Paragraph const & par, std::string & data);
 
 #endif