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

This reverts commit ef5831dd5c8811c94c9b1bc1377a90174d17c82c.

22 files changed, 181 insertions, 181 deletions

diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui
index 66d34ea..5a7a15b 100644
--- a/src/rip/base_k3baudiorippingoptionwidget.ui
+++ b/src/rip/base_k3baudiorippingoptionwidget.ui
@@ -83,7 +83,7 @@ which can be used with programs like xmms or noatun.
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -99,7 +99,7 @@ which can be used with programs like xmms or noatun.
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -148,7 +148,7 @@ file will contain all tracks one after the other.
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6_2</cstring>
+                        <cstring>tqlayout6_2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -164,7 +164,7 @@ file will contain all tracks one after the other.
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -231,7 +231,7 @@ file will contain all tracks one after the other.
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -250,7 +250,7 @@ file will contain all tracks one after the other.
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui
index 09d8062..feff67a 100644
--- a/src/rip/base_k3bcddbpatternwidget.ui
+++ b/src/rip/base_k3bcddbpatternwidget.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -107,7 +107,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -123,7 +123,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>31</width>
                             <height>2</height>
@@ -137,7 +137,7 @@
                     <property name="text">
                         <string>See special strings</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -148,7 +148,7 @@
                     <property name="text">
                         <string>About conditional inclusion</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 0652e01..807e462 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -46,7 +46,7 @@
 #include <kstandarddirs.h>
 #include <kdialogbase.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqframe.h>
@@ -67,7 +67,7 @@ public:
     : K3bCheckListViewItem( parent, after ) {
 
     setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) );
-    setText( 3, i18n("Track %1").arg(_trackNumber) );
+    setText( 3, i18n("Track %1").tqarg(_trackNumber) );
     setText( 4, " " + length.toString() + " " );
     setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " );
 
@@ -111,7 +111,7 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name )
   TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
   toolBoxLayout->addItem( spacer );
   m_labelLength = new TQLabel( mainWidget() );
-  m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+  m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
   toolBoxLayout->addWidget( m_labelLength );
 
 
@@ -335,7 +335,7 @@ void K3bAudioCdView::slotEditTrackCddb()
   if( !items.isEmpty() ) {
     AudioTrackViewItem* a = static_cast<AudioTrackViewItem*>(items.first());
 
-    KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").arg(a->trackNumber),
+    KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").tqarg(a->trackNumber),
 		   KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
     TQWidget* w = new TQWidget( &d );
 
@@ -359,7 +359,7 @@ void K3bAudioCdView::slotEditTrackCddb()
     grid->setRowStretch( 4, 1 );
 
     d.setMainWidget(w);
-    d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
+    d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() );
 
     if( d.exec() == TQDialog::Accepted ) {
       m_cddbInfo.titles[a->trackNumber-1] = editTitle->text();
@@ -415,7 +415,7 @@ void K3bAudioCdView::slotEditAlbumCddb()
   grid->setRowStretch( 7, 1 );
 
   d.setMainWidget(w);
-  d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
+  d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() );
 
   if( d.exec() == TQDialog::Accepted ) {
     m_cddbInfo.cdTitle = editTitle->text();
@@ -516,8 +516,8 @@ void K3bAudioCdView::slotSaveCddbLocally()
 
   m_cddb->saveEntry( m_cddbInfo );
   K3bPassivePopup::showPopup( i18n("Saved entry (%1) in category %2.")
-			      .arg(m_cddbInfo.discid)
-			      .arg(m_cddbInfo.category),
+			      .tqarg(m_cddbInfo.discid)
+			      .tqarg(m_cddbInfo.category),
 			      i18n("CDDB") );
 }
 
@@ -569,7 +569,7 @@ void K3bAudioCdView::updateDisplay()
 
   m_labelLength->setText( i18n("1 track (%1)", 
 			       "%n tracks (%1)", 
-			       m_toc.count()).arg(K3b::Msf(m_toc.length()).toString()) );
+			       m_toc.count()).tqarg(K3b::Msf(m_toc.length()).toString()) );
 }
 
 
@@ -584,7 +584,7 @@ void K3bAudioCdView::showBusyLabel( bool b )
     // the themed label is a cut label, thus its size hint is
     // based on the cut text, we force it to be full
     m_busyInfoLabel->resize( width(), height() );
-    m_busyInfoLabel->resize( m_busyInfoLabel->sizeHint() );
+    m_busyInfoLabel->resize( m_busyInfoLabel->tqsizeHint() );
     int x = (width() - m_busyInfoLabel->width())/2;
     int y = (height() - m_busyInfoLabel->height())/2;
     TQRect r( TQPoint( x, y ), m_busyInfoLabel->size() );
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index 4cff284..60200e3 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -45,7 +45,7 @@
 #include <tqheader.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 #include <tqstringlist.h>
 #include <tqtabwidget.h>
@@ -79,7 +79,7 @@ K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* d
 
   setTitle( i18n("Audio Project Conversion"), 
 	    i18n("1 track (%1)", "%n tracks (%1)", 
-		 m_doc->numOfTracks()).arg(m_doc->length().toString()) );
+		 m_doc->numOfTracks()).tqarg(m_doc->length().toString()) );
 
   refresh();
 }
diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp
index fded45d..d0051e5 100644
--- a/src/rip/k3baudioprojectconvertingthread.cpp
+++ b/src/rip/k3baudioprojectconvertingthread.cpp
@@ -110,7 +110,7 @@ void K3bAudioProjectConvertingThread::run()
 
     TQString dir = filename.left( filename.findRev("/") );
     if( !KStandardDirs::makeDir( dir ) ) {
-      emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
+      emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
       emitFinished(false);
       return;
     }
@@ -137,12 +137,12 @@ void K3bAudioProjectConvertingThread::run()
     }
 
     if( !isOpen ) {
-      emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
+      emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
       emitFinished(false);
       return;
     }
 
-    emitInfoMessage( i18n("Converting to single file '%1'.").arg(filename), K3bJob::INFO );
+    emitInfoMessage( i18n("Converting to single file '%1'.").tqarg(filename), K3bJob::INFO );
   }
 
   bool success = true;
@@ -155,7 +155,7 @@ void K3bAudioProjectConvertingThread::run()
       break;
     }
 
-    emitInfoMessage( i18n("Successfully converted track %1.").arg(i+1), K3bJob::INFO );
+    emitInfoMessage( i18n("Successfully converted track %1.").tqarg(i+1), K3bJob::INFO );
 
     track = track->next();
     ++i;
@@ -180,7 +180,7 @@ void K3bAudioProjectConvertingThread::run()
     if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
       if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
 	TQFile::remove( m_tracks[d->currentTrackIndex].second );
-	emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
+	emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
       }
     }
 
@@ -196,7 +196,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
 {
   TQString dir = filename.left( filename.findRev("/") );
   if( !KStandardDirs::makeDir( dir ) ) {
-    emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
+    emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
     return false;
   }
 
@@ -226,7 +226,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
     }
 
     if( !isOpen ) {
-      emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
+      emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
       return false;
     }
   }
@@ -235,11 +235,11 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
   if( !m_cddbEntry.artists[d->currentTrackIndex].isEmpty() &&
       !m_cddbEntry.titles[d->currentTrackIndex].isEmpty() )
     emitNewSubTask( i18n("Converting track %1 (%2 - %3)")
-		    .arg(d->currentTrackIndex+1)
-		    .arg(m_cddbEntry.artists[d->currentTrackIndex])
-		    .arg(m_cddbEntry.titles[d->currentTrackIndex]) );
+		    .tqarg(d->currentTrackIndex+1)
+		    .tqarg(m_cddbEntry.artists[d->currentTrackIndex])
+		    .tqarg(m_cddbEntry.titles[d->currentTrackIndex]) );
   else
-    emitNewSubTask( i18n("Converting track %1").arg(d->currentTrackIndex+1) );
+    emitNewSubTask( i18n("Converting track %1").tqarg(d->currentTrackIndex+1) );
 
 
   // do the conversion
@@ -265,7 +265,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
       if( d->encoder->encode( buffer, readLength ) < 0 ) {
 	kdDebug() << "(K3bAudioProjectConvertingThread) error while encoding." << endl;
 	emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
-	emitInfoMessage( i18n("Error while encoding track %1.").arg(d->currentTrackIndex+1), K3bJob::ERROR );
+	emitInfoMessage( i18n("Error while encoding track %1.").tqarg(d->currentTrackIndex+1), K3bJob::ERROR );
 	return false;
       }
     }
@@ -304,11 +304,11 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
   TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
 
   if( !KStandardDirs::makeDir( playlistDir ) ) {
-    emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
+    emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
     return false;
   }
 
-  emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
+  emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO );
 
   TQFile f( m_playlistFilename );
   if( f.open( IO_WriteOnly ) ) {
@@ -359,10 +359,10 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
       }
     }
 
-    return ( t.device()->status() == IO_Ok );
+    return ( t.tqdevice()->status() == IO_Ok );
   }
   else {
-    emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
+    emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR );
     kdDebug() << "(K3bAudioProjectConvertingThread) could not open file " << m_playlistFilename << " for writing." << endl;
     return false;
   }
@@ -409,7 +409,7 @@ bool K3bAudioProjectConvertingThread::writeCueFile()
   cueFile.truncate( cueFile.findRev(".") );
   cueFile += ".cue";
 
-  emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
+  emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
 
   return cueWriter.save( cueFile );
 }
@@ -444,7 +444,7 @@ TQString K3bAudioProjectConvertingThread::jobDescription() const
   if( m_cddbEntry.cdTitle.isEmpty() )
     return i18n("Converting Audio Tracks");
   else
-    return i18n("Converting Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
+    return i18n("Converting Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle);
 }
 
 TQString K3bAudioProjectConvertingThread::jobDetails() const 
@@ -452,7 +452,7 @@ TQString K3bAudioProjectConvertingThread::jobDetails() const
   if( d->encoder )
     return i18n("1 track (encoding to %1)", 
 		"%n tracks (encoding to %1)", 
-		m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
+		m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType));
   else
     return i18n("1 track", "%n tracks", m_doc->numOfTracks() );
 }
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 4b99dc8..d1088ca 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -48,7 +48,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -106,7 +106,7 @@ K3bAudioRippingDialog::K3bAudioRippingDialog(const K3bDevice::Toc& toc,
   }
   setTitle( i18n("CD Ripping"), 
 	    i18n("1 track (%1)", "%n tracks (%1)", 
-		 m_trackNumbers.count()).arg(length.toString()) );
+		 m_trackNumbers.count()).tqarg(length.toString()) );
 }
 
 
@@ -383,7 +383,7 @@ void K3bAudioRippingDialog::refresh()
 						   m_patternWidget->blankReplaceString() ) + "." + extension;
       }
       else {
-	filename = i18n("Track%1").arg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
+	filename = i18n("Track%1").tqarg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
       }
 
       filename = d->fsInfo.fixupPath( filename );
diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp
index c650755..9c410ad 100644
--- a/src/rip/k3baudioripthread.cpp
+++ b/src/rip/k3baudioripthread.cpp
@@ -150,7 +150,7 @@ void K3bAudioRipThread::run()
   d->toc = m_device->readToc();
 
   if( !d->paranoiaLib->initParanoia( m_device, d->toc ) ) {
-    emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()),
+    emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()),
 		     K3bJob::ERROR );
     m_device->block(false);
 
