Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>

2 files changed, 68 insertions, 68 deletions

diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index bf87b28a..76d62260 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -1846,7 +1846,7 @@ void CallGraphView::refresh()
   _exporter.reset(_data, _activeItem, _costType, _groupType);
   _exporter.writeDot();
 
-  _renderProcess = new TQProcess(TQT_TQOBJECT(this));
+  _renderProcess = new TQProcess(this);
   if (_layout == GraphOptions::Circular)
     _renderProcess->addArgument( "twopi" );
   else
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index b9675a0e..03680b83 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -83,16 +83,16 @@ TopLevel::TopLevel(const char *name)
   _functionDockShown->setChecked(!_functionDock->isHidden());
 
   connect(_partDock, TQT_SIGNAL(visibilityChanged(bool)),
-          TQT_TQOBJECT(this), TQT_SLOT(partVisibilityChanged(bool)));
+          this, TQT_SLOT(partVisibilityChanged(bool)));
   connect(_stackDock, TQT_SIGNAL(visibilityChanged(bool)),
-          TQT_TQOBJECT(this), TQT_SLOT(stackVisibilityChanged(bool)));
+          this, TQT_SLOT(stackVisibilityChanged(bool)));
   connect(_functionDock, TQT_SIGNAL(visibilityChanged(bool)),
-          TQT_TQOBJECT(this), TQT_SLOT(functionVisibilityChanged(bool)));
+          this, TQT_SLOT(functionVisibilityChanged(bool)));
 
 #if ENABLE_DUMPDOCK
   _dumpDockShown->setChecked(!_dumpDock->isHidden());
   connect(_dumpDock, TQT_SIGNAL(visibilityChanged(bool)),
-          TQT_TQOBJECT(this), TQT_SLOT(dumpVisibilityChanged(bool)));
+          this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotShowTipOnStart()) );
+    TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) );
 }
 
 void TopLevel::init()
@@ -174,19 +174,19 @@ void TopLevel::setupPartSelection(PartSelection* ps)
   // setup connections from the part selection widget
 
   connect(ps, TQT_SIGNAL(activePartsChanged(const TracePartList&)),
-          TQT_TQOBJECT(this), TQT_SLOT(activePartsChangedSlot(const TracePartList&)));
+          this, TQT_SLOT(activePartsChangedSlot(const TracePartList&)));
   connect(ps, TQT_SIGNAL(groupChanged(TraceCostItem*)),
-          TQT_TQOBJECT(this), TQT_SLOT(setGroupDelayed(TraceCostItem*)));
+          this, TQT_SLOT(setGroupDelayed(TraceCostItem*)));
   connect(ps, TQT_SIGNAL(functionChanged(TraceItem*)),
-          TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed(TraceItem*)));
+          this, TQT_SLOT(setTraceItemDelayed(TraceItem*)));
 
   connect(ps, TQT_SIGNAL(goBack()),
           _stackSelection, TQT_SLOT(browserBack()));
 
   connect(ps, TQT_SIGNAL(partsHideSelected()),
-          TQT_TQOBJECT(this), TQT_SLOT(partsHideSelectedSlotDelayed()));
+          this, TQT_SLOT(partsHideSelectedSlotDelayed()));
   connect(ps, TQT_SIGNAL(partsUnhideAll()),
-          TQT_TQOBJECT(this), TQT_SLOT(partsUnhideAllSlotDelayed()));
+          this, TQT_SLOT(partsUnhideAllSlotDelayed()));
 
   connect(ps, TQT_SIGNAL(showMessage(const TQString&, int)),
           _statusbar, TQT_SLOT(message(const TQString&, int)));
@@ -322,7 +322,7 @@ void TopLevel::createDocks()
                    "above.</p>"));
 
   connect(_stackSelection, TQT_SIGNAL(functionSelected(TraceItem*)),
-          TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed(TraceItem*)));
+          this, TQT_SLOT(setTraceItemDelayed(TraceItem*)));
 
   _functionDock = new TQDockWindow(TQDockWindow::InDock, this);
   _functionDock->setCaption(i18n("Flat Profile"));
@@ -416,7 +416,7 @@ void TopLevel::createDocks()
   setAppropriate(_functionDock, true);
 
   connect( _partDock, TQT_SIGNAL(contextMenuRequested(const TQPoint &)),
-           TQT_TQOBJECT(this), TQT_SLOT(showDockMenu(const TQPoint &)));
+           this, TQT_SLOT(showDockMenu(const TQPoint &)));
 #endif
 }
 
