Remove unused font variable which caused a warning.

[lyx.git] / src / BufferView2.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 4c08feb2de3e6ae69d789c3d3886768c1b7db5b2..6af288a3ab11ee1cdadb3942c325425156011991 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -30,6 +30,7 @@
 #include "support/lyxfunctional.h" //equal_1st_in_pair
 #include "language.h"
 #include "gettext.h"
+#include "undo_funcs.h"
 
 extern BufferList bufferlist;
 
@@ -136,10 +137,10 @@ void BufferView::insertErrors(TeXErrors & terr)
        for (TeXErrors::Errors::const_iterator cit = terr.begin();
             cit != terr.end();
             ++cit) {
-               string const desctext((*cit).error_desc);
-               string const errortext((*cit).error_text);
+               string const desctext(cit->error_desc);
+               string const errortext(cit->error_text);
                string const msgtxt = desctext + '\n' + errortext;
-               int const errorrow = (*cit).error_in_line;
+               int const errorrow = cit->error_in_line;
 
                // Insert error string for row number
                int tmpid = -1; 
@@ -155,7 +156,7 @@ void BufferView::insertErrors(TeXErrors & terr)
                        texrowpar = text->firstParagraph();
                        tmppos = 0;
                } else {
-                       texrowpar = text->getParFromID(tmpid);
+                       texrowpar = buffer()->getParFromID(tmpid);
                }
 
                if (texrowpar == 0)
@@ -184,7 +185,7 @@ void BufferView::setCursorFromRow(int row)
                texrowpar = text->firstParagraph();
                tmppos = 0;
        } else {
-               texrowpar = text->getParFromID(tmpid);
+               texrowpar = buffer()->getParFromID(tmpid);
        }
        text->setCursor(this, texrowpar, tmppos);
 }
@@ -227,7 +228,7 @@ void BufferView::menuUndo()
                hideCursor();
                beforeChange(text);
                update(text, BufferView::SELECT|BufferView::FITCUR);
-               if (!text->textUndo(this))
+               if (!textUndo(this))
                        owner()->message(_("No forther undo information"));
                else
                        update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -248,7 +249,7 @@ void BufferView::menuRedo()
                hideCursor();
                beforeChange(text);
                update(text, BufferView::SELECT|BufferView::FITCUR);
-               if (!text->textRedo(this))
+               if (!textRedo(this))
                        owner()->message(_("No further redo information"));
                else
                        update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -328,21 +329,6 @@ void BufferView::paste()
 }
 
 
-
-
-void BufferView::insertCorrectQuote()
-{
-       char c;
-
-       if (text->cursor.pos())
-               c = text->cursor.par()->getChar(text->cursor.pos() - 1);
-       else 
-               c = ' ';
-
-       insertInset(new InsetQuotes(c, buffer()->params));
-}
-
-
 /* these functions are for the spellchecker */ 
 string const BufferView::nextWord(float & value)
 {
@@ -383,24 +369,25 @@ void BufferView::replaceWord(string const & replacestring)
 {
        if (!available()) return;
 
+       LyXText * tt = getLyXText();
        hideCursor();
-       update(text, BufferView::SELECT|BufferView::FITCUR);
+       update(tt, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       update(text, BufferView::SELECT|BufferView::FITCUR);
+       update(tt, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       text->replaceSelectionWithString(this, replacestring);
+       tt->replaceSelectionWithString(this, replacestring);
    
-       text->setSelectionOverString(this, replacestring);
+       tt->setSelectionOverString(this, replacestring);
 
        // Go back so that replacement string is also spellchecked
        for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
-               text->cursorLeft(this);
+               tt->cursorLeft(this);
        }
-       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 // End of spellchecker stuff
 
@@ -469,11 +456,11 @@ int BufferView::unlockInset(UpdatableInset * inset)
        if (inset && theLockingInset() == inset) {
                inset->insetUnlock(this);
                theLockingInset(0);
-               text->finishUndo();
+               finishUndo();
                return 0;
        } else if (inset && theLockingInset() &&
                   theLockingInset()->unlockInsetInInset(this, inset)) {
-               text->finishUndo();
+               finishUndo();
                return 0;
        }
        return bufferlist.unlockInset(inset);
@@ -486,9 +473,9 @@ void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
                return; // shouldn't happen
        if (kind == Undo::EDIT) // in this case insets would not be stored!
                kind = Undo::FINISH;
-       text->setUndo(buffer(), kind,
-                     text->cursor.par()->previous(), 
-                     text->cursor.par()->next());
+       setUndo(this, kind,
+               text->cursor.par(),
+               text->cursor.par()->next());
 }