Remove additional unneeded tq method conversions

8 files changed, 45 insertions, 45 deletions

diff --git a/src/k9main.cpp b/src/k9main.cpp
index e8cb4fa..7c829d9 100644
--- a/src/k9main.cpp
+++ b/src/k9main.cpp
@@ -392,7 +392,7 @@ void k9Main::Copy()
 
   if (getFreeSpace( m_prefOutput) <  m_prefSize)
   {
-    if (KMessageBox::warningContinueCancel (this, i18n("Insufficient disk space on %1\n%2 mb expected.").tqarg(m_prefOutput).tqarg(m_prefSize),i18n("DVD Copy"))==KMessageBox::Cancel)
+    if (KMessageBox::warningContinueCancel (this, i18n("Insufficient disk space on %1\n%2 mb expected.").arg(m_prefOutput).arg(m_prefSize),i18n("DVD Copy"))==KMessageBox::Cancel)
       return;
   }
   stopPreview();
@@ -583,7 +583,7 @@ void k9Main::Open()
     ckLvItem *tsItem = new ckLvItem(root,this,TITLESET);
     tsItem->setOpen(TRUE);
     TQString c;
-    c=i18n("Titleset %1").tqarg(i+1);
+    c=i18n("Titleset %1").arg(i+1);
     tsItem->setText(0,c);
     tsItem->setText(1,"   "+dvd->gettitleset(i)->getsize_mb() +" " +i18n("MB"));
     tsItem->obj=dvd->gettitleset(i) ;
