Angus Leeming wrote:
> Next step: move Paragraph::depth_type into support/types.h. I'll make the
> changes but will post the patch with analysis to the list rather than commit
> it and then tell you all.
Actually, I just committed it. Patch attached for reference. It does no more
than move Paragraph::depth_type to lyx::depth_type, placing the definition in
support/types.h.
With this change, 53 object files depend on paragraph.h, down from 92. As the
parent .C files all #include paragraph.h directly (or through
support/testutils.h), this is much more reasonable.
Angus
#including paragraph.h directly:
BufferView.C, BufferView_pimpl.C, CutAndPaste.C, ParagraphParameters.C,
text_funcs.C, buffer_funcs.C, bufferlist.C, bufferview_funcs.C, lyxfunc.C,
lyxrow_funcs.C, textcursor.C, iterators.C, lyx_cb.C, sgml.C, paragraph.C,
tabular.C, text3.C, toc.C, undo.C, undo_funcs.C, frontends/LyXView.C,
frontends/controllers/ControlDocument.C,
frontends/controllers/ControlParagraph.C,
frontends/controllers/ControlTabular.C,
frontends/controllers/ControlErrorList.C, frontends/xforms/FormParagraph.C,
insets/insettext.C, insets/insetbibitem.C, insets/insetcaption.C,
insets/insetcollapsable.C, insets/insetenv.C, insets/insetert.C,
insets/insetfloat.C, insets/insetfoot.C, insets/insetfootlike.C,
insets/insetbranch.C, insets/insetmarginal.C, insets/insetminipage.C,
insets/insetnewline.C, insets/insetnote.C, insets/insetoptarg.C,
insets/insetquotes.C, insets/insettabular.C, insets/insetwrap.C
Through testutils.h:
buffer.C, lyxfind.C, paragraph.C, rowpainter.C, text2.C, text.C
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.1550
diff -u -p -r1.1550 ChangeLog
--- src/ChangeLog 6 Sep 2003 12:36:50 -0000 1.1550
+++ src/ChangeLog 6 Sep 2003 17:14:49 -0000
@@ -1,5 +1,56 @@
2003-09-06 Angus Leeming <[EMAIL PROTECTED]>
+ * support/types.h: add a 'depth_type' typedef, used to store the
+ nesting depth of a paragraph.
+
+ * paragraph.h:
+ * ParameterStruct.h: use this lyx::depth_type typedef rather than
+ defining explicitly.
+
+ * buffer.h:
+ * paragraph_funcs.h:
+ * ParagraphParameters.h:
+ * sgml.h: use lyx::depth_type rather than Paragraph or
+ ParameterStruct's depth_type.
+
+ * buffer.h
+ * paragraph_funcs.h: no need to #include paragraph.h anymore.
+
+ * BufferView.C:
+ * BufferView_pimpl.C:
+ * CutAndPaste.C:
+ * ParagraphParameters.C:
+ * buffer_funcs.C:
+ * bufferlist.C:
+ * bufferview_funcs.C:
+ * lyx_cb.C:
+ * lyxfunc.C:
+ * tabular.C:
+ * text3.C:
+ * toc.C:
+ * undo_funcs.C:
+ * frontends/LyXView.C:
+ * frontends/controllers/ControlDocument.C:
+ * frontends/controllers/ControlErrorList.C:
+ * insets/insetbibitem.C:
+ * insets/insetbranch.C:
+ * insets/insetcaption.C:
+ * insets/insetcollapsable.C:
+ * insets/insetenv.C:
+ * insets/insetert.C:
+ * insets/insetfloat.C:
+ * insets/insetfoot.C:
+ * insets/insetfootlike.C:
+ * insets/insetnewline.C:
+ * insets/insetquotes.C:
+ * insets/insettabular.C:
+ * insets/insettext.C:
+ * insets/insetwrap.C: must now explicitly #include "paragraph.h".
+
+ * frontends/controllers/ControlChanges.C: #include "changes.h".
+
+2003-09-06 Angus Leeming <[EMAIL PROTECTED]>
+
* ParagraphList_fwd.h: new file, forward-declaring Paragraph rather than
#including paragraph.h.
Index: src/ParagraphParameters.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ParagraphParameters.h,v
retrieving revision 1.16
diff -u -p -r1.16 ParagraphParameters.h
--- src/ParagraphParameters.h 5 Sep 2003 17:22:47 -0000 1.16
+++ src/ParagraphParameters.h 6 Sep 2003 17:14:50 -0000
@@ -74,7 +74,7 @@ public:
///
void align(LyXAlignment);
///
- typedef ParameterStruct::depth_type depth_type;
+ typedef lyx::depth_type depth_type;
///
depth_type depth() const;
///
Index: src/ParameterStruct.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ParameterStruct.h,v
retrieving revision 1.9
diff -u -p -r1.9 ParameterStruct.h
--- src/ParameterStruct.h 23 Aug 2003 00:16:06 -0000 1.9
+++ src/ParameterStruct.h 6 Sep 2003 17:14:50 -0000
@@ -16,13 +16,15 @@
#include "Spacing.h"
#include "layout.h"
#include "lyxlength.h"
+#include "support/types.h"
+
///
struct ParameterStruct {
///
- ParameterStruct();
+ typedef lyx::depth_type depth_type;
///
- typedef unsigned int depth_type;
+ ParameterStruct();
///
VSpace added_space_top;
///
Index: src/buffer.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.h,v
retrieving revision 1.159
diff -u -p -r1.159 buffer.h
--- src/buffer.h 6 Sep 2003 12:36:51 -0000 1.159
+++ src/buffer.h 6 Sep 2003 17:14:50 -0000
@@ -19,9 +19,11 @@
#include "lyxvc.h"
#include "bufferparams.h"
#include "texrow.h"
-#include "paragraph.h"
#include "ParagraphList_fwd.h"
#include "errorlist.h"
+#include "InsetList.h"
+
+#include "support/types.h"
#include <boost/scoped_ptr.hpp>
#include <boost/signals/signal0.hpp>
@@ -98,7 +100,7 @@ public:
/// This parses a single token
int readParagraph(LyXLex &, string const & token,
ParagraphList & pars, ParagraphList::iterator & pit,
- Paragraph::depth_type & depth);
+ lyx::depth_type & depth);
///
void insertStringAsLines(ParagraphList::iterator &, lyx::pos_type &,
@@ -156,11 +158,11 @@ public:
///
void simpleDocBookOnePar(std::ostream &,
ParagraphList::iterator par, int & desc_on,
- Paragraph::depth_type depth) const;
+ lyx::depth_type depth) const;
///
void simpleLinuxDocOnePar(std::ostream & os,
ParagraphList::iterator par,
- Paragraph::depth_type depth) const;
+ lyx::depth_type depth) const;
///
void makeLinuxDocFile(string const & filename,
bool nice, bool only_body = false);
Index: src/paragraph.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph.h,v
retrieving revision 1.101
diff -u -p -r1.101 paragraph.h
--- src/paragraph.h 6 Sep 2003 12:36:53 -0000 1.101
+++ src/paragraph.h 6 Sep 2003 17:14:54 -0000
@@ -54,8 +54,8 @@ public:
};
///
typedef char value_type;
- /// The same as ParameterStruct::depth_type
- typedef unsigned int depth_type;
+ ///
+ typedef lyx::depth_type depth_type;
///
Paragraph();
Index: src/paragraph_funcs.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph_funcs.h,v
retrieving revision 1.30
diff -u -p -r1.30 paragraph_funcs.h
--- src/paragraph_funcs.h 6 Sep 2003 12:36:53 -0000 1.30
+++ src/paragraph_funcs.h 6 Sep 2003 17:14:54 -0000
@@ -12,14 +12,16 @@
#ifndef PARAGRAPH_FUNCS_H
#define PARAGRAPH_FUNCS_H
-#include "paragraph.h"
#include "ParagraphList_fwd.h"
#include "support/types.h"
+#include "support/std_string.h"
+
class Buffer;
class BufferParams;
class TexRow;
class LatexRunParams;
+class LyXFont;
class LyXLex;
class InsetOld;
@@ -48,7 +50,7 @@ void mergeParagraph(BufferParams const &
/// 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);
Index: src/sgml.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/sgml.h,v
retrieving revision 1.6
diff -u -p -r1.6 sgml.h
--- src/sgml.h 5 Sep 2003 17:22:51 -0000 1.6
+++ src/sgml.h 6 Sep 2003 17:14:54 -0000
@@ -13,7 +13,7 @@
#ifndef SGML_H
#define SGML_H
-#include "paragraph.h"
+#include "support/types.h"
#include "support/std_string.h"
#include <algorithm>
@@ -29,11 +29,11 @@ namespace sgml {
std::pair<bool, string> escapeChar(char c);
/// FIXME
-int openTag(std::ostream & os, Paragraph::depth_type depth,
+int openTag(std::ostream & os, lyx::depth_type depth,
bool mixcont, string const & latexname);
/// FIXME
-int closeTag(std::ostream & os, Paragraph::depth_type depth,
+int closeTag(std::ostream & os, lyx::depth_type depth,
bool mixcont, string const & latexname);
}
Index: src/support/types.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/types.h,v
retrieving revision 1.10
diff -u -p -r1.10 types.h
--- src/support/types.h 23 Aug 2003 00:16:58 -0000 1.10
+++ src/support/types.h 6 Sep 2003 17:15:06 -0000
@@ -26,6 +26,8 @@ namespace lyx
// used there...
typedef std::vector<char>::difference_type pos_type;
+ /// a type for the nesting depth of a paragraph
+ typedef unsigned int depth_type;
// set this to '0' if you want to have really safe types
#if 1
Index: src/BufferView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView.C,v
retrieving revision 1.188
diff -u -p -r1.188 BufferView.C
--- src/BufferView.C 5 Sep 2003 16:31:17 -0000 1.188
+++ src/BufferView.C 6 Sep 2003 17:14:36 -0000
@@ -26,6 +26,7 @@
#include "language.h"
#include "lyxtext.h"
#include "undo_funcs.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "frontends/Alert.h"
Index: src/BufferView_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.426
diff -u -p -r1.426 BufferView_pimpl.C
--- src/BufferView_pimpl.C 5 Sep 2003 16:31:17 -0000 1.426
+++ src/BufferView_pimpl.C 6 Sep 2003 17:14:37 -0000
@@ -36,6 +36,7 @@
#include "lyxtext.h"
#include "lyxrc.h"
#include "lastfiles.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "TextCache.h"
Index: src/CutAndPaste.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/CutAndPaste.C,v
retrieving revision 1.112
diff -u -p -r1.112 CutAndPaste.C
--- src/CutAndPaste.C 5 Sep 2003 16:31:19 -0000 1.112
+++ src/CutAndPaste.C 6 Sep 2003 17:14:49 -0000
@@ -18,6 +18,7 @@
#include "iterators.h"
#include "lyxtextclasslist.h"
#include "gettext.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "insets/insetinclude.h"
#include "insets/insettabular.h"
Index: src/ParagraphParameters.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ParagraphParameters.C,v
retrieving revision 1.26
diff -u -p -r1.26 ParagraphParameters.C
--- src/ParagraphParameters.C 5 Sep 2003 18:02:15 -0000 1.26
+++ src/ParagraphParameters.C 6 Sep 2003 17:14:50 -0000
@@ -23,6 +23,7 @@
#include "support/std_sstream.h"
#include "gettext.h"
#include "lyxtext.h"
+#include "paragraph.h"
#include "frontends/LyXView.h"
Index: src/buffer_funcs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer_funcs.C,v
retrieving revision 1.8
diff -u -p -r1.8 buffer_funcs.C
--- src/buffer_funcs.C 5 Sep 2003 16:31:21 -0000 1.8
+++ src/buffer_funcs.C 6 Sep 2003 17:14:51 -0000
@@ -16,6 +16,7 @@
#include "bufferlist.h"
#include "buffer.h"
#include "gettext.h"
+#include "paragraph.h"
#include "vc-backend.h"
#include "LaTeX.h"
Index: src/bufferlist.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/bufferlist.C,v
retrieving revision 1.124
diff -u -p -r1.124 bufferlist.C
--- src/bufferlist.C 5 Sep 2003 16:31:21 -0000 1.124
+++ src/bufferlist.C 6 Sep 2003 17:14:51 -0000
@@ -17,6 +17,7 @@
#include "debug.h"
#include "lyx_cb.h"
#include "gettext.h"
+#include "paragraph.h"
#include "TextCache.h"
#include "frontends/Alert.h"
Index: src/bufferview_funcs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/bufferview_funcs.C,v
retrieving revision 1.103
diff -u -p -r1.103 bufferview_funcs.C
--- src/bufferview_funcs.C 6 Sep 2003 12:36:51 -0000 1.103
+++ src/bufferview_funcs.C 6 Sep 2003 17:14:51 -0000
@@ -20,6 +20,7 @@
#include "gettext.h"
#include "lyxlex.h"
#include "lyxrow.h"
+#include "paragraph.h"
#include "ParagraphParameters.h"
#include "frontends/LyXView.h"
Index: src/lyx_cb.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_cb.C,v
retrieving revision 1.220
diff -u -p -r1.220 lyx_cb.C
--- src/lyx_cb.C 5 Sep 2003 22:17:00 -0000 1.220
+++ src/lyx_cb.C 6 Sep 2003 17:14:52 -0000
@@ -24,7 +24,7 @@
#include "lyxtext.h"
#include "gettext.h"
#include "BufferView.h"
-
+#include "paragraph.h"
#include "frontends/lyx_gui.h"
#include "frontends/LyXView.h"
Index: src/lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.491
diff -u -p -r1.491 lyxfunc.C
--- src/lyxfunc.C 6 Sep 2003 12:36:51 -0000 1.491
+++ src/lyxfunc.C 6 Sep 2003 17:14:53 -0000
@@ -44,6 +44,7 @@
#include "TextCache.h"
#include "lyxfind.h"
#include "undo_funcs.h"
+#include "paragraph.h"
#include "ParagraphParameters.h"
#include "insets/insetcommand.h"
Index: src/tabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tabular.C,v
retrieving revision 1.184
diff -u -p -r1.184 tabular.C
--- src/tabular.C 5 Sep 2003 18:02:15 -0000 1.184
+++ src/tabular.C 6 Sep 2003 17:14:56 -0000
@@ -23,6 +23,7 @@
#include "buffer.h"
#include "debug.h"
#include "lyxlex.h"
+#include "paragraph.h"
#include "insets/insettabular.h"
Index: src/text3.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text3.C,v
retrieving revision 1.134
diff -u -p -r1.134 text3.C
--- src/text3.C 6 Sep 2003 12:36:56 -0000 1.134
+++ src/text3.C 6 Sep 2003 17:14:57 -0000
@@ -23,6 +23,7 @@
#include "debug.h"
#include "buffer.h"
#include "lyxrow.h"
+#include "paragraph.h"
#include "ParagraphParameters.h"
#include "gettext.h"
#include "factory.h"
Index: src/toc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/toc.C,v
retrieving revision 1.27
diff -u -p -r1.27 toc.C
--- src/toc.C 5 Sep 2003 16:31:30 -0000 1.27
+++ src/toc.C 6 Sep 2003 17:14:57 -0000
@@ -16,6 +16,7 @@
#include "funcrequest.h"
#include "LyXAction.h"
#include "iterators.h"
+#include "paragraph.h"
#include "insets/insetfloat.h"
#include "insets/insetwrap.h"
Index: src/undo_funcs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/undo_funcs.C,v
retrieving revision 1.80
diff -u -p -r1.80 undo_funcs.C
--- src/undo_funcs.C 5 Sep 2003 16:31:30 -0000 1.80
+++ src/undo_funcs.C 6 Sep 2003 17:14:57 -0000
@@ -21,6 +21,7 @@
#include "buffer.h"
#include "insets/updatableinset.h"
#include "iterators.h"
+#include "paragraph.h"
/// The flag used by FinishUndo().
Index: src/frontends/LyXView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/LyXView.C,v
retrieving revision 1.29
diff -u -p -r1.29 LyXView.C
--- src/frontends/LyXView.C 5 Sep 2003 10:55:42 -0000 1.29
+++ src/frontends/LyXView.C 6 Sep 2003 17:14:57 -0000
@@ -29,6 +29,7 @@
#include "lyxrc.h"
#include "lyxtext.h"
#include "MenuBackend.h"
+#include "paragraph.h"
#include "controllers/ControlCommandBuffer.h"
Index: src/frontends/controllers/ControlChanges.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlChanges.C,v
retrieving revision 1.11
diff -u -p -r1.11 ControlChanges.C
--- src/frontends/controllers/ControlChanges.C 5 Sep 2003 15:31:18 -0000 1.11
+++ src/frontends/controllers/ControlChanges.C 6 Sep 2003 17:14:58 -0000
@@ -13,6 +13,7 @@
#include "ControlChanges.h"
#include "buffer.h"
#include "BufferView.h"
+#include "changes.h"
#include "funcrequest.h"
#include "lyxfind.h"
#include "support/lstrings.h"
Index: src/frontends/controllers/ControlDocument.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlDocument.C,v
retrieving revision 1.32
diff -u -p -r1.32 ControlDocument.C
--- src/frontends/controllers/ControlDocument.C 5 Sep 2003 15:31:18 -0000 1.32
+++ src/frontends/controllers/ControlDocument.C 6 Sep 2003 17:14:58 -0000
@@ -22,6 +22,7 @@
#include "language.h"
#include "lyxtextclasslist.h"
#include "CutAndPaste.h"
+#include "paragraph.h"
#include "frontends/LyXView.h"
#include "frontends/Alert.h"
Index: src/frontends/controllers/ControlErrorList.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlErrorList.C,v
retrieving revision 1.12
diff -u -p -r1.12 ControlErrorList.C
--- src/frontends/controllers/ControlErrorList.C 5 Sep 2003 15:31:18 -0000 1.12
+++ src/frontends/controllers/ControlErrorList.C 6 Sep 2003 17:14:58 -0000
@@ -16,6 +16,7 @@
#include "debug.h"
#include "iterators.h"
#include "lyxtext.h"
+#include "paragraph.h"
using std::endl;
Index: src/insets/insetbibitem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbibitem.C,v
retrieving revision 1.27
diff -u -p -r1.27 insetbibitem.C
--- src/insets/insetbibitem.C 5 Sep 2003 09:01:26 -0000 1.27
+++ src/insets/insetbibitem.C 6 Sep 2003 17:14:59 -0000
@@ -15,6 +15,7 @@
#include "BufferView.h"
#include "funcrequest.h"
#include "lyxlex.h"
+#include "paragraph.h"
#include "frontends/font_metrics.h"
Index: src/insets/insetbranch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbranch.C,v
retrieving revision 1.12
diff -u -p -r1.12 insetbranch.C
--- src/insets/insetbranch.C 5 Sep 2003 18:02:19 -0000 1.12
+++ src/insets/insetbranch.C 6 Sep 2003 17:15:00 -0000
@@ -17,6 +17,7 @@
#include "funcrequest.h"
#include "gettext.h"
#include "lyxlex.h"
+#include "paragraph.h"
#include "support/std_sstream.h"
Index: src/insets/insetcaption.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcaption.C,v
retrieving revision 1.41
diff -u -p -r1.41 insetcaption.C
--- src/insets/insetcaption.C 5 Sep 2003 18:02:19 -0000 1.41
+++ src/insets/insetcaption.C 6 Sep 2003 17:15:00 -0000
@@ -20,6 +20,7 @@
#include "FloatList.h"
#include "gettext.h"
#include "metricsinfo.h"
+#include "paragraph.h"
#include "frontends/Painter.h"
#include "frontends/font_metrics.h"
Index: src/insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.170
diff -u -p -r1.170 insetcollapsable.C
--- src/insets/insetcollapsable.C 5 Sep 2003 09:01:26 -0000 1.170
+++ src/insets/insetcollapsable.C 6 Sep 2003 17:15:00 -0000
@@ -20,6 +20,7 @@
#include "lyxlex.h"
#include "funcrequest.h"
#include "metricsinfo.h"
+#include "paragraph.h"
#include "WordLangTuple.h"
#include "frontends/font_metrics.h"
Index: src/insets/insetenv.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetenv.C,v
retrieving revision 1.17
diff -u -p -r1.17 insetenv.C
--- src/insets/insetenv.C 5 Sep 2003 09:01:26 -0000 1.17
+++ src/insets/insetenv.C 6 Sep 2003 17:15:00 -0000
@@ -14,6 +14,7 @@
#include "bufferparams.h"
#include "gettext.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "texrow.h"
Index: src/insets/insetert.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetert.C,v
retrieving revision 1.152
diff -u -p -r1.152 insetert.C
--- src/insets/insetert.C 5 Sep 2003 09:01:26 -0000 1.152
+++ src/insets/insetert.C 6 Sep 2003 17:15:01 -0000
@@ -20,6 +20,7 @@
#include "language.h"
#include "lyxlex.h"
#include "metricsinfo.h"
+#include "paragraph.h"
#include "WordLangTuple.h"
#include "frontends/Alert.h"
Index: src/insets/insetfloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloat.C,v
retrieving revision 1.97
diff -u -p -r1.97 insetfloat.C
--- src/insets/insetfloat.C 5 Sep 2003 18:02:19 -0000 1.97
+++ src/insets/insetfloat.C 6 Sep 2003 17:15:01 -0000
@@ -23,6 +23,7 @@
#include "iterators.h"
#include "LaTeXFeatures.h"
#include "lyxlex.h"
+#include "paragraph.h"
#include "support/lstrings.h"
#include "support/tostr.h"
Index: src/insets/insetfoot.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfoot.C,v
retrieving revision 1.66
diff -u -p -r1.66 insetfoot.C
--- src/insets/insetfoot.C 5 Sep 2003 17:23:03 -0000 1.66
+++ src/insets/insetfoot.C 6 Sep 2003 17:15:01 -0000
@@ -18,6 +18,7 @@
// the following are needed just to get the layout of the enclosing
// paragraph. This seems a bit too much to me (JMarc)
#include "lyxlayout.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "support/std_ostream.h"
Index: src/insets/insetfootlike.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfootlike.C,v
retrieving revision 1.28
diff -u -p -r1.28 insetfootlike.C
--- src/insets/insetfootlike.C 5 Sep 2003 09:01:26 -0000 1.28
+++ src/insets/insetfootlike.C 6 Sep 2003 17:15:01 -0000
@@ -14,6 +14,7 @@
#include "buffer.h"
#include "metricsinfo.h"
+#include "paragraph.h"
using std::ostream;
Index: src/insets/insetnewline.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetnewline.C,v
retrieving revision 1.15
diff -u -p -r1.15 insetnewline.C
--- src/insets/insetnewline.C 5 Sep 2003 09:01:26 -0000 1.15
+++ src/insets/insetnewline.C 6 Sep 2003 17:15:02 -0000
@@ -16,6 +16,7 @@
#include "debug.h"
#include "lyxtext.h"
#include "metricsinfo.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "frontends/font_metrics.h"
Index: src/insets/insetquotes.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetquotes.C,v
retrieving revision 1.104
diff -u -p -r1.104 insetquotes.C
--- src/insets/insetquotes.C 5 Sep 2003 09:01:26 -0000 1.104
+++ src/insets/insetquotes.C 6 Sep 2003 17:15:02 -0000
@@ -20,6 +20,7 @@
#include "lyxlex.h"
#include "lyxrc.h"
#include "metricsinfo.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "frontends/font_metrics.h"
Index: src/insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.336
diff -u -p -r1.336 insettabular.C
--- src/insets/insettabular.C 5 Sep 2003 18:02:20 -0000 1.336
+++ src/insets/insettabular.C 6 Sep 2003 17:15:04 -0000
@@ -22,6 +22,7 @@
#include "lyx_cb.h"
#include "lyxlex.h"
#include "metricsinfo.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "undo_funcs.h"
Index: src/insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.490
diff -u -p -r1.490 insettext.C
--- src/insets/insettext.C 5 Sep 2003 09:01:27 -0000 1.490
+++ src/insets/insettext.C 6 Sep 2003 17:15:06 -0000
@@ -24,6 +24,7 @@
#include "lyxlex.h"
#include "lyxrc.h"
#include "metricsinfo.h"
+#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "rowpainter.h"
Index: src/insets/insetwrap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetwrap.C,v
retrieving revision 1.41
diff -u -p -r1.41 insetwrap.C
--- src/insets/insetwrap.C 5 Sep 2003 18:02:21 -0000 1.41
+++ src/insets/insetwrap.C 6 Sep 2003 17:15:06 -0000
@@ -21,6 +21,7 @@
#include "gettext.h"
#include "LaTeXFeatures.h"
#include "lyxlex.h"
+#include "paragraph.h"
#include "support/tostr.h"
