From f34e4919f71ca3af1a56b7b24134254481539249 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Thu, 8 Nov 2001 12:55:58 +0000 Subject: [PATCH] cosmetics: rename (x)array.[Ch] into math_(x)data.[Ch] git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2988 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/Makefile.am | 10 +++++----- src/mathed/{array.C => math_data.C} | 20 ++++++++++---------- src/mathed/{array.h => math_data.h} | 0 src/mathed/math_inset.h | 2 +- src/mathed/math_macro.C | 1 - src/mathed/math_parser.C | 3 +-- src/mathed/{xarray.C => math_xdata.C} | 1 - src/mathed/{xarray.h => math_xdata.h} | 3 ++- 8 files changed, 19 insertions(+), 21 deletions(-) rename src/mathed/{array.C => math_data.C} (92%) rename src/mathed/{array.h => math_data.h} (100%) rename src/mathed/{xarray.C => math_xdata.C} (99%) rename src/mathed/{xarray.h => math_xdata.h} (97%) diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index ee2683fc12..e3962acf03 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -8,10 +8,6 @@ BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES) libmathed_la_SOURCES = \ - array.C \ - array.h \ - xarray.C \ - xarray.h \ formulabase.C \ formulabase.h \ formula.C \ @@ -34,6 +30,8 @@ libmathed_la_SOURCES = \ math_charinset.h \ math_cursor.C \ math_cursor.h \ + math_data.C \ + math_data.h \ math_decorationinset.C \ math_decorationinset.h \ math_defs.h \ @@ -107,4 +105,6 @@ libmathed_la_SOURCES = \ math_support.C \ math_support.h \ math_symbolinset.C \ - math_symbolinset.h + math_symbolinset.h \ + math_xdata.C \ + math_xdata.h diff --git a/src/mathed/array.C b/src/mathed/math_data.C similarity index 92% rename from src/mathed/array.C rename to src/mathed/math_data.C index 6fa0b879b6..30821404d1 100644 --- a/src/mathed/array.C +++ b/src/mathed/math_data.C @@ -8,8 +8,8 @@ #include "math_stringinset.h" #include "math_mathmlstream.h" #include "math_support.h" +#include "math_data.h" #include "debug.h" -#include "array.h" #include "support/LAssert.h" @@ -17,8 +17,8 @@ MathArray::MathArray() {} -MathArray::MathArray(MathArray const & array, size_type from, size_type to) - : bf_(array.begin() + from, array.begin() + to) +MathArray::MathArray(MathArray const & ar, size_type from, size_type to) + : bf_(ar.begin() + from, ar.begin() + to) {} @@ -62,9 +62,9 @@ void MathArray::insert(size_type pos, MathAtom const & t) } -void MathArray::insert(size_type pos, MathArray const & array) +void MathArray::insert(size_type pos, MathArray const & ar) { - bf_.insert(begin() + pos, array.begin(), array.end()); + bf_.insert(begin() + pos, ar.begin(), ar.end()); } @@ -74,9 +74,9 @@ void MathArray::push_back(MathAtom const & t) } -void MathArray::push_back(MathArray const & array) +void MathArray::push_back(MathArray const & ar) { - insert(size(), array); + insert(size(), ar); } @@ -86,10 +86,10 @@ void MathArray::clear() } -void MathArray::swap(MathArray & array) +void MathArray::swap(MathArray & ar) { - if (this != &array) - bf_.swap(array.bf_); + if (this != &ar) + bf_.swap(ar.bf_); } diff --git a/src/mathed/array.h b/src/mathed/math_data.h similarity index 100% rename from src/mathed/array.h rename to src/mathed/math_data.h diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h index 5d8098e8bd..a710af65d7 100644 --- a/src/mathed/math_inset.h +++ b/src/mathed/math_inset.h @@ -28,7 +28,7 @@ #pragma interface #endif -#include "xarray.h" +#include "math_xdata.h" #include "math_defs.h" /** Abstract base class for all math objects. diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C index 5bada3e06f..707548ec2d 100644 --- a/src/mathed/math_macro.C +++ b/src/mathed/math_macro.C @@ -19,7 +19,6 @@ #endif #include "math_macro.h" -#include "array.h" #include "support/lstrings.h" #include "support/LAssert.h" #include "debug.h" diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 4da7787d9c..5384cb5625 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -53,7 +53,6 @@ point to write some macros: #endif #include "math_parser.h" -#include "array.h" #include "math_inset.h" #include "math_arrayinset.h" #include "math_braceinset.h" @@ -72,9 +71,9 @@ point to write some macros: #include "math_specialcharinset.h" #include "math_splitinset.h" #include "math_sqrtinset.h" -#include "debug.h" #include "math_support.h" #include "lyxlex.h" +#include "debug.h" #include "support/lstrings.h" using std::istream; diff --git a/src/mathed/xarray.C b/src/mathed/math_xdata.C similarity index 99% rename from src/mathed/xarray.C rename to src/mathed/math_xdata.C index 5e848f119d..f0deef476e 100644 --- a/src/mathed/xarray.C +++ b/src/mathed/math_xdata.C @@ -4,7 +4,6 @@ #pragma implementation #endif -#include "xarray.h" #include "math_inset.h" #include "math_scriptinset.h" #include "math_support.h" diff --git a/src/mathed/xarray.h b/src/mathed/math_xdata.h similarity index 97% rename from src/mathed/xarray.h rename to src/mathed/math_xdata.h index b67d3b9681..d59caa04f4 100644 --- a/src/mathed/xarray.h +++ b/src/mathed/math_xdata.h @@ -4,7 +4,8 @@ #define MATHEDXARRAY_H #include -#include "array.h" + +#include "math_data.h" #include "math_metricsinfo.h" #ifdef __GNUG__ -- 2.39.2