This removes a few BufferView * arguments that aren't used anymore.
Andre'
--
Those who desire to give up Freedom in order to gain Security, will not have,
nor do they deserve, either one. (T. Jefferson or B. Franklin or both...)
Index: BufferView_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.391
diff -u -p -r1.391 BufferView_pimpl.C
--- BufferView_pimpl.C 11 Jul 2003 12:21:30 -0000 1.391
+++ BufferView_pimpl.C 14 Jul 2003 14:13:54 -0000
@@ -656,7 +656,7 @@ void BufferView::Pimpl::update(LyXText *
text->partialRebreak();
if (text->inset_owner) {
- text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
+ text->inset_owner->setUpdateStatus(InsetText::NONE);
updateInset(text->inset_owner);
} else {
update();
@@ -675,7 +675,7 @@ void BufferView::Pimpl::update(BufferVie
text->partialRebreak();
if (text->inset_owner) {
- text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
+ text->inset_owner->setUpdateStatus(InsetText::NONE);
updateInset(text->inset_owner);
} else {
update();
Index: text2.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text2.C,v
retrieving revision 1.381
diff -u -p -r1.381 text2.C
--- text2.C 10 Jul 2003 11:17:31 -0000 1.381
+++ text2.C 14 Jul 2003 14:13:54 -0000
@@ -762,7 +762,7 @@ void LyXText::setSelection()
bool const lsel = TextCursor::setSelection();
if (inset_owner && (selection.set() || lsel))
- inset_owner->setUpdateStatus(bv(), InsetText::SELECTION);
+ inset_owner->setUpdateStatus(InsetText::SELECTION);
}
@@ -849,7 +849,7 @@ void LyXText::toggleFree(LyXFont const &
selection.cursor = cursor;
}
if (inset_owner)
- inset_owner->setUpdateStatus(bv(), InsetText::CURSOR_PAR);
+ inset_owner->setUpdateStatus(InsetText::CURSOR_PAR);
}
Index: insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.150
diff -u -p -r1.150 insetcollapsable.C
--- insets/insetcollapsable.C 4 Jul 2003 08:23:21 -0000 1.150
+++ insets/insetcollapsable.C 14 Jul 2003 14:13:54 -0000
@@ -236,7 +236,7 @@ void InsetCollapsable::lfunMouseRelease(
if (collapsed_ && cmd.button() != mouse_button::button3) {
collapsed_ = false;
- inset.setUpdateStatus(bv, InsetText::FULL);
+ inset.setUpdateStatus(InsetText::FULL);
bv->updateInset(this);
bv->buffer()->markDirty();
return;
@@ -247,7 +247,7 @@ void InsetCollapsable::lfunMouseRelease(
{
if (collapsed_) {
collapsed_ = false;
- inset.setUpdateStatus(bv, InsetText::FULL);
+ inset.setUpdateStatus(InsetText::FULL);
bv->updateInset(this);
bv->buffer()->markDirty();
} else {
@@ -317,7 +317,7 @@ Inset::RESULT InsetCollapsable::localDis
if (collapsed_) {
collapsed_ = false;
if (bv->lockInset(this)) {
- inset.setUpdateStatus(bv,
InsetText::FULL);
+ inset.setUpdateStatus(InsetText::FULL);
bv->updateInset(this);
bv->buffer()->markDirty();
inset.localDispatch(cmd);
Index: insets/insetert.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetert.C,v
retrieving revision 1.134
diff -u -p -r1.134 insetert.C
--- insets/insetert.C 30 Jun 2003 23:56:18 -0000 1.134
+++ insets/insetert.C 14 Jul 2003 14:13:54 -0000
@@ -585,7 +585,7 @@ void InsetERT::status(BufferView * bv, E
switch (st) {
case Inlined:
if (bv)
- inset.setUpdateStatus(bv, InsetText::INIT);
+ inset.setUpdateStatus(InsetText::INIT);
break;
case Open:
collapsed_ = false;
Index: insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.423
diff -u -p -r1.423 insettext.C
--- insets/insettext.C 14 Jul 2003 13:49:13 -0000 1.423
+++ insets/insettext.C 14 Jul 2003 14:13:54 -0000
@@ -337,7 +337,7 @@ void InsetText::draw(PainterInfo & pi, i
if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) {
inset_x = cix(bv) - int(x) + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
}
x += TEXT_TO_INSET_OFFSET;
@@ -435,7 +435,7 @@ void InsetText::update(BufferView * bv,
if (the_locking_inset) {
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
the_locking_inset->update(bv, reinit);
}
@@ -457,7 +457,7 @@ void InsetText::update(BufferView * bv,
}
-void InsetText::setUpdateStatus(BufferView *, int what) const
+void InsetText::setUpdateStatus(int what) const
{
need_update |= what;
// we have to redraw us full if our LyXText REFRESH_AREA or
@@ -486,7 +486,7 @@ void InsetText::updateLocal(BufferView *
collapseParagraphs(bv);
text_.partialRebreak();
- setUpdateStatus(bv, what);
+ setUpdateStatus(what);
bool flag = mark_dirty ||
(((need_update != CURSOR) && (need_update != NONE)) ||
(text_.refreshStatus() != LyXText::REFRESH_NONE) ||
text_.selection.set());
@@ -548,7 +548,7 @@ void InsetText::insetUnlock(BufferView *
updateLocal(bv, code, false);
#else
if (code != NONE)
- setUpdateStatus(bv, code);
+ setUpdateStatus(code);
#endif
}
@@ -575,7 +575,7 @@ void InsetText::lockInset(BufferView * b
int code = CURSOR;
if (drawFrame_ == LOCKED)
code = CURSOR|DRAW_FRAME;
- setUpdateStatus(bv, code);
+ setUpdateStatus(code);
}
@@ -583,7 +583,7 @@ void InsetText::lockInset(BufferView * b
{
the_locking_inset = inset;
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
inset_pos = cpos();
inset_par = cpar();
inset_boundary = cboundary();
@@ -630,7 +630,7 @@ bool InsetText::lockInsetInInset(BufferV
if (cpar() == inset_par && cpos() == inset_pos) {
lyxerr[Debug::INSETS] << "OK" << endl;
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
} else {
lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
}
@@ -691,17 +691,17 @@ bool InsetText::updateInsetInInset(Buffe
if (found)
text_.updateInset(tl_inset);
if (found)
- setUpdateStatus(bv, ustat);
+ setUpdateStatus(ustat);
return found;
}
bool found = text_.updateInset(inset);
if (found) {
- setUpdateStatus(bv, CURSOR_PAR);
+ setUpdateStatus(CURSOR_PAR);
if (the_locking_inset &&
cpar() == inset_par && cpos() == inset_pos)
{
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
}
}
return found;
@@ -822,7 +822,7 @@ bool InsetText::lfunMouseRelease(FuncReq
ret = inset->localDispatch(cmd1);
else {
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
cmd1.x = cmd.x - inset_x;
cmd1.y = cmd.x - inset_y;
inset->edit(bv, cmd1.x, cmd1.y, cmd.button());
@@ -1534,7 +1534,7 @@ void InsetText::getCursor(BufferView & b
return;
}
x = cx(&bv);
- y = cy(&bv) + InsetText::y();
+ y = cy() + InsetText::y();
}
@@ -1545,7 +1545,7 @@ void InsetText::getCursorPos(BufferView
return;
}
x = cx(bv) - top_x - TEXT_TO_INSET_OFFSET;
- y = cy(bv) - TEXT_TO_INSET_OFFSET;
+ y = cy() - TEXT_TO_INSET_OFFSET;
}
@@ -1570,7 +1570,7 @@ void InsetText::fitInsetCursor(BufferVie
int const asc = font_metrics::maxAscent(font);
int const desc = font_metrics::maxDescent(font);
- if (bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc))
+ if (bv->fitLockedInsetCursor(cx(bv), cy(), asc, desc))
need_update |= FULL;
}
@@ -1801,7 +1801,7 @@ bool InsetText::checkAndActivateInset(Bu
if (y < 0)
y = dim_.des;
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
inset->localDispatch(cmd);
if (!the_locking_inset)
@@ -1936,13 +1936,13 @@ int InsetText::cix(BufferView * bv) cons
}
-int InsetText::cy(BufferView * bv) const
+int InsetText::cy() const
{
return text_.cursor.y() - dim_.asc + TEXT_TO_INSET_OFFSET;
}
-int InsetText::ciy(BufferView * bv) const
+int InsetText::ciy() const
{
return text_.cursor.iy() - dim_.asc + TEXT_TO_INSET_OFFSET;
}
@@ -2032,7 +2032,7 @@ void InsetText::resizeLyXText(BufferView
if (the_locking_inset) {
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
}
text_.top_y(bv->screen().topCursorVisible(&text_));
@@ -2063,7 +2063,7 @@ void InsetText::reinitLyXText() const
restoreLyXTextState();
if (the_locking_inset) {
inset_x = cix(bv) - top_x + drawTextXOffset;
- inset_y = ciy(bv) + drawTextYOffset;
+ inset_y = ciy() + drawTextYOffset;
}
text_.top_y(bv->screen().topCursorVisible(&text_));
if (!owner()) {
@@ -2192,7 +2192,7 @@ InsetText::selectNextWordToSpellcheck(Bu
if (the_locking_inset) {
word = the_locking_inset->selectNextWordToSpellcheck(bv, value);
if (!word.word().empty()) {
- value += cy(bv);
+ value += cy();
return word;
}
// we have to go on checking so move cursor to the next char
@@ -2202,7 +2202,7 @@ InsetText::selectNextWordToSpellcheck(Bu
if (word.word().empty())
bv->unlockInset(const_cast<InsetText *>(this));
else
- value = cy(bv);
+ value = cy();
return word;
}
Index: insets/insettext.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.h,v
retrieving revision 1.174
diff -u -p -r1.174 insettext.h
--- insets/insettext.h 10 Jul 2003 14:44:13 -0000 1.174
+++ insets/insettext.h 14 Jul 2003 14:13:54 -0000
@@ -94,7 +94,7 @@ public:
///
void update(BufferView *, bool = false);
///
- void setUpdateStatus(BufferView *, int what) const;
+ void setUpdateStatus(int what) const;
///
string const editMessage() const;
///
@@ -306,9 +306,9 @@ private:
///
int cix(BufferView *) const;
///
- int cy(BufferView *) const;
+ int cy() const;
///
- int ciy(BufferView *) const;
+ int ciy() const;
///
lyx::pos_type cpos() const;
///
