Move include of own header to the top. Fix dependencies

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index cefee85ba9ae154b2390d103ed895f2c9166bf2a..7d67e0849c0a2dca4002df0dfba26709b8de82e6 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -15,14 +15,15 @@
 #include <config.h>
 
 #include "BiblioInfo.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Citation.h"
 #include "Encoding.h"
 #include "Language.h"
-#include "xml.h"
 #include "TextClass.h"
 #include "TocBackend.h"
+#include "xml.h"
 
 #include "support/convert.h"
 #include "support/debug.h"

diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp
index 397f7271f0af559fb7dc657365df6537228c2a35..02a9e70e1e4d455b1acd4df05e48fd3226ba2343 100644 (file)
--- a/src/FontInfo.cpp
+++ b/src/FontInfo.cpp
@@ -14,8 +14,9 @@
 
 #include <config.h>
 
-#include "ColorSet.h"
 #include "FontInfo.h"
+
+#include "ColorSet.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index b74b13254d7351618676944819a5a7ecff458c89..e9544705ab74fbc393b3e7d40f0ecd92a1d1a917 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -15,10 +15,11 @@
 
 #include <config.h>
 
+#include "LaTeX.h"
+
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"
-#include "LaTeX.h"
 #include "LyXRC.h"
 #include "LyX.h"
 #include "DepTable.h"

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 15e772ea712b24b0320799d88f2533ac24dbfed7..5aeb9a29801be0e5e12bd60d48de10fca494bf0a 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -10,9 +10,10 @@
 
 #include <config.h>
 
-#include "LyXRC.h"
 #include "MetricsInfo.h"
 
+#include "LyXRC.h"
+
 #include "insets/Inset.h"
 
 #include "mathed/MathSupport.h"

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index c8b9157f3c52dcb17389e98e10b861e4d39a78bd..e378f433e8ebc6d09b8d3c3012f9fd861d365dc4 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -11,8 +11,6 @@
 
 #include <config.h>
 
-#include <algorithm>
-
 #include "RowPainter.h"
 
 #include "Buffer.h"
@@ -39,6 +37,7 @@
 #include "support/gettext.h"
 #include "support/lassert.h"
 
+#include <algorithm>
 
 using namespace std;
 

diff --git a/src/TexRow.cpp b/src/TexRow.cpp
index 460a141600194adccca48685bab7af85cac7ef2d..968245bb68d738e6da1e5a378ebbd4c1a10b495e 100644 (file)
--- a/src/TexRow.cpp
+++ b/src/TexRow.cpp
@@ -13,11 +13,12 @@
 
 #include <config.h>
 
+#include "TexRow.h"
+
 #include "Buffer.h"
 #include "Cursor.h"
 #include "FuncRequest.h"
 #include "Paragraph.h"
-#include "TexRow.h"
 
 #include "mathed/InsetMath.h"
 

diff --git a/src/frontends/Clipboard.h b/src/frontends/Clipboard.h
index ce85ab6a0763f3a69858ec1846c4802e3bcfad47..21fd58227e449f377935d1164bc0354a7f604793 100644 (file)
--- a/src/frontends/Clipboard.h
+++ b/src/frontends/Clipboard.h
@@ -14,6 +14,7 @@
 #ifndef BASE_CLIPBOARD_H
 #define BASE_CLIPBOARD_H
 
