Merge branch 'master' of git.lyx.org:lyx

src/Makefile.am

@@ -498,7 +498,6 @@ HEADERFILESMATHED = \
 	mathed/MathCompletionList.h \
 	mathed/MathExtern.h \
 	mathed/MathFactory.h \
-	mathed/MathGridInfo.h \
 	mathed/MathMacro.h \
 	mathed/MathMacroArgument.h \
 	mathed/MacroTable.h \

src/insets/InsetCaption.cpp

@@ -31,6 +31,7 @@
 #include "output_xhtml.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
+#include "ParIterator.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
 #include "TocBackend.h"

src/mathed/InsetMathDiagram.h

@@ -13,7 +13,6 @@
 #ifndef MATH_DIAGRAM_H
 #define MATH_DIAGRAM_H
 
-#include "Length.h"
 #include "InsetMathGrid.h"
 
 

src/mathed/InsetMathHull.h

@@ -14,7 +14,6 @@
 
 #include "InsetMathGrid.h"
 
-#include "Color.h"
 #include "DocIterator.h"
 #include "OutputEnums.h"
 

src/mathed/InsetMathNest.h

@@ -14,9 +14,6 @@
 
 #include "InsetMath.h"
 
-// FIXME: remove
-#include "support/docstring.h"
-
 #include <map>
 
 namespace lyx {

src/mathed/MacroTable.h

@@ -16,7 +16,6 @@
 #include "DocIterator.h"
 
 #include "support/docstring.h"
-#include "support/types.h"
 
 #include <map>
 #include <set>

src/mathed/MathGridInfo.h

@@ -1,69 +0,0 @@
-// -*- C++ -*-
-/**
- * \file MathGridInfo.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author André Pönitz
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef MATH_GRIDINFO_H
-#define MATH_GRIDINFO_H
-
-#include <string>
-
-
-namespace lyx {
-
-
-class ColInfo
-{
-public:
-	ColInfo() : align('c'), rightline(0), leftline(false) {}
-	char   align;      // column alignment
-	docstring width;      // column width
-	docstring special;    // special column alignment
-	int    rightline;  // a line on the right?
-	bool   leftline;
-};
-
-
-class RowInfo
-{
-public:
-	RowInfo() : topline(false), bottomline(false) {}
-	bool topline;     // horizontal line above
-	int  bottomline;  // horizontal line below
-};
-
-
-class CellInfo
-{
-public:
-	CellInfo()
-		: multi(0), leftline(false), rightline(false),
-	   topline(false), bottomline(false)
-	{}
-
-	docstring content;    // cell content
-	int multi;         // multicolumn flag
-	char align;        // cell alignment
-	bool leftline;     // do we have a line on the left?
-	bool rightline;	   // do we have a line on the right?
-	bool topline;	     // do we have a line above?
-	bool bottomline;   // do we have a line below?
-};
-
-
-inline char const * verbose_align(char c)
-{
-	return c == 'c' ? "center" : c == 'r' ? "right" : c == 'l' ? "left" : "none";
-}
-
-
-
-} // namespace lyx
-
-#endif

src/mathed/MathMacroTemplate.h

@@ -17,8 +17,6 @@
 #include "MacroTable.h"
 #include "MathData.h"
 
-#include "support/types.h"
-
 
 namespace lyx {
 

src/mathed/MathParser.h

@@ -15,7 +15,6 @@
 
 #include "MathParser_flags.h"
 
-#include "support/types.h"
 #include "support/docstring.h"
 
 

src/output_latex.h

@@ -16,8 +16,6 @@
 
 #include "support/docstream.h"
 #include "Layout.h"
-#include "Paragraph.h"
-#include "ParIterator.h"
 #include "ParagraphList.h"
 
 

src/sgml.h

@@ -13,7 +13,6 @@
 #ifndef SGML_H
 #define SGML_H
 
-#include "support/types.h"
 #include "support/docstring.h"
 
 namespace lyx {