Fix a few rename inconsistencies discovered by JMarc in insets and mathed, step 1

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index e96ca711e86874f8e1107fdc9941ae59561cab28..296598f5fcd1062254334fe67937ce283ccded43 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -180,7 +180,7 @@ src_mathed_header_files = Split('''
     InsetMathCases.h
     InsetMathChar.h
     InsetMathColor.h
-    InsetMathCommand.h
+    CommandInset.h
     InsetMathComment.h
     InsetMathDFrac.h
     InsetMathDecoration.h
@@ -202,7 +202,7 @@ src_mathed_header_files = Split('''
     InsetMathKern.h
     InsetMathLefteqn.h
     InsetMathLim.h
-    InsetMathMacro.h
+    MathMacro.h
     InsetMathMakebox.h
     InsetMathMatrix.h
     InsetMathNest.h
@@ -229,7 +229,7 @@ src_mathed_header_files = Split('''
     InsetMathXYMatrix.h
     MathAtom.h
     MathAutoCorrect.h
-    MathData.h
+    MathArray.h
     MathExtern.h
     MathFactory.h
     MathGridInfo.h
@@ -306,7 +306,7 @@ src_mathed_files = Split('''
     InsetMathXYMatrix.cpp
     MathAtom.cpp
     MathAutoCorrect.cpp
-    MathData.cpp
+    MathArray.cpp
     MathExtern.cpp
     MathFactory.cpp
     MathMacroArgument.cpp
@@ -331,7 +331,7 @@ src_insets_header_files = Split('''
     InsetBranch.h
     InsetCaption.h
     InsetCharStyle.h
-    InsetCite.h
+    InsetCitation.h
     InsetCollapsable.h
     InsetCommand.h
     InsetCommandParams.h
@@ -354,7 +354,7 @@ src_insets_header_files = Split('''
     InsetNomencl.h
     InsetNote.h
     InsetOptArg.h
-    InsetPageBreak.h
+    InsetPagebreak.h
     InsetQuotes.h
     InsetRef.h
     InsetSpace.h
@@ -386,7 +386,7 @@ src_insets_files = Split('''
     InsetBranch.cpp
     InsetCaption.cpp
     InsetCharStyle.cpp
-    InsetCite.cpp
+    InsetCitation.cpp
     InsetCollapsable.cpp
     InsetCommand.cpp
     InsetCommandParams.cpp
@@ -409,7 +409,7 @@ src_insets_files = Split('''
     InsetNomencl.cpp
     InsetNote.cpp
     InsetOptArg.cpp
-    InsetPageBreak.cpp
+    InsetPagebreak.cpp
     InsetQuotes.cpp
     InsetRef.cpp
     InsetSpace.cpp

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 56d284b61e340cfedb561b0f4cbbc3814abc2792..6bd78cf83d4e865180d1e9418d7edc86c84ade49 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -104,7 +104,7 @@ src/insets/InsetMarginal.cpp
 src/insets/InsetNomencl.cpp
 src/insets/InsetNote.cpp
 src/insets/InsetOptArg.cpp
-src/insets/InsetPageBreak.h
+src/insets/InsetPagebreak.h
 src/insets/InsetRef.cpp
 src/insets/InsetTabular.cpp
 src/insets/InsetText.cpp

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 20d7a46504fa8ba45c9f0b3b38a452dee432a334..1286d1a94ee957d981e6f1a27a88239298050ad0 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -39,7 +39,7 @@
 #include "insets/InsetCharStyle.h"
 #include "insets/InsetTabular.h"
 
-#include "mathed/MathData.h"
+#include "mathed/MathArray.h"
 #include "mathed/InsetMath.h"
 #include "mathed/MathSupport.h"
 

diff --git a/src/cursor.C b/src/cursor.C
index 892f5b76fafd2b2eceeb6ee706e18e3c89f4b4df..f74952606f4f6e69ec436674b2059e26614351b8 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -36,7 +36,7 @@
 #include "insets/InsetTabular.h"
 #include "insets/InsetText.h"
 
-#include "mathed/MathData.h"
+#include "mathed/MathArray.h"
 #include "mathed/InsetMath.h"
 #include "mathed/InsetMathScript.h"
 #include "mathed/MathMacroTable.h"

diff --git a/src/cursor_slice.C b/src/cursor_slice.C
index 02e7b4ab6270d82dbd3b3b8976c68a2ac8668b29..98633ac98e2263c7020edc3d024b979abc49161c 100644 (file)
--- a/src/cursor_slice.C
+++ b/src/cursor_slice.C
@@ -19,7 +19,7 @@
 #include "paragraph.h"
 
 #include "mathed/InsetMath.h"
-#include "mathed/MathData.h"
+#include "mathed/MathArray.h"
 
 #include <boost/assert.hpp>
 

diff --git a/src/dociterator.C b/src/dociterator.C
index 9f753c357a7ec9e41792a8f69df75933ee4c2bc4..c032f639643d7ffbd78e0108e4b0be2804d704fb 100644 (file)
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -17,7 +17,7 @@
 #include "lyxtext.h"
 #include "paragraph.h"
 
-#include "mathed/MathData.h"
+#include "mathed/MathArray.h"
 #include "mathed/InsetMath.h"
 
 #include "insets/InsetTabular.h"

diff --git a/src/factory.C b/src/factory.C
index 50abb182bbeca912f2be3d3da80b2eaaa92e8309..318044c7507ec35b133e92080305f892ae1bbfa4 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -26,7 +26,7 @@
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
 #include "insets/InsetCaption.h"
-#include "insets/InsetCite.h"
+#include "insets/InsetCitation.h"
 #include "insets/InsetCharStyle.h"
 #include "insets/InsetEnv.h"
 #include "insets/InsetERT.h"
@@ -46,7 +46,7 @@
 #include "insets/InsetBox.h"
 #include "insets/InsetBranch.h"
 #include "insets/InsetOptArg.h"
-#include "insets/InsetPageBreak.h"
+#include "insets/InsetPagebreak.h"
 #include "insets/InsetRef.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"

diff --git a/src/insets/InsetCite.cpp b/src/insets/InsetCite.cpp
index df9704e538489c6319b5e194fca62c9d9801bdf0..e7f3fc86fdef28171580a54226bc0aa496cab3b2 100644 (file)
--- a/src/insets/InsetCite.cpp
+++ b/src/insets/InsetCite.cpp
@@ -1,5 +1,5 @@
 /**
- * \file InsetCite.cpp
+ * \file InsetCitation.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "InsetCite.h"
+#include "InsetCitation.h"
 
 #include "buffer.h"
 #include "bufferparams.h"

diff --git a/src/insets/InsetCite.h b/src/insets/InsetCite.h
index 8836c533521968ba6326a93bf409a81c5cfb87a5..f0fd1d7a732cf44b37918f8adcdedbc571c8a271 100644 (file)
--- a/src/insets/InsetCite.h
+++ b/src/insets/InsetCite.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file InsetCite.h
+ * \file InsetCitation.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

diff --git a/src/insets/InsetPageBreak.cpp b/src/insets/InsetPageBreak.cpp
index f606e1fd31b3159d17d7f806ab8155782a8b4cb2..65683cba6fb4b8542e0fccf68e4c4b42fe7556e3 100644 (file)
--- a/src/insets/InsetPageBreak.cpp
+++ b/src/insets/InsetPageBreak.cpp
@@ -1,5 +1,5 @@
 /**
- * \file InsetPageBreak.cpp
+ * \file InsetPagebreak.cpp
  * 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 "InsetPageBreak.h"
+#include "InsetPagebreak.h"
 
 #include "debug.h"
 #include "gettext.h"

diff --git a/src/insets/InsetPageBreak.h b/src/insets/InsetPageBreak.h
index 24d22400340567a1f8b624e8e07aca6df0c4ccde..b018f5883efecfbeeb83567ce6629329ef317403 100644 (file)
--- a/src/insets/InsetPageBreak.h
+++ b/src/insets/InsetPageBreak.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file InsetPageBreak.h
+ * \file InsetPagebreak.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am
index dad6f58824fbcb40a8c201918ed90a46013e722c..ac92f3ed329c51d3f2487b78883c9c0632a165b5 100644 (file)
--- a/src/insets/Makefile.am
+++ b/src/insets/Makefile.am
@@ -43,8 +43,8 @@ libinsets_la_SOURCES = \
        InsetCaption.h \
        InsetCharStyle.cpp \
        InsetCharStyle.h \
-       InsetCite.cpp \
-       InsetCite.h \
+       InsetCitation.cpp \
+       InsetCitation.h \
        InsetCollapsable.cpp \
        InsetCollapsable.h \
        InsetCommand.cpp \
@@ -89,8 +89,8 @@ libinsets_la_SOURCES = \
        InsetNote.h \
        InsetOptArg.cpp \
        InsetOptArg.h \
-       InsetPageBreak.cpp \
-       InsetPageBreak.h \
+       InsetPagebreak.cpp \
+       InsetPagebreak.h \
        InsetQuotes.cpp \
        InsetQuotes.h \
        InsetRef.cpp \

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index 64db5a21809d540012d0a50e35633ff91efc6ae5..6e06d34fc8b38d9c121f5ef6d139499c29d9d9c1 100644 (file)
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "InsetMath.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "gettext.h"
 #include "debug.h"

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index 8e6988aadd36602f6d427064436a62729ebb72cd..0dc38f57e458e0d93af4aec0283c01c76add45c6 100644 (file)
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -13,7 +13,7 @@
 #ifndef MATH_INSET_H
 #define MATH_INSET_H
 
-#include "MathData.h"
+#include "MathArray.h"
 
 #include "insets/InsetBase.h"
 

diff --git a/src/mathed/InsetMathAMSArray.cpp b/src/mathed/InsetMathAMSArray.cpp
index 3febc45cb1c0a603bc6d79e2aff335640ce8ffa7..67098ed64c859d068276094c3fb8e475f524fe17 100644 (file)
--- a/src/mathed/InsetMathAMSArray.cpp
+++ b/src/mathed/InsetMathAMSArray.cpp
@@ -12,7 +12,7 @@
 
 #include "LaTeXFeatures.h"
 #include "InsetMathAMSArray.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"

diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp
index 8732f50c9cb4cae17b8135b49ef7340f992a507f..da7d3183c35ba08b0f1cf7cc110f515c496bc1e9 100644 (file)
--- a/src/mathed/InsetMathArray.cpp
+++ b/src/mathed/InsetMathArray.cpp
@@ -12,7 +12,7 @@
 
 #include "LaTeXFeatures.h"
 #include "InsetMathArray.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathParser.h"
 #include "MathStream.h"
 

diff --git a/src/mathed/InsetMathBinom.cpp b/src/mathed/InsetMathBinom.cpp
index 0a08e7bea356a107b4ff1b5056fa2d4b31686b86..17ec145390edfd75e0aff7da3cc39604ae3b77c1 100644 (file)
--- a/src/mathed/InsetMathBinom.cpp
+++ b/src/mathed/InsetMathBinom.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathBinom.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathSupport.h"
 #include "MathStream.h"
 

diff --git a/src/mathed/InsetMathBoldSymbol.cpp b/src/mathed/InsetMathBoldSymbol.cpp
index 1d7c6f67607bb4af4e919e053f7c086e4c0f15f2..3a82b02b109ba988a89c52c68906f0b9052cc291 100644 (file)
--- a/src/mathed/InsetMathBoldSymbol.cpp
+++ b/src/mathed/InsetMathBoldSymbol.cpp
@@ -12,7 +12,7 @@
 
 #include "InsetMathBoldSymbol.h"
 #include "MathStream.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "LaTeXFeatures.h"
 #include "support/std_ostream.h"
 

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index 0447e84467cb921ac0eaef4ba74f2ec038f43cc5..8a4e87c550ed22ac6e74fff4331061974b9823a9 100644 (file)
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathBox.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "support/std_ostream.h"

diff --git a/src/mathed/InsetMathBoxed.cpp b/src/mathed/InsetMathBoxed.cpp
index 2ff48888f771fc0aaba0674460a658a2098333e7..5b9db75c1dc6af110776012bae6e9d49eb9dc1b3 100644 (file)
--- a/src/mathed/InsetMathBoxed.cpp
+++ b/src/mathed/InsetMathBoxed.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathBoxed.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"

diff --git a/src/mathed/InsetMathBrace.cpp b/src/mathed/InsetMathBrace.cpp
index 54b00d89c33c3eaf51a71329f411c55ccd853bfc..6a4f6b61a7de647286923f7531c35d4c70e50b00 100644 (file)
--- a/src/mathed/InsetMathBrace.cpp
+++ b/src/mathed/InsetMathBrace.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathBrace.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "LColor.h"

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 86886299ba01c2b8adff5fb0edf288e0f6140ae9..64a1d48bd6c8fddc3b3d94b17f669e189626fab6 100644 (file)
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathCases.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "FuncStatus.h"

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index c3358bfe34907c6c8e1d582df3a03ace9d103ca3..5e0fed7b776ce2e397464f4d0d0894d668fd8b1a 100644 (file)
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathColor.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "LaTeXFeatures.h"

diff --git a/src/mathed/InsetMathCommand.cpp b/src/mathed/InsetMathCommand.cpp
index 076096ef48a54ee14e484484191fb5adcb6d2867..23de2c5d527359e17412a8d5a8bfad31de666d80 100644 (file)
--- a/src/mathed/InsetMathCommand.cpp
+++ b/src/mathed/InsetMathCommand.cpp
@@ -1,5 +1,5 @@
 /**
- * \file InsetMathCommand.cpp
+ * \file CommandInset.cpp
  * 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 "InsetMathCommand.h"
-#include "MathData.h"
+#include "CommandInset.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "dispatchresult.h"
 #include "funcrequest.h"

diff --git a/src/mathed/InsetMathCommand.h b/src/mathed/InsetMathCommand.h
index d469f1e08e7ed23fc927cb8c8c97727936e5522a..bac6ddcbe1cb99634d5ccbc25e27121e12bd0283 100644 (file)
--- a/src/mathed/InsetMathCommand.h
+++ b/src/mathed/InsetMathCommand.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file InsetMathCommand.h
+ * \file CommandInset.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

diff --git a/src/mathed/InsetMathComment.cpp b/src/mathed/InsetMathComment.cpp
index ca0de54262e6d6b7e4bad023fa39eced24c485cb..3faf7134335e30df1434879ccbb6d40b5cdb7ab4 100644 (file)
--- a/src/mathed/InsetMathComment.cpp
+++ b/src/mathed/InsetMathComment.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathComment.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "support/std_ostream.h"

diff --git a/src/mathed/InsetMathDFrac.cpp b/src/mathed/InsetMathDFrac.cpp
index 5dded132b687f7d2ec0c5da8b3f5f222cb7a253d..20616016ff89f3a71db5e4f50bb2133dcf8aa2e7 100644 (file)
--- a/src/mathed/InsetMathDFrac.cpp
+++ b/src/mathed/InsetMathDFrac.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathDFrac.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index f7a038bec879bd903db5d153da700ff69c47610f..f1c8a7c3f743bad1623bba956009d510087e4eda 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "InsetMathDecoration.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathParser.h"
 #include "MathSupport.h"
 #include "MathStream.h"

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index a0f6aaad5d3a6b69de89588a5a405e27137fe91f..86049818e5ec30f653764924af99eae9e38afae2 100644 (file)
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "InsetMathDelim.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"

diff --git a/src/mathed/InsetMathDiff.cpp b/src/mathed/InsetMathDiff.cpp
index 2f866d245b86316e1941d597ebe42973b02498dc..61b87a36c8b752f632261f2f08830c224bf624b1 100644 (file)
--- a/src/mathed/InsetMathDiff.cpp
+++ b/src/mathed/InsetMathDiff.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathDiff.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "debug.h"
 

diff --git a/src/mathed/InsetMathEnv.cpp b/src/mathed/InsetMathEnv.cpp
index 110d09b2597bda01cbd4fdabc8bc0961efbd28d0..15584b6745d847e6c4cce73eef3725ab960832b7 100644 (file)
--- a/src/mathed/InsetMathEnv.cpp
+++ b/src/mathed/InsetMathEnv.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathEnv.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "support/std_ostream.h"

diff --git a/src/mathed/InsetMathExFunc.cpp b/src/mathed/InsetMathExFunc.cpp
index 9ede0e43403f30a58e3231a16b5f34a4f5a83e8f..77530973f80466585910cbd4f940f8d4f74dc845 100644 (file)
--- a/src/mathed/InsetMathExFunc.cpp
+++ b/src/mathed/InsetMathExFunc.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathExFunc.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"

diff --git a/src/mathed/InsetMathExInt.cpp b/src/mathed/InsetMathExInt.cpp
index 23fca486bcdec8690a237be9cc95a6c8e595c3a1..9adfe507cef71cde9691902b06acc166fc4f4d8f 100644 (file)
--- a/src/mathed/InsetMathExInt.cpp
+++ b/src/mathed/InsetMathExInt.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathExInt.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "InsetMathSymbol.h"

diff --git a/src/mathed/InsetMathFBox.cpp b/src/mathed/InsetMathFBox.cpp
index 4eb91a8b97cdeab8edae0de21d05dec3809d2db2..135395bccb9bac0b94856624e749e8792fee34f5 100644 (file)
--- a/src/mathed/InsetMathFBox.cpp
+++ b/src/mathed/InsetMathFBox.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathFBox.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "LColor.h"
 

diff --git a/src/mathed/InsetMathFont.cpp b/src/mathed/InsetMathFont.cpp
index e079868a1a103f2a74fcc5cdcc64334aafc0c960..6954cd03af73e1e082d861617cec19d3b89c5168 100644 (file)
--- a/src/mathed/InsetMathFont.cpp
+++ b/src/mathed/InsetMathFont.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathFont.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathParser.h"
 #include "LaTeXFeatures.h"

diff --git a/src/mathed/InsetMathFontOld.cpp b/src/mathed/InsetMathFontOld.cpp
index d061280118250cdde7dc4882ec0206b8c8afb366..e70b7370f594a4d33a3224914b5050daa74dfa50 100644 (file)
--- a/src/mathed/InsetMathFontOld.cpp
+++ b/src/mathed/InsetMathFontOld.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathFontOld.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathParser.h"
 #include "MathStream.h"

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index 924cebe79cf423f323a3bd95367ddaa99c82650d..55ccf4bbe38fdcbe3700f7ffdfd4381e906c25c7 100644 (file)
--- a/src/mathed/InsetMathFrac.cpp
+++ b/src/mathed/InsetMathFrac.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "InsetMathFrac.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "TextPainter.h"
 #include "LaTeXFeatures.h"

diff --git a/src/mathed/InsetMathFracBase.cpp b/src/mathed/InsetMathFracBase.cpp
index 22b0befb64a540abd0d54f6d8c3b6f12df11de4d..82e53915a1af9f9d5cef1f41ca10b353d014b621 100644 (file)
--- a/src/mathed/InsetMathFracBase.cpp
+++ b/src/mathed/InsetMathFracBase.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathFracBase.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "cursor.h"
 
 

diff --git a/src/mathed/InsetMathFrameBox.cpp b/src/mathed/InsetMathFrameBox.cpp
index e77fe38fc6dd276fca4a7916d77eefe43700a382..252589894129086a4c0aa047e60b431472669216 100644 (file)
--- a/src/mathed/InsetMathFrameBox.cpp
+++ b/src/mathed/InsetMathFrameBox.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathFrameBox.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "LColor.h"

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index 53354fa623ae7b5c8baff7491b4e5dcd7ead18c3..336fbedccf0cf303109d79fb9d6e5abc37fe40a1 100644 (file)
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathGrid.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathParser.h"
 #include "MathStream.h"
 

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index cd3a59081b16f3384ccb567a7c4085a58dcc1713..d21174ce447d23673ca42bd6601638cce2923b0b 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -13,7 +13,7 @@
 #include "InsetMathArray.h"
 #include "InsetMathChar.h"
 #include "InsetMathColor.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "InsetMathDelim.h"
 #include "MathExtern.h"
 #include "MathFactory.h"

diff --git a/src/mathed/InsetMathLefteqn.cpp b/src/mathed/InsetMathLefteqn.cpp
index 4122d781f9afa264bcaee522d23dcf4cdb95eb99..6227dbf32c94a8794b1d9af2b9c5b72cb72517b5 100644 (file)
--- a/src/mathed/InsetMathLefteqn.cpp
+++ b/src/mathed/InsetMathLefteqn.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathLefteqn.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "support/std_ostream.h"
 
 

diff --git a/src/mathed/InsetMathLim.cpp b/src/mathed/InsetMathLim.cpp
index ed333d933bd734c4f325eba4d6e84a583bd93d5a..3fdd3b5e8abb530d93d1e6e81be22daff6d0f5b6 100644 (file)
--- a/src/mathed/InsetMathLim.cpp
+++ b/src/mathed/InsetMathLim.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathLim.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "debug.h"
 

diff --git a/src/mathed/InsetMathMBox.cpp b/src/mathed/InsetMathMBox.cpp
index 875f9f8447edbc8a05e9ab6722d524b1741c9088..adb16c5498154db6e8c31b824105802095875f10 100644 (file)
--- a/src/mathed/InsetMathMBox.cpp
+++ b/src/mathed/InsetMathMBox.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathMBox.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 
 #include "BufferView.h"

diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index 27b868c4a378a458a036cf44ce4737aacc2bba9f..1cde0ecfd8f02638f111f78a3d9aff62f2f91c28 100644 (file)
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -1,5 +1,5 @@
 /**
- * \file InsetMathMacro.cpp
+ * \file MathMacro.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "InsetMathMacro.h"
+#include "MathMacro.h"
 #include "MathSupport.h"
 #include "MathExtern.h"
 #include "MathStream.h"

diff --git a/src/mathed/InsetMathMacro.h b/src/mathed/InsetMathMacro.h
index cc2be0a014847f8fc718ee4d86fbeb8d6e27b1d7..b4ff0a4041b3591420ac19b56318740c1ee75c6f 100644 (file)
--- a/src/mathed/InsetMathMacro.h
+++ b/src/mathed/InsetMathMacro.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file InsetMathMacro.h
+ * \file MathMacro.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,7 +14,7 @@
 #define MATH_MACRO_H
 
 #include "InsetMathNest.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "InsetMathNest.h"
 #include "MathMacroTable.h"
 

diff --git a/src/mathed/InsetMathMakebox.cpp b/src/mathed/InsetMathMakebox.cpp
index fb6a0b09a422d42fb55c924a477c7a5d306cc18e..51fce619e6f13a77531e7facc5cb6743c8fac646 100644 (file)
--- a/src/mathed/InsetMathMakebox.cpp
+++ b/src/mathed/InsetMathMakebox.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathMakebox.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 

diff --git a/src/mathed/InsetMathMatrix.cpp b/src/mathed/InsetMathMatrix.cpp
index feb56cb3df61249d8c9c4c37488e872c1daa231f..7b19c38d9822a1a11e7ddf69f6204a57ad97496f 100644 (file)
--- a/src/mathed/InsetMathMatrix.cpp
+++ b/src/mathed/InsetMathMatrix.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathMatrix.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 
 

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 1d18ae086e81d67128b896f8395c1fed1c46db72..526a9c880f9666ea4851acda6cd53ca536ba5288 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -18,7 +18,7 @@
 #include "InsetMathBrace.h"
 #include "InsetMathColor.h"
 #include "InsetMathComment.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "InsetMathDelim.h"
 #include "MathFactory.h"
 #include "InsetMathHull.h"

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index 2157a623684729cb031b82ee306edf38bc29c700..a2a6ecd2b61cfc1d9a433e3383f7ac6f949db981 100644 (file)
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathOverset.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 
 #include "cursor.h"

diff --git a/src/mathed/InsetMathPar.cpp b/src/mathed/InsetMathPar.cpp
index 8cc933e9a330fc6221aeda39b5675f67c1958b3e..e0b6345bda513683c80d862a228468c9db122c1c 100644 (file)
--- a/src/mathed/InsetMathPar.cpp
+++ b/src/mathed/InsetMathPar.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathPar.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "support/std_ostream.h"
 

diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp
index 0817fc642c1b1cd8db484681f48eb07a491a7bab..9864fc390a2a2496b30f4a40d05544407ac6983b 100644 (file)
--- a/src/mathed/InsetMathRef.cpp
+++ b/src/mathed/InsetMathRef.cpp
@@ -20,7 +20,7 @@
 #include "funcrequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathFactory.h"
 #include "MathSupport.h"
 #include "outputparams.h"

diff --git a/src/mathed/InsetMathRef.h b/src/mathed/InsetMathRef.h
index 0d1504e097d1dc0c6152000f8a3e54929d52ff82..236759b4b5756ccbdf512f03ef1af8bcc7ecbfa1 100644 (file)
--- a/src/mathed/InsetMathRef.h
+++ b/src/mathed/InsetMathRef.h
@@ -13,7 +13,7 @@
 #define REF_INSET_H
 
 
-#include "InsetMathCommand.h"
+#include "CommandInset.h"
 
 
 namespace lyx {

diff --git a/src/mathed/InsetMathRoot.cpp b/src/mathed/InsetMathRoot.cpp
index 0d812391155a67bfa6ad2c20e852edc5c515096d..eb791c343ac52fc094a6ba4e618a317c56643543 100644 (file)
--- a/src/mathed/InsetMathRoot.cpp
+++ b/src/mathed/InsetMathRoot.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "InsetMathRoot.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "cursor.h"
 #include "LColor.h"

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 3080b60ce1dbd9fc036644ac6dfddce63485d19b..fa6046a7151ddecd300f36263c5ddc82578a1265 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathScript.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "InsetMathSymbol.h"

diff --git a/src/mathed/InsetMathSize.cpp b/src/mathed/InsetMathSize.cpp
index 23eb69812a97b387b2d0808b94b27d430232aeb8..91709a9532f86d4c65a3381c6c97c374cb45d235 100644 (file)
--- a/src/mathed/InsetMathSize.cpp
+++ b/src/mathed/InsetMathSize.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathSize.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathParser.h"
 #include "MathStream.h"
 

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index 8d3df0930b28499ebd585483ec25fcbeec27948e..41ede3c4d32176bd5158870cdf2bae6efb693c3b 100644 (file)
--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathSpace.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 
 #include "LaTeXFeatures.h"

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index a8575ac6878b8f199debd6c20b417c122bf62dfa..1a668b6fc45b61ad4bce778eec4f26168472a026 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathSplit.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 

diff --git a/src/mathed/InsetMathSqrt.cpp b/src/mathed/InsetMathSqrt.cpp
index 55d773c946df7648f34703ff8615e240e4b8f2c7..57faa1ccc05e93b16e2aa09b03c9f04d3029fc0d 100644 (file)
--- a/src/mathed/InsetMathSqrt.cpp
+++ b/src/mathed/InsetMathSqrt.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathSqrt.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "TextPainter.h"
 #include "LColor.h"

diff --git a/src/mathed/InsetMathStackrel.cpp b/src/mathed/InsetMathStackrel.cpp
index 9f1a9baba9b2d8eb9cdfd501bc33ad7577651e1e..3df8d284bf0a54b87914c5aa4f3be3d67b1c9b29 100644 (file)
--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathStackrel.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 
 

diff --git a/src/mathed/InsetMathSubstack.cpp b/src/mathed/InsetMathSubstack.cpp
index ef494f7f4528e349cd23bbbe0c0e88e169667627..24663ac44777d99f974cbca14ea97694d9a5404c 100644 (file)
--- a/src/mathed/InsetMathSubstack.cpp
+++ b/src/mathed/InsetMathSubstack.cpp
@@ -12,7 +12,7 @@
 
 #include "LaTeXFeatures.h"
 #include "InsetMathSubstack.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "support/std_ostream.h"
 

diff --git a/src/mathed/InsetMathTFrac.cpp b/src/mathed/InsetMathTFrac.cpp
index 84ed2b8157f686ee03e00f57124b910060c26590..a739904edde2bf2e9145bbf9a0e4170768416755 100644 (file)
--- a/src/mathed/InsetMathTFrac.cpp
+++ b/src/mathed/InsetMathTFrac.cpp
@@ -12,7 +12,7 @@
 
 #include "InsetMathTFrac.h"
 
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 
 #include "LaTeXFeatures.h"

diff --git a/src/mathed/InsetMathTabular.cpp b/src/mathed/InsetMathTabular.cpp
index 7445044e3e4e602d29ff09cf6c7284ca83abd84a..ac4381aa46149f51f28051b5301e6e7be98366e7 100644 (file)
--- a/src/mathed/InsetMathTabular.cpp
+++ b/src/mathed/InsetMathTabular.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathTabular.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 577d49e3bb5714ba9e5e969fcc0c0cfe20b85fb0..130e86d01f6d47f891934a355b88aeab126a9db4 100644 (file)
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathUnderset.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 
 #include "cursor.h"

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index dbd16ac31c53348a2e74c761fa462acc8eb130a7..08c234c274aa2cb3bb3f7ea0c2a301670ada20c8 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathXArrow.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"

diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am
index ec8f6725d20cbe48cf45c1fa7967b7d36384f6b2..062f88789590cae974a37ca58f15cb5ab75f4b0c 100644 (file)
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -32,8 +32,8 @@ libmathed_la_SOURCES = \
        InsetMathChar.h \
        InsetMathColor.cpp \
        InsetMathColor.h \
-       InsetMathCommand.cpp \
-       InsetMathCommand.h \
+       CommandInset.cpp \
+       CommandInset.h \
        InsetMathComment.cpp \
        InsetMathComment.h \
        InsetMathDecoration.cpp \
@@ -77,8 +77,8 @@ libmathed_la_SOURCES = \
        InsetMathLefteqn.h \
        InsetMathLim.cpp \
        InsetMathLim.h \
-       InsetMathMacro.cpp \
-       InsetMathMacro.h \
+       MathMacro.cpp \
+       MathMacro.h \
        InsetMathMakebox.cpp \
        InsetMathMakebox.h \
        InsetMathMatrix.cpp \
@@ -131,8 +131,8 @@ libmathed_la_SOURCES = \
        MathAtom.h \
        MathAutoCorrect.cpp \
        MathAutoCorrect.h \
-       MathData.cpp \
-       MathData.h \
+       MathArray.cpp \
+       MathArray.h \
        MathExtern.cpp \
        MathExtern.h \
        MathFactory.cpp \
@@ -146,7 +146,7 @@ libmathed_la_SOURCES = \
        MathMacroTemplate.h \
        MathParser.cpp \
        MathParser.h \
-       MathReplace.h \
+       ReplaceData.h \
        MathStream.cpp \
        MathStream.h \
        MathSupport.cpp \

diff --git a/src/mathed/MathAutoCorrect.cpp b/src/mathed/MathAutoCorrect.cpp
index c275a9341fa071ae663b78c98be38620c83a21c0..2b384d330e0f00e0c685a8549589e1c3be5ab277 100644 (file)
--- a/src/mathed/MathAutoCorrect.cpp
+++ b/src/mathed/MathAutoCorrect.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "MathAutoCorrect.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "InsetMath.h"
 #include "MathSupport.h"
 #include "MathParser.h"

diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index b0639032ff15c8c7c01ba05945ee519c68857401..805f8b5495d85ded6b8ff6a3aeb10b0aabbb8572 100644 (file)
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -1,5 +1,5 @@
 /**
- * \file MathData.cpp
+ * \file MathArray.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,14 +10,14 @@
 
 #include <config.h>
 
-#include "MathData.h"
+#include "MathArray.h"
 #include "InsetMathFont.h"
 #include "InsetMathScript.h"
-#include "InsetMathMacro.h"
+#include "MathMacro.h"
 #include "MathMacroTable.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "MathReplace.h"
+#include "ReplaceData.h"
 
 #include "BufferView.h"
 #include "buffer.h"

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index d3c916c28e4c797a90aa655527913bacec314911..5582a4682872da84b85c2b4b603c9bf47b265be8 100644 (file)
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file MathData.h
+ * \file MathArray.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 36ca80104ea63412c4bc7c996c8e442b83f552a5..a0ba5e33dccd23c54bf1f39e4889db9e15868664 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -18,7 +18,7 @@
 #include "InsetMathArray.h"
 #include "InsetMathChar.h"
 #include "InsetMathDelim.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "InsetMathDiff.h"
 #include "InsetMathExFunc.h"
 #include "InsetMathExInt.h"

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 6cb6e702bafcbee43c6118db5ecd80515f052425..5f5cb02192e2b9a5f3f072c20b97c594081d4e7c 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -30,7 +30,7 @@
 #include "InsetMathFrameBox.h"
 #include "InsetMathKern.h"
 #include "InsetMathLefteqn.h"
-#include "InsetMathMacro.h"
+#include "MathMacro.h"
 #include "InsetMathMakebox.h"
 #include "InsetMathOverset.h"
 #include "InsetMathPhantom.h"

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index 34029c00bd9149ddb37475dffeae2c9a06bf0810..6940b79e6a548ca415e81c429b2fe705a3531717 100644 (file)
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -13,7 +13,7 @@
 #ifndef MATH_MACROTEMPLATE_H
 #define MATH_MACROTEMPLATE_H
 
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathMacroTable.h"
 #include "InsetMathNest.h"
 

diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index c985057b997dc3686b178165fa00074e3965ec0f..05775dc795f5cdd851a6ea8efe3d2479e2d39361 100644 (file)
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -49,7 +49,7 @@ following hack as starting point to write some macros:
 #include "InsetMathDelim.h"
 #include "InsetMathEnv.h"
 #include "InsetMathKern.h"
-#include "InsetMathMacro.h"
+#include "MathMacro.h"
 #include "InsetMathPar.h"
 #include "InsetMathRef.h"
 #include "InsetMathRoot.h"

diff --git a/src/mathed/MathReplace.h b/src/mathed/MathReplace.h
index 9f0a92046ae84f1290e9493b180d4c47721c6964..dc8eb6b68f3403b4da187ae56c48263ed795747e 100644 (file)
--- a/src/mathed/MathReplace.h
+++ b/src/mathed/MathReplace.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file MathReplace.h
+ * \file ReplaceData.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_REPLACE_H
 
 
-#include "MathData.h"
+#include "MathArray.h"
 
 
 namespace lyx {

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index 83c95455e43fe77cddf761fe0b2908284b56ea80..e6d6f52522eeb2a713ca7c525f3b69949778507d 100644 (file)
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMath.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "MathExtern.h"
 #include "MathStream.h"
 

diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index 8f3aacb66b55503e3424677f0cec655247f98ac7..f828b06d587159fa64415bbc2f38ee415c499a38 100644 (file)
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "MathSupport.h"
-#include "MathData.h"
+#include "MathArray.h"
 #include "InsetMath.h"
 #include "MathStream.h"
 #include "MathParser.h"

diff --git a/src/text.C b/src/text.C
index 3a0f2d273b6b34425b80fcd8defc296b63f7a5c5..e45e444533ebaffcd1e3624f15dc54682528cf86 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -60,7 +60,7 @@
 #include "insets/InsetHFill.h"
 #include "insets/InsetLine.h"
 #include "insets/InsetNewline.h"
-#include "insets/InsetPageBreak.h"
+#include "insets/InsetPagebreak.h"
 #include "insets/InsetOptArg.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetSpecialChar.h"

diff --git a/src/undo.C b/src/undo.C
index 24fc399541d5c520c348f0bc8c107b12e31b4bcb..4344ceeb09c9284dd9c9cbcfec97d94d38f5ae82 100644 (file)
--- a/src/undo.C
+++ b/src/undo.C
@@ -26,7 +26,7 @@
 #include "ParagraphList.h"
 
 #include "mathed/MathSupport.h"
-#include "mathed/MathData.h"
+#include "mathed/MathArray.h"
 
 #include "insets/Inset.h"