1 files changed, 115 insertions, 115 deletions

diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index e73b69a7..00fcf6d4 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -281,7 +281,7 @@ void KMFolderTreeItem::slotNoContentChanged()
 {
   // reload the folder tree if the no content state changed, needed because
   // we hide no-content folders if their child nodes are hidden
-  TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQT_SLOT(reload()) );
+  TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQ_SLOT(reload()) );
 }
 
 //-----------------------------------------------------------------------------
@@ -406,12 +406,12 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent,
   mPopup = new TDEPopupMenu(this);
   mPopup->insertTitle(i18n("View Columns"));
   mPopup->setCheckable(true);
-  mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQT_SLOT(slotToggleUnreadColumn()));
-  mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQT_SLOT(slotToggleTotalColumn()));
-  mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQT_SLOT(slotToggleSizeColumn()));
+  mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQ_SLOT(slotToggleUnreadColumn()));
+  mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQ_SLOT(slotToggleTotalColumn()));
+  mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQ_SLOT(slotToggleSizeColumn()));
 
-  connect( this, TQT_SIGNAL( triggerRefresh() ),
-           this, TQT_SLOT( refresh() ) );
+  connect( this, TQ_SIGNAL( triggerRefresh() ),
+           this, TQ_SLOT( refresh() ) );
 
   new FolderViewToolTip( this );
 }
@@ -420,61 +420,61 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent,
 // connects all needed signals to their slots
 void KMFolderTree::connectSignals()
 {
-  connect( mUpdateCountTimer, TQT_SIGNAL(timeout()),
-          this, TQT_SLOT(slotUpdateCountTimeout()) );
+  connect( mUpdateCountTimer, TQ_SIGNAL(timeout()),
+          this, TQ_SLOT(slotUpdateCountTimeout()) );
 
-  connect(&mUpdateTimer, TQT_SIGNAL(timeout()),
-          this, TQT_SLOT(delayedUpdate()));
+  connect(&mUpdateTimer, TQ_SIGNAL(timeout()),
+          this, TQ_SLOT(delayedUpdate()));
 
-  connect(kmkernel->folderMgr(), TQT_SIGNAL(changed()),
-          this, TQT_SLOT(doFolderListChanged()));
+  connect(kmkernel->folderMgr(), TQ_SIGNAL(changed()),
+          this, TQ_SLOT(doFolderListChanged()));
 
-  connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
-          this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+  connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+          this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
 
-  connect(kmkernel->folderMgr(), TQT_SIGNAL(folderMoveOrCopyOperationFinished()),
-	  this, TQT_SLOT(slotFolderMoveOrCopyOperationFinished()));
+  connect(kmkernel->folderMgr(), TQ_SIGNAL(folderMoveOrCopyOperationFinished()),
+	  this, TQ_SLOT(slotFolderMoveOrCopyOperationFinished()));
 
-  connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
-          this, TQT_SLOT(doFolderListChanged()));
+  connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()),
+          this, TQ_SLOT(doFolderListChanged()));
 
-  connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
-          this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+  connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+          this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
 
-  connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()),
-          this, TQT_SLOT(doFolderListChanged()));
+  connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()),
+          this, TQ_SLOT(doFolderListChanged()));
 
-  connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
-          this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+  connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+          this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
 
-  connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()),
-          this, TQT_SLOT(doFolderListChanged()));
+  connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()),
+          this, TQ_SLOT(doFolderListChanged()));
 
-  connect(kmkernel->acctMgr(), TQT_SIGNAL(accountRemoved(KMAccount*)),
-          this, TQT_SLOT(slotAccountRemoved(KMAccount*)));
+  connect(kmkernel->acctMgr(), TQ_SIGNAL(accountRemoved(KMAccount*)),
+          this, TQ_SLOT(slotAccountRemoved(KMAccount*)));
 
-  connect(kmkernel->acctMgr(), TQT_SIGNAL(accountAdded(KMAccount*)),
-          this, TQT_SLOT(slotUnhideLocalInbox()));
+  connect(kmkernel->acctMgr(), TQ_SIGNAL(accountAdded(KMAccount*)),
+          this, TQ_SLOT(slotUnhideLocalInbox()));
 
-  connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)),
-          this, TQT_SLOT(slotFolderRemoved(KMFolder*)));
+  connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)),
+          this, TQ_SLOT(slotFolderRemoved(KMFolder*)));
 
-  connect( &autoopen_timer, TQT_SIGNAL( timeout() ),
-           this, TQT_SLOT( openFolder() ) );
+  connect( &autoopen_timer, TQ_SIGNAL( timeout() ),
+           this, TQ_SLOT( openFolder() ) );
 
