From 5c40a062b2034f48f5b79079017bbaac8ba9363c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 17 Jul 2001 07:38:41 +0000 Subject: [PATCH] rename math_(root|grid).[Ch] to math_(root|grid)inset.[Ch] git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2259 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/ChangeLog | 7 +++- src/mathed/Makefile.am | 8 ++--- src/mathed/math_arrayinset.h | 2 +- src/mathed/math_cursor.C | 34 +++++++++----------- src/mathed/{math_grid.C => math_gridinset.C} | 4 +-- src/mathed/{math_grid.h => math_gridinset.h} | 0 src/mathed/math_matrixinset.h | 4 +-- src/mathed/math_parser.C | 22 ++++++------- src/mathed/{math_root.C => math_rootinset.C} | 2 +- src/mathed/{math_root.h => math_rootinset.h} | 0 10 files changed, 42 insertions(+), 41 deletions(-) rename src/mathed/{math_grid.C => math_gridinset.C} (98%) rename src/mathed/{math_grid.h => math_gridinset.h} (100%) rename src/mathed/{math_root.C => math_rootinset.C} (98%) rename src/mathed/{math_root.h => math_rootinset.h} (100%) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index b437db23f6..a14639c957 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,10 +1,15 @@ +2001-07-16 André Pönitz + + * math_grid.[Ch] -> math_gridinset.[Ch] + math_root.[Ch] -> math_rootinset.[Ch]: more consistent names + 2001-07-16 Lars Gullik Bjønnes * math_cursor.C (operator==): moved ouf of struct (operator<): ditto (normalAnchor): reversed one test (but shouldn't it really be >= ?) -2001-07-12 André Pönitz +2001-07-16 André Pönitz * math_cursor.[hC]: multicell selection (multicell pasete still defunct) diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index 5c1d408dce..d2e13830f7 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -35,8 +35,8 @@ libmathed_la_SOURCES = \ math_fracinset.h \ math_funcinset.C \ math_funcinset.h \ - math_grid.C \ - math_grid.h \ + math_gridinset.C \ + math_gridinset.h \ math_hash.C \ math_inset.C \ math_inset.h \ @@ -52,8 +52,8 @@ libmathed_la_SOURCES = \ math_matrixinset.h \ math_parser.C \ math_parser.h \ - math_root.C \ - math_root.h \ + math_rootinset.C \ + math_rootinset.h \ math_scriptinset.C \ math_scriptinset.h \ math_sizeinset.C \ diff --git a/src/mathed/math_arrayinset.h b/src/mathed/math_arrayinset.h index 8661877c37..71888145c8 100644 --- a/src/mathed/math_arrayinset.h +++ b/src/mathed/math_arrayinset.h @@ -2,7 +2,7 @@ #ifndef MATH_ARRAYINSET_H #define MATH_ARRAYINSET_H -#include "math_grid.h" +#include "math_gridinset.h" #ifdef __GNUG__ #pragma interface diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C index 6da2f7bbee..51fe37089e 100644 --- a/src/mathed/math_cursor.C +++ b/src/mathed/math_cursor.C @@ -23,33 +23,31 @@ #include #include -#include "math_inset.h" -#include "math_arrayinset.h" -#include "math_parser.h" -#include "math_cursor.h" -#include "math_macro.h" -#include "math_macroarg.h" -#include "math_macrotable.h" -#include "math_root.h" -#include "support/lstrings.h" #include "debug.h" #include "LColor.h" #include "Painter.h" -#include "math_matrixinset.h" -#include "math_grid.h" -#include "math_spaceinset.h" -#include "math_funcinset.h" +#include "mathed/support.h" +#include "formulabase.h" +#include "math_cursor.h" +#include "math_arrayinset.h" #include "math_bigopinset.h" -#include "math_fracinset.h" #include "math_decorationinset.h" -#include "math_dotsinset.h" #include "math_deliminset.h" +#include "math_dotsinset.h" +#include "math_fracinset.h" +#include "math_funcinset.h" +#include "math_gridinset.h" +#include "math_macro.h" +#include "math_macroarg.h" +#include "math_macrotable.h" #include "math_macrotemplate.h" +#include "math_matrixinset.h" +#include "math_rootinset.h" +#include "math_spaceinset.h" #include "math_sqrtinset.h" +#include "support/lstrings.h" #include "math_scriptinset.h" -#include "mathed/support.h" -#include "formulabase.h" - +#include "math_parser.h" using std::endl; using std::min; diff --git a/src/mathed/math_grid.C b/src/mathed/math_gridinset.C similarity index 98% rename from src/mathed/math_grid.C rename to src/mathed/math_gridinset.C index 5070ba661b..5b4afb14e2 100644 --- a/src/mathed/math_grid.C +++ b/src/mathed/math_gridinset.C @@ -2,7 +2,7 @@ #pragma implementation #endif -#include "math_grid.h" +#include "math_gridinset.h" #include "support/LOstream.h" #include "debug.h" @@ -386,7 +386,7 @@ void MathGridInset::idxDelete(int & idx, bool & popit, bool & deleteit) } -void MathGridInset::idxDeleteRange(int from, int to) +void MathGridInset::idxDeleteRange(int /*from*/, int /*to*/) { // leave this unimplemented unless someone wants to have it. /* diff --git a/src/mathed/math_grid.h b/src/mathed/math_gridinset.h similarity index 100% rename from src/mathed/math_grid.h rename to src/mathed/math_gridinset.h diff --git a/src/mathed/math_matrixinset.h b/src/mathed/math_matrixinset.h index c2daa85dad..950caa9e17 100644 --- a/src/mathed/math_matrixinset.h +++ b/src/mathed/math_matrixinset.h @@ -2,9 +2,7 @@ #ifndef MATH_MATRIXINSET_H #define MATH_MATRIXINSET_H -#include - -#include "math_grid.h" +#include "math_gridinset.h" #ifdef __GNUG__ #pragma interface diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 69bd62cb2f..c0e7a41653 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -28,22 +28,22 @@ #include "math_parser.h" #include "array.h" #include "math_inset.h" +#include "math_arrayinset.h" +#include "math_bigopinset.h" +#include "math_dotsinset.h" +#include "math_decorationinset.h" +#include "math_deliminset.h" +#include "math_fracinset.h" +#include "math_funcinset.h" #include "math_macro.h" #include "math_macrotable.h" #include "math_macrotemplate.h" -#include "math_root.h" -#include "math_arrayinset.h" -#include "math_sqrtinset.h" #include "math_matrixinset.h" -#include "math_bigopinset.h" -#include "math_funcinset.h" -#include "math_spaceinset.h" -#include "math_sizeinset.h" +#include "math_rootinset.h" #include "math_scriptinset.h" -#include "math_dotsinset.h" -#include "math_fracinset.h" -#include "math_deliminset.h" -#include "math_decorationinset.h" +#include "math_sizeinset.h" +#include "math_spaceinset.h" +#include "math_sqrtinset.h" #include "debug.h" #include "mathed/support.h" #include "lyxlex.h" diff --git a/src/mathed/math_root.C b/src/mathed/math_rootinset.C similarity index 98% rename from src/mathed/math_root.C rename to src/mathed/math_rootinset.C index e440b798af..427af7150e 100644 --- a/src/mathed/math_root.C +++ b/src/mathed/math_rootinset.C @@ -15,7 +15,7 @@ #pragma implementation #endif -#include "math_root.h" +#include "math_rootinset.h" #include "support/LOstream.h" #include "Painter.h" diff --git a/src/mathed/math_root.h b/src/mathed/math_rootinset.h similarity index 100% rename from src/mathed/math_root.h rename to src/mathed/math_rootinset.h -- 2.39.2