header cleanup

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

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index e4ea4be0b6d8176b5cb9e80d9046d4c933bc826c..5027600da4aab003de9cfc0627ea2a479dcdfe5a 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -14,7 +14,6 @@
 
 #include "DocIterator.h"
 
-#include "support/debug.h"
 #include "InsetList.h"
 #include "Paragraph.h"
 #include "Text.h"
@@ -24,6 +23,8 @@
 
 #include "insets/InsetTabular.h"
 
+#include "support/debug.h"
+
 #include <boost/assert.hpp>
 
 #include <ostream>

diff --git a/src/InsetList.cpp b/src/InsetList.cpp
index b7e453ce9d86578c8424d00e515b76b4d93fd4de..6b8e1fae4cc75a4b7e6c2a03ee6324448e39c0ff 100644 (file)
--- a/src/InsetList.cpp
+++ b/src/InsetList.cpp
@@ -16,10 +16,11 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BranchList.h"
-#include "support/debug.h"
 
 #include "insets/InsetBranch.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {

diff --git a/src/Intl.cpp b/src/Intl.cpp
index 031c5348784333fa567c2e3e242b3f77a3cfe201..4e3fabf29b17943aec9b1882650ae02687129172 100644 (file)
--- a/src/Intl.cpp
+++ b/src/Intl.cpp
@@ -14,9 +14,9 @@
 #include <config.h>
 
 #include "Intl.h"
