BUG 3598: display framed and shaded notes in a separate paragraph, require package...

[lyx.git] / src / insets / InsetSpecialChar.cpp

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index ac527982390ad874b50a2fe952af0ad26b21c248..27dc69999df885e0dc254e42efbd4397aaf559b9 100644 (file)
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -16,7 +16,7 @@
 
 #include "debug.h"
 #include "LaTeXFeatures.h"
-#include "LColor.h"
+#include "Color.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 
@@ -69,30 +69,30 @@ bool InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
 {
-       LyXFont font = pi.base.font;
+       Font font = pi.base.font;
 
        switch (kind_) {
        case HYPHENATION:
        {
-               font.setColor(LColor::special);
+               font.setColor(Color::special);
                pi.pain.text(x, y, char_type('-'), font);
                break;
        }
        case LIGATURE_BREAK:
        {
-               font.setColor(LColor::special);
+               font.setColor(Color::special);
                pi.pain.text(x, y, char_type('|'), font);
                break;
        }
        case END_OF_SENTENCE:
        {
-               font.setColor(LColor::special);
+               font.setColor(Color::special);
                pi.pain.text(x, y, char_type('.'), font);
                break;
        }
        case LDOTS:
        {
-               font.setColor(LColor::special);
+               font.setColor(Color::special);
                 string ell = ". . . ";
                 docstring dell(ell.begin(), ell.end());
                pi.pain.text(x, y, dell, font);
@@ -114,7 +114,7 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
                xp[2] = ox + w; yp[2] = y - h/2;
                xp[3] = ox;     yp[3] = y;
 
-               pi.pain.lines(xp, yp, 4, LColor::special);
+               pi.pain.lines(xp, yp, 4, Color::special);
                break;
        }
        }
@@ -240,9 +240,9 @@ int InsetSpecialChar::textString(Buffer const & buf, odocstream & os,
 }
 
 
-auto_ptr<InsetBase> InsetSpecialChar::doClone() const
+auto_ptr<Inset> InsetSpecialChar::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetSpecialChar(kind_));
+       return auto_ptr<Inset>(new InsetSpecialChar(kind_));
 }