1 files changed, 18 insertions, 18 deletions

diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 83f27874..97b01d08 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -86,8 +86,8 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
   layout->setSpacing( KDialog::spacingHint() );
 
   mTypeCombo = new AddressTypeCombo( mAddressList, this );
-  connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( updateAddressEdit() ) );
+  connect( mTypeCombo, TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( updateAddressEdit() ) );
   layout->addWidget( mTypeCombo );
 
   mAddressField = new KActiveLabel( this );
@@ -98,7 +98,7 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
   layout->addWidget( mAddressField );
 
   mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
-  connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) );
 
   layout->addWidget( mEditButton );
 }
@@ -281,7 +281,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
   label->setBuddy( mStreetTextEdit );
   topLayout->addWidget( mStreetTextEdit, 1, 1 );
 
-  TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
+  TabPressEater *eater = new TabPressEater( this );
   mStreetTextEdit->installEventFilter( eater );
 
   label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page );
@@ -317,7 +317,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
 #if KDE_IS_VERSION(3,3,0)
   TQPushButton *labelButton = new TQPushButton( i18n( "Edit Label..." ), page );
   topLayout->addMultiCellWidget( labelButton, 7, 7, 0, 1 );
-  connect( labelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editLabel() ) );
+  connect( labelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editLabel() ) );
 #endif
 
   fillCountryCombo();
@@ -335,28 +335,28 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
   topLayout->addMultiCellWidget( buttonBox, 10, 10, 0, 1 );
 
   TQPushButton *addButton = new TQPushButton( i18n( "New..." ), buttonBox );
-  connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addAddress() ) );
+  connect( addButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addAddress() ) );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), buttonBox );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeAddress() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeAddress() ) );
 
   mChangeTypeButton = new TQPushButton( i18n( "Change Type..." ), buttonBox );
-  connect( mChangeTypeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeType() ) );
+  connect( mChangeTypeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeType() ) );
 
   mTypeCombo->updateTypes();
   mTypeCombo->setCurrentItem( selected );
 
   updateAddressEdits();
 
-  connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( updateAddressEdits() ) );
-  connect( mStreetTextEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( modified() ) );
-  connect( mPOBoxEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mLocalityEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mRegionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mPostalCodeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mCountryCombo, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
-  connect( mPreferredCheckBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
+  connect( mTypeCombo, TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( updateAddressEdits() ) );
+  connect( mStreetTextEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( modified() ) );
+  connect( mPOBoxEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mLocalityEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mRegionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mPostalCodeEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mCountryCombo, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) );
+  connect( mPreferredCheckBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
 
   TDEAcceleratorManager::manage( this );
 
@@ -606,7 +606,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
   TQWidget *page = plainPage();
   TQVBoxLayout *layout = new TQVBoxLayout( page );
 
-  mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
+  mGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "street/postal", "Address Types" ), page );
   layout->addWidget( mGroup );
 
   mTypeList = TDEABC::Address::typeList();