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

1 files changed, 8 insertions, 8 deletions

diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 4f6168446..60c1f2a6f 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -273,7 +273,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
   mTypeCombo = new AddressTypeCombo( mAddressList, page );
   topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
 
-  TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page );
+  TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page );
   label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft );
   topLayout->addWidget( label, 1, 0 );
   mStreetTextEdit = new TQTextEdit( page );
@@ -281,34 +281,34 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
   label->setBuddy( mStreetTextEdit );
   topLayout->addWidget( mStreetTextEdit, 1, 1 );
 
-  TabPressEater *eater = new TabPressEater( this );
+  TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
   mStreetTextEdit->installEventFilter( eater );
 
-  label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page );
+  label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( KABC::Address::postOfficeBoxLabel() ), page );
   topLayout->addWidget( label, 2 , 0 );
   mPOBoxEdit = new KLineEdit( page );
   label->setBuddy( mPOBoxEdit );
   topLayout->addWidget( mPOBoxEdit, 2, 1 );
 
-  label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page );
+  label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).tqarg( KABC::Address::localityLabel() ), page );
   topLayout->addWidget( label, 3, 0 );
   mLocalityEdit = new KLineEdit( page );
   label->setBuddy( mLocalityEdit );
   topLayout->addWidget( mLocalityEdit, 3, 1 );
 
-  label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page );
+  label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).tqarg( KABC::Address::regionLabel() ), page );
   topLayout->addWidget( label, 4, 0 );
   mRegionEdit = new KLineEdit( page );
   label->setBuddy( mRegionEdit );
   topLayout->addWidget( mRegionEdit, 4, 1 );
 
-  label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page );
+  label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).tqarg( KABC::Address::postalCodeLabel() ), page );
   topLayout->addWidget( label, 5, 0 );
   mPostalCodeEdit = new KLineEdit( page );
   label->setBuddy( mPostalCodeEdit );
   topLayout->addWidget( mPostalCodeEdit, 5, 1 );
 
-  label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page );
+  label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).tqarg( KABC::Address::countryLabel() ), page );
   topLayout->addWidget( label, 6, 0 );
   mCountryCombo = new KComboBox( page );
   mCountryCombo->setEditable( true );
@@ -606,7 +606,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent )
   TQWidget *page = plainPage();
   TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
 
-  mGroup = new TQButtonGroup( 2, Horizontal, i18n( "street/postal", "Address Types" ), page );
+  mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
   tqlayout->addWidget( mGroup );
 
   mTypeList = KABC::Address::typeList();