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

[features.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 4c4cc6afe0e3531127d0110fedf1ca2d6ea74e67..092a81f13d61a33a6dcb3a4613d0788f9b13a8e1 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -24,7 +24,6 @@
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
-#include "EmbeddedFiles.h"
 #include "ErrorList.h"
 #include "factory.h"
 #include "FloatList.h"
@@ -214,6 +213,7 @@ struct BufferView::Private
 {
        Private(BufferView & bv): wh_(0), cursor_(bv),
                anchor_pit_(0), anchor_ypos_(0),
+               inlineCompletionUniqueChars_(0),
                last_inset_(0), gui_(0)
        {}
 
@@ -242,11 +242,11 @@ struct BufferView::Private
        vector<int> par_height_;
 
        ///
-       DocIterator inlineCompletionPos;
+       DocIterator inlineCompletionPos_;
        ///
-       docstring inlineCompletion;
+       docstring inlineCompletion_;
        ///
-       size_t inlineCompletionUniqueChars;
+       size_t inlineCompletionUniqueChars_;
 
        /// keyboard mapping object.
        Intl intl_;
@@ -787,7 +787,7 @@ void BufferView::showCursor(DocIterator const & dit)
 
        if (tm.contains(bot_pit)) {
                ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
-               BOOST_ASSERT(!pm.rows().empty());
+               LASSERT(!pm.rows().empty(), /**/);
                // FIXME: smooth scrolling doesn't work in mathed.
                CursorSlice const & cs = dit.innerTextSlice();
                int offset = coordOffset(dit, dit.boundary()).y_;
@@ -803,8 +803,8 @@ void BufferView::showCursor(DocIterator const & dit)
        }
 
        // fix inline completion position
-       if (d->inlineCompletionPos.fixIfBroken())
-               d->inlineCompletionPos = DocIterator();
+       if (d->inlineCompletionPos_.fixIfBroken())
+               d->inlineCompletionPos_ = DocIterator();
 
        tm.redoParagraph(bot_pit);
        ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
@@ -942,11 +942,6 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
                break;
        }
        
-       case LFUN_BUFFER_TOGGLE_EMBEDDING: {
-               flag.setOnOff(buffer_.params().embedded);
-               break;
-       }
-
        case LFUN_SCREEN_UP:
        case LFUN_SCREEN_DOWN:
        case LFUN_SCROLL:
@@ -1248,7 +1243,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
                                                BIBTEX_CODE);
                if (inset) {
-                       if (inset->addDatabase(to_utf8(cmd.argument())))
+                       if (inset->addDatabase(cmd.argument()))
                                buffer_.updateBibfilesCache();
                }
                break;
@@ -1260,7 +1255,7 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                InsetBibtex * inset = getInsetByCode<InsetBibtex>(tmpcur,
                                                BIBTEX_CODE);
                if (inset) {
-                       if (inset->delDatabase(to_utf8(cmd.argument())))
+                       if (inset->delDatabase(cmd.argument()))
                                buffer_.updateBibfilesCache();
                }
                break;
@@ -1310,16 +1305,6 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                buffer_.params().compressed = !buffer_.params().compressed;
                break;
        