@@ -641,8 +641,8 @@ void k9Main::addChapters(TQListViewItem *_parent,k9DVDTitle *_title)
   for (int i=0;i< _title->getchapterCount();i++)
   {
     ckLvItem *it =new ckLvItem(chapter,this,CHAPTER);
-    it->setText(0,i18n("chapter %1").tqarg(++ch));
-    it->setText(1,i18n("%1 MB").tqarg((double)(_title->getChapter(i)->getsectors()) /512));
+    it->setText(0,i18n("chapter %1").arg(++ch));
+    it->setText(1,i18n("%1 MB").arg((double)(_title->getChapter(i)->getsectors()) /512));
     it->streamType=CHAP;
     it->obj=_title->getChapter(i);
     chItems.append( it);
@@ -654,10 +654,10 @@ void k9Main::addChapters(TQListViewItem *_parent,k9DVDTitle *_title)
     for (int i=0;i< title2->getchapterCount();i++)
     {
       ckLvItem *it =new ckLvItem(chapter,this,CHAPTER);
-      it->setText(0,i18n("chapter %1").tqarg(++ch));
+      it->setText(0,i18n("chapter %1").arg(++ch));
       it->streamType=CHAP;
       it->obj=title2->getChapter(i);
-      it->setText(1,i18n("%1 MB").tqarg((double)(title2->getChapter(i)->getsectors()) /512));
+      it->setText(1,i18n("%1 MB").arg((double)(title2->getChapter(i)->getsectors()) /512));
       chItems.append( it);
       it->mainTitle=_title;
     }
@@ -696,7 +696,7 @@ void k9Main::addTitle(k9DVDTitle *track)
   video->streamType=VID;
   addListItem(track,video,VID);
   video->setOpen( false );
-  c=i18n("video %1 ").tqarg(track->getformat());
+  c=i18n("video %1 ").arg(track->getformat());
   c.append (" - " + track->gettotallength().toString("h:mm:ss"));
   video->setText(col1, c);
   c.sprintf("%.2f ",  track->gettotalvideosize_mb());
@@ -707,7 +707,7 @@ void k9Main::addTitle(k9DVDTitle *track)
   for (i=0;i< track->getaudioStreamCount();i++)
   {
     l_auds=track->getaudioStream(i);
-    c=i18n("audio %1 ").tqarg(i+1);
+    c=i18n("audio %1 ").arg(i+1);
     c.append( l_auds->getlanguage() + " " +l_auds->getformat()+" " );
     ch.sprintf("%dch ",l_auds->getchannels());
     c.append(ch+l_auds->getfrequency()+" "+l_auds->getquantization());
@@ -716,7 +716,7 @@ void k9Main::addTitle(k9DVDTitle *track)
     item->language=l_auds->getlanguage();
     addListItem(l_auds,item,AUD);
     item->setText( col1,  c );
-    c=i18n("%1 MB").tqarg(l_auds->getsize_mb());
+    c=i18n("%1 MB").arg(l_auds->getsize_mb());
     item->setText( col2,c);
     item->setText( col3,l_auds->getcontent());
     item->setPixmap(col1,pxSound);
@@ -727,14 +727,14 @@ void k9Main::addTitle(k9DVDTitle *track)
   for (i=0;i< track->getsubPictureCount();i++)
   {
     l_sub=track->getsubtitle(i);
-    c=i18n("subpicture %1 ").tqarg(i+1);
+    c=i18n("subpicture %1 ").arg(i+1);
     c.append( l_sub->getlanguage());
     ckLvItem * item = new ckLvItem( itemTrack,this,STREAM);
     item->streamType=SUB;
     item->language=l_sub->getlanguage();
     addListItem(l_sub,item,SUB);
     item->setText( col1,  c );
-    c=i18n("%1 MB").tqarg(l_sub->getsize_mb());
+    c=i18n("%1 MB").arg(l_sub->getsize_mb());
     item->setText( col2,c);
     item->setText( col3, l_sub->getcontent());
     item->setPixmap(col1,pxText);
@@ -1146,7 +1146,7 @@ void k9Main::CreateMP4()
   for (int i=0; i < dvd->gettitleCount();i++)
   {
     k9DVDTitle *t=dvd->gettitle(i);
-    changeStatusbar( i18n("Transcoding title : %1").tqarg(t->getname()) ,sbMessage);
+    changeStatusbar( i18n("Transcoding title : %1").arg(t->getname()) ,sbMessage);
 
     if (t->isSelected() && t->getIndexed() )
     {
diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp
index 941f37d..299f2a8 100644
--- a/src/k9mencodercmdgen.cpp
+++ b/src/k9mencodercmdgen.cpp
@@ -203,7 +203,7 @@ void k9MencoderCmdGen::addList(TQDomElement _eOpt) {
        bSel=aSel.value()=="true";
 
 
-   TQCheckBox *ckLabel=new TQCheckBox(sName,m_grid,TQString("ck%1").tqarg(m_row++) );
+   TQCheckBox *ckLabel=new TQCheckBox(sName,m_grid,TQString("ck%1").arg(m_row++) );
    ckLabel->setChecked(bSel);
    m_hbox=new TQGrid(2,m_grid);
    m_hbox->setFrameShape(TQFrame::StyledPanel);
@@ -255,7 +255,7 @@ void k9MencoderCmdGen::addInt(TQDomElement _eOpt) {
     if (!aSel.isNull())
         bSel=aSel.value()=="true";
 
-    TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++) );
+    TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++) );
     ckLabel->setChecked(bSel);
     ckLabel->setBackgroundColor(parent->backgroundColor());
 
@@ -266,7 +266,7 @@ void k9MencoderCmdGen::addInt(TQDomElement _eOpt) {
     _eOpt.setAttribute("checkbox",ckLabel->name());
 
 
-   KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,TQString("int%1").tqarg(m_row++));
+   KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,TQString("int%1").arg(m_row++));
    if (iMax <1000)
         sb->setFixedWidth(50);
     else   
@@ -301,7 +301,7 @@ void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) {
     if (!aSel.isNull())
         bSel=aSel.value()=="true";
     
-    TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
+    TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++));
     ckLabel->setChecked(bSel);
     if ( !_eOpt.attributeNode("description").isNull()) {
             TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -317,7 +317,7 @@ void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) {
    if (!_eOpt.attributeNode("precision").isNull()) {
         iPrecision=_eOpt.attributeNode("precision").value().toInt();
     }
-   KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,TQString("float%1").tqarg(m_row++));
+   KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,TQString("float%1").arg(m_row++));
    if (dMax <1000)
         sb->setFixedWidth(80);
     else   