@@ -158,7 +158,7 @@ void K3bAudioRipThread::run()
     if( m_device->interfaceType() == K3bDevice::SCSI &&
 	!m_device->genericDevice().isEmpty() &&
 	!TQFileInfo( m_device->genericDevice() ).isWritable() )
-      emitInfoMessage( i18n("You need write access to %1").arg( m_device->genericDevice() ), K3bJob::ERROR );
+      emitInfoMessage( i18n("You need write access to %1").tqarg( m_device->genericDevice() ), K3bJob::ERROR );
     
     emitFinished(false);
     return;
@@ -197,7 +197,7 @@ void K3bAudioRipThread::run()
     TQString dir = filename.left( filename.findRev("/") );
     if( !KStandardDirs::makeDir( dir, 0777 ) ) {
       d->paranoiaLib->close();
-      emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
+      emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
       m_device->block(false);
       emitFinished(false);
       return;
@@ -226,13 +226,13 @@ void K3bAudioRipThread::run()
 
     if( !isOpen ) {
       d->paranoiaLib->close();
-      emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
+      emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
       m_device->block(false);
       emitFinished(false);
       return;
     }
 
-    emitInfoMessage( i18n("Ripping to single file '%1'.").arg(filename), K3bJob::INFO );
+    emitInfoMessage( i18n("Ripping to single file '%1'.").tqarg(filename), K3bJob::INFO );
   }
 
   emitInfoMessage( i18n("Starting digital audio extraction (ripping)."), K3bJob::INFO );
@@ -254,7 +254,7 @@ void K3bAudioRipThread::run()
 
     if( success && !d->canceled ) {
       TQString& filename = m_tracks[0].second;
-      emitInfoMessage( i18n("Successfully ripped to %2.").arg(filename), K3bJob::INFO );
+      emitInfoMessage( i18n("Successfully ripped to %2.").tqarg(filename), K3bJob::INFO );
     }
   }
 
@@ -300,7 +300,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
 
     TQString dir = filename.left( filename.findRev("/") );
     if( !KStandardDirs::makeDir( dir, 0777 ) ) {
-      emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
+      emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
       return false;
     }
 
@@ -330,16 +330,16 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
       }
 
       if( !isOpen ) {
-	emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
+	emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
 	return false;
       }
     }
 
   if( !m_cddbEntry.artists[track-1].isEmpty() &&
       !m_cddbEntry.titles[track-1].isEmpty() )
-    emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").arg(track).arg(m_cddbEntry.artists[track-1]).arg(m_cddbEntry.titles[track-1]) );
+    emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").tqarg(track).tqarg(m_cddbEntry.artists[track-1]).tqarg(m_cddbEntry.titles[track-1]) );
   else
-    emitNewSubTask( i18n("Ripping track %1").arg(track) );
+    emitNewSubTask( i18n("Ripping track %1").tqarg(track) );
 
     int status;
     while( 1 ) {
@@ -352,9 +352,9 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
       if( status == K3bCdparanoiaLib::S_OK ) {
 	if( buf == 0 ) {
 	  if( m_singleFile )
-	    emitInfoMessage( i18n("Successfully ripped track %1.").arg(track), K3bJob::INFO );
+	    emitInfoMessage( i18n("Successfully ripped track %1.").tqarg(track), K3bJob::INFO );
 	  else
-	    emitInfoMessage( i18n("Successfully ripped track %1 to %2.").arg(track).arg(filename), K3bJob::INFO );
+	    emitInfoMessage( i18n("Successfully ripped track %1 to %2.").tqarg(track).tqarg(filename), K3bJob::INFO );
 
 	  if( !m_singleFile ) {
 	    if( d->encoder )
@@ -371,7 +371,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
 				    CD_FRAMESIZE_RAW ) < 0 ) {
 	      kdDebug() << "(K3bAudioRipThread) error while encoding." << endl;
 	      emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
-	      emitInfoMessage( i18n("Error while encoding track %1.").arg(track), K3bJob::ERROR );
+	      emitInfoMessage( i18n("Error while encoding track %1.").tqarg(track), K3bJob::ERROR );
 	      return false;
 	    }
 	  }
@@ -387,7 +387,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
 	}
       }
       else {
-	emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(track), K3bJob::ERROR );
+	emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(track), K3bJob::ERROR );
 	return false;
       }
     }
@@ -435,7 +435,7 @@ void K3bAudioRipThread::cleanupAfterCancellation()
   if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
     if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
       TQFile::remove( m_tracks[d->currentTrackIndex].second );
-      emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
+      emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
     }
   }
 }
@@ -447,11 +447,11 @@ bool K3bAudioRipThread::writePlaylist()
   TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
 
   if( !KStandardDirs::makeDir( playlistDir ) ) {
-    emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
+    emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
     return false;
   }
 
-  emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
+  emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO );
 
   TQFile f( m_playlistFilename );
   if( f.open( IO_WriteOnly ) ) {
@@ -502,10 +502,10 @@ bool K3bAudioRipThread::writePlaylist()
       }
     }
 
-    return ( t.device()->status() == IO_Ok );
+    return ( t.tqdevice()->status() == IO_Ok );
   }
   else {
-    emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
+    emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR );
     kdDebug() << "(K3bAudioRipThread) could not open file " << m_playlistFilename << " for writing." << endl;
     return false;
   }
@@ -551,7 +551,7 @@ bool K3bAudioRipThread::writeCueFile()
   cueFile.truncate( cueFile.findRev(".") );
   cueFile += ".cue";
 
-  emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
+  emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
 
   return cueWriter.save( cueFile );
 }
@@ -586,7 +586,7 @@ TQString K3bAudioRipThread::jobDescription() const
   if( m_cddbEntry.cdTitle.isEmpty() )
     return i18n("Ripping Audio Tracks");
   else
-    return i18n("Ripping Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
+    return i18n("Ripping Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle);
 }
 
 TQString K3bAudioRipThread::jobDetails() const 
@@ -594,7 +594,7 @@ TQString K3bAudioRipThread::jobDetails() const
   if( d->encoder )
     return i18n("1 track (encoding to %1)", 
 		"%n tracks (encoding to %1)", 
-		m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
+		m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType));
   else
     return i18n("1 track", "%n tracks", m_tracks.count() );
 }
diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp
index 89c9554..79e1375 100644
--- a/src/rip/k3bcddbpatternwidget.cpp
+++ b/src/rip/k3bcddbpatternwidget.cpp
@@ -26,14 +26,14 @@
 #include <tqvalidator.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 
 K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name )
   : base_K3bCddbPatternWidget( parent, name )
 {
-  // fix the layout
-  ((TQGridLayout*)layout())->setRowStretch( 4, 1 );
+  // fix the tqlayout
+  ((TQGridLayout*)tqlayout())->setRowStretch( 4, 1 );
 
   // setup validators
   // there can never be one of the following characters in both dir and filename:
diff --git a/src/rip/k3bcuefilewriter.cpp b/src/rip/k3bcuefilewriter.cpp
index 8c46e96..2303926 100644
--- a/src/rip/k3bcuefilewriter.cpp
+++ b/src/rip/k3bcuefilewriter.cpp
@@ -21,7 +21,7 @@
 #include <k3bversion.h>
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdatetime.h>
 
 
@@ -87,5 +87,5 @@ bool K3bCueFileWriter::save( TQTextStream& t )
     i++;
   }
 
-  return ( t.device()->status() == IO_Ok );
+  return ( t.tqdevice()->status() == IO_Ok );
 }
diff --git a/src/rip/k3bcuefilewriter.h b/src/rip/k3bcuefilewriter.h
index 998117e..cee821d 100644
--- a/src/rip/k3bcuefilewriter.h
+++ b/src/rip/k3bcuefilewriter.h
@@ -16,7 +16,7 @@
 #ifndef _K3B_CUE_FILE_WRITER_H_
 #define _K3B_CUE_FILE_WRITER_H_
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstringlist.h>
 
 #include <k3btoc.h>
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index 0ab14d8..d83fe49 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -119,7 +119,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
             s.replace( '*', '_' );
             s.replace( '}', '*' );  // for conditional inclusion
             dir.append( s.isEmpty()
-                ? i18n("unknown") + TQString(" %1").arg(trackNumber)
+                ? i18n("unknown") + TQString(" %1").tqarg(trackNumber)
                 : s );
             break;
           case TITLE:
@@ -128,7 +128,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
             s.replace( '*', '_' );
             s.replace( '}', '*' );
             dir.append( s.isEmpty()
-                ? i18n("Track %1").arg(trackNumber)
+                ? i18n("Track %1").tqarg(trackNumber)
                 : s );
             break;
           case NUMBER:
@@ -171,7 +171,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
             dir.append( s ); // I think it makes more sense to allow empty comments
             break;
           case DATE:
-            dir.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
+            dir.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) );
             break;
           default:
             dir.append( pattern.mid(i, len) );
@@ -247,7 +247,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
         s = entry.cdExtInfo;
         break;
       case DATE:
-        s = KGlobal::locale()->formatDate( TQDate::currentDate() );
+        s = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
         break;
       default: // we must never get here,
         break; // all choices should be covered
diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp
index ace8fb2..89cdc37 100644
--- a/src/rip/k3bvideocdinfo.cpp
+++ b/src/rip/k3bvideocdinfo.cpp
@@ -177,7 +177,7 @@ void K3bVideoCdInfo::parseXmlData()
                                  );
             }
         } else {
-            kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).arg( tagName ) << endl;
+            kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).tqarg( tagName ) << endl;
         }
     }
 }
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index be91fa9..1248138 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -97,8 +97,8 @@ void K3bVideoCdRip::vcdxRip()
 
     if ( !bin ) {
         kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl;
-        emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxrip" ), K3bJob::ERROR );
-        emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).arg( ">= 0.7.12" ), K3bJob::INFO );
+        emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
+        emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO );
         emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
         cancelAll();
         jobFinished( false );
@@ -107,7 +107,7 @@ void K3bVideoCdRip::vcdxRip()
 
     if( bin->version < K3bVersion("0.7.12") ) {
         kdDebug() << "(K3bVideoCdRip) vcdxrip executable too old!" << endl;
-        emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).arg( "Vcdxrip" ).arg( "0.7.12" ), K3bJob::ERROR );
+        emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).tqarg( "Vcdxrip" ).tqarg( "0.7.12" ), K3bJob::ERROR );
         emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
         cancelAll();
         jobFinished( false );
@@ -115,7 +115,7 @@ void K3bVideoCdRip::vcdxRip()
     }
         
     if ( !bin->copyright.isEmpty() )
-        emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO );
+        emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO );
 
 
     *m_process << k3bcore ->externalBinManager() ->binPath( "vcdxrip" );
@@ -142,10 +142,10 @@ void K3bVideoCdRip::vcdxRip()
      if ( m_videooptions ->getVideoCdSector2336() )
         *m_process << "--sector-2336";
         
-     *m_process << "-i" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
+     *m_process << "-i" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
 
      if ( m_videooptions ->getVideoCdExtractXml() )
-        *m_process << "-o" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
+        *m_process << "-o" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
      else
         *m_process << "-o" << "/dev/null";
       
@@ -172,11 +172,11 @@ void K3bVideoCdRip::vcdxRip()
 
     emit newTask( i18n( "Extracting" ) );
     emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO );
-    emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
+    emit infoMessage( i18n( "Extract files from %1 to %2." ).tqarg( m_videooptions ->getVideoCdSource() ).tqarg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
             
     if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
         kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl;
-        emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR );
+        emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
         cancelAll();
         jobFinished( false );
     }
