From: André Pönitz Date: Mon, 1 Oct 2001 12:23:00 +0000 (+0000) Subject: remove public method; X-Git-Tag: 1.6.10~20533 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e9baa06e515a764ed6193a7f99d3e6ff06fe6122;p=features.git remove public method; add a static_cast<> git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2827 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 213091f596..156d8d937f 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -5,6 +5,12 @@ * math_fracbase.C: change parameter types to match MathInset +2001-10-01 André Pönitz + + * math_cursor.[Ch]: remove local parInset() method + + * math_macro.C: add a static_cast + 2001-09-27 Jean-Marc Lasgouttes * math_cursor.C: fix type mismatches with what was declared in diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C index a9ae33e68b..ef4472dda5 100644 --- a/src/mathed/math_cursor.C +++ b/src/mathed/math_cursor.C @@ -174,11 +174,6 @@ bool MathCursor::popRight() } -MathInset * MathCursor::parInset(int i) const -{ - return Cursor_[i].par_; -} - #if FILEDEBUG void MathCursor::dump(char const *) const @@ -221,7 +216,7 @@ void MathCursor::dump(char const *) const {} bool MathCursor::isInside(MathInset const * p) const { for (unsigned i = 0; i < Cursor_.size(); ++i) - if (parInset(i) == p) + if (Cursor_[i].par_ == p) return true; return false; } diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h index 7137547ad5..d37b66a554 100644 --- a/src/mathed/math_cursor.h +++ b/src/mathed/math_cursor.h @@ -245,8 +245,6 @@ public: /// pos_type last() const; /// - MathInset * parInset(int i) const; - /// MathMatrixInset * outerPar() const; /// void seldump(char const * str) const; diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C index b55febbb7d..9dcf8a9aec 100644 --- a/src/mathed/math_macro.C +++ b/src/mathed/math_macro.C @@ -119,7 +119,7 @@ void MathMacro::draw(Painter & pain, int x, int y) const h += std::max(c.ascent(), lasc) + 5; c.draw(pain, x + lwid, h); char str[] = "#1:"; - str[1] += i; + str[1] += static_cast(i); drawStr(pain, LM_TC_TEX, size(), x + 3, h, str); h += std::max(c.descent(), ldes) + 5; }