1 files changed, 10 insertions, 10 deletions
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 1c074d397..a7d9ebe6f 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
                                 TQWidget *parent, const char *name )
   : TQWidget( parent, name ), mTitle( title ), mLabel( label )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 
   TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
-  TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2,
+  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                               KDialog::spacingHint() );
 
   mBox = new TQListBox( group );
@@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
   mEditButton->setEnabled( false );
   mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  TQT_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
-  bbox->layout();
+  bbox->tqlayout();
   groupLayout->addWidget( bbox, 0, 1 );
 
-  layout->addWidget( group );
+  tqlayout->addWidget( group );
 }
 
 NamePartWidget::~NamePartWidget()
@@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item )
 AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this );
-  layout->addWidget( mPrefix, 0, 0 );
+  tqlayout->addWidget( mPrefix, 0, 0 );
 
   mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this );
-  layout->addWidget( mInclusion, 0, 1 );
+  tqlayout->addWidget( mInclusion, 0, 1 );
 
   mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this );
-  layout->addWidget( mSuffix, 0, 2 );
+  tqlayout->addWidget( mSuffix, 0, 2 );
 
   TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mFormattedNameCombo = new KComboBox( this );
   mFormattedNameCombo->insertItem( i18n( "Empty" ) );
@@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
   mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
-  layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
 
   connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
   connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );