Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 93 insertions, 93 deletions

diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 4b4a5b6b7..d1f02a57c 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -52,13 +52,13 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qvbox.h>
-#include <qvbuttongroup.h>
-#include <qwidgetstack.h>
-#include <qradiobutton.h>
-#include <qwhatsthis.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqvbox.h>
+#include <tqvbuttongroup.h>
+#include <tqwidgetstack.h>
+#include <tqradiobutton.h>
+#include <tqwhatsthis.h>
 
 #include <assert.h>
 #include <kmessagebox.h>
@@ -83,46 +83,46 @@ static const struct {
 };
 
 
-KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const QString& caption, QWidget* parent, const char* name )
+KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name )
   : KDialogBase( parent, name, true /*modal*/, caption,
                  KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true /*sep*/ )
   , mUserIdFormat( userIdFormat )
 {
-  QWidget *page = new QWidget( this );
+  TQWidget *page = new TQWidget( this );
   setMainWidget(page);
-  QGridLayout *topLayout = new QGridLayout( page, 3 /*rows*/, 3 /*cols*/, 0, spacingHint() );
+  TQGridLayout *topLayout = new TQGridLayout( page, 3 /*rows*/, 3 /*cols*/, 0, spacingHint() );
 
-  QLabel *label = new QLabel( i18n( "&User identifier:" ), page );
+  TQLabel *label = new TQLabel( i18n( "&User identifier:" ), page );
   topLayout->addWidget( label, 0, 0 );
 
   mUserIdLineEdit = new KLineEdit( page );
   topLayout->addWidget( mUserIdLineEdit, 0, 1 );
   label->setBuddy( mUserIdLineEdit );
-  QWhatsThis::add( mUserIdLineEdit, i18n( "The User Identifier is the login of the user on the IMAP server. This can be a simple user name or the full email address of the user; the login for your own account on the server will tell you which one it is." ) );
+  TQWhatsThis::add( mUserIdLineEdit, i18n( "The User Identifier is the login of the user on the IMAP server. This can be a simple user name or the full email address of the user; the login for your own account on the server will tell you which one it is." ) );
 
-  QPushButton* kabBtn = new QPushButton( "...", page );
+  TQPushButton* kabBtn = new TQPushButton( "...", page );
   topLayout->addWidget( kabBtn, 0, 2 );
 
-  mButtonGroup = new QVButtonGroup( i18n( "Permissions" ), page );
+  mButtonGroup = new TQVButtonGroup( i18n( "Permissions" ), page );
   topLayout->addMultiCellWidget( mButtonGroup, 1, 1, 0, 2 );
 
   for ( unsigned int i = 0;
         i < sizeof( standardPermissions ) / sizeof( *standardPermissions );
         ++i ) {
-    QRadioButton* cb = new QRadioButton( i18n( "Permissions", standardPermissions[i].userString ), mButtonGroup );
+    TQRadioButton* cb = new TQRadioButton( i18n( "Permissions", standardPermissions[i].userString ), mButtonGroup );
     // We store the permission value (bitfield) as the id of the radiobutton in the group
     mButtonGroup->insert( cb, standardPermissions[i].permissions );
   }
   topLayout->setRowStretch(2, 10);
 
-  connect( mUserIdLineEdit, SIGNAL( textChanged( const QString& ) ), SLOT( slotChanged() ) );
-  connect( kabBtn, SIGNAL( clicked() ), SLOT( slotSelectAddresses() ) );
-  connect( mButtonGroup, SIGNAL( clicked( int ) ), SLOT( slotChanged() ) );
+  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() ) );
   enableButtonOK( false );
 
   mUserIdLineEdit->setFocus();
   // Ensure the lineedit is rather wide so that email addresses can be read in it
-  incInitialSize( QSize( 200, 0 ) );
+  incInitialSize( TQSize( 200, 0 ) );
 }
 
 void KMail::ACLEntryDialog::slotChanged()
@@ -130,9 +130,9 @@ void KMail::ACLEntryDialog::slotChanged()
   enableButtonOK( !mUserIdLineEdit->text().isEmpty() && mButtonGroup->selected() != 0 );
 }
 
