Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b0c86264e0cd10a0d3a47de3b05be453d9417bcd)

19 files changed, 276 insertions, 276 deletions

diff --git a/tdecachegrind/tdecachegrind/cachegrindloader.cpp b/tdecachegrind/tdecachegrind/cachegrindloader.cpp
index 9434ee36..ea688e74 100644
--- a/tdecachegrind/tdecachegrind/cachegrindloader.cpp
+++ b/tdecachegrind/tdecachegrind/cachegrindloader.cpp
@@ -181,8 +181,8 @@ bool CachegrindLoader::loadTrace(TracePart* p)
   CachegrindLoader l;
 
   /* emit progress signals via the singleton loader */
-  connect(&l, TQT_SIGNAL(updateStatus(TQString, int)),
-	  this, TQT_SIGNAL(updateStatus(TQString, int)));
+  connect(&l, TQ_SIGNAL(updateStatus(TQString, int)),
+	  this, TQ_SIGNAL(updateStatus(TQString, int)));
 
   return l.loadTraceInternal(p);
 }
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index 76d62260..cc3baee7 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -1391,12 +1391,12 @@ CallGraphView::CallGraphView(TraceItemView* parentView,
   setFocusPolicy(TQWidget::StrongFocus);
   setBackgroundMode(TQt::NoBackground);
 
-  connect(this, TQT_SIGNAL(contentsMoving(int,int)),
-          this, TQT_SLOT(contentsMovingSlot(int,int)));
-  connect(_completeView, TQT_SIGNAL(zoomRectMoved(int,int)),
-          this, TQT_SLOT(zoomRectMoved(int,int)));
-  connect(_completeView, TQT_SIGNAL(zoomRectMoveFinished()),
-          this, TQT_SLOT(zoomRectMoveFinished()));
+  connect(this, TQ_SIGNAL(contentsMoving(int,int)),
+          this, TQ_SLOT(contentsMovingSlot(int,int)));
+  connect(_completeView, TQ_SIGNAL(zoomRectMoved(int,int)),
+          this, TQ_SLOT(zoomRectMoved(int,int)));
+  connect(_completeView, TQ_SIGNAL(zoomRectMoveFinished()),
+          this, TQ_SLOT(zoomRectMoveFinished()));
 
   TQWhatsThis::add( this, whatsThis() );
 
@@ -1405,8 +1405,8 @@ CallGraphView::CallGraphView(TraceItemView* parentView,
 
   _renderProcess = 0;
   _prevSelectedNode = 0;
-  connect(&_renderTimer, TQT_SIGNAL(timeout()),
-          this, TQT_SLOT(showRenderWarning()));
+  connect(&_renderTimer, TQ_SIGNAL(timeout()),
+          this, TQ_SLOT(showRenderWarning()));
 }
 
 CallGraphView::~CallGraphView()
@@ -1854,10 +1854,10 @@ void CallGraphView::refresh()
   _renderProcess->addArgument(_exporter.filename());
   _renderProcess->addArgument( "-Tplain" );
 
-  connect( _renderProcess, TQT_SIGNAL(readyReadStdout()),
-	   this, TQT_SLOT(readDotOutput()) );
-  connect( _renderProcess, TQT_SIGNAL(processExited()),
-	   this, TQT_SLOT(dotExited()) );
+  connect( _renderProcess, TQ_SIGNAL(readyReadStdout()),
+	   this, TQ_SLOT(readDotOutput()) );
+  connect( _renderProcess, TQ_SIGNAL(processExited()),
+	   this, TQ_SLOT(dotExited()) );
 
   if (1) kdDebug() << "Running '" 
 		   << _renderProcess->arguments().join(" ")
diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp
index 550eb8a4..4a0a87d5 100644
--- a/tdecachegrind/tdecachegrind/callmapview.cpp
+++ b/tdecachegrind/tdecachegrind/callmapview.cpp
@@ -77,17 +77,17 @@ CallMapView::CallMapView(bool showCallers, TraceItemView* parentView,
   setMinimalArea(DEFAULT_MAXAREA);
 
   connect(this,
-          TQT_SIGNAL(doubleClicked(TreeMapItem*)),
-          TQT_SLOT(activatedSlot(TreeMapItem*)));
+          TQ_SIGNAL(doubleClicked(TreeMapItem*)),
+          TQ_SLOT(activatedSlot(TreeMapItem*)));
   connect(this,
-          TQT_SIGNAL(returnPressed(TreeMapItem*)),
-          TQT_SLOT(activatedSlot(TreeMapItem*)));
+          TQ_SIGNAL(returnPressed(TreeMapItem*)),
+          TQ_SLOT(activatedSlot(TreeMapItem*)));
   connect(this,
-          TQT_SIGNAL(currentChanged(TreeMapItem*, bool)),
-          TQT_SLOT(selectedSlot(TreeMapItem*, bool)));
+          TQ_SIGNAL(currentChanged(TreeMapItem*, bool)),
+          TQ_SLOT(selectedSlot(TreeMapItem*, bool)));
   connect(this,
-          TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint &)),
-          TQT_SLOT(context(TreeMapItem*,const TQPoint &)));
+          TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint &)),
+          TQ_SLOT(context(TreeMapItem*,const TQPoint &)));
 
   TQWhatsThis::add( this, whatsThis());
 }
diff --git a/tdecachegrind/tdecachegrind/callview.cpp b/tdecachegrind/tdecachegrind/callview.cpp
index f4be7ae7..edf82bf1 100644
--- a/tdecachegrind/tdecachegrind/callview.cpp
+++ b/tdecachegrind/tdecachegrind/callview.cpp
@@ -61,20 +61,20 @@ CallView::CallView(bool showCallers, TraceItemView* parentView,
     setMinimumHeight(50);
 
     connect( this,
-	     TQT_SIGNAL( selectionChanged(TQListViewItem*) ),
-	     TQT_SLOT( selectedSlot(TQListViewItem*) ) );
+	     TQ_SIGNAL( selectionChanged(TQListViewItem*) ),
+	     TQ_SLOT( selectedSlot(TQListViewItem*) ) );
 
     connect( this,
-	     TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-	     TQT_SLOT(context(TQListViewItem*, const TQPoint &, int)));
+	     TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+	     TQ_SLOT(context(TQListViewItem*, const TQPoint &, int)));
 
     connect(this,
-	    TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-	    TQT_SLOT(activatedSlot(TQListViewItem*)));
+	    TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+	    TQ_SLOT(activatedSlot(TQListViewItem*)));
 
     connect(this,
-	    TQT_SIGNAL(returnPressed(TQListViewItem*)),
-	    TQT_SLOT(activatedSlot(TQListViewItem*)));
+	    TQ_SIGNAL(returnPressed(TQListViewItem*)),
+	    TQ_SLOT(activatedSlot(TQListViewItem*)));
 
     TQWhatsThis::add( this, whatsThis() );
 }