-  connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ),
-           this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) );
+  connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ),
+           this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) );
 
-  connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ),
-           this, TQT_SLOT( slotFolderExpanded( TQListViewItem* ) ) );
+  connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ),
+           this, TQ_SLOT( slotFolderExpanded( TQListViewItem* ) ) );
 
-  connect( this, TQT_SIGNAL( collapsed( TQListViewItem* ) ),
-           this, TQT_SLOT( slotFolderCollapsed( TQListViewItem* ) ) );
+  connect( this, TQ_SIGNAL( collapsed( TQListViewItem* ) ),
+           this, TQ_SLOT( slotFolderCollapsed( TQListViewItem* ) ) );
 
-  connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)),
-           this, TQT_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &)));
+  connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)),
+           this, TQ_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &)));
 
-  connect( this, TQT_SIGNAL(folderSelected(KMFolder*)), TQT_SLOT(updateCopyActions()) );
+  connect( this, TQ_SIGNAL(folderSelected(KMFolder*)), TQ_SLOT(updateCopyActions()) );
 }
 
 //-----------------------------------------------------------------------------
@@ -598,7 +598,7 @@ void KMFolderTree::reload(bool openFolders)
   {
     // we open all folders to update the count
     mUpdateIterator = TQListViewItemIterator (this);
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) );
   }
 
   for ( TQListViewItemIterator it( this ) ; it.current() ; ++it ) {
@@ -606,53 +606,53 @@ void KMFolderTree::reload(bool openFolders)
     if ( !fti || !fti->folder() )
       continue;
 
-    disconnect(fti->folder(),TQT_SIGNAL(iconsChanged()),
-               fti,TQT_SLOT(slotIconsChanged()));
-    connect(fti->folder(),TQT_SIGNAL(iconsChanged()),
-            fti,TQT_SLOT(slotIconsChanged()));
+    disconnect(fti->folder(),TQ_SIGNAL(iconsChanged()),
+               fti,TQ_SLOT(slotIconsChanged()));
+    connect(fti->folder(),TQ_SIGNAL(iconsChanged()),
+            fti,TQ_SLOT(slotIconsChanged()));
 
-    disconnect(fti->folder(),TQT_SIGNAL(nameChanged()),
-               fti,TQT_SLOT(slotNameChanged()));
-    connect(fti->folder(),TQT_SIGNAL(nameChanged()),
-            fti,TQT_SLOT(slotNameChanged()));
+    disconnect(fti->folder(),TQ_SIGNAL(nameChanged()),
+               fti,TQ_SLOT(slotNameChanged()));
+    connect(fti->folder(),TQ_SIGNAL(nameChanged()),
+            fti,TQ_SLOT(slotNameChanged()));
 
-    disconnect( fti->folder(), TQT_SIGNAL(noContentChanged()),
-                fti, TQT_SLOT(slotNoContentChanged()) );
-    connect( fti->folder(), TQT_SIGNAL(noContentChanged()),
-             fti, TQT_SLOT(slotNoContentChanged()) );
+    disconnect( fti->folder(), TQ_SIGNAL(noContentChanged()),
+                fti, TQ_SLOT(slotNoContentChanged()) );
+    connect( fti->folder(), TQ_SIGNAL(noContentChanged()),
+             fti, TQ_SLOT(slotNoContentChanged()) );
 
-    disconnect( fti->folder(), TQT_SIGNAL(syncStateChanged()),
-                this, TQT_SLOT(slotSyncStateChanged()) );
-    connect( fti->folder(), TQT_SIGNAL(syncStateChanged()),
-             this, TQT_SLOT(slotSyncStateChanged()) );
+    disconnect( fti->folder(), TQ_SIGNAL(syncStateChanged()),
+                this, TQ_SLOT(slotSyncStateChanged()) );
+    connect( fti->folder(), TQ_SIGNAL(syncStateChanged()),
+             this, TQ_SLOT(slotSyncStateChanged()) );
 
     // we want to be noticed of changes to update the unread/total columns
-    disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
-        this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
-    connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
-        this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+    disconnect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
+        this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+    connect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
+        this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
     //}
 
-    disconnect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
-               this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
-    connect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
-            this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
-    disconnect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)),
-               this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
-    connect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)),
-            this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+    disconnect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+               this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+    connect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
+            this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+    disconnect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)),
+               this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+    connect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)),
+            this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
 
-  disconnect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )),
-               this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
-  connect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )),
-               this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+  disconnect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )),
+               this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
+  connect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )),
+               this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*)));
 
 
 
-    disconnect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)),
-               mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*)));
-    connect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)),
-            mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*)));
+    disconnect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)),
+               mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*)));
+    connect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)),
+            mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*)));
 
 
     if (!openFolders)
