From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: Enable kdepim compilation under Qt4 This will likely break Qt3
 compilation temporarily, which is an unintended side effect. A third and
 final kdepim commit will repair Qt3 compilation shortly.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmail/accountdialog.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'kmail/accountdialog.cpp')

diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 4dab221bc..2782bfa93 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -181,7 +181,7 @@ void
 ProcmailRCParser::processLocalLock(const TQString &s)
 {
   TQString val;
-  int colonPos = s.findRev(':');
+  int colonPos = s.tqfindRev(':');
 
   if (colonPos > 0) { // we don't care about the leading one
     val = s.mid(colonPos + 1).stripWhiteSpace();
@@ -357,7 +357,7 @@ void AccountDialog::makeLocalAccountPage()
   topLayout->addWidget( choose, 3, 2 );
 
   TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page );
-  group->setColumnLayout(0, TQt::Horizontal);
+  group->setColumnLayout(0, Qt::Horizontal);
   group->tqlayout()->setSpacing( 0 );
   group->tqlayout()->setMargin( 0 );
   TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
@@ -618,7 +618,7 @@ void AccountDialog::makePopAccountPage()
   label = new TQLabel( i18n("&Port:"), page1 );
   grid->addWidget( label, 4, 0 );
   mPop.portEdit = new KLineEdit( page1 );
-  mPop.portEdit->setValidator( new TQIntValidator(this) );
+  mPop.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
   label->setBuddy( mPop.portEdit );
   grid->addWidget( mPop.portEdit, 4, 1 );
 
@@ -778,7 +778,7 @@ void AccountDialog::makePopAccountPage()
 
   vlay->addSpacing( KDialog::spacingHint() );
 
-  mPop.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
+  mPop.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
     i18n("Encryption"), page2 );
   mPop.encryptionNone =
     new TQRadioButton( i18n("&None"), mPop.encryptionGroup );
@@ -792,7 +792,7 @@ void AccountDialog::makePopAccountPage()
     TQT_SLOT(slotPopEncryptionChanged(int)));
   vlay->addWidget( mPop.encryptionGroup );
 
-  mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
+  mPop.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
     i18n("Authentication Method"), page2 );
   mPop.authUser = new TQRadioButton( i18n("Clear te&xt") , mPop.authGroup,
                                     "auth clear text" );
@@ -891,7 +891,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   label = new TQLabel( i18n("&Port:"), page1 );
   grid->addWidget( label, row, 0 );
   mImap.portEdit = new KLineEdit( page1 );
-  mImap.portEdit->setValidator( new TQIntValidator(this) );
+  mImap.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
   label->setBuddy( mImap.portEdit );
   grid->addWidget( mImap.portEdit, row, 1 );
 
@@ -1093,7 +1093,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
 
   vlay->addSpacing( KDialog::spacingHint() );
 
-  mImap.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
+  mImap.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
     i18n("Encryption"), page2 );
   mImap.encryptionNone =
     new TQRadioButton( i18n("&None"), mImap.encryptionGroup );
@@ -1107,7 +1107,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
     TQT_SLOT(slotImapEncryptionChanged(int)));
   vlay->addWidget( mImap.encryptionGroup );
 
-  mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
+  mImap.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
     i18n("Authentication Method"), page2 );
   mImap.authUser = new TQRadioButton( i18n("Clear te&xt"), mImap.authGroup );
   mImap.authLogin = new TQRadioButton( i18n("Please translate this "
@@ -1191,7 +1191,7 @@ void AccountDialog::setupSettings()
     mPop.loginEdit->setText( ap.login() );
     mPop.passwordEdit->setText( ap.passwd());
     mPop.hostEdit->setText( ap.host() );
-    mPop.portEdit->setText( TQString("%1").arg( ap.port() ) );
+    mPop.portEdit->setText( TQString("%1").tqarg( ap.port() ) );
     mPop.usePipeliningCheck->setChecked( ap.usePipelining() );
     mPop.storePasswordCheck->setChecked( ap.storePasswd() );
     mPop.leaveOnServerCheck->setChecked( ap.leaveOnServer() );
@@ -1256,7 +1256,7 @@ void AccountDialog::setupSettings()
     mImap.loginEdit->setText( ai.login() );
     mImap.passwordEdit->setText( ai.passwd());
     mImap.hostEdit->setText( ai.host() );
-    mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
+    mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) );
     mImap.autoExpungeCheck->setChecked( ai.autoExpunge() );
     mImap.hiddenFoldersCheck->setChecked( ai.hiddenFolders() );
     mImap.subscribedFoldersCheck->setChecked( ai.onlySubscribedFolders() );
@@ -1309,7 +1309,7 @@ void AccountDialog::setupSettings()
     mImap.loginEdit->setText( ai.login() );
     mImap.passwordEdit->setText( ai.passwd());
     mImap.hostEdit->setText( ai.host() );
-    mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
+    mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) );
 #if 0
     mImap.resourceCheck->setChecked( ai.resource() );
 #endif
@@ -2293,7 +2293,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent,
   } else {
     ns = i18n("Shared");
   }
-  setCaption( i18n("Edit Namespace '%1'").arg(ns) );
+  setCaption( i18n("Edit Namespace '%1'").tqarg(ns) );
   TQGrid* grid = new TQGrid( 2, page );
 
   mBg = new TQButtonGroup( 0 );
-- 
cgit v1.2.1