1 files changed, 20 insertions, 20 deletions

diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index bfc0be0c..120b1606 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -33,13 +33,13 @@ KMMainWin::KMMainWin(TQWidget *)
   // modal subdialogs will only affect this dialog, not the other windows
   setWFlags( getWFlags() | WGroupLeader );
 
-  kapp->ref();
+  tdeApp->ref();
 
   (void) new TDEAction( i18n("New &Window"), "window-new", 0,
-		      TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
+		      this, TQ_SLOT(slotNewMailReader()),
 		      actionCollection(), "new_mail_client" );
 
-  mKMMainWidget = new KMMainWidget( TQT_TQWIDGET(this), "KMMainWidget", this, actionCollection() );
+  mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
   mKMMainWidget->resize( 450, 600 );
   setCentralWidget(mKMMainWidget);
   setupStatusBar();
@@ -47,17 +47,17 @@ KMMainWin::KMMainWin(TQWidget *)
     setInstance( kmkernel->xmlGuiInstance() );
 
   if ( kmkernel->firstInstance() )
-    TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) );
+    TQTimer::singleShot( 200, this, TQ_SLOT(slotShowTipOnStart()) );
 
   setStandardToolBarMenuEnabled(true);
 
-  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()),
+  KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()),
 				actionCollection());
 
-  KStdAction::keyBindings(TQT_TQOBJECT(mKMMainWidget), TQT_SLOT(slotEditKeys()),
+  KStdAction::keyBindings(mKMMainWidget, TQ_SLOT(slotEditKeys()),
                           actionCollection());
 
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+  KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection());
   createGUI( "kmmainwin.rc", false );
   // Don't use conserveMemory() because this renders dynamic plugging
   // of actions unusable!
@@ -66,14 +66,14 @@ KMMainWin::KMMainWin(TQWidget *)
 
   applyMainWindowSettings(KMKernel::config(), "Main Window");
 
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
-           this, TQT_SLOT( displayStatusMsg(const TQString&) ) );
+  connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ),
+           this, TQ_SLOT( displayStatusMsg(const TQString&) ) );
 
-  connect(kmkernel, TQT_SIGNAL(configChanged()),
-    this, TQT_SLOT(slotConfigChanged()));
+  connect(kmkernel, TQ_SIGNAL(configChanged()),
+    this, TQ_SLOT(slotConfigChanged()));
 
-  connect(mKMMainWidget, TQT_SIGNAL(captionChangeRequest(const TQString&)),
-	  TQT_SLOT(setCaption(const TQString&)) );
+  connect(mKMMainWidget, TQ_SIGNAL(captionChangeRequest(const TQString&)),
+	  TQ_SLOT(setCaption(const TQString&)) );
 
   // Enable mail checks again (see destructor)
   kmkernel->enableMailCheck();
@@ -86,7 +86,7 @@ KMMainWin::~KMMainWin()
 {
   saveMainWindowSettings(KMKernel::config(), "Main Window");
   KMKernel::config()->sync();
-  kapp->deref();
+  tdeApp->deref();
 
   if ( !kmkernel->haveSystemTrayApplet() ) {
     // Check if this was the last KMMainWin
@@ -96,14 +96,14 @@ KMMainWin::~KMMainWin()
       if ( !it.current()->isHidden() &&
            it.current()->isTopLevel() &&
            it.current() != this &&
-           ::tqqt_cast<KMMainWin *>( it.current() )
+           ::tqt_cast<KMMainWin *>( it.current() )
         )
         not_withdrawn++;
     }
 
     if ( not_withdrawn == 0 ) {
       kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
-      // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
+      // Running TDEIO jobs prevent tdeApp from exiting, so we need to kill them
       // if they are only about checking mail (not important stuff like moving messages)
       kmkernel->abortMailCheck();
       kmkernel->acctMgr()->cancelMailCheck();
@@ -145,8 +145,8 @@ void KMMainWin::slotEditToolbars()
   saveMainWindowSettings(KMKernel::config(), "Main Window");
   KEditToolbar dlg(actionCollection(), "kmmainwin.rc");
 
-  connect( &dlg, TQT_SIGNAL(newToolbarConfig()),
-	   TQT_SLOT(slotUpdateToolbars()) );
+  connect( &dlg, TQ_SIGNAL(newToolbarConfig()),
+	   TQ_SLOT(slotUpdateToolbars()) );
 
   dlg.exec();
 }
@@ -206,10 +206,10 @@ void KMMainWin::slotConfigChanged()
 //-----------------------------------------------------------------------------
 bool KMMainWin::queryClose()
 {
-  if ( kapp->sessionSaving() )
+  if ( tdeApp->sessionSaving() )
     writeConfig();
 
-  if ( kmkernel->shuttingDown() || kapp->sessionSaving() || mReallyClose )
+  if ( kmkernel->shuttingDown() || tdeApp->sessionSaving() || mReallyClose )
     return true;
   return kmkernel->canQueryClose();
 }