reformatting and remove using delc

[lyx.git] / src / insets / insetspecialchar.C

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index 81431d769faca7f7c926e5236efeb5b16ec05d9b..9f404779675684c96f7ab0c4604f0ef4ef56b5e5 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -28,19 +28,19 @@ InsetSpecialChar::InsetSpecialChar(Kind k)
 {}
 
 
-int InsetSpecialChar::ascent(Painter &, LyXFont const & font) const
+int InsetSpecialChar::ascent(BufferView *, LyXFont const & font) const
 {
        return lyxfont::maxAscent(font);
 }
 
 
-int InsetSpecialChar::descent(Painter &, LyXFont const & font) const
+int InsetSpecialChar::descent(BufferView *, LyXFont const & font) const
 {
        return lyxfont::maxDescent(font);
 }
 
 
-int InsetSpecialChar::width(Painter &, LyXFont const & font) const
+int InsetSpecialChar::width(BufferView *, LyXFont const & font) const
 {
        switch (kind) {
        case HYPHENATION:
@@ -73,7 +73,7 @@ int InsetSpecialChar::width(Painter &, LyXFont const & font) const
 
 
 void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
-                           int baseline, float & x) const
+                           int baseline, float & x, bool) const
 {
        Painter & pain = bv->painter();
        LyXFont font(f);
@@ -83,21 +83,21 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
        {
                font.setColor(LColor::special);
                pain.text(int(x), baseline, "-", font);
-               x += width(pain, font);
+               x += width(bv, font);
                break;
        }
        case END_OF_SENTENCE:
        {
                font.setColor(LColor::special);
                pain.text(int(x), baseline, ".", font);
-               x += width(pain, font);
+               x += width(bv, font);
                break;
        }
        case LDOTS:
        {
                font.setColor(LColor::special);
                pain.text(int(x), baseline, ". . .", font);
-               x += width(pain, font);
+               x += width(bv, font);
                break;
        }
        case MENU_SEPARATOR:
@@ -114,12 +114,12 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
                xp[3] = ox;     yp[3] = baseline;
                
                pain.lines(xp, yp, 4, LColor::special);
-               x += width(pain, font);
+               x += width(bv, font);
                break;
        }
        case PROTECTED_SEPARATOR:
        {
-               float w = width(pain, font);
+               float w = width(bv, font);
                int h = lyxfont::ascent('x', font);
                int xp[4], yp[4];
                
@@ -196,7 +196,7 @@ int InsetSpecialChar::Latex(Buffer const *, ostream & os, bool /*fragile*/,
        return 0;
 }
 
-int InsetSpecialChar::Ascii(Buffer const *, ostream & os) const
+int InsetSpecialChar::Ascii(Buffer const *, ostream & os, int) const
 {
        switch (kind) {
        case HYPHENATION:                       break;
@@ -211,17 +211,17 @@ int InsetSpecialChar::Ascii(Buffer const *, ostream & os) const
 
 int InsetSpecialChar::Linuxdoc(Buffer const * buf, ostream & os) const
 {
-       return Ascii(buf, os);
+       return Ascii(buf, os, 0);
 }
 
 
 int InsetSpecialChar::DocBook(Buffer const * buf, ostream & os) const
 {
-       return Ascii(buf, os);
+       return Ascii(buf, os, 0);
 }
 
 
-Inset * InsetSpecialChar::Clone() const
+Inset * InsetSpecialChar::Clone(Buffer const &) const
 {
        return new InsetSpecialChar(kind);
 }