ws changes only

[lyx.git] / src / paragraph_funcs.h

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index e4f003327953b300295f7e25f9f358810c6999b0..a67354d5a95ed68cb1c3c7ea6fb809c109456067 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -12,13 +12,17 @@
 #ifndef PARAGRAPH_FUNCS_H
 #define PARAGRAPH_FUNCS_H
 
-#include "ParagraphList.h"
+#include "ParagraphList_fwd.h"
 #include "support/types.h"
 
+#include <string>
+
+
 class Buffer;
 class BufferParams;
 class TexRow;
 class LatexRunParams;
+class LyXFont;
 class LyXLex;
 class InsetOld;
 
@@ -47,7 +51,7 @@ void mergeParagraph(BufferParams const & bparams,
 /// for the environments
 ParagraphList::iterator depthHook(ParagraphList::iterator pit,
                                  ParagraphList const & plist,
-                                 Paragraph::depth_type depth);
+                                 lyx::depth_type depth);
 
 ParagraphList::iterator outerHook(ParagraphList::iterator pit,
                                  ParagraphList const & plist);
@@ -62,12 +66,12 @@ int getEndLabel(ParagraphList::iterator pit,
                ParagraphList const & plist);
 
 
-void latexParagraphs(Buffer const * buf,
+void latexParagraphs(Buffer const & buf,
                     ParagraphList const & paragraphs,
                     std::ostream & ofs,
                     TexRow & texrow,
                     LatexRunParams const &,
-                    string const & everypar = string());
+                    std::string const & everypar = std::string());
 
 /// read a paragraph from a .lyx file. Returns number of unrecognised tokens
 int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex);
@@ -76,7 +80,10 @@ LyXFont const outerFont(ParagraphList::iterator pit,
                        ParagraphList const & plist);
 
 /// find outermost paragraph containing an inset
-ParagraphList::iterator outerPar(Buffer & buf, InsetOld * inset);
+ParagraphList::iterator outerPar(Buffer const & buf, InsetOld const * inset);
+
+/// find owning paragraph containing an inset
+Paragraph const & ownerPar(Buffer const & buf, InsetOld const * inset);
 
 
 #endif // PARAGRAPH_FUNCS_H