commit 43b16548b473d93b26489d8c4bbd9bf1e903a35f
Author: Yuriy Skalko <[email protected]>
Date: Mon Nov 23 00:23:39 2020 +0200
Cleanup headers
---
src/LaTeXFeatures.cpp | 1 +
src/LaTeXFeatures.h | 4 +++-
src/LyX.cpp | 1 -
src/frontends/Clipboard.h | 3 ++-
src/frontends/qt/GuiBox.h | 1 -
src/frontends/qt/GuiChanges.cpp | 5 -----
src/frontends/qt/GuiChanges.h | 2 --
src/frontends/qt/GuiCharacter.cpp | 1 -
src/frontends/qt/GuiCounter.cpp | 2 ++
src/frontends/qt/GuiCounter.h | 3 ++-
src/insets/InsetCommand.cpp | 1 -
src/insets/InsetCommandParams.h | 5 ++---
src/insets/InsetERT.cpp | 6 ------
src/insets/InsetHyperlink.cpp | 3 +--
src/insets/InsetPreview.cpp | 1 +
src/insets/InsetPreview.h | 3 +--
src/insets/InsetText.cpp | 1 -
src/mathed/InsetMathXArrow.cpp | 4 ++--
src/mathed/MathData.cpp | 1 +
src/mathed/MathData.h | 3 +--
src/mathed/MathRow.h | 1 -
src/mathed/MathStream.cpp | 2 ++
src/mathed/MathStream.h | 1 -
src/output_docbook.cpp | 1 +
src/support/lyxmagic.h | 4 ++--
src/tests/check_layout.cpp | 1 +
src/tex2lyx/Parser.cpp | 3 ++-
src/tex2lyx/Preamble.cpp | 1 -
src/tex2lyx/tex2lyx.cpp | 1 +
src/xml.cpp | 1 +
30 files changed, 29 insertions(+), 38 deletions(-)
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 59769a0..fb8a818 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -28,6 +28,7 @@
#include "LaTeXPackages.h"
#include "Layout.h"
#include "LyXRC.h"
+#include "OutputParams.h"
#include "TextClass.h"
#include "TexRow.h"
#include "texstream.h"
diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 2cc90cd..4590bce 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -13,12 +13,12 @@
#ifndef LATEXFEATURES_H
#define LATEXFEATURES_H
-#include "OutputParams.h"
#include "support/strfwd.h"
#include <set>
#include <list>
#include <map>
+#include <vector>
namespace lyx {
@@ -27,6 +27,8 @@ class Buffer;
class BufferParams;
class InsetLayout;
class Language;
+class otexstream;
+class OutputParams;
struct TexString;
/** The packages and commands that a buffer needs. This class
diff --git a/src/LyX.cpp b/src/LyX.cpp
index c1369bc..44361ba 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -38,7 +38,6 @@
#include "Language.h"
#include "LaTeXFonts.h"
#include "LayoutFile.h"
-#include "LyX.h"
#include "LyXAction.h"
#include "LyXRC.h"
#include "ModuleList.h"
diff --git a/src/frontends/Clipboard.h b/src/frontends/Clipboard.h
index 21fd582..c06a17f 100644
--- a/src/frontends/Clipboard.h
+++ b/src/frontends/Clipboard.h
@@ -14,13 +14,14 @@
#ifndef BASE_CLIPBOARD_H
#define BASE_CLIPBOARD_H
-#include "support/FileName.h"
#include "support/strfwd.h"
namespace lyx {
class Cursor;
+namespace support { class FileName; }
+
namespace frontend {
/**
diff --git a/src/frontends/qt/GuiBox.h b/src/frontends/qt/GuiBox.h
index 67630bb..1df2074 100644
--- a/src/frontends/qt/GuiBox.h
+++ b/src/frontends/qt/GuiBox.h
@@ -15,7 +15,6 @@
#include "InsetParamsWidget.h"
#include "ui_BoxUi.h"
-#include "Font.h"
namespace lyx {
namespace frontend {
diff --git a/src/frontends/qt/GuiChanges.cpp b/src/frontends/qt/GuiChanges.cpp
index c1f331f..e6363cd 100644
--- a/src/frontends/qt/GuiChanges.cpp
+++ b/src/frontends/qt/GuiChanges.cpp
@@ -15,10 +15,6 @@
#include "qt_helpers.h"
-#include "support/gettext.h"
-#include "support/lstrings.h"
-#include "support/lyxtime.h"
-
#include "Author.h"
#include "Buffer.h"
#include "BufferParams.h"
@@ -27,7 +23,6 @@
#include "Cursor.h"
#include "FuncRequest.h"
#include "LyXRC.h"
-#include "Text.h"
#include <QDateTime>
#include <QTextBrowser>
diff --git a/src/frontends/qt/GuiChanges.h b/src/frontends/qt/GuiChanges.h
index fce6150..2563ff9 100644
--- a/src/frontends/qt/GuiChanges.h
+++ b/src/frontends/qt/GuiChanges.h
@@ -17,8 +17,6 @@
#include "ui_ChangesUi.h"
#include "support/debug.h"
-#include "support/docstring.h"
-
namespace lyx {
namespace frontend {
diff --git a/src/frontends/qt/GuiCharacter.cpp
b/src/frontends/qt/GuiCharacter.cpp
index cfa481c..b6b672c 100644
--- a/src/frontends/qt/GuiCharacter.cpp
+++ b/src/frontends/qt/GuiCharacter.cpp
@@ -30,7 +30,6 @@
#include "Paragraph.h"
#include "support/gettext.h"
-#include "support/lstrings.h"
#include <QAbstractItemModel>
#include <QPushButton>
diff --git a/src/frontends/qt/GuiCounter.cpp b/src/frontends/qt/GuiCounter.cpp
index d7685bc..1c79725 100644
--- a/src/frontends/qt/GuiCounter.cpp
+++ b/src/frontends/qt/GuiCounter.cpp
@@ -12,6 +12,7 @@
#include "GuiCounter.h"
+#include "GuiView.h"
#include "qt_helpers.h"
#include "Buffer.h"
@@ -22,6 +23,7 @@
#include "insets/InsetCommandParams.h"
#include "support/convert.h"
+#include "support/debug.h"
#include "support/gettext.h"
#include "support/lstrings.h"
diff --git a/src/frontends/qt/GuiCounter.h b/src/frontends/qt/GuiCounter.h
index d512a8b..3ca9533 100644
--- a/src/frontends/qt/GuiCounter.h
+++ b/src/frontends/qt/GuiCounter.h
@@ -14,13 +14,14 @@
#include "InsetParamsWidget.h"
#include "ui_CounterUi.h"
-#include "GuiView.h"
namespace lyx {
class InsetCommandParams;
namespace frontend {
+class GuiView;
+
class GuiCounter : public InsetParamsWidget, public Ui::CounterUi
{
Q_OBJECT
diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index c3fd15f..8d9d174 100644
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -44,7 +44,6 @@
#include "insets/InsetWrap.h"
#include "support/debug.h"
-#include "support/gettext.h"
#include "support/lstrings.h"
#include "frontends/Application.h"
diff --git a/src/insets/InsetCommandParams.h b/src/insets/InsetCommandParams.h
index 874a9a5..3e33054 100644
--- a/src/insets/InsetCommandParams.h
+++ b/src/insets/InsetCommandParams.h
@@ -16,8 +16,6 @@
#include "InsetCode.h"
-#include "OutputParams.h"
-
#include "support/docstring.h"
#include <string>
@@ -27,8 +25,9 @@
namespace lyx {
-class Lexer;
class Buffer;
+class Lexer;
+class OutputParams;
class ParamInfo {
public:
diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index e86724d..bdfb227 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -13,17 +13,11 @@
#include "InsetERT.h"
-#include "Buffer.h"
-#include "BufferParams.h"
-#include "BufferView.h"
#include "Cursor.h"
-#include "DispatchResult.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "Language.h"
-#include "Layout.h"
#include "Lexer.h"
-#include "LyXAction.h"
#include "OutputParams.h"
#include "xml.h"
#include "ParagraphParameters.h"
diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 8894794..66bfa6d 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -13,8 +13,6 @@
#include "InsetHyperlink.h"
#include "Buffer.h"
-#include "DispatchResult.h"
-#include "Encoding.h"
#include "Format.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
@@ -25,6 +23,7 @@
#include "xml.h"
#include "texstream.h"
+#include "support/debug.h"
#include "support/docstream.h"
#include "support/FileName.h"
#include "support/filetools.h"
diff --git a/src/insets/InsetPreview.cpp b/src/insets/InsetPreview.cpp
index 1a70b1e..ba4a69d 100644
--- a/src/insets/InsetPreview.cpp
+++ b/src/insets/InsetPreview.cpp
@@ -15,6 +15,7 @@
#include "BufferParams.h"
#include "BufferView.h"
#include "Cursor.h"
+#include "Dimension.h"
#include "Lexer.h"
#include "MetricsInfo.h"
#include "OutputParams.h"
diff --git a/src/insets/InsetPreview.h b/src/insets/InsetPreview.h
index 834d892..91c579a 100644
--- a/src/insets/InsetPreview.h
+++ b/src/insets/InsetPreview.h
@@ -14,13 +14,12 @@
#include "InsetText.h"
-#include "Dimension.h"
-
#include "support/unique_ptr.h"
namespace lyx {
+class Dimension;
class RenderPreview;
namespace graphics {
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index fe3d160..2c757a9 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -44,7 +44,6 @@
#include "Paragraph.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
-#include "Row.h"
#include "TexRow.h"
#include "texstream.h"
#include "TextClass.h"
diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index cdf3fbf..f4bd7e1 100644
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -10,8 +10,6 @@
#include <config.h>
-#include "support/lassert.h"
-
#include "InsetMathXArrow.h"
#include "MathData.h"
@@ -21,6 +19,8 @@
#include "LaTeXFeatures.h"
#include "MetricsInfo.h"
+#include "support/debug.h"
+#include "support/lassert.h"
#include <algorithm>
diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index 50fc100..610a3e2 100644
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -27,6 +27,7 @@
#include "BufferView.h"
#include "CoordCache.h"
#include "Cursor.h"
+#include "Dimension.h"
#include "mathed/InsetMathUnknown.h"
diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index 81d6cfc..c27b9f5 100644
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -15,8 +15,6 @@
#ifndef MATH_DATA_H
#define MATH_DATA_H
-#include "Dimension.h"
-
#include "MathAtom.h"
#include "MathRow.h"
@@ -33,6 +31,7 @@ namespace lyx {
class Buffer;
class BufferView;
class Cursor;
+class Dimension;
class DocIterator;
class LaTeXFeatures;
class ReplaceData;
diff --git a/src/mathed/MathRow.h b/src/mathed/MathRow.h
index d985569..6d929ca 100644
--- a/src/mathed/MathRow.h
+++ b/src/mathed/MathRow.h
@@ -25,7 +25,6 @@
namespace lyx {
class BufferView;
-class Dimension;
class MathData;
class MetricsInfo;
class PainterInfo;
diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index 588e219..9c2d5ce 100644
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -18,6 +18,8 @@
#include "TexRow.h"
+
+#include "support/debug.h"
#include "support/docstring.h"
#include "support/textutils.h"
diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 94e810d..a75a4cd 100644
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -19,7 +19,6 @@
#include "support/Changer.h"
#include "support/strfwd.h"
-#include "support/unique_ptr.h"
namespace lyx {
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 95d6aaa..63b4ff9 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -31,6 +31,7 @@
#include "mathed/InsetMath.h"
#include "insets/InsetNote.h"
+#include "support/debug.h"
#include "support/lassert.h"
#include "support/textutils.h"
diff --git a/src/support/lyxmagic.h b/src/support/lyxmagic.h
index 9a40d6f..d58aed8 100644
--- a/src/support/lyxmagic.h
+++ b/src/support/lyxmagic.h
@@ -12,12 +12,12 @@
#ifndef LYX_MAGIC_H
#define LYX_MAGIC_H
+#include "support/debug.h"
+
namespace lyx {
#ifdef HAVE_MAGIC_H
-#include "support/debug.h"
-
#include <magic.h>
class Magic {
diff --git a/src/tests/check_layout.cpp b/src/tests/check_layout.cpp
index 039d51b..afdb667 100644
--- a/src/tests/check_layout.cpp
+++ b/src/tests/check_layout.cpp
@@ -1,5 +1,6 @@
#include <config.h>
+#include "../support/debug.h"
#include "../support/FileName.h"
#include "../support/filetools.h"
#include "../Format.h"
diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 795628b..ee25db2 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -10,8 +10,9 @@
#include <config.h>
-#include "Encoding.h"
#include "Parser.h"
+
+#include "Encoding.h"
#include "support/lstrings.h"
#include "support/textutils.h"
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index f7303b6..d6deccb 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -18,7 +18,6 @@
#include "Encoding.h"
#include "LayoutFile.h"
-#include "Layout.h"
#include "Lexer.h"
#include "TextClass.h"
#include "version.h"
diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 8ecfa68..810567c 100644
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -26,6 +26,7 @@
#include "support/ConsoleApplication.h"
#include "support/convert.h"
+#include "support/debug.h"
#include "support/ExceptionMessage.h"
#include "support/filetools.h"
#include "support/lassert.h"
diff --git a/src/xml.cpp b/src/xml.cpp
index 4c4629f..e479ead 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -23,6 +23,7 @@
#include "TextClass.h"
#include "support/convert.h"
+#include "support/debug.h"
#include "support/docstream.h"
#include "support/lassert.h"
#include "support/lstrings.h"
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
