TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

1 files changed, 27 insertions, 27 deletions

diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp
index 97c09661..3aa7d22d 100644
--- a/kcachegrind/kcachegrind/instritem.cpp
+++ b/kcachegrind/kcachegrind/instritem.cpp
@@ -37,9 +37,9 @@
 // InstrItem
 
 // for messages
-InstrItem::InstrItem(InstrView* iv, TQListView* parent,
+InstrItem::InstrItem(InstrView* iv, TQListView* tqparent,
 		     Addr addr, const TQString& msg)
-    : TQListViewItem(parent)
+    : TQListViewItem(tqparent)
 {
   _view = iv;
   _addr = addr;
@@ -56,11 +56,11 @@ InstrItem::InstrItem(InstrView* iv, TQListView* parent,
 }
 
 // for code lines
-InstrItem::InstrItem(InstrView* iv, TQListView* parent,
+InstrItem::InstrItem(InstrView* iv, TQListView* tqparent,
 		     Addr addr, bool inside,
 		     const TQString& code, const TQString& cmd,
 		     const TQString& args, TraceInstr* instr)
-    : TQListViewItem(parent)
+    : TQListViewItem(tqparent)
 {
   _view = iv;
   _addr = addr;
@@ -86,9 +86,9 @@ InstrItem::InstrItem(InstrView* iv, TQListView* parent,
 }
 
 // for call lines
-InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
+InstrItem::InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr,
 		     TraceInstr* instr, TraceInstrCall* instrCall)
-    : TQListViewItem(parent)
+    : TQListViewItem(tqparent)
 {
   _view = iv;
   _addr = addr;
@@ -107,7 +107,7 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
   else
     templ += i18n("%n call to '%1'", "%n calls to '%1'", cc);
 
-  TQString callStr = templ.arg(_instrCall->call()->calledName());
+  TQString callStr = templ.tqarg(_instrCall->call()->calledName());
   TraceFunction* calledF = _instrCall->call()->called();
   calledF->addPrettyLocation(callStr);
 
@@ -118,9 +118,9 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
 }
 
 // for jump lines
-InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
+InstrItem::InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr,
 		     TraceInstr* instr, TraceInstrJump* instrJump)
-    : TQListViewItem(parent)
+    : TQListViewItem(tqparent)
 {
   _view = iv;
   _addr = addr;
@@ -135,13 +135,13 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
   TQString jStr;
   if (_instrJump->isCondJump())
       jStr = i18n("Jump %1 of %2 times to 0x%3")
-	  .arg(_instrJump->followedCount().pretty())
-	  .arg(_instrJump->executedCount().pretty())
-	  .arg(_instrJump->instrTo()->addr().toString());
+	  .tqarg(_instrJump->followedCount().pretty())
+	  .tqarg(_instrJump->executedCount().pretty())
+	  .tqarg(_instrJump->instrTo()->addr().toString());
   else
       jStr = i18n("Jump %1 times to 0x%2")
-	  .arg(_instrJump->executedCount().pretty())
-	  .arg(_instrJump->instrTo()->addr().toString());
+	  .tqarg(_instrJump->executedCount().pretty())
+	  .tqarg(_instrJump->instrTo()->addr().toString());
 
   setText(6, jStr);
 
@@ -200,7 +200,7 @@ void InstrItem::updateCost()
   TraceCostType *ct = _view->costType();
   _pure = ct ? instrCost->subCost(ct) : SubCost(0);
   if (_pure == 0) {
-    setText(1, TQString::null);
+    setText(1, TQString());
     setPixmap(1, TQPixmap());
   }
   else {
@@ -209,7 +209,7 @@ void InstrItem::updateCost()
 
     if (Configuration::showPercentage())
       setText(1, TQString("%1")
-	      .arg(pure, 0, 'f', Configuration::percentPrecision()));
+	      .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
     else
       setText(1, _pure.pretty());
     
@@ -219,7 +219,7 @@ void InstrItem::updateCost()
   TraceCostType *ct2 = _view->costType2();
   _pure2 = ct2 ? instrCost->subCost(ct2) : SubCost(0);
   if (_pure2 == 0) {
-    setText(2, TQString::null);
+    setText(2, TQString());
     setPixmap(2, TQPixmap());
   }
   else {
@@ -228,7 +228,7 @@ void InstrItem::updateCost()
 
     if (Configuration::showPercentage())
       setText(2, TQString("%1")
-	      .arg(pure, 0, 'f', Configuration::percentPrecision()));
+	      .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
     else
       setText(2, _pure2.pretty());
     
@@ -297,7 +297,7 @@ int InstrItem::compare(TQListViewItem * i, int col, bool ascending ) const
 }
 
 void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-			   int column, int width, int alignment )
+			   int column, int width, int tqalignment )
 {
   TQColorGroup _cg( cg );
 
@@ -309,7 +309,7 @@ void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg,
   if (column == 3)
     paintArrows(p, _cg, width);
   else
-    TQListViewItem::paintCell( p, _cg, column, width, alignment );
+    TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 void InstrItem::setJumpArray(const TQMemArray<TraceInstrJump*>& a)
@@ -326,7 +326,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
   const BackgroundMode bgmode = lv->viewport()->backgroundMode();
   const TQColorGroup::ColorRole crole
     = TQPalette::backgroundRoleFromMode( bgmode );
-  if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
+  if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
     p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
   else
     iv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
@@ -373,7 +373,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
 	  p->fillRect( marg + 6*i-2, (y1==0) ? y1: y1-2,
 		       8, (y2-y1==height())? y2:y2+2,
 		       cg.brush( TQColorGroup::Highlight ) );
-	  c = lv->colorGroup().highlightedText();
+	  c = lv->tqcolorGroup().highlightedText();
       }
 #endif
       p->fillRect( marg + 6*i, y1, 4, y2, c);
@@ -388,7 +388,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
   if (start >= 0) {
 #if 0
       if (_jump[start] == ((TraceItemView*)_view)->selectedItem()) {	  
-	  c = lv->colorGroup().highlightedText();
+	  c = lv->tqcolorGroup().highlightedText();
       }
 #endif
       c = _jump[start]->isCondJump() ? red : blue;
@@ -416,13 +416,13 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
       p->drawConvexPolygon(a);
 
       p->setPen(c.light());
-      p->drawPolyline(a, 0, 5);
+      p->tqdrawPolyline(a, 0, 5);
       p->setPen(c.dark());
-      p->drawPolyline(a, 4, 2);
+      p->tqdrawPolyline(a, 4, 2);
       p->setPen(c.light());
-      p->drawPolyline(a, 5, 2);
+      p->tqdrawPolyline(a, 5, 2);
       p->setPen(c.dark());
-      p->drawPolyline(a, 6, 2);
+      p->tqdrawPolyline(a, 6, 2);
   }
 
   // draw inner vertical line for start/stop