TDE
/
k9copy
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source 
(cherry picked from commit 1e42ec2932)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 22c65d08e5
commit fc595fa929
31 changed files with 154 additions and 154 deletions
Show Stats Download Patch File Download Diff File

2
dvdread/dvd_udf.c
Unescape View File

@ -88,7 +88,7 @@ extern void SetAlignHandle(dvd_reader_t *device, void *align);
* this function should be rewritten to use posix_memalign or similar.
* It's just needed for aligning memory for small block reads from
* raw/O_DIRECT devices.
* We assume that 2048 is enough tqalignment for all systems at the moment.
* We assume that 2048 is enough alignment for all systems at the moment.
* Not thread safe. Only use this from one thread.
* Depends on sizeof(unsigned long) being at least as large as sizeof(void *)
*/

14
k9Mplayer/k9mplayer.cpp
Unescape View File

@ -92,9 +92,9 @@ void K9Mplayer::setTitle( const TQString & _numTitle,const TQString &_numChapter
if (_numChapter !="")
*m_process << "-chapter" << _numChapter;
*m_process << TQString("dvd://%1").tqarg(_numTitle);
*m_process << TQString("dvd://%1").arg(_numTitle);
if (!m_process->start( KProcess::NotifyOnExit,KProcess::All)) {
KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").tqarg("mplayer") , i18n("Preview"));
KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").arg("mplayer") , i18n("Preview"));
}
m_canwrite=TRUE;
@ -134,7 +134,7 @@ void K9Mplayer::slotNewPosition(int _pos,const TQTime & _time) {
}
void K9Mplayer::sliderReleased() {
sendCmd( TQString("seek %1 1").tqarg((int)slider->value()));
sendCmd( TQString("seek %1 1").arg((int)slider->value()));
m_seeking=FALSE;
}
@ -175,12 +175,12 @@ void K9Mplayer::open( k9DVD *_dvd,k9DVDTitle *_title,int chapter) {
cbAudio->clear();
for (int i=0; i< _title->getaudioStreamCount();i++) {
k9DVDAudioStream *aud=_title->getaudioStream(i);
cbAudio->insertItem(NULL,TQString("%1-%2").tqarg(aud->getID()).tqarg(aud->getlanguage()),-1);
cbAudio->insertItem(NULL,TQString("%1-%2").arg(aud->getID()).arg(aud->getlanguage()),-1);
}
for (int i=0; i< _title->getsubPictureCount();i++) {
k9DVDSubtitle *sub=_title->getsubtitle(i);
cbSub->insertItem(NULL,TQString("%1-%2").tqarg(sub->getID().first()).tqarg(sub->getlanguage()),-1);
cbSub->insertItem(NULL,TQString("%1-%2").arg(sub->getID().first()).arg(sub->getlanguage()),-1);
}
if(_title->getaspectRatio()=="16:9")
@ -207,12 +207,12 @@ void K9Mplayer::titleChanged() {}
void K9Mplayer::cbAudioActivated( int _value) {
if (m_dvdTitle) {
int value=m_dvdTitle->getaudioStream( _value)->getStreamId();
sendCmd(TQString( "switch_audio %1").tqarg(value));
sendCmd(TQString( "switch_audio %1").arg(value));
}
}
void K9Mplayer::cbSubActivated( int _value) {
sendCmd(TQString("sub_select %1").tqarg(_value));
sendCmd(TQString("sub_select %1").arg(_value));
}

2
k9Mplayer/mplayer.ui
Unescape View File

@ -314,7 +314,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

6
k9author/k9avidecode.cpp
Unescape View File

@ -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

4
k9author/k9menu.cpp
Unescape View File

@ -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++;
}

12
k9author/k9menuedit.cpp
Unescape View File

@ -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);

12
k9author/k9newdvd.cpp
Unescape View File

@ -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();

8
k9author/k9newtitle.cpp
Unescape View File

@ -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&)));

10
k9decmpeg/k9plaympeg2.cpp
Unescape View File