@@ -241,15 +241,15 @@ void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len )
                 if ( tel.isText() ) {
                     const TQString text = tel.data();
                     if ( level == "information" ) {
-                        kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).arg( text ) << endl;
+                        kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).tqarg( text ) << endl;
                         parseInformation( text );
                     } else {
                         if ( level != "error" ) {
-                            kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).arg( text ) << endl;
+                            kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).tqarg( text ) << endl;
                             emit debuggingOutput( "vcdxrip", text );
                             parseInformation( text );
                         } else {
-                            kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).arg( text ) << endl;
+                            kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).tqarg( text ) << endl;
                             emit infoMessage( text, K3bJob::ERROR );
                         }
                     }
@@ -269,14 +269,14 @@ void K3bVideoCdRip::slotVcdXRipFinished()
                 emit infoMessage( i18n( "Files successfully extracted." ), K3bJob::SUCCESS );
                 break;
             default:
-                emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxrip" ).arg( m_process->exitStatus() ), K3bJob::ERROR );
+                emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxrip" ).tqarg( m_process->exitStatus() ), K3bJob::ERROR );
                 emit infoMessage( i18n( "Please send me an email with the last output..." ), K3bJob::ERROR );
                 cancelAll();
                 jobFinished( false );
                 return ;
         }
     } else {
-        emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxrip" ), K3bJob::ERROR );
+        emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxrip" ), K3bJob::ERROR );
         cancelAll();
         jobFinished( false );
         return ;
@@ -290,7 +290,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
     // parse warning
     if ( text.contains( "encountered non-form2 sector" ) ) {
         // I think this is an error not a warning. Finish ripping with invalid mpegs.
-        emit infoMessage( i18n( "%1 encountered non-form2 sector" ).arg("Vcdxrip"), K3bJob::ERROR );
+        emit infoMessage( i18n( "%1 encountered non-form2 sector" ).tqarg("Vcdxrip"), K3bJob::ERROR );
         emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR );
         cancelAll();
         jobFinished( false );
@@ -326,7 +326,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
 
             index = 11;
             end = text.find( "(start lsn" );
-            emit newSubTask( i18n( "Extracting %1" ).arg( text.mid( index, end - index ).stripWhiteSpace() ) );
+            emit newSubTask( i18n( "Extracting %1" ).tqarg( text.mid( index, end - index ).stripWhiteSpace() ) );
         }
         // parse extracting files info
         // extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1)
@@ -337,14 +337,14 @@ void K3bVideoCdRip::parseInformation( TQString text )
             index = text.find( " to " );
             end = text.find( " (lsn" );
             TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace();
-            emit newSubTask( i18n( "Extracting %1 to %2" ).arg( extractFileName ).arg( toFileName ) );
+            emit newSubTask( i18n( "Extracting %1 to %2" ).tqarg( extractFileName ).tqarg( toFileName ) );
         }
     }
 }
 
 TQString K3bVideoCdRip::jobDescription() const
 {
-    return i18n( "Extracting %1" ).arg( m_videooptions ->getVideoCdDescription() );
+    return i18n( "Extracting %1" ).tqarg( m_videooptions ->getVideoCdDescription() );
 }
 
 TQString K3bVideoCdRip::jobDetails() const
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index 2143cd0..9283f00 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqdir.h>
@@ -73,11 +73,11 @@ void K3bVideoCdRippingDialog::setupGui()
 
     // ---------------------------------------------------- Directory group ---
     TQGroupBox* groupDirectory = new TQGroupBox( 0, Qt::Vertical, i18n( "Destination Directory" ), frame );
-    groupDirectory->layout() ->setSpacing( KDialog::spacingHint() );
-    groupDirectory->layout() ->setMargin( KDialog::marginHint() );
+    groupDirectory->tqlayout() ->setSpacing( KDialog::spacingHint() );
+    groupDirectory->tqlayout() ->setMargin( KDialog::marginHint() );
 
-    TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->layout() );
-    groupDirectoryLayout->setAlignment( TQt::AlignTop );
+    TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->tqlayout() );
+    groupDirectoryLayout->tqsetAlignment( TQt::AlignTop );
 
     TQLabel* rippathLabel = new TQLabel( i18n( "Rip files to:" ), groupDirectory );
     m_editDirectory = new KURLRequester( groupDirectory, "m_editDirectory" );
@@ -90,13 +90,13 @@ void K3bVideoCdRippingDialog::setupGui()
     freeSpaceBox->setSpacing( KDialog::spacingHint() );
     ( void ) new TQLabel( i18n( "Free space in directory:" ), freeSpaceBox, "FreeSpaceLabel" );
     m_labelFreeSpace = new TQLabel( "                       ", freeSpaceBox, "m_labelFreeSpace" );
-    m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
     TQHBox* necessarySizeBox = new TQHBox( groupDirectory );
     necessarySizeBox->setSpacing( KDialog::spacingHint() );
     ( void ) new TQLabel( i18n( "Necessary storage size:" ), necessarySizeBox, "StorSize" );
     m_labelNecessarySize = new TQLabel( "                        ", necessarySizeBox, "m_labelNecessarySize" );
-    m_labelNecessarySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    m_labelNecessarySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 
     groupDirectoryLayout->addWidget( rippathLabel, 0, 0 );
@@ -132,7 +132,7 @@ void K3bVideoCdRippingDialog::setupGui()
 
 void K3bVideoCdRippingDialog::setupContextHelp()
 {
-    TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").arg( m_editDirectory ->url() ) );
+    TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").tqarg( m_editDirectory ->url() ) );
 
     TQToolTip::add( m_labelNecessarySize, i18n("Necessary space for extracted files") );
 
@@ -157,10 +157,10 @@ void K3bVideoCdRippingDialog::slotStartClicked()
     TQDir d;
     d.setPath( m_editDirectory ->url() );
     if( !d.exists() ) {
-      if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( m_editDirectory->url() ) )
+      if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( m_editDirectory->url() ) )
 	  == KMessageBox::Yes ) {
 	if( !KStandardDirs::makeDir( m_editDirectory->url() ) ) {
-	  KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( m_editDirectory->url() ) );
+	  KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( m_editDirectory->url() ) );
 	  return;
 	}
       }
