fix bug 3723:

[lyx.git] / src / frontends / LyXView.cpp

diff --git a/src/frontends/LyXView.cpp b/src/frontends/LyXView.cpp
index 6d6c9fcb30d1ca28d8d5dd0789ffa8bd118999b8..6c358ae01470d99cabece1da3f8d3c2409fea682 100644 (file)
--- a/src/frontends/LyXView.cpp
+++ b/src/frontends/LyXView.cpp
@@ -19,22 +19,22 @@
 #include "WorkArea.h"
 #include "Gui.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "cursor.h"
+#include "Cursor.h"
 #include "debug.h"
-#include "errorlist.h"
-#include "funcrequest.h"
+#include "ErrorList.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "intl.h"
-#include "lyx_cb.h"
-#include "lyxfunc.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
+#include "Intl.h"
+#include "callback.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
+#include "Text.h"
 #include "MenuBackend.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 
 #include "controllers/ControlCommandBuffer.h"
 
@@ -196,7 +196,7 @@ void LyXView::connectBuffer(Buffer & buf)
                        boost::bind(&WorkArea::redraw, work_area_));
 
        bufferStructureChangedConnection_ =
-               buf.structureChanged.connect(
+               buf.getMasterBuffer()->structureChanged.connect(
                        boost::bind(&LyXView::updateToc, this));
 
        errorsConnection_ =
@@ -290,7 +290,7 @@ void LyXView::showDialogWithData(string const & name, string const & data)
 
 
 void LyXView::showInsetDialog(string const & name, string const & data,
-               InsetBase * inset)
+               Inset * inset)
 {
        getDialogs().show(name, data, inset);
 }
@@ -394,7 +394,7 @@ void LyXView::updateLayoutChoice()
 
        // Update the layout display
        if (toolbars_->updateLayoutList(buffer()->params().textclass)) {
-               current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
+               current_layout = buffer()->params().getTextClass().defaultLayoutName();
        }
 
        BOOST_ASSERT(work_area_);
@@ -442,7 +442,7 @@ void LyXView::dispatch(FuncRequest const & cmd)
 }
 
 
-Buffer const * const LyXView::updateInset(InsetBase const * inset) const
+Buffer const * const LyXView::updateInset(Inset const * inset) const
 {
        Buffer const * buffer_ptr = 0;
        if (inset) {