rename mathed/math_xinset into mathed/InsetMathX

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15026 a592a061-630c-0410-9148-cb99ea01b6c8

src/CutAndPaste.C

@@ -39,9 +39,9 @@
 #include "insets/insetcharstyle.h"
 #include "insets/insettabular.h"
 
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
-#include "mathed/math_support.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+#include "mathed/MathSupport.h"
 
 #include "support/lstrings.h"
 

src/buffer.C

@@ -55,9 +55,9 @@
 #include "insets/insetinclude.h"
 #include "insets/insettext.h"
 
-#include "mathed/math_macrotemplate.h"
-#include "mathed/math_macrotable.h"
-#include "mathed/math_support.h"
+#include "mathed/MatheMacroTemplate.h"
+#include "mathed/MathMacroTable.h"
+#include "mathed/MathSupport.h"
 
 #include "frontends/Alert.h"
 

src/coordcache.C

@@ -14,7 +14,6 @@
 
 #include "lyxtext.h"
 
-#include "mathed/math_data.h"
 #include "insets/insetbase.h"
 
 #include <boost/assert.hpp>

src/cursor.C

@@ -35,11 +35,11 @@
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
 
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
-#include "mathed/math_scriptinset.h"
-#include "mathed/math_macrotable.h"
-#include "mathed/math_parser.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/MathMacroTable.h"
+#include "mathed/MathParser.h"
 
 #include "support/limited_stack.h"
 
@@ -569,14 +569,14 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur)
 //
 ///////////////////////////////////////////////////////////////////
 
-#include "mathed/math_charinset.h"
-#include "mathed/math_factory.h"
-#include "mathed/math_gridinset.h"
-#include "mathed/math_macroarg.h"
-#include "mathed/math_mathmlstream.h"
-#include "mathed/math_scriptinset.h"
-#include "mathed/math_support.h"
-#include "mathed/math_unknowninset.h"
+#include "mathed/InsetMathChar.h"
+#include "mathed/MathFactory.h"
+#include "mathed/InsetMathGrid.h"
+#include "mathed/MathMacroArgument.h"
+#include "mathed/MathMLStream.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/MathSupport.h"
+#include "mathed/InsetMathUnknown.h"
 
 //#define FILEDEBUG 1
 

src/cursor_slice.C

@@ -18,8 +18,8 @@
 #include "lyxtext.h"
 #include "paragraph.h"
 
-#include "mathed/math_inset.h"
-#include "mathed/math_data.h"
+#include "mathed/InsetMath.h"
+#include "mathed/MathData.h"
 
 #include <boost/assert.hpp>
 

src/dociterator.C

@@ -18,8 +18,9 @@
 #include "lyxrow.h"
 #include "paragraph.h"
 
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+
 #include "insets/insettabular.h"
 
 #include <boost/assert.hpp>

src/factory.C

@@ -53,8 +53,8 @@
 #include "insets/insetvspace.h"
 #include "insets/insetwrap.h"
 
-#include "mathed/math_macrotemplate.h"
-#include "mathed/math_hullinset.h"
+#include "mathed/MathMacroTemplate.h"
+#include "mathed/InsetMathHull.h"
 
 #include "support/lstrings.h"
 

src/lyx_main.C

@@ -40,8 +40,6 @@
 #include "mover.h"
 #include "ToolbarBackend.h"
 
-#include "mathed/math_inset.h"
-
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"
 #include "frontends/LyXView.h"

src/mathed/InsetFormulaMacro.C

