1 files changed, 12 insertions, 12 deletions
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 3d335e845..6f99bbcde 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqframe.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqtabwidget.h>
@@ -56,12 +56,12 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   // General page
   TQWidget *generalPage = new TQWidget( this );
-  TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
   TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
-  TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() );
-  boxLayout->setAlignment( TQt::AlignTop );
+  TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
@@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
   editorLayout->addStretch( 1 );
 
 
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
-  TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2,
+  TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
                                        KDialog::spacingHint() );
   label = new TQLabel( i18n( "Phone:" ), groupBox );
   grid->addWidget( label, 0, 0 );
@@ -124,14 +124,14 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   grid->setColStretch( 1, 1 );
 
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
-  boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() );
-  boxLayout->setAlignment( TQt::AlignTop );
+  boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   mLocationMapURL = new TQComboBox( true, groupBox );
-  mLocationMapURL->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   TQToolTip::add( mLocationMapURL, i18n( "<ul> <li>%s: Street</li>"
                                  "<li>%r: Region</li>"
                                  "<li>%l: Location</li>"
@@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
                                  "<li>%c: Country ISO Code</li> </ul>" ) );
   mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() );
   boxLayout->addWidget( mLocationMapURL );
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
   connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
@@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings()
   mFaxHook->setText( KABPrefs::instance()->faxHookApplication() );
   mAddresseeWidget->restoreSettings();
   mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() );
-  mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) );
+  mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ) );
   mLocationMapURL->lineEdit()->setCursorPosition( 0 );
 
   KConfig config( "kabcrc", false, false );