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

This reverts commit b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.

1 files changed, 21 insertions, 21 deletions

diff --git a/src/prefMPEG4.cpp b/src/prefMPEG4.cpp
index 2a5e367..6b4c858 100644
--- a/src/prefMPEG4.cpp
+++ b/src/prefMPEG4.cpp
@@ -19,7 +19,7 @@
 #include <tqspinbox.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqimage.h>
@@ -124,7 +124,7 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
     tabVideoLayout->addWidget( textLabel1_4, 0, 0 );
 
     cbMp4Codec = new TQComboBox( FALSE, tabVideo, "cbMp4Codec" );
-    cbMp4Codec->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4Codec->sizePolicy().hasHeightForWidth() ) );
+    cbMp4Codec->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4Codec->sizePolicy().hasHeightForWidth() ) );
 
     tabVideoLayout->addMultiCellWidget( cbMp4Codec, 0, 0, 1, 2 );
 
@@ -137,16 +137,16 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
     tabVideoLayout->addWidget( textLabel3_2_2, 2, 0 );
 
     leMp4Width = new TQLineEdit( tabVideo, "leMp4Width" );
-    leMp4Width->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, leMp4Width->sizePolicy().hasHeightForWidth() ) );
+    leMp4Width->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, leMp4Width->sizePolicy().hasHeightForWidth() ) );
     leMp4Width->setMinimumSize( TQSize( 0, 0 ) );
     leMp4Width->setMaximumSize( TQSize( 70, 32767 ) );
     leMp4Width->setMaxLength( 4 );
-    leMp4Width->setAlignment( int( TQLineEdit::AlignAuto ) );
+    leMp4Width->tqsetAlignment( int( TQLineEdit::AlignAuto ) );
 
     tabVideoLayout->addWidget( leMp4Width, 1, 1 );
 
     ckMp4AspectRatio = new TQCheckBox( tabVideo, "ckMp4AspectRatio" );
-    ckMp4AspectRatio->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, ckMp4AspectRatio->sizePolicy().hasHeightForWidth() ) );
+    ckMp4AspectRatio->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, ckMp4AspectRatio->sizePolicy().hasHeightForWidth() ) );
     ckMp4AspectRatio->setChecked( TRUE );
 
     tabVideoLayout->addMultiCellWidget( ckMp4AspectRatio, 1, 1, 3, 6 );
@@ -155,42 +155,42 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
 
     leMp4Height = new TQLineEdit( tabVideo, "leMp4Height" );
     leMp4Height->setEnabled( FALSE );
-    leMp4Height->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4Height->sizePolicy().hasHeightForWidth() ) );
+    leMp4Height->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4Height->sizePolicy().hasHeightForWidth() ) );
     leMp4Height->setMinimumSize( TQSize( 0, 0 ) );
     leMp4Height->setMaximumSize( TQSize( 70, 32767 ) );
     leMp4Height->setMaxLength( 4 );
-    leMp4Height->setAlignment( int( TQLineEdit::AlignAuto ) );
+    leMp4Height->tqsetAlignment( int( TQLineEdit::AlignAuto ) );
 
     tabVideoLayout->addWidget( leMp4Height, 2, 1 );
     spacer8 = new TQSpacerItem( 21, 110, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     tabVideoLayout->addItem( spacer8, 4, 5 );
 
     sbMp4NumberCD = new TQSpinBox( tabVideo, "sbMp4NumberCD" );
-    sbMp4NumberCD->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4NumberCD->sizePolicy().hasHeightForWidth() ) );
+    sbMp4NumberCD->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4NumberCD->sizePolicy().hasHeightForWidth() ) );
     sbMp4NumberCD->setMaxValue( 9 );
     sbMp4NumberCD->setMinValue( 1 );
 
     tabVideoLayout->addWidget( sbMp4NumberCD, 3, 5 );
 
     textLabel1 = new TQLabel( tabVideo, "textLabel1" );
-    textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+    textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
 
     tabVideoLayout->addWidget( textLabel1, 3, 4 );
 
     buttonGroup1 = new TQButtonGroup( tabVideo, "buttonGroup1" );
     buttonGroup1->setFrameShape( TQButtonGroup::NoFrame );
     buttonGroup1->setColumnLayout(0, Qt::Vertical );