@@ -449,14 +449,14 @@ void TopLevel::createLayoutActions()
 
   action = new TDEAction( i18n( "&Duplicate" ),
 			TDEShortcut(KKey("Ctrl+Plus")),
-                        TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()),
+                        this, TQT_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(),
-                        TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()),
+                        this, TQT_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")),
-                        TQT_TQOBJECT(this), TQT_SLOT(layoutNext()),
+                        this, TQT_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")),
-                        TQT_TQOBJECT(this), TQT_SLOT(layoutPrevious()),
+                        this, TQT_SLOT(layoutPrevious()),
                         actionCollection(), "layout_previous" );
   hint = i18n("Go to Previous Layout");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Restore to Default" ), TDEShortcut(),
-                        TQT_TQOBJECT(this), TQT_SLOT(layoutRestore()),
+                        this, TQT_SLOT(layoutRestore()),
                         actionCollection(), "layout_restore" );
   hint = i18n("Restore Layouts to Default");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Save as Default" ), TDEShortcut(),
-                        TQT_TQOBJECT(this), TQT_SLOT(layoutSave()),
+                        this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection());
+  action = KStdAction::openNew(this, TQT_SLOT(newWindow()), actionCollection());
   hint = i18n("<b>New</b><p>Open new empty KCachegrind window.</p>");
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Add..." ), TDEShortcut(),
-                        TQT_TQOBJECT(this), TQT_SLOT(addTrace()),
+                        this, TQT_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
-                        TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(), "reload" );
+                        this, TQT_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(),
-                        TQT_TQOBJECT(this), TQT_SLOT(exportGraph()),
+                        this, TQT_SLOT(exportGraph()),
                         actionCollection(), "export" );
 
   hint = i18n("<b>Export Call Graph</b>"
@@ -535,7 +535,7 @@ void TopLevel::createMiscActions()
 #else
                                TDEStdAccel::key(TDEStdAccel::Redo),
 #endif
-                               TQT_TQOBJECT(this), TQT_SLOT( forceTrace() ),
+                               this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT(loadTrace()), actionCollection());
+  action = KStdAction::open(this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT(loadTrace(const KURL&)),
+  _openRecent = KStdAction::openRecent(this, TQT_SLOT(loadTrace(const KURL&)),
                                        actionCollection());
 
-  KStdAction::showStatusbar(TQT_TQOBJECT(this),
+  KStdAction::showStatusbar(this,
                             TQT_SLOT(toggleStatusBar()), actionCollection());
 
   _partDockShown = new TDEToggleAction(i18n("Parts Overview"), TDEShortcut(),
-                                     TQT_TQOBJECT(this), TQT_SLOT(togglePartDock()),
+                                     this, TQT_SLOT(togglePartDock()),
                                      actionCollection(),
                                      "settings_show_partdock");
 
@@ -583,7 +583,7 @@ void TopLevel::createMiscActions()
   _partDockShown->setWhatsThis( hint );
 
   _stackDockShown = new TDEToggleAction(i18n("Call Stack"), TDEShortcut(),
-                                     TQT_TQOBJECT(this), TQT_SLOT(toggleStackDock()),
+                                     this, TQT_SLOT(toggleStackDock()),
                                      actionCollection(),
                                      "settings_show_stackdock");
 
@@ -592,7 +592,7 @@ void TopLevel::createMiscActions()
   _stackDockShown->setWhatsThis( hint );
 
   _functionDockShown = new TDEToggleAction(i18n("Function Profile"), TDEShortcut(),
-                                         TQT_TQOBJECT(this), TQT_SLOT(toggleFunctionDock()),
+                                         this, TQT_SLOT(toggleFunctionDock()),
                                          actionCollection(),
                                          "settings_show_profiledock");
 
@@ -602,7 +602,7 @@ void TopLevel::createMiscActions()
 
 #if ENABLE_DUMPDOCK
   _dumpDockShown = new TDEToggleAction(i18n("Profile Dumps"), TDEShortcut(),
-                                     TQT_TQOBJECT(this), TQT_SLOT(toggleDumpDock()),
+                                     this, TQT_SLOT(toggleDumpDock()),
                                      actionCollection(),
                                      "settings_show_dumpdock");
 
@@ -613,7 +613,7 @@ void TopLevel::createMiscActions()
 
   _taPercentage = new TDEToggleAction(i18n("Show Relative Costs"), "percent",
 				    TDEShortcut(),
-				    TQT_TQOBJECT(this), TQT_SLOT(togglePercentage()),
+				    this, TQT_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(),
-				  TQT_TQOBJECT(this), TQT_SLOT(toggleExpanded()),
+				  this, TQT_SLOT(toggleExpanded()),
 				  actionCollection(),
 				  "view_expanded");
 
@@ -652,7 +652,7 @@ void TopLevel::createMiscActions()
 
   _taCycles = new TDEToggleAction( i18n( "Do Cycle Detection" ), "edit-undo",
 				 TDEShortcut(),
-				 TQT_TQOBJECT(this), TQT_SLOT( toggleCycles() ), actionCollection(),
+				 this, TQT_SLOT( toggleCycles() ), actionCollection(),
 				 "view_cycles" );
 #if TDE_VERSION >= 0x030290
   // for KDE 3.3: show another text instead of a checkmark
@@ -673,10 +673,10 @@ void TopLevel::createMiscActions()
               "is the option to switch this off.");
   _taCycles->setWhatsThis( hint );
 
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection());
-  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection());
-  KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(configureToolbars()),
+  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()),
                                 actionCollection());
 #if 0
   action = KStdAction::back(_stackSelection, TQT_SLOT(browserBack()),
@@ -701,12 +701,12 @@ void TopLevel::createMiscActions()
 #else
   _paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up",
                                    ALT+Key_Up,
-                                   TQT_TQOBJECT(_stackSelection), TQT_SLOT( browserUp() ),
+                                   _stackSelection, TQT_SLOT( browserUp() ),
                                    actionCollection(), "go_up" );
   connect( _paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           TQT_TQOBJECT(this), TQT_SLOT( upAboutToShow() ) );