@@ -696,7 +696,7 @@ void KMFolderTree::slotUpdateOneCount()
   ++mUpdateIterator;
   if ( !fti->folder() ) {
     // next one please
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) );
     return;
   }
 
@@ -707,7 +707,7 @@ void KMFolderTree::slotUpdateOneCount()
   // restore previous state
   if (!open) fti->folder()->close("updatecount");
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) );
 }
 
 //-----------------------------------------------------------------------------
@@ -737,7 +737,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
     } else {
       // hide local inbox if unused
       if ( kmkernel->inboxFolder() == folder && hideLocalInbox() ) {
-        connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) );
+        connect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(slotUnhideLocalInbox()) );
         continue;
       }
 
@@ -765,14 +765,14 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
         removeFromFolderToItemMap( folder );
         delete fti;
         // still, it might change in the future, so we better check the change signals
-        connect ( folder, TQT_SIGNAL(noContentChanged()), TQT_SLOT(delayedReload()) );
+        connect ( folder, TQ_SIGNAL(noContentChanged()), TQ_SLOT(delayedReload()) );
         continue;
       }
 
-      connect (fti, TQT_SIGNAL(iconChanged(KMFolderTreeItem*)),
-          this, TQT_SIGNAL(iconChanged(KMFolderTreeItem*)));
-      connect (fti, TQT_SIGNAL(nameChanged(KMFolderTreeItem*)),
-          this, TQT_SIGNAL(nameChanged(KMFolderTreeItem*)));
+      connect (fti, TQ_SIGNAL(iconChanged(KMFolderTreeItem*)),
+          this, TQ_SIGNAL(iconChanged(KMFolderTreeItem*)));
+      connect (fti, TQ_SIGNAL(nameChanged(KMFolderTreeItem*)),
+          this, TQ_SIGNAL(nameChanged(KMFolderTreeItem*)));
     }
     // restore last open-state
     fti->setOpen( readIsListViewItemOpen(fti) );
@@ -1094,7 +1094,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
     if ( ( fti->folder() || (fti->text(0) != i18n("Searches")) ) && !multiFolder)
         folderMenu->insertItem(SmallIconSet("folder-new"),
                                createChild, this,
-                               TQT_SLOT(addChildFolder()));
+                               TQ_SLOT(addChildFolder()));
 
     if (!fti->folder()) {
       mMainWidget->action("compact_all_folders")->plug(folderMenu);
@@ -1102,7 +1102,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
     } else if (fti->folder()->folderType() == KMFolderTypeImap) {
       folderMenu->insertItem(SmallIconSet("mail_get"), i18n("Check &Mail"),
         this,
-        TQT_SLOT(slotCheckMail()));
+        TQ_SLOT(slotCheckMail()));
     }
   } else { // regular folders
 
@@ -1110,18 +1110,18 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
     if ( !fti->folder()->noChildren() && !multiFolder ) {
       folderMenu->insertItem(SmallIconSet("folder-new"),
                              i18n("&New Subfolder..."), this,
-                             TQT_SLOT(addChildFolder()));
+                             TQ_SLOT(addChildFolder()));
     }
 
     // copy folder
     TQPopupMenu *copyMenu = new TQPopupMenu( folderMenu );
-    folderToPopupMenu( CopyFolder, TQT_TQOBJECT(this), &mMenuToFolder, copyMenu );
+    folderToPopupMenu( CopyFolder, this, &mMenuToFolder, copyMenu );
     folderMenu->insertItem( i18n("&Copy Folder To"), copyMenu );
 
     if ( fti->folder()->isMoveable() && fti->folder()->canDeleteMessages() )
     {
       TQPopupMenu *moveMenu = new TQPopupMenu( folderMenu );
-      folderToPopupMenu( MoveFolder, TQT_TQOBJECT(this), &mMenuToFolder, moveMenu );
+      folderToPopupMenu( MoveFolder, this, &mMenuToFolder, moveMenu );
       folderMenu->insertItem( i18n("&Move Folder To"), moveMenu );
     }
 
@@ -1139,7 +1139,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
 
       if ( GlobalSettings::self()->enableFavoriteFolderView() ) {
         folderMenu->insertItem( SmallIconSet("bookmark_add"), i18n("Add to Favorite Folders"),
-                                this, TQT_SLOT(slotAddToFavorites()) );
+                                this, TQ_SLOT(slotAddToFavorites()) );
       }
 
       folderMenu->insertSeparator();