-    buttonGroup1->layout()->setSpacing( 6 );
-    buttonGroup1->layout()->setMargin( 2 );
-    buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() );
-    buttonGroup1Layout->setAlignment( TQt::AlignTop );
+    buttonGroup1->tqlayout()->setSpacing( 6 );
+    buttonGroup1->tqlayout()->setMargin( 2 );
+    buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() );
+    buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
 
     rbSize = new TQRadioButton( buttonGroup1, "rbSize" );
 
     buttonGroup1Layout->addWidget( rbSize, 0, 0 );
 
     sbMp4Size = new TQSpinBox( buttonGroup1, "sbMp4Size" );
-    sbMp4Size->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4Size->sizePolicy().hasHeightForWidth() ) );
+    sbMp4Size->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4Size->sizePolicy().hasHeightForWidth() ) );
     sbMp4Size->setMinimumSize( TQSize( 80, 0 ) );
     sbMp4Size->setButtonSymbols( TQSpinBox::UpDownArrows );
     sbMp4Size->setMaxValue( 9999 );
@@ -207,14 +207,14 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
     buttonGroup1Layout->addMultiCell( spacer6, 0, 1, 2, 2 );
 
     leMp4VideoBitrate = new TQLineEdit( buttonGroup1, "leMp4VideoBitrate" );
-    leMp4VideoBitrate->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, leMp4VideoBitrate->sizePolicy().hasHeightForWidth() ) );
+    leMp4VideoBitrate->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, leMp4VideoBitrate->sizePolicy().hasHeightForWidth() ) );
 
     buttonGroup1Layout->addWidget( leMp4VideoBitrate, 1, 1 );
 
     tabVideoLayout->addMultiCellWidget( buttonGroup1, 3, 3, 0, 3 );
     spacer3 = new TQSpacerItem( 130, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     tabVideoLayout->addItem( spacer3, 3, 6 );
-    tabWidget->insertTab( tabVideo, TQString::fromLatin1("") );
+    tabWidget->insertTab( tabVideo, TQString::tqfromLatin1("") );
 
     tabAudio = new TQWidget( tabWidget, "tabAudio" );
     tabAudioLayout = new TQGridLayout( tabAudio, 1, 1, 11, 6, "tabAudioLayout"); 
@@ -224,7 +224,7 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
     tabAudioLayout->addWidget( textLabel1_4_2, 0, 0 );
 
     cbMp4AudioCodec = new TQComboBox( FALSE, tabAudio, "cbMp4AudioCodec" );
-    cbMp4AudioCodec->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4AudioCodec->sizePolicy().hasHeightForWidth() ) );
+    cbMp4AudioCodec->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4AudioCodec->sizePolicy().hasHeightForWidth() ) );
 
     tabAudioLayout->addMultiCellWidget( cbMp4AudioCodec, 0, 0, 1, 2 );
 
@@ -233,11 +233,11 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
     tabAudioLayout->addWidget( textLabel1_5, 1, 0 );
 
     leMp4AudioBitrate = new TQLineEdit( tabAudio, "leMp4AudioBitrate" );
-    leMp4AudioBitrate->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4AudioBitrate->sizePolicy().hasHeightForWidth() ) );
+    leMp4AudioBitrate->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4AudioBitrate->sizePolicy().hasHeightForWidth() ) );
     leMp4AudioBitrate->setMinimumSize( TQSize( 0, 0 ) );
     leMp4AudioBitrate->setMaximumSize( TQSize( 70, 32767 ) );
     leMp4AudioBitrate->setMaxLength( 3 );
-    leMp4AudioBitrate->setAlignment( int( TQLineEdit::AlignAuto ) );
+    leMp4AudioBitrate->tqsetAlignment( int( TQLineEdit::AlignAuto ) );
 
     tabAudioLayout->addWidget( leMp4AudioBitrate, 1, 1 );
     spacer4 = new TQSpacerItem( 376, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -254,7 +254,7 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
     tabAudioLayout->addWidget( textLabel1_2, 2, 0 );
     spacer14 = new TQSpacerItem( 20, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     tabAudioLayout->addItem( spacer14, 3, 3 );
-    tabWidget->insertTab( tabAudio, TQString::fromLatin1("") );
+    tabWidget->insertTab( tabAudio, TQString::tqfromLatin1("") );
 
     prefMPEG4Layout->addWidget( tabWidget, 1, 0 );
 
@@ -262,7 +262,7 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
 
     prefMPEG4Layout->addWidget( ckUseCache, 2, 0 );
     languageChange();
-    resize( TQSize(582, 460).expandedTo(minimumSizeHint()) );
+    resize( TQSize(582, 460).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
 
     // signals and slots connections