Rename old tq methods that no longer need a unique name

18 files changed, 73 insertions, 73 deletions

diff --git a/kcachegrind/converters/hotshot2calltree b/kcachegrind/converters/hotshot2calltree
index e5c886a2..4eb8f7de 100644
--- a/kcachegrind/converters/hotshot2calltree
+++ b/kcachegrind/converters/hotshot2calltree
@@ -136,7 +136,7 @@ def return_from_call(caller_stack, call_dict, cost_now):
     call_dict[called[0]] = per_file_dict
 
 
-def updatetqStatus(filecount):
+def updateStatus(filecount):
     sys.stdout.write("reading File #%d    \r" % filecount)
     sys.stdout.flush()
 def convertProfFiles(output, inputfilenames):
@@ -153,7 +153,7 @@ def convertProfFiles(output, inputfilenames):
     filecount = 1
     number_of_files = len(inputfilenames)
     for inputfilename in inputfilenames:
-        updatetqStatus(filecount)
+        updateStatus(filecount)
         cost, filecount = convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount)
         total_cost += cost
         if (file_limit > 0) and (filecount > file_limit):
@@ -164,7 +164,7 @@ def convertProfFiles(output, inputfilenames):
     dumpResults(output, call_dict, total_cost, cost_per_pos, cost_per_function)
 
 def convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount):
-    updatetqStatus(filecount)
+    updateStatus(filecount)
     if not ((file_limit > 0) and (filecount > file_limit)):
         if os.path.isdir(inputfilename):
             cost, filecount = convertProfDir(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount)
diff --git a/kcachegrind/kcachegrind/cachegrindloader.cpp b/kcachegrind/kcachegrind/cachegrindloader.cpp
index 761830fc..64483512 100644
--- a/kcachegrind/kcachegrind/cachegrindloader.cpp
+++ b/kcachegrind/kcachegrind/cachegrindloader.cpp
@@ -181,8 +181,8 @@ bool CachegrindLoader::loadTrace(TracePart* p)
   CachegrindLoader l;
 
   /* emit progress signals via the singleton loader */
-  connect(&l, TQT_SIGNAL(updatetqStatus(TQString, int)),
-	  this, TQT_SIGNAL(updatetqStatus(TQString, int)));
+  connect(&l, TQT_SIGNAL(updateStatus(TQString, int)),
+	  this, TQT_SIGNAL(updateStatus(TQString, int)));
 
   return l.loadTraceInternal(p);
 }
@@ -737,7 +737,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
   kdDebug() << "Loading " << _filename << " ..." << endl;
   TQString statusMsg = i18n("Loading %1").tqarg(_filename);
   int statusProgress = 0;
-  emit updatetqStatus(statusMsg,statusProgress);
+  emit updateStatus(statusMsg,statusProgress);
 
 
 #if USE_FIXCOST
@@ -815,7 +815,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
 		 * "long operations" (like file loading) are in progress,
 		 * this can temporarly switch to another operation.
 		 */
-		emit updatetqStatus(statusMsg,statusProgress);
+		emit updateStatus(statusMsg,statusProgress);
 	      }
 
 	      continue;
@@ -1308,7 +1308,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
   }
 
 
-  emit updatetqStatus(statusMsg,100);
+  emit updateStatus(statusMsg,100);
 
   _part->tqinvalidate();
   if (!totalsSet) {
diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp
index 5fc8dbb3..f9ebb10c 100644
--- a/kcachegrind/kcachegrind/callgraphview.cpp
+++ b/kcachegrind/kcachegrind/callgraphview.cpp
@@ -1096,7 +1096,7 @@ void CanvasNode::drawShape(TQPainter& p)
 
   if (StoredDrawParams::selected() && _view->hasFocus()) {
     _view->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r,
-				  _view->tqcolorGroup());
+				  _view->colorGroup());
   }
 
   // draw afterwards to always get a frame even when zoomed
diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp
index 3f363f29..7aa6db40 100644
--- a/kcachegrind/kcachegrind/callmapview.cpp
+++ b/kcachegrind/kcachegrind/callmapview.cpp
@@ -531,7 +531,7 @@ void CallMapView::doUpdate(int changeType)
 TQColor CallMapView::groupColor(TraceFunction* f) const
 {
   if (!f)
-    return tqcolorGroup().button();
+    return colorGroup().button();
 
   return Configuration::functionColor(_groupType, f);
 }
diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui
index 9e5c0b59..575ae5f6 100644
--- a/kcachegrind/kcachegrind/configdlgbase.ui
+++ b/kcachegrind/kcachegrind/configdlgbase.ui
@@ -108,7 +108,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -186,7 +186,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -203,7 +203,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -228,7 +228,7 @@
                                         <property name="name">
                                             <cstring>classCombo</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>300</width>
                                                 <height>32767</height>
@@ -330,7 +330,7 @@
                                         <property name="name">
                                             <cstring>fileCombo</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>300</width>
                                                 <height>32767</height>
@@ -352,7 +352,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>300</width>
                                                 <height>32767</height>
@@ -441,7 +441,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -493,7 +493,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>49</height>
@@ -520,7 +520,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -570,7 +570,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>210</width>
                             <height>0</height>
diff --git a/kcachegrind/kcachegrind/dumpselectionbase.ui b/kcachegrind/kcachegrind/dumpselectionbase.ui
index 0643eed7..2f7ac41d 100644
--- a/kcachegrind/kcachegrind/dumpselectionbase.ui
+++ b/kcachegrind/kcachegrind/dumpselectionbase.ui
@@ -493,7 +493,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>21</width>
                                             <height>20</height>
@@ -602,7 +602,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>50</width>
                                             <height>20</height>
@@ -986,7 +986,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -1055,7 +1055,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>21</width>
                                             <height>20</height>
diff --git a/kcachegrind/kcachegrind/functionselectionbase.ui b/kcachegrind/kcachegrind/functionselectionbase.ui
index 3ab3378d..f61fcefd 100644
--- a/kcachegrind/kcachegrind/functionselectionbase.ui
+++ b/kcachegrind/kcachegrind/functionselectionbase.ui
@@ -90,7 +90,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>150</height>
diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp
index 81341672..985582a1 100644
--- a/kcachegrind/kcachegrind/instritem.cpp
+++ b/kcachegrind/kcachegrind/instritem.cpp
@@ -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->tqcolorGroup().brush( crole ) )
+  if ( cg.brush( crole ) != lv->colorGroup().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->tqcolorGroup().highlightedText();
+	  c = lv->colorGroup().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->tqcolorGroup().highlightedText();
+	  c = lv->colorGroup().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->tqdrawPolyline(a, 0, 5);
+      p->drawPolyline(a, 0, 5);
       p->setPen(c.dark());
-      p->tqdrawPolyline(a, 4, 2);
+      p->drawPolyline(a, 4, 2);
       p->setPen(c.light());
-      p->tqdrawPolyline(a, 5, 2);
+      p->drawPolyline(a, 5, 2);
       p->setPen(c.dark());
-      p->tqdrawPolyline(a, 6, 2);
+      p->drawPolyline(a, 6, 2);
   }
 
   // draw inner vertical line for start/stop
diff --git a/kcachegrind/kcachegrind/loader.h b/kcachegrind/kcachegrind/loader.h
index ee374054..f79f13d0 100644
--- a/kcachegrind/kcachegrind/loader.h
+++ b/kcachegrind/kcachegrind/loader.h
@@ -67,7 +67,7 @@ public:
   TQString description() const { return _description; }
 
 signals:
-  void updatetqStatus(TQString, int);
+  void updateStatus(TQString, int);
 
 private:
   TQString _name, _description;
diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp
index 47bda4c9..aa01e627 100644
--- a/kcachegrind/kcachegrind/partgraph.cpp
+++ b/kcachegrind/kcachegrind/partgraph.cpp
@@ -131,7 +131,7 @@ bool PartAreaWidget::isHidden(TracePart* part) const
 TQColor PartAreaWidget::groupColor(TraceFunction* f) const
 {
   if (!f)
-    return tqcolorGroup().button();
+    return colorGroup().button();
 
   return Configuration::functionColor(_groupType, f);
 }
