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
---
 kaddressbook/addresseeeditorwidget.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kaddressbook/addresseeeditorwidget.cpp')

diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 097f513b5..1ea2e77f8 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -181,7 +181,7 @@ void AddresseeEditorWidget::setupTab1()
   tqlayout->addWidget( button, 0, 1 );
   tqlayout->addWidget( mNameEdit, 0, 2 );
   tqlayout->addWidget( mNameLabel, 0, 2 );
-  label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
+  label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).tqarg( KABC::Addressee::roleLabel() ), tab1 );
   mRoleEdit = new KLineEdit( tab1 );
   connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
@@ -190,7 +190,7 @@ void AddresseeEditorWidget::setupTab1()
   tqlayout->addWidget( mRoleEdit, 1, 2 );
 
   // Organization
-  label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
+  label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).tqarg( KABC::Addressee::organizationLabel() ), tab1 );
   mOrgEdit = new KLineEdit( tab1 );
   label->setBuddy( mOrgEdit );
   connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -256,7 +256,7 @@ void AddresseeEditorWidget::setupTab1()
                                                      KIcon::SizeMedium ) );
   homePageLayout->addWidget( label );
 
-  label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
+  label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).tqarg( KABC::Addressee::urlLabel() ), tab1 );
   mURLEdit = new KLineEdit( tab1 );
   connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
@@ -369,7 +369,7 @@ void AddresseeEditorWidget::setupTab2()
   label->setBuddy( mAssistantEdit );
   tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
 
-  label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
+  label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).tqarg( KABC::Addressee::titleLabel() ), tab2 );
   tqlayout->addWidget( label, 2, 3 );
   mTitleEdit = new KLineEdit( tab2 );
   connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -486,7 +486,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
 
   const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true );
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
-    if ( activePages.tqfind( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() )
+    if ( activePages.tqfind( (*it).mid( (*it).tqfindRev('/') + 1 ) ) == activePages.end() )
       continue;
 
     ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );
@@ -558,7 +558,7 @@ void AddresseeEditorWidget::load()
   mBirthdayPicker->setDate( mAddressee.birthday().date() );
 
   TQString anniversaryStr = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
-  TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, TQt::ISODate ));
+  TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, Qt::ISODate ));
   mAnniversaryPicker->setDate( anniversary );
   mNicknameEdit->setText( mAddressee.nickName() );
   mCategoryEdit->setText( mAddressee.categories().join( "," ) );
@@ -652,7 +652,7 @@ void AddresseeEditorWidget::save()
 
   if ( mAnniversaryPicker->date().isValid() )
     mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary",
-                             mAnniversaryPicker->date().toString( TQt::ISODate ) );
+                             mAnniversaryPicker->date().toString( Qt::ISODate ) );
   else
     mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" );
 
-- 
cgit v1.2.1