@@ -346,7 +346,7 @@ void k9MencoderCmdGen::addBool(TQDomElement _eOpt) {
     if (!aSel.isNull())
         bSel=aSel.value()=="true";
 
-   TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
+   TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++));
 
     if ( !_eOpt.attributeNode("description").isNull()) {
         TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -379,7 +379,7 @@ void k9MencoderCmdGen::addString(TQDomElement _eOpt) {
     if (!aSel.isNull())
         bSel=aSel.value()=="true";
     
-    TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
+    TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++));
     ckLabel->setChecked(bSel);
     if ( !_eOpt.attributeNode("description").isNull()) {
             TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -387,7 +387,7 @@ void k9MencoderCmdGen::addString(TQDomElement _eOpt) {
     }
    _eOpt.setAttribute("checkbox",ckLabel->name());
 
-   TQComboBox *cb=new TQComboBox(parent,TQString("string%1").tqarg(m_row++));
+   TQComboBox *cb=new TQComboBox(parent,TQString("string%1").arg(m_row++));
    
    TQDomNodeList values=_eOpt.elementsByTagName("value");
    int def=0;
diff --git a/src/k9play.cpp b/src/k9play.cpp
index e546aab..36aaeb2 100644
--- a/src/k9play.cpp
+++ b/src/k9play.cpp
@@ -32,7 +32,7 @@ void k9play::saveStatus(k9play_st _status) {
    fstatus.open(IO_WriteOnly);
    fstatus.writeBlock((const char*)&_status,sizeof(k9play_st));
    fstatus.close();
-   kdebug (TQString("saving status : %1 %2 %3 %4 %5 %6  %7\n").tqarg(_status.title).tqarg(_status.chapter).tqarg(_status.cell).tqarg(_status.sector).tqarg(_status.bytesWritten).tqarg(_status.bytesRead).tqarg(_status.bytesSkipped));
+   kdebug (TQString("saving status : %1 %2 %3 %4 %5 %6  %7\n").arg(_status.title).arg(_status.chapter).arg(_status.cell).arg(_status.sector).arg(_status.bytesWritten).arg(_status.bytesRead).arg(_status.bytesSkipped));
 
 } 
 
@@ -43,7 +43,7 @@ void k9play::readStatus(k9play_st &_status) {
 	fstatus.close();
    } else memset(&_status,0,sizeof(k9play_st));
 
-   kdebug (TQString("reading status : title:%1 chapter:%2 cell:%3 sector:%4 written:%5 readen:%6 skipped:%7 chapters:%8  \n").tqarg(_status.title).tqarg(_status.chapter).tqarg(_status.cell).tqarg(_status.sector).tqarg(_status.bytesWritten).tqarg(_status.bytesRead).tqarg(_status.bytesSkipped).tqarg(_status.bytesChapters));
+   kdebug (TQString("reading status : title:%1 chapter:%2 cell:%3 sector:%4 written:%5 readen:%6 skipped:%7 chapters:%8  \n").arg(_status.title).arg(_status.chapter).arg(_status.cell).arg(_status.sector).arg(_status.bytesWritten).arg(_status.bytesRead).arg(_status.bytesSkipped).arg(_status.bytesChapters));
 
 }
 
@@ -277,11 +277,11 @@ void k9play::play() {
 	double factor;
 	factor = (double) (m_totalSize - (status.bytesRead +status.bytesSkipped)) / (double) (m_dvdSize-status.bytesWritten) ;
 	if (factor <1) factor =1;
-	kdebug(TQString("shrink factor %1 totalSize:%2 (status.bytesRead +status.bytesSkipped):%3 m_dvdSize:%4 status.bytesWritten:%5").tqarg(factor).tqarg(m_totalSize).tqarg(status.bytesRead +status.bytesSkipped).tqarg(m_dvdSize).tqarg(status.bytesWritten) );
+	kdebug(TQString("shrink factor %1 totalSize:%2 (status.bytesRead +status.bytesSkipped):%3 m_dvdSize:%4 status.bytesWritten:%5").arg(factor).arg(m_totalSize).arg(status.bytesRead +status.bytesSkipped).arg(m_dvdSize).arg(status.bytesWritten) );
 	vamps.setVapFactor(factor);
     } else {
 	vamps.setVapFactor(m_vampsFactor);
-	kdebug(TQString("vamps factor %1\n").tqarg(m_vampsFactor));
+	kdebug(TQString("vamps factor %1\n").arg(m_vampsFactor));
     }
 
 