diff --git a/tdecachegrind/tdecachegrind/configdlg.cpp b/tdecachegrind/tdecachegrind/configdlg.cpp
index 47a3c782..3cb2a988 100644
--- a/tdecachegrind/tdecachegrind/configdlg.cpp
+++ b/tdecachegrind/tdecachegrind/configdlg.cpp
@@ -62,32 +62,32 @@ ConfigDlg::ConfigDlg(Configuration* c, TraceData* data,
   fnItem = new(colorList, i18n("Function (no Grouping)"));
 #endif
 
-  connect(objectCombo, TQT_SIGNAL(activated(const TQString &)),
-          this, TQT_SLOT(objectActivated(const TQString &)));
-  connect(objectCombo, TQT_SIGNAL(textChanged(const TQString &)),
-          this, TQT_SLOT(objectActivated(const TQString &)));
-  connect(objectCheck, TQT_SIGNAL(toggled(bool)),
-          this, TQT_SLOT(objectCheckChanged(bool)));
-  connect(objectColor, TQT_SIGNAL(changed(const TQColor &)),
-          this, TQT_SLOT(objectColorChanged(const TQColor &)));
-
-  connect(classCombo, TQT_SIGNAL(activated(const TQString &)),
-          this, TQT_SLOT(classActivated(const TQString &)));
-  connect(classCombo, TQT_SIGNAL(textChanged(const TQString &)),
-          this, TQT_SLOT(classActivated(const TQString &)));
-  connect(classCheck, TQT_SIGNAL(toggled(bool)),
-          this, TQT_SLOT(classCheckChanged(bool)));
-  connect(classColor, TQT_SIGNAL(changed(const TQColor &)),
-          this, TQT_SLOT(classColorChanged(const TQColor &)));
-
-  connect(fileCombo, TQT_SIGNAL(activated(const TQString &)),
-          this, TQT_SLOT(fileActivated(const TQString &)));
-  connect(fileCombo, TQT_SIGNAL(textChanged(const TQString &)),
-          this, TQT_SLOT(fileActivated(const TQString &)));
-  connect(fileCheck, TQT_SIGNAL(toggled(bool)),
-          this, TQT_SLOT(fileCheckChanged(bool)));
-  connect(fileColor, TQT_SIGNAL(changed(const TQColor &)),
-          this, TQT_SLOT(fileColorChanged(const TQColor &)));
+  connect(objectCombo, TQ_SIGNAL(activated(const TQString &)),
+          this, TQ_SLOT(objectActivated(const TQString &)));
+  connect(objectCombo, TQ_SIGNAL(textChanged(const TQString &)),
+          this, TQ_SLOT(objectActivated(const TQString &)));
+  connect(objectCheck, TQ_SIGNAL(toggled(bool)),
+          this, TQ_SLOT(objectCheckChanged(bool)));
+  connect(objectColor, TQ_SIGNAL(changed(const TQColor &)),
+          this, TQ_SLOT(objectColorChanged(const TQColor &)));
+
+  connect(classCombo, TQ_SIGNAL(activated(const TQString &)),
+          this, TQ_SLOT(classActivated(const TQString &)));
+  connect(classCombo, TQ_SIGNAL(textChanged(const TQString &)),
+          this, TQ_SLOT(classActivated(const TQString &)));
+  connect(classCheck, TQ_SIGNAL(toggled(bool)),
+          this, TQ_SLOT(classCheckChanged(bool)));
+  connect(classColor, TQ_SIGNAL(changed(const TQColor &)),
+          this, TQ_SLOT(classColorChanged(const TQColor &)));
+
+  connect(fileCombo, TQ_SIGNAL(activated(const TQString &)),
+          this, TQ_SLOT(fileActivated(const TQString &)));
+  connect(fileCombo, TQ_SIGNAL(textChanged(const TQString &)),
+          this, TQ_SLOT(fileActivated(const TQString &)));
+  connect(fileCheck, TQ_SIGNAL(toggled(bool)),
+          this, TQ_SLOT(fileCheckChanged(bool)));
+  connect(fileColor, TQ_SIGNAL(changed(const TQColor &)),
+          this, TQ_SLOT(fileColorChanged(const TQColor &)));
 
   TQString objectPrefix = TraceCost::typeName(TraceCost::Object);
   TQString classPrefix = TraceCost::typeName(TraceCost::Class);
@@ -178,12 +178,12 @@ ConfigDlg::ConfigDlg(Configuration* c, TraceData* data,
     }
   }
 
-  connect(dirList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          this, TQT_SLOT(dirsItemChanged(TQListViewItem*)));
-  connect(addDirButton, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(dirsAddPressed()));
-  connect(deleteDirButton, TQT_SIGNAL(clicked()),
-          this, TQT_SLOT(dirsDeletePressed()));
+  connect(dirList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          this, TQ_SLOT(dirsItemChanged(TQListViewItem*)));
+  connect(addDirButton, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(dirsAddPressed()));
+  connect(deleteDirButton, TQ_SIGNAL(clicked()),
+          this, TQ_SLOT(dirsDeletePressed()));
   dirList->setSelected(dirList->firstChild(), true);
 
   symbolCount->setText(TQString::number(c->_maxSymbolCount));
diff --git a/tdecachegrind/tdecachegrind/costtypeview.cpp b/tdecachegrind/tdecachegrind/costtypeview.cpp
index 3f8780ac..18bef5cd 100644
--- a/tdecachegrind/tdecachegrind/costtypeview.cpp
+++ b/tdecachegrind/tdecachegrind/costtypeview.cpp
@@ -54,24 +54,24 @@ CostTypeView::CostTypeView(TraceItemView* parentView,
     setMinimumHeight(50);
 
     connect( this,
-	     TQT_SIGNAL( selectionChanged(TQListViewItem*) ),
-	     TQT_SLOT( selectedSlot(TQListViewItem*) ) );
+	     TQ_SIGNAL( selectionChanged(TQListViewItem*) ),
+	     TQ_SLOT( selectedSlot(TQListViewItem*) ) );
 
     connect( this,
-	     TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-	     TQT_SLOT(context(TQListViewItem*, const TQPoint &, int)));
+	     TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+	     TQ_SLOT(context(TQListViewItem*, const TQPoint &, int)));
 
     connect(this,
-	    TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-	    TQT_SLOT(activatedSlot(TQListViewItem*)));
+	    TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+	    TQ_SLOT(activatedSlot(TQListViewItem*)));
 
     connect(this,
-	    TQT_SIGNAL(returnPressed(TQListViewItem*)),
-	    TQT_SLOT(activatedSlot(TQListViewItem*)));
+	    TQ_SIGNAL(returnPressed(TQListViewItem*)),
+	    TQ_SLOT(activatedSlot(TQListViewItem*)));
 
     connect(this,
-	    TQT_SIGNAL(itemRenamed(TQListViewItem*,int,const TQString&)),
-	    TQT_SLOT(renamedSlot(TQListViewItem*,int,const TQString&)));
+	    TQ_SIGNAL(itemRenamed(TQListViewItem*,int,const TQString&)),
+	    TQ_SLOT(renamedSlot(TQListViewItem*,int,const TQString&)));
 
     TQWhatsThis::add( this, whatsThis() );
 }
diff --git a/tdecachegrind/tdecachegrind/coverageview.cpp b/tdecachegrind/tdecachegrind/coverageview.cpp
index b1ead5eb..3f361f2c 100644
--- a/tdecachegrind/tdecachegrind/coverageview.cpp
+++ b/tdecachegrind/tdecachegrind/coverageview.cpp
@@ -66,20 +66,20 @@ CoverageView::CoverageView(bool showCallers, TraceItemView* parentView,
     setMinimumHeight(50);
 
     connect( this,
-	     TQT_SIGNAL( selectionChanged(TQListViewItem*) ),
-	     TQT_SLOT( selectedSlot(TQListViewItem*) ) );
+	     TQ_SIGNAL( selectionChanged(TQListViewItem*) ),
+	     TQ_SLOT( selectedSlot(TQListViewItem*) ) );
 
     connect( this,
-	     TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-	     TQT_SLOT(context(TQListViewItem*, const TQPoint &, int)));
+	     TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+	     TQ_SLOT(context(TQListViewItem*, const TQPoint &, int)));
 
     connect(this,
-	    TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-	    TQT_SLOT(activatedSlot(TQListViewItem*)));
+	    TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+	    TQ_SLOT(activatedSlot(TQListViewItem*)));
 
     connect(this,
-	    TQT_SIGNAL(returnPressed(TQListViewItem*)),
-	    TQT_SLOT(activatedSlot(TQListViewItem*)));
+	    TQ_SIGNAL(returnPressed(TQListViewItem*)),
+	    TQ_SLOT(activatedSlot(TQListViewItem*)));
 
     TQWhatsThis::add( this, whatsThis() );
 }
