fix crash due to invalidated iterator

[lyx.git] / src / frontends / controllers / Kernel.C

diff --git a/src/frontends/controllers/Kernel.C b/src/frontends/controllers/Kernel.C
index ee39718eaabbe7dec9ecbd7aa8c207de77b33827..b4a0e57c1fc43a198f7ae7f6027826b400e11e6b 100644 (file)
--- a/src/frontends/controllers/Kernel.C
+++ b/src/frontends/controllers/Kernel.C
@@ -19,18 +19,20 @@
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
-#include "support/LAssert.h"
 
-using lyx::support::Assert;
+using std::string;
+
+namespace lyx {
+namespace frontend {
 
 Kernel::Kernel(LyXView & lyxview)
        : lyxview_(lyxview)
 {}
 
 
-void Kernel::dispatch(FuncRequest const & fr, bool verbose) const
+void Kernel::dispatch(FuncRequest const & fr) const
 {
-       lyxview_.getLyXFunc().dispatch(fr, verbose);
+       lyxview_.getLyXFunc().dispatch(fr);
 }
 
 
@@ -48,16 +50,16 @@ void Kernel::disconnect(string const & name) const
 bool Kernel::isBufferAvailable() const
 {
        if (!lyxview_.view().get())
-                return false;
-        return lyxview_.view()->available();
+               return false;
+       return lyxview_.view()->available();
 }
 
 
 bool Kernel::isBufferReadonly() const
 {
        if (!lyxview_.buffer())
-                return true;
-        return lyxview_.buffer()->isReadonly();
+               return true;
+       return lyxview_.buffer()->isReadonly();
 }
 
 
@@ -66,7 +68,8 @@ string const Kernel::bufferFilepath() const
        return buffer().filePath();
 }
 
-Kernel::DocTypes Kernel::docType() const
+
+Kernel::DocType Kernel::docType() const
 {
        if (buffer().isLatex())
                return LATEX;
@@ -79,6 +82,12 @@ Kernel::DocTypes Kernel::docType() const
 }
 
 
+void Kernel::redrawGUI() const
+{
+       lyxview_.getDialogs().redrawGUI();
+}
+
+
 BufferView * Kernel::bufferview()
 {
        return lyxview_.view().get();
@@ -93,13 +102,16 @@ BufferView const * Kernel::bufferview() const
 
 Buffer & Kernel::buffer()
 {
-       Assert(lyxview_.buffer());
+       BOOST_ASSERT(lyxview_.buffer());
        return *lyxview_.buffer();
 }
 
 
 Buffer const & Kernel::buffer() const
 {
-       Assert(lyxview_.buffer());
+       BOOST_ASSERT(lyxview_.buffer());
        return *lyxview_.buffer();
 }
+
+} // namespace frontend
+} // namespace lyx