TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/ksirc/KSTicker/kspainter.cpp b/ksirc/KSTicker/kspainter.cpp
index 90ffac0d..e9e63bce 100644
--- a/ksirc/KSTicker/kspainter.cpp
+++ b/ksirc/KSTicker/kspainter.cpp
@@ -12,22 +12,22 @@ const TQColor KSPainter::lightCyan( 224, 255, 255 );
 const TQColor KSPainter::lightBlue( 173, 216, 230 );
 const TQColor KSPainter::pink	 ( 255, 192, 203 );
 
-TQColor KSPainter::num2colour[KSPainter::maxcolour] = { Qt::white,
-							     Qt::black,
-							     Qt::darkBlue,
-							     Qt::darkGreen,
-							     Qt::red,
+TQColor KSPainter::num2colour[KSPainter::maxcolour] = { TQt::white,
+							     TQt::black,
+							     TQt::darkBlue,
+							     TQt::darkGreen,
+							     TQt::red,
 							     brown,
-							     Qt::darkMagenta,
+							     TQt::darkMagenta,
 							     orange,
-							     Qt::yellow,
-							     Qt::green,
-							     Qt::darkCyan,
-							     Qt::cyan,
-							     Qt::blue,
+							     TQt::yellow,
+							     TQt::green,
+							     TQt::darkCyan,
+							     TQt::cyan,
+							     TQt::blue,
 							     pink,
-							     Qt::gray,
-							     Qt::lightGray };
+							     TQt::gray,
+							     TQt::lightGray };
 
 void KSPainter::initOptColours()
 {
@@ -67,7 +67,7 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty,
   for(loc = 0; (str[loc] != 0x00) && (loc != length) ; loc++){
     if(str[loc] == 0x03 || str[loc] == '~'){
       i = loc;
-      p->drawText(startx, starty, str + offset, i-offset);
+      p->drawText(startx, starty, TQString(str + offset), i-offset);
       startx += p->fontMetrics().width(str + offset, i-offset);
       offset = i;
       //      lastp = i;
@@ -180,7 +180,7 @@ void KSPainter::colourDrawText(TQPainter *p, int startx, int starty,
       offset += i - loc;
     }
   }
-  p->drawText(startx, starty, str + offset, loc-offset);
+  p->drawText(startx, starty, TQString(str + offset), loc-offset);
 
 }