1 files changed, 12 insertions, 12 deletions

diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index ab6134669..0e56f918a 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -87,8 +87,8 @@ using namespace Kontact;
 class SettingsDialogWrapper : public KSettings::Dialog
 {
   public:
-    SettingsDialogWrapper( ContentInListView content, TQWidget * parent = 0 )
-      : KSettings::Dialog( content, parent, 0 )
+    SettingsDialogWrapper( ContentInListView content, TQWidget * tqparent = 0 )
+      : KSettings::Dialog( content, tqparent, 0 )
     {
     }
 
@@ -185,9 +185,9 @@ void MainWindow::initObject()
   showTip( false );
 
   // done initializing
-  slotShowStatusMsg( TQString::null );
+  slotShowStatusMsg( TQString() );
 
-  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( slotShowStatusMsg( const TQString&  ) ) );
 
   // launch commandline specified module if any
@@ -787,7 +787,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     return;
   }
 
-  KApplication::setOverrideCursor( TQCursor( Qt::WaitCursor ) );
+  KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 
   KParts::Part *part = plugin->part();
 
@@ -805,12 +805,12 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   TQWidget *tqfocusWidget = kapp->tqfocusWidget();
   if ( mCurrentPlugin && tqfocusWidget ) {
     // save the focus widget only when it belongs to the activated part
-    TQWidget *parent = tqfocusWidget->tqparentWidget();
-    while ( parent ) {
-      if ( parent == mCurrentPlugin->part()->widget() )
+    TQWidget *tqparent = tqfocusWidget->tqparentWidget();
+    while ( tqparent ) {
+      if ( tqparent == mCurrentPlugin->part()->widget() )
         mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) );
 
-      parent = parent->tqparentWidget();
+      tqparent = tqparent->tqparentWidget();
     }
   }
 
@@ -1027,7 +1027,7 @@ void MainWindow::updateConfig()
 
 void MainWindow::showAboutDialog()
 {
-  KApplication::setOverrideCursor( TQCursor( Qt::WaitCursor ) );
+  KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 
   if ( !mAboutDialog )
     mAboutDialog = new AboutDialog( this );
@@ -1084,7 +1084,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
       if ( !url.query().isEmpty() ) {
         app = url.query().mid( 1 );
       }
-      kapp->invokeHelp( TQString::null, app );
+      kapp->invokeHelp( TQString(), app );
     }
   } else {
     new KRun( url, this );
@@ -1101,7 +1101,7 @@ void MainWindow::readProperties( KConfig *config )
   for ( ; it != end; ++it ) {
     Plugin *plugin = *it;
     if ( !plugin->isRunningStandalone() ) {
-      TQStringList::ConstIterator activePlugin = activePlugins.find( plugin->identifier() );
+      TQStringList::ConstIterator activePlugin = activePlugins.tqfind( plugin->identifier() );
       if ( activePlugin != activePlugins.end() ) {
         plugin->readProperties( config );
       }