-       case LFUN_BUFFER_TOGGLE_EMBEDDING: {
-               // turn embedding on/off
-               try {
-                       buffer_.embeddedFiles().enable(!buffer_.params().embedded, buffer_, true);
-               } catch (ExceptionMessage const & message) {
-                       Alert::error(message.title_, message.details_);
-               }
-               break;
-       }
-
        case LFUN_NEXT_INSET_TOGGLE: {
                // this is the real function we want to invoke
                FuncRequest tmpcmd = FuncRequest(LFUN_INSET_TOGGLE, cmd.origin);
@@ -1602,8 +1587,8 @@ void BufferView::lfunScroll(FuncRequest const & cmd)
 {
        string const scroll_type = cmd.getArg(0);
        int const scroll_step = 
-               (scroll_type == "line")? d->scrollbarParameters_.single_step
-               : (scroll_type == "page")? d->scrollbarParameters_.page_step : 0;
+               (scroll_type == "line") ? d->scrollbarParameters_.single_step
+               : (scroll_type == "page") ? d->scrollbarParameters_.page_step : 0;
        if (scroll_step == 0)
                return;
        string const scroll_quantity = cmd.getArg(1);
@@ -1774,7 +1759,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old)
 
 bool BufferView::mouseSetCursor(Cursor & cur, bool select)
 {
-       BOOST_ASSERT(&cur.bv() == this);
+       LASSERT(&cur.bv() == this, /**/);
 
        if (!select)
                // this event will clear selection so we save selection for
@@ -1861,8 +1846,8 @@ bool BufferView::singleParUpdate()
        int old_height = tm.parMetrics(bottom_pit).height();
 
        // make sure inline completion pointer is ok
-       if (d->inlineCompletionPos.fixIfBroken())
-               d->inlineCompletionPos = DocIterator();
+       if (d->inlineCompletionPos_.fixIfBroken())
+               d->inlineCompletionPos_ = DocIterator();
 
        // In Single Paragraph mode, rebreak only
        // the (main text, not inset!) paragraph containing the cursor.
@@ -1901,8 +1886,8 @@ void BufferView::updateMetrics()
        TextMetrics & tm = textMetrics(&buftext);
 
        // make sure inline completion pointer is ok
-       if (d->inlineCompletionPos.fixIfBroken())
-               d->inlineCompletionPos = DocIterator();
+       if (d->inlineCompletionPos_.fixIfBroken())
+               d->inlineCompletionPos_ = DocIterator();
        
        if (d->anchor_pit_ >= npit)
                // The anchor pit must have been deleted...
@@ -1975,7 +1960,7 @@ void BufferView::updateMetrics()
 
 void BufferView::insertLyXFile(FileName const & fname)
 {
-       BOOST_ASSERT(d->cursor_.inTexted());
+       LASSERT(d->cursor_.inTexted(), /**/);
 
        // Get absolute path of file and add ".lyx"
        // to the filename if necessary
@@ -2060,7 +2045,7 @@ Point BufferView::coordOffset(DocIterator const & dit, bool boundary) const
        CursorSlice const & sl = dit[0];
        TextMetrics const & tm = textMetrics(sl.text());
        ParagraphMetrics const & pm = tm.parMetrics(sl.pit());
-       BOOST_ASSERT(!pm.rows().empty());
+       LASSERT(!pm.rows().empty(), /**/);
        y -= pm.rows()[0].ascent();
 #if 1
        // FIXME: document this mess
@@ -2274,19 +2259,19 @@ void BufferView::insertPlaintextFile(FileName const & f, bool asParagraph)
 
 docstring const & BufferView::inlineCompletion() const
 {
-       return d->inlineCompletion;
+       return d->inlineCompletion_;
 }
 
 
 size_t const & BufferView::inlineCompletionUniqueChars() const
 {
-       return d->inlineCompletionUniqueChars;
+       return d->inlineCompletionUniqueChars_;
 }
 
 
 DocIterator const & BufferView::inlineCompletionPos() const
 {
-       return d->inlineCompletionPos;
+       return d->inlineCompletionPos_;
 }
 
 
@@ -2304,16 +2289,16 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
        docstring const & completion, size_t uniqueChars)
 {
        uniqueChars = min(completion.size(), uniqueChars);
-       bool changed = d->inlineCompletion != completion
-               || d->inlineCompletionUniqueChars != uniqueChars;
+       bool changed = d->inlineCompletion_ != completion
+               || d->inlineCompletionUniqueChars_ != uniqueChars;
        bool singlePar = true;
-       d->inlineCompletion = completion;
-       d->inlineCompletionUniqueChars = min(completion.size(), uniqueChars);
+       d->inlineCompletion_ = completion;
+       d->inlineCompletionUniqueChars_ = min(completion.size(), uniqueChars);
        
        //lyxerr << "setInlineCompletion pos=" << pos << " completion=" << completion << " uniqueChars=" << uniqueChars << std::endl;
        
        // at new position?
-       DocIterator const & old = d->inlineCompletionPos;
+       DocIterator const & old = d->inlineCompletionPos_;
        if (old != pos) {
                //lyxerr << "inlineCompletionPos changed" << std::endl;
                // old or pos are in another paragraph?
@@ -2322,7 +2307,7 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
                        singlePar = false;
                        //lyxerr << "different paragraph" << std::endl;
                }
-               d->inlineCompletionPos = pos;
+               d->inlineCompletionPos_ = pos;
        }
        
        // set update flags