@@ -234,7 +234,7 @@ TQString BasePartItem::text(int textNo) const
 
 TQColor BasePartItem::backColor() const
 {
-  return widget()->tqcolorGroup().base();
+  return widget()->colorGroup().base();
 }
 
 double BasePartItem::value() const
diff --git a/kcachegrind/kcachegrind/partselectionbase.ui b/kcachegrind/kcachegrind/partselectionbase.ui
index 5ee69746..53320d5b 100644
--- a/kcachegrind/kcachegrind/partselectionbase.ui
+++ b/kcachegrind/kcachegrind/partselectionbase.ui
@@ -37,7 +37,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>50</height>
diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp
index 9556c038..6bfc33ac 100644
--- a/kcachegrind/kcachegrind/sourceitem.cpp
+++ b/kcachegrind/kcachegrind/sourceitem.cpp
@@ -314,7 +314,7 @@ void SourceItem::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->tqcolorGroup().brush( crole ) )
+  if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
     p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
   else
     sv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
@@ -391,13 +391,13 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
       p->drawConvexPolygon(a);
 
       p->setPen(c.light());
-      p->tqdrawPolyline(a, 0, 5);
+      p->drawPolyline(a, 0, 5);
       p->setPen(c.dark());
-      p->tqdrawPolyline(a, 4, 2);
+      p->drawPolyline(a, 4, 2);
       p->setPen(c.light());
-      p->tqdrawPolyline(a, 5, 2);
+      p->drawPolyline(a, 5, 2);
       p->setPen(c.dark());
-      p->tqdrawPolyline(a, 6, 2);
+      p->drawPolyline(a, 6, 2);
   }
 
   // draw inner vertical line for start/stop
diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp
index 44165742..b063dd24 100644
--- a/kcachegrind/kcachegrind/toplevel.cpp
+++ b/kcachegrind/kcachegrind/toplevel.cpp
@@ -100,8 +100,8 @@ TopLevel::TopLevel(const char *name)
 #if 0
   // how to do avoid main window resizing on large statusbar label?
   TQSizePolicy p(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
-  _statusLabel->tqsetSizePolicy(p);
-  _statusbar->tqsetSizePolicy(p);
+  _statusLabel->setSizePolicy(p);
+  _statusbar->setSizePolicy(p);
 #endif
   _statusbar->addWidget(_statusLabel, 1);
 
@@ -2340,7 +2340,7 @@ void TopLevel::showMessage(const TQString& msg, int ms)
     _statusbar->message(msg, ms);
 }
 
-void TopLevel::showtqStatus(TQString msg, int progress)
+void TopLevel::showStatus(TQString msg, int progress)
 {
     static bool msgUpdateNeeded = true;
 
diff --git a/kcachegrind/kcachegrind/toplevel.h b/kcachegrind/kcachegrind/toplevel.h
index c437ceae..10e7cde5 100644
--- a/kcachegrind/kcachegrind/toplevel.h
+++ b/kcachegrind/kcachegrind/toplevel.h
@@ -196,7 +196,7 @@ public slots:
   void slotShowTip();
 
   // progress in status bar, empty message disables progress display
-  void showtqStatus(TQString msg, int progress);
+  void showStatus(TQString msg, int progress);
   void showMessage(const TQString&, int msec);
 
 private:
diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp
index 526c1cb0..6e1a8ad3 100644
--- a/kcachegrind/kcachegrind/tracedata.cpp
+++ b/kcachegrind/kcachegrind/tracedata.cpp
@@ -4531,7 +4531,7 @@ void TraceData::load(const TQString& base)
   updateFunctionCycles();
 
   // clear loading messages from status bar
-  if (_topLevel) _topLevel->showtqStatus(TQString(), 0);
+  if (_topLevel) _topLevel->showStatus(TQString(), 0);
 }
 
 TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
@@ -4547,8 +4547,8 @@ TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
   if (!l) return 0;
 
   if (_topLevel)
