Remove additional unneeded tq method conversions

6 files changed, 47 insertions, 47 deletions

diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 3ea6c03..4bc1a0f 100644
--- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
+++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
@@ -188,7 +188,7 @@
                                 <property name="text">
                                     <string>-</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -207,7 +207,7 @@
                                 <property name="text">
                                     <string>-</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -509,7 +509,7 @@
                         <property name="text">
                             <string>See special strings</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 2ce8ae4..8938e4d 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -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())
-	    .tqarg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) );
+	    .arg( 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)")
-				    .tqarg(*it)
-				    .tqarg(m_dvd[*it-1].playbackTime().toString()),
+				    .arg(*it)
+				    .arg(m_dvd[*it-1].playbackTime().toString()),
 				    TQCheckListItem::RadioButtonController );
     titleItem->setText( 1, TQString("%1x%2")
-		       .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) );
+		       .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) );
 
     // now for the rip info
     K3bVideoDVDRippingJob::TitleRipInfo ri( *it );
@@ -222,12 +222,12 @@ 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)")
-	.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()
+	.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()
 	      ? i18n("unknown language")
 	      : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
-	.tqarg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
+	.arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
 	      ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() )
 	      : TQString() );
 
@@ -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").tqarg(s.width()).tqarg(s.height()) );
+    it.key()->setText( 1, TQString("%1x%2").arg(s.width()).arg(s.height()) );
   }
 }
 
@@ -456,12 +456,12 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
 	break;
       case PATTERN_ORIG_VIDEO_SIZE:
 	f.append( TQString("%1x%2")
-		  .tqarg(title.videoStream().pictureWidth())
-		  .tqarg(title.videoStream().pictureHeight()) );
+		  .arg(title.videoStream().pictureWidth())
+		  .arg(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").tqarg(s.width()).tqarg(s.height()) );
+	f.append( TQString("%1x%2").arg(s.width()).arg(s.height()) );
 	break;
       }
       case PATTERN_ASPECT_RATIO:
diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp
index bc08f3e..f17b6ff 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() )
-    .tqarg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
-    .tqarg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
+    .arg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
+    .arg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
 }
 
 
@@ -143,10 +143,10 @@ void K3bVideoDVDRippingJob::slotTranscodingJobFinished( bool success )
   }
   else {
     if( success )
-      emit infoMessage( i18n("Successfully ripped title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
+      emit infoMessage( i18n("Successfully ripped title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
     else {
       d->failedTitles++;
-      emit infoMessage( i18n("Failed to rip title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
+      emit infoMessage( i18n("Failed to rip title %1").arg(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").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
+      emit infoMessage( i18n("Determined clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
       emit infoMessage( i18n("Top: %1, Bottom: %2")
-			.tqarg(m_detectClippingJob->clippingTop()).tqarg(m_detectClippingJob->clippingBottom()), INFO );
+			.arg(m_detectClippingJob->clippingTop()).arg(m_detectClippingJob->clippingBottom()), INFO );
       emit infoMessage( i18n("Left: %1, Right: %2")
-			.tqarg(m_detectClippingJob->clippingLeft()).tqarg(m_detectClippingJob->clippingRight()), INFO );
+			.arg(m_detectClippingJob->clippingLeft()).arg(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").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
+      emit infoMessage( i18n("Failed to determine clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
 
     startTranscoding( d->currentTitleInfoIndex );
   }
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
index 577b674..2081d32 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").tqarg(title).tqarg(chapter);
+  *m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter);
   *m_process << "-x" << "dvd,null";
   *m_process << "--dvd_access_delay" << "0";
   *m_process << "-y" << "ppm,null";
-  *m_process << "-c" << TQString("%1-%2").tqarg( frame ).tqarg( frame+1 );
+  *m_process << "-c" << TQString("%1-%2").arg( frame ).arg( 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 8c3e592..34af9c9 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>)")
-      .tqarg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
-      .tqarg( title.audioStream(i).channels() )
-      .tqarg( title.audioStream(i).langCode().isEmpty()
+      .arg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
+      .arg( title.audioStream(i).channels() )
+      .arg( title.audioStream(i).langCode().isEmpty()
 	    ? i18n("unknown language")
 	    : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
-      .tqarg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED 
+      .arg( 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>)")
-      .tqarg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE 
+      .arg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE 
 	    ? i18n("RLE")
 	    : i18n("Extended") )
-      .tqarg( title.subPictureStream(i).langCode().isEmpty()
+      .arg( title.subPictureStream(i).langCode().isEmpty()
 	    ? i18n("unknown language")
 	    : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
-      .tqarg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED 
+      .arg( 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;
 
-    tqrepaint();
+    repaint();
   }
 
   const TQImage& preview() const {
@@ -243,18 +243,18 @@ private:
       // Title X + length
       return i18n("<p><b>Title %1 (%2)</b><br>"
 		  "%3")
-	.tqarg( m_title.titleNumber(), 2 )
-	.tqarg( m_title.playbackTime().toString( false ) )
-	.tqarg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
+	.arg( m_title.titleNumber(), 2 )
+	.arg( m_title.playbackTime().toString( false ) )
+	.arg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
 
     case 3:
       // video stream info
       return TQString("<p>%1 %2x%3<br>%4%5")
-	.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>"): 
+	.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>"): 
 	      m_title.videoStream().permittedDf() == K3bVideoDVD::VIDEO_PERMITTED_DF_LETTERBOXED 
 	      ? TQString(" - <em>") + i18n("anamorph") + TQString("</em>") : TQString() );
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index cdbb932..41489f7 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -86,7 +86,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
   //
   // Example filename pattern
   //
-  m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).tqarg(i18n("Title") ) );
+  m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).arg(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" ).tqarg(s_mp3Bitrates[i]) );
+    m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).arg(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)")
-				  .tqarg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
-				  .tqarg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
+				  .arg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
+				  .arg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
 				  PICTURE_SIZE_CUSTOM );
     m_comboVideoSize->setCurrentItem( PICTURE_SIZE_CUSTOM );
   }