* some more traces of the signals in CursorSlice

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 73fce34030e0e8e4234f5cd98d4bac3e0a0dee32..6fb9e2bc32343b06f1e1e78518a2d8f2cd0071d3 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -14,8 +14,8 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "layout.h"
-#include "lyxlength.h"
+#include "Layout.h"
+#include "Length.h"
 #include "Spacing.h"
 
 #include "support/types.h"
@@ -24,9 +24,12 @@
 #include <iosfwd>
 #include <string>
 
+
+namespace lyx {
+
 class BufferView;
-class LyXLength;
-class LyXLex;
+class Length;
+class Lexer;
 class Paragraph;
 class Spacing;
 
@@ -53,8 +56,6 @@ public:
        ///
        void align(LyXAlignment);
        ///
-       typedef lyx::depth_type depth_type;
-       ///
        depth_type depth() const;
        ///
        void depth(depth_type);
@@ -67,20 +68,20 @@ public:
        ///
        void appendix(bool);
        ///
-       lyx::docstring const & labelString() const;
+       docstring const & labelString() const;
        ///
-       void labelString(lyx::docstring const &);
+       void labelString(docstring const &);
        ///
-       lyx::docstring const & labelWidthString() const;
+       docstring const & labelWidthString() const;
        ///
-       void labelWidthString(lyx::docstring const &);
+       void labelWidthString(docstring const &);
        ///
-       LyXLength const & leftIndent() const;
+       Length const & leftIndent() const;
        ///
-       void leftIndent(LyXLength const &);
+       void leftIndent(Length const &);
 
        /// read the parameters from a lex
-       void read(LyXLex & lex);
+       void read(Lexer & lex);
 
        /// write out the parameters to a stream
        void write(std::ostream & os) const;
@@ -102,11 +103,11 @@ private:
        ///
        depth_type depth_;
        ///
-       lyx::docstring labelstring_;
+       docstring labelstring_;
        ///
-       lyx::docstring labelwidthstring_;
+       docstring labelwidthstring_;
        ///
-       LyXLength leftindent_;
+       Length leftindent_;
 };
 
 
@@ -117,4 +118,7 @@ private:
  */
 void params2string(Paragraph const & par, std::string & data);
 
+
+} // namespace lyx
+
 #endif