-static QString addresseeToUserId( const KABC::Addressee& addr, IMAPUserIdFormat userIdFormat )
+static TQString addresseeToUserId( const KABC::Addressee& addr, IMAPUserIdFormat userIdFormat )
 {
-  QString email = addr.preferredEmail();
+  TQString email = addr.preferredEmail();
   if ( userIdFormat == FullEmail )
     return email;
   else { // mUserIdFormat == UserName
@@ -148,14 +148,14 @@ void KMail::ACLEntryDialog::slotSelectAddresses()
   dlg.setShowBCC( false );
   if ( mUserIdFormat == FullEmail ) // otherwise we have no way to go back from userid to email
     dlg.setSelectedTo( userIds() );
-  if ( dlg.exec() != QDialog::Accepted )
+  if ( dlg.exec() != TQDialog::Accepted )
     return;
 
-  const QStringList distrLists = dlg.toDistributionLists();
-  QString txt = distrLists.join( ", " );
+  const TQStringList distrLists = dlg.toDistributionLists();
+  TQString txt = distrLists.join( ", " );
   const KABC::Addressee::List lst = dlg.toAddresses();
   if ( !lst.isEmpty() ) {
-    for( QValueList<KABC::Addressee>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+    for( TQValueList<KABC::Addressee>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
       if ( !txt.isEmpty() )
         txt += ", ";
       txt += addresseeToUserId( *it, mUserIdFormat );
@@ -164,22 +164,22 @@ void KMail::ACLEntryDialog::slotSelectAddresses()
   mUserIdLineEdit->setText( txt );
 }
 
-void KMail::ACLEntryDialog::setValues( const QString& userId, unsigned int permissions )
+void KMail::ACLEntryDialog::setValues( const TQString& userId, unsigned int permissions )
 {
   mUserIdLineEdit->setText( userId );
   mButtonGroup->setButton( permissions );
   enableButtonOK( !userId.isEmpty() );
 }
 
-QString KMail::ACLEntryDialog::userId() const
+TQString KMail::ACLEntryDialog::userId() const
 {
   return mUserIdLineEdit->text();
 }
 
-QStringList KMail::ACLEntryDialog::userIds() const
+TQStringList KMail::ACLEntryDialog::userIds() const
 {
-  QStringList lst = QStringList::split( ",", mUserIdLineEdit->text() );
-  for( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+  TQStringList lst = TQStringList::split( ",", mUserIdLineEdit->text() );
+  for( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
     // Strip white space (in particular, due to ", ")
     *it = (*it).stripWhiteSpace();
   }
@@ -194,13 +194,13 @@ unsigned int KMail::ACLEntryDialog::permissions() const
 // class KMail::FolderDiaACLTab::ListView : public KListView
 // {
 // public:
-//   ListView( QWidget* parent, const char* name = 0 ) : KListView( parent, name ) {}
+//   ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {}
 // };
 
 class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem
 {
 public:
-  ListViewItem( QListView* listview )
+  ListViewItem( TQListView* listview )
     : KListViewItem( listview, listview->lastItem() ),
       mModified( false ), mNew( false ) {}
 
@@ -213,8 +213,8 @@ public:
 #endif
              IMAPUserIdFormat userIdFormat );
 
-  QString userId() const { return text( 0 ); }
-  void setUserId( const QString& userId ) { setText( 0, userId ); }
+  TQString userId() const { return text( 0 ); }
+  void setUserId( const TQString& userId ) { setText( 0, userId ); }
 
   unsigned int permissions() const { return mPermissions; }
   void setPermissions( unsigned int permissions );
@@ -229,13 +229,13 @@ public:
 
 private:
   unsigned int mPermissions;
-  QString mInternalRightsList; ///< protocol-dependent string (e.g. IMAP rights list)
+  TQString mInternalRightsList; ///< protocol-dependent string (e.g. IMAP rights list)
   bool mModified;
   bool mNew;
 };
 
 // internalRightsList is only used if permissions doesn't match the standard set
-static QString permissionsToUserString( unsigned int permissions, const QString& internalRightsList )
+static TQString permissionsToUserString( unsigned int permissions, const TQString& internalRightsList )
 {
   for ( unsigned int i = 0;
         i < sizeof( standardPermissions ) / sizeof( *standardPermissions );
@@ -252,7 +252,7 @@ static QString permissionsToUserString( unsigned int permissions, const QString&
 void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions )
 {
   mPermissions = permissions;
-  setText( 1, permissionsToUserString( permissions, QString::null ) );
+  setText( 1, permissionsToUserString( permissions, TQString::null ) );
 }
 
 void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
@@ -296,17 +296,17 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
     KABC::DistributionList::Entry::List::ConstIterator it; // nice number of "::"!
 #endif
     for( it = entryList.begin(); it != entryList.end(); ++it ) {
-      QString email = (*it).email;
+      TQString email = (*it).email;
       if ( email.isEmpty() )
         email = addresseeToUserId( (*it).addressee, userIdFormat );
-      ACLListEntry entry( email, QString::null, mPermissions );
+      ACLListEntry entry( email, TQString::null, mPermissions );
       entry.changed = true;
       aclList.append( entry );
     }
   } else { // it wasn't a distribution list
     ACLListEntry entry( userId(), mInternalRightsList, mPermissions );
     if ( mModified ) {
-      entry.internalRightsList = QString::null;
+      entry.internalRightsList = TQString::null;
       entry.changed = true;
     }
     aclList.append( entry );
@@ -315,24 +315,24 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
 
 ////
 
-KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, QWidget* parent, const char* name )
+KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
   : FolderDiaTab( parent, name ),
     mImapAccount( 0 ),
     mUserRights( 0 ),
     mDlg( dlg ),
     mChanged( false ), mAccepting( false ), mSaving( false )
 {
-  QVBoxLayout* topLayout = new QVBoxLayout( this );
+  TQVBoxLayout* topLayout = new TQVBoxLayout( this );
   // We need a widget stack to show either a label ("no acl support", "please wait"...)
   // or a listview.
-  mStack = new QWidgetStack( this );
+  mStack = new TQWidgetStack( this );
   topLayout->addWidget( mStack );
 
-  mLabel = new QLabel( mStack );
+  mLabel = new TQLabel( mStack );
   mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
-  mACLWidget = new QHBox( mStack );
+  mACLWidget = new TQHBox( mStack );
   mACLWidget->setSpacing( KDialog::spacingHint() );
   mListView = new KListView( mACLWidget );
   mListView->setAllColumnsShowFocus( true );
@@ -340,28 +340,28 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, QWidget* parent, c
   mListView->addColumn( i18n( "User Id" ) );
   mListView->addColumn( i18n( "Permissions" ) );
 
-  connect( mListView, SIGNAL(doubleClicked(QListViewItem*,const QPoint&,int)),
-	   SLOT(slotEditACL(QListViewItem*)) );
-  connect( mListView, SIGNAL(returnPressed(QListViewItem*)),
-	   SLOT(slotEditACL(QListViewItem*)) );
-  connect( mListView, SIGNAL(selectionChanged(QListViewItem*)),
-	   SLOT(slotSelectionChanged(QListViewItem*)) );
+  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(selectionChanged(TQListViewItem*)),
+	   TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
 
-  QVBox* buttonBox = new QVBox( mACLWidget );
+  TQVBox* buttonBox = new TQVBox( mACLWidget );
   buttonBox->setSpacing( KDialog::spacingHint() );
   mAddACL = new KPushButton( i18n( "Add Entry..." ), buttonBox );
   mEditACL = new KPushButton( i18n( "Modify Entry..." ), buttonBox );
   mRemoveACL = new KPushButton( i18n( "Remove Entry" ), buttonBox );
-  QWidget *spacer = new QWidget( buttonBox );
-  spacer->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding );
+  TQWidget *spacer = new TQWidget( buttonBox );
+  spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
-  connect( mAddACL, SIGNAL( clicked() ), SLOT( slotAddACL() ) );
-  connect( mEditACL, SIGNAL( clicked() ), SLOT( slotEditACL() ) );
-  connect( mRemoveACL, SIGNAL( clicked() ), SLOT( slotRemoveACL() ) );
+  connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) );
+  connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) );
+  connect( mRemoveACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveACL() ) );
   mEditACL->setEnabled( false );
   mRemoveACL->setEnabled( false );
 
-  connect( this, SIGNAL( changed(bool) ), SLOT( slotChanged(bool) ) );
+  connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) );
 }
 
 // Warning before save() this will return the url of the _parent_ folder, when creating a new one
