1 files changed, 20 insertions, 20 deletions

diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 54571a238..1466e9900 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -25,7 +25,7 @@
 #include <tqdatetimeedit.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqvalidator.h>
 #include <tqspinbox.h>
@@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
 {
   TQWidget *page = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Title:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mTitle = new KLineEdit( page );
   mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) );
   label->setBuddy( mTitle );
-  layout->addWidget( mTitle, 0, 1 );
+  tqlayout->addWidget( mTitle, 0, 1 );
 
   label = new TQLabel( i18n( "Type:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mType = new KComboBox( page );
   label->setBuddy( mType );
-  layout->addWidget( mType, 1, 1 );
+  tqlayout->addWidget( mType, 1, 1 );
 
   mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page );
   mGlobal->setChecked( true );
-  layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
 
   connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
            this, TQT_SLOT( nameChanged( const TQString& ) ) );
@@ -124,19 +124,19 @@ void AddFieldDialog::nameChanged( const TQString &name )
 FieldWidget::FieldWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
-  mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  mGlobalLayout->setAlignment( TQt::AlignTop );
+  mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  mGlobalLayout->tqsetAlignment( TQt::AlignTop );
 
   mSeparator = new TQFrame( this );
   mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
   mSeparator->hide();
-  layout->addWidget( mSeparator );
+  tqlayout->addWidget( mSeparator );
 
-  mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  mLocalLayout->setAlignment( TQt::AlignTop );
+  mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  mLocalLayout->tqsetAlignment( TQt::AlignTop );
 }
 
 void FieldWidget::addField( const TQString &identifier, const TQString &title,
@@ -238,13 +238,13 @@ void FieldWidget::clearFields()
       wdg->setChecked( true );
     } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
       TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget );
-      wdg->setDate( TQDate::currentDate() );
+      wdg->setDate( TQDate::tqcurrentDate() );
     } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
       TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget );
       wdg->setTime( TQTime::currentTime() );
     } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
       TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget );
-      wdg->setDateTime( TQDateTime::currentDateTime() );
+      wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
     }
   }
 }
@@ -370,7 +370,7 @@ void FieldWidget::recalculateLayout()
 
   FieldRecordList::ConstIterator it;
   for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
-    maxWidth = TQMAX( maxWidth, (*it).mLabel->minimumSizeHint().width() );
+    maxWidth = TQMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() );
 
   for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
     (*it).mLabel->setMinimumWidth( maxWidth );
@@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField()
 
 void CustomFieldsWidget::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mFieldWidget = new FieldWidget( this );
-  layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
 
   mAddButton = new TQPushButton( i18n( "Add Field..." ), this );
-  layout->addWidget( mAddButton, 1, 1, TQt::AlignRight );
+  tqlayout->addWidget( mAddButton, 1, 1, TQt::AlignRight );
 
   mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this );
   mRemoveButton->setEnabled( false );
-  layout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight );
+  tqlayout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight );
 
   // load global fields
   TQStringList globalFields = KABPrefs::instance()->globalCustomFields();