diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:35:52 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:35:52 -0600 |
commit | 1e42ec29323d1016df59b8b571d16fefe3d4e6f1 (patch) | |
tree | 3cdfd52c475c581a2e1fe682e0954305a21acea2 /k9author | |
parent | 445633c8ffa0b5219c036b130230fdc6d97e9894 (diff) | |
download | k9copy-1e42ec29323d1016df59b8b571d16fefe3d4e6f1.tar.gz k9copy-1e42ec29323d1016df59b8b571d16fefe3d4e6f1.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'k9author')
-rw-r--r-- | k9author/k9avidecode.cpp | 6 | ||||
-rw-r--r-- | k9author/k9menu.cpp | 4 | ||||
-rw-r--r-- | k9author/k9menuedit.cpp | 12 | ||||
-rw-r--r-- | k9author/k9newdvd.cpp | 12 | ||||
-rw-r--r-- | k9author/k9newtitle.cpp | 8 |
5 files changed, 21 insertions, 21 deletions
diff --git a/k9author/k9avidecode.cpp b/k9author/k9avidecode.cpp index 1ac2f4e..d4d2cdb 100644 --- a/k9author/k9avidecode.cpp +++ b/k9author/k9avidecode.cpp @@ -54,11 +54,11 @@ k9AviDecode::k9AviDecode(TQObject *parent, const char *name) FormatHandle=dlopen("libavformat.so",RTLD_LAZY | RTLD_GLOBAL); } if (!CodecHandle) { - m_error =i18n("Cannot open then library %1").tqarg("libavcodec"); + m_error =i18n("Cannot open then library %1").arg("libavcodec"); return; } if (!FormatHandle) { - m_error =i18n("Cannot open then library %1").tqarg("libavformat"); + m_error =i18n("Cannot open then library %1").arg("libavformat"); return; } m_error=""; @@ -111,7 +111,7 @@ bool k9AviDecode::open(const TQString & _fileName) { // Open video file if (av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0) { - m_error=i18n("Couldn't open the file %1").tqarg(_fileName); + m_error=i18n("Couldn't open the file %1").arg(_fileName); return false; // Couldn't open file} } // Retrieve stream information diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp index b8927f5..26a399c 100644 --- a/k9author/k9menu.cpp +++ b/k9author/k9menu.cpp @@ -202,7 +202,7 @@ void k9Menu::spumux(const TQString &_hiFileName,const TQString &_mpgFileName) { for (k9MenuButton *button=m_buttons.first();button;button=m_buttons.next()) { TQDomElement eButton = xml.createElement("button"); spu.appendChild(eButton); - eButton.setAttribute("name",TQString("button%1").tqarg(i)); + eButton.setAttribute("name",TQString("button%1").arg(i)); eButton.setAttribute("x0", TQString::number(button->getLeft())); eButton.setAttribute("y0",TQString::number(button->getTop())); eButton.setAttribute("x1",TQString::number(button->getLeft()+button->getWidth())); @@ -261,7 +261,7 @@ void k9Menu::appendMenu(TQDomElement *_rootNode) { pgc.appendChild(eButton); TQDomText eButtonTxt=doc.createTextNode(button->getScript()); eButton.appendChild(eButtonTxt); - eButton.setAttribute("name",TQString("button%1").tqarg(i)); + eButton.setAttribute("name",TQString("button%1").arg(i)); i++; } diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp index 1c8365c..ee94b3d 100644 --- a/k9author/k9menuedit.cpp +++ b/k9author/k9menuedit.cpp @@ -242,7 +242,7 @@ void k9MenuEdit::titleSelected(k9Title *_title) { disconnect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),0,0); cbEnd->setEnabled(true); m_menuEditor->clearSelection(); - lTitle->setText(i18n("Title %1 Menu").tqarg(_title->getNum()+1)); + lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1)); setCanvas(_title->getMenu()->getCanvas()); m_menuType=TITLEMENU; cbStart->clear(); @@ -266,8 +266,8 @@ void k9MenuEdit::titleSelected(k9Title *_title) { k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ; k9NewDVDItems *items=newDVD->getTitles(); for (k9Title *title=items->first();title;title=items->next()) { - cbEnd->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1)); - TQString script=TQString("g6=%1; call vmgm menu;" ).tqarg(title->getNum()+1); + cbEnd->insertItem(i18n("Play Title %1").arg(title->getNum()+1)); + TQString script=TQString("g6=%1; call vmgm menu;" ).arg(title->getNum()+1); m_endScripts << script; } for (int i=0;i<m_endScripts.count();i++ ){ @@ -292,9 +292,9 @@ void k9MenuEdit::rootSelected(k9NewDVD *_newDVD) { m_startScripts << ""; k9NewDVDItems *items=_newDVD->getTitles(); for (k9Title *title=items->first();title;title=items->next()) { - cbStart->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1)); - // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).tqarg(title->getNum()+1); - TQString script=TQString("g6=%1;" ).tqarg(title->getNum()+1); + cbStart->insertItem(i18n("Play Title %1").arg(title->getNum()+1)); + // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).arg(title->getNum()+1); + TQString script=TQString("g6=%1;" ).arg(title->getNum()+1); m_startScripts << script; if (script==_newDVD->getRootMenu()->getStartScript()) cbStart->setCurrentItem(cbStart->count()-1); diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp index e4c747f..48431da 100644 --- a/k9author/k9newdvd.cpp +++ b/k9author/k9newdvd.cpp @@ -157,7 +157,7 @@ void k9NewDVD::addTitles (TQDomElement &_root) { TQString menuFileName=m_workDir+KApplication::randomString(8)+".mpg"; m_tmpFiles << menuFileName, menu->setMenuFileName(menuFileName); - m_processList->addProgress(i18n("Creating menu for title %1").tqarg(title->getNum()+1)); + m_processList->addProgress(i18n("Creating menu for title %1").arg(title->getNum()+1)); menu->createMenus(&titleSet); TQDomElement eTitle=m_xml->createElement("titles"); @@ -244,7 +244,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile * break; } - k9Process *process=m_processList->addProcess(i18n("Encoding %1").tqarg(_aviFile->getFileName())); + k9Process *process=m_processList->addProcess(i18n("Encoding %1").arg(_aviFile->getFileName())); m_processList->setFileName(process,_aviFile->getFileName()); TQTime t(0,0); @@ -255,7 +255,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile * //m_process->clearArguments(); *process << "mencoder" << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg" <<"-afm" <<"libmad"; *process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000"; - *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").tqarg(m_videoBitrate).tqarg(m_config->getPrefAudioBitrate()).tqarg(m_config->getPrefAudioFormat().lower()); + *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").arg(m_videoBitrate).arg(m_config->getPrefAudioBitrate()).arg(m_config->getPrefAudioFormat().lower()); *process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName(); qDebug(process->debug()); /* @@ -376,15 +376,15 @@ void k9NewDVD::appendTitle(k9Title *_title) { btn->setLeft(left*(m_config->getPrefButtonWidth()+50) +50); btn->setWidth(m_config->getPrefButtonWidth()); btn->setHeight(m_config->getPrefButtonHeight()); - btn->setScript(TQString("g1=0;jump titleset %1 menu;").tqarg(_title->getNum()+1)); + btn->setScript(TQString("g1=0;jump titleset %1 menu;").arg(_title->getNum()+1)); btn->setTextPosition(k9MenuButton::RIGHT); - btn->setText(i18n("title %1").tqarg(_title->getNum()+1)); + btn->setText(i18n("title %1").arg(_title->getNum()+1)); btn->setColor(m_config->getPrefButtonTextColor()); btn->setFont(m_config->getPrefButtonFont()); TQString script="\n"; for (k9Title *t = m_titles.first();t;t=m_titles.next()) { - script +=TQString("if (g6== %1) { g6=0; jump titleset %2 menu;}\n").tqarg(t->getNum()+1).tqarg(t->getNum()+1); + script +=TQString("if (g6== %1) { g6=0; jump titleset %2 menu;}\n").arg(t->getNum()+1).arg(t->getNum()+1); } m_rootMenu->setStartScript2(script); emit sigAddTitle(); diff --git a/k9author/k9newtitle.cpp b/k9author/k9newtitle.cpp index a3db200..1882e9c 100644 --- a/k9author/k9newtitle.cpp +++ b/k9author/k9newtitle.cpp @@ -60,7 +60,7 @@ void k9NewTitle::bAddClicked() { k9LvItemImport * item=new k9LvItemImport(m_k9Import->getRoot(),k9LvItemImport::TITLE); item->setOpen(true); k9Title *title=new k9Title( m_k9Import->getNewDVD()); - item->setText(0,i18n("title %1").tqarg(title->getNum() +1)); + item->setText(0,i18n("title %1").arg(title->getNum() +1)); connect( title->getButton(),TQT_SIGNAL(sigsetImage(k9MenuButton*, const TQImage&)),m_k9Import,TQT_SLOT(buttonUpdated(k9MenuButton*, const TQImage&))); item->setTitle(title); @@ -114,7 +114,7 @@ void k9NewTitle::bAddClicked() { pos+=increment; file->setEnd(t.addMSecs(TQMIN(pos,fileInfo.getDuration()) *1000)); k9LvItemImport * itemch=new k9LvItemImport(item,k9LvItemImport::CHAPTER); - itemch->setText(0,i18n("chapter %1").tqarg(i+1)); + itemch->setText(0,i18n("chapter %1").arg(i+1)); itemch->setText(1,file->getStart().toString("hh:mm:ss") +" - "+file->getEnd().toString("hh:mm:ss") ); itemch->setAviFile(file); itemch->setTitle(title); @@ -134,9 +134,9 @@ void k9NewTitle::bAddClicked() { btn->setLeft(left); btn->setWidth(width); btn->setHeight(height); - btn->setScript(TQString("jump title 1 chapter %1 ;").tqarg(i+1)); + btn->setScript(TQString("jump title 1 chapter %1 ;").arg(i+1)); btn->setTextPosition(k9MenuButton::BOTTOM); - btn->setText(i18n("chapter %1").tqarg(i+1)); + btn->setText(i18n("chapter %1").arg(i+1)); btn->setColor(config.getPrefButtonTextColor()); btn->setFont(config.getPrefButtonFont()); connect(file,TQT_SIGNAL(imageChanged(const TQImage&)),btn,TQT_SLOT(setImage(const TQImage&))); |