From 6e3a75969b97a5db4c80c46be49d4deb122abfe7 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Wed, 25 Apr 2007 16:11:45 +0000 Subject: [PATCH] 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 --- development/scons/scons_manifest.py | 16 ++++++++-------- po/POTFILES.in | 2 +- src/CutAndPaste.C | 2 +- src/cursor.C | 2 +- src/cursor_slice.C | 2 +- src/dociterator.C | 2 +- src/factory.C | 4 ++-- src/insets/InsetCite.cpp | 4 ++-- src/insets/InsetCite.h | 2 +- src/insets/InsetPageBreak.cpp | 4 ++-- src/insets/InsetPageBreak.h | 2 +- src/insets/Makefile.am | 8 ++++---- src/mathed/InsetMath.cpp | 2 +- src/mathed/InsetMath.h | 2 +- src/mathed/InsetMathAMSArray.cpp | 2 +- src/mathed/InsetMathArray.cpp | 2 +- src/mathed/InsetMathBinom.cpp | 2 +- src/mathed/InsetMathBoldSymbol.cpp | 2 +- src/mathed/InsetMathBox.cpp | 2 +- src/mathed/InsetMathBoxed.cpp | 2 +- src/mathed/InsetMathBrace.cpp | 2 +- src/mathed/InsetMathCases.cpp | 2 +- src/mathed/InsetMathColor.cpp | 2 +- src/mathed/InsetMathCommand.cpp | 6 +++--- src/mathed/InsetMathCommand.h | 2 +- src/mathed/InsetMathComment.cpp | 2 +- src/mathed/InsetMathDFrac.cpp | 2 +- src/mathed/InsetMathDecoration.cpp | 2 +- src/mathed/InsetMathDelim.cpp | 2 +- src/mathed/InsetMathDiff.cpp | 2 +- src/mathed/InsetMathEnv.cpp | 2 +- src/mathed/InsetMathExFunc.cpp | 2 +- src/mathed/InsetMathExInt.cpp | 2 +- src/mathed/InsetMathFBox.cpp | 2 +- src/mathed/InsetMathFont.cpp | 2 +- src/mathed/InsetMathFontOld.cpp | 2 +- src/mathed/InsetMathFrac.cpp | 2 +- src/mathed/InsetMathFracBase.cpp | 2 +- src/mathed/InsetMathFrameBox.cpp | 2 +- src/mathed/InsetMathGrid.cpp | 2 +- src/mathed/InsetMathHull.cpp | 2 +- src/mathed/InsetMathLefteqn.cpp | 2 +- src/mathed/InsetMathLim.cpp | 2 +- src/mathed/InsetMathMBox.cpp | 2 +- src/mathed/InsetMathMacro.cpp | 4 ++-- src/mathed/InsetMathMacro.h | 4 ++-- src/mathed/InsetMathMakebox.cpp | 2 +- src/mathed/InsetMathMatrix.cpp | 2 +- src/mathed/InsetMathNest.cpp | 2 +- src/mathed/InsetMathOverset.cpp | 2 +- src/mathed/InsetMathPar.cpp | 2 +- src/mathed/InsetMathRef.cpp | 2 +- src/mathed/InsetMathRef.h | 2 +- src/mathed/InsetMathRoot.cpp | 2 +- src/mathed/InsetMathScript.cpp | 2 +- src/mathed/InsetMathSize.cpp | 2 +- src/mathed/InsetMathSpace.cpp | 2 +- src/mathed/InsetMathSplit.cpp | 2 +- src/mathed/InsetMathSqrt.cpp | 2 +- src/mathed/InsetMathStackrel.cpp | 2 +- src/mathed/InsetMathSubstack.cpp | 2 +- src/mathed/InsetMathTFrac.cpp | 2 +- src/mathed/InsetMathTabular.cpp | 2 +- src/mathed/InsetMathUnderset.cpp | 2 +- src/mathed/InsetMathXArrow.cpp | 2 +- src/mathed/Makefile.am | 14 +++++++------- src/mathed/MathAutoCorrect.cpp | 2 +- src/mathed/MathData.cpp | 8 ++++---- src/mathed/MathData.h | 2 +- src/mathed/MathExtern.cpp | 2 +- src/mathed/MathFactory.cpp | 2 +- src/mathed/MathMacroTemplate.h | 2 +- src/mathed/MathParser.cpp | 2 +- src/mathed/MathReplace.h | 4 ++-- src/mathed/MathStream.cpp | 2 +- src/mathed/MathSupport.cpp | 2 +- src/text.C | 2 +- src/undo.C | 2 +- 78 files changed, 105 insertions(+), 105 deletions(-) diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index e96ca711e8..296598f5fc 100644 --- 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 56d284b61e..6bd78cf83d 100644 --- 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 20d7a46504..1286d1a94e 100644 --- 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 892f5b76fa..f74952606f 100644 --- 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 02e7b4ab62..98633ac98e 100644 --- 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 diff --git a/src/dociterator.C b/src/dociterator.C index 9f753c357a..c032f63964 100644 --- 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 50abb182bb..318044c750 100644 --- 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 df9704e538..e7f3fc86fd 100644 --- 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 -#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 8836c53352..f0fd1d7a73 100644 --- 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 f606e1fd31..65683cba6f 100644 --- 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 -#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 24d2240034..b018f5883e 100644 --- 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 dad6f58824..ac92f3ed32 100644 --- 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 64db5a2180..6e06d34fc8 100644 --- a/src/mathed/InsetMath.cpp +++ b/src/mathed/InsetMath.cpp @@ -12,7 +12,7 @@ #include #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 8e6988aadd..0dc38f57e4 100644 --- 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 3febc45cb1..67098ed64c 100644 --- 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 8732f50c9c..da7d3183c3 100644 --- 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 0a08e7bea3..17ec145390 100644 --- a/src/mathed/InsetMathBinom.cpp +++ b/src/mathed/InsetMathBinom.cpp @@ -11,7 +11,7 @@ #include #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 1d7c6f6760..3a82b02b10 100644 --- 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 0447e84467..8a4e87c550 100644 --- a/src/mathed/InsetMathBox.cpp +++ b/src/mathed/InsetMathBox.cpp @@ -11,7 +11,7 @@ #include #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 2ff48888f7..5b9db75c1d 100644 --- a/src/mathed/InsetMathBoxed.cpp +++ b/src/mathed/InsetMathBoxed.cpp @@ -11,7 +11,7 @@ #include #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 54b00d89c3..6a4f6b61a7 100644 --- a/src/mathed/InsetMathBrace.cpp +++ b/src/mathed/InsetMathBrace.cpp @@ -11,7 +11,7 @@ #include #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 86886299ba..64a1d48bd6 100644 --- a/src/mathed/InsetMathCases.cpp +++ b/src/mathed/InsetMathCases.cpp @@ -11,7 +11,7 @@ #include #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 c3358bfe34..5e0fed7b77 100644 --- a/src/mathed/InsetMathColor.cpp +++ b/src/mathed/InsetMathColor.cpp @@ -11,7 +11,7 @@ #include #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 076096ef48..23de2c5d52 100644 --- 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 -#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 d469f1e08e..bac6ddcbe1 100644 --- 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 ca0de54262..3faf713433 100644 --- a/src/mathed/InsetMathComment.cpp +++ b/src/mathed/InsetMathComment.cpp @@ -11,7 +11,7 @@ #include #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 5dded132b6..20616016ff 100644 --- a/src/mathed/InsetMathDFrac.cpp +++ b/src/mathed/InsetMathDFrac.cpp @@ -11,7 +11,7 @@ #include #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 f7a038bec8..f1c8a7c3f7 100644 --- a/src/mathed/InsetMathDecoration.cpp +++ b/src/mathed/InsetMathDecoration.cpp @@ -12,7 +12,7 @@ #include #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 a0f6aaad5d..86049818e5 100644 --- a/src/mathed/InsetMathDelim.cpp +++ b/src/mathed/InsetMathDelim.cpp @@ -12,7 +12,7 @@ #include #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 2f866d245b..61b87a36c8 100644 --- a/src/mathed/InsetMathDiff.cpp +++ b/src/mathed/InsetMathDiff.cpp @@ -11,7 +11,7 @@ #include #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 110d09b259..15584b6745 100644 --- a/src/mathed/InsetMathEnv.cpp +++ b/src/mathed/InsetMathEnv.cpp @@ -11,7 +11,7 @@ #include #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 9ede0e4340..77530973f8 100644 --- a/src/mathed/InsetMathExFunc.cpp +++ b/src/mathed/InsetMathExFunc.cpp @@ -11,7 +11,7 @@ #include #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 23fca486bc..9adfe507ce 100644 --- a/src/mathed/InsetMathExInt.cpp +++ b/src/mathed/InsetMathExInt.cpp @@ -11,7 +11,7 @@ #include #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 4eb91a8b97..135395bccb 100644 --- a/src/mathed/InsetMathFBox.cpp +++ b/src/mathed/InsetMathFBox.cpp @@ -11,7 +11,7 @@ #include #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 e079868a1a..6954cd03af 100644 --- a/src/mathed/InsetMathFont.cpp +++ b/src/mathed/InsetMathFont.cpp @@ -11,7 +11,7 @@ #include #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 d061280118..e70b7370f5 100644 --- a/src/mathed/InsetMathFontOld.cpp +++ b/src/mathed/InsetMathFontOld.cpp @@ -11,7 +11,7 @@ #include #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 924cebe79c..55ccf4bbe3 100644 --- a/src/mathed/InsetMathFrac.cpp +++ b/src/mathed/InsetMathFrac.cpp @@ -12,7 +12,7 @@ #include #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 22b0befb64..82e53915a1 100644 --- a/src/mathed/InsetMathFracBase.cpp +++ b/src/mathed/InsetMathFracBase.cpp @@ -11,7 +11,7 @@ #include #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 e77fe38fc6..2525898941 100644 --- a/src/mathed/InsetMathFrameBox.cpp +++ b/src/mathed/InsetMathFrameBox.cpp @@ -11,7 +11,7 @@ #include #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 53354fa623..336fbedccf 100644 --- a/src/mathed/InsetMathGrid.cpp +++ b/src/mathed/InsetMathGrid.cpp @@ -11,7 +11,7 @@ #include #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 cd3a59081b..d21174ce44 100644 --- 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 4122d781f9..6227dbf32c 100644 --- a/src/mathed/InsetMathLefteqn.cpp +++ b/src/mathed/InsetMathLefteqn.cpp @@ -11,7 +11,7 @@ #include #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 ed333d933b..3fdd3b5e8a 100644 --- a/src/mathed/InsetMathLim.cpp +++ b/src/mathed/InsetMathLim.cpp @@ -11,7 +11,7 @@ #include #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 875f9f8447..adb16c5498 100644 --- a/src/mathed/InsetMathMBox.cpp +++ b/src/mathed/InsetMathMBox.cpp @@ -11,7 +11,7 @@ #include #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 27b868c4a3..1cde0ecfd8 100644 --- 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 -#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 cc2be0a014..b4ff0a4041 100644 --- 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 fb6a0b09a4..51fce619e6 100644 --- a/src/mathed/InsetMathMakebox.cpp +++ b/src/mathed/InsetMathMakebox.cpp @@ -11,7 +11,7 @@ #include #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 feb56cb3df..7b19c38d98 100644 --- a/src/mathed/InsetMathMatrix.cpp +++ b/src/mathed/InsetMathMatrix.cpp @@ -11,7 +11,7 @@ #include #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 1d18ae086e..526a9c880f 100644 --- 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 2157a62368..a2a6ecd2b6 100644 --- a/src/mathed/InsetMathOverset.cpp +++ b/src/mathed/InsetMathOverset.cpp @@ -11,7 +11,7 @@ #include #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 8cc933e9a3..e0b6345bda 100644 --- a/src/mathed/InsetMathPar.cpp +++ b/src/mathed/InsetMathPar.cpp @@ -11,7 +11,7 @@ #include #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 0817fc642c..9864fc390a 100644 --- 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 0d1504e097..236759b4b5 100644 --- 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 0d81239115..eb791c343a 100644 --- a/src/mathed/InsetMathRoot.cpp +++ b/src/mathed/InsetMathRoot.cpp @@ -12,7 +12,7 @@ #include #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 3080b60ce1..fa6046a715 100644 --- a/src/mathed/InsetMathScript.cpp +++ b/src/mathed/InsetMathScript.cpp @@ -11,7 +11,7 @@ #include #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 23eb69812a..91709a9532 100644 --- a/src/mathed/InsetMathSize.cpp +++ b/src/mathed/InsetMathSize.cpp @@ -11,7 +11,7 @@ #include #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 8d3df0930b..41ede3c4d3 100644 --- a/src/mathed/InsetMathSpace.cpp +++ b/src/mathed/InsetMathSpace.cpp @@ -11,7 +11,7 @@ #include #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 a8575ac687..1a668b6fc4 100644 --- a/src/mathed/InsetMathSplit.cpp +++ b/src/mathed/InsetMathSplit.cpp @@ -11,7 +11,7 @@ #include #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 55d773c946..57faa1ccc0 100644 --- a/src/mathed/InsetMathSqrt.cpp +++ b/src/mathed/InsetMathSqrt.cpp @@ -11,7 +11,7 @@ #include #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 9f1a9baba9..3df8d284bf 100644 --- a/src/mathed/InsetMathStackrel.cpp +++ b/src/mathed/InsetMathStackrel.cpp @@ -11,7 +11,7 @@ #include #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 ef494f7f45..24663ac447 100644 --- 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 84ed2b8157..a739904edd 100644 --- 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 7445044e3e..ac4381aa46 100644 --- a/src/mathed/InsetMathTabular.cpp +++ b/src/mathed/InsetMathTabular.cpp @@ -11,7 +11,7 @@ #include #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 577d49e3bb..130e86d01f 100644 --- a/src/mathed/InsetMathUnderset.cpp +++ b/src/mathed/InsetMathUnderset.cpp @@ -11,7 +11,7 @@ #include #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 dbd16ac31c..08c234c274 100644 --- a/src/mathed/InsetMathXArrow.cpp +++ b/src/mathed/InsetMathXArrow.cpp @@ -11,7 +11,7 @@ #include #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 ec8f6725d2..062f887895 100644 --- 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 c275a9341f..2b384d330e 100644 --- a/src/mathed/MathAutoCorrect.cpp +++ b/src/mathed/MathAutoCorrect.cpp @@ -11,7 +11,7 @@ #include #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 b0639032ff..805f8b5495 100644 --- 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 -#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 d3c916c28e..5582a46828 100644 --- 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 36ca80104e..a0ba5e33dc 100644 --- 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 6cb6e702ba..5f5cb02192 100644 --- 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 34029c00bd..6940b79e6a 100644 --- 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 c985057b99..05775dc795 100644 --- 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 9f0a92046a..dc8eb6b68f 100644 --- 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 83c95455e4..e6d6f52522 100644 --- a/src/mathed/MathStream.cpp +++ b/src/mathed/MathStream.cpp @@ -11,7 +11,7 @@ #include #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 8f3aacb66b..f828b06d58 100644 --- a/src/mathed/MathSupport.cpp +++ b/src/mathed/MathSupport.cpp @@ -12,7 +12,7 @@ #include #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 3a0f2d273b..e45e444533 100644 --- 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 24fc399541..4344ceeb09 100644 --- 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" -- 2.39.2