+           this, TQT_SLOT( upAboutToShow() ) );
   connect( _paUp->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           TQT_TQOBJECT(this), TQT_SLOT( upActivated( int ) ) );
+           this, TQT_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,18 +715,18 @@ void TopLevel::createMiscActions()
 
   TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
   _paBack = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left,
-                                     TQT_TQOBJECT(_stackSelection), TQT_SLOT(browserBack()),
+                                     _stackSelection, TQT_SLOT(browserBack()),
                                      actionCollection(), "go_back" );
   connect( _paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-           TQT_TQOBJECT(this), TQT_SLOT( backAboutToShow() ) );
+           this, TQT_SLOT( backAboutToShow() ) );
   connect( _paBack->popupMenu(), TQT_SIGNAL( activated( int ) ),
-           TQT_TQOBJECT(this), TQT_SLOT( backActivated( int ) ) );
+           this, TQT_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,
-                                        TQT_TQOBJECT(_stackSelection),
+                                        _stackSelection,
                                         TQT_SLOT(browserForward()),
                                         actionCollection(), "go_forward" );
   connect( _paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ),
@@ -748,7 +748,7 @@ void TopLevel::createMiscActions()
   // cost types are dependent on loaded data, thus TDESelectAction
   // is filled in setData()
   connect( _saCost, TQT_SIGNAL(activated(const TQString&)),
-           TQT_TQOBJECT(this), TQT_SLOT(costTypeSelected(const TQString&)));
+           this, TQT_SLOT(costTypeSelected(const TQString&)));
 
   _saCost2 = new TDESelectAction( i18n("Secondary Event Type"), TDEShortcut(),
 				actionCollection(), "view_cost_type2");
@@ -758,7 +758,7 @@ void TopLevel::createMiscActions()
   _saCost2->setWhatsThis( hint );
 
   connect( _saCost2, TQT_SIGNAL(activated(const TQString&)),
-           TQT_TQOBJECT(this), TQT_SLOT(costType2Selected(const TQString&)));
+           this, TQT_SLOT(costType2Selected(const TQString&)));
 
   saGroup = new TDESelectAction( i18n("Grouping"), TDEShortcut(),
                                actionCollection(), "view_group_type");
@@ -777,10 +777,10 @@ void TopLevel::createMiscActions()
 
   saGroup->setItems(args);
   connect( saGroup, TQT_SIGNAL(activated(int)),
-           TQT_TQOBJECT(this), TQT_SLOT(groupTypeSelected(int)));
+           this, TQT_SLOT(groupTypeSelected(int)));
 
   _taSplit = new TDEToggleAction(i18n("Split"), "view_left_right", TDEShortcut(),
-                               TQT_TQOBJECT(this), TQT_SLOT(splitSlot()),
+                               this, TQT_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(),
-                                  TQT_TQOBJECT(this), TQT_SLOT(splitDirSlot()),
+                                  this, TQT_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( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() );
+  KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() );
 #else
   (void) new TDEAction( KGuiItem( i18n("Tip of the &Day..."), "idea",
                                 i18n("Show \"Tip of the Day\"") ),
-                      0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTip()),
+                      0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(loadTraceDelayed()));
+  TQTimer::singleShot(0, this, TQT_SLOT(loadTraceDelayed()));
 }
 
 void TopLevel::loadTraceDelayed()
