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

This reverts commit b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.

1 files changed, 15 insertions, 15 deletions

diff --git a/libk9copy/dvdprogress.cpp b/libk9copy/dvdprogress.cpp
index 691ccfc..c48b96b 100644
--- a/libk9copy/dvdprogress.cpp
+++ b/libk9copy/dvdprogress.cpp
@@ -13,7 +13,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqprogressbar.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -29,31 +29,31 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags
 {
     if ( !name )
 	setName( "DVDProgress" );
-    setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
+    tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
     setMinimumSize( TQSize( 0, 150 ) );
     setMaximumSize( TQSize( 400, 150 ) );
     setCursor( TQCursor( 3 ) );
     DVDProgressLayout = new TQGridLayout( this, 1, 1, 11, 6, "DVDProgressLayout"); 
 
-    layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); 
+    tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); 
 
     lblTotal = new TQLabel( this, "lblTotal" );
     lblTotal->setCursor( TQCursor( 3 ) );
-    layout2->addWidget( lblTotal );
+    tqlayout2->addWidget( lblTotal );
 
     pbTotal = new TQProgressBar( this, "pbTotal" );
     pbTotal->setCursor( TQCursor( 3 ) );
     pbTotal->setProgress( 100 );
     pbTotal->setPercentageVisible( FALSE );
-    layout2->addWidget( pbTotal );
+    tqlayout2->addWidget( pbTotal );
 
-    DVDProgressLayout->addLayout( layout2, 1, 0 );
+    DVDProgressLayout->addLayout( tqlayout2, 1, 0 );
 
-    layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); 
+    tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1"); 
 
     lblTitle = new TQLabel( this, "lblTitle" );
     lblTitle->setCursor( TQCursor( 3 ) );
-    layout1->addWidget( lblTitle );
+    tqlayout1->addWidget( lblTitle );
 
     pbTitle = new TQProgressBar( this, "pbTitle" );
     pbTitle->setCursor( TQCursor( 3 ) );
@@ -61,16 +61,16 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags
     pbTitle->setProgress( 100 );
     pbTitle->setCenterIndicator( TRUE );
     pbTitle->setPercentageVisible( FALSE );
-    layout1->addWidget( pbTitle );
+    tqlayout1->addWidget( pbTitle );
 
-    DVDProgressLayout->addLayout( layout1, 0, 0 );
+    DVDProgressLayout->addLayout( tqlayout1, 0, 0 );
 
-    lblStatus = new TQLabel( this, "lblStatus" );
-    lblStatus->setCursor( TQCursor( 3 ) );
+    lbltqStatus = new TQLabel( this, "lblStatus" );
+    lbltqStatus->setCursor( TQCursor( 3 ) );
 
-    DVDProgressLayout->addWidget( lblStatus, 2, 0 );
+    DVDProgressLayout->addWidget( lbltqStatus, 2, 0 );
     languageChange();
-    resize( TQSize(278, 150).expandedTo(minimumSizeHint()) );
+    resize( TQSize(278, 150).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
@@ -91,7 +91,7 @@ void DVDProgress::languageChange()
     setCaption( tr2i18n( "k9Copy - DVD Analyze" ) );
     lblTotal->setText( TQString() );
     lblTitle->setText( TQString() );
-    lblStatus->setText( TQString() );
+    lbltqStatus->setText( TQString() );
 }
 
 #include "dvdprogress.moc"