ws changes only

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index 62b1b4048fcc4d3bf87aa13379b54620fee7cb3d..3c6fddddb4ba365ba4ebbb61216d463af4291df3 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -23,7 +23,7 @@
 
 #include "support/types.h"
 
-#include "support/std_string.h"
+#include <string>
 
 class Buffer;
 class BufferParams;
@@ -80,9 +80,9 @@ public:
        bool isMultiLingual(BufferParams const &);
 
        ///
-       string const asString(Buffer const &, bool label) const;
+       std::string const asString(Buffer const &, bool label) const;
        ///
-       string const asString(Buffer const &, lyx::pos_type beg, lyx::pos_type end,
+       std::string const asString(Buffer const &, lyx::pos_type beg, lyx::pos_type end,
                              bool label) const;
 
        ///
@@ -135,11 +135,8 @@ public:
        ///
        void layout(LyXLayout_ptr const & new_layout);
 
-       ///
-       char enumdepth;
-
-       ///
-       char itemdepth;
+       /// This is the item depth, only used by enumerate and itemize
+       signed char itemdepth;
 
        ///
        InsetBibitem * bibitem() const;  // ale970302
@@ -185,12 +182,12 @@ public:
        int beginningOfBody() const;
 
        ///
-       string const & getLabelstring() const;
+       std::string const & getLabelstring() const;
 
        /// the next two functions are for the manual labels
-       string const getLabelWidthString() const;
+       std::string const getLabelWidthString() const;
        ///
-       void setLabelWidthString(string const & s);
+       void setLabelWidthString(std::string const & s);
        ///
        char getAlign() const;
        /// The nesting depth of a paragraph