[LyX/master] Move include of own header to the top. Fix dependencies

Yuriy Skalko yuriy.skalko at gmail.com
Sun Oct 25 16:30:38 UTC 2020


commit 10272e474790d25ae9b5f3d272423959422ddfbd
Author: Yuriy Skalko <yuriy.skalko at gmail.com>
Date:   Sun Oct 25 00:47:13 2020 +0300

    Move include of own header to the top. Fix dependencies
---
 src/BiblioInfo.cpp                     |    3 ++-
 src/FontInfo.cpp                       |    3 ++-
 src/LaTeX.cpp                          |    3 ++-
 src/MetricsInfo.cpp                    |    3 ++-
 src/RowPainter.cpp                     |    3 +--
 src/TexRow.cpp                         |    3 ++-
 src/frontends/Clipboard.h              |    1 +
 src/frontends/qt/GuiClipboard.cpp      |    7 +++----
 src/frontends/qt/GuiCompareHistory.cpp |    5 +++--
 src/frontends/qt/GuiFontLoader.cpp     |    6 +++---
 src/frontends/qt/GuiKeySymbol.cpp      |    2 ++
 src/frontends/qt/GuiKeySymbol.h        |    3 ++-
 src/frontends/qt/GuiSearch.cpp         |    3 ++-
 src/frontends/qt/GuiViewSource.cpp     |    3 ++-
 src/frontends/qt/LengthCombo.cpp       |    4 ++--
 src/insets/InsetCommandParams.cpp      |    6 +++---
 src/insets/InsetFloat.cpp              |    3 ++-
 src/insets/InsetHyperlink.cpp          |    6 +++---
 src/mathed/MacroTable.cpp              |    3 ++-
 src/mathed/MathAutoCorrect.cpp         |    3 ++-
 src/output_docbook.cpp                 |    3 ++-
 src/support/Length.cpp                 |    3 ++-
 src/support/Timeout.cpp                |    3 ++-
 src/support/debug.cpp                  |    3 ++-
 src/support/filetools.cpp              |    4 ++--
 src/support/os_win32.cpp               |    3 ++-
 26 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index cefee85..7d67e08 100644
--- 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 397f727..02a9e70 100644
--- 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 b74b132..e954470 100644
--- 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 15e772e..5aeb9a2 100644
--- 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 c8b9157..e378f43 100644
--- 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 460a141..968245b 100644
--- 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 ce85ab6..21fd582 100644
--- 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 7922187..422315a 100644
--- 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 b4228a5..4586eab 100644
--- 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 afbf037..80d45f6 100644
--- 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 94d095c..4e031ee 100644
--- 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 e4a59b7..a3293d7 100644
--- 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 3fffb6e..1d209a2 100644
--- 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 58560f5..40752cd 100644
--- 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 6eacfbf..1ab6d7d 100644
--- 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 69671c2..2ee1934 100644
--- 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 92397dd..92d3ad0 100644
--- 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 bfa478d..8894794 100644
--- 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 19d45d2..c1a4c49 100644
--- 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 77e5fef..5d5a7d0 100644
--- 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 0c06b87..63cae8a 100644
--- 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 d23ea9b..d3aa434 100644
--- 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 3c3502e..e42fabc 100644
--- 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 ada2577..6ec52a0 100644
--- 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 178d1f1..6d6674d 100644
--- 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 536d2a6..1d40e56 100644
--- 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"


More information about the lyx-cvs mailing list