@@ -1158,24 +1158,24 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
   {
     folderMenu->insertItem(SmallIconSet("bookmark_folder"),
         i18n("Serverside Subscription..."), mMainWidget,
-        TQT_SLOT(slotSubscriptionDialog()));
+        TQ_SLOT(slotSubscriptionDialog()));
     folderMenu->insertItem(SmallIcon("bookmark_folder"),
         i18n("Local Subscription..."), mMainWidget,
-        TQT_SLOT(slotLocalSubscriptionDialog()));
+        TQ_SLOT(slotLocalSubscriptionDialog()));
 
     if (!fti->folder()->noContent())
     {
       mMainWidget->action("refresh_folder")->plug(folderMenu);
       if ( fti->folder()->folderType() == KMFolderTypeImap && !multiFolder ) {
         folderMenu->insertItem(SmallIconSet("reload"), i18n("Refresh Folder List"), this,
-            TQT_SLOT(slotResetFolderList()));
+            TQ_SLOT(slotResetFolderList()));
       }
     }
     if ( fti->folder()->folderType() == KMFolderTypeCachedImap && !multiFolder ) {
       KMFolderCachedImap * folder = static_cast<KMFolderCachedImap*>( fti->folder()->storage() );
       folderMenu->insertItem( SmallIconSet("wizard"),
                               i18n("&Troubleshoot IMAP Cache..."),
-                              folder, TQT_SLOT(slotTroubleshoot()) );
+                              folder, TQ_SLOT(slotTroubleshoot()) );
     }
     folderMenu->insertSeparator();
   }
@@ -1189,11 +1189,11 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
     folderMenu->insertItem(SmallIconSet("configure_shortcuts"),
         i18n("&Assign Shortcut..."),
         fti,
-        TQT_SLOT(assignShortcut()));
+        TQ_SLOT(assignShortcut()));
 
     if ( !fti->folder()->noContent() && fti->folder()->canDeleteMessages() ) {
       folderMenu->insertItem( i18n("Expire..."), fti,
-                              TQT_SLOT( slotShowExpiryProperties() ) );
+                              TQ_SLOT( slotShowExpiryProperties() ) );
     }
     mMainWidget->action("modify")->plug(folderMenu);
   }
@@ -1230,7 +1230,7 @@ void KMFolderTree::contentsMouseReleaseEvent(TQMouseEvent* me)
   }
 
   // react on middle-button only
-  if (btn != Qt::MidButton) {
+  if (btn != TQt::MidButton) {
     KFolderTree::contentsMouseReleaseEvent(me);
     return;
   }
@@ -1753,10 +1753,10 @@ void KMFolderTree::slotToggleSizeColumn()
 bool KMFolderTree::eventFilter( TQObject *o, TQEvent *e )
 {
   if ( e->type() == TQEvent::MouseButtonPress &&
-      TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
-      o->isA(TQHEADER_OBJECT_NAME_STRING) )
+      static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton &&
+      o->isA("TQHeader") )
   {
-    mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
+    mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
     return true;
   }
   return KFolderTree::eventFilter(o, e);
@@ -1860,15 +1860,15 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver,
   // connect the signals
   if ( action == MoveMessage || action == MoveFolder )
   {
-    disconnect( menu, TQT_SIGNAL(activated(int)), receiver,
-        TQT_SLOT(moveSelectedToFolder(int)) );
-    connect( menu, TQT_SIGNAL(activated(int)), receiver,
-        TQT_SLOT(moveSelectedToFolder(int)) );
+    disconnect( menu, TQ_SIGNAL(activated(int)), receiver,
+        TQ_SLOT(moveSelectedToFolder(int)) );
+    connect( menu, TQ_SIGNAL(activated(int)), receiver,
+        TQ_SLOT(moveSelectedToFolder(int)) );
   } else {
-    disconnect( menu, TQT_SIGNAL(activated(int)), receiver,
-        TQT_SLOT(copySelectedToFolder(int)) );
-    connect( menu, TQT_SIGNAL(activated(int)), receiver,
-        TQT_SLOT(copySelectedToFolder(int)) );
+    disconnect( menu, TQ_SIGNAL(activated(int)), receiver,
+        TQ_SLOT(copySelectedToFolder(int)) );
+    connect( menu, TQ_SIGNAL(activated(int)), receiver,
+        TQ_SLOT(copySelectedToFolder(int)) );
   }
   if ( !item ) {
     item = firstChild();
@@ -2176,14 +2176,14 @@ void KMFolderTree::slotAddToFavorites()
 
 void KMFolderTree::slotUnhideLocalInbox()
 {
-  disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
-              this, TQT_SLOT(slotUnhideLocalInbox()) );
+  disconnect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
+              this, TQ_SLOT(slotUnhideLocalInbox()) );
   reload();
 }
 
 void KMFolderTree::delayedReload()
 {
-  TQTimer::singleShot( 0, this, TQT_SLOT(reload()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(reload()) );
 }
 
 #include "kmfoldertree.moc"