Rename a number of old tq methods that are no longer tq specific

1 files changed, 15 insertions, 15 deletions

diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 5c573314..16853ea2 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -24,7 +24,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
@@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected()
 PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 );
+  TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 );
 
   mTypeCombo = new PhoneTypeCombo( this );
   mNumberEdit = new KLineEdit( this );
 
-  tqlayout->addWidget( mTypeCombo );
-  tqlayout->addWidget( mNumberEdit );
+  layout->addWidget( mTypeCombo );
+  layout->addWidget( mNumberEdit );
 
   connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
   connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) );
@@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly )
 PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name ), mReadOnly( false )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 );
-  tqlayout->setSpacing( KDialog::spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( this, 2, 2 );
+  layout->setSpacing( KDialog::spacingHint() );
 
-  mWidgetLayout = new TQVBoxLayout( tqlayout );
-  tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
+  mWidgetLayout = new TQVBoxLayout( layout );
+  layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add" ), this );
-  mAddButton->setMaximumSize( mAddButton->tqsizeHint() );
-  tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight );
+  mAddButton->setMaximumSize( mAddButton->sizeHint() );
+  layout->addWidget( mAddButton, 1, 0, TQt::AlignRight );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
-  mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() );
-  tqlayout->addWidget( mRemoveButton, 1, 1 );
+  mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() );
+  layout->addWidget( mRemoveButton, 1, 1 );
 
   mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
   connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
@@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
 {
   TQWidget *page = plainPage();
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() );
 
   mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page );
-  tqlayout->addWidget( mPreferredBox );
+  layout->addWidget( mPreferredBox );
 
   mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
-  tqlayout->addWidget( mGroup );
+  layout->addWidget( mGroup );
 
   // fill widgets
   mTypeList = KABC::PhoneNumber::typeList();