ws changes only

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index a2722660be87cf00edd846a9fa75e88fb8e312f8..7c1726267a6d40fb7a749a5c880a76f5c51da128 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -14,19 +14,21 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "support/std_string.h"
-#include "ShareContainer.h"
 #include "layout.h"
+#include "ShareContainer.h"
 
-#include "ParameterStruct.h"
+#include "support/types.h"
 
 #include <iosfwd>
+#include <string>
 
-class VSpace;
-class Spacing;
+class BufferView;
+class LyXLength;
 class LyXLex;
 class Paragraph;
-
+class ParameterStruct;
+class Spacing;
+class VSpace;
 
 ///
 class ParagraphParameters {
@@ -88,13 +90,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;
        ///
@@ -116,23 +118,16 @@ private:
 };
 
 
-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);
+void setParagraphParams(BufferView & bv, std::string const & data);
 
 #endif