Remove 3rdparty/boost/Makefile.am

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 723e66b80daa65120e8ad79f14a56f83008acfed..4defd94fa610e513ea29948da6f4fa7cf1e03e46 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -19,23 +19,23 @@
 
 namespace lyx {
 
-class Buffer;
 class BufferParams;
 class BufferView;
+class Change;
 class CompletionList;
 class Cursor;
 class CursorData;
 class CursorSlice;
-class DocIterator;
 class ErrorList;
 class Font;
 class FontInfo;
 class FuncRequest;
 class FuncStatus;
 class Inset;
+class InsetText;
 class Lexer;
-class PainterInfo;
-class Spacing;
+class Paragraph;
+class ParagraphParameters;
 
 /// This class encapsulates the main text data and operations in LyX.
 /// This is more or less the private implementation of InsetText.
@@ -258,7 +258,7 @@ public:
         settings are given to the new one.
         This function will handle a multi-paragraph selection.
         */
-       void setParagraphs(Cursor const & cur, docstring const & arg, bool modify = false);
+       void setParagraphs(Cursor const & cur, docstring const & arg, bool merge = false);
        /// Sets parameters for current or selected paragraphs
        void setParagraphs(Cursor const & cur, ParagraphParameters const & p);