remove unused code

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 87d2a294867d4fcd470f9e8c97479d3d6a4f7a6e..61f6a226dfe34bcd5377e0de99aa8afebddbc839 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -15,19 +15,20 @@
 #endif
 
 #include "bufferview_funcs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "paragraph.h"
 #include "lyxfont.h"
-#include "frontends/Alert.h"
 #include "lyxtext.h"
 #include "buffer.h"
-#include "support/lstrings.h"
 #include "lyx_cb.h"
 #include "language.h"
 #include "gettext.h"
 #include "ParagraphParameters.h"
 
+#include "frontends/Alert.h"
+
+#include "support/lstrings.h"
 
 void emph(BufferView * bv)
 {
@@ -79,7 +80,7 @@ void changeDepth(BufferView * bv, LyXText * text, int decInc)
 {
        if (!bv->available() || !text)
            return;
-       
+
        bv->hideCursor();
        bv->update(bv->text, BufferView::SELECT|BufferView::FITCUR);
        if (decInc >= 0)
@@ -122,7 +123,7 @@ void styleReset(BufferView * bv)
 {
 #ifndef INHERIT_LANG
        LyXFont font(LyXFont::ALL_INHERIT, ignore_language);
-#else 
+#else
        LyXFont font(LyXFont::ALL_INHERIT);
 #endif
        toggleAndShow(bv, font);
@@ -145,31 +146,29 @@ void fontSize(BufferView * bv, string const & size)
 }
 
 
-// Returns the current font and depth as a message. 
+// Returns the current font and depth as a message.
 string const currentState(BufferView * bv)
 {
        ostringstream state;
 
-       if (bv->available()) { 
+       if (bv->available()) {
                // I think we should only show changes from the default
                // font. (Asger)
                LyXText * text = bv->getLyXText();
                Buffer * buffer = bv->buffer();
                LyXFont font = text->real_current_font;
                LyXFont const & defaultfont =
-                       textclasslist
-                       .TextClass(buffer->params.textclass)
-                       .defaultfont();
+                       buffer->params.getLyXTextClass().defaultfont();
                font.reduce(defaultfont);
 
                state << _("Font:") << ' '
                      << font.stateText(&buffer->params);
-               
+
                // The paragraph depth
                int depth = text->getDepth();
                if (depth > 0)
                        state << _(", Depth: ") << depth;
-               
+
                // The paragraph spacing, but only if different from
                // buffer spacing.
                if (!text->cursor.par()->params().spacing().isDefault()) {
@@ -180,7 +179,7 @@ string const currentState(BufferView * bv)
                        switch (cur_space) {
                        case Spacing::Single:
                                state << _("Single");
-                               
+
                                break;
                        case Spacing::Onehalf:
                                state << _("Onehalf");
@@ -198,7 +197,7 @@ string const currentState(BufferView * bv)
                                break;
                        }
                }
-#if 1
+#ifdef DEVEL_VERSION
                state << _(", Paragraph: ") << text->cursor.par()->id();
 #endif
        }
@@ -206,34 +205,37 @@ string const currentState(BufferView * bv)
 }
 
 
-/* -------> Does the actual toggle job of the XxxCB() calls above.
+/* Does the actual toggle job of the calls above.
  * Also shows the current font state.
  */
 void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
 {
-       if (bv->available()) { 
-               if (bv->theLockingInset()) {
-                       bv->theLockingInset()->setFont(bv, font, toggleall);
-                       return;
-               }
-               LyXText * text = bv->getLyXText();
-               if (!text)
-                       return;
-
-               bv->hideCursor();
-               bv->update(text, BufferView::SELECT|BufferView::FITCUR);
-               text->toggleFree(bv, font, toggleall);
-               bv->update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
-
-               if (font.language() != ignore_language ||
-                   font.number() != LyXFont::IGNORE) {
-                       LyXCursor & cursor = text->cursor;
-                       text->computeBidiTables(bv->buffer(), cursor.row());
-                       if (cursor.boundary() != 
-                           text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(),
-                                            text->real_current_font) )
-                               text->setCursor(bv, cursor.par(), cursor.pos(),
-                                               false, !cursor.boundary());
-               }
+       if (!bv->available())
+               return;
+ 
+       if (bv->theLockingInset()) {
+               bv->theLockingInset()->setFont(bv, font, toggleall);
+               return;
+       }
+ 
+       LyXText * text = bv->getLyXText();
+       // FIXME: can this happen ?? 
+       if (!text)
+               return;
+
+       bv->hideCursor();
+       bv->update(text, BufferView::SELECT | BufferView::FITCUR);
+       text->toggleFree(bv, font, toggleall);
+       bv->update(text, BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+
+       if (font.language() != ignore_language ||
+           font.number() != LyXFont::IGNORE) {
+               LyXCursor & cursor = text->cursor;
+               text->computeBidiTables(bv->buffer(), cursor.row());
+               if (cursor.boundary() !=
+                   text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(),
+                                    text->real_current_font))
+                       text->setCursor(bv, cursor.par(), cursor.pos(),
+                                       false, !cursor.boundary());
        }
 }