+#include "support/FileName.h"
 #include "support/strfwd.h"
 
 namespace lyx {

diff --git a/src/frontends/qt/GuiClipboard.cpp b/src/frontends/qt/GuiClipboard.cpp
index 7922187644d2180ca8e6c1a793b00217bbfeae32..422315a03eb21a08ea800d807f1a77d47d38d85d 100644 (file)
--- a/src/frontends/qt/GuiClipboard.cpp
+++ b/src/frontends/qt/GuiClipboard.cpp
@@ -12,19 +12,18 @@
 
 #include <config.h>
 
-#include "FileDialog.h"
-
-#include "support/FileName.h"
 #include "GuiClipboard.h"
-#include "qt_helpers.h"
 
 #include "Buffer.h"
 #include "BufferView.h"
 #include "Cursor.h"
+#include "FileDialog.h"
+#include "qt_helpers.h"
 
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"

diff --git a/src/frontends/qt/GuiCompareHistory.cpp b/src/frontends/qt/GuiCompareHistory.cpp
index b4228a5f53cc97597f6064faca4ff3b0bdea9130..4586eabad932f9c94109d8f8e435377ad2401bed 100644 (file)
--- a/src/frontends/qt/GuiCompareHistory.cpp
+++ b/src/frontends/qt/GuiCompareHistory.cpp
@@ -9,8 +9,6 @@
  */
 
 #include <config.h>
-#include <support/debug.h>
-#include <limits>
 
 #include "GuiCompareHistory.h"
 
@@ -21,11 +19,14 @@
 #include "LyXVC.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/lstrings.h"
 
 #include <QDialogButtonBox>
 #include <QPushButton>
 
+#include <limits>
+
 using namespace std;
 using namespace lyx::support;
 

diff --git a/src/frontends/qt/GuiFontLoader.cpp b/src/frontends/qt/GuiFontLoader.cpp
index afbf03777a71be2c74aac72526721fc3f37f11f9..80d45f6afcc5d0571a613c6540a6beabce676ddc 100644 (file)
--- a/src/frontends/qt/GuiFontLoader.cpp
+++ b/src/frontends/qt/GuiFontLoader.cpp
@@ -11,8 +11,9 @@
 
 #include <config.h>
 
-#include "FontLoader.h"
+#include "GuiFontLoader.h"
 
+#include "FontLoader.h"
 #include "FontInfo.h"
 #include "GuiFontMetrics.h"
 #include "qt_helpers.h"
@@ -22,6 +23,7 @@
 #include "support/debug.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
 #include "support/Package.h"
@@ -30,8 +32,6 @@
 #include <QFontInfo>
 #include <QFontDatabase>
 
-#include "support/lassert.h"
-
 using namespace std;
 using namespace lyx::support;
 

diff --git a/src/frontends/qt/GuiKeySymbol.cpp b/src/frontends/qt/GuiKeySymbol.cpp
index 94d095c3f72443fe9f21145cf49c0689e87f8ba5..4e031ee89664f98b3894b901aca15b10f10ed4e5 100644 (file)
--- a/src/frontends/qt/GuiKeySymbol.cpp
+++ b/src/frontends/qt/GuiKeySymbol.cpp
@@ -10,6 +10,8 @@
 
 #include <config.h>
 
+#include "GuiKeySymbol.h"
+
 #include "KeySymbol.h"
 #include "GuiApplication.h"
 

diff --git a/src/frontends/qt/GuiKeySymbol.h b/src/frontends/qt/GuiKeySymbol.h
index e4a59b7f5e9736a12d532ac1d6d3d459d6509006..a3293d7c2f1be2515a787fdc742625cf752374e5 100644 (file)
--- a/src/frontends/qt/GuiKeySymbol.h
+++ b/src/frontends/qt/GuiKeySymbol.h
@@ -13,7 +13,8 @@
 #ifndef GUIKEYSYM_H
 #define GUIKEYSYM_H
 
-class QKeyEvent;
+#include "KeySymbol.h"
+#include <QKeyEvent>
 
 namespace lyx {
 

diff --git a/src/frontends/qt/GuiSearch.cpp b/src/frontends/qt/GuiSearch.cpp
index 3fffb6ea2b7a2b19aa04b699d8f6e16c6c350180..1d209a24d0c71ba54cb002210e5c940154d8d6a2 100644 (file)
--- a/src/frontends/qt/GuiSearch.cpp
+++ b/src/frontends/qt/GuiSearch.cpp
@@ -12,13 +12,14 @@
 
 #include <config.h>
 
+#include "GuiSearch.h"
+
 #include "lyxfind.h"
 #include "qt_helpers.h"
 #include "FuncRequest.h"
 #include "BufferView.h"
 #include "Buffer.h"
 #include "Cursor.h"
-#include "GuiSearch.h"
 #include "GuiView.h"
 
 #include "support/gettext.h"

diff --git a/src/frontends/qt/GuiViewSource.cpp b/src/frontends/qt/GuiViewSource.cpp
index 58560f519e8d5ef6f76c247b3426bbaadc921aa8..40752cde1461b8b0195f73f817df97ee54e352fd 100644 (file)
--- a/src/frontends/qt/GuiViewSource.cpp
+++ b/src/frontends/qt/GuiViewSource.cpp
@@ -12,8 +12,9 @@
 
 #include <config.h>
 
-#include "GuiApplication.h"
 #include "GuiViewSource.h"
+
+#include "GuiApplication.h"
 #include "LaTeXHighlighter.h"
 #include "qt_helpers.h"
 

diff --git a/src/frontends/qt/LengthCombo.cpp b/src/frontends/qt/LengthCombo.cpp
index 6eacfbfb36d715d5ae2a2586cde557d7232f3084..1ab6d7df249c46c07dbd240209fcef071c4d4234 100644 (file)
--- a/src/frontends/qt/LengthCombo.cpp
+++ b/src/frontends/qt/LengthCombo.cpp
@@ -12,10 +12,10 @@
 
 #include <config.h>
 
-#include "support/qstring_helpers.h"
-
 #include "LengthCombo.h"
 
+#include "support/qstring_helpers.h"
+
 #include "qt_helpers.h"
 
 #include <string>

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 69671c222bbe96f966f5a2968d38f015cd17880b..2ee1934e066312b5c4060193f78c30a5b4152c7b 100644 (file)
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -11,9 +11,6 @@
  */
 
 #include <config.h>
-#include <algorithm>
-#include <functional>
-
 
 #include "InsetCommandParams.h"
 
@@ -46,6 +43,9 @@
 
 #include "support/lassert.h"
 
+#include <algorithm>
+#include <functional>
+
 using namespace std;
 using namespace lyx::support;
 

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 92397dd7a41f8ad21a1d050b0ab0fac5f14417e6..92d3ad0457d80e79fe9cb28fe2f44fe611131772 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -12,9 +12,10 @@
 
 #include <config.h>
 
+#include "InsetFloat.h"
+
 #include "InsetBox.h"
 #include "InsetCaption.h"
-#include "InsetFloat.h"
 #include "InsetGraphics.h"
 #include "InsetLabel.h"
 

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index bfa478d2f17b82edf3f0bacbc693a76b798d1f54..88947941860f4ac98504a4edf8b26c971062174a 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -12,9 +12,6 @@
 #include <config.h>
 #include "InsetHyperlink.h"
 
-#include <QtGui/QDesktopServices>
-#include <QUrl>
-
 #include "Buffer.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
@@ -37,6 +34,9 @@
 
 #include "frontends/alert.h"
 
+#include <QtGui/QDesktopServices>
+#include <QUrl>
+
 using namespace std;
 using namespace lyx::support;
 

diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp
index 19d45d206902c70997d9baf02d960098f38418e7..c1a4c49312b0af5ac197615a85531dd7f5c5ed62 100644 (file)
--- a/src/mathed/MacroTable.cpp
+++ b/src/mathed/MacroTable.cpp
@@ -10,8 +10,9 @@
 
 #include <config.h>
 
-#include "InsetMathSqrt.h"
 #include "MacroTable.h"
+
+#include "InsetMathSqrt.h"
 #include "InsetMathMacroTemplate.h"
 #include "InsetMathMacroArgument.h"
 #include "MathParser.h"

diff --git a/src/mathed/MathAutoCorrect.cpp b/src/mathed/MathAutoCorrect.cpp
index 77e5fefbd4e7b541d3bce77d6795ae6ffd0b325e..5d5a7d098c4782057603ac8e373f64529052cbae 100644 (file)
--- a/src/mathed/MathAutoCorrect.cpp
+++ b/src/mathed/MathAutoCorrect.cpp
@@ -10,8 +10,9 @@
 
 #include <config.h>
 
-#include "Cursor.h"
 #include "MathAutoCorrect.h"
+
+#include "Cursor.h"
 #include "MathData.h"
 #include "InsetMath.h"
 #include "MathSupport.h"

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 0c06b877233eb7e89740124668e0f80c10def0cd..63cae8a58bb69ae9b42ba0bf604cb8a4fa3110e1 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -11,12 +11,13 @@
 
 #include <config.h>
 
+#include "output_docbook.h"
+
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "Font.h"
 #include "InsetList.h"
-#include "output_docbook.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"

diff --git a/src/support/Length.cpp b/src/support/Length.cpp
index d23ea9bf98b3ed52faafedcd2c5ff7a766dcc515..d3aa434892d771b49a55d603d7ec0c14bb7a411f 100644 (file)
--- a/src/support/Length.cpp
+++ b/src/support/Length.cpp
@@ -15,11 +15,12 @@
 
 #include <config.h>
 
+#include "support/Length.h"
+
 #include "LyXRC.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
-#include "support/Length.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 

diff --git a/src/support/Timeout.cpp b/src/support/Timeout.cpp
index 3c3502e412d73bfb35295352d120ce92954594f5..e42fabc9f110d660c1d8a4b5fc03ad91244312c5 100644 (file)
--- a/src/support/Timeout.cpp
+++ b/src/support/Timeout.cpp
@@ -10,8 +10,9 @@
 
 #include <config.h>
 
-#include "support/lassert.h"
 #include "support/Timeout.h"
+
+#include "support/lassert.h"
 #include "support/debug.h"
 
 #include <QObject>

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

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 178d1f1dd453192b85a6c9764ef7a05fa6ba2b58..6d6674dce915773081eac0e445a050d12b808699 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -21,11 +21,11 @@
 
 #include <config.h>
 
+#include "support/filetools.h"
+
 #include "LyX.h"
 #include "LyXRC.h"
 
-#include "support/filetools.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/environment.h"

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 536d2a64460d07854c2b1900e2776a027d3b8b39..1d40e56742a6f51a8e18c97056b839c8d2c1548d 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -15,10 +15,11 @@
 
 #include <config.h>
 
+#include "support/os_win32.h"
+
 #include "LyXRC.h"
 
 #include "support/os.h"
-#include "support/os_win32.h"
 
 #include "support/debug.h"
 #include "support/environment.h"