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

This reverts commit b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.

3 files changed, 41 insertions, 41 deletions

diff --git a/k9Mplayer/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp
index 2eacf0e..24bc9a9 100644
--- a/k9Mplayer/k9mplayer.cpp
+++ b/k9Mplayer/k9mplayer.cpp
@@ -1,7 +1,7 @@
 
 #include "k9common.h"
 #include "k9config.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <kselect.h>
 #include "k9mplayer.h"
@@ -92,9 +92,9 @@ void K9Mplayer::setTitle( const TQString & _numTitle,const TQString &_numChapter
     if (_numChapter !="")
         *m_process << "-chapter" << _numChapter;
 
-    *m_process << TQString("dvd://%1").arg(_numTitle);
+    *m_process << TQString("dvd://%1").tqarg(_numTitle);
     if (!m_process->start( KProcess::NotifyOnExit,KProcess::All)) {
-         KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").arg("mplayer") , i18n("Preview"));
+         KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").tqarg("mplayer") , i18n("Preview"));
     }
     m_canwrite=TRUE;
 
@@ -108,7 +108,7 @@ void K9Mplayer::setTitle( const TQString & _numTitle,const TQString &_numChapter
 /*$SPECIALIZATION$*/
 
 void  K9Mplayer::receivedStdout (KProcess *proc, char *buffer, int buflen) {
-    TQString buf = TQString::fromLatin1(buffer, buflen);
+    TQString buf = TQString::tqfromLatin1(buffer, buflen);
     sscanf(buf.latin1(),"ANS_PERCENT_POSITION=%d",&m_position);
     if (!m_seeking && m_position>0) {
         slider->setValue(m_position);
@@ -134,7 +134,7 @@ void K9Mplayer::slotNewPosition(int _pos,const TQTime & _time) {
 }
 
 void K9Mplayer::sliderReleased() {
-    sendCmd( TQString("seek %1 1").arg((int)slider->value()));
+    sendCmd( TQString("seek %1 1").tqarg((int)slider->value()));
     m_seeking=FALSE;
 }
 
@@ -175,12 +175,12 @@ void K9Mplayer::open( k9DVD *_dvd,k9DVDTitle *_title,int chapter) {
     cbAudio->clear();
     for (int i=0; i< _title->getaudioStreamCount();i++) {
         k9DVDAudioStream *aud=_title->getaudioStream(i);
-        cbAudio->insertItem(NULL,TQString("%1-%2").arg(aud->getID()).arg(aud->getlanguage()),-1);
+        cbAudio->insertItem(NULL,TQString("%1-%2").tqarg(aud->getID()).tqarg(aud->getlanguage()),-1);
     }
 
     for (int i=0; i< _title->getsubPictureCount();i++) {
         k9DVDSubtitle *sub=_title->getsubtitle(i);
-        cbSub->insertItem(NULL,TQString("%1-%2").arg(sub->getID().first()).arg(sub->getlanguage()),-1);
+        cbSub->insertItem(NULL,TQString("%1-%2").tqarg(sub->getID().first()).tqarg(sub->getlanguage()),-1);
     }
 
     if(_title->getaspectRatio()=="16:9")
@@ -207,12 +207,12 @@ void K9Mplayer::titleChanged() {}
 void K9Mplayer::cbAudioActivated( int _value) {
     if (m_dvdTitle) {
        int value=m_dvdTitle->getaudioStream( _value)->getStreamId();
-       sendCmd(TQString( "switch_audio %1").arg(value));
+       sendCmd(TQString( "switch_audio %1").tqarg(value));
     }
 }
 
 void K9Mplayer::cbSubActivated( int _value) {
-    sendCmd(TQString("sub_select %1").arg(_value));
+    sendCmd(TQString("sub_select %1").tqarg(_value));
 
 }
 
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
diff --git a/k9Mplayer/mplayer.ui b/k9Mplayer/mplayer.ui
index 87f779c..c0c6854 100644
--- a/k9Mplayer/mplayer.ui
+++ b/k9Mplayer/mplayer.ui
@@ -54,7 +54,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>190</width>
                     <height>20</height>
@@ -78,7 +78,7 @@
             <property name="name">
                 <cstring>bSwitchAudio</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>22</width>
                     <height>22</height>
@@ -93,7 +93,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="6">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -111,7 +111,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>30</width>
                             <height>30</height>
@@ -139,7 +139,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>30</width>
                             <height>30</height>
@@ -168,7 +168,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -186,13 +186,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>22</width>
                                     <height>22</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>22</width>
                                     <height>22</height>
@@ -217,7 +217,7 @@
                             <property name="name">
                                 <cstring>pixmapLabel1</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>22</width>
                                     <height>22</height>
@@ -242,13 +242,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>22</width>
                                     <height>22</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>22</width>
                                     <height>22</height>
@@ -314,7 +314,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>