no need to cast anymore

[lyx.git] / src / frontends / qt4 / GuiView.cpp

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 0b02e46ee6b62ee13f4c644b0b861503a2fd29f3..bdd32b86fc4e642d517148b9721549eeb8f36977 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -705,15 +705,14 @@ GuiWorkArea const * GuiView::currentWorkArea() const
 }
 
 
-void GuiView::setCurrentWorkArea(GuiWorkArea * work_area)
+void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
 {
-       BOOST_ASSERT(work_area);
+       BOOST_ASSERT(wa);
 
        // Changing work area can result from opening a file so
        // update the toc in any case.
        updateToc();
 
-       GuiWorkArea * wa = static_cast<GuiWorkArea *>(work_area);
        d.current_work_area_ = wa;
        for (int i = 0; i != d.splitter_->count(); ++i) {
                if (d.tabWorkArea(i)->setCurrentWorkArea(wa))
@@ -722,11 +721,10 @@ void GuiView::setCurrentWorkArea(GuiWorkArea * work_area)
 }
 
 
-void GuiView::removeWorkArea(GuiWorkArea * work_area)
+void GuiView::removeWorkArea(GuiWorkArea * wa)
 {
-       BOOST_ASSERT(work_area);
-       GuiWorkArea * gwa = static_cast<GuiWorkArea *>(work_area);
-       if (gwa == d.current_work_area_) {
+       BOOST_ASSERT(wa);
+       if (wa == d.current_work_area_) {
                disconnectBuffer();
                disconnectBufferView();
                hideBufferDependent();
@@ -739,7 +737,7 @@ void GuiView::removeWorkArea(GuiWorkArea * work_area)
 
        for (int i = 0; i != d.splitter_->count(); ++i) {
                TabWorkArea * twa = d.tabWorkArea(i);
-               if (!twa->removeWorkArea(gwa))
+               if (!twa->removeWorkArea(wa))
                        // Not found in this tab group.
                        continue;
 
@@ -962,7 +960,7 @@ FuncStatus GuiView::getStatus(FuncRequest const & cmd)
                        }
                }
                else if (name == "latexlog")
-                       enable = FileName(buf->logName()).isFileReadable();
+                       enable = FileName(buf->logName()).isReadableFile();
                else if (name == "spellchecker")
 #if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
                        enable = !buf->isReadonly();
@@ -1018,7 +1016,7 @@ FuncStatus GuiView::getStatus(FuncRequest const & cmd)
 }
 
 
-void GuiView::dispatch(FuncRequest const & cmd)
+bool GuiView::dispatch(FuncRequest const & cmd)
 {
        BufferView * bv = view();       
        // By default we won't need any update.
@@ -1161,16 +1159,10 @@ void GuiView::dispatch(FuncRequest const & cmd)
                }
 
                default:
-                       theLyXFunc().setLyXView(this);
-                       lyx::dispatch(cmd);
-                       return;
+                       return false;
        }
 
-       if (!bv)
-               return;
-       bv->processUpdateFlags(bv->cursor().result().update());
-       // We won't need any new update.
-       bv->cursor().updateFlags(Update::None);
+       return true;
 }