diff --git a/tdecachegrind/tdecachegrind/functionselection.cpp b/tdecachegrind/tdecachegrind/functionselection.cpp
index 84bdeabd..7a866ea7 100644
--- a/tdecachegrind/tdecachegrind/functionselection.cpp
+++ b/tdecachegrind/tdecachegrind/functionselection.cpp
@@ -57,17 +57,17 @@ FunctionSelection::FunctionSelection( TopLevel* top,
   
   groupBox->insertStringList(args);
   // this needs same order of grouptype actionlist!
-  connect(groupBox, TQT_SIGNAL(activated(int)),
-	  top, TQT_SLOT(groupTypeSelected(int)));
+  connect(groupBox, TQ_SIGNAL(activated(int)),
+	  top, TQ_SLOT(groupTypeSelected(int)));
 
   // search while typing...
-  connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)),
-	  this, TQT_SLOT(searchChanged(const TQString&)));
-  connect(&_searchTimer, TQT_SIGNAL(timeout()),
-	  this, TQT_SLOT(queryDelayed()));
+  connect(searchEdit, TQ_SIGNAL(textChanged(const TQString&)),
+	  this, TQ_SLOT(searchChanged(const TQString&)));
+  connect(&_searchTimer, TQ_SIGNAL(timeout()),
+	  this, TQ_SLOT(queryDelayed()));
   // select first matching group/function on return
-  connect(searchEdit, TQT_SIGNAL(returnPressed()),
-	  this, TQT_SLOT(searchReturnPressed()));
+  connect(searchEdit, TQ_SIGNAL(returnPressed()),
+	  this, TQ_SLOT(searchReturnPressed()));
   searchEdit->setMinimumWidth(50);
 
   // we start with desending cost sorting
@@ -91,33 +91,33 @@ FunctionSelection::FunctionSelection( TopLevel* top,
 
 #if 0
   // single click press activation
-  connect(functionList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          this, TQT_SLOT(functionActivated(TQListViewItem*)));
+  connect(functionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          this, TQ_SLOT(functionActivated(TQListViewItem*)));
   connect(functionList,
-	  TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-          this, TQT_SLOT(functionContext(TQListViewItem*, const TQPoint &, int)));
+	  TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+          this, TQ_SLOT(functionContext(TQListViewItem*, const TQPoint &, int)));
 #else
   // single click release activation
-  connect(functionList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          this, TQT_SLOT(functionSelected(TQListViewItem*)));
-  connect(functionList, TQT_SIGNAL(clicked(TQListViewItem*)),
-	  this, TQT_SLOT(functionActivated(TQListViewItem*)));
-  connect(functionList, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-	  this, TQT_SLOT(functionActivated(TQListViewItem*)));
+  connect(functionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          this, TQ_SLOT(functionSelected(TQListViewItem*)));
+  connect(functionList, TQ_SIGNAL(clicked(TQListViewItem*)),
+	  this, TQ_SLOT(functionActivated(TQListViewItem*)));
+  connect(functionList, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+	  this, TQ_SLOT(functionActivated(TQListViewItem*)));
   connect(functionList,
-	  TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-          this, TQT_SLOT(functionContext(TQListViewItem*, const TQPoint &, int)));
+	  TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+          this, TQ_SLOT(functionContext(TQListViewItem*, const TQPoint &, int)));
 #endif
 
-  connect(groupList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          this, TQT_SLOT(groupSelected(TQListViewItem*)));
-  connect(groupList, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-	  this, TQT_SLOT(groupDoubleClicked(TQListViewItem*)));
-  connect(groupList, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-	  this, TQT_SLOT(groupDoubleClicked(TQListViewItem*)));
+  connect(groupList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          this, TQ_SLOT(groupSelected(TQListViewItem*)));
+  connect(groupList, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+	  this, TQ_SLOT(groupDoubleClicked(TQListViewItem*)));
+  connect(groupList, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+	  this, TQ_SLOT(groupDoubleClicked(TQListViewItem*)));
   connect(groupList,
-	  TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-          this, TQT_SLOT(groupContext(TQListViewItem*, const TQPoint &, int)));
+	  TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+          this, TQ_SLOT(groupContext(TQListViewItem*, const TQPoint &, int)));
 
   // start hidden
   groupList->hide();
@@ -237,8 +237,8 @@ void FunctionSelection::addGroupMenu(TQPopupMenu* popup)
   case TraceItem::FunctionCycle: popup1->setItemChecked(4, true); break;
   default: break;
   }
-  connect(popup1,TQT_SIGNAL(activated(int)),
-	  _topLevel,TQT_SLOT(groupTypeSelected(int)));
+  connect(popup1,TQ_SIGNAL(activated(int)),
+	  _topLevel,TQ_SLOT(groupTypeSelected(int)));
 
   popup->insertItem(i18n("Grouping"), popup1);
 }    
diff --git a/tdecachegrind/tdecachegrind/instrview.cpp b/tdecachegrind/tdecachegrind/instrview.cpp
index bfeaccd0..5428fd6d 100644
--- a/tdecachegrind/tdecachegrind/instrview.cpp
+++ b/tdecachegrind/tdecachegrind/instrview.cpp
@@ -136,19 +136,19 @@ InstrView::InstrView(TraceItemView* parentView,
   setColumnAlignment(2, TQt::AlignRight);
 
   connect(this,
-          TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-          TQT_SLOT(context(TQListViewItem*, const TQPoint &, int)));
+          TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+          TQ_SLOT(context(TQListViewItem*, const TQPoint &, int)));
 
-  connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          TQT_SLOT(selectedSlot(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          TQ_SLOT(selectedSlot(TQListViewItem*)));
 
   connect(this,
-          TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-          TQT_SLOT(activatedSlot(TQListViewItem*)));
+          TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+          TQ_SLOT(activatedSlot(TQListViewItem*)));
 
   connect(this,
-          TQT_SIGNAL(returnPressed(TQListViewItem*)),
-          TQT_SLOT(activatedSlot(TQListViewItem*)));
+          TQ_SIGNAL(returnPressed(TQListViewItem*)),
+          TQ_SLOT(activatedSlot(TQListViewItem*)));
 
   TQWhatsThis::add( this, whatsThis());
 }
diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp
index 95b02ea4..8b9368aa 100644
--- a/tdecachegrind/tdecachegrind/main.cpp
+++ b/tdecachegrind/tdecachegrind/main.cpp
@@ -84,7 +84,7 @@ int main( int argc, char ** argv )
     }
   }
 
-  a.connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) );
+  a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) );
   int res = a.exec();
 
   // to make leak checking in valgrind happy...
diff --git a/tdecachegrind/tdecachegrind/multiview.cpp b/tdecachegrind/tdecachegrind/multiview.cpp
index 349db8d6..3ed96fe2 100644
--- a/tdecachegrind/tdecachegrind/multiview.cpp
+++ b/tdecachegrind/tdecachegrind/multiview.cpp
@@ -66,8 +66,8 @@ void MultiView::appendView()
 
     TabView* tv = new TabView(this, this,
 			      TQString("TabView-%1").arg(n).ascii());