@ -55,7 +55,7 @@ void k9PlayMPEG2::playTitle() {
/* set read ahead cache usage */
if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) {
setError(TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
setError(TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
return;
}
@ -63,14 +63,14 @@ void k9PlayMPEG2::playTitle() {
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) {
setError(TQString("ERR:Error on setting languages: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
setError(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) {
setError(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
setError(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
return ;
}
@ -105,7 +105,7 @@ void k9PlayMPEG2::playTitle() {
if (result == DVDNAV_STATUS_ERR) {
setError(TQString("ERR:Error getting next block: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
setError(TQString("ERR:Error getting next block: %1\n").arg(dvdnav_err_to_string(dvdnav)));
return;
}
@ -254,7 +254,7 @@ void k9PlayMPEG2::open (dvd_reader_t *dvd,const TQString & device,k9DVDTitle * t
m_lastSector=0;
ret = stat(device.utf8(), &dvd_stat);
/* if ( ret < 0 ) {
c=i18n("Can't find device %1\n").tqarg(device.latin1());
c=i18n("Can't find device %1\n").arg(device.latin1());
setError(c);
return;
}

2
k9devices/k9halconnection.cpp
Unescape View File

@ -41,7 +41,7 @@ k9HalConnection::k9HalConnection(TQObject *parent, const char *name)
dbus_error_init( &error );
m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error );
if( dbus_error_is_set(&error) ) {
qDebug(TQString("Error connecting to DBUS : %1").tqarg(error.message));
qDebug(TQString("Error connecting to DBUS : %1").arg(error.message));
return;
}

2
k9devices/k9haldevice.cpp
Unescape View File

@ -95,7 +95,7 @@ void k9HalDevice::getDriveProperties() {
m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM;
m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR;
m_model=TQString(libhal_drive_get_model(drive));
// qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model));
// qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").arg(m_canReadDvd).arg(m_canBurnDvd).arg(m_model));
libhal_drive_free(drive);

20
k9vamps/k9vamps.cpp
Unescape View File

@ -185,7 +185,7 @@ void k9vamps::run () {
vobuf = (uchar*) malloc (vbuf_size);
if (vibuf == NULL || vobuf == NULL)
fatal (TQString("Allocation of video buffers failed: %1").tqarg(strerror (errno)));
fatal (TQString("Allocation of video buffers failed: %1").arg(strerror (errno)));
// actually do vaporization
@ -357,18 +357,18 @@ int k9vamps::check_video_packet (uchar *ptr) {
vid_packet_start_code |= (uint32_t) (ptr [3]);
if (vid_packet_start_code != 0x000001e0)
fatal(TQString ("Bad video packet start code at %1: %2").tqarg(rtell(ptr)).tqarg(vid_packet_start_code,0,16));
fatal(TQString ("Bad video packet start code at %1: %2").arg(rtell(ptr)).arg(vid_packet_start_code,0,16));
vid_packet_length = ptr [4] << 8;
vid_packet_length |= ptr [5];
vid_packet_length += 6;
if ((ptr [6] & 0xc0) != 0x80)
fatal (TQString("Not an MPEG2 video packet at %1").tqarg(rtell (ptr)));
fatal (TQString("Not an MPEG2 video packet at %1").arg(rtell (ptr)));
if (ptr [7]) {
if ((ptr [7] & 0xc0) != 0xc0)
qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7]));
qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").arg(rtell (ptr)).arg(ptr [7]));
else {
sequence_header_code = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24;
sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16;
@ -399,7 +399,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
pad_packet_start_code |= (uint32_t) (ptr [3]);
if (pad_packet_start_code != 0x000001be)
qDebug (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code));
qDebug (TQString("Bad padding packet start code at %1: %2").arg(rtell (ptr + vid_packet_length)).arg(pad_packet_start_code));
else {
pad_packet_length = ptr [4] << 8;
pad_packet_length |= ptr [5];
@ -409,7 +409,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
// length of video packet plus padding packet must always match sector size
if (14 + vid_packet_length + pad_packet_length != SECT_SIZE)
qDebug (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length));
qDebug (TQString("Bad video packet length at %1: %2").arg(rtell (ptr)).arg(vid_packet_length));
return rc;
}
@ -636,7 +636,7 @@ void k9vamps::vap_leader () {
data_length |= ptr [5];
if (14 + data_length != SECT_SIZE - 6)
fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length));
fatal (TQString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length));
//JMP:à vérifier
skip (SECT_SIZE);
@ -681,7 +681,7 @@ void k9vamps::vap_trailer (int length) {
data_length |= ptr [5];
if (14 + data_length != SECT_SIZE - 6)
fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length));
fatal (TQString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length));
skip (SECT_SIZE);
} else {
copy (SECT_SIZE);
@ -802,7 +802,7 @@ int k9vamps::vap_phase1 (void) {
data_length |= ptr [5];
if (14 + data_length != SECT_SIZE - 6)
fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length));
fatal (TQString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length));
break;
@ -938,7 +938,7 @@ void k9vamps::vap_phase2 (int seq_length) {
data_length |= ptr [5];
if (14 + data_length != SECT_SIZE - 6)
fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length));
fatal (TQString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length));
//JMP: à vérifier
skip (SECT_SIZE);
break;

2
libdvdnav/read_cache.c
Unescape View File

@ -47,7 +47,7 @@
typedef struct read_cache_chunk_s {
uint8_t *cache_buffer;
uint8_t *cache_buffer_base; /* used in malloc and free for tqalignment */
uint8_t *cache_buffer_base; /* used in malloc and free for alignment */
int32_t cache_start_sector; /* -1 means cache invalid */
int32_t cache_read_count; /* this many sectors are already read */
size_t cache_block_count; /* this many sectors will go in this chunk */

16
libk9copy/k9burndvd.cpp
Unescape View File

@ -176,9 +176,9 @@ void k9BurnDVD::getWodimCmd(k9Process *proc) {
*proc <<"-data";
if (m_speed !=i18n("default"))
*proc << TQString("speed=%1").tqarg(m_speed);
*proc <<TQString("dev=%1").tqarg(burnDevice);
*proc <<TQString("tsize=%1s").tqarg(imageSize);
*proc << TQString("speed=%1").arg(m_speed);
*proc <<TQString("dev=%1").arg(burnDevice);
*proc <<TQString("tsize=%1s").arg(imageSize);
*proc << "-";
}
@ -222,7 +222,7 @@ void k9BurnDVD::burnWithGenisoimage() {
if (!cancelled) {
int res=progress->execute();
if ( res==-1 ) {
KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").tqarg("genisoimage"), i18n("DVD burning") );
KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg("genisoimage"), i18n("DVD burning") );
cancelled=true;
} else {
if (proc->exitStatus()==0) {
@ -233,7 +233,7 @@ void k9BurnDVD::burnWithGenisoimage() {
} else {
TQString c;
c=i18n("An error occured while Burning DVD: %1").tqarg(lastMsg) +"\n" +i18n("Insert an other DVD");
c=i18n("An error occured while Burning DVD: %1").arg(lastMsg) +"\n" +i18n("Insert an other DVD");
if ( KMessageBox::warningContinueCancel ( 0,c, i18n("authoring"))!=KMessageBox::Continue) {
cancelled=true;
}
@ -306,7 +306,7 @@ void k9BurnDVD::burnWithGrowisofs() {
if (!cancelled) {
int res=progress->execute();
if ( res==-1 ) {
KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").tqarg(progname), i18n("DVD burning") );
KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg(progname), i18n("DVD burning") );
cancelled=true;
} else {
if (proc->exitStatus()==0) {
@ -317,7 +317,7 @@ void k9BurnDVD::burnWithGrowisofs() {
} else {
TQString c;
c=i18n("An error occured while Burning DVD: %1").tqarg(lastMsg) +"\n" +i18n("Insert an other DVD");
c=i18n("An error occured while Burning DVD: %1").arg(lastMsg) +"\n" +i18n("Insert an other DVD");
if ( KMessageBox::warningContinueCancel ( 0,c, i18n("authoring"))!=KMessageBox::Continue) {
cancelled=true;
}
@ -346,7 +346,7 @@ void k9BurnDVD::growisoStderr(KProcess *proc, char *buffer, int buflen) {
}
progress->setTitle(i18n("Burning DVD"));
progress->setLabelText(i18n("Current write speed :%1 x").tqarg(burnSpeed));
progress->setLabelText(i18n("Current write speed :%1 x").arg(burnSpeed));
if (c.contains("% done")) {
pos=c.find("%");
if (pos!=-1) {

8
libk9copy/k9cellcopylist.cpp
Unescape View File

@ -294,10 +294,10 @@ double k9CellCopyList::getMinFactor(bool _withMenus) {
double totalSize=gettotalSize()+menuSize - (fforced) -m_inbytes;
totalSize/=2.50;
qDebug(TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes));
qDebug(TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").arg(totalSize).arg(gettotalSize()).arg(menuSize).arg(fforced).arg(m_frcinbytes).arg(m_inbytes));
double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ;
qDebug(TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes));
qDebug(TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").arg(minFactor).arg(fforced).arg(m_frcinbytes).arg(MaxSize).arg(totalSize).arg(m_outbytes).arg(m_frcoutbytes));
if (minFactor<1)
minFactor=1;
@ -347,7 +347,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
if (dvdSize2 <0) {
factor=2.5;
//qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2));
//qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").arg(dvdSize).arg(m_outbytes).arg(fforcedsh).arg(dvdSize2));
}
else {
factor=(totalSize +menuSize - fforced -m_inbytes)/ dvdSize2 ;
@ -361,7 +361,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
uint64_t i=m_inbytes;
//if (o==0)
// o=1;
//qDebug(TQString("factor : %1 realise : %2").tqarg(factor).tqarg((double)i/(double)o));
//qDebug(TQString("factor : %1 realise : %2").arg(factor).arg((double)i/(double)o));
if (factor<=1)
factor=1;

4
libk9copy/k9drawimage.cpp
Unescape View File

@ -24,12 +24,12 @@ k9DrawImage::~k9DrawImage()
void k9DrawImage::setImage(const TQImage &_image){
m_pixmap =_image;
tqrepaint();
repaint();
}
void k9DrawImage::setImage(TQString _fileName) {
m_pixmap.load(_fileName);
tqrepaint();
repaint();
}
void k9DrawImage::paintEvent ( TQPaintEvent * ) {

20
libk9copy/k9dvd.cpp
Unescape View File

@ -150,7 +150,7 @@ k9DVD::k9DVD(TQObject *parent, const char *name,const TQStringList args) {
m_lsubpType.append(i18n("reserved"));
m_lsubpType.append(i18n("Director's comments"));
m_lsubpType.append(i18n("Large director's comments"));
m_lsubpType.append(i18n("Director's comments for tqchildren"));
m_lsubpType.append(i18n("Director's comments for children"));
m_frames_per_s[0]=-1.0;
@ -187,7 +187,7 @@ int k9DVD::get_title_name(const char* dvd_device, char* title) {
int i;
TQString c;
if (! (filehandle = fopen(dvd_device, "r"))) {
c=i18n("Couldn't open %1 for title\n").tqarg(dvd_device);
c=i18n("Couldn't open %1 for title\n").arg(dvd_device);
// setError(c );
strcpy(title, i18n("unknown").latin1());
return -1;
@ -195,7 +195,7 @@ int k9DVD::get_title_name(const char* dvd_device, char* title) {
if ( fseek(filehandle, 32808, SEEK_SET )) {
fclose(filehandle);
c=i18n("Couldn't seek in %1 for title\n").tqarg( dvd_device);
c=i18n("Couldn't seek in %1 for title\n").arg( dvd_device);
setError(c);
strcpy(title, i18n("unknown").latin1());
return -1;
@ -330,7 +330,7 @@ int k9DVD::scandvd (const TQString & device,bool _quickScan) {
/*
ret = stat(device.latin1(), &dvd_stat);
if ( ret < 0 ) {
c=i18n("Can't find device %1\n").tqarg( device);
c=i18n("Can't find device %1\n").arg( device);
setError(c);
return 1;
}
@ -340,7 +340,7 @@ int k9DVD::scandvd (const TQString & device,bool _quickScan) {
m_dvd.close();
m_dvd.openDevice(device);
if( !m_dvd.opened() ) {
c=i18n("Can't open disc %1!\n").tqarg(device);
c=i18n("Can't open disc %1!\n").arg(device);
setError(c);
return 2;
}
@ -393,8 +393,8 @@ int k9DVD::scandvd (const TQString & device,bool _quickScan) {
m_titleCount++;
vts_ttn = ttn;//ifo->vts_ptt_srpt->title[j].ptt[0].pgcn; //ifo_zero->tt_srpt->title[j].vts_ttn;
//JMPtxt=i18n("Title %1").tqarg(indexedCount);
txt=i18n("Title %1").tqarg(numTitle);
//JMPtxt=i18n("Title %1").arg(indexedCount);
txt=i18n("Title %1").arg(numTitle);
emit sigTotalText (txt);
emit sigTitleProgress(numTitle,ltitles);
video_attr = &vtsi_mat->vts_video_attr;
@ -691,7 +691,7 @@ k9DVDTitle* k9DVD::addTitle(k9DVDTitleset *_titleset,int id,int num,int _VTS,int
}
if (bappend)
m_titles.append(track);
track->name=i18n("Title %1").tqarg(num);
track->name=i18n("Title %1").arg(num);
if (!_indexed) {
for (uint i=0;i<m_titles.count();i++) {
@ -859,7 +859,7 @@ long k9DVD::stream_vob( int title, unsigned long startblock, unsigned long lastb
TQString c;
dvdfile =m_dvd.openTitle( title);
if( !dvdfile ) {
c=i18n("Error opening vobs for title %1\n").tqarg( title);
c=i18n("Error opening vobs for title %1\n").arg( title);
setError(c);
return 0;
}
@ -870,7 +870,7 @@ long k9DVD::stream_vob( int title, unsigned long startblock, unsigned long lastb
emit sigVobProgress(i-startblock,lastblock-startblock);
total+=size;
if( !size ) {
c=i18n("ERROR reading block %1\n").tqarg(i);
c=i18n("ERROR reading block %1\n").arg(i);
setError(c);
break;
}

40
libk9copy/k9dvdauthor.cpp
Unescape View File

@ -145,7 +145,7 @@ void k9DVDAuthor::addMenus(TQDomElement &titleSet) {
error=true;
TQString sMsg;
//sMsg.TQString::sprintf(tr2i18n("'%s' not selected"),l_track->getname().latin1());
sMsg=i18n("'%1' not selected").tqarg(l_track->getname());
sMsg=i18n("'%1' not selected").arg(l_track->getname());
KMessageBox::error( 0,sMsg, tr2i18n("authoring"));
}
start.sprintf("jump titleset %d menu;",DVD->getnewTitleNum(l_track));
@ -222,10 +222,10 @@ void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) {
TQString txtcmd;
if (audio !=-1) {
txtcmd="subtitle=%1;\n audio=%2;\n g1=0;jump title 1;";
txtcmd=txtcmd.tqarg(subtitle+63).tqarg(audio);
txtcmd=txtcmd.arg(subtitle+63).arg(audio);
} else {
txtcmd="subtitle=%1;\n g1=0;jump title 1;";
txtcmd=txtcmd.tqarg(subtitle+63);
txtcmd=txtcmd.arg(subtitle+63);
}
precmd.setNodeValue(txtcmd);
@ -339,23 +339,23 @@ void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) {
for (k9ChapterCell *cell =l_chap->cells.first();cell ;cell =l_chap->cells.next() ) {
icell++;
sCell = TQString("--cell %1").tqarg(icell);
sChapter=TQString("--chapter %1").tqarg(numPart);
sCell = TQString("--cell %1").arg(icell);
sChapter=TQString("--chapter %1").arg(numPart);
//test
uint32_t itotSize = (cell->getlastSector()-cell->getstartSector())* DVD_VIDEO_LB_LEN;
TQString file;
e=xml->createElement("vob");
file=TQString("k9copy --play --input %1 --dvdtitle %2 %3 %4 %5 %6 --vampsfactor %7 --inputsize %8 --chaptersize %9 ")
.tqarg(DVD->getDevice())
.tqarg(title->getnumTitle())
.tqarg(sChapter)
.tqarg(sCell)
.tqarg(caud)
.tqarg(csub)
.tqarg(titleFactor,0,'f',2)
.tqarg(itotSize,0,'f',0)
.tqarg(chapterSize,0,'f',0);
.arg(DVD->getDevice())
.arg(title->getnumTitle())
.arg(sChapter)
.arg(sCell)
.arg(caud)
.arg(csub)
.arg(titleFactor,0,'f',2)
.arg(itotSize,0,'f',0)
.arg(chapterSize,0,'f',0);
if (m_firsttitle) {
file +=" --initstatus ";
m_firsttitle=false;
@ -364,9 +364,9 @@ void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) {
file +=" --ffactor ";
}
file +=TQString(" --inject %1 --totalsize %2 --dvdsize %3 |")
.tqarg(inject)
.tqarg(m_totalSize -m_forced ,0,'f',0)
.tqarg(((uint64_t)k9DVDSize::getMaxSize() *1024 *1024) - m_forcedsh,0,'f',0);
.arg(inject)
.arg(m_totalSize -m_forced ,0,'f',0)
.arg(((uint64_t)k9DVDSize::getMaxSize() *1024 *1024) - m_forcedsh,0,'f',0);
e.setAttribute("file",file);
if (first)
@ -387,7 +387,7 @@ void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) {
c.sprintf("g1=%d;\ncall vmgm menu;",DVD->getnewTitleNum(l_next));
if( DVD->getnewTitleNum(l_next)==-1) {
error=true;
c=i18n("'%1' not selected").tqarg(l_next->getname());
c=i18n("'%1' not selected").arg(l_next->getname());
KMessageBox::error( 0, c, tr2i18n("authoring"));
}
@ -411,7 +411,7 @@ void k9DVDAuthor::setworkDir( const TQString& _newVal) {
void k9DVDAuthor::author() {
if ( ! k9Tools::checkProgram("dvdauthor")) {
KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").tqarg("dvdauthor") , i18n("authoring"));
KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").arg("dvdauthor") , i18n("authoring"));
error = TRUE;
return;
}
@ -505,7 +505,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
// m_copied+=totalBytes - m_lastPos;
m_copied=totalBytes;
m_lastPos=totalBytes;
//qDebug(TQString("copied : %1 totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512));
//qDebug(TQString("copied : %1 totalSize : %2").arg(m_copied).arg(m_totalSize*512));
m_percent=(float)m_copied / (float)(m_totalSize/DVD_VIDEO_LB_LEN );

18
libk9copy/k9dvdbackup.cpp
Unescape View File

@ -280,13 +280,13 @@ void k9DVDBackup::copyEmptyPgc(int _vts,k9Cell *_cell) {
k9DVDFile *dvdfile;
if ((dvdfile = m_dvdread->openTitle( _vts))== 0) {
TQString stmp;
stmp=i18n("Unable to open titleset %1").tqarg(_vts);
stmp=i18n("Unable to open titleset %1").arg(_vts);
seterror(stmp);
return ;
}
backupDlg->setTotalSteps(vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1);
TQString c;
c=i18n("Extracting titleset %1").tqarg(_vts);
c=i18n("Extracting titleset %1").arg(_vts);
backupDlg->setProgressLabel(c);
backupDlg->show();
@ -458,7 +458,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) {
k9DVDFile *dvdfile;
if ((dvdfile = m_dvdread->openMenu( _vts))== 0) {
TQString stmp;
stmp=i18n("Unable to open menu for titleset %1").tqarg(_vts);
stmp=i18n("Unable to open menu for titleset %1").arg(_vts);
seterror (stmp);
return 0;
}
@ -484,7 +484,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) {
uint32_t sector, dsi_next_vobu = 0;
uint32_t imax=length/sizeof(cell_adr_t);
TQString c;
c=i18n("Extracting menu for titleset %1").tqarg(_vts);
c=i18n("Extracting menu for titleset %1").arg(_vts);
backupDlg->setProgressLabel(c);
backupDlg->show();
@ -502,7 +502,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) {
nbCells++;
}
//else
//qDebug() << TQString("cell start sector (%1) exceed menu size (%2)").tqarg((ptr+i)->start_sector).tqarg(menuLastSector);
//qDebug() << TQString("cell start sector (%1) exceed menu size (%2)").arg((ptr+i)->start_sector).arg(menuLastSector);
}
cadr.sort();
vamps->reset();
@ -577,7 +577,7 @@ void k9DVDBackup::playCell (int vts_num, k9Cell *_cell,bool _empty) {
vts_handle=currTS->ifoTitle->getIFO();
if (!vts_handle) {
TQString stmp;
stmp=i18n("Unable to open ifo file for titleset %1").tqarg(vts_num);
stmp=i18n("Unable to open ifo file for titleset %1").arg(vts_num);
seterror (stmp);
//JMP vamps->setNoData();
return;
@ -585,7 +585,7 @@ void k9DVDBackup::playCell (int vts_num, k9Cell *_cell,bool _empty) {
backupDlg->setTotalSteps( vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1);
TQString c;
c=i18n("Extracting titleset %1").tqarg(vts_num);
c=i18n("Extracting titleset %1").arg(vts_num);
backupDlg->setProgressLabel(c);
backupDlg->show();
} else {
@ -599,7 +599,7 @@ void k9DVDBackup::playCell (int vts_num, k9Cell *_cell,bool _empty) {
dvdfile = m_dvdread->openTitle (vts_num);
if (! dvdfile) {
TQString stmp;
stmp=i18n("Unable to open vobs for titleset %1").tqarg(vts_num);
stmp=i18n("Unable to open vobs for titleset %1").arg(vts_num);
seterror( stmp);
//JMP vamps->setNoData();
return;
@ -1395,7 +1395,7 @@ void k9DVDBackup::updateVob(k9CellList *cellLst) {
sName="VIDEO_TS.VOB";
else
sName.sprintf("VTS_%02d_%d.VOB",(int)currVTS,(int)VobNum);
dbg=i18n("Updating vob %1").tqarg(sName);
dbg=i18n("Updating vob %1").arg(sName);
sName=output+"/"+sName;
TQFileInfo finfo(sName);
long fileSize=finfo.size();

6
libk9copy/k9mp4enc.cpp
Unescape View File

@ -274,7 +274,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
if ( ext!="" )
ext="."+ext;
path=m_filename.left ( m_filename.length()-ext.length() );
//path=TQString("%1-chapter%2-cell%3%4").tqarg(path).tqarg(ichapterCells.key()).tqarg(ichapterCells.value()).tqarg(ext);
//path=TQString("%1-chapter%2-cell%3%4").arg(path).arg(ichapterCells.key()).arg(ichapterCells.value()).arg(ext);
path=TQString ( "%1-chapter%2%3" ).arg ( path ).arg ( ichapterCells.key() ).arg ( ext );
++ichapterCells;
}
@ -312,9 +312,9 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
//*m_process << "-ovc" << sVOption;
/* int pos=sVOption.find("-vf");
if (pos==-1)
*m_process <<"-vf" << TQString("scale=%1:%2").tqarg(m_width).tqarg(m_height);
*m_process <<"-vf" << TQString("scale=%1:%2").arg(m_width).arg(m_height);
else
sVOption=sVOption.insert(pos+4,TQString("scale=%1:%2,").tqarg(m_width).tqarg(m_height));
sVOption=sVOption.insert(pos+4,TQString("scale=%1:%2,").arg(m_width).arg(m_height));
*/
*m_process << sVOption;

2
libk9copy/k9processlist.cpp
Unescape View File

@ -147,7 +147,7 @@ void k9ProcessList::setPos(k9Process *_process,double _pos) {
}
k9Process *k9ProcessList::addProcess(const TQString &label) {
TQString name=TQString("process%1").tqarg(m_items.count()) ;
TQString name=TQString("process%1").arg(m_items.count()) ;
k9Process *process=new k9Process(TQT_TQOBJECT(this),name.latin1());
m_processes.append(process);
TQListViewItem *item = new _k9ProcessListItem(lProcess,label);

4
libk9copy/mp4dlg.ui
Unescape View File

@ -89,7 +89,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>
@ -103,7 +103,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>

4
libk9copy/progress.ui
Unescape View File

@ -155,7 +155,7 @@
<property name="frameShadow">
<enum>Plain</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@ -220,7 +220,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>

24
src/k9main.cpp
Unescape View File

@ -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() )
{

16
src/k9mencodercmdgen.cpp
Unescape View File

@ -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;

26
src/k9play.cpp
Unescape View File

@ -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) {

4
src/k9playbackoptions.cpp
Unescape View File

@ -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);
}

10
src/k9titlefactor.cpp
Unescape View File

@ -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);
}

2
src/kviewmpeg2.cpp
Unescape View File

@ -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) {

6
src/prefMPEG4.ui
Unescape View File

@ -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>

2
src/titlefactor.ui
Unescape View File

@ -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">

Write Preview
Loading…
Cancel
Save