@@ -170,7 +170,7 @@ void K3bVideoCdRippingDialog::slotStartClicked()
     TQFileInfo* fi;
     while ( ( fi = it.current() ) != 0 ) {
         if ( fi ->fileName() != "." && fi ->fileName() != ".." )
-            filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( KIO::convertSize( fi ->size() ) ) );
+            filesExists.append( TQString( "%1 (%2)" ).tqarg( TQFile::encodeName( fi ->fileName() ).data() ).tqarg( KIO::convertSize( fi ->size() ) ) );
         ++it;
     }
 
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index b44b9df..7fbe3b2 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -29,7 +29,7 @@
 #include <tqframe.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
 
@@ -68,7 +68,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
                             const K3b::Msf& length )
                 : TQListViewItem( parent )
         {
-            setText( 0, TQString( "%1. %2" ).arg( _trackNumber ).arg( id ) );
+            setText( 0, TQString( "%1. %2" ).tqarg( _trackNumber ).tqarg( id ) );
             setText( 1, name );
             if ( length > 0 ) {
                 setText( 2, length.toString() );
@@ -83,7 +83,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
 
         void updateData( const K3bVideoCdInfoResultEntry& resultEntry )
         {
-            setText( 0, TQString( "%1. %2" ).arg( trackNumber ).arg( resultEntry.id ) );
+            setText( 0, TQString( "%1. %2" ).tqarg( trackNumber ).tqarg( resultEntry.id ) );
             setText( 1, resultEntry.name );
         }
 
@@ -153,7 +153,7 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name )
     TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     toolBoxLayout->addItem( spacer );
     m_labelLength = new TQLabel( mainWidget() );
-    m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
     toolBoxLayout->addWidget( m_labelLength );
 
     // the track view
@@ -232,7 +232,7 @@ void K3bVideoCdView::reloadMedium()
             K3b::Msf length( ( *it ).length() );
             sequenceSize += length;
             m_videocdmpegsize += length.mode2Form2Bytes();
-            ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).arg( index ), "", index, length );
+            ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).tqarg( index ), "", index, length );
         } else {
             K3b::Msf length( ( *it ).length() );
             m_videocddatasize += length.mode2Form1Bytes();
@@ -314,7 +314,7 @@ void K3bVideoCdView::updateDisplay()
     else
         setTitle( i18n( "Video CD" ) );
 
-    m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).arg( K3b::Msf( m_toc.length() ).toString() ) );
+    m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).tqarg( K3b::Msf( m_toc.length() ).toString() ) );
 }
 
 
@@ -416,7 +416,7 @@ void K3bVideoCdView::startRip()
         if ( m_videooptions ->getVideoCdRipSequences() )
             videocdsize += m_videocdmpegsize;
 
-        kdDebug() << TQString("(K3bVideoCdView::startRip())  m_videooptions ->setVideoCdSize( %1)").arg( videocdsize ) << endl;
+        kdDebug() << TQString("(K3bVideoCdView::startRip())  m_videooptions ->setVideoCdSize( %1)").tqarg( videocdsize ) << endl;
         m_videooptions ->setVideoCdSize( videocdsize );
         K3bVideoCdRippingDialog rip( m_videooptions, this );
         rip.exec();
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 5c22e83..864b798 100644
--- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
+++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
@@ -67,7 +67,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -106,7 +106,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -188,7 +188,7 @@
                                 <property name="text">
                                     <string>-</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -207,7 +207,7 @@
                                 <property name="text">
                                     <string>-</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -252,7 +252,7 @@
                                         </widget>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>layout4</cstring>
+                                                <cstring>tqlayout4</cstring>
                                             </property>
                                             <hbox>
                                                 <property name="name">
@@ -326,7 +326,7 @@
                                         </property>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>layout8</cstring>
+                                                <cstring>tqlayout8</cstring>
                                             </property>
                                             <hbox>
                                                 <property name="name">
@@ -372,7 +372,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>0</height>
@@ -397,7 +397,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout10</cstring>
+                                    <cstring>tqlayout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -423,7 +423,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -464,7 +464,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout14</cstring>
+                            <cstring>tqlayout14</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -509,13 +509,13 @@
                         <property name="text">
                             <string>See special strings</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -560,7 +560,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>5</width>
                                 <height>1</height>
@@ -663,7 +663,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>1</height>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 81e484f..bcdb0f6 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -34,7 +34,7 @@
 #include <kconfig.h>
 #include <kmessagebox.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <tqstyle.h>
@@ -172,7 +172,7 @@ K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD&
 
   setTitle( i18n("Video DVD Ripping"),
 	    i18n("1 title from %1", "%n titles from %1", titles.count())
-	    .arg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) );
+	    .tqarg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) );
 
   // populate list map
   populateTitleView( titles );
