#include "debug.h"
#include "Language.h"
-#include "Color.h"
#include "support/unicode.h"
: QPainter(device), Painter()
{
// new QPainter has default QPen:
- current_color_ = Color::black;
+ current_color_ = Color_black;
current_ls_ = line_solid;
current_lw_ = line_thin;
}
}
-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_)
}
-void GuiPainter::point(int x, int y, Color_color col)
+void GuiPainter::point(int x, int y, ColorCode col)
{
if (!isDrawingEnabled())
return;
void GuiPainter::line(int x1, int y1, int x2, int y2,
- Color_color col,
+ ColorCode col,
line_style ls,
line_width lw)
{
void GuiPainter::lines(int const * xp, int const * yp, int np,
- Color_color col,
+ ColorCode col,
line_style ls,
line_width lw)
{
void GuiPainter::rectangle(int x, int y, int w, int h,
- Color_color col,
+ ColorCode col,
line_style ls,
line_width lw)
{
}
-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;
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;
str = ' ' + str;
#endif
- QLFontInfo & fi = guiApp->guiFontLoader().fontinfo(f);
+ GuiFontInfo & fi = guiApp->guiFontLoader().fontinfo(f);
int textwidth;