From dcc50a24548b3ff46f9060897793ca346befa7e2 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 18 Jun 2008 18:54:31 +0000 Subject: [PATCH] Fix include orderings. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25309 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ExternalTransforms.cpp | 2 +- src/insets/Inset.cpp | 4 ++-- src/insets/InsetBibitem.cpp | 4 ++-- src/insets/InsetBibitem.h | 2 +- src/insets/InsetBox.cpp | 2 +- src/insets/InsetCaption.cpp | 2 +- src/insets/InsetCollapsable.cpp | 4 ++-- src/insets/InsetERT.cpp | 4 ++-- src/insets/InsetExternal.cpp | 2 +- src/insets/InsetFlex.cpp | 5 +++-- src/insets/InsetFloat.cpp | 2 +- src/insets/InsetFloatList.cpp | 2 +- src/insets/InsetFoot.cpp | 2 +- src/insets/InsetGraphics.cpp | 2 +- src/insets/InsetGraphicsParams.cpp | 2 +- src/insets/InsetHyperlink.cpp | 4 ++-- src/insets/InsetInclude.cpp | 6 +++--- src/insets/InsetInfo.cpp | 4 ++-- src/insets/InsetLabel.cpp | 2 +- src/insets/InsetLayout.cpp | 1 + src/insets/InsetLine.cpp | 2 +- src/insets/InsetListingsParams.cpp | 7 +++---- src/insets/InsetNewpage.cpp | 2 +- src/insets/InsetNomencl.cpp | 2 +- src/insets/InsetTOC.cpp | 3 ++- src/insets/InsetTabular.cpp | 2 +- src/insets/InsetVSpace.cpp | 4 ++-- src/insets/InsetWrap.cpp | 2 +- src/insets/RenderGraphic.cpp | 5 ++--- src/insets/RenderPreview.cpp | 4 ++-- src/insets/RenderPreview.h | 2 +- 31 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/insets/ExternalTransforms.cpp b/src/insets/ExternalTransforms.cpp index 76404738c1..270a7c83b0 100644 --- a/src/insets/ExternalTransforms.cpp +++ b/src/insets/ExternalTransforms.cpp @@ -12,10 +12,10 @@ #include "ExternalTransforms.h" +#include "support/convert.h" #include "support/debug.h" #include "support/lstrings.h" #include "support/lyxlib.h" // float_equal -#include "support/convert.h" #include "support/Translator.h" #include diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp index ce754bd1fc..1b614ff0fe 100644 --- a/src/insets/Inset.cpp +++ b/src/insets/Inset.cpp @@ -31,15 +31,15 @@ #include "Text.h" #include "TextClass.h" -#include "frontends/Painter.h" #include "frontends/Application.h" +#include "frontends/Painter.h" -#include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" #include "support/ExceptionMessage.h" #include "support/gettext.h" +#include "support/lassert.h" #include diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp index f796e3c6c1..69d213822b 100644 --- a/src/insets/InsetBibitem.cpp +++ b/src/insets/InsetBibitem.cpp @@ -30,10 +30,10 @@ #include "frontends/alert.h" -#include "support/lstrings.h" +#include "support/convert.h" #include "support/docstream.h" #include "support/gettext.h" -#include "support/convert.h" +#include "support/lstrings.h" using namespace std; using namespace lyx::support; diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h index 3a23bf925a..435dd71972 100644 --- a/src/insets/InsetBibitem.h +++ b/src/insets/InsetBibitem.h @@ -12,8 +12,8 @@ #ifndef INSET_BIBITEM_H #define INSET_BIBITEM_H -#include "InsetCommand.h" #include "BiblioInfo.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 25911bc985..2645974fb9 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -21,13 +21,13 @@ #include "DispatchResult.h" #include "FuncStatus.h" #include "FuncRequest.h" -#include "support/gettext.h" #include "LaTeXFeatures.h" #include "Lexer.h" #include "MetricsInfo.h" #include "TextClass.h" #include "support/debug.h" +#include "support/gettext.h" #include "support/Translator.h" #include "frontends/Application.h" diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp index f69b17b3bf..b0f4d02981 100644 --- a/src/insets/InsetCaption.cpp +++ b/src/insets/InsetCaption.cpp @@ -24,7 +24,6 @@ #include "FloatList.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "support/gettext.h" #include "InsetList.h" #include "MetricsInfo.h" #include "output_latex.h" @@ -37,6 +36,7 @@ #include "frontends/FontMetrics.h" #include "frontends/Painter.h" +#include "support/gettext.h" #include "support/lstrings.h" #include diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp index 30c79101ca..f9994d2d16 100644 --- a/src/insets/InsetCollapsable.cpp +++ b/src/insets/InsetCollapsable.cpp @@ -21,12 +21,12 @@ #include "Dimension.h" #include "DispatchResult.h" #include "FloatList.h" +#include "FuncRequest.h" #include "FuncStatus.h" #include "InsetLayout.h" #include "Language.h" #include "LaTeXFeatures.h" #include "Lexer.h" -#include "FuncRequest.h" #include "MetricsInfo.h" #include "ParagraphParameters.h" #include "TextClass.h" @@ -34,10 +34,10 @@ #include "frontends/FontMetrics.h" #include "frontends/Painter.h" -#include "support/lassert.h" #include "support/debug.h" #include "support/docstream.h" #include "support/gettext.h" +#include "support/lassert.h" using namespace std; diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp index 30a290510d..a25db23df2 100644 --- a/src/insets/InsetERT.cpp +++ b/src/insets/InsetERT.cpp @@ -22,12 +22,12 @@ #include "FuncStatus.h" #include "Language.h" #include "Layout.h" -#include "LyXAction.h" #include "Lexer.h" -#include "TextClass.h" +#include "LyXAction.h" #include "MetricsInfo.h" #include "ParagraphParameters.h" #include "Paragraph.h" +#include "TextClass.h" #include "frontends/alert.h" #include "frontends/Application.h" diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp index a2b820c490..0001b3775f 100644 --- a/src/insets/InsetExternal.cpp +++ b/src/insets/InsetExternal.cpp @@ -35,13 +35,13 @@ #include "graphics/PreviewLoader.h" +#include "support/convert.h" #include "support/debug.h" #include "support/ExceptionMessage.h" #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" #include "support/lyxlib.h" -#include "support/convert.h" #include "support/Translator.h" #include diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp index 717fb2b100..b768a4b344 100644 --- a/src/insets/InsetFlex.cpp +++ b/src/insets/InsetFlex.cpp @@ -16,14 +16,15 @@ #include "Buffer.h" #include "BufferParams.h" -#include "support/gettext.h" #include "LaTeXFeatures.h" #include "Lexer.h" -#include "Text.h" #include "MetricsInfo.h" #include "Paragraph.h" #include "paragraph_funcs.h" #include "sgml.h" +#include "Text.h" + +#include "support/gettext.h" #include diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp index 6b19e8cc83..a595b2e032 100644 --- a/src/insets/InsetFloat.cpp +++ b/src/insets/InsetFloat.cpp @@ -34,9 +34,9 @@ #include "support/convert.h" #include "support/debug.h" +#include "support/docstream.h" #include "support/gettext.h" #include "support/lstrings.h" -#include "support/docstream.h" #include "frontends/Application.h" diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp index dd8cf315fa..e0dedf0b80 100644 --- a/src/insets/InsetFloatList.cpp +++ b/src/insets/InsetFloatList.cpp @@ -21,8 +21,8 @@ #include "LaTeXFeatures.h" #include "Lexer.h" #include "MetricsInfo.h" -#include "TocBackend.h" #include "TextClass.h" +#include "TocBackend.h" #include "support/debug.h" #include "support/gettext.h" diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp index 708eb3d1f8..bace67f593 100644 --- a/src/insets/InsetFoot.cpp +++ b/src/insets/InsetFoot.cpp @@ -16,7 +16,6 @@ #include "Buffer.h" #include "BufferParams.h" #include "Counters.h" -#include "support/gettext.h" #include "Layout.h" // FIXME: the following is needed just to get the layout of the enclosing // paragraph. This seems a bit too much to me (JMarc) @@ -27,6 +26,7 @@ #include "support/debug.h" #include "support/docstream.h" +#include "support/gettext.h" #include "support/lstrings.h" using namespace std; diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index 39e96db285..2bd0cae111 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -59,6 +59,7 @@ TODO #include "Format.h" #include "FuncRequest.h" #include "FuncStatus.h" +#include "InsetIterator.h" #include "LaTeXFeatures.h" #include "Length.h" #include "Lexer.h" @@ -67,7 +68,6 @@ TODO #include "OutputParams.h" #include "sgml.h" #include "TocBackend.h" -#include "InsetIterator.h" #include "frontends/alert.h" #include "frontends/Application.h" diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp index ad796d7638..eac1b4355e 100644 --- a/src/insets/InsetGraphicsParams.cpp +++ b/src/insets/InsetGraphicsParams.cpp @@ -13,10 +13,10 @@ #include "InsetGraphicsParams.h" +#include "Buffer.h" #include "LyX.h" // for use_gui #include "Lexer.h" #include "LyXRC.h" -#include "Buffer.h" #include "graphics/GraphicsParams.h" #include "graphics/GraphicsTypes.h" diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp index 3079faa0c9..fed64bece2 100644 --- a/src/insets/InsetHyperlink.cpp +++ b/src/insets/InsetHyperlink.cpp @@ -16,11 +16,11 @@ #include "DispatchResult.h" #include "FuncRequest.h" #include "LaTeXFeatures.h" -#include "support/gettext.h" #include "OutputParams.h" -#include "support/lstrings.h" #include "support/docstream.h" +#include "support/gettext.h" +#include "support/lstrings.h" using namespace std; using namespace lyx::support; diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index c0f10af568..d976556a02 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -13,7 +13,6 @@ #include "InsetInclude.h" -#include "LayoutFile.h" #include "Buffer.h" #include "buffer_funcs.h" #include "BufferList.h" @@ -27,6 +26,7 @@ #include "FuncRequest.h" #include "FuncStatus.h" #include "LaTeXFeatures.h" +#include "LayoutFile.h" #include "LyX.h" #include "LyXFunc.h" #include "LyXRC.h" @@ -46,15 +46,15 @@ #include "insets/InsetListingsParams.h" #include "insets/RenderPreview.h" -#include "support/lassert.h" +#include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" #include "support/FileNameList.h" #include "support/filetools.h" #include "support/gettext.h" +#include "support/lassert.h" #include "support/lstrings.h" // contains #include "support/lyxalgo.h" -#include "support/convert.h" #include diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 5e6eba7251..32be68a172 100644 --- a/src/insets/InsetInfo.cpp +++ b/src/insets/InsetInfo.cpp @@ -11,7 +11,6 @@ #include "InsetInfo.h" -#include "LayoutFile.h" #include "Buffer.h" #include "BufferParams.h" #include "BufferView.h" @@ -21,6 +20,7 @@ #include "InsetSpecialChar.h" #include "KeyMap.h" #include "LaTeXFeatures.h" +#include "LayoutFile.h" #include "LyXAction.h" #include "LyXRC.h" #include "Lexer.h" @@ -32,11 +32,11 @@ #include "support/debug.h" #include "support/docstream.h" #include "support/docstring_list.h" +#include "support/ExceptionMessage.h" #include "support/FileName.h" #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" -#include "support/ExceptionMessage.h" #include diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp index 55ab479fa2..2b95d62fa9 100644 --- a/src/insets/InsetLabel.cpp +++ b/src/insets/InsetLabel.cpp @@ -28,9 +28,9 @@ #include "frontends/alert.h" #include "support/convert.h" -#include "support/lyxalgo.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/lyxalgo.h" using namespace std; using namespace lyx::support; diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index f50d1c8ce0..8e117224ae 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -17,6 +17,7 @@ #include "Color.h" #include "Font.h" #include "Lexer.h" + #include "support/lstrings.h" #include diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp index d90c285bc1..816e8cd06e 100644 --- a/src/insets/InsetLine.cpp +++ b/src/insets/InsetLine.cpp @@ -14,8 +14,8 @@ #include "Dimension.h" #include "Font.h" -#include "MetricsInfo.h" #include "LaTeXFeatures.h" +#include "MetricsInfo.h" #include "OutputParams.h" #include "Text.h" diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp index 4c0b804372..2c87a4095c 100644 --- a/src/insets/InsetListingsParams.cpp +++ b/src/insets/InsetListingsParams.cpp @@ -13,15 +13,14 @@ #include "InsetListingsParams.h" -#include "support/gettext.h" #include "Length.h" #include "Lexer.h" -#include "support/lstrings.h" -#include "support/textutils.h" #include "support/convert.h" - +#include "support/gettext.h" #include "support/lassert.h" +#include "support/lstrings.h" +#include "support/textutils.h" #include diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp index 9cb680c684..511fbfb6e7 100644 --- a/src/insets/InsetNewpage.cpp +++ b/src/insets/InsetNewpage.cpp @@ -15,10 +15,10 @@ #include "FuncRequest.h" #include "FuncStatus.h" -#include "Text.h" #include "Lexer.h" #include "MetricsInfo.h" #include "OutputParams.h" +#include "Text.h" #include "TextMetrics.h" #include "frontends/FontMetrics.h" diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp index 75e639083a..e063795760 100644 --- a/src/insets/InsetNomencl.cpp +++ b/src/insets/InsetNomencl.cpp @@ -16,13 +16,13 @@ #include "Buffer.h" #include "DispatchResult.h" #include "FuncRequest.h" -#include "support/gettext.h" #include "InsetIterator.h" #include "LaTeXFeatures.h" #include "MetricsInfo.h" #include "sgml.h" #include "support/docstream.h" +#include "support/gettext.h" using namespace std; diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp index 80abdf9163..eeb04d2369 100644 --- a/src/insets/InsetTOC.cpp +++ b/src/insets/InsetTOC.cpp @@ -15,11 +15,12 @@ #include "Buffer.h" #include "DispatchResult.h" #include "FuncRequest.h" -#include "support/gettext.h" #include "MetricsInfo.h" #include "OutputParams.h" #include "TocBackend.h" +#include "support/gettext.h" + #include using namespace std; diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index ac91fab19f..940526f592 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -50,12 +50,12 @@ #include "frontends/Painter.h" #include "frontends/Selection.h" -#include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" #include "support/FileName.h" #include "support/gettext.h" +#include "support/lassert.h" #include "support/lstrings.h" #include diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp index e109896ed2..0b782f00b8 100644 --- a/src/insets/InsetVSpace.cpp +++ b/src/insets/InsetVSpace.cpp @@ -21,13 +21,13 @@ #include "FuncRequest.h" #include "FuncStatus.h" #include "Lexer.h" -#include "Text.h" #include "MetricsInfo.h" #include "OutputParams.h" +#include "Text.h" -#include "support/lassert.h" #include "support/debug.h" #include "support/gettext.h" +#include "support/lassert.h" #include "frontends/Application.h" #include "frontends/FontMetrics.h" diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp index 04013f680e..f1b49923e3 100644 --- a/src/insets/InsetWrap.cpp +++ b/src/insets/InsetWrap.cpp @@ -31,8 +31,8 @@ #include "TocBackend.h" #include "support/convert.h" -#include "support/docstream.h" #include "support/debug.h" +#include "support/docstream.h" #include "support/gettext.h" #include "frontends/Application.h" diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp index df1a93a180..bca3a518f8 100644 --- a/src/insets/RenderGraphic.cpp +++ b/src/insets/RenderGraphic.cpp @@ -14,9 +14,6 @@ #include "insets/Inset.h" -#include "support/FileName.h" -#include "support/filetools.h" -#include "support/gettext.h" #include "LyX.h" #include "LyXRC.h" #include "MetricsInfo.h" @@ -26,7 +23,9 @@ #include "graphics/GraphicsImage.h" +#include "support/FileName.h" #include "support/filetools.h" +#include "support/gettext.h" #include diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp index 584a8486c9..5f5a1707f3 100644 --- a/src/insets/RenderPreview.cpp +++ b/src/insets/RenderPreview.cpp @@ -15,7 +15,6 @@ #include "BufferView.h" #include "Dimension.h" -#include "support/gettext.h" #include "LyX.h" #include "LyXRC.h" #include "MetricsInfo.h" @@ -27,8 +26,9 @@ #include "graphics/PreviewLoader.h" #include "graphics/Previews.h" -#include "support/lassert.h" #include "support/FileName.h" +#include "support/gettext.h" +#include "support/lassert.h" #include "support/lstrings.h" #include diff --git a/src/insets/RenderPreview.h b/src/insets/RenderPreview.h index 38a9aa80d4..bad2bff452 100644 --- a/src/insets/RenderPreview.h +++ b/src/insets/RenderPreview.h @@ -18,8 +18,8 @@ #include "RenderBase.h" -#include "support/FileMonitor.h" #include "support/docstring.h" +#include "support/FileMonitor.h" #include #include -- 2.39.2