Remove unused font variable which caused a warning.

[lyx.git] / src / BufferView2.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 0269bf9c36f18e556be6db216cd10ada24c4dfef..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
 
@@ -411,7 +398,7 @@ bool BufferView::lockInset(UpdatableInset * inset)
                theLockingInset(inset);
                return true;
        } else if (inset) {
-           return theLockingInset()->LockInsetInInset(this, inset);
+           return theLockingInset()->lockInsetInInset(this, inset);
        }
        return false;
 }
@@ -425,12 +412,12 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
                    (cursor.par()->getChar(cursor.pos() - 1) ==
                     Paragraph::META_INSET) &&
                    (cursor.par()->getInset(cursor.pos() - 1) ==
-                    theLockingInset()->GetLockingInset()))
+                    theLockingInset()->getLockingInset()))
                        text->setCursor(this, cursor,
                                        cursor.par(), cursor.pos() - 1);
                LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
                LyXText * txt = getLyXText();
-               if (theLockingInset()->GetLockingInset()->LyxCode() ==
+               if (theLockingInset()->getLockingInset()->lyxCode() ==
                    Inset::TEXT_CODE &&
                    (txt->real_current_font.language() !=
                     buffer()->params.language
@@ -439,8 +426,8 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
                        shape = (txt->real_current_font.isVisibleRightToLeft())
                                ? LyXScreen::REVERSED_L_SHAPE
                                : LyXScreen::L_SHAPE;
-               y += cursor.y() + theLockingInset()->InsetInInsetY();
-               pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
+               y += cursor.y() + theLockingInset()->insetInInsetY();
+               pimpl_->screen_->showManualCursor(text, x, y, asc, desc,
                                                  shape);
        }
 }
@@ -449,7 +436,7 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 void BufferView::hideLockedInsetCursor()
 {
        if (theLockingInset() && available()) {
-               pimpl_->screen_->HideCursor();
+               pimpl_->screen_->hideCursor();
        }
 }
 
@@ -457,8 +444,8 @@ void BufferView::hideLockedInsetCursor()
 void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
        if (theLockingInset() && available()) {
-               y += text->cursor.y() + theLockingInset()->InsetInInsetY();
-               if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
+               y += text->cursor.y() + theLockingInset()->insetInInsetY();
+               if (pimpl_->screen_->fitManualCursor(text, this, x, y, asc, desc))
                        updateScrollbar();
        }
 }
@@ -467,13 +454,13 @@ void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 int BufferView::unlockInset(UpdatableInset * inset)
 {
        if (inset && theLockingInset() == inset) {
-               inset->InsetUnlock(this);
+               inset->insetUnlock(this);
                theLockingInset(0);
-               text->finishUndo();
+               finishUndo();
                return 0;
        } else if (inset && theLockingInset() &&
-                  theLockingInset()->UnlockInsetInInset(this, inset)) {
-               text->finishUndo();
+                  theLockingInset()->unlockInsetInInset(this, inset)) {
+               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());
 }
 
 
@@ -512,7 +499,7 @@ bool BufferView::ChangeInsets(Inset::Code code,
                bool flag2 = false;
                for (Paragraph::inset_iterator it = par->inset_iterator_begin();
                     it != par->inset_iterator_end(); ++it) {
-                       if ((*it)->LyxCode() == code) {
+                       if ((*it)->lyxCode() == code) {
                                InsetCommand * inset = static_cast<InsetCommand *>(*it);
                                if (inset->getContents() == from) {
                                        inset->setContents(to);