-      _topLevel->connect(l, TQT_SIGNAL(updatetqStatus(TQString, int)),
-			 TQT_SLOT(showtqStatus(TQString, int)));
+      _topLevel->connect(l, TQT_SIGNAL(updateStatus(TQString, int)),
+			 TQT_SLOT(showStatus(TQString, int)));
 
   TracePart* part = new TracePart(this, file);
 
@@ -5015,7 +5015,7 @@ void TraceData::updateFunctionCycles()
 #if 0
   int fCount = _functionMap.size(), fNo = 0, progress=0, p;
   TQString msg = i18n("Recalculating Function Cycles...");
-  if (_topLevel) _topLevel->showtqStatus(msg,0);
+  if (_topLevel) _topLevel->showStatus(msg,0);
 #endif
 
   // DFS and collapse strong connected components (Tarjan)
@@ -5029,7 +5029,7 @@ void TraceData::updateFunctionCycles()
 	  p = 100*fNo/fCount;
 	  if (p> progress) {
 	      progress = p;
-	      _topLevel->showtqStatus(msg, p);
+	      _topLevel->showStatus(msg, p);
 	  }
       }
 #endif
@@ -5047,7 +5047,7 @@ void TraceData::updateFunctionCycles()
   invalidateDynamicCost();
 
 #if 0
-  if (0) if (_topLevel) _topLevel->showtqStatus(TQString(),0);
+  if (0) if (_topLevel) _topLevel->showStatus(TQString(),0);
 #endif
 }
 
diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp
index c1f7f12b..52e1a83f 100644
--- a/kcachegrind/kcachegrind/treemap.cpp
+++ b/kcachegrind/kcachegrind/treemap.cpp
@@ -1517,11 +1517,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
 
         if (DEBUG_DRAWING)
 	    kdDebug(90100) << "  Checking " << i->path(0).join("/") << " ("
-		      << i->tqitemRect().x() << "/" << i->tqitemRect().y()
-		      << "-" << i->tqitemRect().width() 
-		      << "x" << i->tqitemRect().height() << ")" << endl;
+		      << i->itemRect().x() << "/" << i->itemRect().y()
+		      << "-" << i->itemRect().width() 
+		      << "x" << i->itemRect().height() << ")" << endl;
 