@@ -409,12 +409,12 @@ void KMail::FolderDiaACLTab::load()
   // or just the username part of it.
   // To know which one it is, we currently have a hidden config option,
   // but the default value is determined from the current user's own id.
-  QString defaultFormat = "fullemail";
+  TQString defaultFormat = "fullemail";
   // warning mImapAccount can be 0 if creating a subsubsubfolder with dimap...  (bug?)
   if ( mImapAccount && mImapAccount->login().find('@') == -1 )
     defaultFormat = "username"; // no @ found, so we assume it's just the username
   KConfigGroup configGroup( kmkernel->config(), "IMAP" );
-  QString str = configGroup.readEntry( "UserIdFormat", defaultFormat );
+  TQString str = configGroup.readEntry( "UserIdFormat", defaultFormat );
   mUserIdFormat = FullEmail;
   if ( str == "username" )
     mUserIdFormat = UserName;
@@ -452,19 +452,19 @@ void KMail::FolderDiaACLTab::load()
   mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
   ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
   if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
-    slotConnectionResult( -1, QString::null );
+    slotConnectionResult( -1, TQString::null );
   } else if ( state == ImapAccountBase::Connecting ) {
-    connect( mImapAccount, SIGNAL( connectionResult(int, const QString&) ),
-             this, SLOT( slotConnectionResult(int, const QString&) ) );
+    connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
+             this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
   } else { // Connected
-    slotConnectionResult( 0, QString::null );
+    slotConnectionResult( 0, TQString::null );
   }
 }
 
