From ecaf48dc268f677363d81ba4c04572c44ae712f3 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Sat, 6 Sep 2003 23:36:02 +0000 Subject: [PATCH] Forward declare LatexRunParams in converter.h. Remove #include "lyxrc.h" from encoding.h. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7700 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/LaTeXFeatures.C | 11 +++++++---- src/bufferparams.C | 9 +++++++-- src/bufferparams.h | 11 ++++++----- src/converter.h | 4 ++-- src/encoding.C | 4 +++- src/encoding.h | 2 -- src/exporter.C | 9 ++++++--- src/frontends/qt2/lyx_gui.C | 1 + src/frontends/qt2/qfont_loader.C | 1 + src/frontends/xforms/XPainter.C | 1 + src/frontends/xforms/xfont_metrics.C | 1 + src/graphics/PreviewLoader.C | 5 +++-- src/insets/insetexternal.C | 1 + src/insets/insetgraphics.C | 4 +++- src/ispell.C | 10 ++++++---- src/language.C | 4 +++- src/lyx_main.C | 1 + src/lyxfunc.C | 1 + src/paragraph.C | 1 + src/paragraph_funcs.C | 27 +++++++++++++++------------ src/paragraph_pimpl.C | 1 + src/rowpainter.C | 23 +++++++++++++---------- src/text.C | 25 ++++++++++++++----------- 24 files changed, 102 insertions(+), 60 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 690847b609..5f0c9124f1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-09-07 Angus Leeming + + * converter.h: forward declare LatexRunParams. + * encoding.h: remove #include "lyxrc.h" + 2003-09-06 Angus Leeming * Bullet.[Ch]: factorize all those #ifdef ENABLE_ASSERTIONS to just one, diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C index 49b88bf85f..4238f6a28b 100644 --- a/src/LaTeXFeatures.C +++ b/src/LaTeXFeatures.C @@ -15,17 +15,20 @@ #include #include "LaTeXFeatures.h" -#include "debug.h" -#include "lyx_sty.h" + #include "bufferparams.h" +#include "debug.h" +#include "encoding.h" #include "Floating.h" #include "FloatList.h" #include "language.h" -#include "encoding.h" -#include "support/std_sstream.h" +#include "lyx_sty.h" +#include "lyxrc.h" #include "support/filetools.h" +#include "support/std_sstream.h" + using namespace lyx::support; using lyx::textclass_type; diff --git a/src/bufferparams.C b/src/bufferparams.C index 2c402a7075..5b1affb560 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -16,13 +16,16 @@ #include #include "bufferparams.h" + +#include "Bullet.h" #include "debug.h" #include "encoding.h" #include "gettext.h" #include "language.h" #include "LaTeXFeatures.h" -#include "support/std_sstream.h" +#include "latexrunparams.h" #include "lyxlex.h" +#include "lyxrc.h" #include "lyxtextclasslist.h" #include "tex-strings.h" #include "texrow.h" @@ -31,13 +34,15 @@ #include "support/lyxalgo.h" // for lyx::count +#include "support/std_sstream.h" using namespace lyx::support; +using std::endl; + using std::istringstream; using std::ostream; using std::ostringstream; -using std::endl; using std::pair; diff --git a/src/bufferparams.h b/src/bufferparams.h index 83e62ffb8e..5e13ba4f72 100644 --- a/src/bufferparams.h +++ b/src/bufferparams.h @@ -15,18 +15,19 @@ #ifndef BUFFERPARAMS_H #define BUFFERPARAMS_H -#include "support/std_string.h" -#include "vspace.h" -#include "Spacing.h" +#include "author.h" +#include "BranchList.h" #include "Bullet.h" #include "lyxtextclass.h" -#include "author.h" #include "paper.h" -#include "BranchList.h" +#include "Spacing.h" +#include "vspace.h" #include "insets/insetquotes.h" #include + +#include "support/std_string.h" #include class LyXLex; diff --git a/src/converter.h b/src/converter.h index 943e03e9a3..40cb7e9a37 100644 --- a/src/converter.h +++ b/src/converter.h @@ -12,15 +12,15 @@ #ifndef CONVERTER_H #define CONVERTER_H -#include "latexrunparams.h" #include "graph.h" #include +class Buffer; class Format; class Formats; +class LatexRunParams; -class Buffer; /// class Converter { diff --git a/src/encoding.C b/src/encoding.C index 3760f85963..4ef0bd9ead 100644 --- a/src/encoding.C +++ b/src/encoding.C @@ -13,8 +13,10 @@ #include #include "encoding.h" -#include "lyxlex.h" + #include "debug.h" +#include "lyxlex.h" +#include "lyxrc.h" #ifndef CXX_GLOBAL_CSTD using std::strtol; diff --git a/src/encoding.h b/src/encoding.h index 9bfd8948c1..832cf46517 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -14,8 +14,6 @@ #define ENCODING_H #include "support/std_string.h" -#include "lyxrc.h" - #include /// diff --git a/src/exporter.C b/src/exporter.C index b204da466d..6ca03d3335 100644 --- a/src/exporter.C +++ b/src/exporter.C @@ -17,15 +17,18 @@ #include #include "exporter.h" + #include "buffer.h" #include "buffer_funcs.h" -#include "support/filetools.h" -#include "lyxrc.h" #include "converter.h" #include "format.h" -#include "frontends/Alert.h" #include "gettext.h" +#include "latexrunparams.h" +#include "lyxrc.h" +#include "frontends/Alert.h" + +#include "support/filetools.h" using namespace lyx::support; diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C index 989ec96989..79a2abca99 100644 --- a/src/frontends/qt2/lyx_gui.C +++ b/src/frontends/qt2/lyx_gui.C @@ -22,6 +22,7 @@ // FIXME: move this stuff out again #include "bufferlist.h" #include "lyxfunc.h" +#include "lyxrc.h" #include "lyxserver.h" #include "BufferView.h" diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C index a976b80c3e..5377ff2007 100644 --- a/src/frontends/qt2/qfont_loader.C +++ b/src/frontends/qt2/qfont_loader.C @@ -15,6 +15,7 @@ #include "qfont_loader.h" #include "qt_helpers.h" #include "debug.h" +#include "lyxrc.h" #include "support/lstrings.h" #include "frontends/lyx_gui.h" diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C index 7a937d34f9..2b82c361bc 100644 --- a/src/frontends/xforms/XPainter.C +++ b/src/frontends/xforms/XPainter.C @@ -21,6 +21,7 @@ #include "encoding.h" #include "language.h" #include "lyxfont.h" +#include "lyxrc.h" #include "support/lstrings.h" diff --git a/src/frontends/xforms/xfont_metrics.C b/src/frontends/xforms/xfont_metrics.C index 9139707d39..742fb7b789 100644 --- a/src/frontends/xforms/xfont_metrics.C +++ b/src/frontends/xforms/xfont_metrics.C @@ -16,6 +16,7 @@ #include "encoding.h" #include "language.h" +#include "lyxrc.h" #include "frontends/lyx_gui.h" diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C index e73480b268..f2b049853b 100644 --- a/src/graphics/PreviewLoader.C +++ b/src/graphics/PreviewLoader.C @@ -15,8 +15,9 @@ #include "buffer.h" #include "converter.h" -#include "format.h" #include "debug.h" +#include "format.h" +#include "latexrunparams.h" #include "lyxrc.h" #include "frontends/lyx_gui.h" // hexname @@ -46,9 +47,9 @@ using std::make_pair; using std::setfill; using std::setw; +using std::ifstream; using std::list; using std::map; -using std::ifstream; using std::ofstream; using std::ostream; using std::ostringstream; diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C index 2607db4ff8..e8cfe51f81 100644 --- a/src/insets/insetexternal.C +++ b/src/insets/insetexternal.C @@ -21,6 +21,7 @@ #include "funcrequest.h" #include "gettext.h" #include "LaTeXFeatures.h" +#include "latexrunparams.h" #include "lyxlex.h" #include "lyxrc.h" #include "support/std_sstream.h" diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 5b5a5cad3e..e80ea5bb34 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -63,7 +63,7 @@ TODO #include "funcrequest.h" #include "gettext.h" #include "LaTeXFeatures.h" -#include "support/std_sstream.h" +#include "latexrunparams.h" #include "lyxlex.h" #include "lyxrc.h" @@ -80,6 +80,8 @@ TODO #include #include +#include "support/std_sstream.h" + namespace support = lyx::support; using namespace lyx::support; diff --git a/src/ispell.C b/src/ispell.C index 528a6130dc..2dae4f04bd 100644 --- a/src/ispell.C +++ b/src/ispell.C @@ -12,13 +12,15 @@ #include -#include "language.h" +#include "ispell.h" + +#include "bufferparams.h" #include "debug.h" #include "encoding.h" -#include "ispell.h" -#include "WordLangTuple.h" #include "gettext.h" -#include "bufferparams.h" +#include "language.h" +#include "lyxrc.h" +#include "WordLangTuple.h" #include "support/forkedcall.h" diff --git a/src/language.C b/src/language.C index 9a81295ba8..c960edbca1 100644 --- a/src/language.C +++ b/src/language.C @@ -13,9 +13,11 @@ #include #include "language.h" + +#include "debug.h" #include "encoding.h" #include "lyxlex.h" -#include "debug.h" +#include "lyxrc.h" using std::endl; diff --git a/src/lyx_main.C b/src/lyx_main.C index 1cf95d3496..5aa42b2e91 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -31,6 +31,7 @@ #include "lastfiles.h" #include "lyxfunc.h" #include "lyxlex.h" +#include "lyxrc.h" #include "lyxtextclasslist.h" #include "lyxserver.h" #include "MenuBackend.h" diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 59d0e5e0fd..d0a60263b3 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -38,6 +38,7 @@ #include "lyx_cb.h" #include "LyXAction.h" #include "lyxfind.h" +#include "lyxrc.h" #include "lyxrow.h" #include "lyxserver.h" #include "paragraph.h" diff --git a/src/paragraph.C b/src/paragraph.C index 1aff7412aa..0eede1c38a 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -26,6 +26,7 @@ #include "gettext.h" #include "language.h" #include "latexrunparams.h" +#include "lyxrc.h" #include "lyxrow.h" #include "insets/insetbibitem.h" diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index fd1b460edc..51bc067362 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -11,31 +11,32 @@ #include #include "paragraph_funcs.h" -#include "paragraph_pimpl.h" + #include "buffer.h" #include "debug.h" +#include "encoding.h" #include "errorlist.h" +#include "factory.h" #include "gettext.h" #include "iterators.h" #include "language.h" -#include "encoding.h" #include "lyxlex.h" -#include "factory.h" -#include "support/std_sstream.h" +#include "lyxrc.h" +#include "paragraph_pimpl.h" -#include "support/lstrings.h" -#include "support/LAssert.h" - -#include "insets/insetoptarg.h" #include "insets/insetbibitem.h" +#include "insets/insethfill.h" +#include "insets/insetlatexaccent.h" +#include "insets/insetnewline.h" +#include "insets/insetoptarg.h" #include "insets/insetspace.h" #include "insets/insetspecialchar.h" -#include "insets/insetlatexaccent.h" #include "insets/insettabular.h" -#include "insets/insethfill.h" -#include "insets/insetnewline.h" -extern string bibitemWidest(Buffer const &); +#include "support/LAssert.h" +#include "support/lstrings.h" + +#include "support/std_sstream.h" using namespace lyx::support; @@ -45,6 +46,8 @@ using std::endl; using std::istringstream; using std::ostream; +extern string bibitemWidest(Buffer const &); + namespace { diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C index d451254629..698a44ac41 100644 --- a/src/paragraph_pimpl.C +++ b/src/paragraph_pimpl.C @@ -21,6 +21,7 @@ #include "language.h" #include "LaTeXFeatures.h" #include "latexrunparams.h" +#include "lyxrc.h" #include "texrow.h" #include "support/LAssert.h" diff --git a/src/rowpainter.C b/src/rowpainter.C index 4ac708211e..1bcc643c81 100644 --- a/src/rowpainter.C +++ b/src/rowpainter.C @@ -11,24 +11,27 @@ #include -#include "frontends/Painter.h" -#include "frontends/font_metrics.h" -#include "support/LAssert.h" -#include "paragraph_funcs.h" -#include "support/textutils.h" +#include "rowpainter.h" -#include "insets/insettext.h" -#include "ParagraphParameters.h" -#include "BufferView.h" #include "buffer.h" +#include "BufferView.h" +#include "encoding.h" #include "gettext.h" #include "language.h" -#include "encoding.h" -#include "rowpainter.h" +#include "lyxrc.h" #include "lyxrow.h" #include "lyxrow_funcs.h" #include "metricsinfo.h" +#include "paragraph_funcs.h" +#include "ParagraphParameters.h" +#include "frontends/font_metrics.h" +#include "frontends/Painter.h" + +#include "insets/insettext.h" + +#include "support/LAssert.h" +#include "support/textutils.h" using namespace lyx::support; diff --git a/src/text.C b/src/text.C index fc76f5f59d..d7993fc610 100644 --- a/src/text.C +++ b/src/text.C @@ -17,29 +17,32 @@ #include #include "lyxtext.h" -#include "gettext.h" + #include "buffer.h" +#include "BufferView.h" #include "debug.h" #include "encoding.h" #include "funcrequest.h" -#include "frontends/LyXView.h" -#include "frontends/font_metrics.h" -#include "BufferView.h" +#include "gettext.h" #include "language.h" -#include "ParagraphParameters.h" -#include "undo_funcs.h" -#include "text_funcs.h" -#include "WordLangTuple.h" -#include "paragraph_funcs.h" -#include "rowpainter.h" +#include "lyxrc.h" #include "lyxrow.h" #include "lyxrow_funcs.h" +#include "paragraph_funcs.h" +#include "ParagraphParameters.h" +#include "rowpainter.h" +#include "text_funcs.h" +#include "undo_funcs.h" +#include "WordLangTuple.h" + +#include "frontends/font_metrics.h" +#include "frontends/LyXView.h" #include "insets/insettext.h" -#include "support/textutils.h" #include "support/LAssert.h" #include "support/lstrings.h" +#include "support/textutils.h" using namespace lyx::support;