Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index d93b932bbb6674fd263bc362d737dc72fdd0d6df..2ff88433a7735ba35144079ed8067238fc1b6f60 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -53,6 +53,7 @@
 #include "ToolbarBackend.h"
 #include "version.h"
 
+#include "support/assert.h"
 #include "support/debug.h"
 #include "support/FileFilterList.h"
 #include "support/FileName.h"
@@ -88,7 +89,6 @@
 #include <QUrl>
 #include <QScrollBar>
 
-#include <boost/assert.hpp>
 #include <boost/bind.hpp>
 
 #ifdef HAVE_SYS_TIME_H
@@ -764,7 +764,7 @@ GuiWorkArea const * GuiView::currentWorkArea() const
 
 void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
 {
-       BOOST_ASSERT(wa);
+       LASSERT(wa, /**/);
 
        // Changing work area can result from opening a file so
        // update the toc in any case.
@@ -780,7 +780,7 @@ void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
 
 void GuiView::removeWorkArea(GuiWorkArea * wa)
 {
-       BOOST_ASSERT(wa);
+       LASSERT(wa, /**/);
        if (wa == d.current_work_area_) {
                disconnectBuffer();
                disconnectBufferView();
@@ -869,7 +869,7 @@ Buffer const * GuiView::buffer() const
 
 void GuiView::setBuffer(Buffer * newBuffer)
 {
-       BOOST_ASSERT(newBuffer);
+       LASSERT(newBuffer, /**/);
        setBusy(true);
 
        GuiWorkArea * wa = workArea(*newBuffer);
@@ -949,12 +949,6 @@ void GuiView::updateToc()
 }
 
 
-void GuiView::updateEmbeddedFiles()
-{
-       updateDialog("embedding", "");
-}
-
-
 void GuiView::autoSave()
 {
        LYXERR(Debug::INFO, "Running autoSave()");
@@ -1074,7 +1068,7 @@ FuncStatus GuiView::getStatus(FuncRequest const & cmd)
                        FuncStatus fs;
                        if (!inset->getStatus(view()->cursor(), fr, fs)) {
                                // Every inset is supposed to handle this
-                               BOOST_ASSERT(false);
+                               LASSERT(false, /**/);
                        }
                        flag |= fs;
                } else {
@@ -2018,7 +2012,7 @@ namespace {
 
 char const * const dialognames[] = {
 "aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
-"citation", "document", "embedding", "errorlist", "ert", "external", "file",
+"citation", "document", "errorlist", "ert", "external", "file",
 "findreplace", "float", "graphics", "include", "index", "nomenclature", "label", "log",
 "mathdelimiter", "mathmatrix", "note", "paragraph", "prefs", "print", 
 "ref", "sendto", "space", "spellchecker", "symbols", "tabular", "tabularcreate",
@@ -2255,7 +2249,7 @@ Dialog * createGuiWrap(GuiView & lv);
 
 Dialog * GuiView::build(string const & name)
 {
-       BOOST_ASSERT(isValidName(name));
+       LASSERT(isValidName(name), /**/);
 
        if (name == "aboutlyx")
                return createGuiAbout(*this);