@@ -195,13 +195,13 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
     titleItem = new TQCheckListItem( m_w->m_titleView,
 				    titleItem,
 				    i18n("Title %1 (%2)")
-				    .arg(*it)
-				    .arg(m_dvd[*it-1].playbackTime().toString()),
+				    .tqarg(*it)
+				    .tqarg(m_dvd[*it-1].playbackTime().toString()),
 				    TQCheckListItem::RadioButtonController );
     titleItem->setText( 1, TQString("%1x%2")
-		       .arg(m_dvd[*it-1].videoStream().realPictureWidth())
-		       .arg(m_dvd[*it-1].videoStream().realPictureHeight()) );
-    titleItem->setText( 3, TQString("%1 Title %2.avi").arg(m_dvd.volumeIdentifier()).arg(*it) );
+		       .tqarg(m_dvd[*it-1].videoStream().realPictureWidth())
+		       .tqarg(m_dvd[*it-1].videoStream().realPictureHeight()) );
+    titleItem->setText( 3, TQString("%1 Title %2.avi").tqarg(m_dvd.volumeIdentifier()).tqarg(*it) );
 
     // now for the rip info
     K3bVideoDVDRippingJob::TitleRipInfo ri( *it );
@@ -222,18 +222,18 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
     TQListViewItem* asI = 0;
     for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) {
       TQString text = i18n("%1 %2Ch (%3%4)")
-	.arg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) )
-	.arg( m_dvd[*it-1].audioStream(i).channels() )
-	.arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
+	.tqarg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) )
+	.tqarg( m_dvd[*it-1].audioStream(i).channels() )
+	.tqarg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
 	      ? i18n("unknown language")
 	      : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
-	.arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
+	.tqarg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
 	      ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() )
 	      : TQString() );
 
       if( m_dvd[*it-1].audioStream(i).format() == K3bVideoDVD::AUDIO_FORMAT_DTS ) {
 	// width of the radio button from TQCheckListItem::paintCell
-	int buttonSize = tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4;
+	int buttonSize = tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4;
 	int spaceWidth = fontMetrics().width( ' ' );
 	int numSpaces = buttonSize/spaceWidth;
 	asI = new TQListViewItem( titleItem, asI, TQString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" );
@@ -302,7 +302,7 @@ void K3bVideoDVDRippingDialog::slotUpdateVideoSizes()
   for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin();
        it != m_titleRipInfos.end(); ++it ) {
     TQSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) );
-    it.key()->setText( 1, TQString("%1x%2").arg(s.width()).arg(s.height()) );
+    it.key()->setText( 1, TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) );
   }
 }
 
@@ -456,12 +456,12 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
 	break;
       case PATTERN_ORIG_VIDEO_SIZE:
 	f.append( TQString("%1x%2")
-		  .arg(title.videoStream().pictureWidth())
-		  .arg(title.videoStream().pictureHeight()) );
+		  .tqarg(title.videoStream().pictureWidth())
+		  .tqarg(title.videoStream().pictureHeight()) );
 	break;
       case PATTERN_VIDEO_SIZE: {
 	TQSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) );
-	f.append( TQString("%1x%2").arg(s.width()).arg(s.height()) );
+	f.append( TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) );
 	break;
       }
       case PATTERN_ASPECT_RATIO:
@@ -471,7 +471,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
 	  f.append( "16:9" );
 	break;
       case PATTERN_CURRENT_DATE:
-	f.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
+	f.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) );
 	break;
       default:
 	f.append( pattern[i-1] );
diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
index f17b6ff..bc08f3e 100644
--- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
@@ -115,8 +115,8 @@ TQString K3bVideoDVDRippingJob::jobDescription() const
 TQString K3bVideoDVDRippingJob::jobDetails() const
 {
   return i18n("Transcoding %n title to %1/%2", "Transcoding %n titles to %1/%2", m_titleRipInfos.count() )
-    .arg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
-    .arg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
+    .tqarg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
+    .tqarg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
 }
 
 