@@ -1,5 +1,5 @@
 /**
- * \file formulamacro.C
+ * \file InsetFormulaMacro.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,10 +11,10 @@
 
 #include <config.h>
 
-#include "formulamacro.h"
-#include "math_macrotable.h"
-#include "math_macrotemplate.h"
-#include "math_mathmlstream.h"
+#include "InsetFormulaMacro.h"
+#include "MathMacroTable.h"
+#include "MatheMacroTemplate.h"
+#include "MathMLStream.h"
 
 #include "BufferView.h"
 #include "cursor.h"

src/mathed/InsetFormulaMacro.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file formulamacro.h
+ * \file InsetFormulaMacro.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #ifndef INSET_FORMULA_MACRO_H
 #define INSET_FORMULA_MACRO_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 class MathMacroTemplate;
 class LyXLex;

src/mathed/InsetMath.C

@@ -1,5 +1,5 @@
 /**
- * \file math_inset.C
+ * \file InsetMath.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,9 +11,9 @@
 
 #include <config.h>
 
-#include "math_inset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMath.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 #include "debug.h"
 
 #include "support/lstrings.h"

src/mathed/InsetMath.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_inset.h
+ * \file InsetMath.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #ifndef MATH_INSET_H
 #define MATH_INSET_H
 
-#include "math_data.h"
+#include "MathData.h"
 
 #include "insets/insetbase.h"
 

src/mathed/InsetMathAMSArray.C

@@ -1,5 +1,5 @@
 /**
- * \file math_amsarrayinset.C
+ * \file InsetMathAMSArray.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,11 +11,11 @@
 #include <config.h>
 
 #include "LaTeXFeatures.h"
-#include "math_amsarrayinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
+#include "InsetMathAMSArray.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 
 #include "funcrequest.h"
 #include "FuncStatus.h"

src/mathed/InsetMathAMSArray.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_amsarrayinset.h
+ * \file InsetMathAMSArray.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_AMSARRAYINSET_H
 #define MATH_AMSARRAYINSET_H
 
-#include "math_gridinset.h"
+#include "InsetMathGrid.h"
 
 
 /// Inset for things like [pbvV]matrix, psmatrix etc

src/mathed/InsetMathArray.C

@@ -1,5 +1,5 @@
 /**
- * \file math_arrayinset.C
+ * \file InsetMathArray.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,11 +11,11 @@
 #include <config.h>
 
 #include "LaTeXFeatures.h"
-#include "math_arrayinset.h"
-#include "math_data.h"
-#include "math_parser.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "InsetMathArray.h"
+#include "MathData.h"
+#include "MathParser.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
 
 #include "support/lstrings.h"
 

src/mathed/InsetMathArray.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_arrayinset.h
+ * \file InsetMathArray.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_ARRAYINSET_H
 #define MATH_ARRAYINSET_H
 
-#include "math_gridinset.h"
+#include "InsetMathGrid.h"
 
 
 /// Inset for things like \begin{array}...\end{array}

src/mathed/InsetMathBig.C

@@ -1,5 +1,5 @@
 /**
- * \file math_biginset.C
+ * \file InsetMathBig.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_biginset.h"
-#include "math_support.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "InsetMathBig.h"
+#include "MathSupport.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
 
 #include "support/lstrings.h"
 

src/mathed/InsetMathBig.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_biginset.h
+ * \file InsetMathBig.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_BIGINSET_H
 #define MATH_BIGINSET_H
 
-#include "math_diminset.h"
+#include "InsetMathDim.h"
 
 #include <string>
 

src/mathed/InsetMathBinom.C

@@ -1,5 +1,5 @@
 /**
- * \file math_binominset.C
+ * \file InsetMathBinom.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_binominset.h"
-#include "math_data.h"
-#include "math_support.h"
-#include "math_mathmlstream.h"
+#include "InsetMathBinom.h"
+#include "MathData.h"
+#include "MathSupport.h"
+#include "MathMLStream.h"
 
 
 using std::max;

src/mathed/InsetMathBinom.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_binominset.h
+ * \file InsetMathBinom.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_BINOMINSET_H
 #define MATH_BINOMINSET_H
 
-#include "math_fracbase.h"
+#include "InsetMathFracBase.h"
 
 
 /// Binom like objects

src/mathed/InsetMathBoldSymbol.C

@@ -1,5 +1,5 @@
 /**
- * \file math_boldsymbolinset.C
+ * \file InsetMathBoldSymbol.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_boldsymbolinset.h"
-#include "math_mathmlstream.h"
-#include "math_data.h"
+#include "InsetMathBoldSymbol.h"
+#include "MathMLStream.h"
+#include "MathData.h"
 #include "LaTeXFeatures.h"
 #include "support/std_ostream.h"
 

src/mathed/InsetMathBoldSymbol.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_boldsymbolinset.h
+ * \file InsetMathBoldSymbol.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_BOLDSYMBOLINSET_H
 #define MATH_BOLDSYMBOLINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 /// Inset for AMSTeX's \boldsymbol

src/mathed/InsetMathBox.C

@@ -1,5 +1,5 @@
 /**
- * \file math_boxinset.C
+ * \file InsetMathBox.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_boxinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "InsetMathBox.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
 #include "support/std_ostream.h"
 
 using std::string;

src/mathed/InsetMathBox.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_boxinset.h
+ * \file InsetMathBox.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_BOXINSET_H
 #define MATH_BOXINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 #include <string>
 

src/mathed/InsetMathBoxed.C

@@ -1,5 +1,5 @@
 /**
- * \file math_boxedinset.C
+ * \file InsetMathBoxed.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "math_boxedinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_parser.h"
-#include "math_streamstr.h"
+#include "InsetMathBoxed.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathParser.h"
+#include "MathStream.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
 

src/mathed/InsetMathBoxed.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_boxedinset.h
+ * \file InsetMathBoxed.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_BOXEDINSET_H
 #define MATH_BOXEDINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 /// Non-AMS-style frame

src/mathed/InsetMathBrace.C

@@ -1,5 +1,5 @@
 /**
- * \file math_braceinset.C
+ * \file InsetMathBrace.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_braceinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_support.h"
+#include "InsetMathBrace.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathSupport.h"
 #include "LColor.h"
 #include "support/std_ostream.h"
 #include "frontends/Painter.h"

src/mathed/InsetMathBrace.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_braceinset.h
+ * \file InsetMathBrace.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_BRACEINSET_H
 #define MATH_BRACEINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 /// Extra nesting

src/mathed/InsetMathCases.C

@@ -1,5 +1,5 @@
 /**
- * \file math_casesinset.C
+ * \file InsetMathCases.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_casesinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_support.h"
+#include "InsetMathCases.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathSupport.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "support/std_ostream.h"

src/mathed/InsetMathCases.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_casesinset.h
+ * \file InsetMathCases.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_CASESINSET_H
 #define MATH_CASESINSET_H
 
-#include "math_gridinset.h"
+#include "InsetMathGrid.h"
 
 
 class LaTeXFeatures;

src/mathed/InsetMathChar.C

@@ -1,5 +1,5 @@
 /**
- * \file math_charinset.C
+ * \file InsetMathChar.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,14 +11,14 @@
 
 #include <config.h>
 
-#include "math_charinset.h"
-#include "math_support.h"
-#include "math_mathmlstream.h"
+#include "InsetMathChar.h"
+#include "MathSupport.h"
+#include "MathMLStream.h"
 
 #include "debug.h"
 #include "dimension.h"
 #include "support/lstrings.h"
-#include "textpainter.h"
+#include "TextPainter.h"
 
 using std::auto_ptr;
 

src/mathed/InsetMathChar.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_charinset.h
+ * \file InsetMathChar.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_CHARINSET_H
 #define MATH_CHARINSET_H
 
-#include "math_inset.h"
+#include "InsetMath.h"
 
 
 /// The base character inset.

src/mathed/InsetMathColor.C

@@ -1,5 +1,5 @@
 /**
- * \file math_colorinset.C
+ * \file InsetMathColor.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "math_colorinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
+#include "InsetMathColor.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 
 #include "LaTeXFeatures.h"
 

src/mathed/InsetMathColor.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_colorinset.h
+ * \file InsetMathColor.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,7 +14,7 @@
 
 #include "LColor.h"
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 /// Change colours.
 

src/mathed/InsetMathCommand.C

@@ -1,5 +1,5 @@
 /**
- * \file command_inset.C
+ * \file InsetMathCommand.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "command_inset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathCommand.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 #include "dispatchresult.h"
 #include "funcrequest.h"
 

src/mathed/InsetMathCommand.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file command_inset.h
+ * \file InsetMathCommand.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #ifndef COMMAND_INSET_H
 #define COMMAND_INSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 #include "insets/render_button.h"
 

src/mathed/InsetMathComment.C

@@ -1,5 +1,5 @@
 /**
- * \file math_commentinset.C
+ * \file InsetMathComment.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_commentinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_support.h"
+#include "InsetMathComment.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathSupport.h"
 #include "support/std_ostream.h"
 
 using std::string;

src/mathed/InsetMathComment.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_commentinset.h
+ * \file InsetMathComment.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_COMMENTINSET_H
 #define MATH_COMMENTINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 class latexkeys;

src/mathed/InsetMathDFrac.C

@@ -1,5 +1,5 @@
 /**
- * \file math_dfracinset.C
+ * \file InsetMathDFrac.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_dfracinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathDFrac.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
 #include "frontends/Painter.h"

src/mathed/InsetMathDFrac.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_fracinset.h
+ * \file InsetMathFrac.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_DFRACINSET_H
 #define MATH_DFRACINSET_H
 
-#include "math_fracinset.h"
+#include "InsetMathFrac.h"
 
 
 /// \dfrac support

src/mathed/InsetMathDecoration.C

@@ -1,5 +1,5 @@
 /**
- * \file math_decorationinset.C
+ * \file InsetMathDecoration.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,12 +11,12 @@
 
 #include <config.h>
 
-#include "math_decorationinset.h"
-#include "math_data.h"
-#include "math_support.h"
-#include "math_parser.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "InsetMathDecoration.h"
+#include "MathData.h"
+#include "MathSupport.h"
+#include "MathParser.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
 
 #include "LaTeXFeatures.h"
 #include "debug.h"

src/mathed/InsetMathDecoration.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_decorationinset.h
+ * \file InsetMathDecoration.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #ifndef MATH_DECORATIONINSET_H
 #define MATH_DECORATIONINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 class latexkeys;

src/mathed/InsetMathDelim.C

@@ -1,5 +1,5 @@
 /**
- * \file math_deliminset.C
+ * \file InsetMathDelim.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,11 +11,11 @@
 
 #include <config.h>
 
-#include "math_deliminset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
+#include "InsetMathDelim.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 
 
 using std::string;

src/mathed/InsetMathDelim.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_deliminset.h
+ * \file InsetMathDelim.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #ifndef MATH_DELIMINSET_H
 #define MATH_DELIMINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 #include <string>
 

src/mathed/InsetMathDiff.C

@@ -1,5 +1,5 @@
 /**
- * \file math_diffinset.C
+ * \file InsetMathDiff.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_diffinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathDiff.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 #include "debug.h"
 
 using std::auto_ptr;

src/mathed/InsetMathDiff.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_diffinset.h
+ * \file InsetMathDiff.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,7 +16,7 @@
 // d f(x)/dx in one block
 // for interfacing external programs
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 class InsetMathDiff : public InsetMathNest {
 public:

src/mathed/InsetMathDim.C

@@ -1,5 +1,5 @@
 /**
- * \file math_diminset.C
+ * \file InsetMathDim.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "math_diminset.h"
+#include "InsetMathDim.h"
 #include "coordcache.h"
 #include "debug.h"
 

src/mathed/InsetMathDim.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_diminset.h
+ * \file InsetMathDim.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_DIMINSET_H
 #define MATH_DIMINSET_H
 
-#include "math_inset.h"
+#include "InsetMath.h"
 #include "dimension.h"
 
 class PainterInfo;

src/mathed/InsetMathDots.C

@@ -1,5 +1,5 @@
 /**
- * \file math_dotsinset.C
+ * \file InsetMathDots.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,10 +11,10 @@
 
 #include <config.h>
 
-#include "math_dotsinset.h"
-#include "math_mathmlstream.h"
-#include "math_support.h"
-#include "math_parser.h"
+#include "InsetMathDots.h"
+#include "MathMLStream.h"
+#include "MathSupport.h"
+#include "MathParser.h"
 
 
 using std::string;

src/mathed/InsetMathDots.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_dotsinset.h
+ * \file InsetMathDots.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_DOTSINSET_H
 #define MATH_DOTSINSET_H
 
-#include "math_diminset.h"
+#include "InsetMathDim.h"
 
 
 class latexkeys;

src/mathed/InsetMathEnv.C

@@ -1,5 +1,5 @@
 /**
- * \file math_envinset.C
+ * \file InsetMathEnv.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_envinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "InsetMathEnv.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
 #include "support/std_ostream.h"
 
 

src/mathed/InsetMathEnv.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_envinset.h
+ * \file InsetMathEnv.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_ENVINSET_H
 #define MATH_ENVINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 #include <string>
 

src/mathed/InsetMathExFunc.C

@@ -1,5 +1,5 @@
 /**
- * \file math_exfuncinset.C
+ * \file InsetMathExFunc.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "math_exfuncinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
+#include "InsetMathExFunc.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 
 
 using std::string;

src/mathed/InsetMathExFunc.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_exfuncinset.h
+ * \file InsetMathExFunc.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #define MATH_EXFUNCINSET_H
 
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 #include <string>
 

src/mathed/InsetMathExInt.C

@@ -1,5 +1,5 @@
 /**
- * \file math_exintinset.C
+ * \file InsetMathExInt.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "math_exintinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_symbolinset.h"
+#include "InsetMathExInt.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
+#include "InsetMathSymbol.h"
 #include "debug.h"
 
 #include <boost/scoped_ptr.hpp>

src/mathed/InsetMathExInt.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_exintinset.h
+ * \file InsetMathExInt.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,7 +16,7 @@
 // \int_l^u f(x) dx in one block (as opposed to 'f','(','x',')' or 'f','x')
 // or \sum, \prod...  for interfacing external programs
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 #include <string>
 

src/mathed/InsetMathFBox.C

@@ -1,5 +1,5 @@
 /**
- * \file math_fboxinset.C
+ * \file InsetMathFBox.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "math_fboxinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_parser.h"
-#include "math_streamstr.h"
+#include "InsetMathFBox.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathParser.h"
+#include "MathStream.h"
 #include "LColor.h"
 
 #include "support/std_ostream.h"

src/mathed/InsetMathFBox.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_fboxinset.h
+ * \file InsetMathFBox.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_FBOXINSET_H
 #define MATH_FBOXINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 /// Non-AMS-style frame

src/mathed/InsetMathFont.C

@@ -1,5 +1,5 @@
 /**
- * \file math_fontinset.C
+ * \file InsetMathFont.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_fontinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_parser.h"
+#include "InsetMathFont.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathParser.h"
 #include "LaTeXFeatures.h"
 #include "support/std_ostream.h"
 

src/mathed/InsetMathFont.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_fontinset.h
+ * \file InsetMathFont.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_FONTINSET_H
 #define MATH_FONTINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 class latexkeys;

src/mathed/InsetMathFontOld.C

@@ -1,5 +1,5 @@
 /**
- * \file math_fontoldinset.C
+ * \file InsetMathFontOld.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "math_fontoldinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_parser.h"
-#include "math_streamstr.h"
+#include "InsetMathFontOld.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathParser.h"
+#include "MathStream.h"
 #include "support/std_ostream.h"
 
 using std::auto_ptr;

src/mathed/InsetMathFontOld.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_fontoldinset.h
+ * \file InsetMathFontOld.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_FONTOLDINSET_H
 #define MATH_FONTOLDINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 class latexkeys;

src/mathed/InsetMathFrac.C

@@ -1,5 +1,5 @@
 /**
- * \file math_fracinset.C
+ * \file InsetMathFrac.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,10 +11,10 @@
 
 #include <config.h>
 
-#include "math_fracinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "textpainter.h"
+#include "InsetMathFrac.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "TextPainter.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
 #include "frontends/Painter.h"

src/mathed/InsetMathFrac.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_fracinset.h
+ * \file InsetMathFrac.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #ifndef MATH_FRACINSET_H
 #define MATH_FRACINSET_H
 
-#include "math_fracbase.h"
+#include "InsetMathFracBase.h"
 
 
 /// Fraction like objects (frac, binom)

src/mathed/InsetMathFracBase.C

@@ -1,5 +1,5 @@
 /**
- * \file math_fracbase.C
+ * \file InsetMathFracBase.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "math_fracbase.h"
-#include "math_data.h"
+#include "InsetMathFracBase.h"
+#include "MathData.h"
 #include "cursor.h"
 
 

src/mathed/InsetMathFracBase.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_fracbase.h
+ * \file InsetMathFracBase.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_FRACBASE_H
 #define MATH_FRACBASE_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 class InsetMathFracBase : public InsetMathNest {

src/mathed/InsetMathFrameBox.C

@@ -1,5 +1,5 @@
 /**
- * \file math_frameboxinset.C
+ * \file InsetMathFrameBox.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_frameboxinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_support.h"
+#include "InsetMathFrameBox.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathSupport.h"
 #include "LColor.h"
 #include "frontends/Painter.h"
 

src/mathed/InsetMathFrameBox.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_frameboxinset.h
+ * \file InsetMathFrameBox.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_FRAMEBOXINSET_H
 #define MATH_FRAMEBOXINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 /// Extra nesting

src/mathed/InsetMathGrid.C

@@ -1,5 +1,5 @@
 /**
- * \file math_gridinset.C
+ * \file InsetMathGrid.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_gridinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "InsetMathGrid.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
 
 #include "BufferView.h"
 #include "CutAndPaste.h"

src/mathed/InsetMathGrid.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_gridinset.h
+ * \file InsetMathGrid.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_GRID_H
 #define MATH_GRID_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 #include "lyxlength.h"
 
 

src/mathed/InsetMathHull.C

@@ -1,5 +1,5 @@
 /**
- * \file math_hullinset.C
+ * \file InsetMathHull.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,20 +10,20 @@
 
 #include <config.h>
 
-#include "math_arrayinset.h"
-#include "math_charinset.h"
-#include "math_colorinset.h"
-#include "math_data.h"
-#include "math_deliminset.h"
-#include "math_extern.h"
-#include "math_factory.h"
-#include "math_hullinset.h"
-#include "math_mathmlstream.h"
-#include "math_parser.h"
-#include "math_spaceinset.h"
-#include "math_streamstr.h"
-#include "math_support.h"
-#include "ref_inset.h"
+#include "InsetMathArray.h"
+#include "InsetMathChar.h"
+#include "InsetMathColor.h"
+#include "MathData.h"
+#include "InsetMathDelim.h"
+#include "MathExtern.h"
+#include "MathFactory.h"
+#include "InsetMathHull.h"
+#include "MathMLStream.h"
+#include "MathParser.h"
+#include "InsetMathSpace.h"
+#include "MathStream.h"
+#include "MathSupport.h"
+#include "InsetMathRef.h"
 
 #include "bufferview_funcs.h"
 #include "lyxtext.h"
@@ -44,7 +44,7 @@
 #include "lyxrc.h"
 #include "outputparams.h"
 #include "sgml.h"
-#include "textpainter.h"
+#include "TextPainter.h"
 #include "undo.h"
 
 #include "insets/render_preview.h"

src/mathed/InsetMathHull.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_hullinset.h
+ * \file InsetMathHull.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_HULLINSET_H
 #define MATH_HULLINSET_H
 
-#include "math_gridinset.h"
+#include "InsetMathGrid.h"
 #include <boost/scoped_ptr.hpp>
 
 class RenderPreview;

src/mathed/InsetMathKern.C

@@ -1,5 +1,5 @@
 /**
- * \file math_kerninset.C
+ * \file InsetMathKern.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_kerninset.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
+#include "InsetMathKern.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 #include "dimension.h"
 
 using std::string;

src/mathed/InsetMathKern.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_kerninset.h
+ * \file InsetMathKern.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_CHEATINSET_H
 #define MATH_CHEATINSET_H
 
-#include "math_inset.h"
+#include "InsetMath.h"
 #include "lyxlength.h"
 
 

src/mathed/InsetMathLefteqn.C

@@ -1,5 +1,5 @@
 /**
- * \file math_lefteqninset.C
+ * \file InsetMathLefteqn.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "math_lefteqninset.h"
-#include "math_data.h"
+#include "InsetMathLefteqn.h"
+#include "MathData.h"
 #include "support/std_ostream.h"
 
 

src/mathed/InsetMathLefteqn.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_lefteqninset.h
+ * \file InsetMathLefteqn.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_LEFTEQNINSET_H
 #define MATH_LEFTEQNINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 /// Support for LaTeX's \\lefteqn command

src/mathed/InsetMathLim.C

@@ -1,5 +1,5 @@
 /**
- * \file math_liminset.C
+ * \file InsetMathLim.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_liminset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathLim.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 #include "debug.h"
 
 using std::auto_ptr;

src/mathed/InsetMathLim.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_liminset.h
+ * \file InsetMathLim.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,7 +16,7 @@
 // lim_{x->x0} f(x) in one block
 // for interfacing external programs
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 class InsetMathLim : public InsetMathNest {
 public:

src/mathed/InsetMathMBox.C

@@ -1,5 +1,5 @@
 /**
- * \file math_mboxinset.C
+ * \file InsetMathMBox.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_mboxinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathMBox.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 
 #include "BufferView.h"
 #include "buffer.h"

src/mathed/InsetMathMBox.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_mboxinset.h
+ * \file InsetMathMBox.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_MBOXINSET_H
 #define MATH_MBOXINSET_H
 
-#include "math_diminset.h"
+#include "InsetMathDim.h"
 #include "lyxtext.h"
 
 

src/mathed/InsetMathMacro.C

@@ -1,5 +1,5 @@
 /**
- * \file math_macro.C
+ * \file InsetMathMacro.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,10 +11,10 @@
 
 #include <config.h>
 
-#include "math_macro.h"
-#include "math_support.h"
-#include "math_extern.h"
-#include "math_mathmlstream.h"
+#include "InsetMathMacro.h"
+#include "MathSupport.h"
+#include "MathExtern.h"
+#include "MathMLStream.h"
 
 #include "buffer.h"
 #include "cursor.h"

src/mathed/InsetMathMacro.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_macro.h
+ * \file InsetMathMacro.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,10 +13,10 @@
 #ifndef MATH_MACRO_H
 #define MATH_MACRO_H
 
-#include "math_nestinset.h"
-#include "math_data.h"
-#include "math_nestinset.h"
-#include "math_macrotable.h"
+#include "InsetMathNest.h"
+#include "MathData.h"
+#include "InsetMathNest.h"
+#include "MathMacroTable.h"
 
 
 /// This class contains the data for a macro.

src/mathed/InsetMathMakebox.C

@@ -1,5 +1,5 @@
 /**
- * \file math_makeboxinset.C
+ * \file InsetMathMakebox.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_makeboxinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
-#include "math_support.h"
+#include "InsetMathMakebox.h"
+#include "MathData.h"
+#include "MathMLStream.h"
+#include "MathSupport.h"
 
 #include "support/std_ostream.h"
 

src/mathed/InsetMathMakebox.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_makeboxinset.h
+ * \file InsetMathMakebox.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_MAKEBOXINSET_H
 #define MATH_MAKEBOXINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 /// Extra nesting: \\makebox.
 // consolidate with InsetMathFrameBox?

src/mathed/InsetMathMatrix.C

@@ -1,5 +1,5 @@
 /**
- * \file math_matrixinset.C
+ * \file InsetMathMatrix.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_matrixinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathMatrix.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 
 using std::auto_ptr;
 

src/mathed/InsetMathMatrix.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_matrixinset.h
+ * \file InsetMathMatrix.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_MATRIXINSET_H
 #define MATH_MATRIXINSET_H
 
-#include "math_gridinset.h"
+#include "InsetMathGrid.h"
 
 
 // "shortcut" for DelimInset("(",ArrayInset,")")

src/mathed/InsetMathNest.C

@@ -1,5 +1,5 @@
 /**
- * \file math_nestinset.C
+ * \file InsetMathNest.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,28 +10,28 @@
 
 #include <config.h>
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
-#include "math_arrayinset.h"
-#include "math_biginset.h"
-#include "math_boxinset.h"
-#include "math_braceinset.h"
-#include "math_colorinset.h"
-#include "math_commentinset.h"
-#include "math_data.h"
-#include "math_deliminset.h"
-#include "math_factory.h"
-#include "math_hullinset.h"
-#include "math_mathmlstream.h"
-#include "math_macroarg.h"
-//#include "math_mboxinset.h"
-#include "math_parser.h"
-#include "math_scriptinset.h"
-#include "math_spaceinset.h"
-#include "math_symbolinset.h"
-#include "math_support.h"
-#include "math_unknowninset.h"
-#include "ref_inset.h"
+#include "InsetMathArray.h"
+#include "InsetMathBig.h"
+#include "InsetMathBox.h"
+#include "InsetMathBrace.h"
+#include "InsetMathColor.h"
+#include "InsetMathComment.h"
+#include "MathData.h"
+#include "InsetMathDelim.h"
+#include "MathFactory.h"
+#include "InsetMathHull.h"
+#include "MathMLStream.h"
+#include "MathMacroArgument.h"
+//#include "InsetMathMBox.h"
+#include "MathParser.h"
+#include "InsetMathScript.h"
+#include "InsetMathSpace.h"
+#include "InsetMathSymbol.h"
+#include "MathSupport.h"
+#include "InsetMathUnknown.h"
+#include "InsetMathRef.h"
 
 #include "BufferView.h"
 #include "CutAndPaste.h"

src/mathed/InsetMathNest.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_nestinset.h
+ * \file InsetMathNest.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_NESTINSET_H
 #define MATH_NESTINSET_H
 
-#include "math_diminset.h"
+#include "InsetMathDim.h"
 
 
 /** Abstract base class for all math objects that contain nested items.

src/mathed/InsetMathNumber.C

@@ -1,5 +1,5 @@
 /**
- * \file math_numberinset.C
+ * \file InsetMathNumber.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "math_numberinset.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
+#include "InsetMathNumber.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 
 using lyx::docstring;
 

src/mathed/InsetMathNumber.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_numberinset.h
+ * \file InsetMathNumber.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_NUMBERINSET_H
 #define MATH_NUMBERINSET_H
 
-#include "math_inset.h"
+#include "InsetMath.h"
 
 
 /** Some inset that "is" a number

src/mathed/InsetMathOverset.C

@@ -1,5 +1,5 @@
 /**
- * \file math_oversetinset.C
+ * \file InsetMathOverset.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_oversetinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathOverset.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 
 #include "cursor.h"
 #include "LaTeXFeatures.h"

src/mathed/InsetMathOverset.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_oversetinset.h
+ * \file InsetMathOverset.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #define MATH_OVERSETINSET_H
 
 
-#include "math_fracbase.h"
+#include "InsetMathFracBase.h"
 
 /// Inset for overset
 class InsetMathOverset : public InsetMathFracBase {

src/mathed/InsetMathPar.C

@@ -1,5 +1,5 @@
 /**
- * \file math_parinset.C
+ * \file InsetMathPar.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_parinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathPar.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 #include "support/std_ostream.h"
 
 

src/mathed/InsetMathPar.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_parinset.h
+ * \file InsetMathPar.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #define MATH_PARINSET_H
 
 
-#include "math_hullinset.h"
+#include "InsetMathHull.h"
 
 class InsetMathPar : public InsetMathHull {
 public:

src/mathed/InsetMathPhantom.C

@@ -1,5 +1,5 @@
 /**
- * \file math_phantominset.C
+ * \file InsetMathPhantom.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "math_phantominset.h"
-#include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "InsetMathPhantom.h"
+#include "MathMLStream.h"
+#include "MathStream.h"
 
 #include "LColor.h"
 

src/mathed/InsetMathPhantom.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_phantominset.h
+ * \file InsetMathPhantom.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef MATH_PHANTOMINSET_H
 #define MATH_PHANTOMINSET_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 class InsetMathPhantom : public InsetMathNest {
 public:

src/mathed/InsetMathRef.C

@@ -1,5 +1,5 @@
 /**
- * \file ref_inset.C
+ * \file InsetMathRef.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "ref_inset.h"
+#include "InsetMathRef.h"
 
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
@@ -20,9 +20,9 @@
 #include "funcrequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "math_data.h"
-#include "math_factory.h"
-#include "math_support.h"
+#include "MathData.h"
+#include "MathFactory.h"
+#include "MathSupport.h"
 #include "outputparams.h"
 #include "sgml.h"
 

src/mathed/InsetMathRef.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file ref_inset.h
+ * \file InsetMathRef.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #define REF_INSET_H
 
 
-#include "command_inset.h"
+#include "InsetMathCommand.h"
 class Buffer;
 
 // for \ref

src/mathed/InsetMathRoot.C

@@ -1,5 +1,5 @@
 /**
- * \file math_rootinset.C
+ * \file InsetMathRoot.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,9 +11,9 @@
 
 #include <config.h>
 
-#include "math_rootinset.h"
-#include "math_data.h"
-#include "math_mathmlstream.h"
+#include "InsetMathRoot.h"
+#include "MathData.h"
+#include "MathMLStream.h"
 #include "cursor.h"
 #include "LColor.h"
 

src/mathed/InsetMathRoot.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file math_rootinset.h
+ * \file InsetMathRoot.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #ifndef MATH_ROOT_H
 #define MATH_ROOT_H
 
-#include "math_nestinset.h"
+#include "InsetMathNest.h"
 
 
 /// The general n-th root inset.