From 222b3580d21a8ce2d8c499db4de885e9b8a94d88 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Sun, 31 Oct 2010 01:04:03 +0000 Subject: [PATCH] More include frenzy. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35940 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/CutAndPaste.cpp | 1 + src/frontends/qt4/FloatPlacement.cpp | 1 + src/frontends/qt4/GuiInfo.cpp | 1 + src/insets/InsetBibitem.cpp | 1 + src/insets/InsetBibitem.h | 4 +++- src/insets/InsetBibtex.cpp | 1 + src/insets/InsetCaption.h | 1 - src/insets/InsetCollapsable.cpp | 1 + src/insets/InsetCollapsable.h | 4 ++-- src/insets/InsetCommand.cpp | 2 +- src/insets/InsetCommand.h | 2 +- src/insets/InsetExternal.h | 3 +-- src/insets/InsetFlex.cpp | 1 + src/insets/InsetFloatList.cpp | 1 + src/insets/InsetGraphics.h | 3 ++- src/insets/InsetIndex.cpp | 2 ++ src/insets/InsetInfo.h | 8 +++----- src/insets/InsetLine.cpp | 1 + src/insets/InsetListings.cpp | 2 ++ src/insets/InsetListings.h | 3 ++- src/insets/InsetNomencl.cpp | 1 + src/insets/InsetTOC.cpp | 1 + src/output_latex.cpp | 1 + 23 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 364e1e9d03..3d2bc2c324 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -35,6 +35,7 @@ #include "Paragraph.h" #include "ParagraphParameters.h" #include "ParIterator.h" +#include "TextClass.h" #include "insets/InsetBibitem.h" #include "insets/InsetBranch.h" diff --git a/src/frontends/qt4/FloatPlacement.cpp b/src/frontends/qt4/FloatPlacement.cpp index b3790e4227..be5cf0543a 100644 --- a/src/frontends/qt4/FloatPlacement.cpp +++ b/src/frontends/qt4/FloatPlacement.cpp @@ -17,6 +17,7 @@ #include "Buffer.h" #include "BufferParams.h" #include "FloatList.h" +#include "TextClass.h" #include "insets/InsetFloat.h" #include "support/lstrings.h" diff --git a/src/frontends/qt4/GuiInfo.cpp b/src/frontends/qt4/GuiInfo.cpp index 130317130d..dcc5ee9855 100644 --- a/src/frontends/qt4/GuiInfo.cpp +++ b/src/frontends/qt4/GuiInfo.cpp @@ -23,6 +23,7 @@ #include "insets/InsetInfo.h" #include "support/debug.h" +#include "support/gettext.h" #include "support/lstrings.h" diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp index 630f4add13..eb8e1c7c77 100644 --- a/src/insets/InsetBibitem.cpp +++ b/src/insets/InsetBibitem.cpp @@ -15,6 +15,7 @@ #include "BiblioInfo.h" #include "Buffer.h" +#include "Cursor.h" #include "buffer_funcs.h" #include "BufferParams.h" #include "BufferView.h" diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h index 661795284c..9231b3cb9b 100644 --- a/src/insets/InsetBibitem.h +++ b/src/insets/InsetBibitem.h @@ -12,12 +12,14 @@ #ifndef INSET_BIBITEM_H #define INSET_BIBITEM_H -#include "BiblioInfo.h" + #include "InsetCommand.h" namespace lyx { +class BiblioInfo; + ///////////////////////////////////////////////////////////////////////// // // InsetBibItem diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp index ae20d9f22d..e37da7170e 100644 --- a/src/insets/InsetBibtex.cpp +++ b/src/insets/InsetBibtex.cpp @@ -16,6 +16,7 @@ #include "BiblioInfo.h" #include "Buffer.h" #include "BufferParams.h" +#include "Cursor.h" #include "DispatchResult.h" #include "Encoding.h" #include "Format.h" diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h index be5a73aeba..708f0223be 100644 --- a/src/insets/InsetCaption.h +++ b/src/insets/InsetCaption.h @@ -13,7 +13,6 @@ #define INSETCAPTION_H #include "InsetText.h" -#include "support/strfwd.h" namespace lyx { diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp index b57b74b341..8f233f761b 100644 --- a/src/insets/InsetCollapsable.cpp +++ b/src/insets/InsetCollapsable.cpp @@ -26,6 +26,7 @@ #include "Lexer.h" #include "MetricsInfo.h" #include "OutputParams.h" +#include "TextClass.h" #include "frontends/FontMetrics.h" #include "frontends/Painter.h" diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h index e712fba0b3..fda6f84e3c 100644 --- a/src/insets/InsetCollapsable.h +++ b/src/insets/InsetCollapsable.h @@ -14,11 +14,11 @@ #ifndef INSETCOLLAPSABLE_H #define INSETCOLLAPSABLE_H -#include "Inset.h" #include "InsetText.h" #include "Box.h" -#include "TextClass.h" + +#include namespace lyx { diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp index 55c185e9ee..08a932d277 100644 --- a/src/insets/InsetCommand.cpp +++ b/src/insets/InsetCommand.cpp @@ -15,6 +15,7 @@ #include "Buffer.h" #include "BufferView.h" +#include "Cursor.h" #include "DispatchResult.h" #include "FuncRequest.h" #include "FuncStatus.h" @@ -28,7 +29,6 @@ #include "insets/InsetExternal.h" #include "insets/InsetFloat.h" #include "insets/InsetGraphics.h" -#include "insets/InsetInclude.h" #include "insets/InsetLine.h" #include "insets/InsetListings.h" #include "insets/InsetNote.h" diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h index 4c1335002a..653a4a0b10 100644 --- a/src/insets/InsetCommand.h +++ b/src/insets/InsetCommand.h @@ -16,11 +16,11 @@ #include "Inset.h" #include "InsetCommandParams.h" #include "RenderButton.h" -#include "Cursor.h" namespace lyx { +class Cursor; ///////////////////////////////////////////////////////////////////////// // diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h index 19baa141c4..58377daee7 100644 --- a/src/insets/InsetExternal.h +++ b/src/insets/InsetExternal.h @@ -13,11 +13,10 @@ #define INSET_EXTERNAL_H #include "Inset.h" + #include "ExternalTemplate.h" -#include "ExternalTransforms.h" #include "support/FileName.h" -#include "support/Translator.h" #include #include diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp index 9355d42b79..6d64c3f8ea 100644 --- a/src/insets/InsetFlex.cpp +++ b/src/insets/InsetFlex.cpp @@ -20,6 +20,7 @@ #include "FuncRequest.h" #include "FuncStatus.h" #include "Lexer.h" +#include "TextClass.h" #include "support/gettext.h" diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp index a0d29d0ffb..7de262f9a2 100644 --- a/src/insets/InsetFloatList.cpp +++ b/src/insets/InsetFloatList.cpp @@ -17,6 +17,7 @@ #include "DispatchResult.h" #include "Floating.h" #include "FloatList.h" +#include "Font.h" #include "Language.h" #include "LaTeXFeatures.h" #include "Lexer.h" diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h index d7bb31525e..1846c4a4e6 100644 --- a/src/insets/InsetGraphics.h +++ b/src/insets/InsetGraphics.h @@ -13,10 +13,11 @@ #ifndef INSET_GRAPHICS_H #define INSET_GRAPHICS_H -#include #include "Inset.h" #include "InsetGraphicsParams.h" +#include + namespace lyx { class RenderGraphic; diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp index 233495bea1..60636f789b 100644 --- a/src/insets/InsetIndex.cpp +++ b/src/insets/InsetIndex.cpp @@ -16,6 +16,7 @@ #include "BufferParams.h" #include "BufferView.h" #include "ColorSet.h" +#include "Cursor.h" #include "DispatchResult.h" #include "Encoding.h" #include "FuncRequest.h" @@ -26,6 +27,7 @@ #include "output_latex.h" #include "output_xhtml.h" #include "sgml.h" +#include "TextClass.h" #include "TocBackend.h" #include "support/debug.h" diff --git a/src/insets/InsetInfo.h b/src/insets/InsetInfo.h index 6bcd8ed4d0..25f40e241f 100644 --- a/src/insets/InsetInfo.h +++ b/src/insets/InsetInfo.h @@ -13,10 +13,10 @@ #define INSET_INFO_H #include "InsetCollapsable.h" -#include "Cursor.h" -#include "support/gettext.h" -#include "support/Translator.h" +namespace lyx { + +class Cursor; /* InsetInfo displays shortcuts, lyxrc, package and textclass availability and menu information in a non-editable boxed InsetText. @@ -76,8 +76,6 @@ the command buffer (view->Toolbar->Command Buffer). */ -namespace lyx { - class InsetInfo : public InsetCollapsable { public: enum info_type { diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp index 2c88c061fd..5c12d37e09 100644 --- a/src/insets/InsetLine.cpp +++ b/src/insets/InsetLine.cpp @@ -15,6 +15,7 @@ #include "InsetLine.h" #include "Buffer.h" +#include "Cursor.h" #include "Dimension.h" #include "DispatchResult.h" #include "FuncRequest.h" diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp index 2bb843d104..8276f4301b 100644 --- a/src/insets/InsetListings.cpp +++ b/src/insets/InsetListings.cpp @@ -24,9 +24,11 @@ #include "FuncStatus.h" #include "InsetCaption.h" #include "Language.h" +#include "LaTeXFeatures.h" #include "Lexer.h" #include "output_latex.h" #include "output_xhtml.h" +#include "OutputParams.h" #include "TextClass.h" #include "support/debug.h" diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h index 88d380a8b2..d307126fe7 100644 --- a/src/insets/InsetListings.h +++ b/src/insets/InsetListings.h @@ -12,12 +12,13 @@ #ifndef INSET_LISTINGS_H #define INSET_LISTINGS_H -#include "LaTeXFeatures.h" #include "InsetListingsParams.h" namespace lyx { +class LaTeXFeatures; + ///////////////////////////////////////////////////////////////////////// // // InsetListings diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp index ac990b1408..b70a2a73b7 100644 --- a/src/insets/InsetNomencl.cpp +++ b/src/insets/InsetNomencl.cpp @@ -16,6 +16,7 @@ #include "InsetNote.h" #include "Buffer.h" +#include "Cursor.h" #include "DispatchResult.h" #include "Font.h" #include "Encoding.h" diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp index 0531d1f0f4..2e4939776f 100644 --- a/src/insets/InsetTOC.cpp +++ b/src/insets/InsetTOC.cpp @@ -15,6 +15,7 @@ #include "Buffer.h" #include "BufferParams.h" #include "DispatchResult.h" +#include "Font.h" #include "Language.h" #include "LaTeXFeatures.h" #include "OutputParams.h" diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 69991ffa2f..391ccfaee1 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -15,6 +15,7 @@ #include "Buffer.h" #include "BufferParams.h" #include "Encoding.h" +#include "Font.h" #include "InsetList.h" #include "Language.h" #include "Layout.h"