Update fr.po

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index c452235d329d086887912b5567e4ba900ddc2212..07601e9e33faf415d75a3498f57a2239298315eb 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Angus Leeming
  * \author John Levon
  *
@@ -14,24 +14,19 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "layout.h"
-#include "LyXLength.h"
+#include "LayoutEnums.h"
 #include "Spacing.h"
 
 #include "support/types.h"
-#include "support/docstring.h"
-
-#include <iosfwd>
-#include <string>
+#include "support/strfwd.h"
+#include "support/Length.h"
 
 
 namespace lyx {
 
-class BufferView;
-class LyXLength;
-class LyXLex;
+class Layout;
+class Lexer;
 class Paragraph;
-class Spacing;
 
 
 ///
@@ -76,19 +71,27 @@ public:
        ///
        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 string
+       void read (std::string const & str, bool merge = true);
 
        /// read the parameters from a lex
-       void read(LyXLex & lex);
+       void read(Lexer & lex, bool merge = true);
+
+       ///
+       void apply(ParagraphParameters const & params, Layout const & layout);
+
+       // It would be nice to have a working version of this method, so that
+       // getStatus() could return information about what was possible.
+       // bool canApply(ParagraphParameters const & params, Layout const & layout)
+       //      { return true; }
 
        /// write out the parameters to a stream
        void write(std::ostream & os) const;
 
-       //friend bool operator==(ParameterStruct const & ps1,
-       //ParameterStruct const & ps2);
-
 private:
        ///
        Spacing spacing_;
@@ -107,7 +110,7 @@ private:
        ///
        docstring labelwidthstring_;
        ///
-       LyXLength leftindent_;
+       Length leftindent_;
 };