-    connect(tv, TQT_SIGNAL(activated(TabView*)),
-	    this, TQT_SLOT(tabActivated(TabView*)) );
+    connect(tv, TQ_SIGNAL(activated(TabView*)),
+	    this, TQ_SLOT(tabActivated(TabView*)) );
     _views.append(tv);
     tv->show();
 
diff --git a/tdecachegrind/tdecachegrind/partselection.cpp b/tdecachegrind/tdecachegrind/partselection.cpp
index 9c8140f3..f89d356d 100644
--- a/tdecachegrind/tdecachegrind/partselection.cpp
+++ b/tdecachegrind/tdecachegrind/partselection.cpp
@@ -58,16 +58,16 @@ PartSelection::PartSelection( TQWidget* parent, const char* name)
   partAreaWidget->setFieldType(0, i18n( "Name" ));
   partAreaWidget->setFieldType(1, i18n( "Cost" ));
 
-  connect(partAreaWidget, TQT_SIGNAL(selectionChanged()),
-          this, TQT_SLOT(selectionChanged()));
-  connect(partAreaWidget, TQT_SIGNAL(currentChanged(TreeMapItem*, bool)),
-          this, TQT_SLOT(currentChangedSlot(TreeMapItem*, bool)));
-  connect(partAreaWidget, TQT_SIGNAL(doubleClicked(TreeMapItem*)),
-          this, TQT_SLOT(doubleClicked(TreeMapItem*)));
+  connect(partAreaWidget, TQ_SIGNAL(selectionChanged()),
+          this, TQ_SLOT(selectionChanged()));
+  connect(partAreaWidget, TQ_SIGNAL(currentChanged(TreeMapItem*, bool)),
+          this, TQ_SLOT(currentChangedSlot(TreeMapItem*, bool)));
+  connect(partAreaWidget, TQ_SIGNAL(doubleClicked(TreeMapItem*)),
+          this, TQ_SLOT(doubleClicked(TreeMapItem*)));
   connect(partAreaWidget,
-          TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint &)),
+          TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint &)),
           this,
-          TQT_SLOT(contextMenuRequested(TreeMapItem*,const TQPoint &)));
+          TQ_SLOT(contextMenuRequested(TreeMapItem*,const TQPoint &)));
 
   _showInfo = true;
   showInfo(false);
diff --git a/tdecachegrind/tdecachegrind/partview.cpp b/tdecachegrind/tdecachegrind/partview.cpp
index e2dc707e..fe13d806 100644
--- a/tdecachegrind/tdecachegrind/partview.cpp
+++ b/tdecachegrind/tdecachegrind/partview.cpp
@@ -58,12 +58,12 @@ PartView::PartView(TraceItemView* parentView,
     setSelectionMode(Extended);
 
     connect( this,
-	     TQT_SIGNAL( selectionChanged() ),
-	     TQT_SLOT( selectionChangedSlot() ) );
+	     TQ_SIGNAL( selectionChanged() ),
+	     TQ_SLOT( selectionChangedSlot() ) );
 
     connect( this,
-	     TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-	     TQT_SLOT(context(TQListViewItem*, const TQPoint &, int)));
+	     TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+	     TQ_SLOT(context(TQListViewItem*, const TQPoint &, int)));
 
     TQWhatsThis::add( this, whatsThis() );
 }
diff --git a/tdecachegrind/tdecachegrind/sourceview.cpp b/tdecachegrind/tdecachegrind/sourceview.cpp
index 22e83453..222c4b43 100644
--- a/tdecachegrind/tdecachegrind/sourceview.cpp
+++ b/tdecachegrind/tdecachegrind/sourceview.cpp
@@ -60,20 +60,20 @@ SourceView::SourceView(TraceItemView* parentView,
   setResizeMode(TQListView::LastColumn);
 
   connect(this,
-          TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
-          TQT_SLOT(context(TQListViewItem*, const TQPoint &, int)));
+          TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)),
+          TQ_SLOT(context(TQListViewItem*, const TQPoint &, int)));
 
   connect(this,
-          TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          TQT_SLOT(selectedSlot(TQListViewItem*)));
+          TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          TQ_SLOT(selectedSlot(TQListViewItem*)));
 
   connect(this,
-          TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-          TQT_SLOT(activatedSlot(TQListViewItem*)));
+          TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+          TQ_SLOT(activatedSlot(TQListViewItem*)));
 
   connect(this,
-          TQT_SIGNAL(returnPressed(TQListViewItem*)),
-          TQT_SLOT(activatedSlot(TQListViewItem*)));
+          TQ_SIGNAL(returnPressed(TQListViewItem*)),
+          TQ_SLOT(activatedSlot(TQListViewItem*)));
 
   TQWhatsThis::add( this, whatsThis());
 }
diff --git a/tdecachegrind/tdecachegrind/stackselection.cpp b/tdecachegrind/tdecachegrind/stackselection.cpp
index 59094754..e7e595ce 100644
--- a/tdecachegrind/tdecachegrind/stackselection.cpp
+++ b/tdecachegrind/tdecachegrind/stackselection.cpp
@@ -57,8 +57,8 @@ StackSelection::StackSelection( TQWidget* parent, const char* name)
   stackList->setColumnWidth(1, 0);
   stackList->setColumnWidth(2, 50);
 
-  connect(stackList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-          this, TQT_SLOT(stackSelected(TQListViewItem*)));
+  connect(stackList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+          this, TQ_SLOT(stackSelected(TQListViewItem*)));
 }
 
 StackSelection::~StackSelection()
diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp
index b8cd09f5..d31f9517 100644
--- a/tdecachegrind/tdecachegrind/tabview.cpp
+++ b/tdecachegrind/tdecachegrind/tabview.cpp
@@ -247,33 +247,33 @@ TabView::TabView(TraceItemView* parentView,
   vbox->addWidget( _mainSplitter );
 
   _rightTW = new TabWidget(this, _mainSplitter, "Right");
-  connect(_rightTW, TQT_SIGNAL(currentChanged(TQWidget*)),
-          this, TQT_SLOT(tabChanged(TQWidget*)));
-  connect(_rightTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)),
-          this, TQT_SLOT(visibleRectChangedSlot(TabWidget*)));
+  connect(_rightTW, TQ_SIGNAL(currentChanged(TQWidget*)),
+          this, TQ_SLOT(tabChanged(TQWidget*)));
+  connect(_rightTW, TQ_SIGNAL(visibleRectChanged(TabWidget*)),
+          this, TQ_SLOT(visibleRectChangedSlot(TabWidget*)));
 
   _topTW = new TabWidget(this, _leftSplitter, "Top");
-  connect(_topTW, TQT_SIGNAL(currentChanged(TQWidget*)),
-          this, TQT_SLOT(tabChanged(TQWidget*)));
-  connect(_topTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)),
-          this, TQT_SLOT(visibleRectChangedSlot(TabWidget*)));
+  connect(_topTW, TQ_SIGNAL(currentChanged(TQWidget*)),
+          this, TQ_SLOT(tabChanged(TQWidget*)));
+  connect(_topTW, TQ_SIGNAL(visibleRectChanged(TabWidget*)),
+          this, TQ_SLOT(visibleRectChangedSlot(TabWidget*)));
 
   _bottomSplitter = new Splitter(TQt::Horizontal,
                                   _leftSplitter, "Bottom");
 
   _leftTW = new TabWidget(this, _bottomSplitter, "Left");
   _leftTW->setTabPosition(TQTabWidget::Bottom);
