From 0705dae8a3a2bcdd6be55eb468547c1389e84d2c Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Sun, 7 Sep 2003 21:25:37 +0000 Subject: [PATCH] Finish the task of removing all cruft from the header files. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7703 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView_pimpl.C | 1 - src/ChangeLog | 12 ++++++++++++ src/LaTeXFeatures.h | 1 - src/ToolbarBackend.h | 1 - src/changes.h | 2 +- src/converter.h | 1 + src/debug.h | 1 - src/frontends/Alert.h | 1 - src/frontends/ChangeLog | 7 +++++++ src/frontends/Dialogs.h | 8 +++----- src/frontends/LyXView.h | 5 ++--- src/frontends/WorkArea.h | 2 -- src/frontends/controllers/ButtonController.h | 1 - src/frontends/controllers/ChangeLog | 19 +++++++++++++++++++ src/frontends/controllers/ControlBranch.h | 1 - src/frontends/controllers/ControlDocument.h | 5 +---- src/frontends/controllers/ControlErrorList.h | 1 - src/frontends/controllers/ControlForks.h | 6 +++--- src/frontends/controllers/ControlNote.h | 1 - src/frontends/controllers/ControlPrefs.C | 2 ++ src/frontends/controllers/ControlPrefs.h | 2 -- src/frontends/controllers/ControlThesaurus.h | 1 - src/frontends/controllers/GUI.h | 2 -- src/frontends/controllers/helper_funcs.h | 6 ++---- src/frontends/controllers/tex_helpers.h | 1 - src/frontends/guiapi.h | 1 - src/frontends/qt2/BulletsModule.h | 2 -- src/frontends/qt2/ChangeLog | 18 ++++++++++++++++++ src/frontends/qt2/QBrowseBox.h | 2 -- src/frontends/qt2/QCharacter.C | 2 ++ src/frontends/qt2/QCharacter.h | 2 -- src/frontends/qt2/QCharacterDialog.C | 2 ++ src/frontends/qt2/QCharacterDialog.h | 3 --- src/frontends/qt2/QContentPane.h | 2 -- src/frontends/qt2/QDialogView.h | 4 +--- src/frontends/qt2/QDocumentDialog.h | 4 ++-- src/frontends/qt2/QLPopupMenu.h | 1 - src/frontends/qt2/QLToolbar.h | 3 ++- src/frontends/qt2/QWorkArea.h | 6 +++--- src/frontends/qt2/Qt2Base.h | 3 +-- src/frontends/qt2/QtLyXView.h | 1 - src/frontends/qt2/emptytable.C | 1 + src/frontends/qt2/emptytable.h | 2 -- src/frontends/qt2/qsetborder.h | 4 ++-- src/frontends/xforms/ChangeLog | 14 ++++++++++++++ src/frontends/xforms/FormAboutlyx.h | 1 - src/frontends/xforms/FormBase.h | 1 - src/frontends/xforms/FormCharacter.h | 4 ---- src/frontends/xforms/FormDialogView.h | 2 -- src/frontends/xforms/FormMathsBitmap.h | 3 --- src/frontends/xforms/FormPreferences.h | 8 +++----- src/frontends/xforms/Tooltips.h | 3 +-- src/frontends/xforms/XFormsMenubar.h | 3 +-- src/frontends/xforms/XPainter.C | 2 ++ src/frontends/xforms/xfont_loader.h | 1 - src/frontends/xforms/xfont_metrics.C | 1 + src/frontends/xforms/xfont_metrics.h | 2 -- src/graph.h | 3 +-- src/graphics/ChangeLog | 5 +++++ src/graphics/GraphicsCacheItem.h | 3 ++- src/graphics/GraphicsTypes.C | 2 ++ src/graphics/GraphicsTypes.h | 1 - src/graphics/Previews.h | 1 - src/insets/ChangeLog | 5 +++++ src/insets/insetspace.h | 1 - src/insets/insetspecialchar.h | 1 - src/lyx_main.C | 1 + src/lyx_main.h | 4 +--- src/lyxlex_pimpl.h | 1 - src/mathed/ChangeLog | 18 ++++++++++++++++++ src/mathed/command_inset.C | 1 + src/mathed/formulabase.h | 3 --- src/mathed/math_amsarrayinset.C | 1 + src/mathed/math_arrayinset.C | 1 + src/mathed/math_binaryopinset.h | 1 - src/mathed/math_binominset.C | 1 + src/mathed/math_boxinset.C | 1 + src/mathed/math_braceinset.C | 3 ++- src/mathed/math_casesinset.C | 1 + src/mathed/math_commentinset.C | 3 ++- src/mathed/math_decorationinset.C | 1 + src/mathed/math_decorationinset.h | 1 - src/mathed/math_deliminset.C | 3 ++- src/mathed/math_diffinset.C | 1 + src/mathed/math_envinset.C | 1 + src/mathed/math_envinset.h | 1 - src/mathed/math_ertinset.h | 3 ++- src/mathed/math_exfuncinset.C | 3 ++- src/mathed/math_exintinset.C | 1 + src/mathed/math_extern.C | 1 + src/mathed/math_factory.C | 1 + src/mathed/math_fboxinset.C | 3 ++- src/mathed/math_fboxinset.h | 1 - src/mathed/math_fontinset.C | 1 + src/mathed/math_fontoldinset.C | 3 ++- src/mathed/math_fracbase.C | 1 + src/mathed/math_fracinset.C | 3 ++- src/mathed/math_frameboxinset.C | 3 ++- src/mathed/math_gridinset.C | 3 ++- src/mathed/math_kerninset.C | 1 + src/mathed/math_kerninset.h | 1 - src/mathed/math_lefteqninset.C | 1 + src/mathed/math_liminset.C | 1 + src/mathed/math_macro.h | 3 +-- src/mathed/math_macrotemplate.h | 1 + src/mathed/math_makeboxinset.C | 3 ++- src/mathed/math_matrixinset.C | 1 + src/mathed/math_nestinset.h | 5 +++-- src/mathed/math_oversetinset.C | 1 + src/mathed/math_parboxinset.C | 1 + src/mathed/math_parinset.C | 1 + src/mathed/math_parser.C | 1 + src/mathed/math_rootinset.C | 1 + src/mathed/math_scriptinset.C | 5 +++-- src/mathed/math_sizeinset.C | 3 ++- src/mathed/math_splitinset.C | 1 + src/mathed/math_sqrtinset.C | 3 ++- src/mathed/math_stackrelinset.C | 1 + src/mathed/math_substackinset.C | 1 + src/mathed/math_tabularinset.C | 1 + src/mathed/math_textinset.C | 1 + src/mathed/math_undersetinset.C | 1 + src/mathed/math_xarrowinset.C | 3 ++- src/mathed/ref_inset.C | 1 + src/sgml.h | 2 +- src/toc.h | 2 +- 126 files changed, 212 insertions(+), 130 deletions(-) diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 94bff2a317..abcc8144da 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -48,7 +48,6 @@ #include "frontends/Alert.h" #include "frontends/Dialogs.h" #include "frontends/FileDialog.h" -#include "frontends/LyXKeySym.h" #include "frontends/LyXView.h" #include "frontends/LyXScreenFactory.h" #include "frontends/screen.h" diff --git a/src/ChangeLog b/src/ChangeLog index 8f3875c06a..42703cc226 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2003-09-07 Angus Leeming + + * LaTeXFeatures.h: remove #include "support/types.h". + * ToolbarBackend.h: remove #include . + * changes.h: remove #include . + * debug.h: remove #include . + * graph.h: remove #include "support/std_string.h". + * lyx_main.h: remove #include . + * lyxlex_pimpl.h: remove #include . + * sgml.h: remove #include , . + * toc.h: remove #include "support/std_ostream.h". Add #include . + 2003-09-07 Angus Leeming * vspace.[Ch] (length): returns a const & to a LyXGlueLength. diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h index d882bc4013..261ba90800 100644 --- a/src/LaTeXFeatures.h +++ b/src/LaTeXFeatures.h @@ -13,7 +13,6 @@ #ifndef LATEXFEATURES_H #define LATEXFEATURES_H -#include "support/types.h" #include "support/std_string.h" diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h index b202b94930..f5651db881 100644 --- a/src/ToolbarBackend.h +++ b/src/ToolbarBackend.h @@ -14,7 +14,6 @@ #define TOOLBAR_BACKEND_H #include -#include #include "support/std_string.h" diff --git a/src/changes.h b/src/changes.h index 36a1266eb0..3552973674 100644 --- a/src/changes.h +++ b/src/changes.h @@ -19,7 +19,7 @@ #include #include -#include + struct Change { /// the type of change diff --git a/src/converter.h b/src/converter.h index 40cb7e9a37..2286e04608 100644 --- a/src/converter.h +++ b/src/converter.h @@ -14,6 +14,7 @@ #include "graph.h" +#include "support/std_string.h" #include class Buffer; diff --git a/src/debug.h b/src/debug.h index edfabb5f16..9bdf60c9b3 100644 --- a/src/debug.h +++ b/src/debug.h @@ -13,7 +13,6 @@ #ifndef LYXDEBUG_H #define LYXDEBUG_H -#include #include "support/std_string.h" diff --git a/src/frontends/Alert.h b/src/frontends/Alert.h index b79c2e47e3..3711dbdd6a 100644 --- a/src/frontends/Alert.h +++ b/src/frontends/Alert.h @@ -14,7 +14,6 @@ #include "support/lstrings.h" -#include namespace Alert { diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 5f2e6f3f7a..9247923c7c 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,10 @@ +2003-09-07 Angus Leeming + + * Alert.h: remove #include . + * Dialogs.h: remove #include . + * WorkArea.h: remove #include , . + * guiapi.h: remove #include "support/std_string.h". + 2003-09-06 Angus Leeming * LyXKeySym.h: remove LyXKeySymPtr typedef. diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h index 988e606e03..1caf3d49e2 100644 --- a/src/frontends/Dialogs.h +++ b/src/frontends/Dialogs.h @@ -11,14 +11,12 @@ #ifndef DIALOGS_H #define DIALOGS_H - -#include "support/std_string.h" - #include -#include #include #include +#include "support/std_string.h" + class Dialog; class InsetBase; @@ -33,7 +31,7 @@ class Dialogs : boost::noncopyable public: /// Dialogs(LyXView &); - /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy. + /// ~Dialogs(); /** Redraw all visible dialogs because, for example, the GUI colours diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h index 4c9ee9051a..d42505fd09 100644 --- a/src/frontends/LyXView.h +++ b/src/frontends/LyXView.h @@ -13,15 +13,14 @@ #ifndef LYXVIEW_H #define LYXVIEW_H - -#include "support/std_string.h" - #include #include #include #include #include +#include "support/std_string.h" + class Buffer; class Toolbar; class Intl; diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h index 6248af5d01..09c107d1f2 100644 --- a/src/frontends/WorkArea.h +++ b/src/frontends/WorkArea.h @@ -19,10 +19,8 @@ #include #include #include -#include #include "support/std_string.h" -#include class Painter; class FuncRequest; diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h index 3c0e96f4b8..f387a07e2d 100644 --- a/src/frontends/controllers/ButtonController.h +++ b/src/frontends/controllers/ButtonController.h @@ -15,7 +15,6 @@ #include "ButtonPolicies.h" -#include "support/std_string.h" #include diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index dec5fc0980..4d66f650f5 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,22 @@ +2003-09-07 Angus Leeming + + * ButtonController.h: + * helper_funcs.h: remove #include "support/std_string.h". + + * ControlBranch.h: + * ControlNote.h: remove #include "debug.h". + + * ControlDocument.h: remove #include , "support/std_string.h". + + * ControlErrorList.h: + * ControlThesaurus.h: remove #include . + + * ControlPrefs.h: remove #include "funcrequest.h", . + + * GUI.h: remove #include "BCView.h". + + * tex_helpers.h: remove #include . + 2003-09-05 Martin Vermeer * biblio.C: diff --git a/src/frontends/controllers/ControlBranch.h b/src/frontends/controllers/ControlBranch.h index 0f43a31bd2..268b5a2bec 100644 --- a/src/frontends/controllers/ControlBranch.h +++ b/src/frontends/controllers/ControlBranch.h @@ -15,7 +15,6 @@ #include "Dialog.h" -#include "debug.h" class InsetBranchParams; diff --git a/src/frontends/controllers/ControlDocument.h b/src/frontends/controllers/ControlDocument.h index 6b2e3ac592..77003af318 100644 --- a/src/frontends/controllers/ControlDocument.h +++ b/src/frontends/controllers/ControlDocument.h @@ -12,13 +12,10 @@ #ifndef CONTROLDOCUMENT_H #define CONTROLDOCUMENT_H - -#include #include "ControlDialog_impl.h" -#include "support/std_string.h" #include "bufferparams.h" -#include +#include class Language; diff --git a/src/frontends/controllers/ControlErrorList.h b/src/frontends/controllers/ControlErrorList.h index 226ed668d5..deb0c03da2 100644 --- a/src/frontends/controllers/ControlErrorList.h +++ b/src/frontends/controllers/ControlErrorList.h @@ -14,7 +14,6 @@ #include "errorlist.h" #include "Dialog.h" -#include diff --git a/src/frontends/controllers/ControlForks.h b/src/frontends/controllers/ControlForks.h index 0752a06204..de37d7cbbe 100644 --- a/src/frontends/controllers/ControlForks.h +++ b/src/frontends/controllers/ControlForks.h @@ -12,14 +12,14 @@ #ifndef CONTROLFORKS_H #define CONTROLFORKS_H - #include "ControlDialog_impl.h" -#include "support/std_string.h" #include -#include +#include "support/std_string.h" #include +#include + /** A controller for dialogs that display the child processes forked by LyX. Also provides an interface enabling them to be killed prematurely. diff --git a/src/frontends/controllers/ControlNote.h b/src/frontends/controllers/ControlNote.h index 003617caa7..09d3901b8e 100644 --- a/src/frontends/controllers/ControlNote.h +++ b/src/frontends/controllers/ControlNote.h @@ -14,7 +14,6 @@ #include "Dialog.h" -#include "debug.h" #include class InsetNoteParams; diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C index a784dcb930..7c4e4504d5 100644 --- a/src/frontends/controllers/ControlPrefs.C +++ b/src/frontends/controllers/ControlPrefs.C @@ -19,6 +19,8 @@ #include "converter.h" #include "format.h" #include "gettext.h" +#include "funcrequest.h" +#include "lfuns.h" #include "frontends/Dialogs.h" #include "frontends/LyXView.h" diff --git a/src/frontends/controllers/ControlPrefs.h b/src/frontends/controllers/ControlPrefs.h index 581a81bdb2..0452bbca4a 100644 --- a/src/frontends/controllers/ControlPrefs.h +++ b/src/frontends/controllers/ControlPrefs.h @@ -15,11 +15,9 @@ #include "ControlDialog_impl.h" #include "support/std_string.h" -#include "funcrequest.h" #include "lyxrc.h" #include "LColor.h" -#include class Converters; class Formats; diff --git a/src/frontends/controllers/ControlThesaurus.h b/src/frontends/controllers/ControlThesaurus.h index 3d4d4fa0d9..3c397940f8 100644 --- a/src/frontends/controllers/ControlThesaurus.h +++ b/src/frontends/controllers/ControlThesaurus.h @@ -15,7 +15,6 @@ #include "Dialog.h" #include "Thesaurus.h" -#include /** A controller for Thesaurus dialogs. */ diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h index 6ea2a9ee12..ab4cfcd60c 100644 --- a/src/frontends/controllers/GUI.h +++ b/src/frontends/controllers/GUI.h @@ -12,8 +12,6 @@ #ifndef GUI_H #define GUI_H -#include "BCView.h" - #include class LyXView; diff --git a/src/frontends/controllers/helper_funcs.h b/src/frontends/controllers/helper_funcs.h index c20fa8a635..0530656eb1 100644 --- a/src/frontends/controllers/helper_funcs.h +++ b/src/frontends/controllers/helper_funcs.h @@ -12,11 +12,9 @@ #ifndef HELPERFUNCS_H #define HELPERFUNCS_H - #include "support/std_string.h" - -#include // pair -#include // pair +#include +#include /** Launch a file dialog and return the chosen file. filename: a suggested filename. diff --git a/src/frontends/controllers/tex_helpers.h b/src/frontends/controllers/tex_helpers.h index 6ffd4c50d6..ff3c6a163a 100644 --- a/src/frontends/controllers/tex_helpers.h +++ b/src/frontends/controllers/tex_helpers.h @@ -14,7 +14,6 @@ #include "support/std_string.h" -#include #include diff --git a/src/frontends/guiapi.h b/src/frontends/guiapi.h index a6d2fd067d..ef1d4990ce 100644 --- a/src/frontends/guiapi.h +++ b/src/frontends/guiapi.h @@ -13,7 +13,6 @@ #define GUIAPI_H -#include "support/std_string.h" class Dialogs; diff --git a/src/frontends/qt2/BulletsModule.h b/src/frontends/qt2/BulletsModule.h index cc9cb920fe..7192307000 100644 --- a/src/frontends/qt2/BulletsModule.h +++ b/src/frontends/qt2/BulletsModule.h @@ -14,8 +14,6 @@ #include "ui/BulletsModuleBase.h" -#include "support/std_string.h" -#include #include "Bullet.h" #include diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 6c45a383d5..ad0d92be48 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,21 @@ +2003-09-07 Angus Leeming + + * BulletsModule.h: remove #include "support/std_string.h", . + * QBrowseBox.h: remove #include . + * QCharacter.h: remove #include "support/std_string.h". + * QCharacterDialog.h: remove #include , , + . + * QContentPane.h: remove #include . + * QDialogView.h: remove #include . + * QDocumentDialog.h: remove #include "ui/BulletsModuleBase.h". + * QLPopupMenu.h: remove #include . + * QLToolbar.h: remove #include . + * QWorkArea.h: remove #include , . + * Qt2Base.h: remove #include . + * QtLyXView.h: remove #include "frontends/LyXView.h". + * emptytable.h: remove #include . + * qsetborder.h: remove #include . + 2003-09-06 Angus Leeming * QParagraph.C: add Spacing.h and vspace.h includes. diff --git a/src/frontends/qt2/QBrowseBox.h b/src/frontends/qt2/QBrowseBox.h index bf2738ba8a..c1845fa7f5 100644 --- a/src/frontends/qt2/QBrowseBox.h +++ b/src/frontends/qt2/QBrowseBox.h @@ -14,8 +14,6 @@ #include "qgridview.h" -#include - class QString; class QPainter; diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt2/QCharacter.C index 54c35d751a..5b2cbbcffc 100644 --- a/src/frontends/qt2/QCharacter.C +++ b/src/frontends/qt2/QCharacter.C @@ -19,6 +19,8 @@ #include "qt_helpers.h" #include +#include +#include using namespace frnt; diff --git a/src/frontends/qt2/QCharacter.h b/src/frontends/qt2/QCharacter.h index e119993793..a484e397d2 100644 --- a/src/frontends/qt2/QCharacter.h +++ b/src/frontends/qt2/QCharacter.h @@ -18,8 +18,6 @@ #include "controllers/character.h" #include "controllers/frnt_lang.h" -#include "support/std_string.h" - #include diff --git a/src/frontends/qt2/QCharacterDialog.C b/src/frontends/qt2/QCharacterDialog.C index 6649cd12eb..bfcb49809f 100644 --- a/src/frontends/qt2/QCharacterDialog.C +++ b/src/frontends/qt2/QCharacterDialog.C @@ -13,6 +13,8 @@ #include "QCharacterDialog.h" +#include +#include #include diff --git a/src/frontends/qt2/QCharacterDialog.h b/src/frontends/qt2/QCharacterDialog.h index e6611f74c6..5a94677615 100644 --- a/src/frontends/qt2/QCharacterDialog.h +++ b/src/frontends/qt2/QCharacterDialog.h @@ -17,9 +17,6 @@ #include "QCharacter.h" #include "ui/QCharacterDialogBase.h" -#include -#include -#include class LyXFont; diff --git a/src/frontends/qt2/QContentPane.h b/src/frontends/qt2/QContentPane.h index 0bf0ba69ad..0d9ec895cf 100644 --- a/src/frontends/qt2/QContentPane.h +++ b/src/frontends/qt2/QContentPane.h @@ -12,9 +12,7 @@ #ifndef QCONTENTPANE_H #define QCONTENTPANE_H - #include -#include #include #include diff --git a/src/frontends/qt2/QDialogView.h b/src/frontends/qt2/QDialogView.h index 2539e8a56a..99589d9287 100644 --- a/src/frontends/qt2/QDialogView.h +++ b/src/frontends/qt2/QDialogView.h @@ -12,14 +12,12 @@ #ifndef QDIALOGVIEW_H #define QDIALOGVIEW_H - #include "Dialog.h" #include -#include +#include #include #include -#include class Qt2BC; diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h index 1b97f5a382..248f5c97a3 100644 --- a/src/frontends/qt2/QDocumentDialog.h +++ b/src/frontends/qt2/QDocumentDialog.h @@ -14,9 +14,7 @@ #include "ui/QDocumentDialogBase.h" -#include "support/std_string.h" -#include "ui/BulletsModuleBase.h" #include "BulletsModule.h" #include "ui/TextLayoutModuleBase.h" @@ -29,6 +27,8 @@ #include "ui/MarginsModuleBase.h" #include "ui/PreambleModuleBase.h" +#include "support/std_string.h" + class QDocument; class FloatPlacement; diff --git a/src/frontends/qt2/QLPopupMenu.h b/src/frontends/qt2/QLPopupMenu.h index 3438992bb2..94052c31d8 100644 --- a/src/frontends/qt2/QLPopupMenu.h +++ b/src/frontends/qt2/QLPopupMenu.h @@ -17,7 +17,6 @@ #include "support/std_string.h" -#include class MenuBackend; class MenuItem; diff --git a/src/frontends/qt2/QLToolbar.h b/src/frontends/qt2/QLToolbar.h index 2c2416f23d..b71ffdeb1a 100644 --- a/src/frontends/qt2/QLToolbar.h +++ b/src/frontends/qt2/QLToolbar.h @@ -19,12 +19,13 @@ #include "qt_helpers.h" #include + #include -#include #include #include + class QtView; class QToolBar; class QLComboBox; diff --git a/src/frontends/qt2/QWorkArea.h b/src/frontends/qt2/QWorkArea.h index cb4e41f1cd..6e9c8e728c 100644 --- a/src/frontends/qt2/QWorkArea.h +++ b/src/frontends/qt2/QWorkArea.h @@ -13,14 +13,14 @@ #ifndef QWORKAREA_H #define QWORKAREA_H - #include "WorkArea.h" #include "QLPainter.h" #include "QContentPane.h" -#include #include -#include + +class QPixmap; +class QWidget; /** diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index abf1255310..2884f598c3 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -16,10 +16,9 @@ #include "ViewBase.h" #include -#include +#include #include #include -#include class Qt2BC; diff --git a/src/frontends/qt2/QtLyXView.h b/src/frontends/qt2/QtLyXView.h index 241f8559de..6366f060cb 100644 --- a/src/frontends/qt2/QtLyXView.h +++ b/src/frontends/qt2/QtLyXView.h @@ -15,4 +15,3 @@ #undef emit #undef signals -#include "frontends/LyXView.h" diff --git a/src/frontends/qt2/emptytable.C b/src/frontends/qt2/emptytable.C index ae56c7f410..d6e61667dc 100644 --- a/src/frontends/qt2/emptytable.C +++ b/src/frontends/qt2/emptytable.C @@ -12,6 +12,7 @@ #include "emptytable.h" +#include /** * A simple widget for a quick "preview" in TabularCreateDialog diff --git a/src/frontends/qt2/emptytable.h b/src/frontends/qt2/emptytable.h index 2ccebf45ac..ab4e9943bf 100644 --- a/src/frontends/qt2/emptytable.h +++ b/src/frontends/qt2/emptytable.h @@ -12,8 +12,6 @@ #ifndef EMPTYTABLE_H #define EMPTYTABLE_H - -#include #include "qttableview.h" /** diff --git a/src/frontends/qt2/qsetborder.h b/src/frontends/qt2/qsetborder.h index e50d3f37a4..d60f319b29 100644 --- a/src/frontends/qt2/qsetborder.h +++ b/src/frontends/qt2/qsetborder.h @@ -14,11 +14,11 @@ #include #include -#include +class QColor; class QMouseEvent; -class QResizeEvent; class QPaintEvent; +class QResizeEvent; class QSetBorder : public QWidget { diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 4b1bef4c87..6da72b2368 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,17 @@ +2003-09-07 Angus Leeming + + * FormAboutlyx.h: remove #include . + * FormBase.h: remove #include "support/std_string.h". + * FormCharacter.h: remove #include "lyxfont.h", "LColor.h", "character.h". + * FormDialogView.h: remove #include "support/std_string.h", + . + * FormMathsBitmap.h: remove . + * FormPreferences.h: remove #include "Color.h", . + * Tooltips.h: remove #include . + * XFormsMenubar.h: remove #include . + * xfont_loader.h: remove #include "support/std_string.h". + * xfont_metrics.h: remove #include "support/std_string.h", "font_metrics.h" + 2003-09-06 Angus Leeming * FormParagraph.C: add Spacing.h and vspace.h includes. diff --git a/src/frontends/xforms/FormAboutlyx.h b/src/frontends/xforms/FormAboutlyx.h index 61ac5ff214..91a0e19712 100644 --- a/src/frontends/xforms/FormAboutlyx.h +++ b/src/frontends/xforms/FormAboutlyx.h @@ -16,7 +16,6 @@ #include "FormDialogView.h" -#include class ControlAboutlyx; struct FD_aboutlyx; diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h index a09c0edefc..37bd974a75 100644 --- a/src/frontends/xforms/FormBase.h +++ b/src/frontends/xforms/FormBase.h @@ -20,7 +20,6 @@ #include "ButtonPolicies.h" #include "forms_fwd.h" -#include "support/std_string.h" #include #include // for Pixmap diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h index 4160cd1980..fc125656d9 100644 --- a/src/frontends/xforms/FormCharacter.h +++ b/src/frontends/xforms/FormCharacter.h @@ -13,12 +13,8 @@ #ifndef FORM_CHARACTER_H #define FORM_CHARACTER_H - #include "FormDialogView.h" -#include "lyxfont.h" // for LyXFont enums #include "ControlCharacter.h" // for ControlCharacter enum -#include "LColor.h" // for LColor enum -#include "character.h" // for FONT_STATE enum struct FD_character; diff --git a/src/frontends/xforms/FormDialogView.h b/src/frontends/xforms/FormDialogView.h index 9e02c17f12..0b843a1521 100644 --- a/src/frontends/xforms/FormDialogView.h +++ b/src/frontends/xforms/FormDialogView.h @@ -20,8 +20,6 @@ #include "ButtonPolicies.h" #include "forms_fwd.h" -#include "support/std_string.h" -#include #include // for Pixmap class xformsBC; diff --git a/src/frontends/xforms/FormMathsBitmap.h b/src/frontends/xforms/FormMathsBitmap.h index 8272ba0f26..94fea9f524 100644 --- a/src/frontends/xforms/FormMathsBitmap.h +++ b/src/frontends/xforms/FormMathsBitmap.h @@ -14,12 +14,9 @@ #ifndef FORM_MATHSBITMAP_H #define FORM_MATHSBITMAP_H - #include "FormDialogView.h" -#include #include - struct BitmapStore { BitmapStore(int nt_in, int nx_in, int ny_in, int bw_in, int bh_in, diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h index fbdd557076..dbd25dc604 100644 --- a/src/frontends/xforms/FormPreferences.h +++ b/src/frontends/xforms/FormPreferences.h @@ -13,21 +13,19 @@ #ifndef FORMPREFERENCES_H #define FORMPREFERENCES_H - #include "FormBase.h" -#include "Color.h" // NamedColor #include "xforms_helpers.h" // XformColor -#include - #include "lyx_forms.h" -#include // pair + +#include class ControlPrefs; class Dialogs; class LyXRC; class LyXView; +class NamedColor; class RGBColor; class FormColorpicker; diff --git a/src/frontends/xforms/Tooltips.h b/src/frontends/xforms/Tooltips.h index 8edfdbf11d..01e0e890a2 100644 --- a/src/frontends/xforms/Tooltips.h +++ b/src/frontends/xforms/Tooltips.h @@ -18,10 +18,8 @@ #ifndef TOOLTIPS_H #define TOOLTIPS_H - #include "support/std_string.h" -#include #include #include @@ -29,6 +27,7 @@ #include + class Tooltips : boost::noncopyable, public boost::signals::trackable { public: /// diff --git a/src/frontends/xforms/XFormsMenubar.h b/src/frontends/xforms/XFormsMenubar.h index bfc06fcf16..8d01d077ca 100644 --- a/src/frontends/xforms/XFormsMenubar.h +++ b/src/frontends/xforms/XFormsMenubar.h @@ -12,7 +12,6 @@ #ifndef XFORMSMENUBAR_H #define XFORMSMENUBAR_H -#include "support/std_string.h" #include "frontends/Menubar.h" #include @@ -20,8 +19,8 @@ #include "forms_fwd.h" #include // Window +#include "support/std_string.h" #include -#include class LyXView; class XFormsView; diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C index 2b82c361bc..a282b83dca 100644 --- a/src/frontends/xforms/XPainter.C +++ b/src/frontends/xforms/XPainter.C @@ -18,6 +18,8 @@ #include "xformsImage.h" #include "XWorkArea.h" +#include "font_metrics.h" + #include "encoding.h" #include "language.h" #include "lyxfont.h" diff --git a/src/frontends/xforms/xfont_loader.h b/src/frontends/xforms/xfont_loader.h index 77c2eb98d3..2e8beb67dc 100644 --- a/src/frontends/xforms/xfont_loader.h +++ b/src/frontends/xforms/xfont_loader.h @@ -15,7 +15,6 @@ #include #include "lyxfont.h" -#include "support/std_string.h" class FontInfo; diff --git a/src/frontends/xforms/xfont_metrics.C b/src/frontends/xforms/xfont_metrics.C index 742fb7b789..3485157f43 100644 --- a/src/frontends/xforms/xfont_metrics.C +++ b/src/frontends/xforms/xfont_metrics.C @@ -12,6 +12,7 @@ #include #include "xfont_metrics.h" +#include "font_metrics.h" #include "xfont_loader.h" #include "encoding.h" diff --git a/src/frontends/xforms/xfont_metrics.h b/src/frontends/xforms/xfont_metrics.h index e8e911f4c4..c4326be7cc 100644 --- a/src/frontends/xforms/xfont_metrics.h +++ b/src/frontends/xforms/xfont_metrics.h @@ -14,9 +14,7 @@ #define XFONT_METRICS_H -#include "support/std_string.h" -#include "font_metrics.h" #include diff --git a/src/graph.h b/src/graph.h index 4a8477cbf9..49f1a4dbb3 100644 --- a/src/graph.h +++ b/src/graph.h @@ -12,11 +12,10 @@ #ifndef GRAPH_H #define GRAPH_H -#include "support/std_string.h" - #include #include + class Graph { public: Graph() : numedges_(0) {}; diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index cf374b45f5..c11e6e45cc 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,8 @@ +2003-09-07 Angus Leeming + + * GraphicsTypes.h: + * Previews.h: remove #include "support/std_string.h". + 2003-09-06 Angus Leeming * PreviewedInset.C: add #include "insets/inset.h" diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h index c95d45c05f..7de2af16f0 100644 --- a/src/graphics/GraphicsCacheItem.h +++ b/src/graphics/GraphicsCacheItem.h @@ -29,12 +29,13 @@ #define GRAPHICSCACHEITEM_H #include "GraphicsTypes.h" -#include "support/std_string.h" #include #include #include +#include "support/std_string.h" + class InsetGraphics; namespace lyx { diff --git a/src/graphics/GraphicsTypes.C b/src/graphics/GraphicsTypes.C index 11887ad04c..9967e702e1 100644 --- a/src/graphics/GraphicsTypes.C +++ b/src/graphics/GraphicsTypes.C @@ -13,6 +13,8 @@ #include "graphics/GraphicsTypes.h" #include "support/translator.h" +#include "support/std_string.h" + namespace lyx { namespace graphics { diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h index 2dfe4cba71..625e1c8555 100644 --- a/src/graphics/GraphicsTypes.h +++ b/src/graphics/GraphicsTypes.h @@ -15,7 +15,6 @@ #ifndef GRAPHICSTYPES_H #define GRAPHICSTYPES_H -#include "support/std_string.h" namespace lyx { namespace graphics { diff --git a/src/graphics/Previews.h b/src/graphics/Previews.h index 3e2cbc0304..2ede9c4bb9 100644 --- a/src/graphics/Previews.h +++ b/src/graphics/Previews.h @@ -15,7 +15,6 @@ #ifndef PREVIEWS_H #define PREVIEWS_H -#include "support/std_string.h" #include #include diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 2e0bdb85b1..ce00ea126b 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2003-09-07 Angus Leeming + + * insetspace.h: + * insetspecialchar.h: remove #include "support/std_string.h". + 2003-09-06 Angus Leeming * renderers.C: add #include "insets/inset.h" diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h index c340560ccd..df3e3a7500 100644 --- a/src/insets/insetspace.h +++ b/src/insets/insetspace.h @@ -17,7 +17,6 @@ #include "inset.h" -#include "support/std_string.h" struct LaTeXFeatures; diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h index 73a02165c3..b2bd0937f4 100644 --- a/src/insets/insetspecialchar.h +++ b/src/insets/insetspecialchar.h @@ -16,7 +16,6 @@ #include "inset.h" -#include "support/std_string.h" struct LaTeXFeatures; diff --git a/src/lyx_main.C b/src/lyx_main.C index 5aa42b2e91..2f006b64a9 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -50,6 +50,7 @@ #include #include +#include using namespace lyx::support; diff --git a/src/lyx_main.h b/src/lyx_main.h index 3996640014..e8a8d68743 100644 --- a/src/lyx_main.h +++ b/src/lyx_main.h @@ -14,12 +14,10 @@ #ifndef LYX_MAIN_H #define LYX_MAIN_H -#include "support/std_string.h" - #include #include -#include +#include "support/std_string.h" class ErrorItem; diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h index c7acd92e79..79078d5d02 100644 --- a/src/lyxlex_pimpl.h +++ b/src/lyxlex_pimpl.h @@ -18,7 +18,6 @@ #include -#include #include #include diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 3090eb09c1..527aa9d5b1 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,21 @@ +2003-09-07 Angus Leeming + + * formulabase.h: remove #includes "dimension.h", , + . + + * math_decorationinset.h: remove #include "support/std_string.h". + + * math_envinset.h: + * math_fboxinset.h: remove #include "metricsinfo.h". + + * math_kerninset.h: remove #include "math_nestinset.h". + + * math_macro.h: remove #include "math_macroarg.h". + + * math_nestinset.h: remove #include "math_data.h". + + Ensuing changes to .C files. + 2003-09-05 Angus Leeming * math_binaryopinset.[Ch]: diff --git a/src/mathed/command_inset.C b/src/mathed/command_inset.C index cbd82038a9..b580579b1e 100644 --- a/src/mathed/command_inset.C +++ b/src/mathed/command_inset.C @@ -11,6 +11,7 @@ #include #include "command_inset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "funcrequest.h" #include "support/std_sstream.h" diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h index 8ab46960a2..d42bbc3945 100644 --- a/src/mathed/formulabase.h +++ b/src/mathed/formulabase.h @@ -15,10 +15,7 @@ #define INSET_FORMULABASE_H #include "insets/updatableinset.h" -#include "dimension.h" -#include -#include class Buffer; class BufferView; diff --git a/src/mathed/math_amsarrayinset.C b/src/mathed/math_amsarrayinset.C index 0aca0bb688..efd96b2823 100644 --- a/src/mathed/math_amsarrayinset.C +++ b/src/mathed/math_amsarrayinset.C @@ -11,6 +11,7 @@ #include #include "math_amsarrayinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "math_support.h" diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C index ef1b9b0cbb..67b5a5fb63 100644 --- a/src/mathed/math_arrayinset.C +++ b/src/mathed/math_arrayinset.C @@ -11,6 +11,7 @@ #include #include "math_arrayinset.h" +#include "math_data.h" #include "math_parser.h" #include "math_mathmlstream.h" #include "math_streamstr.h" diff --git a/src/mathed/math_binaryopinset.h b/src/mathed/math_binaryopinset.h index 009766f611..76b4829a24 100644 --- a/src/mathed/math_binaryopinset.h +++ b/src/mathed/math_binaryopinset.h @@ -12,7 +12,6 @@ #ifndef MATH_BINARYOPINSET_H #define MATH_BINARYOPINSET_H -#include "math_nestinset.h" #include "math_nestinset.h" #include "metricsinfo.h" diff --git a/src/mathed/math_binominset.C b/src/mathed/math_binominset.C index b3707fd1a6..69ff5aa98f 100644 --- a/src/mathed/math_binominset.C +++ b/src/mathed/math_binominset.C @@ -11,6 +11,7 @@ #include #include "math_binominset.h" +#include "math_data.h" #include "math_support.h" #include "math_mathmlstream.h" diff --git a/src/mathed/math_boxinset.C b/src/mathed/math_boxinset.C index 624f627792..5b48653037 100644 --- a/src/mathed/math_boxinset.C +++ b/src/mathed/math_boxinset.C @@ -11,6 +11,7 @@ #include #include "math_boxinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_braceinset.C b/src/mathed/math_braceinset.C index e0a6ab5862..ecd1c0cef0 100644 --- a/src/mathed/math_braceinset.C +++ b/src/mathed/math_braceinset.C @@ -11,8 +11,9 @@ #include #include "math_braceinset.h" -#include "math_support.h" +#include "math_data.h" #include "math_mathmlstream.h" +#include "math_support.h" #include "support/std_ostream.h" using std::max; diff --git a/src/mathed/math_casesinset.C b/src/mathed/math_casesinset.C index a507cc231e..2a57697bd5 100644 --- a/src/mathed/math_casesinset.C +++ b/src/mathed/math_casesinset.C @@ -11,6 +11,7 @@ #include #include "math_casesinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_support.h" #include "LaTeXFeatures.h" diff --git a/src/mathed/math_commentinset.C b/src/mathed/math_commentinset.C index 0c7f9b7255..09fa26b650 100644 --- a/src/mathed/math_commentinset.C +++ b/src/mathed/math_commentinset.C @@ -11,8 +11,9 @@ #include #include "math_commentinset.h" -#include "math_support.h" +#include "math_data.h" #include "math_mathmlstream.h" +#include "math_support.h" #include "support/std_ostream.h" using std::auto_ptr; diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C index e74118f293..d823419983 100644 --- a/src/mathed/math_decorationinset.C +++ b/src/mathed/math_decorationinset.C @@ -12,6 +12,7 @@ #include #include "math_decorationinset.h" +#include "math_data.h" #include "math_support.h" #include "math_parser.h" #include "math_mathmlstream.h" diff --git a/src/mathed/math_decorationinset.h b/src/mathed/math_decorationinset.h index 6d2a23b661..37f8df1893 100644 --- a/src/mathed/math_decorationinset.h +++ b/src/mathed/math_decorationinset.h @@ -14,7 +14,6 @@ #define MATH_DECORATIONINSET_H #include "math_nestinset.h" -#include "support/std_string.h" class latexkeys; diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C index a700569c79..3a2f7ba047 100644 --- a/src/mathed/math_deliminset.C +++ b/src/mathed/math_deliminset.C @@ -12,9 +12,10 @@ #include #include "math_deliminset.h" -#include "math_support.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" +#include "math_support.h" using std::max; diff --git a/src/mathed/math_diffinset.C b/src/mathed/math_diffinset.C index 0af81f9c03..3d32081793 100644 --- a/src/mathed/math_diffinset.C +++ b/src/mathed/math_diffinset.C @@ -11,6 +11,7 @@ #include #include "math_diffinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "debug.h" diff --git a/src/mathed/math_envinset.C b/src/mathed/math_envinset.C index c5f768bf5f..e92fd99e37 100644 --- a/src/mathed/math_envinset.C +++ b/src/mathed/math_envinset.C @@ -11,6 +11,7 @@ #include #include "math_envinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_envinset.h b/src/mathed/math_envinset.h index 374fbc5acb..e8366b16fe 100644 --- a/src/mathed/math_envinset.h +++ b/src/mathed/math_envinset.h @@ -13,7 +13,6 @@ #define MATH_ENVINSET_H #include "math_nestinset.h" -#include "metricsinfo.h" /// Environtments á la \begin{something}...\end{something} diff --git a/src/mathed/math_ertinset.h b/src/mathed/math_ertinset.h index b7a9acdf27..ca9379c0a7 100644 --- a/src/mathed/math_ertinset.h +++ b/src/mathed/math_ertinset.h @@ -12,9 +12,10 @@ #ifndef MATH_ERTINSET_H #define MATH_ERTINSET_H - +#include "math_data.h" #include "math_textinset.h" + // implements support for \parbox class MathErtInset : public MathTextInset { diff --git a/src/mathed/math_exfuncinset.C b/src/mathed/math_exfuncinset.C index 6757b5801c..3ce1701b46 100644 --- a/src/mathed/math_exfuncinset.C +++ b/src/mathed/math_exfuncinset.C @@ -11,9 +11,10 @@ #include #include "math_exfuncinset.h" -#include "math_support.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" +#include "math_support.h" using std::auto_ptr; diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C index bd5f9dc20c..a6b96c9cbb 100644 --- a/src/mathed/math_exintinset.C +++ b/src/mathed/math_exintinset.C @@ -11,6 +11,7 @@ #include #include "math_exintinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "math_symbolinset.h" diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C index 6381d0436f..f6a4be430a 100644 --- a/src/mathed/math_extern.C +++ b/src/mathed/math_extern.C @@ -18,6 +18,7 @@ #include "math_arrayinset.h" #include "math_charinset.h" #include "math_deliminset.h" +#include "math_data.h" #include "math_diffinset.h" #include "math_exfuncinset.h" #include "math_exintinset.h" diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C index 2b0b973388..f083c9a175 100644 --- a/src/mathed/math_factory.C +++ b/src/mathed/math_factory.C @@ -28,6 +28,7 @@ #include "math_kerninset.h" #include "math_lefteqninset.h" #include "math_macro.h" +#include "math_macroarg.h" #include "math_macrotable.h" #include "math_macrotemplate.h" #include "math_makeboxinset.h" diff --git a/src/mathed/math_fboxinset.C b/src/mathed/math_fboxinset.C index 783eea1bbf..8039de58c8 100644 --- a/src/mathed/math_fboxinset.C +++ b/src/mathed/math_fboxinset.C @@ -11,9 +11,10 @@ #include #include "math_fboxinset.h" +#include "math_data.h" #include "math_mathmlstream.h" -#include "math_streamstr.h" #include "math_parser.h" +#include "math_streamstr.h" #include "frontends/Painter.h" using std::auto_ptr; diff --git a/src/mathed/math_fboxinset.h b/src/mathed/math_fboxinset.h index 114637e816..b8a4e0947d 100644 --- a/src/mathed/math_fboxinset.h +++ b/src/mathed/math_fboxinset.h @@ -13,7 +13,6 @@ #define MATH_FBOXINSET_H #include "math_nestinset.h" -#include "metricsinfo.h" class latexkeys; diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C index 79d25a16cb..0c74e24690 100644 --- a/src/mathed/math_fontinset.C +++ b/src/mathed/math_fontinset.C @@ -11,6 +11,7 @@ #include #include "math_fontinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_parser.h" #include "LaTeXFeatures.h" diff --git a/src/mathed/math_fontoldinset.C b/src/mathed/math_fontoldinset.C index 59155a49ae..66b38c73e3 100644 --- a/src/mathed/math_fontoldinset.C +++ b/src/mathed/math_fontoldinset.C @@ -11,9 +11,10 @@ #include #include "math_fontoldinset.h" +#include "math_data.h" #include "math_mathmlstream.h" -#include "math_streamstr.h" #include "math_parser.h" +#include "math_streamstr.h" #include "support/std_ostream.h" using std::auto_ptr; diff --git a/src/mathed/math_fracbase.C b/src/mathed/math_fracbase.C index 24b79f40b2..24bbd29ca0 100644 --- a/src/mathed/math_fracbase.C +++ b/src/mathed/math_fracbase.C @@ -11,6 +11,7 @@ #include #include "math_fracbase.h" +#include "math_data.h" MathFracbaseInset::MathFracbaseInset() diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C index 06674c69ed..ba0548c667 100644 --- a/src/mathed/math_fracinset.C +++ b/src/mathed/math_fracinset.C @@ -12,9 +12,10 @@ #include #include "math_fracinset.h" -#include "frontends/Painter.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "textpainter.h" +#include "frontends/Painter.h" using std::max; diff --git a/src/mathed/math_frameboxinset.C b/src/mathed/math_frameboxinset.C index f09c40c2c4..c5b665ddde 100644 --- a/src/mathed/math_frameboxinset.C +++ b/src/mathed/math_frameboxinset.C @@ -11,8 +11,9 @@ #include #include "math_frameboxinset.h" -#include "math_support.h" +#include "math_data.h" #include "math_mathmlstream.h" +#include "math_support.h" #include "frontends/Painter.h" using std::auto_ptr; diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C index 4f1889d3e8..5f61841e33 100644 --- a/src/mathed/math_gridinset.C +++ b/src/mathed/math_gridinset.C @@ -11,11 +11,12 @@ #include #include "math_gridinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" +#include "debug.h" #include "funcrequest.h" #include "frontends/Painter.h" -#include "debug.h" #include "support/std_sstream.h" diff --git a/src/mathed/math_kerninset.C b/src/mathed/math_kerninset.C index f173119863..64abb5c368 100644 --- a/src/mathed/math_kerninset.C +++ b/src/mathed/math_kerninset.C @@ -14,6 +14,7 @@ #include "math_mathmlstream.h" #include "math_streamstr.h" #include "math_support.h" +#include "dimension.h" using std::auto_ptr; diff --git a/src/mathed/math_kerninset.h b/src/mathed/math_kerninset.h index 8d40cf27b3..0437c393d0 100644 --- a/src/mathed/math_kerninset.h +++ b/src/mathed/math_kerninset.h @@ -15,7 +15,6 @@ #include "math_inset.h" #include "vspace.h" #include "support/std_string.h" -#include "math_nestinset.h" /// The \kern primitive diff --git a/src/mathed/math_lefteqninset.C b/src/mathed/math_lefteqninset.C index f9a8863de5..d3dc4b638f 100644 --- a/src/mathed/math_lefteqninset.C +++ b/src/mathed/math_lefteqninset.C @@ -11,6 +11,7 @@ #include #include "math_lefteqninset.h" +#include "math_data.h" #include "support/std_ostream.h" using std::auto_ptr; diff --git a/src/mathed/math_liminset.C b/src/mathed/math_liminset.C index 89639368f5..79712556cf 100644 --- a/src/mathed/math_liminset.C +++ b/src/mathed/math_liminset.C @@ -11,6 +11,7 @@ #include #include "math_liminset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "debug.h" diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h index 5f356d861a..1ec617c35f 100644 --- a/src/mathed/math_macro.h +++ b/src/mathed/math_macro.h @@ -13,10 +13,9 @@ #ifndef MATH_MACRO_H #define MATH_MACRO_H - +#include "math_data.h" #include "math_nestinset.h" #include "metricsinfo.h" -#include "math_macroarg.h" #include "support/std_string.h" class MathMacroTemplate; diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/math_macrotemplate.h index 97441accdd..406515756f 100644 --- a/src/mathed/math_macrotemplate.h +++ b/src/mathed/math_macrotemplate.h @@ -13,6 +13,7 @@ #ifndef MATH_MACROTEMPLATE_H #define MATH_MACROTEMPLATE_H +#include "math_data.h" #include "math_nestinset.h" #include "support/std_string.h" diff --git a/src/mathed/math_makeboxinset.C b/src/mathed/math_makeboxinset.C index 73feb414e4..8d97d54ea6 100644 --- a/src/mathed/math_makeboxinset.C +++ b/src/mathed/math_makeboxinset.C @@ -11,8 +11,9 @@ #include #include "math_makeboxinset.h" -#include "math_support.h" +#include "math_data.h" #include "math_mathmlstream.h" +#include "math_support.h" using std::auto_ptr; diff --git a/src/mathed/math_matrixinset.C b/src/mathed/math_matrixinset.C index 23b4bdd15b..f1343b4736 100644 --- a/src/mathed/math_matrixinset.C +++ b/src/mathed/math_matrixinset.C @@ -11,6 +11,7 @@ #include #include "math_matrixinset.h" +#include "math_data.h" #include "math_mathmlstream.h" using std::auto_ptr; diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h index 72edfe4821..4af8f0ab19 100644 --- a/src/mathed/math_nestinset.h +++ b/src/mathed/math_nestinset.h @@ -13,14 +13,15 @@ #define MATH_NESTINSET_H #include "math_diminset.h" -#include "math_data.h" + +class MathArray; + /** Abstract base class for all math objects that contain nested items. This is basically everything that is not a single character or a single symbol. */ - class MathNestInset : public MathDimInset { public: /// nestinsets have a fixed size to start with diff --git a/src/mathed/math_oversetinset.C b/src/mathed/math_oversetinset.C index a9d6ee093e..c38fc7fcf5 100644 --- a/src/mathed/math_oversetinset.C +++ b/src/mathed/math_oversetinset.C @@ -11,6 +11,7 @@ #include #include "math_oversetinset.h" +#include "math_data.h" #include "math_mathmlstream.h" diff --git a/src/mathed/math_parboxinset.C b/src/mathed/math_parboxinset.C index 21f851472c..7a4ec536bb 100644 --- a/src/mathed/math_parboxinset.C +++ b/src/mathed/math_parboxinset.C @@ -11,6 +11,7 @@ #include #include "math_parboxinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" #include "debug.h" diff --git a/src/mathed/math_parinset.C b/src/mathed/math_parinset.C index 83eb131c3d..28e2209f1f 100644 --- a/src/mathed/math_parinset.C +++ b/src/mathed/math_parinset.C @@ -11,6 +11,7 @@ #include #include "math_parinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index a11f6fe75c..95b4cb7753 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -48,6 +48,7 @@ following hack as starting point to write some macros: #include "math_factory.h" #include "math_kerninset.h" #include "math_macro.h" +#include "math_macroarg.h" #include "math_macrotemplate.h" #include "math_parboxinset.h" #include "math_parinset.h" diff --git a/src/mathed/math_rootinset.C b/src/mathed/math_rootinset.C index 3b41365508..bba8ddfbb1 100644 --- a/src/mathed/math_rootinset.C +++ b/src/mathed/math_rootinset.C @@ -12,6 +12,7 @@ #include #include "math_rootinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "frontends/Painter.h" diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C index 7350dcb919..ba4d7a8a7a 100644 --- a/src/mathed/math_scriptinset.C +++ b/src/mathed/math_scriptinset.C @@ -11,12 +11,13 @@ #include #include "math_scriptinset.h" +#include "math_data.h" +#include "math_mathmlstream.h" #include "math_support.h" #include "math_symbolinset.h" -#include "math_mathmlstream.h" +#include "debug.h" #include "funcrequest.h" #include "support/LAssert.h" -#include "debug.h" using namespace lyx::support; diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C index c965f3e0a9..9e9eee1af6 100644 --- a/src/mathed/math_sizeinset.C +++ b/src/mathed/math_sizeinset.C @@ -11,8 +11,9 @@ #include #include "math_sizeinset.h" -#include "math_parser.h" +#include "math_data.h" #include "math_mathmlstream.h" +#include "math_parser.h" #include "math_streamstr.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_splitinset.C b/src/mathed/math_splitinset.C index 6cd7fb698d..9d4e0058aa 100644 --- a/src/mathed/math_splitinset.C +++ b/src/mathed/math_splitinset.C @@ -11,6 +11,7 @@ #include #include "math_splitinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C index c71dc6d35a..f02db6a954 100644 --- a/src/mathed/math_sqrtinset.C +++ b/src/mathed/math_sqrtinset.C @@ -11,9 +11,10 @@ #include #include "math_sqrtinset.h" +#include "math_data.h" #include "math_mathmlstream.h" -#include "frontends/Painter.h" #include "textpainter.h" +#include "frontends/Painter.h" using std::auto_ptr; diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/math_stackrelinset.C index 79c10b757a..90b9c5f0ba 100644 --- a/src/mathed/math_stackrelinset.C +++ b/src/mathed/math_stackrelinset.C @@ -11,6 +11,7 @@ #include #include "math_stackrelinset.h" +#include "math_data.h" #include "math_mathmlstream.h" diff --git a/src/mathed/math_substackinset.C b/src/mathed/math_substackinset.C index 08f425e795..4767f3402e 100644 --- a/src/mathed/math_substackinset.C +++ b/src/mathed/math_substackinset.C @@ -11,6 +11,7 @@ #include #include "math_substackinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_tabularinset.C b/src/mathed/math_tabularinset.C index 6d07dec5dd..114fee63c4 100644 --- a/src/mathed/math_tabularinset.C +++ b/src/mathed/math_tabularinset.C @@ -11,6 +11,7 @@ #include #include "math_tabularinset.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" diff --git a/src/mathed/math_textinset.C b/src/mathed/math_textinset.C index 37a5064f2f..39931d8f42 100644 --- a/src/mathed/math_textinset.C +++ b/src/mathed/math_textinset.C @@ -11,6 +11,7 @@ #include #include "math_textinset.h" +#include "math_data.h" #include "metricsinfo.h" #include "debug.h" diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C index bf73084e03..8162266a17 100644 --- a/src/mathed/math_undersetinset.C +++ b/src/mathed/math_undersetinset.C @@ -11,6 +11,7 @@ #include #include "math_undersetinset.h" +#include "math_data.h" #include "math_mathmlstream.h" diff --git a/src/mathed/math_xarrowinset.C b/src/mathed/math_xarrowinset.C index b6287282d0..c798a5316d 100644 --- a/src/mathed/math_xarrowinset.C +++ b/src/mathed/math_xarrowinset.C @@ -11,9 +11,10 @@ #include #include "math_xarrowinset.h" -#include "math_support.h" +#include "math_data.h" #include "math_mathmlstream.h" #include "math_streamstr.h" +#include "math_support.h" using std::auto_ptr; diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C index d29f00493b..5a89bbd488 100644 --- a/src/mathed/ref_inset.C +++ b/src/mathed/ref_inset.C @@ -11,6 +11,7 @@ #include #include "ref_inset.h" +#include "math_data.h" #include "math_factory.h" #include "BufferView.h" diff --git a/src/sgml.h b/src/sgml.h index fe38a6a0a3..a598a712c6 100644 --- a/src/sgml.h +++ b/src/sgml.h @@ -16,8 +16,8 @@ #include "support/types.h" #include "support/std_string.h" -#include #include +#include namespace sgml { diff --git a/src/toc.h b/src/toc.h index 86dc54020e..91aeaacc41 100644 --- a/src/toc.h +++ b/src/toc.h @@ -13,10 +13,10 @@ #ifndef TOC_H #define TOC_H -#include "support/std_ostream.h" #include "support/std_string.h" #include +#include #include class Buffer;