Fix include orderings.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25309 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/ExternalTransforms.cpp b/src/insets/ExternalTransforms.cpp
index 76404738c10081e60a8557278aa3fbbce4c10e66..270a7c83b0f9deb387387ec84d074b9c66bca1ef 100644 (file)
--- 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 <boost/regex.hpp>

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index ce754bd1fc53b92d45b78417b55a45b576f25e5b..1b614ff0fede4f223637d484f7d4b4c3acd54d10 100644 (file)
--- 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 <map>
 

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index f796e3c6c14284f69ef6b3a69385bc7f9440d640..69d213822ba2622003b4ce2026db611ad4648324 100644 (file)
--- 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 3a23bf925a79a541b7e84e978859c1ad6665122c..435dd7197282a4491a50f9d8e31548a2b5284464 100644 (file)
--- 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 25911bc985f4f0b0612c1a0b4b8a0cc56e818652..2645974fb98f8e6ba5b63d002a1a3f5b725a568e 100644 (file)
--- 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 f69b17b3bfa7ad1093c86e01ff72867310d1048a..b0f4d029817a9fde3df699ae6f7faa8d9c741f56 100644 (file)
--- 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 <sstream>

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 30c79101caad09607aa78a969808b811fa0764c8..f9994d2d16f1464630974b861a0cf0797eba5e69 100644 (file)
--- 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 30a290510d3fb9e2e3aaee31e7e2e5605ca044f5..a25db23df222ad7eb32a94791560ae5f9f3c4ac3 100644 (file)
--- 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 a2b820c49071ee48bf00651eb2cafba4b1c70034..0001b3775f4d8f7741a0565fa78e2a5faf2f5c48 100644 (file)
--- 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 <boost/bind.hpp>

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 717fb2b100097482ad52264fbc98a4168fcc7bae..b768a4b344ecd88a498745911465bc6fb3ee5c45 100644 (file)
--- 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 <ostream>
 

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 6b19e8cc835e7704b4c969d4402aa02545936a9b..a595b2e0321f5560530f58b5abef6d6fd352c9b4 100644 (file)
--- 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 dd8cf315fa5773489442c5ebe828f893fd8acd6f..e0dedf0b80856a95b7c4bb2760fcbbad7d903703 100644 (file)
--- 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 708eb3d1f86ef5d732f8e9dc0b89aecc04a3d83b..bace67f593a15583867e321df81a94615bd35ab4 100644 (file)
--- 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 39e96db285a2635a531130d6e242a3146e89f68e..2bd0cae1118a9aff97be69506576ac5a0dda2480 100644 (file)
--- 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 ad796d7638ff0f3794bb27ec6ba11f9bdd7d3200..eac1b4355e7369233780cc72e44b7ca41419bcd2 100644 (file)
--- 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 3079faa0c97d1be8c508eb56c670f89f3a75e154..fed64bece230293249522e56df627b5ce6498f30 100644 (file)
--- 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 c0f10af568b3508656ae8a40404674ace52596c5..d976556a02cd4af8ce05017554b770a1e82e187d 100644 (file)
--- 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 <boost/bind.hpp>
 

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 5e6eba7251814ff31b5b4ce7617caf3f9d76b601..32be68a172ca3a2e56b1f2c3fcbf98d348bb86b8 100644 (file)
--- 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 <sstream>
 

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 55ab479fa2efd38e829090ba2d722818a7c29fe8..2b95d62fa987a1bc86d130327711ebe21fd1d0ab 100644 (file)
--- 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 f50d1c8ce0ae8c1dbbd7901f03121152dc636b3d..8e117224ae1ab0771e5a905450499a7733ebe661 100644 (file)
--- 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 <vector>

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index d90c285bc185b67bb6edb12de03d2959d30f7b73..816e8cd06e3801cf894e8a707f414e73636d0fe7 100644 (file)
--- 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 4c0b804372e0b472f3f2a18472032b9392779625..2c87a4095c941e2a72eefca0544cab622b7f4dda 100644 (file)
--- 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 <sstream>
 

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index 9cb680c6849007c1ccfe3b036880b0fda889a5cf..511fbfb6e7fe958c2081e15298f4272e8b898582 100644 (file)
--- 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 75e639083adf856c998571120d6c91d1110b5071..e063795760c29b9bc1392cc4f60e46e4f2a270cd 100644 (file)
--- 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 80abdf91634d65f6e89f4c25020d342f2c1bad8e..eeb04d23694089288bf5ce0a0ac3e763b8328331 100644 (file)
--- 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 <ostream>
 
 using namespace std;

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index ac91fab19f855eb198fc031be0b8f107cc7cd38b..940526f59267898a70e37e04b0d93c4101c8d415 100644 (file)
--- 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 <boost/scoped_ptr.hpp>

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index e109896ed2edc165d0217cf8b26dcabb91a82e83..0b782f00b859c36eb154623c8905d9e3adbcc683 100644 (file)
--- 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 04013f680e9c188b1415dd8bf3e4171bdadff7c0..f1b49923e3742b58986f86fd3c43a9f34ec36c32 100644 (file)
--- 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 df1a93a1804f565301945bf8b5c60a94ef899a74..bca3a518f8dd2489f7ea2bce2810bf6f2499058f 100644 (file)
--- 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 <boost/bind.hpp>
 

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 584a8486c9d9f934ed736f5e231c65580c8c3b13..5f5a1707f36008e7bbd010d8a4fea7884cf4b2f8 100644 (file)
--- 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 <boost/bind.hpp>

diff --git a/src/insets/RenderPreview.h b/src/insets/RenderPreview.h
index 38a9aa80d4372b74abb6d0d339110c302050cbed..bad2bff452059bffbd39b504d8c824eb245c5507 100644 (file)
--- 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 <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>