From 3b3c072df03c58f31cabf5f3b89ee8d9d5f264cf Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 5 Sep 2003 02:53:05 +0000 Subject: [PATCH] Strip out redundant #includes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7668 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/ChangeLog | 4 ++++ src/mathed/formula.C | 16 ---------------- src/mathed/formulabase.C | 14 -------------- src/mathed/formulamacro.C | 10 ---------- src/mathed/math_amsarrayinset.C | 2 -- src/mathed/math_arrayinset.C | 1 - src/mathed/math_atom.C | 2 -- src/mathed/math_autocorrect.C | 3 --- src/mathed/math_biginset.C | 1 - src/mathed/math_binominset.C | 1 - src/mathed/math_boxinset.C | 1 - src/mathed/math_braceinset.C | 1 - src/mathed/math_casesinset.C | 1 - src/mathed/math_charinset.C | 7 ------- src/mathed/math_commentinset.C | 3 --- src/mathed/math_cursor.C | 8 -------- src/mathed/math_data.C | 6 ------ src/mathed/math_deliminset.C | 2 -- src/mathed/math_diffinset.C | 2 -- src/mathed/math_diminset.C | 2 -- src/mathed/math_dotsinset.C | 1 - src/mathed/math_exintinset.C | 2 -- src/mathed/math_extern.C | 5 ----- src/mathed/math_factory.C | 4 ---- src/mathed/math_fboxinset.C | 1 - src/mathed/math_fontinset.C | 3 --- src/mathed/math_fontoldinset.C | 3 --- src/mathed/math_fracinset.C | 1 - src/mathed/math_frameboxinset.C | 1 - src/mathed/math_gridinset.C | 1 - src/mathed/math_hullinset.C | 3 --- src/mathed/math_inset.C | 5 ----- src/mathed/math_iterator.C | 1 - src/mathed/math_kerninset.C | 1 - src/mathed/math_lefteqninset.C | 1 - src/mathed/math_liminset.C | 2 -- src/mathed/math_macro.C | 3 --- src/mathed/math_macroarg.C | 1 - src/mathed/math_macrotable.C | 5 ----- src/mathed/math_makeboxinset.C | 2 -- src/mathed/math_mathmlstream.C | 2 -- src/mathed/math_matrixinset.C | 2 -- src/mathed/math_numberinset.C | 1 - src/mathed/math_oversetinset.C | 1 - src/mathed/math_parboxinset.C | 1 - src/mathed/math_parser.C | 9 --------- src/mathed/math_pos.C | 1 - src/mathed/math_sizeinset.C | 1 - src/mathed/math_spaceinset.C | 3 --- src/mathed/math_sqrtinset.C | 1 - src/mathed/math_stackrelinset.C | 1 - src/mathed/math_streamstr.C | 3 --- src/mathed/math_stringinset.C | 1 - src/mathed/math_substackinset.C | 1 - src/mathed/math_support.C | 5 ----- src/mathed/math_tabularinset.C | 3 --- src/mathed/math_undersetinset.C | 1 - src/mathed/math_xarrowinset.C | 1 - src/mathed/ref_inset.C | 1 - 59 files changed, 4 insertions(+), 168 deletions(-) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 4e6aaa2758..1d7090128c 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,7 @@ +2003-09-05 Angus Leeming + + * most .C files: strip out redundant #includes. + 2003-09-02 Alfredo Braunstein * formulamacro.C (prefix): replace %s by %1$s to make bformat happy diff --git a/src/mathed/formula.C b/src/mathed/formula.C index 524d8f2bfc..4bf5d1faf1 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -14,31 +14,15 @@ #include "formula.h" #include "math_cursor.h" #include "math_parser.h" -#include "math_charinset.h" -#include "math_arrayinset.h" -#include "metricsinfo.h" -#include "math_deliminset.h" #include "math_hullinset.h" -#include "math_support.h" #include "math_mathmlstream.h" #include "textpainter.h" -#include "BufferView.h" -#include "gettext.h" #include "debug.h" #include "latexrunparams.h" -#include "lyxrc.h" -#include "funcrequest.h" #include "Lsstream.h" -#include "support/LOstream.h" -#include "support/LAssert.h" -#include "support/lyxlib.h" -#include "support/systemcall.h" -#include "support/filetools.h" -#include "frontends/Alert.h" -#include "frontends/LyXView.h" #include "frontends/Painter.h" #include "graphics/PreviewedInset.h" diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C index f979a18371..a83a2aab5c 100644 --- a/src/mathed/formulabase.C +++ b/src/mathed/formulabase.C @@ -15,40 +15,26 @@ #include "support/LAssert.h" #include "formula.h" #include "formulamacro.h" -#include "lyxrc.h" #include "funcrequest.h" #include "BufferView.h" #include "lyxtext.h" #include "gettext.h" -#include "LaTeXFeatures.h" #include "debug.h" #include "math_support.h" -#include "metricsinfo.h" -#include "math_data.h" #include "support/lstrings.h" #include "support/lyxlib.h" #include "frontends/LyXView.h" -#include "frontends/font_metrics.h" -#include "frontends/mouse_state.h" #include "math_arrayinset.h" -#include "math_charinset.h" #include "math_deliminset.h" #include "math_cursor.h" #include "math_factory.h" -#include "math_fontinset.h" #include "math_hullinset.h" -#include "math_iterator.h" -#include "math_macrotable.h" #include "math_parser.h" -#include "math_pos.h" #include "math_spaceinset.h" #include "undo_funcs.h" -#include "textpainter.h" #include "frontends/Dialogs.h" -#include "intl.h" #include "ref_inset.h" -#include using namespace lyx::support; diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index a54a0e3642..fab1bfa508 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -12,26 +12,16 @@ #include #include "formulamacro.h" -#include "lfuns.h" #include "math_cursor.h" -#include "math_parser.h" -#include "math_macro.h" #include "math_macrotable.h" #include "math_macrotemplate.h" -#include "metricsinfo.h" -#include "math_support.h" #include "math_mathmlstream.h" -#include "BufferView.h" #include "gettext.h" #include "latexrunparams.h" #include "frontends/Painter.h" #include "frontends/font_metrics.h" -#include "support/lyxlib.h" #include "support/lstrings.h" -#include "support/LOstream.h" -#include "debug.h" #include "lyxlex.h" -#include "lyxtext.h" #include "Lsstream.h" using namespace lyx::support; diff --git a/src/mathed/math_amsarrayinset.C b/src/mathed/math_amsarrayinset.C index bc89a191dc..0aca0bb688 100644 --- a/src/mathed/math_amsarrayinset.C +++ b/src/mathed/math_amsarrayinset.C @@ -12,10 +12,8 @@ #include "math_amsarrayinset.h" #include "math_mathmlstream.h" -#include "metricsinfo.h" #include "math_streamstr.h" #include "math_support.h" -#include "Lsstream.h" using std::auto_ptr; diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C index 9465aa03ee..a84c53653f 100644 --- a/src/mathed/math_arrayinset.C +++ b/src/mathed/math_arrayinset.C @@ -13,7 +13,6 @@ #include "math_arrayinset.h" #include "math_parser.h" #include "math_mathmlstream.h" -#include "metricsinfo.h" #include "math_streamstr.h" #include "Lsstream.h" diff --git a/src/mathed/math_atom.C b/src/mathed/math_atom.C index 6706b33cbc..c77a1512ee 100644 --- a/src/mathed/math_atom.C +++ b/src/mathed/math_atom.C @@ -12,9 +12,7 @@ #include "math_atom.h" #include "math_inset.h" -#include "insets/insetbase.h" -#include MathAtom::MathAtom() diff --git a/src/mathed/math_autocorrect.C b/src/mathed/math_autocorrect.C index 27fbf604ea..63a74f33cb 100644 --- a/src/mathed/math_autocorrect.C +++ b/src/mathed/math_autocorrect.C @@ -10,7 +10,6 @@ #include -#include "LString.h" #include "Lsstream.h" #include "debug.h" #include "support/filetools.h" // LibFileSearch @@ -18,9 +17,7 @@ #include "math_inset.h" #include "math_parser.h" -#include #include -#include using namespace lyx::support; diff --git a/src/mathed/math_biginset.C b/src/mathed/math_biginset.C index 1bd849d427..1bf4de266b 100644 --- a/src/mathed/math_biginset.C +++ b/src/mathed/math_biginset.C @@ -12,7 +12,6 @@ #include "math_biginset.h" #include "math_support.h" -#include "math_parser.h" #include "math_mathmlstream.h" #include "math_streamstr.h" diff --git a/src/mathed/math_binominset.C b/src/mathed/math_binominset.C index 20675a8ca4..b3707fd1a6 100644 --- a/src/mathed/math_binominset.C +++ b/src/mathed/math_binominset.C @@ -12,7 +12,6 @@ #include "math_binominset.h" #include "math_support.h" -#include "support/LOstream.h" #include "math_mathmlstream.h" diff --git a/src/mathed/math_boxinset.C b/src/mathed/math_boxinset.C index dd28994efa..67dc6bd89e 100644 --- a/src/mathed/math_boxinset.C +++ b/src/mathed/math_boxinset.C @@ -11,7 +11,6 @@ #include #include "math_boxinset.h" -#include "math_support.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "support/LOstream.h" diff --git a/src/mathed/math_braceinset.C b/src/mathed/math_braceinset.C index fd9258791e..a782a8ca31 100644 --- a/src/mathed/math_braceinset.C +++ b/src/mathed/math_braceinset.C @@ -11,7 +11,6 @@ #include #include "math_braceinset.h" -#include "math_parser.h" #include "math_support.h" #include "math_mathmlstream.h" #include "support/LOstream.h" diff --git a/src/mathed/math_casesinset.C b/src/mathed/math_casesinset.C index 4655fd6d8d..050d62e43a 100644 --- a/src/mathed/math_casesinset.C +++ b/src/mathed/math_casesinset.C @@ -11,7 +11,6 @@ #include #include "math_casesinset.h" -#include "math_parser.h" #include "math_mathmlstream.h" #include "math_support.h" #include "LaTeXFeatures.h" diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C index 7e03bfcc7e..ab2fb14e72 100644 --- a/src/mathed/math_charinset.C +++ b/src/mathed/math_charinset.C @@ -12,19 +12,12 @@ #include #include "math_charinset.h" -#include "LColor.h" #include "dimension.h" -#include "frontends/Painter.h" -#include "frontends/font_metrics.h" #include "support/LOstream.h" -#include "debug.h" #include "math_support.h" #include "math_mathmlstream.h" -#include "LaTeXFeatures.h" #include "textpainter.h" -#include -#include using std::ostream; diff --git a/src/mathed/math_commentinset.C b/src/mathed/math_commentinset.C index 2d61aaaf4f..cfe0262eb8 100644 --- a/src/mathed/math_commentinset.C +++ b/src/mathed/math_commentinset.C @@ -11,12 +11,9 @@ #include #include "math_commentinset.h" -#include "math_data.h" #include "math_support.h" #include "math_mathmlstream.h" -#include "LaTeXFeatures.h" #include "support/LOstream.h" -#include "textpainter.h" using std::auto_ptr; diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C index 157d565d09..8f7636b357 100644 --- a/src/mathed/math_cursor.C +++ b/src/mathed/math_cursor.C @@ -13,24 +13,18 @@ #include -#include "support/lstrings.h" #include "support/LAssert.h" #include "support/limited_stack.h" #include "debug.h" #include "Lsstream.h" -#include "frontends/Painter.h" #include "math_cursor.h" #include "formulabase.h" #include "funcrequest.h" -#include "math_autocorrect.h" #include "math_braceinset.h" #include "math_commentinset.h" #include "math_charinset.h" -#include "math_extern.h" #include "math_factory.h" -#include "math_fontinset.h" #include "math_gridinset.h" -#include "math_iterator.h" #include "math_macroarg.h" #include "math_macrotemplate.h" #include "math_mathmlstream.h" @@ -39,8 +33,6 @@ #include "math_support.h" #include "math_unknowninset.h" -#include -#include //#define FILEDEBUG 1 diff --git a/src/mathed/math_data.C b/src/mathed/math_data.C index 9094764fae..469c6358df 100644 --- a/src/mathed/math_data.C +++ b/src/mathed/math_data.C @@ -10,10 +10,7 @@ #include -#include "math_data.h" -#include "math_inset.h" #include "math_cursor.h" -#include "math_deliminset.h" #include "math_fontinset.h" #include "math_scriptinset.h" #include "math_mathmlstream.h" @@ -21,10 +18,7 @@ #include "math_replace.h" #include "debug.h" #include "support/LAssert.h" -#include "metricsinfo.h" -#include "math_data.h" #include "frontends/Painter.h" -#include "textpainter.h" using namespace lyx::support; diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C index a7d0a2f6e7..a700569c79 100644 --- a/src/mathed/math_deliminset.C +++ b/src/mathed/math_deliminset.C @@ -12,11 +12,9 @@ #include #include "math_deliminset.h" -#include "math_parser.h" #include "math_support.h" #include "math_mathmlstream.h" #include "math_streamstr.h" -#include "math_extern.h" using std::max; diff --git a/src/mathed/math_diffinset.C b/src/mathed/math_diffinset.C index d81bbd8c0d..0af81f9c03 100644 --- a/src/mathed/math_diffinset.C +++ b/src/mathed/math_diffinset.C @@ -11,9 +11,7 @@ #include #include "math_diffinset.h" -#include "math_support.h" #include "math_mathmlstream.h" -#include "math_symbolinset.h" #include "debug.h" using std::auto_ptr; diff --git a/src/mathed/math_diminset.C b/src/mathed/math_diminset.C index 791b361027..f1253db192 100644 --- a/src/mathed/math_diminset.C +++ b/src/mathed/math_diminset.C @@ -11,8 +11,6 @@ #include #include "math_diminset.h" -#include "Lsstream.h" -#include "textpainter.h" void MathDimInset::metricsT(TextMetricsInfo const &) const diff --git a/src/mathed/math_dotsinset.C b/src/mathed/math_dotsinset.C index 979cf13685..10923779dc 100644 --- a/src/mathed/math_dotsinset.C +++ b/src/mathed/math_dotsinset.C @@ -13,7 +13,6 @@ #include "math_dotsinset.h" #include "math_mathmlstream.h" -#include "math_streamstr.h" #include "math_support.h" #include "math_parser.h" diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C index 3658e281ad..bd5f9dc20c 100644 --- a/src/mathed/math_exintinset.C +++ b/src/mathed/math_exintinset.C @@ -11,13 +11,11 @@ #include #include "math_exintinset.h" -#include "math_support.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "math_symbolinset.h" #include "debug.h" -#include using std::auto_ptr; using std::endl; diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C index 0d40f9873d..e053c264df 100644 --- a/src/mathed/math_extern.C +++ b/src/mathed/math_extern.C @@ -14,7 +14,6 @@ #include -#include "math_amsarrayinset.h" #include "math_arrayinset.h" #include "math_charinset.h" #include "math_deliminset.h" @@ -29,16 +28,12 @@ #include "math_scriptinset.h" #include "math_stringinset.h" #include "math_symbolinset.h" -#include "math_unknowninset.h" #include "math_parser.h" #include "Lsstream.h" #include "debug.h" -#include "support/lyxlib.h" -#include "support/systemcall.h" #include "support/filetools.h" #include "support/lstrings.h" -#include using namespace lyx::support; diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C index eaa9be204b..7d60bb349c 100644 --- a/src/mathed/math_factory.C +++ b/src/mathed/math_factory.C @@ -29,7 +29,6 @@ #include "math_macro.h" #include "math_macrotable.h" #include "math_macrotemplate.h" -#include "math_macroarg.h" #include "math_makeboxinset.h" #include "math_oversetinset.h" #include "math_parboxinset.h" @@ -49,8 +48,6 @@ //#include "insets/insetref.h" #include "ref_inset.h" -#include "metricsinfo.h" -#include "math_data.h" #include "debug.h" #include "math_support.h" #include "Lsstream.h" @@ -58,7 +55,6 @@ #include "support/lstrings.h" #include "frontends/lyx_gui.h" -#include #include using namespace lyx::support; diff --git a/src/mathed/math_fboxinset.C b/src/mathed/math_fboxinset.C index 4824231ddf..783eea1bbf 100644 --- a/src/mathed/math_fboxinset.C +++ b/src/mathed/math_fboxinset.C @@ -11,7 +11,6 @@ #include #include "math_fboxinset.h" -#include "math_support.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "math_parser.h" diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C index d9728d6573..24b95bb4c1 100644 --- a/src/mathed/math_fontinset.C +++ b/src/mathed/math_fontinset.C @@ -12,12 +12,9 @@ #include "math_fontinset.h" #include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" #include "math_parser.h" #include "LaTeXFeatures.h" #include "support/LOstream.h" -#include "textpainter.h" using std::auto_ptr; diff --git a/src/mathed/math_fontoldinset.C b/src/mathed/math_fontoldinset.C index 1bb2165116..84fd74f6d4 100644 --- a/src/mathed/math_fontoldinset.C +++ b/src/mathed/math_fontoldinset.C @@ -13,11 +13,8 @@ #include "math_fontoldinset.h" #include "math_mathmlstream.h" #include "math_streamstr.h" -#include "math_support.h" #include "math_parser.h" -#include "textpainter.h" #include "support/LOstream.h" -#include "frontends/Painter.h" using std::auto_ptr; diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C index 384be55469..06674c69ed 100644 --- a/src/mathed/math_fracinset.C +++ b/src/mathed/math_fracinset.C @@ -12,7 +12,6 @@ #include #include "math_fracinset.h" -#include "math_support.h" #include "frontends/Painter.h" #include "math_mathmlstream.h" #include "textpainter.h" diff --git a/src/mathed/math_frameboxinset.C b/src/mathed/math_frameboxinset.C index 1f11e421d4..f09c40c2c4 100644 --- a/src/mathed/math_frameboxinset.C +++ b/src/mathed/math_frameboxinset.C @@ -13,7 +13,6 @@ #include "math_frameboxinset.h" #include "math_support.h" #include "math_mathmlstream.h" -#include "math_streamstr.h" #include "frontends/Painter.h" using std::auto_ptr; diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C index 71b505da99..bec0cf3b21 100644 --- a/src/mathed/math_gridinset.C +++ b/src/mathed/math_gridinset.C @@ -13,7 +13,6 @@ #include "math_gridinset.h" #include "math_mathmlstream.h" #include "math_streamstr.h" -#include "lyxfont.h" #include "funcrequest.h" #include "frontends/Painter.h" #include "debug.h" diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C index 15ca41d6ea..10bff0f49b 100644 --- a/src/mathed/math_hullinset.C +++ b/src/mathed/math_hullinset.C @@ -23,14 +23,11 @@ #include "Lsstream.h" #include "LaTeXFeatures.h" #include "support/LAssert.h" -#include "frontends/Painter.h" #include "frontends/Alert.h" #include "lyxrc.h" #include "gettext.h" -#include "BufferView.h" -#include using namespace lyx::support; diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C index 9c998f0683..a9bd6d848b 100644 --- a/src/mathed/math_inset.C +++ b/src/mathed/math_inset.C @@ -11,15 +11,10 @@ #include -#include "math_inset.h" -#include "math_scriptinset.h" #include "math_mathmlstream.h" #include "math_cursor.h" #include "debug.h" -#include "frontends/LyXView.h" -#include "frontends/Dialogs.h" -#include "BufferView.h" #include "formulabase.h" using std::ostream; diff --git a/src/mathed/math_iterator.C b/src/mathed/math_iterator.C index bd15564ac0..b599e604fc 100644 --- a/src/mathed/math_iterator.C +++ b/src/mathed/math_iterator.C @@ -12,7 +12,6 @@ #include "math_iterator.h" #include "math_inset.h" -#include "debug.h" #include "support/LAssert.h" using namespace lyx::support; diff --git a/src/mathed/math_kerninset.C b/src/mathed/math_kerninset.C index 116a266f70..f173119863 100644 --- a/src/mathed/math_kerninset.C +++ b/src/mathed/math_kerninset.C @@ -11,7 +11,6 @@ #include #include "math_kerninset.h" -#include "math_extern.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "math_support.h" diff --git a/src/mathed/math_lefteqninset.C b/src/mathed/math_lefteqninset.C index e693ed79e0..fb05e5988b 100644 --- a/src/mathed/math_lefteqninset.C +++ b/src/mathed/math_lefteqninset.C @@ -11,7 +11,6 @@ #include #include "math_lefteqninset.h" -#include "math_support.h" #include "support/LOstream.h" using std::auto_ptr; diff --git a/src/mathed/math_liminset.C b/src/mathed/math_liminset.C index 4e0721aa99..89639368f5 100644 --- a/src/mathed/math_liminset.C +++ b/src/mathed/math_liminset.C @@ -11,9 +11,7 @@ #include #include "math_liminset.h" -#include "math_support.h" #include "math_mathmlstream.h" -#include "math_symbolinset.h" #include "debug.h" using std::auto_ptr; diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C index 340c448c3c..82a36f3a6a 100644 --- a/src/mathed/math_macro.C +++ b/src/mathed/math_macro.C @@ -17,9 +17,6 @@ #include "math_macrotable.h" #include "math_macrotemplate.h" #include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "support/lstrings.h" -#include "support/LAssert.h" #include "debug.h" #include "LaTeXFeatures.h" diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C index 5073c37087..702b43c73e 100644 --- a/src/mathed/math_macroarg.C +++ b/src/mathed/math_macroarg.C @@ -11,7 +11,6 @@ #include -#include "math_macroarg.h" #include "math_macro.h" #include "math_mathmlstream.h" #include "math_support.h" diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C index 885bd5b3b3..e6475be71d 100644 --- a/src/mathed/math_macrotable.C +++ b/src/mathed/math_macrotable.C @@ -11,14 +11,9 @@ #include #include "math_macrotable.h" -#include "math_macro.h" #include "math_macrotemplate.h" -#include "math_parser.h" -#include "math_mathmlstream.h" #include "debug.h" -#include "math_support.h" // math_font_available -#include using std::endl; diff --git a/src/mathed/math_makeboxinset.C b/src/mathed/math_makeboxinset.C index 1ae10b0270..73feb414e4 100644 --- a/src/mathed/math_makeboxinset.C +++ b/src/mathed/math_makeboxinset.C @@ -13,8 +13,6 @@ #include "math_makeboxinset.h" #include "math_support.h" #include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "frontends/Painter.h" using std::auto_ptr; diff --git a/src/mathed/math_mathmlstream.C b/src/mathed/math_mathmlstream.C index 9cfbdac62e..a12a646abc 100644 --- a/src/mathed/math_mathmlstream.C +++ b/src/mathed/math_mathmlstream.C @@ -14,9 +14,7 @@ #include "math_inset.h" #include "math_data.h" #include "math_extern.h" -#include "debug.h" #include "support/lyxalgo.h" -#include "support/LOstream.h" using std::ostream; diff --git a/src/mathed/math_matrixinset.C b/src/mathed/math_matrixinset.C index e26e1416b6..23b4bdd15b 100644 --- a/src/mathed/math_matrixinset.C +++ b/src/mathed/math_matrixinset.C @@ -11,9 +11,7 @@ #include #include "math_matrixinset.h" -#include "math_parser.h" #include "math_mathmlstream.h" -#include "Lsstream.h" using std::auto_ptr; diff --git a/src/mathed/math_numberinset.C b/src/mathed/math_numberinset.C index 5417200afd..d93cdbc319 100644 --- a/src/mathed/math_numberinset.C +++ b/src/mathed/math_numberinset.C @@ -14,7 +14,6 @@ #include "math_mathmlstream.h" #include "math_streamstr.h" #include "math_support.h" -#include "debug.h" using std::auto_ptr; diff --git a/src/mathed/math_oversetinset.C b/src/mathed/math_oversetinset.C index 5356f28452..a9d6ee093e 100644 --- a/src/mathed/math_oversetinset.C +++ b/src/mathed/math_oversetinset.C @@ -12,7 +12,6 @@ #include "math_oversetinset.h" #include "math_mathmlstream.h" -#include "math_support.h" using std::max; diff --git a/src/mathed/math_parboxinset.C b/src/mathed/math_parboxinset.C index 86766ba5c8..21f851472c 100644 --- a/src/mathed/math_parboxinset.C +++ b/src/mathed/math_parboxinset.C @@ -13,7 +13,6 @@ #include "math_parboxinset.h" #include "math_mathmlstream.h" #include "math_streamstr.h" -#include "lyxlength.h" #include "debug.h" using std::auto_ptr; diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 9827f6bdf3..1efd8ec7db 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -39,27 +39,21 @@ following hack as starting point to write some macros: #include #include "math_parser.h" -#include "math_inset.h" #include "math_arrayinset.h" #include "math_braceinset.h" -#include "math_boxinset.h" #include "math_charinset.h" #include "math_commentinset.h" #include "math_deliminset.h" #include "math_envinset.h" -#include "math_extern.h" #include "math_factory.h" #include "math_kerninset.h" #include "math_macro.h" #include "math_macrotemplate.h" -#include "math_hullinset.h" #include "math_parboxinset.h" #include "math_parinset.h" #include "math_rootinset.h" #include "math_scriptinset.h" -#include "math_sizeinset.h" #include "math_sqrtinset.h" -#include "math_stringinset.h" #include "math_support.h" #include "math_tabularinset.h" @@ -69,10 +63,7 @@ following hack as starting point to write some macros: #include "lyxlex.h" #include "Lsstream.h" #include "debug.h" -#include "support/LAssert.h" -#include -#include using std::istream; using std::ostream; diff --git a/src/mathed/math_pos.C b/src/mathed/math_pos.C index 522ac72443..6546268d3f 100644 --- a/src/mathed/math_pos.C +++ b/src/mathed/math_pos.C @@ -14,7 +14,6 @@ #include "math_inset.h" #include "debug.h" #include "support/LAssert.h" -#include "support/LOstream.h" using namespace lyx::support; diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C index 1e744835c9..0e9e4cca06 100644 --- a/src/mathed/math_sizeinset.C +++ b/src/mathed/math_sizeinset.C @@ -14,7 +14,6 @@ #include "math_parser.h" #include "math_mathmlstream.h" #include "math_streamstr.h" -#include "math_support.h" #include "support/LOstream.h" using std::atoi; diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C index 99b51492f9..5b77f0cb59 100644 --- a/src/mathed/math_spaceinset.C +++ b/src/mathed/math_spaceinset.C @@ -12,12 +12,9 @@ #include "math_spaceinset.h" #include "math_data.h" -#include "math_support.h" -#include "LColor.h" #include "frontends/Painter.h" #include "math_mathmlstream.h" #include "LaTeXFeatures.h" -#include "debug.h" using std::auto_ptr; diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C index ea48241718..c71dc6d35a 100644 --- a/src/mathed/math_sqrtinset.C +++ b/src/mathed/math_sqrtinset.C @@ -12,7 +12,6 @@ #include "math_sqrtinset.h" #include "math_mathmlstream.h" -#include "LColor.h" #include "frontends/Painter.h" #include "textpainter.h" diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/math_stackrelinset.C index befe1391b4..79c10b757a 100644 --- a/src/mathed/math_stackrelinset.C +++ b/src/mathed/math_stackrelinset.C @@ -12,7 +12,6 @@ #include "math_stackrelinset.h" #include "math_mathmlstream.h" -#include "math_support.h" using std::max; diff --git a/src/mathed/math_streamstr.C b/src/mathed/math_streamstr.C index 5db3b9a42c..7aad616470 100644 --- a/src/mathed/math_streamstr.C +++ b/src/mathed/math_streamstr.C @@ -10,10 +10,7 @@ #include -#include "math_streamstr.h" #include "math_mathmlstream.h" -#include "support/LOstream.h" -#include "support/lyxalgo.h" WriteStream & operator<<(WriteStream & ws, string const & s) diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C index 68e604ccb1..1df9f46d1f 100644 --- a/src/mathed/math_stringinset.C +++ b/src/mathed/math_stringinset.C @@ -14,7 +14,6 @@ #include "math_mathmlstream.h" #include "math_streamstr.h" #include "math_support.h" -#include "debug.h" using std::auto_ptr; diff --git a/src/mathed/math_substackinset.C b/src/mathed/math_substackinset.C index 33e670674e..47b4c78d45 100644 --- a/src/mathed/math_substackinset.C +++ b/src/mathed/math_substackinset.C @@ -12,7 +12,6 @@ #include "math_substackinset.h" #include "math_mathmlstream.h" -#include "math_streamstr.h" #include "support/LOstream.h" using std::auto_ptr; diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C index 8be4b03e73..056d9ee97e 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/math_support.C @@ -12,17 +12,12 @@ #include #include "math_support.h" -#include "lyxfont.h" -#include "math_inset.h" #include "math_parser.h" -#include "metricsinfo.h" #include "math_data.h" #include "frontends/Painter.h" #include "frontends/font_metrics.h" #include "frontends/lyx_gui.h" #include "debug.h" -#include "lfuns.h" -#include "dimension.h" #include "Lsstream.h" #include "math_mathmlstream.h" diff --git a/src/mathed/math_tabularinset.C b/src/mathed/math_tabularinset.C index 70e66fbadd..6d07dec5dd 100644 --- a/src/mathed/math_tabularinset.C +++ b/src/mathed/math_tabularinset.C @@ -11,11 +11,8 @@ #include #include "math_tabularinset.h" -#include "math_parser.h" #include "math_mathmlstream.h" -#include "metricsinfo.h" #include "math_streamstr.h" -#include "Lsstream.h" #include diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C index d647c0d367..bf73084e03 100644 --- a/src/mathed/math_undersetinset.C +++ b/src/mathed/math_undersetinset.C @@ -12,7 +12,6 @@ #include "math_undersetinset.h" #include "math_mathmlstream.h" -#include "math_support.h" using std::max; diff --git a/src/mathed/math_xarrowinset.C b/src/mathed/math_xarrowinset.C index fe80ae8311..b6287282d0 100644 --- a/src/mathed/math_xarrowinset.C +++ b/src/mathed/math_xarrowinset.C @@ -12,7 +12,6 @@ #include "math_xarrowinset.h" #include "math_support.h" -#include "math_parser.h" #include "math_mathmlstream.h" #include "math_streamstr.h" diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C index 6dcf18a405..d29f00493b 100644 --- a/src/mathed/ref_inset.C +++ b/src/mathed/ref_inset.C @@ -23,7 +23,6 @@ #include "frontends/LyXView.h" #include "frontends/Dialogs.h" -#include "support/LOstream.h" using std::auto_ptr; using std::endl; -- 2.39.2