reverse last change

[lyx.git] / src / paragraph_funcs.h

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index 5d2a051384d3a0aadde3e6c48ef72c6b22f66cf9..791087fefd50e77f9060bff670827f55d38d9e61 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -1,23 +1,21 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team. 
+/**
+ * \file paragraph_funcs.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef PARAGRAPH_FUNCS_H
 #define PARAGRAPH_FUNCS_H
 
-#include "ParagraphList.h"
-#include "paragraph.h"
-
 #include "support/types.h"
 
 class BufferParams;
+class Paragraph;
 
 ///
 void breakParagraph(BufferParams const & bparams,
@@ -30,14 +28,14 @@ void breakParagraphConservative(BufferParams const & bparams,
                                Paragraph *,
                                lyx::pos_type pos);
 
-#if 0
-/** Paste this paragraph with the next one.
-    Be carefull, this doesent make any check at all.
-*/ 
-void pasteParagraph(BufferParams const & bparams,
-                   Paragraph *);
+/**
+ * Append the next paragraph onto the tail of this one.
+ * Be careful, this doesent make any check at all.
+ */
+void mergeParagraph(BufferParams const & bparams, Paragraph *);
 
 
+#if 0
 /// for the environments
 Paragraph * depthHook(Paragraph * par, Paragraph::depth_type depth);
 
@@ -51,4 +49,4 @@ bool isFirstInSequence(Paragraph * par);
 int getEndLabel(Paragraph * para, BufferParams const & bparams);
 #endif
 
-#endif
+#endif // PARAGRAPH_FUNCS_H