Replace various '#define' strings - part 6

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

2 files changed, 15 insertions, 15 deletions

diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index e3560ed74..811d42f78 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -275,7 +275,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
             TQT_SLOT(  slotMouseOn( TQListBoxItem * ) ) );
   connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT(  slotMouseOff() ) );
 
-  mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+  mMapper = new TQSignalMapper( this );
   connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) );
 
   TQToolTip::remove( this );
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index f89d5e450..83f020fff 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -96,7 +96,7 @@ class SettingsDialogWrapper : public KSettings::Dialog
     void fixButtonLabel( TQWidget *widget )
     {
       TQObject *object = widget->child( "KJanusWidget::buttonBelowList" );
-      TQPushButton *button = static_cast<TQPushButton*>( TQT_TQWIDGET(object) );
+      TQPushButton *button = static_cast<TQPushButton*>( object );
       if ( button )
         button->setText( i18n( "Select Components ..." ) );
     }
@@ -133,7 +133,7 @@ void MainWindow::initGUI()
     (*it)->load();
 
     TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(),
-                                   TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()),
+                                   this, TQT_SLOT(slotActionTriggered()),
                                    actionCollection(), (*it)->pluginName().latin1() );
     action->setName( (*it)->pluginName().latin1() );
     action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) );
@@ -144,8 +144,8 @@ void MainWindow::initGUI()
     }
   }
 
-  KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureShortcuts() ), actionCollection() );
-  KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() );
+  KStdAction::keyBindings( this, TQT_SLOT( configureShortcuts() ), actionCollection() );
+  KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() );
   setXMLFile( "kontactui.rc" );
 
   setStandardToolBarMenuEnabled( true );
@@ -175,7 +175,7 @@ void MainWindow::initObject()
     mSidePane->updatePlugins();
   }
 
-  KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this),
+  KSettings::Dispatcher::self()->registerInstance( instance(), this,
                                                    TQT_SLOT( updateConfig() ) );
 
   loadSettings();
@@ -333,9 +333,9 @@ void MainWindow::initAboutScreen()
 
 void MainWindow::setupActions()
 {
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
+  KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() );
   mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ),
-                                         TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ),
+                                         TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT( slotNewClicked() ),
                                          actionCollection(), "action_new" );
 
   TDEConfig* const cfg = Prefs::self()->config();
@@ -344,18 +344,18 @@ void MainWindow::setupActions()
 
   if ( mSyncActionsEnabled ) {
     mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ), "kitchensync" ),
-                                            TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotSyncClicked() ),
+                                            TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQT_SLOT( slotSyncClicked() ),
                                             actionCollection(), "action_sync" );
   }
-  new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ),
+  new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQT_SLOT( slotPreferences() ),
                actionCollection(), "settings_configure_kontact" );
 
-  new TDEAction( i18n( "Configure &Profiles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureProfiles() ),
+  new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQT_SLOT( slotConfigureProfiles() ),
                actionCollection(), "settings_configure_kontact_profiles" );
 
-  new TDEAction( i18n( "&Kontact Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowIntroduction() ),
+  new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQT_SLOT( slotShowIntroduction() ),
                actionCollection(), "help_introduction" );
-  new TDEAction( i18n( "&Tip of the Day" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ),
+  new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQT_SLOT( slotShowTip() ),
                actionCollection(), "help_tipofday" );
 
   KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" );
@@ -543,7 +543,7 @@ void MainWindow::loadPlugins()
     kdDebug(5600) << "Loading Plugin: " << (*it)->name() << endl;
     Kontact::Plugin *plugin =
       KParts::ComponentFactory::createInstanceFromService<Kontact::Plugin>(
-          (*it)->service(), TQT_TQOBJECT(this) );
+          (*it)->service(), this );
 
     if ( !plugin )
       continue;
@@ -763,7 +763,7 @@ void MainWindow::slotSyncClicked()
 TDEToolBar* Kontact::MainWindow::findToolBar(const char* name)
 {
   // like TDEMainWindow::toolBar, but which doesn't create the toolbar if not found
-  return static_cast<TDEToolBar *>(TQT_TQWIDGET(child(name, "TDEToolBar")));
+  return static_cast<TDEToolBar *>(child(name, "TDEToolBar"));
 }
 
 void MainWindow::slotActionTriggered()