@@ -143,10 +143,10 @@ void K3bVideoDVDRippingJob::slotTranscodingJobFinished( bool success )
   }
   else {
     if( success )
-      emit infoMessage( i18n("Successfully ripped title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
+      emit infoMessage( i18n("Successfully ripped title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
     else {
       d->failedTitles++;
-      emit infoMessage( i18n("Failed to rip title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
+      emit infoMessage( i18n("Failed to rip title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
     }
 
     ++d->currentTitleInfoIndex ;
@@ -176,11 +176,11 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success )
     m_titleRipInfos[d->currentTitleInfoIndex].clipRight = 0;
 
     if( success ) {
-      emit infoMessage( i18n("Determined clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
+      emit infoMessage( i18n("Determined clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
       emit infoMessage( i18n("Top: %1, Bottom: %2")
-			.arg(m_detectClippingJob->clippingTop()).arg(m_detectClippingJob->clippingBottom()), INFO );
+			.tqarg(m_detectClippingJob->clippingTop()).tqarg(m_detectClippingJob->clippingBottom()), INFO );
       emit infoMessage( i18n("Left: %1, Right: %2")
-			.arg(m_detectClippingJob->clippingLeft()).arg(m_detectClippingJob->clippingRight()), INFO );
+			.tqarg(m_detectClippingJob->clippingLeft()).tqarg(m_detectClippingJob->clippingRight()), INFO );
 
       // let's see if the clipping values make sense
       if( m_detectClippingJob->clippingTop() + m_detectClippingJob->clippingBottom() 
@@ -197,7 +197,7 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success )
       }
     }
     else
-      emit infoMessage( i18n("Failed to determine clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
+      emit infoMessage( i18n("Failed to determine clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
 
     startTranscoding( d->currentTitleInfoIndex );
   }
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
index 2081d32..577b674 100644
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
@@ -77,11 +77,11 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv
   m_process = new KProcess();
   *m_process << bin->path;
   *m_process << "-i" << dvd.device()->blockDeviceName();
-  *m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter);
+  *m_process << "-T" << TQString("%1,%2").tqarg(title).tqarg(chapter);
   *m_process << "-x" << "dvd,null";
   *m_process << "--dvd_access_delay" << "0";
   *m_process << "-y" << "ppm,null";
-  *m_process << "-c" << TQString("%1-%2").arg( frame ).arg( frame+1 );
+  *m_process << "-c" << TQString("%1-%2").tqarg( frame ).tqarg( frame+1 );
   *m_process << "-Z" << "x200";
   *m_process << "-o" << m_tempDir->name();
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index 34af9c9..5811750 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -45,12 +45,12 @@ static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int
       s += "<br>";
     s += TQString::number(i+1) + ": " 
       + i18n("%1 %2Ch (%3<em>%4</em>)")
-      .arg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
-      .arg( title.audioStream(i).channels() )
-      .arg( title.audioStream(i).langCode().isEmpty()
+      .tqarg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
+      .tqarg( title.audioStream(i).channels() )
+      .tqarg( title.audioStream(i).langCode().isEmpty()
 	    ? i18n("unknown language")
 	    : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
-      .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED 
+      .tqarg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED 
 	    ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() )
 	    : TQString() );
   }
@@ -69,13 +69,13 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne
       s += "<br>";
     s += TQString::number(i+1) + ": " 
       + TQString("%1 (%2<em>%3</em>)")
-      .arg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE 
+      .tqarg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE 
 	    ? i18n("RLE")
 	    : i18n("Extended") )
-      .arg( title.subPictureStream(i).langCode().isEmpty()
+      .tqarg( title.subPictureStream(i).langCode().isEmpty()
 	    ? i18n("unknown language")
 	    : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
-      .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED 
+      .tqarg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED 
 	    ? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() )
 	    : TQString() );
   }
@@ -137,7 +137,7 @@ public:
 
     m_previewSet = true;
 
-    repaint();
+    tqrepaint();
   }
 
   const TQImage& preview() const {
@@ -243,18 +243,18 @@ private:
       // Title X + length
       return i18n("<p><b>Title %1 (%2)</b><br>"
 		  "%3")
-	.arg( m_title.titleNumber(), 2 )
-	.arg( m_title.playbackTime().toString( false ) )
-	.arg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
+	.tqarg( m_title.titleNumber(), 2 )
+	.tqarg( m_title.playbackTime().toString( false ) )
+	.tqarg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
 
     case 3:
       // video stream info
       return TQString("<p>%1 %2x%3<br>%4%5")
-	.arg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") )
-	.arg( m_title.videoStream().pictureWidth() )
-	.arg( m_title.videoStream().pictureHeight() )
-	.arg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" )
-	.arg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"): 
+	.tqarg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") )
+	.tqarg( m_title.videoStream().pictureWidth() )
+	.tqarg( m_title.videoStream().pictureHeight() )
+	.tqarg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" )
+	.tqarg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"): 
 	      m_title.videoStream().permittedDf() == K3bVideoDVD::VIDEO_PERMITTED_DF_LETTERBOXED 
 	      ? TQString(" - <em>") + i18n("anamorph") + TQString("</em>") : TQString() );
 
@@ -300,7 +300,7 @@ public:
       return;
     int col = m_view->header()->sectionAt( contentsPos.x() );
 
-    TQRect r = m_view->itemRect( item );
+    TQRect r = m_view->tqitemRect( item );
     int headerPos = m_view->header()->sectionPos( col );
     r.setLeft( headerPos );
     r.setRight( headerPos + m_view->header()->sectionSize( col ) );
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp
index 6ecc076..101d965 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -27,7 +27,7 @@
 #include <k3bexternalbinmanager.h>
 
 #include <tqcursor.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <kapplication.h>
@@ -54,7 +54,7 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n
   TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
   toolBoxLayout->addItem( spacer );
   m_labelLength = new TQLabel( mainWidget() );
-  m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+  m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
   toolBoxLayout->addWidget( m_labelLength );
 
 
@@ -65,7 +65,7 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n
   connect( m_titleView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
 	   this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
 
-  // general layout
+  // general tqlayout
   // ----------------------------------------------------------------------------------
   mainGrid->addLayout( toolBoxLayout, 0, 0 );
   mainGrid->addWidget( m_titleView, 1, 0 );
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 266d1b0..d05f915 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -36,7 +36,7 @@
 #include <tqwidgetstack.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 
 static const int s_mp3Bitrates[] = {
@@ -86,7 +86,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
   //
   // Example filename pattern
   //
-  m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).arg(i18n("Title") ) );
+  m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).tqarg(i18n("Title") ) );
   m_comboFilenamePattern->insertItem( TQString( "%{volumeid} (%{title})" ) );
 
 
@@ -94,7 +94,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
   // Add the Audio bitrates
   //
   for( int i = 0; s_mp3Bitrates[i]; ++i )
-    m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).arg(s_mp3Bitrates[i]) );
+    m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_mp3Bitrates[i]) );
 
 
   for( int i = 0; i < K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_NUM_ENTRIES; ++i ) {
@@ -187,8 +187,8 @@ void K3bVideoDVDRippingWidget::setSelectedPictureSize( const TQSize& size )
   else {
     m_comboVideoSize->changeItem( i18n(s_pictureSizeNames[PICTURE_SIZE_CUSTOM])
 				  + TQString(" (%1x%2)")
-				  .arg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
-				  .arg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
+				  .tqarg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
+				  .tqarg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
 				  PICTURE_SIZE_CUSTOM );
     m_comboVideoSize->setCurrentItem( PICTURE_SIZE_CUSTOM );
   }
@@ -351,8 +351,8 @@ void K3bVideoDVDRippingWidget::slotCustomPictureSize()
   spinHeight->setSpecialValueText( i18n("Auto") );
   TQLabel* labelW = new TQLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() );
   TQLabel* labelH = new TQLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() );
-  labelW->setAlignment( TQt::AlignRight|TQt::AlignVCenter );
-  labelH->setAlignment( TQt::AlignRight|TQt::AlignVCenter );
+  labelW->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter );
+  labelH->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter );
 
   TQGridLayout* grid = new TQGridLayout( dlg.plainPage() );
   grid->setMargin( 0 );