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, 96 insertions, 96 deletions

diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 1283047e2..c0a1952d7 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -69,13 +69,13 @@ using KMail::FolderRequester;
 #include <kpushbutton.h>
 
 // Qt headers:
-#include <qtabwidget.h>
-#include <qlabel.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
+#include <tqtabwidget.h>
+#include <tqlabel.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
 
 // other headers:
 #include <gpgmepp/key.h>
@@ -86,28 +86,28 @@ using namespace KPIM;
 
 namespace KMail {
 
-  IdentityDialog::IdentityDialog( QWidget * parent, const char * name )
+  IdentityDialog::IdentityDialog( TQWidget * parent, const char * name )
     : KDialogBase( Plain, i18n("Edit Identity"), Ok|Cancel|Help, Ok,
                    parent, name )
   {
     // tmp. vars:
-    QWidget * tab;
-    QLabel  * label;
+    TQWidget * tab;
+    TQLabel  * label;
     int row;
-    QGridLayout * glay;
-    QString msg;
+    TQGridLayout * glay;
+    TQString msg;
 
     //
     // Tab Widget: General
     //
     row = -1;
-    QVBoxLayout * vlay = new QVBoxLayout( plainPage(), 0, spacingHint() );
-    QTabWidget *tabWidget = new QTabWidget( plainPage(), "config-identity-tab" );
+    TQVBoxLayout * vlay = new TQVBoxLayout( plainPage(), 0, spacingHint() );
+    TQTabWidget *tabWidget = new TQTabWidget( plainPage(), "config-identity-tab" );
     vlay->addWidget( tabWidget );
 
-    tab = new QWidget( tabWidget );
+    tab = new TQWidget( tabWidget );
     tabWidget->addTab( tab, i18n("&General") );
-    glay = new QGridLayout( tab, 4, 2, marginHint(), spacingHint() );
+    glay = new TQGridLayout( tab, 4, 2, marginHint(), spacingHint() );
     glay->setRowStretch( 3, 1 );
     glay->setColStretch( 1, 1 );
 
@@ -115,51 +115,51 @@ namespace KMail {
     ++row;
     mNameEdit = new KLineEdit( tab );
     glay->addWidget( mNameEdit, row, 1 );
-    label = new QLabel( mNameEdit, i18n("&Your name:"), tab );
+    label = new TQLabel( mNameEdit, i18n("&Your name:"), tab );
     glay->addWidget( label, row, 0 );
     msg = i18n("<qt><h3>Your name</h3>"
                "<p>This field should contain your name as you would like "
                "it to appear in the email header that is sent out;</p>"
                "<p>if you leave this blank your real name will not "
                "appear, only the email address.</p></qt>");
-    QWhatsThis::add( label, msg );
-    QWhatsThis::add( mNameEdit, msg );
+    TQWhatsThis::add( label, msg );
+    TQWhatsThis::add( mNameEdit, msg );
 
     // "Organization" line edit and label:
     ++row;
     mOrganizationEdit = new KLineEdit( tab );
     glay->addWidget( mOrganizationEdit, row, 1 );
-    label =  new QLabel( mOrganizationEdit, i18n("Organi&zation:"), tab );
+    label =  new TQLabel( mOrganizationEdit, i18n("Organi&zation:"), tab );
     glay->addWidget( label, row, 0 );
     msg = i18n("<qt><h3>Organization</h3>"
                "<p>This field should have the name of your organization "
                "if you'd like it to be shown in the email header that "
                "is sent out.</p>"
                "<p>It is safe (and normal) to leave this blank.</p></qt>");
-    QWhatsThis::add( label, msg );
-    QWhatsThis::add( mOrganizationEdit, msg );
+    TQWhatsThis::add( label, msg );
+    TQWhatsThis::add( mOrganizationEdit, msg );
 
     // "Email Address" line edit and label:
     // (row 3: spacer)
     ++row;
     mEmailEdit = new KLineEdit( tab );
     glay->addWidget( mEmailEdit, row, 1 );
-    label = new QLabel( mEmailEdit, i18n("&Email address:"), tab );
+    label = new TQLabel( mEmailEdit, i18n("&Email address:"), tab );
     glay->addWidget( label, row, 0 );
     msg = i18n("<qt><h3>Email address</h3>"
                "<p>This field should have your full email address.</p>"
                "<p>If you leave this blank, or get it wrong, people "
                "will have trouble replying to you.</p></qt>");
-    QWhatsThis::add( label, msg );
-    QWhatsThis::add( mEmailEdit, msg );
+    TQWhatsThis::add( label, msg );
+    TQWhatsThis::add( mEmailEdit, msg );
 
     //
     // Tab Widget: Cryptography
     //
     row = -1;
-    mCryptographyTab = tab = new QWidget( tabWidget );
+    mCryptographyTab = tab = new TQWidget( tabWidget );
     tabWidget->addTab( tab, i18n("Cryptograph&y") );
-    glay = new QGridLayout( tab, 6, 2, marginHint(), spacingHint() );
+    glay = new TQGridLayout( tab, 6, 2, marginHint(), spacingHint() );
     glay->setColStretch( 1, 1 );
 
     // "OpenPGP Signature Key" requester and label:
@@ -178,9 +178,9 @@ namespace KMail {
 	       "normal mail functions will not be affected.</p>"
                "<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>");
 
-    label = new QLabel( mPGPSigningKeyRequester, i18n("OpenPGP signing key:"), tab );
-    QWhatsThis::add( mPGPSigningKeyRequester, msg );
-    QWhatsThis::add( label, msg );
+    label = new TQLabel( mPGPSigningKeyRequester, i18n("OpenPGP signing key:"), tab );
+    TQWhatsThis::add( mPGPSigningKeyRequester, msg );
+    TQWhatsThis::add( label, msg );
 
     glay->addWidget( label, row, 0 );
     glay->addWidget( mPGPSigningKeyRequester, row, 1 );
@@ -203,9 +203,9 @@ namespace KMail {
                "to encrypt copies of outgoing messages to you using OpenPGP; "
 	       "normal mail functions will not be affected.</p>"
                "<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>");
-    label = new QLabel( mPGPEncryptionKeyRequester, i18n("OpenPGP encryption key:"), tab );
-    QWhatsThis::add( mPGPEncryptionKeyRequester, msg );
-    QWhatsThis::add( label, msg );
+    label = new TQLabel( mPGPEncryptionKeyRequester, i18n("OpenPGP encryption key:"), tab );
+    TQWhatsThis::add( mPGPEncryptionKeyRequester, msg );
+    TQWhatsThis::add( label, msg );
 
     glay->addWidget( label, row, 0 );
     glay->addWidget( mPGPEncryptionKeyRequester, row, 1 );
@@ -225,9 +225,9 @@ namespace KMail {
                "<p>You can leave this blank, but KMail will not be able "
                "to digitally sign emails using S/MIME; "
 	       "normal mail functions will not be affected.</p></qt>");
-    label = new QLabel( mSMIMESigningKeyRequester, i18n("S/MIME signing certificate:"), tab );
-    QWhatsThis::add( mSMIMESigningKeyRequester, msg );
-    QWhatsThis::add( label, msg );
+    label = new TQLabel( mSMIMESigningKeyRequester, i18n("S/MIME signing certificate:"), tab );
+    TQWhatsThis::add( mSMIMESigningKeyRequester, msg );
+    TQWhatsThis::add( label, msg );
     glay->addWidget( label, row, 0 );
     glay->addWidget( mSMIMESigningKeyRequester, row, 1 );
 
@@ -253,9 +253,9 @@ namespace KMail {
                "<p>You can leave this blank, but KMail will not be able "
                "to encrypt copies of outgoing messages to you using S/MIME; "
 	       "normal mail functions will not be affected.</p></qt>");
-    label = new QLabel( mSMIMEEncryptionKeyRequester, i18n("S/MIME encryption certificate:"), tab );
-    QWhatsThis::add( mSMIMEEncryptionKeyRequester, msg );
-    QWhatsThis::add( label, msg );
+    label = new TQLabel( mSMIMEEncryptionKeyRequester, i18n("S/MIME encryption certificate:"), tab );
+    TQWhatsThis::add( mSMIMEEncryptionKeyRequester, msg );
+    TQWhatsThis::add( label, msg );
 
     glay->addWidget( label, row, 0 );
     glay->addWidget( mSMIMEEncryptionKeyRequester, row, 1 );
@@ -265,15 +265,15 @@ namespace KMail {
 
     // "Preferred Crypto Message Format" combobox and label:
     ++row;
-    mPreferredCryptoMessageFormat = new QComboBox( false, tab );
-    QStringList l;
+    mPreferredCryptoMessageFormat = new TQComboBox( false, tab );
+    TQStringList l;
     l << Kleo::cryptoMessageFormatToLabel( Kleo::AutoFormat )
       << Kleo::cryptoMessageFormatToLabel( Kleo::InlineOpenPGPFormat )
       << Kleo::cryptoMessageFormatToLabel( Kleo::OpenPGPMIMEFormat )
       << Kleo::cryptoMessageFormatToLabel( Kleo::SMIMEFormat )
       << Kleo::cryptoMessageFormatToLabel( Kleo::SMIMEOpaqueFormat );
     mPreferredCryptoMessageFormat->insertStringList( l );
-    label = new QLabel( mPreferredCryptoMessageFormat,
+    label = new TQLabel( mPreferredCryptoMessageFormat,
 			i18n("Preferred crypto message format:"), tab );
 
     glay->addWidget( label, row, 0 );
@@ -286,9 +286,9 @@ namespace KMail {
     // Tab Widget: Advanced
     //
     row = -1;
-    tab = new QWidget( tabWidget );
+    tab = new TQWidget( tabWidget );
     tabWidget->addTab( tab, i18n("&Advanced") );
-    glay = new QGridLayout( tab, 8, 2, marginHint(), spacingHint() );
+    glay = new TQGridLayout( tab, 8, 2, marginHint(), spacingHint() );
     // the last (empty) row takes all the remaining space
     glay->setRowStretch( 8-1, 1 );
     glay->setColStretch( 1, 1 );
@@ -297,7 +297,7 @@ namespace KMail {
     ++row;
     mReplyToEdit = new KPIM::AddresseeLineEdit( tab, true, "mReplyToEdit" );
     glay->addWidget( mReplyToEdit, row, 1 );
-    label = new QLabel ( mReplyToEdit, i18n("&Reply-To address:"), tab);
+    label = new TQLabel ( mReplyToEdit, i18n("&Reply-To address:"), tab);
     glay->addWidget( label , row, 0 );
     msg = i18n("<qt><h3>Reply-To addresses</h3>"
                "<p>This sets the <tt>Reply-to:</tt> header to contain a "
@@ -309,14 +309,14 @@ namespace KMail {
                "<tt>From:</tt> field, but any responses to go to "
                "a group address.</p>"
                "<p>If in doubt, leave this field blank.</p></qt>");
-    QWhatsThis::add( label, msg );
-    QWhatsThis::add( mReplyToEdit, msg );
+    TQWhatsThis::add( label, msg );
+    TQWhatsThis::add( mReplyToEdit, msg );
 
     // "BCC addresses" line edit and label:
     ++row;
     mBccEdit = new KPIM::AddresseeLineEdit( tab, true, "mBccEdit" );
     glay->addWidget( mBccEdit, row, 1 );
-    label = new QLabel( mBccEdit, i18n("&BCC addresses:"), tab );
+    label = new TQLabel( mBccEdit, i18n("&BCC addresses:"), tab );
     glay->addWidget( label, row, 0 );
     msg = i18n("<qt><h3>BCC (Blind Carbon Copy) addresses</h3>"
                "<p>The addresses that you enter here will be added to each "
@@ -327,14 +327,14 @@ namespace KMail {
                "<p>To specify more than one address, use commas to separate "
                "the list of BCC recipients.</p>"
                "<p>If in doubt, leave this field blank.</p></qt>");
-    QWhatsThis::add( label, msg );
-    QWhatsThis::add( mBccEdit, msg );
+    TQWhatsThis::add( label, msg );
+    TQWhatsThis::add( mBccEdit, msg );
 
     // "Dictionary" combo box and label:
     ++row;
     mDictionaryCombo = new DictionaryComboBox( tab );
     glay->addWidget( mDictionaryCombo, row, 1 );
-    glay->addWidget( new QLabel( mDictionaryCombo, i18n("D&ictionary:"), tab ),
+    glay->addWidget( new TQLabel( mDictionaryCombo, i18n("D&ictionary:"), tab ),
                      row, 0 );
 
     // "Sent-mail Folder" combo box and label:
@@ -343,7 +343,7 @@ namespace KMail {
         kmkernel->getKMMainWidget()->folderTree() );
     mFccCombo->setShowOutbox( false );
     glay->addWidget( mFccCombo, row, 1 );
-    glay->addWidget( new QLabel( mFccCombo, i18n("Sent-mail &folder:"), tab ),
+    glay->addWidget( new TQLabel( mFccCombo, i18n("Sent-mail &folder:"), tab ),
                      row, 0 );
 
     // "Drafts Folder" combo box and label:
@@ -352,7 +352,7 @@ namespace KMail {
         kmkernel->getKMMainWidget()->folderTree() );
     mDraftsCombo->setShowOutbox( false );
     glay->addWidget( mDraftsCombo, row, 1 );
-    glay->addWidget( new QLabel( mDraftsCombo, i18n("&Drafts folder:"), tab ),
+    glay->addWidget( new TQLabel( mDraftsCombo, i18n("&Drafts folder:"), tab ),
                      row, 0 );
 
     // "Templates Folder" combo box and label:
@@ -361,43 +361,43 @@ namespace KMail {
         kmkernel->getKMMainWidget()->folderTree() );
     mTemplatesCombo->setShowOutbox( false );
     glay->addWidget( mTemplatesCombo, row, 1 );
-    glay->addWidget( new QLabel( mTemplatesCombo, i18n("&Templates folder:"), tab ),
+    glay->addWidget( new TQLabel( mTemplatesCombo, i18n("&Templates folder:"), tab ),
                      row, 0 );
 
     // "Special transport" combobox and label:
     ++row;
-    mTransportCheck = new QCheckBox( i18n("Special &transport:"), tab );
+    mTransportCheck = new TQCheckBox( i18n("Special &transport:"), tab );
     glay->addWidget( mTransportCheck, row, 0 );
-    mTransportCombo = new QComboBox( true, tab );
+    mTransportCombo = new TQComboBox( true, tab );
     mTransportCombo->setEnabled( false ); // since !mTransportCheck->isChecked()
     mTransportCombo->insertStringList( KMail::TransportManager::transportNames() );
     glay->addWidget( mTransportCombo, row, 1 );
-    connect( mTransportCheck, SIGNAL(toggled(bool)),
-             mTransportCombo, SLOT(setEnabled(bool)) );
+    connect( mTransportCheck, TQT_SIGNAL(toggled(bool)),
+             mTransportCombo, TQT_SLOT(setEnabled(bool)) );
 
     // the last row is a spacer
     
     // 
     // Tab Widget: Templates
     // 
-		tab = new QWidget( tabWidget );
+		tab = new TQWidget( tabWidget );
     tabWidget->addTab( tab, i18n("&Templates") );
-    vlay = new QVBoxLayout( tab, marginHint(), spacingHint() );
-		mCustom = new QCheckBox( i18n("&Use custom message templates"), tab );
+    vlay = new TQVBoxLayout( tab, marginHint(), spacingHint() );
+		mCustom = new TQCheckBox( i18n("&Use custom message templates"), tab );
 		vlay->addWidget( mCustom );
 		mWidget = new TemplatesConfiguration( tab , "identity-templates" );
 		mWidget->setEnabled( false );
 		vlay->addWidget( mWidget );
-		QHBoxLayout *btns = new QHBoxLayout( vlay, spacingHint() );
+		TQHBoxLayout *btns = new TQHBoxLayout( vlay, spacingHint() );
 		mCopyGlobal = new KPushButton( i18n("&Copy global templates"), tab );
 		mCopyGlobal->setEnabled( false );
 		btns->addWidget( mCopyGlobal );
-		connect( mCustom, SIGNAL( toggled( bool ) ),
-					mWidget, SLOT( setEnabled( bool ) ) );
-		connect( mCustom, SIGNAL( toggled( bool ) ),
-					mCopyGlobal, SLOT( setEnabled( bool ) ) );
-		connect( mCopyGlobal, SIGNAL(clicked()),
-					this, SLOT(slotCopyGlobal()) );
+		connect( mCustom, TQT_SIGNAL( toggled( bool ) ),
+					mWidget, TQT_SLOT( setEnabled( bool ) ) );
+		connect( mCustom, TQT_SIGNAL( toggled( bool ) ),
+					mCopyGlobal, TQT_SLOT( setEnabled( bool ) ) );
+		connect( mCopyGlobal, TQT_SIGNAL(clicked()),
+					this, TQT_SLOT(slotCopyGlobal()) );
 		
     //
     // Tab Widget: Signature
@@ -415,8 +415,8 @@ namespace KMail {
       resize( geometry.readSizeEntry( "Identity Dialog size" ) );
     mNameEdit->setFocus();
 
-    connect( tabWidget, SIGNAL(currentChanged(QWidget*)),
-	     SLOT(slotAboutToShow(QWidget*)) );
+    connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)),
+	     TQT_SLOT(slotAboutToShow(TQWidget*)) );
   }
 
   IdentityDialog::~IdentityDialog() {
@@ -424,11 +424,11 @@ namespace KMail {
     geometry.writeEntry( "Identity Dialog size", size() );
   }
 
-  void IdentityDialog::slotAboutToShow( QWidget * w ) {
+  void IdentityDialog::slotAboutToShow( TQWidget * w ) {
     if ( w == mCryptographyTab ) {
       // set the configured email address as inital query of the key
       // requesters:
-      const QString email = mEmailEdit->text().stripWhiteSpace();
+      const TQString email = mEmailEdit->text().stripWhiteSpace();
       mPGPEncryptionKeyRequester->setInitialQuery( email );
       mPGPSigningKeyRequester->setInitialQuery( email );
       mSMIMEEncryptionKeyRequester->setInitialQuery( email );
@@ -442,13 +442,13 @@ namespace KMail {
 
   namespace {
     struct DoesntMatchEMailAddress {
-      explicit DoesntMatchEMailAddress( const QString & s )
+      explicit DoesntMatchEMailAddress( const TQString & s )
 	: email( s.stripWhiteSpace().lower() ) {}
       bool operator()( const GpgME::Key & key ) const;
     private:
       bool checkForEmail( const char * email ) const;
-      static QString extractEmail( const char * email );
-      const QString email;
+      static TQString extractEmail( const char * email );
+      const TQString email;
     };
 
     bool DoesntMatchEMailAddress::operator()( const GpgME::Key & key ) const {
@@ -460,14 +460,14 @@ namespace KMail {
     }
 
     bool DoesntMatchEMailAddress::checkForEmail( const char * e ) const {
-      const QString em = extractEmail( e );
+      const TQString em = extractEmail( e );
       return !em.isEmpty() && email == em;
     }
 
-    QString DoesntMatchEMailAddress::extractEmail( const char * e ) {
+    TQString DoesntMatchEMailAddress::extractEmail( const char * e ) {
       if ( !e || !*e )
-	return QString::null;
-      const QString em = QString::fromUtf8( e );
+	return TQString::null;
+      const TQString em = TQString::fromUtf8( e );
       if ( e[0] == '<' )
 	return em.mid( 1, em.length() - 2 );
       else
@@ -475,12 +475,12 @@ namespace KMail {
     }
   }
 
-bool IdentityDialog::validateAddresses( const QString & addresses )
+bool IdentityDialog::validateAddresses( const TQString & addresses )
 {
-  QString brokenAddress;
+  TQString brokenAddress;
   KPIM::EmailParseResult errorCode = KMMessage::isValidEmailAddressList( KMMessage::expandAliases( addresses ), brokenAddress );
   if ( !( errorCode == KPIM::AddressOk || errorCode == KPIM::AddressEmpty ) ) {
-    QString errorMsg( "<qt><p><b>" + brokenAddress +
+    TQString errorMsg( "<qt><p><b>" + brokenAddress +
                       "</b></p><p>" + KPIM::emailParseResultToString( errorCode ) +
                       "</p></qt>" );
     KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Address") );
@@ -490,11 +490,11 @@ bool IdentityDialog::validateAddresses( const QString & addresses )
 }
 
 void IdentityDialog::slotOk() {
-    const QString email = mEmailEdit->text().stripWhiteSpace();
+    const TQString email = mEmailEdit->text().stripWhiteSpace();
  
     // Validate email addresses
     if ( !isValidSimpleEmailAddress( email )) {
-      QString errorMsg( simpleEmailAddressErrorMsg());
+      TQString errorMsg( simpleEmailAddressErrorMsg());
       KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Address") );
       return;
     }
@@ -511,7 +511,7 @@ void IdentityDialog::slotOk() {
     const std::vector<GpgME::Key> & pgpEncryptionKeys = mPGPEncryptionKeyRequester->keys();
     const std::vector<GpgME::Key> & smimeSigningKeys = mSMIMESigningKeyRequester->keys();
     const std::vector<GpgME::Key> & smimeEncryptionKeys = mSMIMEEncryptionKeyRequester->keys();
-    QString msg;
+    TQString msg;
     bool err = false;
     if ( std::find_if( pgpSigningKeys.begin(), pgpSigningKeys.end(),
 		       DoesntMatchEMailAddress( email ) ) != pgpSigningKeys.end() ) {
@@ -567,8 +567,8 @@ void IdentityDialog::slotOk() {
     return KDialogBase::slotOk();
   }
 
-  bool IdentityDialog::checkFolderExists( const QString & folderID,
-                                          const QString & msg ) {
+  bool IdentityDialog::checkFolderExists( const TQString & folderID,
+                                          const TQString & msg ) {
     KMFolder * folder = kmkernel->findFolderById( folderID );
     if ( !folder ) {
       KMessageBox::sorry( this, msg );
@@ -636,7 +636,7 @@ void IdentityDialog::slotOk() {
     
     // "Templates" tab:
     uint identity = ident.uoid();
-		QString iid = QString("IDENTITY_%1").arg( identity );
+		TQString iid = TQString("IDENTITY_%1").arg( identity );
 		Templates t( iid );
 		mCustom->setChecked(t.useCustomTemplates());
 		mWidget->loadFromIdentity( identity );
@@ -651,7 +651,7 @@ void IdentityDialog::slotOk() {
     // "General" tab:
     ident.setFullName( mNameEdit->text() );
     ident.setOrganization( mOrganizationEdit->text() );
-    QString email = mEmailEdit->text();
+    TQString email = mEmailEdit->text();
     ident.setEmailAddr( email );
     // "Cryptography" tab:
     ident.setPGPSigningKey( mPGPSigningKeyRequester->fingerprint().latin1() );
@@ -663,17 +663,17 @@ void IdentityDialog::slotOk() {
     ident.setReplyToAddr( mReplyToEdit->text() );
     ident.setBcc( mBccEdit->text() );
     ident.setTransport( ( mTransportCheck->isChecked() ) ?
-                        mTransportCombo->currentText() : QString::null );
+                        mTransportCombo->currentText() : TQString::null );
     ident.setDictionary( mDictionaryCombo->currentDictionary() );
     ident.setFcc( mFccCombo->folder() ?
-                  mFccCombo->folder()->idString() : QString::null );
+                  mFccCombo->folder()->idString() : TQString::null );
     ident.setDrafts( mDraftsCombo->folder() ?
-                     mDraftsCombo->folder()->idString() : QString::null );
+                     mDraftsCombo->folder()->idString() : TQString::null );
     ident.setTemplates( mTemplatesCombo->folder() ?
-                     mTemplatesCombo->folder()->idString() : QString::null );
+                     mTemplatesCombo->folder()->idString() : TQString::null );
     // "Templates" tab:
     uint identity = ident.uoid();
-    QString iid = QString("IDENTITY_%1").arg( identity );
+    TQString iid = TQString("IDENTITY_%1").arg( identity );
     Templates t( iid );
 		kdDebug() << "use custom templates for identity " << identity << ": " << mCustom->isChecked() << endl;
 		t.setUseCustomTemplates(mCustom->isChecked());
@@ -685,9 +685,9 @@ void IdentityDialog::slotOk() {
     ident.setXFaceEnabled( mXFaceConfigurator->isXFaceEnabled() );
   }
 
-  void IdentityDialog::slotUpdateTransportCombo( const QStringList & sl ) {
+  void IdentityDialog::slotUpdateTransportCombo( const TQStringList & sl ) {
     // save old setting:
-    QString content = mTransportCombo->currentText();
+    TQString content = mTransportCombo->currentText();
     // update combo box:
     mTransportCombo->clear();
     mTransportCombo->insertStringList( sl );