-#include "support/debug.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
 
 namespace lyx {
 

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 36d79a4cd5e6191d2d067311ee12d785dbe12f8f..b068b2c95faf75e1376a6239b7027c213f38ef47 100644 (file)
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -15,11 +15,11 @@
 
 #include "KeyMap.h"
 
-#include "support/debug.h"
 #include "KeySequence.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 7035106f94ac7008a4096007d7aebe5bebb82f2b..1910b1dc7a7c317f77f9549bad4d5109b86ad10c 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -17,14 +17,14 @@
 
 #include "BufferList.h"
 #include "LaTeX.h"
-#include "support/gettext.h"
 #include "LyXRC.h"
-#include "support/debug.h"
 #include "DepTable.h"
 
+#include "support/debug.h"
 #include "support/convert.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
 #include "support/os.h"

diff --git a/src/Language.cpp b/src/Language.cpp
index 6e4f6fe8c061c282264612555f92dabe8c4f39e5..3aee984cf9671af5535fff37ae074afc6913d484 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -14,11 +14,11 @@
 
 #include "Language.h"
 
-#include "support/debug.h"
 #include "Encoding.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 
 #include <ostream>

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 769f76d23ba53b007e0f7b2d3e89178261bb5ccd..c29f0bd1f8a0d0a0359e18410488b417a7e38952 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -16,9 +16,8 @@
 #include "TextClass.h"
 #include "Lexer.h"
 #include "Font.h"
-#include "support/debug.h"
-
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <ostream>

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index a9ae157a75da5a82342a56d82a25ed5847004064..6f5da00d2bbebcd1e6a7a3be8f330ff2cb60d427 100644 (file)
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -15,9 +15,8 @@
 
 #include "Lexer.h"
 
-#include "support/debug.h"
-
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gzstream.h"

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index e0bbec0b99b182db0909fe1a74b80fe1339fc6cc..e00f3be2f55db064170e733361860adb2f2ef03d 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -15,9 +15,9 @@
 
 #include "LyXAction.h"
 
-#include "support/debug.h"
 #include "FuncRequest.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <boost/assert.hpp>

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 5f2019eb1f12b9fb1443893a6fe08f00a9d8921c..5d3dc132b53620b328f1089b17f730b44c57b297 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -33,14 +33,12 @@
 #include "Converter.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "InsetIterator.h"
 #include "Intl.h"
 #include "KeyMap.h"
@@ -80,9 +78,11 @@
 #include "frontends/LyXView.h"
 #include "frontends/Selection.h"
 
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Path.h"
 #include "support/Package.h"

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 6705b08aed09eeed27cb8690433e0615065c0602..e92f926f3101cac6a416c407aa67b419ce1ab27c 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -21,11 +21,9 @@
 
 #include "LyXRC.h"
 
-#include "support/debug.h"
 #include "Color.h"
 #include "Converter.h"
 #include "Format.h"
-#include "support/gettext.h"
 #include "Session.h"
 #include "Lexer.h"
 #include "FontEnums.h"
@@ -34,8 +32,10 @@
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/userinfo.h"

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 62f41cc2042dcd8d6f9250fd58236b09de3d92ea..930680b33bd262373a3210c78f7b68a4a6e0df50 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -17,13 +17,13 @@
 
 #include "LyXVC.h"
 #include "VCBackend.h"
-#include "support/debug.h"
 #include "Buffer.h"
-#include "support/gettext.h"
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 using namespace std;

diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp
index c9e5a2572c4930db556ea08962034b0fa4d4f7b3..ceb071cf8f7443c063444c7b783b1685d5d501b9 100644 (file)
--- a/src/MenuBackend.cpp
+++ b/src/MenuBackend.cpp
@@ -23,11 +23,9 @@
 #include "BufferParams.h"
 #include "Converter.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Format.h"
-#include "support/gettext.h"
 #include "KeyMap.h"
 #include "Session.h"
 #include "LyXAction.h"
@@ -41,9 +39,11 @@
 
 #include "frontends/Application.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/convert.h"
 
 #include <boost/bind.hpp>
 

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 3b7e8134cb41ecc0297de6b697f6623b3dffeb16..0f492178122ae0884d288c52369fedcbcc4fa093 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -13,10 +13,10 @@
 
 #include "ModuleList.h"
 
-#include "support/debug.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index a4a4fcbe4b8abdba7b91eafa50457e4e8d6d4103..31439575b28067b1a6e402dc8150ef75f6d44c01 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -12,10 +12,11 @@
 
 #include "PDFOptions.h"
 
+#include "Lexer.h"
+
 #include "support/convert.h"
-#include "support/lstrings.h"
 #include "support/debug.h"
-#include "Lexer.h"
+#include "support/lstrings.h"
 
 #include <sstream>
 #include <string>

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 1a1f2e814a314f1970de4b5902f7141a7695c995..b0bdbebd1964532f45f3b2859720cc833bee08ff 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -42,7 +42,6 @@
 #include "VSpace.h"
 
 #include "frontends/alert.h"
-#include "frontends/FontMetrics.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetLabel.h"

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index a53605c794f411fcee6aacbfad27a6cdf4b6cf2a..09631228b919197dac0f8f5b66788cb08653dcc2 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -24,8 +24,6 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"
@@ -44,9 +42,11 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetOptArg.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/convert.h"
 
 #include <boost/bind.hpp>
 #include <boost/crc.hpp>

diff --git a/src/Row.cpp b/src/Row.cpp
index c1a2e6cd7b91d76e86ae8f4d8e26672a0fe23ac2..013f6445e8bf02d843ed7c31d1156e80c4eb727b 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -17,6 +17,7 @@
 #include <config.h>
 
 #include "Row.h"
+
 #include "support/debug.h"
 
 

diff --git a/src/Server.cpp b/src/Server.cpp
index 7843997ca5c31ba83a22fa4d1c6f99963b19b896..14c1e202dd7eb09fe275338e04e72272c2b308c1 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -40,12 +40,13 @@
 #include <config.h>
 
 #include "Server.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
+
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"
 

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index d84349e1f4cd829392bb656f5578c24b3b8f50a0..47e800a8eb49ca1b39557fa993484c95bb108a09 100644 (file)
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -16,13 +16,13 @@
 
 #include "ServerSocket.h"
 
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
 #include "support/socktools.h"

diff --git a/src/Session.cpp b/src/Session.cpp
index 35498bdbb479524627174c49833b0b23603d055b..9291ef1c2213bfcd974a4a992544446915bee8fe 100644 (file)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -12,9 +12,10 @@
 #include <config.h>
 
 #include "Session.h"
+
 #include "support/debug.h"
-#include "support/Package.h"
 #include "support/filetools.h"
+#include "support/Package.h"
 
 #include <fstream>
 #include <sstream>

diff --git a/src/TexRow.cpp b/src/TexRow.cpp
index af0268ade280d7be74d08f95c938bff84eaad625..6d88ba614140050f78702b4ecf0144e1e16c24b2 100644 (file)
--- a/src/TexRow.cpp
+++ b/src/TexRow.cpp
@@ -13,6 +13,7 @@
 #include <config.h>
 
 #include "TexRow.h"
+
 #include "support/debug.h"
 
 #include <algorithm>

diff --git a/src/Text.cpp b/src/Text.cpp
index 5a075e6f55c01a0173cf275ad68b2f97adcef59e..de1ae45843d484ba558e118a5bfae58cc6326b86 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -47,9 +47,6 @@
 #include "VSpace.h"
 #include "WordLangTuple.h"
 
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
-
 #include "insets/InsetText.h"
 #include "insets/InsetBibitem.h"
 #include "insets/InsetCaption.h"
@@ -81,8 +78,6 @@ namespace lyx {
 using cap::cutSelection;
 using cap::pasteParagraphList;
 
-using frontend::FontMetrics;
-
 namespace {
 
 void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 206205ff8b2dcf93318afb0672db61b6d6a89fb5..2d9122447516d376d0437a5c345da93650c5ea37 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -47,8 +47,6 @@
 #include "TextMetrics.h"
 #include "VSpace.h"
 
-#include "frontends/FontMetrics.h"
-
 #include "insets/InsetEnvironment.h"
 
 #include "mathed/InsetMathHull.h"

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 943a00816e1dd3557d6f79840601e5851633fc32..78e3fcf7d6fc4f1b07ee54fbf46c9f467d7ace24 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -18,8 +18,6 @@
 
 #include "Color.h"
 #include "Counters.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Layout.h"
@@ -28,10 +26,12 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
-#include "support/lstrings.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/os.h"
 
 #include <sstream>

diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index a696936f535380c5a9a77dbca4d8308801d76ddf..49bafdd38929ca8e12ae5ad2dfa023d8979f5f56 100644 (file)
--- a/src/TextClassList.cpp
+++ b/src/TextClassList.cpp
@@ -13,9 +13,9 @@
 
 #include "TextClassList.h"
 #include "TextClass.h"
-#include "support/debug.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 9d122678ff5d884cd6cb5ed5a616ad8f250bf6db..e28d8fc9785873de5b8d8733a2163d117b502870 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -27,7 +27,6 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
@@ -49,6 +48,8 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {

diff --git a/src/ToolbarBackend.cpp b/src/ToolbarBackend.cpp
index afb2a78069eaec18228972116bd7a36f379c5673..34f3d5bac1d28a7e9e22a39f6333ff509a07630d 100644 (file)
--- a/src/ToolbarBackend.cpp
+++ b/src/ToolbarBackend.cpp
@@ -14,12 +14,14 @@
 #include "ToolbarBackend.h"
 #include "FuncRequest.h"
 #include "Lexer.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "LyXAction.h"
 #include "support/lstrings.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
+
 #include <boost/bind.hpp>
+
 #include <algorithm>
 
 using namespace std;

diff --git a/src/Trans.cpp b/src/Trans.cpp
index ba01232ba751d5116ba169e2409f9823f4a81353..266d86765b02fe185767a3a8854e885237fd001d 100644 (file)
--- a/src/Trans.cpp
+++ b/src/Trans.cpp
@@ -17,16 +17,16 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "Text.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/convert.h"
-#include "support/docstream.h"
 
 using namespace std;
 using namespace lyx::support;

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 11224908ccc8b51deea6b12a78714dae8e72699b..8378859ea3fe21ba25e74d5f4627de3621a3f913 100644 (file)
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -20,7 +20,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "buffer_funcs.h"
-#include "support/debug.h"
 #include "DocIterator.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
@@ -31,6 +30,7 @@
 
 #include "insets/Inset.h"
 
+#include "support/debug.h"
 #include "support/limited_stack.h"
 
 #include <algorithm>

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 1726b921ef7fefa897e1c72f727d11fc89eb65cb..0d96692328b871293101e6492b27c3985a6a6d54 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -11,12 +11,12 @@
 #include <config.h>
 
 #include "VCBackend.h"
-#include "support/debug.h"
 #include "Buffer.h"
 
-#include "support/Path.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/Path.h"
 #include "support/Systemcall.h"
 
 #include <boost/regex.hpp>

diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index c048729970d449da4f22c457a580ee980bd485f9..006cf3a9fa3055dbb09bfe08eae5785811274386 100644 (file)
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -12,13 +12,13 @@
 
 #include "Action.h"
 
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "GuiView.h"
 #include "LyXFunc.h"
 #include "qt_helpers.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 namespace lyx {

diff --git a/src/frontends/qt4/ButtonController.cpp b/src/frontends/qt4/ButtonController.cpp
index 81f07e576a5b82a6e454886054b63f9b503bfc87..5a65ffeac16c0b303d804fe7ab55e6d90c07d3ba 100644 (file)
--- a/src/frontends/qt4/ButtonController.cpp
+++ b/src/frontends/qt4/ButtonController.cpp
@@ -11,9 +11,11 @@
 #include <config.h>
 
 #include "ButtonController.h"
-#include "support/debug.h"
+
 #include "qt_helpers.h"
 
+#include "support/debug.h"
+
 #include <QPushButton>
 #include <QLineEdit>
 #include <QLabel>

diff --git a/src/frontends/qt4/ButtonPolicy.cpp b/src/frontends/qt4/ButtonPolicy.cpp
index 9caab3617eb8798cc87f8f1a2ca723ad7d031a6e..e2a3431b677332c2d7615d18050fcb069d774bd4 100644 (file)
--- a/src/frontends/qt4/ButtonPolicy.cpp
+++ b/src/frontends/qt4/ButtonPolicy.cpp
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "ButtonPolicy.h"
+
 #include "support/debug.h"
 
 #include <iostream>

diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index b53f20f738524fdf452db0b8a7ae58c0918e4788..b262bca342246babe0d9bbe904941a150ed94c6f 100644 (file)
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -16,11 +16,11 @@
 #include "frontends/Application.h"
 
 #include "qt_helpers.h"
-#include "support/debug.h"
 #include "LyX.h" // for lyx::use_gui
 #include "ui_AskForTextUi.h"
 #include "support/gettext.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/lstrings.h"
 

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 705b9acec70637c38ead3a4fc019e3f5074535fc..5335fd0194f42b498302af80d28ddbee562ab3fb 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -23,17 +23,9 @@
 #include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 
-#include "support/ExceptionMessage.h"
-#include "support/FileName.h"
-#include "support/ForkedCalls.h"
-#include "support/lstrings.h"
-#include "support/os.h"
-#include "support/Package.h"
-
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferView.h"
-#include "support/debug.h"
 #include "Font.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
@@ -44,6 +36,14 @@
 #include "Session.h"
 #include "version.h"
 
+#include "support/debug.h"
+#include "support/ExceptionMessage.h"
+#include "support/FileName.h"
+#include "support/ForkedCalls.h"
+#include "support/lstrings.h"
+#include "support/os.h"
+#include "support/Package.h"
+
 #include <QApplication>
 #include <QClipboard>
 #include <QEventLoop>

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 797110572995da3938813783a1427d3224ec4108..052510b425c245360cd0c8347e4fcda6aec83231 100644 (file)
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -17,7 +17,6 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "ui_BibtexAddUi.h"
 #include "qt_helpers.h"
 #include "Validator.h"
@@ -25,10 +24,11 @@
 
 #include "ButtonPolicy.h"
 
+#include "support/debug.h"
+#include "support/FileFilterList.h"
 #include "support/filetools.h" // changeExtension
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/FileFilterList.h"
 
 #include <QPushButton>
 #include <QListWidget>

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 1135d54aa4f5e14f102836cb082cff725c76daf4..71406c94e3c8d780effc71cc82a47180624273f2 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -15,23 +15,23 @@
 
 #include "GuiCitation.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "qt_helpers.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 
-#include "support/lstrings.h"
-#include "support/docstring.h"
-
 #include "insets/InsetCommand.h"
 
-#include <vector>
-#include <string>
+#include "support/debug.h"
+#include "support/docstring.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <QCloseEvent>
 #include <QShowEvent>
 
+#include <vector>
+#include <string>
+
 #undef KeyPress
 
 #include <boost/regex.hpp>

diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp
index 4a05c6bba0d6df2de6de1e3c3d1e6fd326c8be5d..faf330dc9b5b6b3f5b6a38f85491fdb667b523d4 100644 (file)
--- a/src/frontends/qt4/GuiClipboard.cpp
+++ b/src/frontends/qt4/GuiClipboard.cpp
@@ -14,13 +14,14 @@
 
 #include "FileDialog.h"
 
+#include "GuiClipboard.h"
+#include "qt_helpers.h"
+
 #include "frontends/alert.h"
 
 #include "Buffer.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "GuiClipboard.h"
-#include "qt_helpers.h"
 
 #include "support/convert.h"
 #include "support/debug.h"

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 1fa4f93050da970c5dcdff29558630de8c397264..58859ab704b4ae1a0530927a29bc2b7e20eddf6a 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -42,7 +42,6 @@
 
 #include "insets/InsetListingsParams.h"
 
-//#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index 9fe844cc6cef7086582e29d9a82f2ad772e60f13..8adf8b26e6733ba238c2b8351252dbd1fc8dd608 100644 (file)
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -12,15 +12,15 @@
 
 #include "GuiErrorList.h"
 
+#include "qt_helpers.h"
+
 #include "Buffer.h"
 #include "BufferView.h"
-#include "support/debug.h"
-#include "support/gettext.h"
-#include "Text.h"
 #include "ParIterator.h"
+#include "Text.h"
 
-#include "qt_helpers.h"
-
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <QListWidget>

diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index 3d53007248432ebd47fd00c68a519c94d05b1d26..6ec0bc508d366cac2ce7b1a3c4f116151c6ad37c 100644 (file)
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -14,10 +14,10 @@
 #include "GuiFontLoader.h"
 #include "qt_helpers.h"
 
-#include "support/debug.h"
 #include "LyXRC.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index b48c2fd06f0c2231cc1d088a744e711538d37165..bc8ea18c355f9049828a5b8d3df3e2a5cc99976f 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -16,7 +16,6 @@
 
 #include "GuiGraphics.h"
 
-#include "support/debug.h"
 #include "LengthCombo.h"
 #include "Length.h"
 #include "LyXRC.h"
@@ -24,7 +23,6 @@
 #include "Validator.h"
 
 #include "FuncRequest.h"
-#include "support/gettext.h"
 
 #include "graphics/GraphicsCache.h"
 #include "graphics/GraphicsCacheItem.h"
@@ -33,8 +31,10 @@
 #include "insets/InsetGraphicsParams.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/FileFilterList.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"

diff --git a/src/frontends/qt4/GuiLabel.cpp b/src/frontends/qt4/GuiLabel.cpp
index d5c99a4e5a7b1af110b0f7f2e30ef4bb6f9da7c8..b90723e958f6fabda1a02a3613110c6025db84e4 100644 (file)
--- a/src/frontends/qt4/GuiLabel.cpp
+++ b/src/frontends/qt4/GuiLabel.cpp
@@ -12,9 +12,10 @@
 
 #include "GuiLabel.h"
 
-#include "support/debug.h"
 #include "qt_helpers.h"
 
+#include "support/debug.h"
+
 #include <QLabel>
 #include <QPushButton>
 #include <QLineEdit>

diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 52c03e9508ccb4c6f13f1ab859cbc772bfaffbac..7147fd0c567ba412c79318a5f35d3f0cafbe2918 100644 (file)
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -14,11 +14,13 @@
 #include "GuiListings.h"
 
 #include "qt_helpers.h"
+
 #include "FuncRequest.h"
+
 #include "insets/InsetListings.h"
 #include "insets/InsetListingsParams.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 

diff --git a/src/frontends/qt4/GuiMath.cpp b/src/frontends/qt4/GuiMath.cpp
index 63ad6cc505cbd6205a0a679bec22c6b60cf41af6..a183a69a015580aaa2d3464cfdd726765317c5cd 100644 (file)
--- a/src/frontends/qt4/GuiMath.cpp
+++ b/src/frontends/qt4/GuiMath.cpp
@@ -11,9 +11,11 @@
 #include <config.h>
 
 #include "GuiMath.h"
-#include "support/debug.h"
+
 #include "FuncRequest.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {

diff --git a/src/frontends/qt4/GuiNomencl.cpp b/src/frontends/qt4/GuiNomencl.cpp
index 2027f4647218f7574b0c9f2481969f3a7153f5c2..b34ba798cd142146d63ecbfb5cdeb25f98a23cc3 100644 (file)
--- a/src/frontends/qt4/GuiNomencl.cpp
+++ b/src/frontends/qt4/GuiNomencl.cpp
@@ -13,9 +13,10 @@
 
 #include "GuiNomencl.h"
 
-#include "support/debug.h"
 #include "qt_helpers.h"
 
+#include "support/debug.h"
+
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>

diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index 9b06147d2c9068df9acbad6fbd98d655f810ce71..3f7635415cc6ec4fb59a85313b054b691c45779f 100644 (file)
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -16,14 +16,13 @@
 #include "GuiApplication.h"
 #include "GuiFontMetrics.h"
 #include "GuiImage.h"
-
-#include "GuiApplication.h"
 #include "qt_helpers.h"
 
-#include "support/debug.h"
 #include "Language.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
+
 #include <QPixmapCache>
 #include <QTextLayout>
 

diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp
index abb11fd1a07f32d0822373417faa25f7fe4b8ad8..49465a7ef06ec5cd53bf8536cc5fa179425a6fcd 100644 (file)
--- a/src/frontends/qt4/GuiParagraph.cpp
+++ b/src/frontends/qt4/GuiParagraph.cpp
@@ -15,6 +15,8 @@
 
 #include "GuiParagraph.h"
 
+#include "qt_helpers.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -24,7 +26,6 @@
 #include "Lexer.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
-#include "qt_helpers.h"
 #include "Spacing.h"
 
 #include "support/debug.h"

diff --git a/src/frontends/qt4/GuiParagraph.h b/src/frontends/qt4/GuiParagraph.h
index bc0e96d42a0a4cb7af039bef4aade27f7bd3a673..ee9a06bf9976b29ae22822c3f26253d753384515 100644 (file)
--- a/src/frontends/qt4/GuiParagraph.h
+++ b/src/frontends/qt4/GuiParagraph.h
@@ -14,15 +14,14 @@
 #ifndef GUIPARAGRAPH_H
 #define GUIPARAGRAPH_H
 
-// Uncomment this if you prefer dock widget
-//#define USE_DOCK_WIDGET
-
-#include "Layout.h"
-#include "ui_ParagraphUi.h"
 #include "DialogView.h"
-#include "ParagraphParameters.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
+#include "ui_ParagraphUi.h"
+
+#include "Layout.h"
+#include "ParagraphParameters.h"
+
 #include "support/debug.h"
 
 #include <QDialog>

diff --git a/src/frontends/qt4/GuiPopupMenu.cpp b/src/frontends/qt4/GuiPopupMenu.cpp
index 5c4da6d6992ea7dad07ff819cb72337df1050210..b4ff3ae51775454d4a59cce282135cf5fa8331db 100644 (file)
--- a/src/frontends/qt4/GuiPopupMenu.cpp
+++ b/src/frontends/qt4/GuiPopupMenu.cpp
@@ -21,8 +21,8 @@
 #include "LyXFunc.h"
 #include "MenuBackend.h"
 
-#include "support/lstrings.h"
 #include "support/debug.h"
+#include "support/lstrings.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 290089b3f1bf080d999dfbfe5710e1b5510905e3..2de384edae616a636b7d6da6a600f75d1188e05b 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -20,9 +20,7 @@
 #include "BufferList.h"
 #include "Color.h"
 #include "ConverterCache.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "GuiFontExample.h"
 #include "GuiKeySymbol.h"
 #include "KeyMap.h"
@@ -32,12 +30,14 @@
 #include "paper.h"
 #include "Session.h"
 
+#include "support/debug.h"
+#include "support/FileFilterList.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
-#include "support/FileFilterList.h"
 
 #include "graphics/GraphicsTypes.h"
 

diff --git a/src/frontends/qt4/GuiSelection.cpp b/src/frontends/qt4/GuiSelection.cpp
index 21c58bf3234bd37d40f9f5eb022a0e874949858a..23878b32328f49b90117ff6f03b8de9753945cab 100644 (file)
--- a/src/frontends/qt4/GuiSelection.cpp
+++ b/src/frontends/qt4/GuiSelection.cpp
@@ -15,8 +15,8 @@
 #include "GuiSelection.h"
 
 #include "qt_helpers.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <QApplication>

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index b147f7419ba077f98652f2a14920e66cd884b06e..4e6143ad8d1e4be20a5037ba433867f500657373 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -20,15 +20,15 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
 
-#include "support/textutils.h"
+#include "support/debug.h"
 #include "support/docstring.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 #include <QListWidgetItem>
 

diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp
index 579f2dd13e2ac5d7400fdc6c41a0b2d896a94441..b718d4b28788e22f62470c74e047ec852668181e 100644 (file)
--- a/src/frontends/qt4/GuiTexinfo.cpp
+++ b/src/frontends/qt4/GuiTexinfo.cpp
@@ -14,8 +14,8 @@
 #include "GuiTexinfo.h"
 
 #include "FuncRequest.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index 862d6fbe18057a14975c99bd325e0f55ccbd5074..79c5f89f68cbd02fe204c0bfca764459876e80ba 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -25,13 +25,13 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "TextClass.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 
 #include <algorithm>
 

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index b384c2dd1586eb13623ccf86a4e3962d2c6432d0..c651c31517485db5578ce4b65b0b31357d18f906 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -14,31 +14,31 @@
 
 #include <config.h>
 
+#include "GuiView.h"
+#include "GuiCommandBuffer.h"
+#include "GuiToolbar.h"
+#include "LyXAction.h"
+#include "Action.h"
+#include "qt_helpers.h"
+#include "InsertTableWidget.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "IconPalette.h"
 #include "Layout.h"
 #include "LyXFunc.h"
+#include "LyXRC.h"
 #include "Paragraph.h"
 #include "TextClass.h"
 #include "ToolbarBackend.h"
 
-#include "GuiView.h"
-#include "GuiCommandBuffer.h"
-#include "GuiToolbar.h"
-#include "LyXAction.h"
-#include "Action.h"
-#include "qt_helpers.h"
-#include "InsertTableWidget.h"
-#include "LyXRC.h"
-
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h" // sorted
 

diff --git a/src/frontends/qt4/GuiToolbars.cpp b/src/frontends/qt4/GuiToolbars.cpp
index 25fc333b2893349c9913a123fc9ed59d16a7eb2a..9a891d6a3ee88e4bbff61f325f5ffca6640b5165 100644 (file)
--- a/src/frontends/qt4/GuiToolbars.cpp
+++ b/src/frontends/qt4/GuiToolbars.cpp
@@ -20,16 +20,17 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Layout.h"
 #include "LyX.h"
 #include "LyXFunc.h"
 #include "TextClass.h"
 #include "ToolbarBackend.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
+
 using namespace std;
 
 namespace lyx {

diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp
index 9072b81fb0f45b2f1165c9b9bcbefbd7d30f4e52..02f34068d7b1c3c6031f4a544abb7a1f0548f004 100644 (file)
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -17,14 +17,14 @@
 #include "FileDialog.h"
 #include "LengthCombo.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
+#include "frontends/alert.h"
+
 #include "Language.h"
 #include "Length.h"
 
-#include "frontends/alert.h"
-
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/os.h"

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index 2960ae6002d84484c244acb718edeb3b733d7bc6..a6ea5aa3cf9362360fb88d6c65e172d10c0f1d69 100644 (file)
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -17,9 +17,9 @@
 #include "GraphicsImage.h"
 
 #include "ConverterCache.h"
-#include "support/debug.h"
 #include "Format.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/FileMonitor.h"

diff --git a/src/graphics/GraphicsImage.cpp b/src/graphics/GraphicsImage.cpp
index 2be848f235c80b7771f5aa2ccc5aa4d1e73aa9bb..ee0274e09f663038356e09985b05e739554bc509 100644 (file)
--- a/src/graphics/GraphicsImage.cpp
+++ b/src/graphics/GraphicsImage.cpp
@@ -14,6 +14,7 @@
 
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
+
 #include "support/debug.h"
 
 

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index b25d2d1c013e17e7137252604a745c9c0a979b43..8a3d7bb5394c2a5e47a5e1350d35d47f918f1a05 100644 (file)
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -16,8 +16,8 @@
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
 #include "GraphicsCache.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/Timeout.h"
 
 #include <boost/bind.hpp>

diff --git a/src/insets/ExternalTemplate.cpp b/src/insets/ExternalTemplate.cpp
index 01600c07ba9e0fca9c67badaa216d670663553e8..f3884f91d6acf8d5237420bd91e4b10ad6074f73 100644 (file)
--- a/src/insets/ExternalTemplate.cpp
+++ b/src/insets/ExternalTemplate.cpp
@@ -13,9 +13,9 @@
 
 #include "ExternalTemplate.h"
 
-#include "support/debug.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/Package.h"

diff --git a/src/insets/ExternalTransforms.cpp b/src/insets/ExternalTransforms.cpp
index ca1c5c5443ca66c5bdfe0d334db36fa83c940f0b..76404738c10081e60a8557278aa3fbbce4c10e66 100644 (file)
--- a/src/insets/ExternalTransforms.cpp
+++ b/src/insets/ExternalTransforms.cpp
@@ -13,7 +13,6 @@
 #include "ExternalTransforms.h"
 
 #include "support/debug.h"
-
 #include "support/lstrings.h"
 #include "support/lyxlib.h" // float_equal
 #include "support/convert.h"

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 704cedeb0c21a3b308f9d78fd1a8781ca9ddd9d3..40632057697579d6e06e7c325f73846043fbc884 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -16,11 +16,9 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "DispatchResult.h"
-#include "support/debug.h"
 #include "EmbeddedFiles.h"
 #include "Encoding.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -28,9 +26,11 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/docstream.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Path.h"

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 2e04a4d93aaa403cfe31c2439f8e802086d5c612..db22b7a837d7f758386ce6badd59b846a7ce7a0c 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -19,7 +19,6 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
-#include "support/debug.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
 #include "support/gettext.h"
@@ -28,6 +27,7 @@
 #include "MetricsInfo.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
 #include "support/Translator.h"
 
 #include <sstream>

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index a9597ca872b8d8939d52a2e2355aaa257d9730be..88a3cb120284408d9c125d316eea9987adbb79f7 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -15,15 +15,15 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "support/gettext.h"
 #include "EmbeddedFiles.h"
 #include "FuncRequest.h"
 #include "LaTeXFeatures.h"
 
-#include "support/lstrings.h"
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/lstrings.h"
 
 #include <algorithm>
 

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 03de43e8c345b5caeaa58f89c1f3366929110d4c..8e35394b1a1af5d09824d66e22e69167b02047b1 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -18,12 +18,10 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FloatList.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -35,7 +33,9 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 
 using namespace std;
 

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 6fb39bd173e64126685f2332c605c4835cb6bad0..f93f83552eaabad7e06ebd48e047604209eb991e 100644 (file)
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -27,11 +27,11 @@
 #include "InsetRef.h"
 #include "InsetTOC.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Lexer.h"
 
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/docstream.h"
 

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 763a448ec418dbe4c15c9626450f452b12af598d..76402d0d9d2715c9af5b26afab8156f152484f68 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -17,11 +17,9 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "LyXAction.h"
@@ -33,6 +31,8 @@
 
 #include "frontends/alert.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <sstream>

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index ffdc218360727ebafc4cd2a757b66ab33b892021..3efc70a6bfd761303787475e9c65dddafe0d8fcc 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -19,12 +19,10 @@
 
 #include "Buffer.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Exporter.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -35,8 +33,10 @@
 
 #include "graphics/PreviewLoader.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"

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 08625e2884032dd906e766854febd511ee334ef7..e966bb5d6c7b9a0c1f2720cc7e163a1d19e2cdda 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -18,18 +18,18 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "OutputParams.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/docstream.h"
 #include "support/convert.h"

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index 642ef7e3ef79423c2d296edf35c9ca3facb5ca9b..87e6bd2d343b412b9b68cc0c24508248f972ea4a 100644 (file)
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -14,18 +14,18 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "TocBackend.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <ostream>

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 417190f139551c7065396ad5b990eb7c4aa46ac1..57b404614fa8c6d6f5c8a45363a61d68a3b27f4c 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -10,7 +10,6 @@
  */
 
 #include <config.h>
-#include "support/debug.h"
 
 #include "InsetFoot.h"
 
@@ -26,6 +25,7 @@
 #include "TextClass.h"
 #include "TocBackend.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <ostream>

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index f19dd90f1af3e11192f43080b7b2e4c568ece98e..421dcf1a6b3e31c7b26896275b73008415afb9ba 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -55,14 +55,12 @@ TODO
 #include "BufferView.h"
 #include "Converter.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "Exporter.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Length.h"
 #include "Lexer.h"
@@ -75,9 +73,11 @@ TODO
 #include "frontends/alert.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/ExceptionMessage.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 #include "support/os.h"

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index 78aa53a333eb16737220165d4850c3ff24d7f1f1..c7419b39eaeae8f77d04c0c342c8feadab7e013c 100644 (file)
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -13,7 +13,6 @@
 
 #include "InsetGraphicsParams.h"
 
-#include "support/debug.h"
 #include "LyX.h" // for use_gui
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -23,6 +22,7 @@
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index daf533378daa9fae3e70aac3d87c00c9b51b5396..2218ef660d50bd5435d59f41adbe33ad4f0c5f9d 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -17,7 +17,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "InsetSpecialChar.h"
 #include "KeyMap.h"
@@ -32,6 +31,7 @@
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/gettext.h"

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index f331092cec7e4c468d8091cbdf18a58fdaaa52fe..f2944c85a518eb67a65fc4adde4652b8a65e3724 100644 (file)
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -12,7 +12,6 @@
 
 #include "InsetLine.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "Font.h"
 #include "MetricsInfo.h"
@@ -20,9 +19,11 @@
 #include "OutputParams.h"
 #include "Text.h"
 
+#include "frontends/Painter.h"
+
+#include "support/debug.h"
 #include "support/docstream.h"
 
-#include "frontends/Painter.h"
 
 
 using namespace std;

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index 104fdfab4851cf8d36c3a0e0f80e3b5c9eadf75b..679118f6d544253ede9ce70554608b7b10fc698f 100644 (file)
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -12,7 +12,6 @@
 
 #include "InsetNewline.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -20,6 +19,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/docstream.h"
 

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index e26d2f21aa6e606c0dcb5f4cbb49eed1636f62cc..d539c9fa723fbe0ea3ae72656c9a33bd9ad92141 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -12,8 +12,6 @@
 
 #include "InsetNewpage.h"
 
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Text.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -22,8 +20,10 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 
 using namespace std;
 

diff --git a/src/insets/InsetOptArg.cpp b/src/insets/InsetOptArg.cpp
index d7e29176fe8cbec568b5cee1a6674db9ad9748ca..c5da19b62d72443340f3f3d6db95c09625573098 100644 (file)
--- a/src/insets/InsetOptArg.cpp
+++ b/src/insets/InsetOptArg.cpp
@@ -13,9 +13,8 @@
 #include "InsetOptArg.h"
 
 #include "support/debug.h"
-#include "support/gettext.h"
-
 #include "support/docstream.h"
+#include "support/gettext.h"
 
 using namespace std;
 

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 9e03914dd4b6a6311cdd7d9b866064645060228a..98ed950521898f1e8b1f5df9f1de8b755759574c 100644 (file)
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -15,7 +15,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "support/debug.h"
 #include "Dimension.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -27,6 +26,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/docstream.h"
 #include "support/lstrings.h"

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 761526a76dbf2d577652e2ac479189aae156d0aa..bdc7d51d5eb9e5f595531ef8cabe33d0f335a46d 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -15,7 +15,6 @@
 
 #include "InsetSpace.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
@@ -24,6 +23,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 
 using namespace std;

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 09d14be295bc6532288b5d73f3dbb6e3851f8d0b..bc62e4e7651575325a969a37c71cd57326c75853 100644 (file)
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -14,7 +14,6 @@
 
 #include "InsetSpecialChar.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -23,6 +22,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 
 using namespace std;

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index f89c8211902b1ea976cf87edd2e67193040a92b7..f69da2b74bf8f967929aea94691a48bce380343d 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -28,11 +28,9 @@
 #include "Counters.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -46,16 +44,19 @@
 #include "TextClass.h"
 #include "TextMetrics.h"
 
-#include "support/convert.h"
-#include "support/docstream.h"
-#include "support/FileName.h"
-#include "support/lstrings.h"
-
 #include "frontends/alert.h"
 #include "frontends/Clipboard.h"
 #include "frontends/Painter.h"
 #include "frontends/Selection.h"
 
+
+#include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/FileName.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
 #include <boost/scoped_ptr.hpp>
 
 #include <sstream>

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index aa81f6603d1b78dcf6e9e431fe60d7b888c1d947..04841ff780c763e1fd3a28aeb0dd02eb8e11c256 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -20,11 +20,9 @@
 #include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "InsetList.h"
 #include "Intl.h"
 #include "lyxfind.h"
@@ -49,6 +47,8 @@
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <boost/bind.hpp>

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 9155960c2f4f833f9c42b0712075e8ca3043ca38..fccc29695bf3b1fd98030873a3c7e73c676afc3b 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -18,13 +18,11 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "OutputParams.h"
@@ -33,6 +31,8 @@
 
 #include "support/convert.h"
 #include "support/docstream.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 
 using namespace std;
 

diff --git a/src/insets/MailInset.cpp b/src/insets/MailInset.cpp
index 5d61a3980c64e0f8193eada3cf0a8562452113e3..c59949a3ba2cd9ff5dc946eda0e90fb418665487 100644 (file)
--- a/src/insets/MailInset.cpp
+++ b/src/insets/MailInset.cpp
@@ -13,10 +13,11 @@
 #include "MailInset.h"
 
 #include "BufferView.h"
-#include "support/debug.h"
 
 #include "frontends/Application.h"
 
+#include "support/debug.h"
+
 #include <boost/assert.hpp>
 
 using namespace std;

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 043f02cde2caeb80ee699dbfe45cda7e87588567..bb53c35854739da4d9138dd7785bcdb38430b352 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -22,9 +22,7 @@
 #include "buffer_funcs.h"
 #include "BufferView.h"
 #include "Changes.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "Text.h"
 #include "Paragraph.h"
 #include "ParIterator.h"
@@ -32,7 +30,9 @@
 #include "frontends/alert.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 using namespace std;

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index a056f27bfee3f02072751a6c83d0cb5a54105f6d..838438127b870b1295b740675ce3888319c4ee6c 100644 (file)
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -14,10 +14,10 @@
 #include "InsetMath.h"
 #include "MathData.h"
 #include "MathStream.h"
-#include "support/gettext.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 8c8f1ef141e37cc278059fa0813fca3c86584ef5..46083a439eebb75bce0fbaadab1b79a290641add 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -17,14 +17,14 @@
 #include "MathStream.h"
 #include "MetricsInfo.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "TextPainter.h"
 
-#include "support/lstrings.h"
-
 #include "frontends/FontMetrics.h"
 
+#include "support/debug.h"
+#include "support/lstrings.h"
+
 
 namespace lyx {
 

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index 3878da7f8c09d668acdef684404b3c03bee77981..777fa75aca29b07b014cf601f5889e1a2db4c11a 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -20,6 +20,7 @@
 #include "MetricsInfo.h"
 
 #include "LaTeXFeatures.h"
+
 #include "support/debug.h"
 
 #include <ostream>

diff --git a/src/mathed/InsetMathDiff.cpp b/src/mathed/InsetMathDiff.cpp
index a3688225b59ed1a44ed009b9817630ae16258b88..29614bd1e62ee8d05a10aa1667163cb980c08647 100644 (file)
--- a/src/mathed/InsetMathDiff.cpp
+++ b/src/mathed/InsetMathDiff.cpp
@@ -13,6 +13,7 @@
 #include "InsetMathDiff.h"
 #include "MathData.h"
 #include "MathStream.h"
+
 #include "support/debug.h"
 
 

diff --git a/src/mathed/InsetMathExInt.cpp b/src/mathed/InsetMathExInt.cpp
index 23372ba16d92dfbcc3e6ff6ed132074d6a9f1a7c..b7d81791d2542ee09b4ad76f0fec02979a584575 100644 (file)
--- a/src/mathed/InsetMathExInt.cpp
+++ b/src/mathed/InsetMathExInt.cpp
@@ -15,8 +15,8 @@
 #include "MathStream.h"
 #include "MathStream.h"
 #include "InsetMathSymbol.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 
 

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index d1d6108fd06cdbb46cbdd1d00d20b025109f5e27..22fe1237c779be1ae053684578d9775725cb4155 100644 (file)
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -21,15 +21,15 @@
 #include "CutAndPaste.h"
 #include "FuncStatus.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Painter.h"
 
-#include "support/lstrings.h"
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <sstream>
 

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index fd098f199691961baec33ec28010cb46a2593147..eb5a1a37e6f5b0814c5911f532adbe189f6fefb2 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -32,10 +32,8 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LyXRC.h"
 #include "OutputParams.h"
 #include "ParIterator.h"
@@ -52,6 +50,8 @@
 
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <sstream>

diff --git a/src/mathed/InsetMathLim.cpp b/src/mathed/InsetMathLim.cpp
index 3bc981056618dda9f57ec865a9d951707fe9a91a..53de8889505a5585316ea43c81de82e543452c9b 100644 (file)
--- a/src/mathed/InsetMathLim.cpp
+++ b/src/mathed/InsetMathLim.cpp
@@ -13,6 +13,7 @@
 #include "InsetMathLim.h"
 #include "MathData.h"
 #include "MathStream.h"
+
 #include "support/debug.h"
 
 

diff --git a/src/mathed/InsetMathMBox.cpp b/src/mathed/InsetMathMBox.cpp
index c3c41b194dc14fd8902e71760c57c393515f55e4..0d05d10c36ea3c5fba01c66dc810e3397feb5c3b 100644 (file)
--- a/src/mathed/InsetMathMBox.cpp
+++ b/src/mathed/InsetMathMBox.cpp
@@ -18,7 +18,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
 #include "OutputParams.h"
@@ -26,6 +25,8 @@
 #include "TexRow.h"
 #include "TextMetrics.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index d63f03f34138d23976bff9b5bd0cfa49e8c2ae9c..07a33ac04f4ac8bb6c0d0c29903e8639404d2a23 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -38,25 +38,23 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
-#include "support/gettext.h"
-#include "Text.h"
 #include "OutputParams.h"
-
-#include "support/lstrings.h"
-#include "support/textutils.h"
-#include "support/docstream.h"
+#include "Text.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Painter.h"
 #include "frontends/Selection.h"
 
-#include "FuncRequest.h"
+#include "support/debug.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
+#include "support/docstream.h"
 
 #include <sstream>
 

diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp
index f17acde308ce9a8003ef40c2ca0cb17660d9e2a0..a9c115fcf527dc7a8f02ea8d8d6adfa0347c98ab 100644 (file)
--- a/src/mathed/InsetMathRef.cpp
+++ b/src/mathed/InsetMathRef.cpp
@@ -16,10 +16,8 @@
 #include "LaTeXFeatures.h"
 #include "Buffer.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "MathData.h"
 #include "MathFactory.h"
 #include "MathSupport.h"
@@ -28,6 +26,9 @@
 
 #include "insets/InsetCommand.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
+
 #include <ostream>
 
 using namespace std;

diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp
index 406e901c49d0f3503f9606e379540b81c866e9e4..188d3c0d89070ef362e3f1e72b9b86c14792e804 100644 (file)
--- a/src/mathed/MacroTable.cpp
+++ b/src/mathed/MacroTable.cpp
@@ -19,11 +19,11 @@
 #include "InsetMathNest.h"
 
 #include "Buffer.h"
+#include "DocIterator.h"
 #include "InsetList.h"
 #include "Text.h"
 
 #include "support/debug.h"
-#include "DocIterator.h"
 
 #include <boost/assert.hpp>
 

diff --git a/src/mathed/MathAutoCorrect.cpp b/src/mathed/MathAutoCorrect.cpp
index d10929eaee7a4d16708640001ac75b7a0bc3be37..5b82670ee3c3f04ef3958ce6b59938c0d909a86e 100644 (file)
--- a/src/mathed/MathAutoCorrect.cpp
+++ b/src/mathed/MathAutoCorrect.cpp
@@ -15,8 +15,8 @@
 #include "InsetMath.h"
 #include "MathSupport.h"
 #include "MathParser.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h" //  LibFileSearch
 #include "support/docstream.h"

diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index ec5c443f317dec79efd7f2cc0e9f3b84457f32c1..09376663c62167226fe33e56eebfe8ab5dff8a11 100644 (file)
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -27,8 +27,8 @@
 #include "BufferView.h"
 #include "CoordCache.h"
 #include "Cursor.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 
 #include "frontends/FontMetrics.h"

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 0895dcadeeae323f40f8fffb75c607fbbe7b352d..0515179da042532c819126b75c3a6d0c480d550b 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -16,7 +16,6 @@
 
 #include "MathExtern.h"
 
-#include "support/debug.h"
 #include "InsetMathArray.h"
 #include "InsetMathChar.h"
 #include "InsetMathDelim.h"
@@ -35,6 +34,7 @@
 #include "MathParser.h"
 #include "MathStream.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 6ca7a4d9f6f39684b237289cb09842cb8e416e76..0bef08274c8479a91524e3c5007ddad5321ce528 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -47,10 +47,9 @@
 #include "MathParser.h"
 #include "MathSupport.h"
 
-#include "support/debug.h"
-
 #include "insets/InsetCommand.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h" // LibFileSearch

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 25902867ec9d7bbc78e426dc2d40d7062f8c736c..6dbcf1a8c57351a744ce6a63270e172f218550d0 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -21,7 +21,6 @@
 #include "BufferView.h"
 #include "CoordCache.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "LaTeXFeatures.h"
 #include "LyXRC.h"
 #include "FuncStatus.h"
@@ -30,6 +29,8 @@
 
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+
 #include <ostream>
 #include <vector>
 

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 26d802aa96e884275dada96371d4c1f449a7da18..ff0bc99c6dfcfc90f60a50256d6b2b11a7c65101 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -28,22 +28,20 @@
 #include "BufferView.h"
 #include "Color.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Lexer.h"
 #include "Undo.h"
 
 #include "frontends/Painter.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/docstream.h"
 #include "support/lstrings.h"
 
-#include "support/debug.h"
-
 #include <sstream>
 
 using namespace std;

diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index c5927cc03fc5d08b0094135f707a4f0cd2a8e1fb..31a34ddf6d70100585622bb34c0a26b21a41a4a8 100644 (file)
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -63,8 +63,8 @@ following hack as starting point to write some macros:
 #include "MathSupport.h"
 
 #include "Lexer.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/convert.h"
 #include "support/docstream.h"
 

diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index b930d1f5660c041b608bd776bd8932caaff92825..d1831d4432203050ff4b22c04c0e2456b5d18c13 100644 (file)
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -18,14 +18,13 @@
 #include "MathParser.h"
 #include "MathStream.h"
 
-#include "support/debug.h"
-
-#include "support/docstream.h"
-
 #include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+#include "support/docstream.h"
+
 #include <map>
 #include <sstream>
 

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index d5e781a388ba948405cafcc7e1e826e6e0e17c0a..dda121059deab033add6b22885d1f94a3b5362c9 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -17,7 +17,6 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "Counters.h"
-#include "support/debug.h"
 #include "Layout.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
@@ -27,8 +26,9 @@
 #include "sgml.h"
 #include "TextClass.h"
 
-#include "support/lstrings.h"
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/lstrings.h"
 #include "support/types.h"
 
 #include <boost/next_prior.hpp>

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index c6c9dcd0ea527e0e94d14bde544064bd730abd97..4865845b455ff465dc363271949719ad74d625c9 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -14,7 +14,6 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "Encoding.h"
 #include "InsetList.h"
 #include "Language.h"
@@ -31,6 +30,7 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetOptArg.h"
 
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <boost/next_prior.hpp>

diff --git a/src/output_plaintext.cpp b/src/output_plaintext.cpp
index 452b4c10d834f4fc792cec6bfaa87bb53df0de27..ca67db49284b9d697a5f71e4fb3c206fd3b0e991 100644 (file)
--- a/src/output_plaintext.cpp
+++ b/src/output_plaintext.cpp
@@ -14,8 +14,6 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Layout.h"
 #include "output.h"
 #include "OutputParams.h"
@@ -23,6 +21,8 @@
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 using namespace std;

diff --git a/src/paragraph_funcs.cpp b/src/paragraph_funcs.cpp
index 6313d5e2cc016af8b1800fd3f9c35f20ecd47b57..278478f483a0d06c9bdb19cd643fe86b86eb2c09 100644 (file)
--- a/src/paragraph_funcs.cpp
+++ b/src/paragraph_funcs.cpp
@@ -14,7 +14,6 @@
 
 #include "BufferParams.h"
 #include "Changes.h"
-#include "support/debug.h"
 #include "InsetList.h"
 #include "Layout.h"
 #include "Paragraph.h"
@@ -22,6 +21,8 @@
 #include "Text.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
+
 #include <boost/next_prior.hpp>
 
 using namespace std;

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index df83d9a40c8e1feda2a527b21843dbf3b7321b46..9f20f65b7d3b278dfb2f80adcbcc12198b979ff8 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -17,7 +17,6 @@
 #include "Buffer.h"
 #include "CoordCache.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
@@ -40,6 +39,7 @@
 
 #include "insets/InsetText.h"
 
+#include "support/debug.h"
 #include "support/textutils.h"
 
 #include <boost/crc.hpp>

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index 444dab9b11638137c45cc2649980fea038e445fc..df421ccaa7d75a0a39cf92c586b53d52e74f7234 100644 (file)
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -11,9 +11,8 @@
 
 #include <config.h>
 
-#include "support/debug.h"
-
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/FileName.h"