diff --git a/libkipi/libkipi/batchprogressdialog.cpp b/libkipi/libkipi/batchprogressdialog.cpp
index 1f33cb9..411149e 100644
--- a/libkipi/libkipi/batchprogressdialog.cpp
+++ b/libkipi/libkipi/batchprogressdialog.cpp
@@ -146,15 +146,15 @@ BatchProgressDialog::BatchProgressDialog( TQWidget *parent, const TQString &capt
 
     TQFrame *headerFrame = new TQFrame( box );
     headerFrame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
-    TQHBoxLayout* tqlayout = new TQHBoxLayout( headerFrame );
-    tqlayout->setMargin( 2 ); // to make sure the frame gets displayed
-    tqlayout->setSpacing( 0 );
+    TQHBoxLayout* layout = new TQHBoxLayout( headerFrame );
+    layout->setMargin( 2 ); // to make sure the frame gets displayed
+    layout->setSpacing( 0 );
     TQLabel *pixmapLabelLeft = new TQLabel( headerFrame, "pixmapLabelLeft" );
     pixmapLabelLeft->setScaledContents( false );
-    tqlayout->addWidget( pixmapLabelLeft );
+    layout->addWidget( pixmapLabelLeft );
     TQLabel *labelTitle = new TQLabel( caption, headerFrame, "labelTitle" );
-    tqlayout->addWidget( labelTitle );
-    tqlayout->setStretchFactor( labelTitle, 1 );
+    layout->addWidget( labelTitle );
+    layout->setStretchFactor( labelTitle, 1 );
 
     TQString dir;
     KGlobal::dirs()->addResourceType("kipi_banner_left", KGlobal::dirs()->kde_default("data") + "kipi/data");
diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp
index 422f8c8..75a6169 100644
--- a/libkipi/libkipi/imagecollectionselector.cpp
+++ b/libkipi/libkipi/imagecollectionselector.cpp
@@ -108,7 +108,7 @@ ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* in
     TQPushButton* selectAll=box->addButton(i18n("Select All"));
     TQPushButton* invertSelection=box->addButton(i18n("Invert Selection"));
     TQPushButton* selectNone=box->addButton(i18n("Select None"));
-    box->tqlayout();
+    box->layout();
 
     connect(selectAll, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(slotSelectAll()) );
diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp
index f462e80..9dc1c1c 100644
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@@ -101,15 +101,15 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
    
     TQFrame *headerFrame = new TQFrame( box );
     headerFrame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
-    TQHBoxLayout* tqlayout = new TQHBoxLayout( headerFrame );
-    tqlayout->setMargin( 2 ); // to make sure the frame gets displayed
-    tqlayout->setSpacing( 0 );
+    TQHBoxLayout* layout = new TQHBoxLayout( headerFrame );
+    layout->setMargin( 2 ); // to make sure the frame gets displayed
+    layout->setSpacing( 0 );
     TQLabel *pixmapLabelLeft = new TQLabel( headerFrame, "pixmapLabelLeft" );
     pixmapLabelLeft->setScaledContents( false );
-    tqlayout->addWidget( pixmapLabelLeft );
+    layout->addWidget( pixmapLabelLeft );
     TQLabel *labelTitle = new TQLabel( i18n("Select Image From Album"), headerFrame, "labelTitle" );
-    tqlayout->addWidget( labelTitle );
-    tqlayout->setStretchFactor( labelTitle, 1 );
+    layout->addWidget( labelTitle );
+    layout->setStretchFactor( labelTitle, 1 );
     dvlay->addWidget( headerFrame );
     
     TQString directory;
diff --git a/libkipi/libkipi/uploadwidget.cpp b/libkipi/libkipi/uploadwidget.cpp
index f680aef..27e01d2 100644
--- a/libkipi/libkipi/uploadwidget.cpp
+++ b/libkipi/libkipi/uploadwidget.cpp
@@ -66,10 +66,10 @@ KIPI::UploadWidget::UploadWidget( KIPI::Interface* interface, TQWidget* parent,
 {
     d = new Private;
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 0 );
     d->m_treeView = new KFileTreeView( this );
     d->m_treeView->setRootIsDecorated( true );
-    tqlayout->addWidget( d->m_treeView );
+    layout->addWidget( d->m_treeView );
 
     // Fetch the current album, so we can start out there.
     KIPI::ImageCollection album = interface->currentAlbum();