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

This reverts commit b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.

1 files changed, 20 insertions, 20 deletions

diff --git a/k9Mplayer/mplayer.cpp b/k9Mplayer/mplayer.cpp
index 11a1fd7..cd033e2 100644
--- a/k9Mplayer/mplayer.cpp
+++ b/k9Mplayer/mplayer.cpp
@@ -16,7 +16,7 @@
 #include <kpushbutton.h>
 #include <tqslider.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqimage.h>
@@ -489,79 +489,79 @@ MPlayer::MPlayer( TQWidget* parent, const char* name, WFlags fl )
 
     MPlayerLayout->addWidget( bSwitchAudio, 0, 2 );
 
-    layout6 = new TQHBoxLayout( 0, 0, 6, "layout6"); 
+    tqlayout6 = new TQHBoxLayout( 0, 0, 6, "tqlayout6"); 
 
     bStop = new KPushButton( this, "bStop" );
-    bStop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) );
+    bStop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) );
     bStop->setMinimumSize( TQSize( 30, 30 ) );
     bStop->setPixmap( image1 );
     bStop->setFlat( TRUE );
-    layout6->addWidget( bStop );
+    tqlayout6->addWidget( bStop );
 
     bPlay = new KPushButton( this, "bPlay" );
-    bPlay->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) );
+    bPlay->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) );
     bPlay->setMinimumSize( TQSize( 30, 30 ) );
     bPlay->setPixmap( image2 );
     bPlay->setFlat( TRUE );
-    layout6->addWidget( bPlay );
+    tqlayout6->addWidget( bPlay );
 
     slider = new TQSlider( this, "slider" );
     slider->setOrientation( Qt::Horizontal );
-    layout6->addWidget( slider );
+    tqlayout6->addWidget( slider );
 
-    layout5 = new TQHBoxLayout( 0, 0, 6, "layout5"); 
+    tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5"); 
 
     bDown = new KPushButton( this, "bDown" );
-    bDown->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bDown->sizePolicy().hasHeightForWidth() ) );
+    bDown->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bDown->sizePolicy().hasHeightForWidth() ) );
     bDown->setMinimumSize( TQSize( 22, 22 ) );
     bDown->setMaximumSize( TQSize( 22, 22 ) );
     TQFont bDown_font(  bDown->font() );
     bDown_font.setBold( TRUE );
     bDown->setFont( bDown_font ); 
     bDown->setFlat( TRUE );
-    layout5->addWidget( bDown );
+    tqlayout5->addWidget( bDown );
 
     pixmapLabel1 = new TQLabel( this, "pixmapLabel1" );
     pixmapLabel1->setMaximumSize( TQSize( 22, 22 ) );
     pixmapLabel1->setPixmap( image3 );
     pixmapLabel1->setScaledContents( TRUE );
-    layout5->addWidget( pixmapLabel1 );
+    tqlayout5->addWidget( pixmapLabel1 );
 
     bUp = new KPushButton( this, "bUp" );
-    bUp->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bUp->sizePolicy().hasHeightForWidth() ) );
+    bUp->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bUp->sizePolicy().hasHeightForWidth() ) );
     bUp->setMinimumSize( TQSize( 22, 22 ) );
     bUp->setMaximumSize( TQSize( 22, 22 ) );
     TQFont bUp_font(  bUp->font() );
     bUp_font.setBold( TRUE );
     bUp->setFont( bUp_font ); 
     bUp->setFlat( TRUE );
-    layout5->addWidget( bUp );
-    layout6->addLayout( layout5 );
+    tqlayout5->addWidget( bUp );
+    tqlayout6->addLayout( tqlayout5 );
 
-    MPlayerLayout->addMultiCellLayout( layout6, 4, 4, 0, 5 );
+    MPlayerLayout->addMultiCellLayout( tqlayout6, 4, 4, 0, 5 );
 
     frame4 = new TQFrame( this, "frame4" );
-    frame4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) );
+    frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) );
     frame4->setFrameShape( TQFrame::HLine );
     frame4->setFrameShadow( TQFrame::Raised );
 
     MPlayerLayout->addMultiCellWidget( frame4, 1, 1, 0, 5 );
 
     Label = new TQLabel( this, "Label" );
-    Label->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, Label->sizePolicy().hasHeightForWidth() ) );
+    Label->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, Label->sizePolicy().hasHeightForWidth() ) );
     Label->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) );
-    Label->setAlignment( int( TQLabel::AlignCenter ) );
+    Label->tqsetAlignment( int( TQLabel::AlignCenter ) );
 
     MPlayerLayout->addMultiCellWidget( Label, 2, 2, 0, 5 );
 
     frame3 = new TQFrame( this, "frame3" );
-    frame3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) );
+    frame3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) );
     frame3->setFrameShape( TQFrame::HLine );
     frame3->setFrameShadow( TQFrame::Raised );
 
     MPlayerLayout->addMultiCellWidget( frame3, 3, 3, 0, 5 );
     languageChange();
-    resize( TQSize(559, 458).expandedTo(minimumSizeHint()) );
+    resize( TQSize(559, 458).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
 
     // signals and slots connections