-  connect(_leftTW, TQT_SIGNAL(currentChanged(TQWidget*)),
-          this, TQT_SLOT(tabChanged(TQWidget*)));
-  connect(_leftTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)),
-          this, TQT_SLOT(visibleRectChangedSlot(TabWidget*)));
+  connect(_leftTW, TQ_SIGNAL(currentChanged(TQWidget*)),
+          this, TQ_SLOT(tabChanged(TQWidget*)));
+  connect(_leftTW, TQ_SIGNAL(visibleRectChanged(TabWidget*)),
+          this, TQ_SLOT(visibleRectChangedSlot(TabWidget*)));
 
   _bottomTW = new TabWidget(this, _bottomSplitter, "Bottom");
   _bottomTW->setTabPosition(TQTabWidget::Bottom);
-  connect(_bottomTW, TQT_SIGNAL(currentChanged(TQWidget*)),
-          this, TQT_SLOT(tabChanged(TQWidget*)));
-  connect(_bottomTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)),
-          this, TQT_SLOT(visibleRectChangedSlot(TabWidget*)));
+  connect(_bottomTW, TQ_SIGNAL(currentChanged(TQWidget*)),
+          this, TQ_SLOT(tabChanged(TQWidget*)));
+  connect(_bottomTW, TQ_SIGNAL(visibleRectChanged(TabWidget*)),
+          this, TQ_SLOT(visibleRectChangedSlot(TabWidget*)));
 
 
   // default positions...
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index 03680b83..fc362e0f 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -82,17 +82,17 @@ TopLevel::TopLevel(const char *name)
   _stackDockShown->setChecked(!_stackDock->isHidden());
   _functionDockShown->setChecked(!_functionDock->isHidden());
 
-  connect(_partDock, TQT_SIGNAL(visibilityChanged(bool)),
-          this, TQT_SLOT(partVisibilityChanged(bool)));
-  connect(_stackDock, TQT_SIGNAL(visibilityChanged(bool)),
-          this, TQT_SLOT(stackVisibilityChanged(bool)));
-  connect(_functionDock, TQT_SIGNAL(visibilityChanged(bool)),
-          this, TQT_SLOT(functionVisibilityChanged(bool)));
+  connect(_partDock, TQ_SIGNAL(visibilityChanged(bool)),
+          this, TQ_SLOT(partVisibilityChanged(bool)));
+  connect(_stackDock, TQ_SIGNAL(visibilityChanged(bool)),
+          this, TQ_SLOT(stackVisibilityChanged(bool)));
+  connect(_functionDock, TQ_SIGNAL(visibilityChanged(bool)),
+          this, TQ_SLOT(functionVisibilityChanged(bool)));
 
 #if ENABLE_DUMPDOCK
   _dumpDockShown->setChecked(!_dumpDock->isHidden());
-  connect(_dumpDock, TQT_SIGNAL(visibilityChanged(bool)),
-          this, TQT_SLOT(dumpVisibilityChanged(bool)));
+  connect(_dumpDock, TQ_SIGNAL(visibilityChanged(bool)),
+          this, TQ_SLOT(dumpVisibilityChanged(bool)));
 #endif
 
   _statusbar = statusBar();
@@ -134,7 +134,7 @@ TopLevel::TopLevel(const char *name)
 
   // if this is the first toplevel, show tip of day
   if (memberList->count() == 1)
-    TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) );
+    TQTimer::singleShot( 200, this, TQ_SLOT(slotShowTipOnStart()) );
 }
 
 void TopLevel::init()
