Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 9 insertions, 9 deletions

diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 507b34c37..26daf6a23 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -52,7 +52,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <tqvbuttongroup.h>
@@ -244,7 +244,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin
   if ( internalRightsList.isEmpty() )
     return i18n( "Custom Permissions" ); // not very helpful, but shouldn't happen
   else
-    return i18n( "Custom Permissions (%1)" ).arg( internalRightsList );
+    return i18n( "Custom Permissions (%1)" ).tqarg( internalRightsList );
 }
 
 void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions )
@@ -328,7 +328,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   topLayout->addWidget( mStack );
 
   mLabel = new TQLabel( mStack );
-  mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
   mACLWidget = new TQHBox( mStack );
@@ -352,7 +352,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   mEditACL = new KPushButton( i18n( "Modify Entry..." ), buttonBox );
   mRemoveACL = new KPushButton( i18n( "Remove Entry" ), buttonBox );
   TQWidget *spacer = new TQWidget( buttonBox );
-  spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+  spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
   connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) );
   connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) );
@@ -453,7 +453,7 @@ void KMail::FolderDiaACLTab::load()
   KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
   if ( folder && folder->storage() == mImapAccount->rootFolder() )
     return; // nothing to be done for the (virtual) account folder
-  mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
+  mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) );
   ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
   if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
     slotConnectionResult( -1, TQString() );
@@ -471,7 +471,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
               this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
   if ( errorCode ) {
     if ( errorCode == -1 ) // unspecified error
-      mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
+      mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) );
     else
       // Connection error (error message box already shown by the account)
       mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
@@ -521,7 +521,7 @@ void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, c
       if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
         mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) );
       else
-        mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) );
+        mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).tqarg( job->errorString() ) );
       return;
     }
 
@@ -632,7 +632,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
     return;
   if ( !ACLitem->isNew() ) {
     if ( mImapAccount && mImapAccount->login() == ACLitem->userId() ) {
-      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( topLevelWidget(),
+      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( tqtopLevelWidget(),
          i18n( "Do you really want to remove your own permissions for this folder? You will not be able to access it afterwards." ), i18n( "Remove" ) ) )
         return;
     }
@@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
   emit changed(true);
 }
 
-KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept()
+KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaACLTab::accept()
 {
   if ( !mChanged || !mImapAccount )
     return Accepted; // (no change made), ok for accepting the dialog immediately