-void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const QString& errorMsg )
+void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString& errorMsg )
 {
-  disconnect( mImapAccount, SIGNAL( connectionResult(int, const QString&) ),
-              this, SLOT( slotConnectionResult(int, const QString&) ) );
+  disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, 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() ) );
@@ -475,8 +475,8 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const QString&
   }
 
   if ( mUserRights == 0 ) {
-    connect( mImapAccount, SIGNAL( receivedUserRights( KMFolder* ) ),
-             this, SLOT( slotReceivedUserRights( KMFolder* ) ) );
+    connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
+             this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
     KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
     mImapAccount->getUserRights( folder, mImapPath );
   }
@@ -502,15 +502,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, SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-           this, SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+  connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
+           this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
 }
 
 void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
 {
   if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
-    disconnect( mImapAccount, SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
-                this, SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
+    disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
+                this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
 
     if ( job && job->error() ) {
       if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
@@ -547,7 +547,7 @@ void KMail::FolderDiaACLTab::loadFinished( const ACLList& aclList )
   slotSelectionChanged( mListView->selectedItem() );
 }
 
-void KMail::FolderDiaACLTab::slotEditACL(QListViewItem* item)
+void KMail::FolderDiaACLTab::slotEditACL(TQListViewItem* item)
 {
   if ( !item ) return;
   bool canAdmin = ( mUserRights & ACLJobs::Administer );
@@ -563,8 +563,8 @@ void KMail::FolderDiaACLTab::slotEditACL(QListViewItem* item)
   ListViewItem* ACLitem = static_cast<ListViewItem *>( mListView->currentItem() );
   ACLEntryDialog dlg( mUserIdFormat, i18n( "Modify Permissions" ), this );
   dlg.setValues( ACLitem->userId(), ACLitem->permissions() );
-  if ( dlg.exec() == QDialog::Accepted ) {
-    QStringList userIds = dlg.userIds();
+  if ( dlg.exec() == TQDialog::Accepted ) {
+    TQStringList userIds = dlg.userIds();
     Q_ASSERT( !userIds.isEmpty() ); // impossible, the OK button is disabled in that case
     ACLitem->setUserId( dlg.userIds().front() );
     ACLitem->setPermissions( dlg.permissions() );
@@ -582,9 +582,9 @@ void KMail::FolderDiaACLTab::slotEditACL()
   slotEditACL( mListView->currentItem() );
 }
 
-void KMail::FolderDiaACLTab::addACLs( const QStringList& userIds, unsigned int permissions )
+void KMail::FolderDiaACLTab::addACLs( const TQStringList& userIds, unsigned int permissions )
 {
-  for( QStringList::const_iterator it = userIds.begin(); it != userIds.end(); ++it ) {
+  for( TQStringList::const_iterator it = userIds.begin(); it != userIds.end(); ++it ) {
     ListViewItem* ACLitem = new ListViewItem( mListView );
     ACLitem->setUserId( *it );
     ACLitem->setPermissions( permissions );
@@ -596,14 +596,14 @@ void KMail::FolderDiaACLTab::addACLs( const QStringList& userIds, unsigned int p
 void KMail::FolderDiaACLTab::slotAddACL()
 {
   ACLEntryDialog dlg( mUserIdFormat, i18n( "Add Permissions" ), this );
-  if ( dlg.exec() == QDialog::Accepted ) {
-    const QStringList userIds = dlg.userIds();
+  if ( dlg.exec() == TQDialog::Accepted ) {
+    const TQStringList userIds = dlg.userIds();
     addACLs( dlg.userIds(), dlg.permissions() );
     emit changed(true);
   }
 }
 
-void KMail::FolderDiaACLTab::slotSelectionChanged(QListViewItem* item)
+void KMail::FolderDiaACLTab::slotSelectionChanged(TQListViewItem* item)
 {
   bool canAdmin = ( mUserRights & ACLJobs::Administer );
   bool canAdminThisItem = canAdmin;
@@ -675,7 +675,7 @@ bool KMail::FolderDiaACLTab::save()
   manager.load();
 #endif
   ACLList aclList;
-  for ( QListViewItem* item = mListView->firstChild(); item; item = item->nextSibling() ) {
+  for ( TQListViewItem* item = mListView->firstChild(); item; item = item->nextSibling() ) {
     ListViewItem* ACLitem = static_cast<ListViewItem *>( item );
     ACLitem->save( aclList,
 #ifdef KDEPIM_NEW_DISTRLISTS
@@ -691,17 +691,17 @@ bool KMail::FolderDiaACLTab::save()
   // we have to add the old userid to the "to be deleted" list.
   for( ACLList::ConstIterator init = mInitialACLList.begin(); init != mInitialACLList.end(); ++init ) {
     bool isInNewList = false;
-    QString uid = (*init).userId;
+    TQString uid = (*init).userId;
     for( ACLList::ConstIterator it = aclList.begin(); it != aclList.end() && !isInNewList; ++it )
       isInNewList = uid == (*it).userId;
     if ( !isInNewList && !mRemovedACLs.contains(uid) )
       mRemovedACLs.append( uid );
   }
 
-  for ( QStringList::ConstIterator rit = mRemovedACLs.begin(); rit != mRemovedACLs.end(); ++rit ) {
+  for ( TQStringList::ConstIterator rit = mRemovedACLs.begin(); rit != mRemovedACLs.end(); ++rit ) {
     // We use permissions == -1 to signify deleting. At least on cyrus, setacl(0) or deleteacl are the same,
     // but I'm not sure if that's true for all servers.
-    ACLListEntry entry( *rit, QString::null, -1 );
+    ACLListEntry entry( *rit, TQString::null, -1 );
     entry.changed = true;
     aclList.append( entry );
   }
@@ -723,8 +723,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, SIGNAL( directoryListingFinished(KMFolderImap*) ),
-             this, SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
+    connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
+             this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
   } else {
       slotDirectoryListingFinished( parentImap );
   }
@@ -752,10 +752,10 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
   jd.total = 1; jd.done = 0; jd.parent = 0;
   mImapAccount->insertJob(job, jd);
 
-  connect(job, SIGNAL(result(KIO::Job *)),
-          SLOT(slotMultiSetACLResult(KIO::Job *)));
-  connect(job, SIGNAL(aclChanged( const QString&, int )),
-          SLOT(slotACLChanged( const QString&, int )) );
+  connect(job, TQT_SIGNAL(result(KIO::Job *)),
+          TQT_SLOT(slotMultiSetACLResult(KIO::Job *)));
+  connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )),
+          TQT_SLOT(slotACLChanged( const TQString&, int )) );
 }
 
 void KMail::FolderDiaACLTab::slotMultiSetACLResult(KIO::Job* job)
@@ -776,13 +776,13 @@ void KMail::FolderDiaACLTab::slotMultiSetACLResult(KIO::Job* job)
   }
 }
 
-void KMail::FolderDiaACLTab::slotACLChanged( const QString& userId, int permissions )
+void KMail::FolderDiaACLTab::slotACLChanged( const TQString& userId, int permissions )
 {
   // The job indicates success in changing the permissions for this user
   // -> we note that it's been done.
   bool ok = false;
   if ( permissions > -1 ) {
-    for ( QListViewItem* item = mListView->firstChild(); item; item = item->nextSibling() ) {
+    for ( TQListViewItem* item = mListView->firstChild(); item; item = item->nextSibling() ) {
       ListViewItem* ACLitem = static_cast<ListViewItem *>( item );
       if ( ACLitem->userId() == userId ) {
         ACLitem->setModified( false );