Move Color::color enum to ColorCode.h

[lyx.git] / src / frontends / qt4 / GuiPainter.cpp

diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index a3fad0e7b1223dff989dde0654991f7314fce33b..a3c2b6ccacba1438286b9f6e78c89a2ea834b031 100644 (file)
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -22,7 +22,6 @@
 
 #include "debug.h"
 #include "Language.h"
-#include "Color.h"
 
 #include "support/unicode.h"
 
@@ -64,7 +63,7 @@ GuiPainter::GuiPainter(QPaintDevice * device)
        : QPainter(device), Painter()
 {
        // new QPainter has default QPen:
-       current_color_ = Color::black;
+       current_color_ = Color_black;
        current_ls_ = line_solid;
        current_lw_ = line_thin;
 }
@@ -77,7 +76,7 @@ GuiPainter::~GuiPainter()
 }
 
 
-void GuiPainter::setQPainterPen(Color_color col,
+void GuiPainter::setQPainterPen(ColorCode col,
        Painter::line_style ls, Painter::line_width lw)
 {
        if (col == current_color_ && ls == current_ls_ && lw == current_lw_)
@@ -105,7 +104,7 @@ void GuiPainter::setQPainterPen(Color_color col,
 }
 
 
-void GuiPainter::point(int x, int y, Color_color col)
+void GuiPainter::point(int x, int y, ColorCode col)
 {
        if (!isDrawingEnabled())
                return;
@@ -116,7 +115,7 @@ void GuiPainter::point(int x, int y, Color_color col)
 
 
 void GuiPainter::line(int x1, int y1, int x2, int y2,
-       Color_color col,
+       ColorCode col,
        line_style ls,
        line_width lw)
 {
@@ -133,7 +132,7 @@ void GuiPainter::line(int x1, int y1, int x2, int y2,
 
 
 void GuiPainter::lines(int const * xp, int const * yp, int np,
-       Color_color col,
+       ColorCode col,
        line_style ls,
        line_width lw)
 {
@@ -161,7 +160,7 @@ void GuiPainter::lines(int const * xp, int const * yp, int np,
 
 
 void GuiPainter::rectangle(int x, int y, int w, int h,
-       Color_color col,
+       ColorCode col,
        line_style ls,
        line_width lw)
 {
@@ -173,14 +172,14 @@ void GuiPainter::rectangle(int x, int y, int w, int h,
 }
 
 
-void GuiPainter::fillRectangle(int x, int y, int w, int h, Color_color col)
+void GuiPainter::fillRectangle(int x, int y, int w, int h, ColorCode col)
 {
        fillRect(x, y, w, h, guiApp->colorCache().get(col));
 }
 
 
 void GuiPainter::arc(int x, int y, unsigned int w, unsigned int h,
-       int a1, int a2, Color_color col)
+       int a1, int a2, ColorCode col)
 {
        if (!isDrawingEnabled())
                return;
@@ -199,7 +198,7 @@ void GuiPainter::image(int x, int y, int w, int h, graphics::Image const & i)
        graphics::GuiImage const & qlimage =
                static_cast<graphics::GuiImage const &>(i);
 
-       fillRectangle(x, y, w, h, Color::graphicsbg);
+       fillRectangle(x, y, w, h, Color_graphicsbg);
 
        if (!isDrawingEnabled())
                return;
@@ -245,6 +244,9 @@ int GuiPainter::smallCapsText(int x, int y,
 int GuiPainter::text(int x, int y, docstring const & s,
                Font const & f)
 {
+       if (s.empty())
+               return 0;
+
        /* Caution: The following ucs4 to QString conversions work for symbol fonts
        only because they are no real conversions but simple casts in reality.
        When we want to draw a symbol or calculate the metrics we pass the position
@@ -265,7 +267,7 @@ int GuiPainter::text(int x, int y, docstring const & s,
                str = ' ' + str;
 #endif
 
-       QLFontInfo & fi = guiApp->guiFontLoader().fontinfo(f);
+       GuiFontInfo & fi = guiApp->guiFontLoader().fontinfo(f);
 
        int textwidth;
 
@@ -314,8 +316,8 @@ int GuiPainter::text(int x, int y, docstring const & s,
                // We need to draw the text as LTR as we use our own bidi code.
                setLayoutDirection(Qt::LeftToRight);
                drawText(x, y, str);
-               LYXERR(Debug::PAINTING) << "draw " << std::string(str.toUtf8())
-                       << " at " << x << "," << y << std::endl;
+               //LYXERR(Debug::PAINTING) << "draw " << std::string(str.toUtf8())
+               //      << " at " << x << "," << y << std::endl;
                return textwidth;
        }
 
@@ -347,9 +349,9 @@ int GuiPainter::text(int x, int y, docstring const & s,
                p.setLayoutDirection(Qt::LeftToRight);
                p.drawText(-lb, mA, str);
                QPixmapCache::insert(key, pm);
-               LYXERR(Debug::PAINTING) << "h=" << h << "  mA=" << mA << "  mD=" << mD
-                       << "  w=" << w << "  lb=" << lb << "  tw=" << textwidth 
-                       << "  rb=" << rb << endl;
+               //LYXERR(Debug::PAINTING) << "h=" << h << "  mA=" << mA << "  mD=" << mD
+               //      << "  w=" << w << "  lb=" << lb << "  tw=" << textwidth 
+               //      << "  rb=" << rb << endl;
        }
        // Draw the cached pixmap.
        drawPixmap(x + lb, y - mA, pm);