remove more forms.h cruft

[lyx.git] / src / BufferView2.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 09232ceb84544ffb426c6351b03f0769c1f07834..3db22eb0f524c8d7bc984ed954397645559a187d 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -84,10 +84,11 @@ bool BufferView::insertLyXFile(string const & filen)
        bool res = true;
 
        if (c == '#') {
-               lyxerr.debug() << "Will insert file with header" << endl;
+               lyxerr[Debug::INFO] << "Will insert file with header" << endl;
                res = buffer()->readFile(lex, text->cursor.par());
        } else {
-               lyxerr.debug() << "Will insert file without header" << endl;
+               lyxerr[Debug::INFO] << "Will insert file without header" 
+                                   << endl;
                res = buffer()->readLyXformat2(lex, text->cursor.par());
        }
 
@@ -410,7 +411,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;
 }
@@ -424,12 +425,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
@@ -438,7 +439,7 @@ 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();
+               y += cursor.y() + theLockingInset()->insetInInsetY();
                pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
                                                  shape);
        }
@@ -456,7 +457,7 @@ void BufferView::hideLockedInsetCursor()
 void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
        if (theLockingInset() && available()) {
-               y += text->cursor.y() + theLockingInset()->InsetInInsetY();
+               y += text->cursor.y() + theLockingInset()->insetInInsetY();
                if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
                        updateScrollbar();
        }
@@ -466,12 +467,12 @@ 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();
                return 0;
        } else if (inset && theLockingInset() &&
-                  theLockingInset()->UnlockInsetInInset(this, inset)) {
+                  theLockingInset()->unlockInsetInInset(this, inset)) {
                text->finishUndo();
                return 0;
        }
@@ -511,7 +512,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);