anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 21:05:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* LyXView: get rid of two pure virtual methods.

Browse Source 
* GuiView.h: link fix, sorry.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31287 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2009-09-05 14:48:36 +00:00
parent 722d8c757b
commit b4b19b59a3
3 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/LyXFunc.cpp
View File

@ -229,7 +229,7 @@ void LyXFunc::handleKeyFunc(FuncCode action)
LASSERT(lyx_view_ && lyx_view_->currentBufferView(), /**/); LASSERT(lyx_view_ && lyx_view_->currentBufferView(), /**/);
lyx_view_->currentBufferView()->getIntl().getTransManager().deadkey( lyx_view_->currentBufferView()->getIntl().getTransManager().deadkey(
c, get_accent(action).accent, view()->cursor().innerText(), c, get_accent(action).accent, view()->cursor().innerText(),
currentBufferView()->cursor()); view()->cursor());
// Need to clear, in case the minibuffer calls these // Need to clear, in case the minibuffer calls these
// actions // actions
keyseq.clear(); keyseq.clear();
@ -267,7 +267,8 @@ void LyXFunc::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0")); dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0"));
// if the current buffer is not that one, switch to it. // if the current buffer is not that one, switch to it.
if (!lyx_view_->buffer() || lyx_view_->buffer()->fileName() != tmp.filename) { if (!lyx_view_->documentBufferView()
|| lyx_view_->documentBufferView()->buffer().fileName() != tmp.filename) {
if (!switchToBuffer) if (!switchToBuffer)
return; return;
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file)); dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
@ -414,7 +415,8 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
if (lyx_view_ if (lyx_view_
&& (cmd.origin != FuncRequest::MENU || lyx_view_->hasFocus())) { && (cmd.origin != FuncRequest::MENU || lyx_view_->hasFocus())) {
lv = lyx_view_; lv = lyx_view_;
buf = lyx_view_->buffer(); if (lyx_view_->documentBufferView())
buf = &lyx_view_->documentBufferView()->buffer();
} }
if (cmd.action == LFUN_NOACTION) { if (cmd.action == LFUN_NOACTION) {
@ -819,7 +821,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
if (lyx_view_) if (lyx_view_)
lyx_view_->restartCursor(); lyx_view_->restartCursor();
} else { } else {
Buffer * buffer = lyx_view_ ? lyx_view_->buffer() : 0; Buffer * buffer = 0;
if (lyx_view_ && lyx_view_->currentBufferView())
buffer = &lyx_view_->currentBufferView()->buffer();
switch (action) { switch (action) {
case LFUN_WORD_FIND_FORWARD: case LFUN_WORD_FIND_FORWARD:
@ -901,42 +905,42 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
} }
case LFUN_BUFFER_UPDATE: { case LFUN_BUFFER_UPDATE: {
LASSERT(lyx_view_ && lyx_view_->documentBuffer(), /**/); LASSERT(lyx_view_ && lyx_view_->documentBufferView(), /**/);
Buffer * doc_buffer = lyx_view_->documentBuffer(); Buffer & doc_buffer = lyx_view_->documentBufferView()->buffer();
string format = argument; string format = argument;
if (argument.empty()) if (argument.empty())
format = doc_buffer->getDefaultOutputFormat(); format = doc_buffer.getDefaultOutputFormat();
doc_buffer->doExport(format, true); doc_buffer.doExport(format, true);
break; break;
} }
case LFUN_BUFFER_VIEW: { case LFUN_BUFFER_VIEW: {
LASSERT(lyx_view_ && lyx_view_->documentBuffer(), /**/); LASSERT(lyx_view_ && lyx_view_->documentBufferView(), /**/);
Buffer * doc_buffer = lyx_view_->documentBuffer(); Buffer & doc_buffer = lyx_view_->documentBufferView()->buffer();
string format = argument; string format = argument;
if (argument.empty()) if (argument.empty())
format = doc_buffer->getDefaultOutputFormat(); format = doc_buffer.getDefaultOutputFormat();
doc_buffer->preview(format); doc_buffer.preview(format);
break; break;
} }
case LFUN_MASTER_BUFFER_UPDATE: { case LFUN_MASTER_BUFFER_UPDATE: {
LASSERT(lyx_view_ && lyx_view_->documentBuffer() && lyx_view_->documentBuffer()->masterBuffer(), /**/); LASSERT(lyx_view_ && lyx_view_->documentBufferView(), /**/);
Buffer * doc_buffer = lyx_view_->documentBuffer(); Buffer & doc_buffer = lyx_view_->documentBufferView()->buffer();
string format = argument; string format = argument;
if (argument.empty()) if (argument.empty())
format = doc_buffer->masterBuffer()->getDefaultOutputFormat(); format = doc_buffer.masterBuffer()->getDefaultOutputFormat();
doc_buffer->masterBuffer()->doExport(format, true); doc_buffer.masterBuffer()->doExport(format, true);
break; break;
} }
case LFUN_MASTER_BUFFER_VIEW: { case LFUN_MASTER_BUFFER_VIEW: {
LASSERT(lyx_view_ && lyx_view_->documentBuffer() && lyx_view_->documentBuffer()->masterBuffer(), /**/); LASSERT(lyx_view_ && lyx_view_->documentBufferView(), /**/);
Buffer * doc_buffer = lyx_view_->documentBuffer(); Buffer & doc_buffer = lyx_view_->documentBufferView()->buffer();
string format = argument; string format = argument;
if (argument.empty()) if (argument.empty())
format = doc_buffer->masterBuffer()->getDefaultOutputFormat(); format = doc_buffer.masterBuffer()->getDefaultOutputFormat();
doc_buffer->masterBuffer()->preview(format); doc_buffer.masterBuffer()->preview(format);
break; break;
} }
@ -1341,7 +1345,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
break; break;
case LFUN_KEYMAP_OFF: case LFUN_KEYMAP_OFF:
LASSERT(lyx_view_ && lyx_view_->view(), /**/); LASSERT(lyx_view_ && lyx_view_->currentBufferView(), /**/);
lyx_view_->currentBufferView()->getIntl().keyMapOn(false); lyx_view_->currentBufferView()->getIntl().keyMapOn(false);
break; break;
@ -1759,7 +1763,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
&& !lyxaction.funcHasFlag(action, LyXAction::ReadOnly)) && !lyxaction.funcHasFlag(action, LyXAction::ReadOnly))
buffer->markDirty(); buffer->markDirty();
if (lyx_view_ && lyx_view_->buffer()) { if (lyx_view_ && lyx_view_->currentBufferView()) {
// BufferView::update() updates the ViewMetricsInfo and // BufferView::update() updates the ViewMetricsInfo and
// also initializes the position cache for all insets in // also initializes the position cache for all insets in
// (at least partially) visible top-level paragraphs. // (at least partially) visible top-level paragraphs.
@ -1828,14 +1832,15 @@ void LyXFunc::sendDispatchMessage(docstring const & msg, FuncRequest const & cmd
void LyXFunc::reloadBuffer() void LyXFunc::reloadBuffer()
{ {
FileName filename = lyx_view_->buffer()->fileName(); Buffer * buf = &lyx_view_->documentBufferView()->buffer();
FileName filename = buf->fileName();
// The user has already confirmed that the changes, if any, should // The user has already confirmed that the changes, if any, should
// be discarded. So we just release the Buffer and don't call closeBuffer(); // be discarded. So we just release the Buffer and don't call closeBuffer();
theBufferList().release(lyx_view_->buffer()); theBufferList().release(buf);
// if the lyx_view_ has been destroyed, create a new one // if the lyx_view_ has been destroyed, create a new one
if (!lyx_view_) if (!lyx_view_)
theApp()->dispatch(FuncRequest(LFUN_WINDOW_NEW)); theApp()->dispatch(FuncRequest(LFUN_WINDOW_NEW));
Buffer * buf = lyx_view_->loadDocument(filename); buf = lyx_view_->loadDocument(filename);
docstring const disp_fn = makeDisplayPath(filename.absFilename()); docstring const disp_fn = makeDisplayPath(filename.absFilename());
docstring str; docstring str;
if (buf) { if (buf) {
@ -1880,7 +1885,7 @@ docstring LyXFunc::viewStatusMessage()
return keyseq.printOptions(true); return keyseq.printOptions(true);
LASSERT(lyx_view_, /**/); LASSERT(lyx_view_, /**/);
if (!lyx_view_->buffer()) if (!lyx_view_->currentBufferView())
return _("Welcome to LyX!"); return _("Welcome to LyX!");
return view()->cursor().currentState(); return view()->cursor().currentState();

8
src/frontends/LyXView.h
View File

@ -63,14 +63,6 @@ public:
virtual BufferView * documentBufferView() = 0; virtual BufferView * documentBufferView() = 0;
virtual BufferView const * documentBufferView() const = 0; virtual BufferView const * documentBufferView() const = 0;
/// \return the buffer currently selected in this window
virtual Buffer * buffer() = 0;
virtual Buffer const * buffer() const = 0;
/// \return the document buffer in this window
virtual Buffer * documentBuffer() = 0;
virtual Buffer const * documentBuffer() const = 0;
/// set a buffer to the current workarea. /// set a buffer to the current workarea.
virtual void setBuffer(Buffer * b) = 0; ///< \c Buffer to set. virtual void setBuffer(Buffer * b) = 0; ///< \c Buffer to set.
/// ///

2
src/frontends/qt4/GuiView.h
View File

@ -64,7 +64,7 @@ public:
/// LyXView inherited methods. /// LyXView inherited methods.
///@{ ///@{
int id() const; int id() const { return id_; };
void setBusy(bool); void setBusy(bool);
BufferView * currentBufferView(); BufferView * currentBufferView();
BufferView const * currentBufferView() const; BufferView const * currentBufferView() const;