@@ -173,23 +173,23 @@ void TopLevel::setupPartSelection(PartSelection* ps)
 {
   // setup connections from the part selection widget
 
-  connect(ps, TQT_SIGNAL(activePartsChanged(const TracePartList&)),
-          this, TQT_SLOT(activePartsChangedSlot(const TracePartList&)));
-  connect(ps, TQT_SIGNAL(groupChanged(TraceCostItem*)),
-          this, TQT_SLOT(setGroupDelayed(TraceCostItem*)));
-  connect(ps, TQT_SIGNAL(functionChanged(TraceItem*)),
-          this, TQT_SLOT(setTraceItemDelayed(TraceItem*)));
+  connect(ps, TQ_SIGNAL(activePartsChanged(const TracePartList&)),
+          this, TQ_SLOT(activePartsChangedSlot(const TracePartList&)));
+  connect(ps, TQ_SIGNAL(groupChanged(TraceCostItem*)),
+          this, TQ_SLOT(setGroupDelayed(TraceCostItem*)));
+  connect(ps, TQ_SIGNAL(functionChanged(TraceItem*)),
+          this, TQ_SLOT(setTraceItemDelayed(TraceItem*)));
 
-  connect(ps, TQT_SIGNAL(goBack()),
-          _stackSelection, TQT_SLOT(browserBack()));
+  connect(ps, TQ_SIGNAL(goBack()),
+          _stackSelection, TQ_SLOT(browserBack()));
 
-  connect(ps, TQT_SIGNAL(partsHideSelected()),
-          this, TQT_SLOT(partsHideSelectedSlotDelayed()));
-  connect(ps, TQT_SIGNAL(partsUnhideAll()),
-          this, TQT_SLOT(partsUnhideAllSlotDelayed()));
+  connect(ps, TQ_SIGNAL(partsHideSelected()),
+          this, TQ_SLOT(partsHideSelectedSlotDelayed()));
+  connect(ps, TQ_SIGNAL(partsUnhideAll()),
+          this, TQ_SLOT(partsUnhideAllSlotDelayed()));
 
-  connect(ps, TQT_SIGNAL(showMessage(const TQString&, int)),
-          _statusbar, TQT_SLOT(message(const TQString&, int)));
+  connect(ps, TQ_SIGNAL(showMessage(const TQString&, int)),
+          _statusbar, TQ_SLOT(message(const TQString&, int)));
 }
 
 /**
@@ -321,8 +321,8 @@ void TopLevel::createDocks()
                    "cost used for all calls from the function in the line "
                    "above.</p>"));
 
-  connect(_stackSelection, TQT_SIGNAL(functionSelected(TraceItem*)),
-          this, TQT_SLOT(setTraceItemDelayed(TraceItem*)));
+  connect(_stackSelection, TQ_SIGNAL(functionSelected(TraceItem*)),
+          this, TQ_SLOT(setTraceItemDelayed(TraceItem*)));
 
   _functionDock = new TQDockWindow(TQDockWindow::InDock, this);
   _functionDock->setCaption(i18n("Flat Profile"));
@@ -415,8 +415,8 @@ void TopLevel::createDocks()
   setAppropriate(_dumpDock, true);
   setAppropriate(_functionDock, true);
 
-  connect( _partDock, TQT_SIGNAL(contextMenuRequested(const TQPoint &)),
-           this, TQT_SLOT(showDockMenu(const TQPoint &)));
+  connect( _partDock, TQ_SIGNAL(contextMenuRequested(const TQPoint &)),
+           this, TQ_SLOT(showDockMenu(const TQPoint &)));
 #endif
 }
 
@@ -449,14 +449,14 @@ void TopLevel::createLayoutActions()
 
   action = new TDEAction( i18n( "&Duplicate" ),
 			TDEShortcut(KKey("Ctrl+Plus")),
-                        this, TQT_SLOT(layoutDuplicate()),
+                        this, TQ_SLOT(layoutDuplicate()),
                         actionCollection(), "layout_duplicate" );
   hint = i18n("<b>Duplicate Current Layout</b>"
               "<p>Make a copy of the current layout.</p>");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Remove" ), TDEShortcut(),
-                        this, TQT_SLOT(layoutRemove()),
+                        this, TQ_SLOT(layoutRemove()),
                         actionCollection(), "layout_remove" );
   hint = i18n("<b>Remove Current Layout</b>"
               "<p>Delete current layout and make the previous active.</p>");
@@ -464,26 +464,26 @@ void TopLevel::createLayoutActions()
 
   action = new TDEAction( i18n( "&Go to Next" ),
 			TDEShortcut(KKey("Ctrl+Right")),
-                        this, TQT_SLOT(layoutNext()),
+                        this, TQ_SLOT(layoutNext()),
                         actionCollection(), "layout_next" );
   hint = i18n("Go to Next Layout");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Go to Previous" ),
 			TDEShortcut(KKey("Ctrl+Left")),
-                        this, TQT_SLOT(layoutPrevious()),
+                        this, TQ_SLOT(layoutPrevious()),
                         actionCollection(), "layout_previous" );
   hint = i18n("Go to Previous Layout");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Restore to Default" ), TDEShortcut(),
-                        this, TQT_SLOT(layoutRestore()),
+                        this, TQ_SLOT(layoutRestore()),
                         actionCollection(), "layout_restore" );
   hint = i18n("Restore Layouts to Default");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Save as Default" ), TDEShortcut(),
-                        this, TQT_SLOT(layoutSave()),
+                        this, TQ_SLOT(layoutSave()),
                         actionCollection(), "layout_save" );
   hint = i18n("Save Layouts as Default");
   action->setWhatsThis( hint );
@@ -495,12 +495,12 @@ void TopLevel::createMiscActions()
   TQString hint;
   TDEAction* action;
 
-  action = KStdAction::openNew(this, TQT_SLOT(newWindow()), actionCollection());
+  action = KStdAction::openNew(this, TQ_SLOT(newWindow()), actionCollection());
   hint = i18n("<b>New</b><p>Open new empty KCachegrind window.</p>");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Add..." ), TDEShortcut(),
-                        this, TQT_SLOT(addTrace()),
+                        this, TQ_SLOT(addTrace()),
                         actionCollection(), "file_add" );
   hint = i18n("<b>Add Profile Data</b>"
               "<p>This opens an additional profile data file in the current window.</p>");
@@ -513,13 +513,13 @@ void TopLevel::createMiscActions()
 #else
                         TDEStdAccel::key(TDEStdAccel::Reload),
 #endif
-                        this, TQT_SLOT( reload() ), actionCollection(), "reload" );
+                        this, TQ_SLOT( reload() ), actionCollection(), "reload" );
   hint = i18n("<b>Reload Profile Data</b>"
               "<p>This loads any new created parts, too.</p>");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Export Graph" ), TDEShortcut(),
-                        this, TQT_SLOT(exportGraph()),
+                        this, TQ_SLOT(exportGraph()),
                         actionCollection(), "export" );
 
   hint = i18n("<b>Export Call Graph</b>"
@@ -535,7 +535,7 @@ void TopLevel::createMiscActions()
 #else
                                TDEStdAccel::key(TDEStdAccel::Redo),
 #endif
-                               this, TQT_SLOT( forceTrace() ),
+                               this, TQ_SLOT( forceTrace() ),
                                actionCollection(), "dump" );
   hint = i18n("<b>Force Dump</b>"
               "<p>This forces a dump for a Callgrind profile run "
@@ -561,20 +561,20 @@ void TopLevel::createMiscActions()
               "of the program.</p>");
   _taDump->setWhatsThis( hint );
 
-  action = KStdAction::open(this, TQT_SLOT(loadTrace()), actionCollection());
+  action = KStdAction::open(this, TQ_SLOT(loadTrace()), actionCollection());
   hint = i18n("<b>Open Profile Data</b>"
               "<p>This opens a profile data file, with possible multiple parts</p>");
   action->setToolTip( hint );
   action->setWhatsThis( hint );
 
-  _openRecent = KStdAction::openRecent(this, TQT_SLOT(loadTrace(const KURL&)),
+  _openRecent = KStdAction::openRecent(this, TQ_SLOT(loadTrace(const KURL&)),
                                        actionCollection());
 
   KStdAction::showStatusbar(this,
-                            TQT_SLOT(toggleStatusBar()), actionCollection());
+                            TQ_SLOT(toggleStatusBar()), actionCollection());
 
   _partDockShown = new TDEToggleAction(i18n("Parts Overview"), TDEShortcut(),
-                                     this, TQT_SLOT(togglePartDock()),
+                                     this, TQ_SLOT(togglePartDock()),
                                      actionCollection(),
                                      "settings_show_partdock");
 
@@ -583,7 +583,7 @@ void TopLevel::createMiscActions()
   _partDockShown->setWhatsThis( hint );
 
   _stackDockShown = new TDEToggleAction(i18n("Call Stack"), TDEShortcut(),
-                                     this, TQT_SLOT(toggleStackDock()),
+                                     this, TQ_SLOT(toggleStackDock()),
                                      actionCollection(),
                                      "settings_show_stackdock");
 
@@ -592,7 +592,7 @@ void TopLevel::createMiscActions()
   _stackDockShown->setWhatsThis( hint );
 
   _functionDockShown = new TDEToggleAction(i18n("Function Profile"), TDEShortcut(),
-                                         this, TQT_SLOT(toggleFunctionDock()),
+                                         this, TQ_SLOT(toggleFunctionDock()),
                                          actionCollection(),
                                          "settings_show_profiledock");
 
@@ -602,7 +602,7 @@ void TopLevel::createMiscActions()
 
 #if ENABLE_DUMPDOCK
   _dumpDockShown = new TDEToggleAction(i18n("Profile Dumps"), TDEShortcut(),
-                                     this, TQT_SLOT(toggleDumpDock()),
+                                     this, TQ_SLOT(toggleDumpDock()),
                                      actionCollection(),
                                      "settings_show_dumpdock");
 
@@ -613,7 +613,7 @@ void TopLevel::createMiscActions()
 
   _taPercentage = new TDEToggleAction(i18n("Show Relative Costs"), "percent",
 				    TDEShortcut(),
-				    this, TQT_SLOT(togglePercentage()),
+				    this, TQ_SLOT(togglePercentage()),
 				    actionCollection(),
 				    "view_percentage");
 #if TDE_VERSION >= 0x030290
@@ -627,7 +627,7 @@ void TopLevel::createMiscActions()
 
   _taExpanded = new TDEToggleAction(i18n("Percentage Relative to Parent"), "move",
 				  TDEShortcut(),
-				  this, TQT_SLOT(toggleExpanded()),
+				  this, TQ_SLOT(toggleExpanded()),
 				  actionCollection(),
 				  "view_expanded");
 
@@ -652,7 +652,7 @@ void TopLevel::createMiscActions()
 
   _taCycles = new TDEToggleAction( i18n( "Do Cycle Detection" ), "edit-undo",
 				 TDEShortcut(),
-				 this, TQT_SLOT( toggleCycles() ), actionCollection(),
+				 this, TQ_SLOT( toggleCycles() ), actionCollection(),
 				 "view_cycles" );
 #if TDE_VERSION >= 0x030290
   // for KDE 3.3: show another text instead of a checkmark
@@ -673,25 +673,25 @@ void TopLevel::createMiscActions()
               "is the option to switch this off.");
   _taCycles->setWhatsThis( hint );
 
-  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
-  KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection());
-  KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), actionCollection());
-  KStdAction::configureToolbars(this,TQT_SLOT(configureToolbars()),
+  KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+  KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection());
+  KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), actionCollection());
+  KStdAction::configureToolbars(this,TQ_SLOT(configureToolbars()),
                                 actionCollection());
 #if 0
-  action = KStdAction::back(_stackSelection, TQT_SLOT(browserBack()),
+  action = KStdAction::back(_stackSelection, TQ_SLOT(browserBack()),
                             actionCollection());
   hint = i18n("Go back in function selection history");
   action->setToolTip( hint );
   action->setWhatsThis( hint );
 
-  action = KStdAction::forward(_stackSelection, TQT_SLOT(browserForward()),
+  action = KStdAction::forward(_stackSelection, TQ_SLOT(browserForward()),
                       actionCollection());
   hint = i18n("Go forward in function selection history");
   action->setToolTip( hint );
   action->setWhatsThis( hint );
 
-  action = KStdAction::up(_stackSelection, TQT_SLOT(browserUp()),
+  action = KStdAction::up(_stackSelection, TQ_SLOT(browserUp()),
                       actionCollection());
   hint = i18n("<b>Go Up</b>"
               "<p>Go to last selected caller of current function. "
@@ -701,12 +701,12 @@ void TopLevel::createMiscActions()
 #else
   _paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up",
                                    ALT+Key_Up,
-                                   _stackSelection, TQT_SLOT( browserUp() ),
+                                   _stackSelection, TQ_SLOT( browserUp() ),
                                    actionCollection(), "go_up" );
-  connect( _paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( upAboutToShow() ) );
-  connect( _paUp->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( upActivated( int ) ) );
+  connect( _paUp->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( upAboutToShow() ) );
+  connect( _paUp->popupMenu(), TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( upActivated( int ) ) );
   hint = i18n("<b>Go Up</b>"
               "<p>Go to last selected caller of current function. "
               "If no caller was visited, use that with highest cost.</p>");
@@ -715,24 +715,24 @@ void TopLevel::createMiscActions()
 
   TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
   _paBack = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left,
-                                     _stackSelection, TQT_SLOT(browserBack()),
+                                     _stackSelection, TQ_SLOT(browserBack()),
                                      actionCollection(), "go_back" );
-  connect( _paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( backAboutToShow() ) );
-  connect( _paBack->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( backActivated( int ) ) );
+  connect( _paBack->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( backAboutToShow() ) );
+  connect( _paBack->popupMenu(), TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( backActivated( int ) ) );
   hint = i18n("Go back in function selection history");
   _paBack->setToolTip( hint );
   _paBack->setWhatsThis( hint );
 
   _paForward = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right,
                                         _stackSelection,
-                                        TQT_SLOT(browserForward()),
+                                        TQ_SLOT(browserForward()),
                                         actionCollection(), "go_forward" );
-  connect( _paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           this, TQT_SLOT( forwardAboutToShow() ) );
-  connect( _paForward->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( forwardActivated( int ) ) );
+  connect( _paForward->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+           this, TQ_SLOT( forwardAboutToShow() ) );
+  connect( _paForward->popupMenu(), TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( forwardActivated( int ) ) );
   hint = i18n("Go forward in function selection history");
   _paForward->setToolTip( hint );
   _paForward->setWhatsThis( hint );
@@ -747,8 +747,8 @@ void TopLevel::createMiscActions()
 
   // cost types are dependent on loaded data, thus TDESelectAction
   // is filled in setData()
-  connect( _saCost, TQT_SIGNAL(activated(const TQString&)),
-           this, TQT_SLOT(costTypeSelected(const TQString&)));
+  connect( _saCost, TQ_SIGNAL(activated(const TQString&)),
+           this, TQ_SLOT(costTypeSelected(const TQString&)));
 
   _saCost2 = new TDESelectAction( i18n("Secondary Event Type"), TDEShortcut(),
 				actionCollection(), "view_cost_type2");
@@ -757,8 +757,8 @@ void TopLevel::createMiscActions()
   _saCost2->setToolTip( hint );
   _saCost2->setWhatsThis( hint );
 
-  connect( _saCost2, TQT_SIGNAL(activated(const TQString&)),
-           this, TQT_SLOT(costType2Selected(const TQString&)));
+  connect( _saCost2, TQ_SIGNAL(activated(const TQString&)),
+           this, TQ_SLOT(costType2Selected(const TQString&)));
 
   saGroup = new TDESelectAction( i18n("Grouping"), TDEShortcut(),
                                actionCollection(), "view_group_type");
@@ -776,11 +776,11 @@ void TopLevel::createMiscActions()
        << TraceCost::i18nTypeName(TraceItem::FunctionCycle);
 
   saGroup->setItems(args);
-  connect( saGroup, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(groupTypeSelected(int)));
+  connect( saGroup, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(groupTypeSelected(int)));
 
   _taSplit = new TDEToggleAction(i18n("Split"), "view_left_right", TDEShortcut(),
-                               this, TQT_SLOT(splitSlot()),
+                               this, TQ_SLOT(splitSlot()),
                                actionCollection(), "view_split");
 
   hint = i18n("Show two information panels");
@@ -789,7 +789,7 @@ void TopLevel::createMiscActions()
 
  _taSplitDir = new TDEToggleAction(i18n("Split Horizontal"),
                                   "view_left_right", TDEShortcut(),
-                                  this, TQT_SLOT(splitDirSlot()),
+                                  this, TQ_SLOT(splitDirSlot()),
                                   actionCollection(), "view_split_dir");
 
   hint = i18n("Change Split Orientation when main window is split.");
@@ -798,11 +798,11 @@ void TopLevel::createMiscActions()
 
   // copied from KMail...
 #if TDE_VERSION >= 308 // KDE 3.1
-  KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() );
+  KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() );
 #else
   (void) new TDEAction( KGuiItem( i18n("Tip of the &Day..."), "idea",
                                 i18n("Show \"Tip of the Day\"") ),
-                      0, this, TQT_SLOT(slotShowTip()),
+                      0, this, TQ_SLOT(slotShowTip()),
                       actionCollection(), "help_show_tip" );
 #endif
 }
@@ -1102,7 +1102,7 @@ void TopLevel::addTrace(TQString file)
 void TopLevel::loadDelayed(TQString file)
 {
   _loadTraceDelayed = file;
-  TQTimer::singleShot(0, this, TQT_SLOT(loadTraceDelayed()));
+  TQTimer::singleShot(0, this, TQ_SLOT(loadTraceDelayed()));
 }
 
 void TopLevel::loadTraceDelayed()
@@ -1381,13 +1381,13 @@ bool TopLevel::setFunction(TraceFunction* f)
 void TopLevel::setCostTypeDelayed(TraceCostType* ct)
 {
   _costTypeDelayed = ct;
-  TQTimer::singleShot (0, this, TQT_SLOT(setCostTypeDelayed()));
+  TQTimer::singleShot (0, this, TQ_SLOT(setCostTypeDelayed()));
 }
 
 void TopLevel::setCostType2Delayed(TraceCostType* ct)
 {
   _costType2Delayed = ct;
-  TQTimer::singleShot (0, this, TQT_SLOT(setCostType2Delayed()));
+  TQTimer::singleShot (0, this, TQ_SLOT(setCostType2Delayed()));
 }
 
 void TopLevel::setCostTypeDelayed()
@@ -1403,7 +1403,7 @@ void TopLevel::setCostType2Delayed()
 void TopLevel::setGroupTypeDelayed(TraceItem::CostType gt)
 {
   _groupTypeDelayed = gt;
-  TQTimer::singleShot (0, this, TQT_SLOT(setGroupTypeDelayed()));
+  TQTimer::singleShot (0, this, TQ_SLOT(setGroupTypeDelayed()));
 }
 
 void TopLevel::setGroupTypeDelayed()
@@ -1420,7 +1420,7 @@ void TopLevel::setGroupDelayed(TraceCostItem* g)
 #endif
 
   _groupDelayed = g;
-  TQTimer::singleShot (0, this, TQT_SLOT(setGroupDelayed()));
+  TQTimer::singleShot (0, this, TQ_SLOT(setGroupDelayed()));
 }
 
 void TopLevel::setGroupDelayed()
@@ -1431,7 +1431,7 @@ void TopLevel::setGroupDelayed()
 void TopLevel::setDirectionDelayed(TraceItemView::Direction d)
 {
   _directionDelayed = d;
-  TQTimer::singleShot (0, this, TQT_SLOT(setDirectionDelayed()));
+  TQTimer::singleShot (0, this, TQ_SLOT(setDirectionDelayed()));
 }
 
 void TopLevel::setDirectionDelayed()
@@ -1479,7 +1479,7 @@ void TopLevel::setTraceItemDelayed(TraceItem* i)
          _lastSender ? _lastSender->name() :"0" );
 #endif
 
-  TQTimer::singleShot (0, this, TQT_SLOT(setTraceItemDelayed()));
+  TQTimer::singleShot (0, this, TQ_SLOT(setTraceItemDelayed()));
 }
 
 void TopLevel::setTraceItemDelayed()
@@ -1644,18 +1644,18 @@ void TopLevel::addCostMenu(TQPopupMenu* popup, bool withCost2)
       }
     }
     popup->insertItem(i18n("Primary Event Type"), popup1);
-    connect(popup1,TQT_SIGNAL(activated(int)),this,TQT_SLOT(setCostType(int)));
+    connect(popup1,TQ_SIGNAL(activated(int)),this,TQ_SLOT(setCostType(int)));
     if (popup2) {
       popup->insertItem(i18n("Secondary Event Type"), popup2);
-      connect(popup2,TQT_SIGNAL(activated(int)),this,TQT_SLOT(setCostType2(int)));
+      connect(popup2,TQ_SIGNAL(activated(int)),this,TQ_SLOT(setCostType2(int)));
     }
   }
   if (_showPercentage)
     popup->insertItem(i18n("Show Absolute Cost"),
-		      this, TQT_SLOT(setAbsoluteCost()));
+		      this, TQ_SLOT(setAbsoluteCost()));
   else
     popup->insertItem(i18n("Show Relative Cost"),
-		      this, TQT_SLOT(setRelativeCost()));
+		      this, TQ_SLOT(setRelativeCost()));
 }
 
 bool TopLevel::setCostType(int id)
@@ -1684,9 +1684,9 @@ bool TopLevel::setCostType2(int id)
 
 void TopLevel::addGoMenu(TQPopupMenu* popup)
 {
-  popup->insertItem(i18n("Go Back"), this, TQT_SLOT(goBack()));
-  popup->insertItem(i18n("Go Forward"), this, TQT_SLOT(goForward()));
-  popup->insertItem(i18n("Go Up"), this, TQT_SLOT(goUp()));
+  popup->insertItem(i18n("Go Back"), this, TQ_SLOT(goBack()));
+  popup->insertItem(i18n("Go Forward"), this, TQ_SLOT(goForward()));
+  popup->insertItem(i18n("Go Up"), this, TQ_SLOT(goUp()));
 }
 
 void TopLevel::goBack()
@@ -2098,7 +2098,7 @@ void TopLevel::activePartsChangedSlot(const TracePartList& list)
 
 void TopLevel::partsHideSelectedSlotDelayed()
 {
-  TQTimer::singleShot( 0, this, TQT_SLOT(partsHideSelectedSlot()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(partsHideSelectedSlot()) );
 }
 
 // this puts selected parts into hidden list,
@@ -2131,7 +2131,7 @@ void TopLevel::partsHideSelectedSlot()
 
 void TopLevel::partsUnhideAllSlotDelayed()
 {
-  TQTimer::singleShot( 0, this, TQT_SLOT(partsUnhideAllSlot()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(partsUnhideAllSlot()) );
 }
 
 // this unhides all hidden parts. Does NOT change selection
@@ -2159,7 +2159,7 @@ void TopLevel::forceTrace()
     cmd.close();
   }
   if (_taDump->isChecked())
-    TQTimer::singleShot( 1000, this, TQT_SLOT(forceTraceReload()) );
+    TQTimer::singleShot( 1000, this, TQ_SLOT(forceTraceReload()) );
   else {
     // cancel request
     cmd.remove();
@@ -2174,7 +2174,7 @@ void TopLevel::forceTraceReload()
   TQFile cmd("callgrind.cmd");
   if (cmd.exists()) {
     if (_taDump->isChecked())
-      TQTimer::singleShot( 1000, this, TQT_SLOT(forceTraceReload()) );
+      TQTimer::singleShot( 1000, this, TQ_SLOT(forceTraceReload()) );
     return;
   }
   _taDump->setChecked(false);
diff --git a/tdecachegrind/tdecachegrind/tracedata.cpp b/tdecachegrind/tdecachegrind/tracedata.cpp
index da0726bb..020fa685 100644
--- a/tdecachegrind/tdecachegrind/tracedata.cpp
+++ b/tdecachegrind/tdecachegrind/tracedata.cpp
@@ -4547,8 +4547,8 @@ TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
   if (!l) return 0;
 
   if (_topLevel)
-      _topLevel->connect(l, TQT_SIGNAL(updateStatus(TQString, int)),
-			 TQT_SLOT(showStatus(TQString, int)));
+      _topLevel->connect(l, TQ_SIGNAL(updateStatus(TQString, int)),
+			 TQ_SLOT(showStatus(TQString, int)));
 
   TracePart* part = new TracePart(this, file);
 
diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp
index bcffbd21..ae8d2fc3 100644
--- a/tdecachegrind/tdecachegrind/treemap.cpp
+++ b/tdecachegrind/tdecachegrind/treemap.cpp
@@ -1794,7 +1794,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
 {
   //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
 
-  if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
+  if ( receivers( TQ_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
     e->accept();
 
   if ( e->reason() == TQContextMenuEvent::Keyboard ) {
@@ -2803,8 +2803,8 @@ void TreeMapWidget::addSplitDirectionItems(TQPopupMenu* popup, int id)
   _splitID = id;
   popup->setCheckable(true);
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(splitActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(splitActivated(int)));
 
   popup->insertItem(i18n("Recursive Bisection"), id);
   popup->insertItem(i18n("Columns"),         id+1);
@@ -2862,10 +2862,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
   TQPopupMenu* bpopup = new TQPopupMenu();
   bpopup->setCheckable(true);
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(visualizationActivated(int)));
-  connect(bpopup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(visualizationActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(visualizationActivated(int)));
+  connect(bpopup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(visualizationActivated(int)));
 
   TQPopupMenu* spopup = new TQPopupMenu();
   addSplitDirectionItems(spopup, id+100);
@@ -2925,8 +2925,8 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
     tpopup->setItemChecked(id+7,_attr[f].pos == DrawParams::BottomCenter);
     tpopup->setItemChecked(id+8,_attr[f].pos == DrawParams::BottomRight);
 
-    connect(tpopup, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(visualizationActivated(int)));
+    connect(tpopup, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(visualizationActivated(int)));
   }
 }
 
@@ -2950,8 +2950,8 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup,
   _selectionID = id;
   _menuItem = i;
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(selectionActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(selectionActivated(int)));
 
   while (i) {
     TQString name = i->text(0);
@@ -2981,8 +2981,8 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
 {
   _fieldStopID = id;
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(fieldStopActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(fieldStopActivated(int)));
 
   popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id);
   popup->setItemChecked(id, fieldStop(0).isEmpty());
@@ -3031,8 +3031,8 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
   _areaStopID = id;
   _menuItem = i;
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(areaStopActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(areaStopActivated(int)));
 
   bool foundArea = false;
 
@@ -3093,8 +3093,8 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
   _depthStopID = id;
   _menuItem = i;
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(depthStopActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(depthStopActivated(int)));
 
   bool foundDepth = false;