@@ -1381,13 +1381,13 @@ bool TopLevel::setFunction(TraceFunction* f)
 void TopLevel::setCostTypeDelayed(TraceCostType* ct)
 {
   _costTypeDelayed = ct;
-  TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setCostTypeDelayed()));
+  TQTimer::singleShot (0, this, TQT_SLOT(setCostTypeDelayed()));
 }
 
 void TopLevel::setCostType2Delayed(TraceCostType* ct)
 {
   _costType2Delayed = ct;
-  TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setCostType2Delayed()));
+  TQTimer::singleShot (0, this, TQT_SLOT(setCostType2Delayed()));
 }
 
 void TopLevel::setCostTypeDelayed()
@@ -1403,7 +1403,7 @@ void TopLevel::setCostType2Delayed()
 void TopLevel::setGroupTypeDelayed(TraceItem::CostType gt)
 {
   _groupTypeDelayed = gt;
-  TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setGroupTypeDelayed()));
+  TQTimer::singleShot (0, this, TQT_SLOT(setGroupTypeDelayed()));
 }
 
 void TopLevel::setGroupTypeDelayed()
@@ -1420,7 +1420,7 @@ void TopLevel::setGroupDelayed(TraceCostItem* g)
 #endif
 
   _groupDelayed = g;
-  TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setGroupDelayed()));
+  TQTimer::singleShot (0, this, TQT_SLOT(setGroupDelayed()));
 }
 
 void TopLevel::setGroupDelayed()
@@ -1431,7 +1431,7 @@ void TopLevel::setGroupDelayed()
 void TopLevel::setDirectionDelayed(TraceItemView::Direction d)
 {
   _directionDelayed = d;
-  TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setDirectionDelayed()));
+  TQTimer::singleShot (0, this, TQT_SLOT(setDirectionDelayed()));
 }
 
 void TopLevel::setDirectionDelayed()
@@ -1479,7 +1479,7 @@ void TopLevel::setTraceItemDelayed(TraceItem* i)
          _lastSender ? _lastSender->name() :"0" );
 #endif
 
-  TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed()));
+  TQTimer::singleShot (0, this, TQT_SLOT(setTraceItemDelayed()));
 }
 
 void TopLevel::setTraceItemDelayed()
@@ -1652,10 +1652,10 @@ void TopLevel::addCostMenu(TQPopupMenu* popup, bool withCost2)
   }
   if (_showPercentage)
     popup->insertItem(i18n("Show Absolute Cost"),
-		      TQT_TQOBJECT(this), TQT_SLOT(setAbsoluteCost()));
+		      this, TQT_SLOT(setAbsoluteCost()));
   else
     popup->insertItem(i18n("Show Relative Cost"),
-		      TQT_TQOBJECT(this), TQT_SLOT(setRelativeCost()));
+		      this, TQT_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"), TQT_TQOBJECT(this), TQT_SLOT(goBack()));
-  popup->insertItem(i18n("Go Forward"), TQT_TQOBJECT(this), TQT_SLOT(goForward()));
-  popup->insertItem(i18n("Go Up"), TQT_TQOBJECT(this), TQT_SLOT(goUp()));
+  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()));
 }
 
 void TopLevel::goBack()
@@ -2098,7 +2098,7 @@ void TopLevel::activePartsChangedSlot(const TracePartList& list)
 
 void TopLevel::partsHideSelectedSlotDelayed()
 {
-  TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(partsHideSelectedSlot()) );
+  TQTimer::singleShot( 0, this, TQT_SLOT(partsHideSelectedSlot()) );
 }
 
 // this puts selected parts into hidden list,
@@ -2131,7 +2131,7 @@ void TopLevel::partsHideSelectedSlot()
 
 void TopLevel::partsUnhideAllSlotDelayed()
 {
-  TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(partsUnhideAllSlot()) );
+  TQTimer::singleShot( 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(forceTraceReload()) );
+    TQTimer::singleShot( 1000, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(forceTraceReload()) );
+      TQTimer::singleShot( 1000, this, TQT_SLOT(forceTraceReload()) );
     return;
   }
   _taDump->setChecked(false);