X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.h;h=a432a05e555eab947185da7b6da98c92b019e757;hb=ce7c45bb437c44dae15f96148cb9b793ab0b895c;hp=fcf25eb66d0cbc3bda50a1fceeb6170c410e0716;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index fcf25eb66d..a432a05e55 100644
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -14,18 +14,24 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "support/std_string.h"
-#include "ShareContainer.h"
 #include "layout.h"
+#include "lyxlength.h"
+#include "Spacing.h"
 
-#include "ParameterStruct.h"
+#include "support/types.h"
+#include "support/docstring.h"
 
 #include <iosfwd>
+#include <string>
 
-class VSpace;
-class Spacing;
+
+namespace lyx {
+
+class BufferView;
+class LyXLength;
 class LyXLex;
 class Paragraph;
+class Spacing;
 
 
 ///
@@ -38,14 +44,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 &);
@@ -54,28 +52,10 @@ 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);
 	///
-	typedef ParameterStruct::depth_type depth_type;
-	///
 	depth_type depth() const;
 	///
 	void depth(depth_type);
@@ -88,13 +68,13 @@ public:
 	///
 	void appendix(bool);
 	///
-	string const & labelString() const;
+	docstring const & labelString() const;
 	///
-	void labelString(string const &);
+	void labelString(docstring const &);
 	///
-	string const & labelWidthString() const;
+	docstring const & labelWidthString() const;
 	///
-	void labelWidthString(string const &);
+	void labelWidthString(docstring const &);
 	///
 	LyXLength const & leftIndent() const;
 	///
@@ -106,33 +86,39 @@ 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_;
 	///
-	boost::shared_ptr<ParameterStruct> param;
+	LyXAlignment align_;
 	///
-	static ShareContainer<ParameterStruct> container;
+	depth_type depth_;
+	///
+	docstring labelstring_;
+	///
+	docstring labelwidthstring_;
+	///
+	LyXLength leftindent_;
 };
 
 
-inline
-ParagraphParameters::depth_type ParagraphParameters::depth() const
-{
-	return param->depth;
-}
-
 
 /** 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);
+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, string const & data);
+
+} // namespace lyx
 
 #endif