anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The lv variable was used back in LyXView.cpp, where we didn't have such

Browse Source 
easy access to the current view. So we don't need it. Moreover, it seems
to me that using lv in some of these places could cause bugs. What if
the current_view_ has changed? Then we could be updating completion on
the wrong thing?


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34072 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-04-07 12:41:19 +00:00
parent 1d1b204eb2
commit 23eade51a8
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontends/qt4/GuiApplication.cpp
View File

@ -1225,7 +1225,6 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
// Assumes that the action will be dispatched.
dr.dispatched(true);
GuiView * lv = current_view_;
switch (cmd.action) {
case LFUN_WINDOW_NEW:
@ -1560,15 +1559,15 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
default:
// Everything below is only for active window
if (lv == 0)
if (current_view_ == 0)
break;
// Let the current GuiView dispatch its own actions.
lv->dispatch(cmd, dr);
current_view_->dispatch(cmd, dr);
if (dr.dispatched())
break;
BufferView * bv = lv->currentBufferView();
BufferView * bv = current_view_->currentBufferView();
LASSERT(bv, /**/);
// Let the current BufferView dispatch its own actions.
@ -1576,7 +1575,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
if (dr.dispatched())
break;
BufferView * doc_bv = lv->documentBufferView();
BufferView * doc_bv = current_view_->documentBufferView();
// Try with the document BufferView dispatch if any.
if (doc_bv) {
doc_bv->dispatch(cmd, dr);
@ -1614,24 +1613,24 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
if (cmd.origin == FuncRequest::KEYBOARD) {
if (cmd.action == LFUN_SELF_INSERT
|| (cmd.action == LFUN_ERT_INSERT && bv->cursor().inMathed()))
lv->updateCompletion(bv->cursor(), true, true);
current_view_->updateCompletion(bv->cursor(), true, true);
else if (cmd.action == LFUN_CHAR_DELETE_BACKWARD)
lv->updateCompletion(bv->cursor(), false, true);
current_view_->updateCompletion(bv->cursor(), false, true);
else
lv->updateCompletion(bv->cursor(), false, false);
current_view_->updateCompletion(bv->cursor(), false, false);
}
dr = bv->cursor().result();
}
// if we executed a mutating lfun, mark the buffer as dirty
Buffer * doc_buffer = (lv && lv->documentBufferView())
? &(lv->documentBufferView()->buffer()) : 0;
Buffer * doc_buffer = (current_view_ && current_view_->documentBufferView())
? &(current_view_->documentBufferView()->buffer()) : 0;
if (doc_buffer && theBufferList().isLoaded(doc_buffer)
&& flag.enabled()
&& !lyxaction.funcHasFlag(action, LyXAction::NoBuffer)
&& !lyxaction.funcHasFlag(action, LyXAction::ReadOnly))
lv->currentBufferView()->buffer().markDirty();
current_view_->currentBufferView()->buffer().markDirty();
}