-        if (i->tqitemRect().contains(x, y)) {
+        if (i->itemRect().contains(x, y)) {
 
 	    if (DEBUG_DRAWING) kdDebug(90100) << "  .. Got. Index " << idx << endl;
 
@@ -1539,7 +1539,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
         if (DEBUG_DRAWING)
 	    kdDebug(90100) << "item(" << x << "," << y << "): Got " 
 		      << p->path(0).join("/") << " (Size " 
-		      << p->tqitemRect().width() << "x" << p->tqitemRect().height()
+		      << p->itemRect().width() << "x" << p->itemRect().height()
 		      << ", Val " << p->value() << ")" << endl;
       }
 
@@ -1568,8 +1568,8 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
 {
   if (i) {
     /* Must have a visible area */
-    while(i && ((i->tqitemRect().width() <1) ||
-                (i->tqitemRect().height() <1))) {
+    while(i && ((i->itemRect().width() <1) ||
+                (i->itemRect().height() <1))) {
       TreeMapItem* p = i->parent();
       if (!p) break;
       int idx = p->tqchildren()->findRef(i);
@@ -1798,7 +1798,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
     e->accept();
 
   if ( e->reason() == TQContextMenuEvent::Keyboard ) {
-    TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect();
+    TQRect r = (_current) ? _current->itemRect() : _base->itemRect();
     TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2);
     emit contextMenuRequested(_current, p);
   }
@@ -1962,14 +1962,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 int nextVisible(TreeMapItem* i)
 {
   TreeMapItem* p = i->parent();
-  if (!p || p->tqitemRect().isEmpty()) return -1;
+  if (!p || p->itemRect().isEmpty()) return -1;
 
   int idx = p->tqchildren()->findRef(i);
   if (idx<0) return -1;
 
   while (idx < (int)p->tqchildren()->count()-1) {
     idx++;
-    TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+    TQRect r = p->tqchildren()->at(idx)->itemRect();
     if (r.width()>1 && r.height()>1)
       return idx;
   }
@@ -1980,14 +1980,14 @@ int nextVisible(TreeMapItem* i)
 int prevVisible(TreeMapItem* i)
 {
   TreeMapItem* p = i->parent();
-  if (!p || p->tqitemRect().isEmpty()) return -1;
+  if (!p || p->itemRect().isEmpty()) return -1;
 
   int idx = p->tqchildren()->findRef(i);
   if (idx<0) return -1;
 
   while (idx > 0) {
     idx--;
-    TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+    TQRect r = p->tqchildren()->at(idx)->itemRect();
     if (r.width()>1 && r.height()>1)
       return idx;
   }
@@ -2162,7 +2162,7 @@ void TreeMapWidget::drawTreeMap()
     }
     else {
       // only subitem
-      if (!_needsRefresh->tqitemRect().isValid()) return;
+      if (!_needsRefresh->itemRect().isValid()) return;
     }
 
     // reset cached font object; it could have been changed
@@ -2180,7 +2180,7 @@ void TreeMapWidget::drawTreeMap()
     TQPainter p(this);
     tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
                            TQRect(0, 0, TQWidget::width(), TQWidget::height()),
-                           tqcolorGroup() );
+                           colorGroup() );
   }
 }
 
@@ -2226,7 +2226,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
   int dd = item->depth();
   if (isTransparent(dd)) return;
 
-  RectDrawing d(item->tqitemRect());
+  RectDrawing d(item->itemRect());
   item->setSelected(isSelected);
   item->setCurrent(isCurrent);
   item->setShaded(_shading);
@@ -2261,15 +2261,15 @@ void TreeMapWidget::drawItems(TQPainter* p,
 {
     if (DEBUG_DRAWING)
 	kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", "
-		  << item->tqitemRect().x() << "/" << item->tqitemRect().y()
-		  << "-" << item->tqitemRect().width() << "x"
-		  << item->tqitemRect().height() << "), Val " << item->value()
+		  << item->itemRect().x() << "/" << item->itemRect().y()
+		  << "-" << item->itemRect().width() << "x"
+		  << item->itemRect().height() << "), Val " << item->value()
 		  << ", Sum " << item->sum() << endl;
 
   drawItem(p, item);
   item->clearFreeRects();
 
-  TQRect origRect = item->tqitemRect();
+  TQRect origRect = item->itemRect();
   int bw = item->borderWidth();
   TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
                   origRect.width()-2*bw, origRect.height()-2*bw);
@@ -2317,7 +2317,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
         i->clearItemRect();
     }
     // tooltip apears on whole item rect
-    item->addFreeRect(item->tqitemRect());
+    item->addFreeRect(item->itemRect());
 
     // if we have space for text...
     if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return;
diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h
index 1604a51c..a70f5bd4 100644
--- a/kcachegrind/kcachegrind/treemap.h
+++ b/kcachegrind/kcachegrind/treemap.h
@@ -297,7 +297,7 @@ public:
    */
   void setItemRect(const TQRect& r) { _rect = r; }
   void clearItemRect();
-  const TQRect& tqitemRect() const { return _rect; }
+  const TQRect& itemRect() const { return _rect; }
   int width() const { return _rect.width(); }
   int height() const { return _rect.height(); }
 
diff --git a/kcachegrind/kcachegrind/utils.h b/kcachegrind/kcachegrind/utils.h
index 06052a61..7256f054 100644
--- a/kcachegrind/kcachegrind/utils.h
+++ b/kcachegrind/kcachegrind/utils.h
@@ -86,7 +86,7 @@ class FixString {
     bool stripInt64(int64&, bool stripSpaces = true);
 
     operator TQString() const
-	{ return TQString::tqfromLatin1(_str,_len); }
+	{ return TQString::fromLatin1(_str,_len); }
 
  private:
     const char* _str;