simplification

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 704c970ed2af93f1f4b1e9dd4c11f230a4acf6c3..7fc98ff30bc0317c6318ef8d59da0f8ee0a88423 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -185,7 +185,7 @@ bool import(LyXView * lv, FileName const & filename,
                }
                updateLabels(*buf);
                lv->setBuffer(buf);
-               lv->errors("Parse");
+               buf->errors("Parse");
        } else {
                Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
                if (b)
@@ -845,6 +845,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
        } else {
                switch (action) {
                // Let lyx_view_ dispatch its own actions.
+               case LFUN_BUFFER_SWITCH:
+               case LFUN_BUFFER_NEXT:
+               case LFUN_BUFFER_PREVIOUS:
                case LFUN_COMMAND_EXECUTE:
                case LFUN_DROP_LAYOUTS_CHOICE:
                case LFUN_MENU_OPEN:
@@ -1215,7 +1218,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        if (buf) {
                                updateLabels(*buf);
                                lyx_view_->setBuffer(buf);
-                               lyx_view_->errors("Parse");
+                               buf->errors("Parse");
                        }
                        updateFlags = Update::None;
                        break;
@@ -1268,23 +1271,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
 
                // --- buffers ----------------------------------------
-               case LFUN_BUFFER_SWITCH:
-                       BOOST_ASSERT(lyx_view_);
-                       lyx_view_->setBuffer(theBufferList().getBuffer(argument));
-                       updateFlags = Update::None;
-                       break;
-
-               case LFUN_BUFFER_NEXT:
-                       BOOST_ASSERT(lyx_view_);
-                       lyx_view_->setBuffer(theBufferList().next(lyx_view_->buffer()));
-                       updateFlags = Update::None;
-                       break;
-
-               case LFUN_BUFFER_PREVIOUS:
-                       BOOST_ASSERT(lyx_view_);
-                       lyx_view_->setBuffer(theBufferList().previous(lyx_view_->buffer()));
-                       updateFlags = Update::None;
-                       break;
 
                case LFUN_FILE_NEW: {
                        BOOST_ASSERT(lyx_view_);
@@ -1350,7 +1336,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        lyx_view_->setBuffer(buf);
                        view()->setCursorFromRow(row);
                        if (loaded)
-                               lyx_view_->errors("Parse");
+                               buf->errors("Parse");
                        updateFlags = Update::FitCursor;
                        break;
                }
@@ -1501,7 +1487,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                updateLabels(*child->masterBuffer());
                                lyx_view_->setBuffer(child);
                                if (parsed)
-                                       lyx_view_->errors("Parse");
+                                       child->errors("Parse");
                        }
 
                        // If a screen update is required (in case where auto_open is false), 
@@ -1854,7 +1840,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                }
 
                case LFUN_WINDOW_NEW:
-                       LyX::ref().newLyXView();
+                       theApp()->createView();
                        break;
 
                case LFUN_WINDOW_CLOSE:
@@ -2102,7 +2088,7 @@ void LyXFunc::open(string const & fname)
        if (buf) {
                updateLabels(*buf);
                lyx_view_->setBuffer(buf);
-               lyx_view_->errors("Parse");
+               buf->errors("Parse");
                str2 = bformat(_("Document %1$s opened."), disp_fn);
        } else {
                str2 = bformat(_("Could not open document %1$s"), disp_fn);
@@ -2217,7 +2203,7 @@ void LyXFunc::reloadBuffer()
        if (buf) {
                updateLabels(*buf);
                lyx_view_->setBuffer(buf);
-               lyx_view_->errors("Parse");
+               buf->errors("Parse");
                str = bformat(_("Document %1$s reloaded."), disp_fn);
        } else {
                str = bformat(_("Could not reload document %1$s"), disp_fn);