1 files changed, 31 insertions, 31 deletions

diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp
index 49e14b573..499d444f1 100644
--- a/kmail/kmfoldercombobox.cpp
+++ b/kmail/kmfoldercombobox.cpp
@@ -8,8 +8,8 @@
 
 //-----------------------------------------------------------------------------
 
-KMFolderComboBox::KMFolderComboBox( QWidget *parent, char *name )
-  : QComboBox( parent, name )
+KMFolderComboBox::KMFolderComboBox( TQWidget *parent, char *name )
+  : TQComboBox( parent, name )
 {
   init();
 }
@@ -17,8 +17,8 @@ KMFolderComboBox::KMFolderComboBox( QWidget *parent, char *name )
 
 //-----------------------------------------------------------------------------
 
-KMFolderComboBox::KMFolderComboBox( bool rw, QWidget *parent, char *name )
-  : QComboBox( rw, parent, name )
+KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *parent, char *name )
+  : TQComboBox( rw, parent, name )
 {
   init();
 }
@@ -32,15 +32,15 @@ void KMFolderComboBox::init()
   mOutboxShown = true;
   mImapShown = true;
   refreshFolders();
-  connect( this, SIGNAL( activated(int) ),
-      this, SLOT( slotActivated(int) ) );
-  connect( kmkernel->folderMgr(), SIGNAL(changed()),
-      this, SLOT(refreshFolders()) );
-  connect( kmkernel->dimapFolderMgr(), SIGNAL(changed()),
-      this, SLOT(refreshFolders()) );
+  connect( this, TQT_SIGNAL( activated(int) ),
+      this, TQT_SLOT( slotActivated(int) ) );
+  connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()),
+      this, TQT_SLOT(refreshFolders()) );
+  connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()),
+      this, TQT_SLOT(refreshFolders()) );
   if (mImapShown)
-    connect( kmkernel->imapFolderMgr(), SIGNAL(changed()),
-        this, SLOT(refreshFolders()) );
+    connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
+        this, TQT_SLOT(refreshFolders()) );
 }
 
 
@@ -59,22 +59,22 @@ void KMFolderComboBox::showImapFolders(bool shown)
   mImapShown = shown;
   refreshFolders();
   if (shown)
-    connect( kmkernel->imapFolderMgr(), SIGNAL(changed()),
-        this, SLOT(refreshFolders()) );
+    connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
+        this, TQT_SLOT(refreshFolders()) );
   else
-    disconnect( kmkernel->imapFolderMgr(), SIGNAL(changed()),
-        this, SLOT(refreshFolders()) );
+    disconnect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()),
+        this, TQT_SLOT(refreshFolders()) );
 }
 
 //-----------------------------------------------------------------------------
 
-void KMFolderComboBox::createFolderList(QStringList *names,
-                                        QValueList<QGuardedPtr<KMFolder> > *folders)
+void KMFolderComboBox::createFolderList(TQStringList *names,
+                                        TQValueList<TQGuardedPtr<KMFolder> > *folders)
 {
   kmkernel->folderMgr()->createI18nFolderList( names, folders );
   if ( !mOutboxShown ) {
-    QValueList< QGuardedPtr<KMFolder> >::iterator folderIt = folders->begin();
-    QStringList::iterator namesIt = names->begin();
+    TQValueList< TQGuardedPtr<KMFolder> >::iterator folderIt = folders->begin();
+    TQStringList::iterator namesIt = names->begin();
     for ( ; folderIt != folders->end(); ++folderIt, ++namesIt ) {
       KMFolder *folder = *folderIt;
       if ( folder == kmkernel->outboxFolder() )
@@ -96,8 +96,8 @@ void KMFolderComboBox::createFolderList(QStringList *names,
 
 void KMFolderComboBox::refreshFolders()
 {
-  QStringList names;
-  QValueList<QGuardedPtr<KMFolder> > folders;
+  TQStringList names;
+  TQValueList<TQGuardedPtr<KMFolder> > folders;
   createFolderList( &names, &folders );
 
   KMFolder *folder = getFolder();
@@ -110,8 +110,8 @@ void KMFolderComboBox::refreshFolders()
 
 void KMFolderComboBox::setFolder( KMFolder *aFolder )
 {
-  QStringList names;
-  QValueList<QGuardedPtr<KMFolder> > folders;
+  TQStringList names;
+  TQValueList<TQGuardedPtr<KMFolder> > folders;
   createFolderList( &names, &folders );
 
   int idx = folders.findIndex( aFolder );
@@ -122,7 +122,7 @@ void KMFolderComboBox::setFolder( KMFolder *aFolder )
   mFolder = aFolder;
 }
 
-void KMFolderComboBox::setFolder( const QString &idString )
+void KMFolderComboBox::setFolder( const TQString &idString )
 {
   KMFolder * folder = kmkernel->findFolderById( idString );
   if (!folder && !idString.isEmpty())
@@ -146,16 +146,16 @@ KMFolder *KMFolderComboBox::getFolder()
   if (mFolder)
     return mFolder;
 
-  QStringList names;
-  QValueList<QGuardedPtr<KMFolder> > folders;
+  TQStringList names;
+  TQValueList<TQGuardedPtr<KMFolder> > folders;
   createFolderList( &names, &folders );
 
   if (currentItem() == mSpecialIdx)
      return 0;
 
-  QString text = currentText();
+  TQString text = currentText();
   int idx = 0;
-  QStringList::Iterator it;
+  TQStringList::Iterator it;
   for ( it = names.begin(); it != names.end(); ++it ) {
     if ( ! (*it).compare( text ) )
       return *folders.at( idx );
@@ -169,8 +169,8 @@ KMFolder *KMFolderComboBox::getFolder()
 
 void KMFolderComboBox::slotActivated(int index)
 {
-  QStringList names;
-  QValueList<QGuardedPtr<KMFolder> > folders;
+  TQStringList names;
+  TQValueList<TQGuardedPtr<KMFolder> > folders;
   createFolderList( &names, &folders );
 
   if (index == mSpecialIdx)