@@ -302,7 +302,7 @@ void k9play::play() {
 
     /* set read ahead cache usage */
     if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) {
-        writeOutput( TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
+        writeOutput( TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
         return;
     }
 
@@ -310,14 +310,14 @@ void k9play::play() {
     if (dvdnav_menu_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK ||
             dvdnav_audio_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK ||
             dvdnav_spu_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK) {
-        writeOutput( TQString("ERR:Error on setting languages: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
+        writeOutput( TQString("ERR:Error on setting languages: %1\n").arg(dvdnav_err_to_string(dvdnav)));
         return ;
     }
 
     /* set the PGC positioning flag to have position information relatively to the
      * whole feature instead of just relatively to the current chapter */
     if (dvdnav_set_PGC_positioning_flag(dvdnav, 1) != DVDNAV_STATUS_OK) {
-        writeOutput(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
+        writeOutput(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
         return ;
     }
 
@@ -351,7 +351,7 @@ void k9play::play() {
 
 
         if (result == DVDNAV_STATUS_ERR) {
-            writeOutput(TQString("ERR:Error getting next block: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
+            writeOutput(TQString("ERR:Error getting next block: %1\n").arg(dvdnav_err_to_string(dvdnav)));
             return;
         }
         switch (event) {
@@ -367,7 +367,7 @@ void k9play::play() {
 
 		if ((m_endSector !=0xFFFFFFFF) && (((status.bytesRead+status.bytesSkipped)/2048) >m_endSector)) {
 			finished=1;
-			kdebug(TQString("pos >m_endSector %1 %2").tqarg((status.bytesRead+status.bytesSkipped)/2048).tqarg(m_endSector));
+			kdebug(TQString("pos >m_endSector %1 %2").arg((status.bytesRead+status.bytesSkipped)/2048).arg(m_endSector));
 		}
 		if ((m_chapter !=0 && ptt !=m_chapter) || (tt != m_title))
 			finished=1;
@@ -377,7 +377,7 @@ void k9play::play() {
 		if (!finished && m_chapterList.count() >0) {
 		    if (m_chapterList.findIndex( TQString::number(ptt)) == -1) {
 		        dvdnav_part_play(dvdnav,tt, ptt+1);
-		        kdebug( TQString("skipping chapter %1").tqarg(ptt));
+		        kdebug( TQString("skipping chapter %1").arg(ptt));
 		        continue;
 		    	//dvdnav_part_play(dvdnav_t *self, int32_t title, int32_t part);
 		    }
@@ -386,7 +386,7 @@ void k9play::play() {
 	
 		if (m_continue) {
 			dvdnav_sector_search(dvdnav,m_startSector , SEEK_SET);
-			kdebug (TQString("repositionning on %1").tqarg(m_startSector));
+			kdebug (TQString("repositionning on %1").arg(m_startSector));
 			m_continue=false;
 			finished=0;
 			bcell=true;
@@ -398,7 +398,7 @@ void k9play::play() {
 			    vamps.addData( buf,len);
 			    status.bytesRead +=len;
                             if (!m_useCache)
-			         writeOutput(TQString("\rINFOPOS: %1 %2").tqarg((status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN).tqarg(lgr));
+			         writeOutput(TQString("\rINFOPOS: %1 %2").arg((status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN).arg(lgr));
                             if (m_pos==0xFFFFFFFF)
                                 m_pos=(status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN;
 			}
@@ -531,7 +531,7 @@ void k9play::flush(k9SaveImage &_saveImage ) {
     TQFile out;
     out.open(IO_WriteOnly,stdout);
     while(!m_output->atEnd()) {
-        writeOutput(TQString("\rINFOPOS: %1 %2").tqarg(m_pos).tqarg(m_length));
+        writeOutput(TQString("\rINFOPOS: %1 %2").arg(m_pos).arg(m_length));
         m_pos+=20;
         int l=m_output->readBlock(buffer,20*DVD_VIDEO_LB_LEN);
         if (l>0) {
diff --git a/src/k9playbackoptions.cpp b/src/k9playbackoptions.cpp
index a4f197d..1831e09 100644
--- a/src/k9playbackoptions.cpp
+++ b/src/k9playbackoptions.cpp
@@ -153,7 +153,7 @@ void k9PlaybackOptions::lbSequenceChanged(TQListBoxItem *_item) {
 	if (title->getaudioStream(i)->getselected()) {
 //		if ( !title->getDefAudioSet())
 //		   title->setDefAudio(title->getaudioStream(i));
-		cbDefAudio->insertItem( TQString("%1 - %2").tqarg(title->getaudioStream(i)->getID()).tqarg(title->getaudioStream(i)->getlanguage()));
+		cbDefAudio->insertItem( TQString("%1 - %2").arg(title->getaudioStream(i)->getID()).arg(title->getaudioStream(i)->getlanguage()));
 		if (title->getaudioStream(i)==title->getDefAudio()) {
 		   cbDefAudio->setCurrentItem(cbDefAudio->count()-1);
 		}
@@ -164,7 +164,7 @@ void k9PlaybackOptions::lbSequenceChanged(TQListBoxItem *_item) {
     for (int i=0;i < title->getsubPictureCount();i++) {
 	if (title->getsubtitle(i)->getselected()) {
                 TQPixmap icon;
-		cbDefSub->insertItem(TQString("%1 - %2").tqarg(title->getsubtitle(i)->getID().first()).tqarg(title->getsubtitle(i)->getlanguage()));
+		cbDefSub->insertItem(TQString("%1 - %2").arg(title->getsubtitle(i)->getID().first()).arg(title->getsubtitle(i)->getlanguage()));
 		if (title->getsubtitle(i)==title->getDefSubtitle()) {
 		   cbDefSub->setCurrentItem(cbDefSub->count()-1);
 		}
diff --git a/src/k9titlefactor.cpp b/src/k9titlefactor.cpp
index fbbf337..0789de1 100644
--- a/src/k9titlefactor.cpp
+++ b/src/k9titlefactor.cpp
@@ -86,9 +86,9 @@ void k9TitleFactor::slFactor_valueChanged( int ) {
 		m_factor=-1;
 	}
 	if (m_current->getforceFactor())	
-        	tFactor->setText(TQString("%1").tqarg(m_current->getfactor(),4,'f',2));
+        	tFactor->setText(TQString("%1").arg(m_current->getfactor(),4,'f',2));
 	else
-		tFactor->setText(TQString("%1").tqarg(getFactor(),4,'f',2));
+		tFactor->setText(TQString("%1").arg(getFactor(),4,'f',2));
     }
 
 }
@@ -107,14 +107,14 @@ void k9TitleFactor::changedTitle(k9DVDTitle *_title) {
 	gbTitle->setChecked(m_current->getforceFactor());
 	m_updating=false;
 	
-	lbTitle->setText(TQString(i18n("Shrink Factor for %1")).tqarg(m_current->getname()));
+	lbTitle->setText(TQString(i18n("Shrink Factor for %1")).arg(m_current->getname()));
 	if (m_current->getforceFactor()) {
 		slFactor->setValue(m_current->getfactor()*100.0);
-		tFactor->setText(TQString("%1").tqarg(m_current->getfactor(),4,'f',2));        
+		tFactor->setText(TQString("%1").arg(m_current->getfactor(),4,'f',2));        
 		setMinFactor();
 	} else {
 		slFactor->setValue(getFactor()*100.0);
-		tFactor->setText(TQString("%1").tqarg(getFactor(),4,'f',2));
+		tFactor->setText(TQString("%1").arg(getFactor(),4,'f',2));
 		slFactor->setMinValue(100);
 	}
 		
diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp
index 20ca88e..af20c94 100755
--- a/src/kviewmpeg2.cpp
+++ b/src/kviewmpeg2.cpp
@@ -48,7 +48,7 @@ k9Widget::k9Widget(TQWidget *parent):TQWidget(parent) {
 void k9Widget::setImage(TQImage *_image) {
     m_image=_image;
     //paintEvent( NULL);
-    tqrepaint(FALSE);
+    repaint(FALSE);
 }
 
 void k9Widget::paintEvent( TQPaintEvent *_event) {
diff --git a/src/prefMPEG4.ui b/src/prefMPEG4.ui
index caecf62..3259bb8 100644
--- a/src/prefMPEG4.ui
+++ b/src/prefMPEG4.ui
@@ -152,7 +152,7 @@
                         <property name="maxLength">
                             <number>4</number>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignAuto</set>
                         </property>
                         <property name="inputMask">
@@ -228,7 +228,7 @@
                         <property name="maxLength">
                             <number>4</number>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignAuto</set>
                         </property>
                         <property name="inputMask">
@@ -509,7 +509,7 @@
                         <property name="maxLength">
                             <number>3</number>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignAuto</set>
                         </property>
                     </widget>
diff --git a/src/titlefactor.ui b/src/titlefactor.ui
index 5381e12..7d4f3e3 100644
--- a/src/titlefactor.ui
+++ b/src/titlefactor.ui
@@ -53,7 +53,7 @@
             <property name="title">
                 <string>Change Factor</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter</set>
             </property>
             <property name="flat">