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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 6 insertions, 6 deletions

diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index b148b756f..f0917eca7 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -39,7 +39,7 @@
 #include <tqeventloop.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
 
@@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                             KDialog::spacingHint() );
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
-  TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() );
 
   mImageButton = new ImageButton( i18n( "Picture" ), box );
   mImageButton->setFixedSize( 100, 140 );
   mImageButton->setImageLoader( mImageLoader );
-  layout->addWidget( mImageButton );
+  tqlayout->addWidget( mImageButton );
 
   topLayout->addWidget( box );
 
@@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const
 ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::ContactEditorWidget( ab, parent, name )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this );
-  layout->addWidget( mPhotoWidget );
+  tqlayout->addWidget( mPhotoWidget );
 
   mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this );
-  layout->addWidget( mLogoWidget );
+  tqlayout->addWidget( mLogoWidget );
 
   connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
   connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );