Revert "XHTML: remove DOCTYPE, as the document is then understood as HTML4/XHTML1...

[lyx.git] / src / ParagraphParameters.h

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index cbea00691b81f59a4272dcc883c8ebfaaea5c080..b4608e0b3bf62936e6882da6c05fe00700ca8448 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,20 +14,19 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "Layout.h"
-#include "Length.h"
+#include "LayoutEnums.h"
 #include "Spacing.h"
 
+#include "support/debug.h"
 #include "support/types.h"
 #include "support/docstring.h"
-
-#include <iosfwd>
-#include <string>
+#include "support/Length.h"
 
 
 namespace lyx {
 
 class BufferView;
+class Layout;
 class Length;
 class Lexer;
 class Paragraph;
@@ -82,22 +81,21 @@ public:
 
        /// read the parameters from a string
        void read (std::string str, bool merge = true);
-       
+
        /// read the parameters from a lex
        void read(Lexer & lex, bool merge = true);
-       
-       /// 
-       void apply(ParagraphParameters const & params, Layout const & layout);
-       
+
        ///
-       bool canApply(ParagraphParameters const & params, Layout const & layout);
+       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_;