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

This reverts commit ff87b104ff73f32bd8963b412f7c6c7badb62843.

1 files changed, 11 insertions, 11 deletions

diff --git a/libkipi/libkipi/batchprogressdialog.cpp b/libkipi/libkipi/batchprogressdialog.cpp
index ec90a99..7ceca4f 100644
--- a/libkipi/libkipi/batchprogressdialog.cpp
+++ b/libkipi/libkipi/batchprogressdialog.cpp
@@ -24,7 +24,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 #include <tqwidget.h>
 #include <tqgroupbox.h>
@@ -106,25 +106,25 @@ public:
 private:
    int m_messagetype;
 
-   void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
+   void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
       {
       TQColorGroup _cg( cg );
 
       if ( m_messagetype == KIPI::ErrorMessage )
           {
           _cg.setColor( TQColorGroup::Text, TQt::red );
-          KListViewItem::paintCell( p, _cg, column, width, alignment );
+          KListViewItem::paintCell( p, _cg, column, width, tqalignment );
           return;
           }
 
       if ( m_messagetype == KIPI::WarningMessage )
           {
           _cg.setColor( TQColorGroup::Text, TQt::darkYellow );
-          KListViewItem::paintCell( p, _cg, column, width, alignment );
+          KListViewItem::paintCell( p, _cg, column, width, tqalignment );
           return;
           }
 
-      KListViewItem::paintCell( p, cg, column, width, alignment );
+      KListViewItem::paintCell( p, cg, column, width, tqalignment );
       }
 };
 
@@ -146,15 +146,15 @@ BatchProgressDialog::BatchProgressDialog( TQWidget *parent, const TQString &capt
 
     TQFrame *headerFrame = new TQFrame( box );
     headerFrame->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
-    TQHBoxLayout* layout = new TQHBoxLayout( headerFrame );
-    layout->setMargin( 2 ); // to make sure the frame gets displayed
-    layout->setSpacing( 0 );
+    TQHBoxLayout* tqlayout = new TQHBoxLayout( headerFrame );
+    tqlayout->setMargin( 2 ); // to make sure the frame gets displayed
+    tqlayout->setSpacing( 0 );
     TQLabel *pixmapLabelLeft = new TQLabel( headerFrame, "pixmapLabelLeft" );
     pixmapLabelLeft->setScaledContents( false );
-    layout->addWidget( pixmapLabelLeft );
+    tqlayout->addWidget( pixmapLabelLeft );
     TQLabel *labelTitle = new TQLabel( caption, headerFrame, "labelTitle" );
-    layout->addWidget( labelTitle );
-    layout->setStretchFactor( labelTitle, 1 );
+    tqlayout->addWidget( labelTitle );
+    tqlayout->setStretchFactor( labelTitle, 1 );
 
     TQString dir;
     KGlobal::dirs()->addResourceType("kipi_banner_left", KGlobal::dirs()->kde_default("data") + "kipi/data");