Do not include MetricsInfo.h in MathStream.h

Fixes the FIXME in MathStream.h
2024-11-09 18:31:04 +00:00 · 2016-06-04 09:41:13 +01:00 · 2016-06-04 09:41:13 +01:00 · 348e0241af
commit 348e0241af
parent 760bca8265
29 changed files with 85 additions and 33 deletions
--- a/src/mathed/InsetMathCancel.cpp
+++ b/src/mathed/InsetMathCancel.cpp
@ -12,9 +12,11 @@

 #include "InsetMathCancel.h"

-#include "LaTeXFeatures.h"
 #include "MathStream.h"

+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include "frontends/Painter.h"

 #include <ostream>
--- a/src/mathed/InsetMathCancelto.cpp
+++ b/src/mathed/InsetMathCancelto.cpp
@ -12,11 +12,13 @@

 #include "InsetMathCancelto.h"

-#include "Cursor.h"
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"

+#include "Cursor.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include "frontends/Painter.h"

 #include <ostream>
--- a/src/mathed/InsetMathDiagram.cpp
+++ b/src/mathed/InsetMathDiagram.cpp
@ -13,9 +13,11 @@

 #include "InsetMathDiagram.h"

-#include "LaTeXFeatures.h"
 #include "MathStream.h"

+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include <ostream>

 namespace lyx {
--- a/src/mathed/InsetMathEnsureMath.cpp
+++ b/src/mathed/InsetMathEnsureMath.cpp
@ -13,11 +13,13 @@

 #include "InsetMathEnsureMath.h"

-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"

+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include <ostream>


--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@ -38,6 +38,7 @@
 #include "MacroTable.h"
 #include "MathMacro.h"
 #include "MathMacroTemplate.h"
+#include "MetricsInfo.h"
 #include "output_xhtml.h"
 #include "Paragraph.h"
 #include "ParIterator.h"
--- a/src/mathed/InsetMathKern.cpp
+++ b/src/mathed/InsetMathKern.cpp
@ -11,10 +11,12 @@
 #include <config.h>

 #include "InsetMathKern.h"
-#include "MathStream.h"
+
 #include "MathStream.h"
 #include "MathSupport.h"
+
 #include "Dimension.h"
+#include "MetricsInfo.h"

 #include "support/docstring.h"

--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@ -50,6 +50,7 @@
 #include "FuncStatus.h"
 #include "LyX.h"
 #include "LyXRC.h"
+#include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "Text.h"

--- a/src/mathed/InsetMathNumber.cpp
+++ b/src/mathed/InsetMathNumber.cpp
@ -15,6 +15,8 @@
 #include "MathStream.h"
 #include "MathSupport.h"

+#include "MetricsInfo.h"
+
 using namespace std;


--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@ -11,11 +11,13 @@
 #include <config.h>

 #include "InsetMathOverset.h"
+
 #include "MathData.h"
 #include "MathStream.h"

 #include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"

 using namespace std;

--- a/src/mathed/InsetMathPar.cpp
+++ b/src/mathed/InsetMathPar.cpp
@ -15,6 +15,8 @@
 #include "MathData.h"
 #include "MathStream.h"

+#include "MetricsInfo.h"
+
 #include <ostream>

 namespace lyx {
--- a/src/mathed/InsetMathPhantom.cpp
+++ b/src/mathed/InsetMathPhantom.cpp
@ -14,6 +14,9 @@

 #include "LaTeXFeatures.h"
 #include "MathStream.h"
+
+#include "MetricsInfo.h"
+
 #include "frontends/Painter.h"

 #include <algorithm>
--- a/src/mathed/InsetMathRoot.cpp
+++ b/src/mathed/InsetMathRoot.cpp
@ -13,13 +13,16 @@

 #include "InsetMathRoot.h"

-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
+
 #include "Cursor.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"

 #include "frontends/Painter.h"

+
 using namespace std;

 namespace lyx {
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@ -10,22 +10,24 @@

 #include <config.h>

+#include "InsetMathScript.h"
+
+#include "InsetMathBrace.h"
+#include "InsetMathSymbol.h"
+#include "MathData.h"
+#include "MathStream.h"
+#include "MathSupport.h"
+
 #include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetMathBrace.h"
-#include "InsetMathScript.h"
-#include "InsetMathSymbol.h"
 #include "LaTeXFeatures.h"
-#include "MathData.h"
-#include "MathStream.h"
-#include "MathSupport.h"
+#include "MetricsInfo.h"

 #include "support/debug.h"
 #include "support/gettext.h"
-
 #include "support/lassert.h"


--- a/src/mathed/InsetMathSideset.cpp
+++ b/src/mathed/InsetMathSideset.cpp
@ -11,20 +11,22 @@

 #include <config.h>

+#include "InsetMathSideset.h"
+
+#include "InsetMathSymbol.h"
+#include "MathData.h"
+#include "MathStream.h"
+#include "MathSupport.h"
+
 #include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetMathSideset.h"
-#include "InsetMathSymbol.h"
 #include "LaTeXFeatures.h"
-#include "MathData.h"
-#include "MathStream.h"
-#include "MathSupport.h"
+#include "MetricsInfo.h"

 #include "support/debug.h"
-
 #include "support/lassert.h"


--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@ -21,6 +21,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"

 #include "insets/InsetSpace.h"

--- a/src/mathed/InsetMathSqrt.cpp
+++ b/src/mathed/InsetMathSqrt.cpp
@ -12,10 +12,13 @@

 #include "InsetMathSqrt.h"

-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
+
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 #include "TextPainter.h"
+
 #include "frontends/Painter.h"


--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.cpp
@ -12,11 +12,13 @@

 #include "InsetMathStackrel.h"

-#include "Cursor.h"
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"

+#include "Cursor.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 using namespace std;

 namespace lyx {
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@ -18,6 +18,7 @@
 #include "MathSupport.h"

 #include "Encoding.h"
+#include "MetricsInfo.h"

 #include "support/debug.h"
 #include "support/gettext.h"
--- a/src/mathed/InsetMathSubstack.cpp
+++ b/src/mathed/InsetMathSubstack.cpp
@ -12,14 +12,15 @@

 #include "InsetMathSubstack.h"

-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"

 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"

+#include "support/gettext.h"
 #include "support/lstrings.h"

 #include <ostream>
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@ -12,13 +12,15 @@

 #include "InsetMathSymbol.h"

-#include "Dimension.h"
-#include "LaTeXFeatures.h"
 #include "MathAtom.h"
 #include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"

+#include "Dimension.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/lyxlib.h"
--- a/src/mathed/InsetMathTabular.cpp
+++ b/src/mathed/InsetMathTabular.cpp
@ -16,6 +16,8 @@
 #include "MathStream.h"
 #include "MathStream.h"

+#include "MetricsInfo.h"
+
 #include "support/lstrings.h"

 #include <ostream>
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@ -11,11 +11,14 @@
 #include <config.h>

 #include "InsetMathUnderset.h"
+
 #include "MathData.h"
 #include "MathStream.h"

 #include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+

 using namespace std;

--- a/src/mathed/InsetMathUnknown.cpp
+++ b/src/mathed/InsetMathUnknown.cpp
@ -11,10 +11,12 @@
 #include <config.h>

 #include "InsetMathUnknown.h"
+
 #include "MathSupport.h"
 #include "MathAtom.h"
 #include "MathStream.h"
-#include "MathStream.h"
+
+#include "MetricsInfo.h"

 #include "frontends/Painter.h"

--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@ -13,12 +13,15 @@
 #include "support/lassert.h"

 #include "InsetMathXArrow.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"

 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+

 #include <algorithm>

--- a/src/mathed/InsetMathXYMatrix.cpp
+++ b/src/mathed/InsetMathXYMatrix.cpp
@ -12,9 +12,11 @@

 #include "InsetMathXYMatrix.h"

-#include "LaTeXFeatures.h"
 #include "MathStream.h"

+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include <ostream>

 namespace lyx {
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@ -30,6 +30,7 @@
 #include "LaTeXFeatures.h"
 #include "LyX.h"
 #include "LyXRC.h"
+#include "MetricsInfo.h"

 #include "frontends/Painter.h"

--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@ -13,8 +13,6 @@

 #include "MathMacroTemplate.h"

-#include "DocIterator.h"
-#include "LaTeXFeatures.h"
 #include "InsetMathBrace.h"
 #include "InsetMathChar.h"
 #include "InsetMathHull.h"
@ -31,9 +29,12 @@
 #include "Color.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
+#include "DocIterator.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
+#include "MetricsInfo.h"
 #include "TocBackend.h"

 #include "frontends/Painter.h"
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@ -15,8 +15,6 @@
 #include "support/strfwd.h"

 #include "InsetMath.h"
-// FIXME: Move to individual insets
-#include "MetricsInfo.h"
 #include "texstream.h"


--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@ -19,6 +19,8 @@
 #include "MathParser.h"
 #include "MathStream.h"

+#include "MetricsInfo.h"
+
 #include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"