Michael Schmitt's patch to remove unused arguments

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

diff --git a/src/cursor.C b/src/cursor.C
index 88c47b2c6bc6ae3ca2fcd936a0a0b423692665dc..709ac106c48b2d45f22d1d6ba880b4647aa4274f 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -180,7 +180,7 @@ void LCursor::getDim(int & asc, int & desc) const
                asc = row.baseline();
                desc = row.height() - asc;
        } else
-               innerInset()->getCursorDim(bv_, asc, desc);
+               innerInset()->getCursorDim(asc, desc);
 }
 
 
@@ -202,7 +202,7 @@ void LCursor::getPos(int & x, int & y) const
                // Ugly as you like.
                //inset->getCursorPos(bv_, x, y);
                //y = inset->insetInInsetY() + bv_->text->cursor.y();
-               inset->getCursorPos(bv_, x, y);
+               inset->getCursorPos(x, y);
                x += inset->x();
                y += cached_y_;
        }

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index ab6a38e7b4af534d901d1bd6b2f99f043cabe99b..943f852436e8600d156bd3387ba92055ed93873e 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+
+2003-11-21  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * insetcollapsable.[Ch]:
+       * insettabular.[Ch]:
+       * insettext.[Ch] (getCursorDim): squash unused variable
+
 2003-11-21  Alfredo Braunstein  <abraunst@lyx.org>
 
        * insettext.C (edit): x0_,y0_ -> xo_,yo_

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index 84e4e4a2856f166bd100074cc04eaab510e3f2da..46ae13c37d73784af5b551ce3ba6800c494a9d9d 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -330,9 +330,9 @@ void InsetCollapsable::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
+void InsetCollapsable::getCursorPos(int & x, int & y) const
 {
-       inset.getCursorPos(bv, x , y);
+       inset.getCursorPos(x , y);
        y += - ascent() + height_collapsed() + inset.ascent();
 }
 

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index 6885681c4087998c5c4ce18e926dff041fd74515..a5a96a8651115e9e57c8d703de77dbf3285a20cb 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -77,7 +77,7 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        /// get the screen x,y of the cursor
-       void getCursorPos(BufferView *, int & x, int & y) const;
+       void getCursorPos(int & x, int & y) const;
        ///
        void setFont(BufferView *, LyXFont const &, bool toggleall = false,
                 bool selectall = false);

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 7349c6af059e93d8821c5d978c1032803bd5ac4c..4bf5e49ea8e52eb1bd816890253631f6c3bf6eb6 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -970,7 +970,7 @@ void InsetTabular::calculate_dimensions_of_cells(MetricsInfo & mi) const
 }
 
 
-void InsetTabular::getCursorPos(BufferView *, int & x, int & y) const
+void InsetTabular::getCursorPos(int & x, int & y) const
 {
        x = TEXT_TO_INSET_OFFSET + cursorx_ - xo_;
        y = TEXT_TO_INSET_OFFSET + cursory_;

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index a13b2ec7cb325457cc73856bcdc8ee2463baf75a..a34237434139fc2738ceda003ac8da60138bc9da 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -110,7 +110,7 @@ public:
        ///
        InsetOld::Code lyxCode() const { return InsetOld::TABULAR_CODE; }
        /// get the absolute screen x,y of the cursor
-       void getCursorPos(BufferView *, int & x, int & y) const;
+       void getCursorPos(int & x, int & y) const;
        ///
        bool tabularFeatures(BufferView * bv, std::string const & what);
        ///

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 5235866cab02ca76d5a6d3b28afcdf674bd3069e..728a10e35bfe6036a34f272f23d5fb1ae8fa1cfb 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -438,7 +438,7 @@ void InsetText::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetText::getCursorPos(BufferView *, int & x, int & y) const
+void InsetText::getCursorPos(int & x, int & y) const
 {
        x = text_.cursor.x() + TEXT_TO_INSET_OFFSET;
        y = text_.cursor.y() - dim_.asc + TEXT_TO_INSET_OFFSET;

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index c2584e5c40cf793f55402ce82d34f87eb2b32ce8..a8b51994066427aa628a69df5d5dfd5550f87e3e 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -89,7 +89,7 @@ public:
        ///
        InsetOld::Code lyxCode() const { return InsetOld::TEXT_CODE; }
        /// FIXME, document
-       void getCursorPos(BufferView *, int & x, int & y) const;
+       void getCursorPos(int & x, int & y) const;
        ///
        int insetInInsetY() const;
        ///

diff --git a/src/insets/updatableinset.C b/src/insets/updatableinset.C
index 7ab4647b4356aa35946e33df7881ffc397c110c4..a0cc5e25cb8fc36f27c7543bc2f91915e493d84a 100644 (file)
--- a/src/insets/updatableinset.C
+++ b/src/insets/updatableinset.C
@@ -107,7 +107,7 @@ UpdatableInset::priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &)
 }
 
 
-void UpdatableInset::getCursorDim(BufferView *, int &, int &) const
+void UpdatableInset::getCursorDim(int &, int &) const
 {
        BOOST_ASSERT(false);
 }

diff --git a/src/insets/updatableinset.h b/src/insets/updatableinset.h
index f8d124c26c42d2aabfa2755459ad611036753441..2191ae1c365028c293010cd335ec419bc06cbd42 100644 (file)
--- a/src/insets/updatableinset.h
+++ b/src/insets/updatableinset.h
@@ -30,9 +30,9 @@ public:
        virtual EDITABLE editable() const;
 
        /// return the cursor pos, relative to the inset pos
-       virtual void getCursorPos(BufferView *, int &, int &) const {}
+       virtual void getCursorPos(int &, int &) const {}
        /// return the cursor dim
-       virtual void getCursorDim(BufferView *, int &, int &) const;
+       virtual void getCursorDim(int &, int &) const;
        ///
        virtual bool insertInset(BufferView *, InsetOld *) { return false; }
        ///

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 554e418681248efd65f1255ea90b190e31e2f55f..fd1e396b43c55a395f2c8542fe9a051c160cb2cc 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-21  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * formulabase.C (getCursorDim): squash unused variable
+
 2003-11-20  Angus Leeming  <leeming@lyx.org>
 
        * formulabase.C (getCursorDim): squash warning about unused variable.

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 7157c9d57f3d409cfd2686439a008762411f3247..d8a9aebb4aea46a8f61c43e95e0788171d7f52a9 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -170,7 +170,7 @@ void InsetFormulaBase::getCursor(BufferView &, int & x, int & y) const
 }
 
 
-void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
+void InsetFormulaBase::getCursorPos(int & x, int & y) const
 {
        if (!mathcursor) {
                lyxerr << "getCursorPos - should not happen";
@@ -186,7 +186,7 @@ void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
 }
 
 
-void InsetFormulaBase::getCursorDim(BufferView *, int & asc, int & desc) const
+void InsetFormulaBase::getCursorDim(int & asc, int & desc) const
 {
        if (!mathcursor)
                return;

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index 14455e69479d82828c6d041a29cdccc1f7941229..610d81ba18115872ca14d6786f731f294a9b3e61 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -45,9 +45,9 @@ public:
        /// what appears in the minibuffer when opening
        virtual std::string const editMessage() const;
        ///
-       virtual void getCursorPos(BufferView *, int &, int &) const;
+       virtual void getCursorPos(int &, int &) const;
        ///
-       virtual void getCursorDim(BufferView *, int &, int &) const;
+       virtual void getCursorDim(int &, int &) const;
        /// get the absolute document x,y of the cursor
        virtual void getCursor(BufferView & bv, int & x, int & y) const;
        ///