1 files changed, 29 insertions, 29 deletions

diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 43d15a51f..94cf2d480 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -117,9 +117,9 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt
   TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page );
   topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 );
 
-  connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
-  connect( kabBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddresses() ) );
-  connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) );
+  connect( mUserIdLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) );
+  connect( kabBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelectAddresses() ) );
+  connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) );
   enableButtonOK( false );
 
   mUserIdLineEdit->setFocus();
@@ -338,12 +338,12 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   mListView->addColumn( i18n( "User Id" ) );
   mListView->addColumn( i18n( "Permissions" ) );
 
-  connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
-	   TQT_SLOT(slotEditACL(TQListViewItem*)) );
-  connect( mListView, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-	   TQT_SLOT(slotEditACL(TQListViewItem*)) );
-  connect( mListView, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-	   TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
+  connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+	   TQ_SLOT(slotEditACL(TQListViewItem*)) );
+  connect( mListView, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+	   TQ_SLOT(slotEditACL(TQListViewItem*)) );
+  connect( mListView, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+	   TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
 
   TQVBox* buttonBox = new TQVBox( mACLWidget );
   buttonBox->setSpacing( KDialog::spacingHint() );
@@ -353,13 +353,13 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   TQWidget *spacer = new TQWidget( buttonBox );
   spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
-  connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) );
-  connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) );
-  connect( mRemoveACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveACL() ) );
+  connect( mAddACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddACL() ) );
+  connect( mEditACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditACL() ) );
+  connect( mRemoveACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveACL() ) );
   mEditACL->setEnabled( false );
   mRemoveACL->setEnabled( false );
 
-  connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) );
+  connect( this, TQ_SIGNAL( changed(bool) ), TQ_SLOT( slotChanged(bool) ) );
 }
 
 // Warning before save() this will return the url of the _parent_ folder, when creating a new one
@@ -457,8 +457,8 @@ void KMail::FolderDiaACLTab::load()
   if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
     slotConnectionResult( -1, TQString() );
   } else if ( state == ImapAccountBase::Connecting ) {
-    connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
-             this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+    connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+             this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
   } else { // Connected
     slotConnectionResult( 0, TQString() );
   }
@@ -466,8 +466,8 @@ void KMail::FolderDiaACLTab::load()
 
 void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString& errorMsg )
 {
-  disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
-              this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
+  disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ),
+              this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) );
   if ( errorCode ) {
     if ( errorCode == -1 ) // unspecified error
       mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
@@ -478,8 +478,8 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
   }
 
   if ( mUserRightsState != KMail::ACLJobs::Ok ) {
-    connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
-             this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
+    connect( mImapAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ),
+             this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) );
     KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
     mImapAccount->getUserRights( folder, mImapPath );
   }
@@ -506,15 +506,15 @@ void KMail::FolderDiaACLTab::startListing()
 {
   // List ACLs of folder - or its parent, if creating a new folder
   mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
-  connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
-           this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
+  connect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+           this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
 }
 
 void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
-    disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
-                this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
+    disconnect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )),
+                this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) );
 
     if ( job && job->error() ) {
       if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION )
@@ -727,8 +727,8 @@ bool KMail::FolderDiaACLTab::save()
   if ( mDlg->isNewFolder() ) {
     // The folder isn't created yet, wait for it
     // It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete
-    connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
-             this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
+    connect( parentImap, TQ_SIGNAL( directoryListingFinished(KMFolderImap*) ),
+             this, TQ_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
   } else {
       slotDirectoryListingFinished( parentImap );
   }
@@ -756,10 +756,10 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
   jd.total = 1; jd.done = 0; jd.parent = 0;
   mImapAccount->insertJob(job, jd);
 
-  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
-          TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
-  connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
-          TQT_SLOT(slotACLChanged( const TQString&, int )) );
+  connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+          TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )),
+          TQ_SLOT(slotACLChanged( const TQString&, int )) );
 }
 
 void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job)