From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksirc/KSTicker/kspainter.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'ksirc/KSTicker/kspainter.cpp') diff --git a/ksirc/KSTicker/kspainter.cpp b/ksirc/KSTicker/kspainter.cpp index fe5fbf65..90ffac0d 100644 --- a/ksirc/KSTicker/kspainter.cpp +++ b/ksirc/KSTicker/kspainter.cpp @@ -6,13 +6,13 @@ const int KSPainter::optcolours = 8; const int KSPainter::startspecial = 16; const int KSPainter::maxcolour = 16+optcolours; -const QColor KSPainter::brown ( 165, 42, 42 ); -const QColor KSPainter::orange ( 255, 165, 0 ); -const QColor KSPainter::lightCyan( 224, 255, 255 ); -const QColor KSPainter::lightBlue( 173, 216, 230 ); -const QColor KSPainter::pink ( 255, 192, 203 ); +const TQColor KSPainter::brown ( 165, 42, 42 ); +const TQColor KSPainter::orange ( 255, 165, 0 ); +const TQColor KSPainter::lightCyan( 224, 255, 255 ); +const TQColor KSPainter::lightBlue( 173, 216, 230 ); +const TQColor KSPainter::pink ( 255, 192, 203 ); -QColor KSPainter::num2colour[KSPainter::maxcolour] = { Qt::white, +TQColor KSPainter::num2colour[KSPainter::maxcolour] = { Qt::white, Qt::black, Qt::darkBlue, Qt::darkGreen, @@ -41,7 +41,7 @@ void KSPainter::initOptColours() num2colour[startspecial+7] = ksopts->backgroundColor; } -int KSPainter::colour2num(const QColor &colour) +int KSPainter::colour2num(const TQColor &colour) { for(int i = 0; i < maxcolour; i++) if(num2colour[i] == colour) @@ -50,7 +50,7 @@ int KSPainter::colour2num(const QColor &colour) return -1; } -void KSPainter::colourDrawText(QPainter *p, int startx, int starty, +void KSPainter::colourDrawText(TQPainter *p, int startx, int starty, char *str, int length) { int offset = 0; @@ -62,7 +62,7 @@ void KSPainter::colourDrawText(QPainter *p, int startx, int starty, // Default pen (colour) - const QPen qpDefPen = p->pen(); + const TQPen qpDefPen = p->pen(); for(loc = 0; (str[loc] != 0x00) && (loc != length) ; loc++){ if(str[loc] == 0x03 || str[loc] == '~'){ @@ -121,8 +121,8 @@ void KSPainter::colourDrawText(QPainter *p, int startx, int starty, p->setBackgroundMode(Qt::TransparentMode); } else if((str[i] == '~') && ((str[i+1] >= 0x61) || (str[i+1] <= 0x7a))){ - QFont fnt = p->font(); - QColor temppen; + TQFont fnt = p->font(); + TQColor temppen; switch(str[i+1]){ case 'c': p->setPen(qpDefPen); -- cgit v1.2.1