Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QLPainter.C

diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C
index 5918b1eb6ddea813572ea70d81928e73cd21068b..aff7c6af40cd2c070c60cdc19cd5274a57a97ea7 100644 (file)
--- a/src/frontends/qt2/QLPainter.C
+++ b/src/frontends/qt2/QLPainter.C
@@ -142,7 +142,8 @@ Painter & QLPainter::rectangle(int x, int y,
        line_style ls,
        line_width lw)
 {
-       //lyxerr << "rectangle " << x<<","<<y << " " <<w<<","<<h<<endl;
+       //lyxerr << "rectangle " << x << ',' << y << ' '
+       //       << w << ',' << h << endl;
        setPen(col, ls, lw).drawRect(x, y, w, h);
        return *this;
 }
@@ -152,7 +153,8 @@ Painter & QLPainter::fillRectangle(int x, int y,
        int w, int h,
        LColor::color col)
 {
-       //lyxerr << "fillRectangle " << x<<","<<y << " " <<w<<","<<h<<endl;
+       //lyxerr << "fillRectangle " << x << ',' << y << ' '
+       //       << w << ',' << h << endl;
        qp_->fillRect(x, y, w, h, QColor(lcolor.getX11Name(col).c_str()));
        return *this;
 }
@@ -184,8 +186,8 @@ Painter & QLPainter::arc(int x, int y,
        unsigned int w, unsigned int h,
        int a1, int a2, LColor::color col)
 {
-       lyxerr[Debug::GUI] << "arc: " << x<<","<<y
-               << " " << w<<","<<h << ", angles "
+       lyxerr[Debug::GUI] << "arc: " << x << ',' << y
+               << ' ' << w << ',' << h << ", angles "
                << a1 << " - " << a2 << endl;
        // LyX usings 1/64ths degree, Qt usings 1/16th
        setPen(col).drawArc(x, y, w, h, a1 / 4, a2 / 4);
@@ -249,7 +251,7 @@ Painter & QLPainter::text(int x, int y,
        char const * s, size_t ls,
        LyXFont const & f)
 {
-       setPen(f.color());
+       setPen(f.realColor());
 
        Encoding const * encoding = f.language()->encoding();
        if (f.isSymbolFont())