From ef5831dd5c8811c94c9b1bc1377a90174d17c82c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:29:52 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- k3bsetup/base_k3bsetup2.ui | 12 +-- k3bsetup/k3bsetup2.cpp | 8 +- .../k3bproject/kfile_k3bprojectfileplugin.cpp | 2 +- libk3b/cddb/k3bcddb.cpp | 2 +- libk3b/cddb/k3bcddbhttpquery.cpp | 6 +- libk3b/cddb/k3bcddblocalquery.cpp | 4 +- libk3b/cddb/k3bcddblocalsubmit.cpp | 4 +- libk3b/cddb/k3bcddbmultientriesdialog.cpp | 12 +-- libk3b/cddb/k3bcddbpquery.cpp | 18 ++--- libk3b/cddb/k3bcddbpquery.h | 2 +- libk3b/cddb/k3bcddbquery.cpp | 8 +- libk3b/cddb/k3bcddbquery.h | 2 +- libk3b/core/k3bdefaultexternalprograms.cpp | 4 +- libk3b/core/k3bglobals.cpp | 4 +- libk3b/core/k3bjob.h | 2 +- libk3b/core/k3bprocess.cpp | 2 +- libk3b/core/k3bprogressinfoevent.h | 2 +- libk3b/core/k3bversion.cpp | 4 +- libk3b/jobs/k3baudiocuefilewritingjob.cpp | 8 +- libk3b/jobs/k3baudiosessionreadingjob.cpp | 6 +- libk3b/jobs/k3bbinimagewritingjob.cpp | 6 +- libk3b/jobs/k3bblankingjob.cpp | 6 +- libk3b/jobs/k3bcdcopyjob.cpp | 54 ++++++------- libk3b/jobs/k3bcdda2wavreader.cpp | 10 +-- libk3b/jobs/k3bclonejob.cpp | 16 ++-- libk3b/jobs/k3bclonetocreader.cpp | 2 +- libk3b/jobs/k3bdatatrackreader.cpp | 42 +++++------ libk3b/jobs/k3bdvdcopyjob.cpp | 34 ++++----- libk3b/jobs/k3bdvdformattingjob.cpp | 24 +++--- libk3b/jobs/k3biso9660imagewritingjob.cpp | 14 ++-- libk3b/jobs/k3breadcdreader.cpp | 24 +++--- libk3b/jobs/k3bverificationjob.cpp | 6 +- libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp | 26 +++---- libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp | 54 ++++++------- libk3b/k3bimage.xsd | 6 +- libk3b/plugin/k3baudioserver.cpp | 4 +- libk3b/plugin/k3bpluginmanager.cpp | 4 +- libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp | 2 +- libk3b/projects/audiocd/k3baudiocdtracksource.cpp | 6 +- libk3b/projects/audiocd/k3baudiodoc.cpp | 4 +- libk3b/projects/audiocd/k3baudiodoc.h | 2 +- libk3b/projects/audiocd/k3baudioimager.cpp | 6 +- libk3b/projects/audiocd/k3baudiojob.cpp | 24 +++--- libk3b/projects/audiocd/k3baudiojobtempdata.cpp | 2 +- libk3b/projects/audiocd/k3baudionormalizejob.cpp | 14 ++-- libk3b/projects/datacd/k3bdatadoc.cpp | 22 +++--- libk3b/projects/datacd/k3bdatajob.cpp | 24 +++--- libk3b/projects/datacd/k3bdatapreparationjob.cpp | 8 +- libk3b/projects/datacd/k3bdiritem.cpp | 36 ++++----- libk3b/projects/datacd/k3bdiritem.h | 8 +- libk3b/projects/datacd/k3bisoimager.cpp | 34 ++++----- libk3b/projects/datacd/k3bmkisofshandler.cpp | 6 +- libk3b/projects/datacd/k3bmsinfofetcher.cpp | 10 +-- libk3b/projects/datadvd/k3bdvdbooktypejob.cpp | 10 +-- libk3b/projects/datadvd/k3bdvdjob.cpp | 24 +++--- libk3b/projects/k3bcdrdaowriter.cpp | 58 +++++++------- libk3b/projects/k3bcdrecordwriter.cpp | 48 ++++++------ libk3b/projects/k3bcuefileparser.cpp | 2 +- libk3b/projects/k3bdvdrecordwriter.cpp | 8 +- libk3b/projects/k3bgrowisofshandler.cpp | 14 ++-- libk3b/projects/k3bgrowisofshandler.h | 2 +- libk3b/projects/k3bgrowisofswriter.cpp | 18 ++--- libk3b/projects/k3bimagefilereader.cpp | 2 +- libk3b/projects/k3binffilewriter.cpp | 6 +- libk3b/projects/k3binffilewriter.h | 2 +- libk3b/projects/k3btocfilewriter.cpp | 6 +- libk3b/projects/k3btocfilewriter.h | 2 +- libk3b/projects/mixedcd/k3bmixedjob.cpp | 48 ++++++------ libk3b/projects/movixcd/k3bmovixdoc.cpp | 2 +- libk3b/projects/movixcd/k3bmovixdocpreparer.cpp | 8 +- libk3b/projects/movixcd/k3bmovixjob.cpp | 6 +- libk3b/projects/movixcd/k3bmovixprogram.cpp | 2 +- libk3b/projects/movixdvd/k3bmovixdvdjob.cpp | 6 +- libk3b/projects/videocd/cdi/cdi_vcd.app | Bin 102402 -> 102400 bytes libk3b/projects/videocd/k3bvcddoc.cpp | 14 ++-- libk3b/projects/videocd/k3bvcddoc.h | 2 +- libk3b/projects/videocd/k3bvcdjob.cpp | 58 +++++++------- libk3b/projects/videocd/k3bvcdoptions.cpp | 2 +- libk3b/projects/videocd/k3bvcdtrack.cpp | 20 ++--- libk3b/projects/videocd/k3bvcdxmlview.cpp | 48 ++++++------ libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp | 38 +++++----- libk3b/projects/videodvd/k3bvideodvdimager.cpp | 16 ++-- libk3b/projects/videodvd/k3bvideodvdjob.cpp | 4 +- libk3b/tools/k3bbusywidget.cpp | 6 +- libk3b/tools/k3bbusywidget.h | 4 +- libk3b/tools/k3bcdparanoialib.h | 2 +- libk3b/tools/k3bcutcombobox.cpp | 14 ++-- libk3b/tools/k3bcutcombobox.h | 4 +- libk3b/tools/k3bdeviceselectiondialog.cpp | 2 +- libk3b/tools/k3blistview.cpp | 44 +++++------ libk3b/tools/k3blistviewitemanimator.cpp | 2 +- libk3b/tools/k3bmd5job.cpp | 12 +-- libk3b/tools/k3bmsfedit.cpp | 6 +- libk3b/tools/k3bmsfedit.h | 2 +- libk3b/tools/k3bmultichoicedialog.cpp | 2 +- libk3b/tools/k3bprogressdialog.cpp | 2 +- libk3b/tools/k3bpushbutton.cpp | 4 +- libk3b/tools/k3brichtextlabel.cpp | 12 +-- libk3b/tools/k3brichtextlabel.h | 6 +- libk3b/tools/k3bstdguiitems.cpp | 2 +- libk3b/tools/k3btitlelabel.cpp | 20 ++--- libk3b/tools/k3btitlelabel.h | 8 +- libk3b/tools/k3btoolbox.cpp | 22 +++--- libk3b/tools/k3btoolbutton.cpp | 2 +- libk3b/tools/kcutlabel.cpp | 8 +- libk3b/tools/kcutlabel.h | 2 +- libk3b/videodvd/k3bvideodvd.cpp | 8 +- libk3bdevice/k3bcdtext.cpp | 24 +++--- libk3bdevice/k3bdevice.cpp | 32 ++++---- libk3bdevice/k3bdevice.h | 2 +- libk3bdevice/k3bdevice_mmc.cpp | 2 +- libk3bdevice/k3bdevicemanager.cpp | 8 +- libk3bdevice/k3bmmc.h | 2 +- libk3bdevice/k3bscsicommand.cpp | 4 +- plugins/audiooutput/alsa/k3balsaoutputplugin.cpp | 22 +++--- plugins/decoder/flac/k3bflacdecoder.cpp | 4 +- .../decoder/libsndfile/k3blibsndfiledecoder.cpp | 2 +- plugins/decoder/mp3/k3bmaddecoder.cpp | 4 +- plugins/decoder/ogg/k3boggvorbisdecoder.cpp | 8 +- plugins/decoder/wave/k3bwavedecoder.cpp | 4 +- .../base_k3bexternalencoderconfigwidget.ui | 4 +- plugins/encoder/external/k3bexternalencoder.cpp | 4 +- .../external/k3bexternalencoderconfigwidget.cpp | 2 +- .../lame/base_k3blameencodersettingswidget.ui | 24 +++--- .../lame/base_k3bmanualbitratesettingswidget.ui | 6 +- plugins/encoder/lame/k3blameencoder.cpp | 22 +++--- .../ogg/base_k3boggvorbisencodersettingswidget.ui | 16 ++-- plugins/encoder/ogg/k3boggvorbisencoder.cpp | 4 +- .../encoder/sox/base_k3bsoxencoderconfigwidget.ui | 8 +- plugins/encoder/sox/k3bsoxencoder.cpp | 2 +- .../k3baudiometainforenamerplugin.cpp | 10 +-- src/fastscale/scale.cpp | 2 +- src/k3b.cpp | 44 +++++------ src/k3b.h | 4 +- src/k3bappdevicemanager.cpp | 2 +- src/k3bapplication.cpp | 2 +- src/k3baudioplayer.cpp | 16 ++-- src/k3bburnprogressdialog.cpp | 12 +-- src/k3bburnprogressdialog.h | 2 +- src/k3bcontentsview.cpp | 4 +- src/k3bdataprojectinterface.cpp | 4 +- src/k3bdataprojectinterface.h | 2 +- src/k3bdebuggingoutputdialog.cpp | 22 +++--- src/k3bdebuggingoutputfile.cpp | 14 ++-- src/k3bdirview.cpp | 18 ++--- src/k3bdiskinfoview.cpp | 36 ++++----- src/k3bemptydiscwaiter.cpp | 84 ++++++++++----------- src/k3bfiletreecombobox.cpp | 22 +++--- src/k3bfiletreeview.cpp | 24 +++--- src/k3bfileview.cpp | 12 +-- src/k3bfirstrun.cpp | 2 +- src/k3bflatbutton.cpp | 4 +- src/k3bflatbutton.h | 2 +- src/k3binteractiondialog.cpp | 36 ++++----- src/k3binteractiondialog.h | 2 +- src/k3bjobinterface.cpp | 2 +- src/k3bjobprogressdialog.cpp | 62 +++++++-------- src/k3bjobprogressdialog.h | 2 +- src/k3blsofwrapperdialog.cpp | 6 +- src/k3bmediacontentsview.cpp | 2 +- src/k3bmediaselectioncombobox.cpp | 14 ++-- src/k3bmediaselectiondialog.cpp | 2 +- src/k3bmedium.cpp | 40 +++++----- src/k3bminibutton.cpp | 10 +-- src/k3bpassivepopup.cpp | 6 +- src/k3bprojectmanager.cpp | 18 ++--- src/k3bsidepanel.cpp | 8 +- src/k3bsplash.cpp | 10 +-- src/k3bstatusbarmanager.cpp | 16 ++-- src/k3bsystemproblemdialog.cpp | 78 +++++++++---------- src/k3btempdirselectionwidget.cpp | 10 +-- src/k3bthemedheader.cpp | 20 ++--- src/k3bthemedheader.h | 2 +- src/k3btimeoutwidget.cpp | 8 +- src/k3btimeoutwidget.h | 4 +- src/k3bwelcomewidget.cpp | 14 ++-- src/k3bwelcomewidget.h | 2 +- src/k3bwidgetshoweffect.cpp | 2 +- src/k3bwriterselectionwidget.cpp | 14 ++-- src/misc/k3bblankingdialog.cpp | 10 +-- src/misc/k3bcdcopydialog.cpp | 6 +- src/misc/k3bcdimagewritingdialog.cpp | 64 ++++++++-------- src/misc/k3bdvdcopydialog.cpp | 4 +- src/misc/k3bdvdformattingdialog.cpp | 12 +-- src/misc/k3bisoimagewritingdialog.cpp | 30 ++++---- src/option/base_k3bcddboptiontab.ui | 6 +- src/option/base_k3bmiscoptiontab.ui | 8 +- src/option/base_k3bpluginoptiontab.ui | 2 +- src/option/base_k3bthemeoptiontab.ui | 8 +- src/option/k3bburningoptiontab.cpp | 10 +-- src/option/k3bcddboptiontab.cpp | 16 ++-- src/option/k3bdeviceoptiontab.cpp | 4 +- src/option/k3bdevicewidget.cpp | 40 +++++----- src/option/k3bexternalbinoptiontab.cpp | 4 +- src/option/k3bexternalbinwidget.cpp | 2 +- src/option/k3bmiscoptiontab.cpp | 6 +- src/option/k3bnotifyoptiontab.cpp | 2 +- src/option/k3boptiondialog.cpp | 2 +- src/option/k3bthemeoptiontab.cpp | 2 +- src/projects/base_k3badvanceddataimagesettings.ui | 2 +- src/projects/base_k3baudiocdtextallfieldswidget.ui | 10 +-- src/projects/base_k3baudiocdtextwidget.ui | 10 +-- src/projects/base_k3baudiotrackwidget.ui | 10 +-- src/projects/base_k3bbootimageview.ui | 10 +-- src/projects/base_k3bdataimagesettings.ui | 4 +- src/projects/base_k3bdatavolumedescwidget.ui | 12 +-- src/projects/base_k3bmovixoptionswidget.ui | 6 +- src/projects/k3baudioburndialog.cpp | 4 +- src/projects/k3baudiocdtextwidget.cpp | 2 +- src/projects/k3baudiodatasourceeditwidget.cpp | 6 +- src/projects/k3baudiodatasourceviewitem.cpp | 4 +- src/projects/k3baudioeditorwidget.cpp | 44 +++++------ src/projects/k3baudioeditorwidget.h | 4 +- src/projects/k3baudiotrackaddingdialog.cpp | 24 +++--- src/projects/k3baudiotrackdialog.cpp | 4 +- src/projects/k3baudiotrackplayer.cpp | 6 +- src/projects/k3baudiotracksplitdialog.cpp | 22 +++--- src/projects/k3baudiotracktrmlookupdialog.cpp | 4 +- src/projects/k3baudiotrackview.cpp | 4 +- src/projects/k3baudiotrackviewitem.cpp | 4 +- src/projects/k3baudioview.cpp | 2 +- src/projects/k3bbootimageview.cpp | 2 +- .../k3bdataadvancedimagesettingswidget.cpp | 10 +-- src/projects/k3bdataburndialog.cpp | 6 +- src/projects/k3bdatadirtreeview.cpp | 8 +- src/projects/k3bdatafileview.cpp | 2 +- src/projects/k3bdataimagesettingswidget.cpp | 8 +- src/projects/k3bdatapropertiesdialog.cpp | 10 +-- src/projects/k3bdataurladdingdialog.cpp | 56 +++++++------- src/projects/k3bdataview.cpp | 2 +- src/projects/k3bdataviewitem.cpp | 8 +- src/projects/k3bdvdburndialog.cpp | 6 +- src/projects/k3bencodingconverter.cpp | 2 +- src/projects/k3bfillstatusdisplay.cpp | 54 ++++++------- src/projects/k3bfillstatusdisplay.h | 4 +- src/projects/k3bmixedburndialog.cpp | 4 +- src/projects/k3bmixeddirtreeview.cpp | 4 +- src/projects/k3bmixedview.cpp | 2 +- src/projects/k3bmovixburndialog.cpp | 6 +- src/projects/k3bmovixdvdburndialog.cpp | 6 +- src/projects/k3bmovixlistview.cpp | 4 +- src/projects/k3bmovixview.cpp | 2 +- src/projects/k3bmusicbrainzjob.cpp | 10 +-- src/projects/k3bprojectburndialog.cpp | 12 +-- src/projects/k3bvcdburndialog.cpp | 36 ++++----- src/projects/k3bvcdlistview.cpp | 2 +- src/projects/k3bvcdtrackdialog.cpp | 60 +++++++-------- src/projects/k3bvcdview.cpp | 2 +- src/projects/k3bvideodvdburndialog.cpp | 6 +- src/projects/k3bview.cpp | 4 +- src/rip/base_k3baudiorippingoptionwidget.ui | 12 +-- src/rip/base_k3bcddbpatternwidget.ui | 10 +-- src/rip/k3baudiocdview.cpp | 20 ++--- src/rip/k3baudioprojectconvertingdialog.cpp | 4 +- src/rip/k3baudioprojectconvertingthread.cpp | 38 +++++----- src/rip/k3baudiorippingdialog.cpp | 6 +- src/rip/k3baudioripthread.cpp | 44 +++++------ src/rip/k3bcddbpatternwidget.cpp | 6 +- src/rip/k3bcuefilewriter.cpp | 4 +- src/rip/k3bcuefilewriter.h | 2 +- src/rip/k3bpatternparser.cpp | 8 +- src/rip/k3bvideocdinfo.cpp | 2 +- src/rip/k3bvideocdrip.cpp | 34 ++++----- src/rip/k3bvideocdrippingdialog.cpp | 22 +++--- src/rip/k3bvideocdview.cpp | 14 ++-- src/rip/videodvd/base_k3bvideodvdrippingwidget.ui | 28 +++---- src/rip/videodvd/k3bvideodvdrippingdialog.cpp | 34 ++++----- src/rip/videodvd/k3bvideodvdrippingjob.cpp | 16 ++-- src/rip/videodvd/k3bvideodvdrippingpreview.cpp | 4 +- .../videodvd/k3bvideodvdrippingtitlelistview.cpp | 34 ++++----- src/rip/videodvd/k3bvideodvdrippingview.cpp | 6 +- src/rip/videodvd/k3bvideodvdrippingwidget.cpp | 14 ++-- 272 files changed, 1702 insertions(+), 1702 deletions(-) diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui index 6fe902c..25df4e2 100644 --- a/k3bsetup/base_k3bsetup2.ui +++ b/k3bsetup/base_k3bsetup2.ui @@ -21,7 +21,7 @@ - tqlayout6 + layout6 @@ -40,7 +40,7 @@ - tqlayout1 + layout1 @@ -73,7 +73,7 @@ - tqlayout2 + layout2 @@ -89,7 +89,7 @@ Fixed - + 20 10 @@ -186,7 +186,7 @@ - tqlayout3 + layout3 @@ -202,7 +202,7 @@ Expanding - + 40 20 diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp index b88a9db..5414d2e 100644 --- a/k3bsetup/k3bsetup2.cpp +++ b/k3bsetup/k3bsetup2.cpp @@ -15,7 +15,7 @@ #include -#include +#include #include #include #include @@ -260,7 +260,7 @@ void K3bSetup2::updatePrograms() if( perm != wantedPerm || fi.owner() != "root" || fi.group() != wantedGroup ) { - bi->setText( 4, TQString("%1 root.%2").tqarg(wantedPerm,0,8).tqarg(wantedGroup) ); + bi->setText( 4, TQString("%1 root.%2").arg(wantedPerm,0,8).arg(wantedGroup) ); if( bi->isOn() ) d->changesNeeded = true; } @@ -405,7 +405,7 @@ void K3bSetup2::save() // TODO: create the group if it's not there g = getgrnam( burningGroup().local8Bit() ); if( !g ) { - KMessageBox::error( this, i18n("There is no group %1.").tqarg(burningGroup()) ); + KMessageBox::error( this, i18n("There is no group %1.").arg(burningGroup()) ); return; } } @@ -536,7 +536,7 @@ void K3bSetup2::slotAddDevice() emit changed( d->changesNeeded ); } else - KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename), + KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename), i18n("Error"), false ); } } diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp index 953f0e7..68a5027 100644 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp +++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index 416ab10..78767c2 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -187,7 +187,7 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s ) } m_httpQuery->setServer( server, port ); - m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::tqfromLatin1("/~cddb/cddb.cgi") ); + m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::fromLatin1("/~cddb/cddb.cgi") ); return m_httpQuery; } diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index f3b9152..45af445 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -58,7 +58,7 @@ void K3bCddbHttpQuery::doMatchQuery() m_state = READ; m_parsingBuffer.truncate(0); - performCommand( TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ) ); + performCommand( TQString( "cddb read %1 %2").arg( header().category ).arg( header().discid ) ); } @@ -82,7 +82,7 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd ) if( !job ) { setError( CONNECTION_ERROR ); - emit infoMessage( i18n("Could not connect to host %1").tqarg(m_server) ); + emit infoMessage( i18n("Could not connect to host %1").arg(m_server) ); emitQueryFinished(); return; } diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp index 1c247dd..96ce176 100644 --- a/libk3b/cddb/k3bcddblocalquery.cpp +++ b/libk3b/cddb/k3bcddblocalquery.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -38,7 +38,7 @@ K3bCddbLocalQuery::~K3bCddbLocalQuery() void K3bCddbLocalQuery::doQuery() { - emit infoMessage( i18n("Searching entry in %1").tqarg( m_cddbDir ) ); + emit infoMessage( i18n("Searching entry in %1").arg( m_cddbDir ) ); kapp->processEvents(); //BAD! TQString path = preparePath( m_cddbDir ); diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp index 3c401b1..294e413 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.cpp +++ b/libk3b/cddb/k3bcddblocalsubmit.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -94,7 +94,7 @@ void K3bCddbLocalSubmit::doSubmit() else { kdDebug() << "(K3bCddbLocalSubmit) could not find directory: " << path << endl; setError( IO_ERROR ); - emit infoMessage( i18n("Could not find directory: %1").tqarg(path) ); + emit infoMessage( i18n("Could not find directory: %1").arg(path) ); emit submitFinished( this ); } } diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp index f8746b7..0e7a5bc 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp +++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp @@ -16,7 +16,7 @@ #include "k3bcddbmultientriesdialog.h" -#include +#include #include #include @@ -29,13 +29,13 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const ch : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name ) { TQFrame* frame = plainPage(); - TQVBoxLayout* tqlayout = new TQVBoxLayout( frame ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( spacingHint() ); - tqlayout->setMargin( 0 ); + TQVBoxLayout* layout = new TQVBoxLayout( frame ); + layout->setAutoAdd( true ); + layout->setSpacing( spacingHint() ); + layout->setMargin( 0 ); TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame ); - infoLabel->tqsetAlignment( WordBreak ); + infoLabel->setAlignment( WordBreak ); m_listBox = new KListBox( frame, "list_box"); diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp index bcd75be..74d318c 100644 --- a/libk3b/cddb/k3bcddbpquery.cpp +++ b/libk3b/cddb/k3bcddbpquery.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -54,7 +54,7 @@ void K3bCddbpQuery::doQuery() // connect to the server m_socket->connectToHost( m_server, m_port ); - emit infoMessage( i18n("Searching %1 on port %2").tqarg(m_server).tqarg(m_port) ); + emit infoMessage( i18n("Searching %1 on port %2").arg(m_server).arg(m_port) ); } @@ -63,7 +63,7 @@ void K3bCddbpQuery::doMatchQuery() // we should still be connected // TODO: check this - TQString read = TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ); + TQString read = TQString( "cddb read %1 %2").arg( header().category ).arg( header().discid ); m_state = READ; m_parsingBuffer = ""; @@ -258,16 +258,16 @@ void K3bCddbpQuery::slotError( int e ) { switch(e) { case TQSocket::ErrConnectionRefused: - kdDebug() << i18n("Connection to %1 refused").tqarg( m_server ) << endl; - emit infoMessage( i18n("Connection to %1 refused").tqarg( m_server ) ); + kdDebug() << i18n("Connection to %1 refused").arg( m_server ) << endl; + emit infoMessage( i18n("Connection to %1 refused").arg( m_server ) ); break; case TQSocket::ErrHostNotFound: - kdDebug() << i18n("Could not find host %1").tqarg( m_server ) << endl; - emit infoMessage( i18n("Could not find host %1").tqarg( m_server ) ); + kdDebug() << i18n("Could not find host %1").arg( m_server ) << endl; + emit infoMessage( i18n("Could not find host %1").arg( m_server ) ); break; case TQSocket::ErrSocketRead: - kdDebug() << i18n("Error while reading from %1").tqarg( m_server ) << endl; - emit infoMessage( i18n("Error while reading from %1").tqarg( m_server ) ); + kdDebug() << i18n("Error while reading from %1").arg( m_server ) << endl; + emit infoMessage( i18n("Error while reading from %1").arg( m_server ) ); break; } diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h index d0a12bc..2a9b87b 100644 --- a/libk3b/cddb/k3bcddbpquery.h +++ b/libk3b/cddb/k3bcddbpquery.h @@ -21,7 +21,7 @@ #include #include -#include +#include class TQSocket; diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp index e4ccc75..ffd4e20 100644 --- a/libk3b/cddb/k3bcddbquery.cpp +++ b/libk3b/cddb/k3bcddbquery.cpp @@ -25,7 +25,7 @@ #include -#include +#include #include #include #include @@ -226,7 +226,7 @@ TQString K3bCddbQuery::handshakeString() const if( host.isEmpty() ) host = "kde-host"; - return TQString("%1 %2 K3b %3").tqarg(user).tqarg(host).tqarg(kapp->aboutData()->version()); + return TQString("%1 %2 K3b %3").arg(user).arg(host).arg(kapp->aboutData()->version()); } @@ -238,10 +238,10 @@ TQString K3bCddbQuery::queryString() const + TQString::number( (unsigned int)m_toc.count() ); for( K3bDevice::Toc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) { - query.append( TQString( " %1" ).tqarg( (*it).firstSector().lba() ) ); + query.append( TQString( " %1" ).arg( (*it).firstSector().lba() ) ); } - query.append( TQString( " %1" ).tqarg( m_toc.length().lba() / 75 ) ); + query.append( TQString( " %1" ).arg( m_toc.length().lba() / 75 ) ); return query; } diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h index 6d75262..3d81383 100644 --- a/libk3b/cddb/k3bcddbquery.h +++ b/libk3b/cddb/k3bcddbquery.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include "k3bcddbresult.h" diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp index 12e149d..33a256c 100644 --- a/libk3b/core/k3bdefaultexternalprograms.cpp +++ b/libk3b/core/k3bdefaultexternalprograms.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -186,7 +186,7 @@ bool K3bCdrecordProgram::scan( const TQString& p ) endPos = out.output().find( "\n", pos ); // cdrecord does not use local encoding for the copyright statement but plain latin1 - bin->copyright = TQString::tqfromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace(); + bin->copyright = TQString::fromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace(); } else { kdDebug() << "(K3bCdrecordProgram) could not start " << path << endl; diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index be9a7a1..c01e289 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -169,7 +169,7 @@ TQString K3b::findUniqueFilePrefix( const TQString& _prefix, const TQString& pat TQString K3b::findTempFile( const TQString& ending, const TQString& d ) { - return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::tqfromLatin1(".") + ending) ); + return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::fromLatin1(".") + ending) ); } @@ -387,7 +387,7 @@ TQString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExter else if( (plainAtapiSupport() && bin->hasFeature("plain-atapi") ) ) return dev->blockDeviceName(); else - return TQString("ATAPI:%1").tqarg(dev->blockDeviceName()); + return TQString("ATAPI:%1").arg(dev->blockDeviceName()); } diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h index cbb4758..a5a738f 100644 --- a/libk3b/core/k3bjob.h +++ b/libk3b/core/k3bjob.h @@ -285,7 +285,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob void setWritingApp( int w ) { m_writeMethod = w; } signals: - void buffertqStatus( int ); + void bufferStatus( int ); void deviceBuffer( int ); diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp index ca8d2e0..c46fd0a 100644 --- a/libk3b/core/k3bprocess.cpp +++ b/libk3b/core/k3bprocess.cpp @@ -192,7 +192,7 @@ TQStringList K3bProcess::splitOutput( char* data, int len, // check if line ends with a newline // if not save the last line because it is not finished TQChar c = buffer.right(1).at(0); - bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is tqunicode 46?? It is printed as a point + bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is unicode 46?? It is printed as a point if( hasUnfinishedLine ) { kdDebug() << "(K3bProcess) found unfinished line: '" << lines.last() << "'" << endl; kdDebug() << "(K3bProcess) last char: '" << buffer.right(1) << "'" << endl; diff --git a/libk3b/core/k3bprogressinfoevent.h b/libk3b/core/k3bprogressinfoevent.h index 78e17a2..3e0b67e 100644 --- a/libk3b/core/k3bprogressinfoevent.h +++ b/libk3b/core/k3bprogressinfoevent.h @@ -69,7 +69,7 @@ class K3bProgressInfoEvent : public TQCustomEvent NewTask, NewSubTask, DebuggingOutput, - BuffertqStatus, + BufferStatus, WriteSpeed, NextTrack }; diff --git a/libk3b/core/k3bversion.cpp b/libk3b/core/k3bversion.cpp index 0eb6f19..cc91dd5 100644 --- a/libk3b/core/k3bversion.cpp +++ b/libk3b/core/k3bversion.cpp @@ -157,9 +157,9 @@ TQString K3bVersion::createVersionString( int majorVersion, TQString s = TQString::number(majorVersion); if( minorVersion > -1 ) { - s.append( TQString(".%1").tqarg(minorVersion) ); + s.append( TQString(".%1").arg(minorVersion) ); if( patchlevel > -1 ) - s.append( TQString(".%1").tqarg(patchlevel) ); + s.append( TQString(".%1").arg(patchlevel) ); } if( !suffix.isNull() ) diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp index d66b529..c0c07d5 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp +++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp @@ -76,7 +76,7 @@ K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObjec connect( m_audioJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_audioJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_audioJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) ); - connect( m_audioJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_audioJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_audioJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); @@ -252,19 +252,19 @@ void K3bAudioCueFileWritingJob::importCueInProject() // now analyze the source emit newTask( i18n("Analysing the audio file") ); - emit newSubTask( i18n("Analysing %1").tqarg( parser.imageFilename() ) ); + emit newSubTask( i18n("Analysing %1").arg( parser.imageFilename() ) ); // start the analyser thread m_analyserThread->setDecoder( m_decoder ); m_analyserJob->start(); } else { - emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").tqarg( m_cueFile ), ERROR ); + emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").arg( m_cueFile ), ERROR ); jobFinished(false); } } else { - emit infoMessage( i18n("No valid audio cue file: '%1'").tqarg( m_cueFile ), ERROR ); + emit infoMessage( i18n("No valid audio cue file: '%1'").arg( m_cueFile ), ERROR ); jobFinished(false); } } diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp index 1946415..f85e138 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.cpp +++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp @@ -93,7 +93,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() toc = device->readToc(); if( !paranoia->initParanoia( device, toc ) ) { - emitInfoMessage( i18n("Could not open device %1").tqarg(device->blockDeviceName()), + emitInfoMessage( i18n("Could not open device %1").arg(device->blockDeviceName()), K3bJob::ERROR ); emitFinished(false); return; @@ -154,7 +154,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() } if( !waveFileWriter->open( filenames[currentTrack-1] ) ) { - emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filenames[currentTrack-1]), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filenames[currentTrack-1]), K3bJob::ERROR ); writeError = true; break; } @@ -188,7 +188,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() device->block( false ); if( status != K3bCdparanoiaLib::S_OK ) { - emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(trackNum), K3bJob::ERROR ); + emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(trackNum), K3bJob::ERROR ); emitFinished(false); return; } diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp index 2fd0b60..50bac83 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.cpp +++ b/libk3b/jobs/k3bbinimagewritingjob.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include @@ -148,7 +148,7 @@ bool K3bBinImageWritingJob::prepareWriter() connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(copyPercent(int)) ); connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(copySubPercent(int)) ); connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(writerFinished(bool)) ); @@ -207,7 +207,7 @@ void K3bBinImageWritingJob::writerFinished(bool ok) void K3bBinImageWritingJob::slotNextTrack( int t, int tt ) { - emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) ); + emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) ); } diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index 5781b2b..aeab621 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -131,9 +131,9 @@ void K3bBlankingJob::slotStartErasing() K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE, K3bDevice::MEDIA_CD_RW, i18n("Please insert a rewritable CD medium into drive

%1 %2 (%3).") - .tqarg(m_device->vendor()) - .tqarg(m_device->description()) - .tqarg(m_device->devicename()) ) < 0 ) { + .arg(m_device->vendor()) + .arg(m_device->description()) + .arg(m_device->devicename()) ) < 0 ) { emit canceled(); jobFinished(false); return; diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index 9a266bf..308da22 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -313,7 +313,7 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) unsigned long avail, size; TQString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) ); if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { - emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR ); + emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR ); d->error = true; canCopy = false; } @@ -379,7 +379,7 @@ void K3bCdCopyJob::slotCdTextReady( K3bDevice::DeviceHandler* dh ) if( dh->success() ) { if( K3bDevice::CdText::checkCrc( dh->cdTextRaw() ) ) { K3bDevice::CdText cdt( dh->cdTextRaw() ); - emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").tqarg(cdt.performer()).tqarg(cdt.title()), SUCCESS ); + emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").arg(cdt.performer()).arg(cdt.title()), SUCCESS ); d->haveCdText = true; d->cdTextRaw = dh->cdTextRaw(); } @@ -429,7 +429,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error ) d->cddbInfo = d->cddb->result(); d->haveCddb = true; - emit infoMessage( i18n("Found Cddb entry (%1 - %2).").tqarg(d->cddbInfo.cdArtist).tqarg(d->cddbInfo.cdTitle), SUCCESS ); + emit infoMessage( i18n("Found Cddb entry (%1 - %2).").arg(d->cddbInfo.cdArtist).arg(d->cddbInfo.cdTitle), SUCCESS ); // save the entry locally KConfig* c = k3bcore->config(); @@ -441,7 +441,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error ) emit infoMessage( i18n("No Cddb entry found."), WARNING ); } else { - emit infoMessage( i18n("Cddb error (%1).").tqarg(d->cddb->errorString()), ERROR ); + emit infoMessage( i18n("Cddb error (%1).").arg(d->cddb->errorString()), ERROR ); } startCopy(); @@ -524,24 +524,24 @@ bool K3bCdCopyJob::prepareImageFiles() m_tempPath = K3b::findUniqueFilePrefix( "k3bCdCopy", m_tempPath ); kdDebug() << "(K3bCdCopyJob) creating temp dir: " << m_tempPath << endl; if( !dir.mkdir( m_tempPath, true ) ) { - emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(m_tempPath), ERROR ); + emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(m_tempPath), ERROR ); return false; } d->deleteTempDir = true; } m_tempPath = K3b::prepareDir( m_tempPath ); - emit infoMessage( i18n("Using temporary directory %1.").tqarg(m_tempPath), INFO ); + emit infoMessage( i18n("Using temporary directory %1.").arg(m_tempPath), INFO ); // create temp filenames int i = 1; for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) { if( (*it).type() == K3bDevice::Track::AUDIO ) { - d->imageNames.append( m_tempPath + TQString("Track%1.wav").tqarg(TQString::number(i).rightJustify(2, '0')) ); - d->infNames.append( m_tempPath + TQString("Track%1.inf").tqarg(TQString::number(i).rightJustify(2, '0')) ); + d->imageNames.append( m_tempPath + TQString("Track%1.wav").arg(TQString::number(i).rightJustify(2, '0')) ); + d->infNames.append( m_tempPath + TQString("Track%1.inf").arg(TQString::number(i).rightJustify(2, '0')) ); } else - d->imageNames.append( m_tempPath + TQString("Track%1.iso").tqarg(TQString::number(i).rightJustify(2, '0')) ); + d->imageNames.append( m_tempPath + TQString("Track%1.iso").arg(TQString::number(i).rightJustify(2, '0')) ); ++i; } @@ -554,7 +554,7 @@ bool K3bCdCopyJob::prepareImageFiles() else { // we only need a single image file if( !fi.isFile() || - questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_tempPath), + questionYesNo( i18n("Do you want to overwrite %1?").arg(m_tempPath), i18n("File Exists") ) ) { if( fi.isDir() ) m_tempPath = K3b::findTempFile( "iso", m_tempPath ); @@ -564,7 +564,7 @@ bool K3bCdCopyJob::prepareImageFiles() } // else the user specified a file in an existing dir - emit infoMessage( i18n("Writing image file to %1.").tqarg(m_tempPath), INFO ); + emit infoMessage( i18n("Writing image file to %1.").arg(m_tempPath), INFO ); } else return false; @@ -580,12 +580,12 @@ void K3bCdCopyJob::readNextSession() { if( !m_onTheFly || m_onlyCreateImages ) { if( d->numSessions > 1 ) - emit newTask( i18n("Reading Session %1").tqarg(d->currentReadSession) ); + emit newTask( i18n("Reading Session %1").arg(d->currentReadSession) ); else emit newTask( i18n("Reading Source Medium") ); if( d->currentReadSession == 1 ) - emit newSubTask( i18n("Reading track %1 of %2").tqarg(1).tqarg(d->toc.count()) ); + emit newSubTask( i18n("Reading track %1 of %2").arg(1).arg(d->toc.count()) ); } // there is only one situation where we need the audiosessionreader: @@ -677,17 +677,17 @@ bool K3bCdCopyJob::writeNextSession() // we emit our own task since the cdrecord task is way too simple if( d->numSessions > 1 ) { if( m_simulate ) - emit newTask( i18n("Simulating Session %1").tqarg(d->currentWrittenSession) ); + emit newTask( i18n("Simulating Session %1").arg(d->currentWrittenSession) ); else if( m_copies > 1 ) - emit newTask( i18n("Writing Copy %1 (Session %2)").tqarg(d->doneCopies+1).tqarg(d->currentWrittenSession) ); + emit newTask( i18n("Writing Copy %1 (Session %2)").arg(d->doneCopies+1).arg(d->currentWrittenSession) ); else - emit newTask( i18n("Writing Copy (Session %2)").tqarg(d->currentWrittenSession) ); + emit newTask( i18n("Writing Copy (Session %2)").arg(d->currentWrittenSession) ); } else { if( m_simulate ) emit newTask( i18n("Simulating") ); else if( m_copies > 1 ) - emit newTask( i18n("Writing Copy %1").tqarg(d->doneCopies+1) ); + emit newTask( i18n("Writing Copy %1").arg(d->doneCopies+1) ); else emit newTask( i18n("Writing Copy") ); } @@ -713,7 +713,7 @@ bool K3bCdCopyJob::writeNextSession() connect( d->cdrecordWriter, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWritingNextTrack(int, int)) ); - connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); @@ -923,7 +923,7 @@ bool K3bCdCopyJob::writeNextSession() trackLen = trackLen * 2056; // see k3bdatatrackreader.h else trackLen = trackLen * 2332; // see k3bdatatrackreader.h - d->cdrecordWriter->addArgument( TQString("-tsize=%1").tqarg(trackLen) )->addArgument("-"); + d->cdrecordWriter->addArgument( TQString("-tsize=%1").arg(trackLen) )->addArgument("-"); } else if( d->toc.contentType() == K3bDevice::MIXED ) d->cdrecordWriter->addArgument( d->imageNames[d->toc.count()-1] ); @@ -953,7 +953,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success ) if( success ) { if( d->numSessions > 1 ) - emit infoMessage( i18n("Successfully read session %1.").tqarg(d->currentReadSession), SUCCESS ); + emit infoMessage( i18n("Successfully read session %1.").arg(d->currentReadSession), SUCCESS ); else emit infoMessage( i18n("Successfully read source disk."), SUCCESS ); @@ -987,7 +987,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success ) } else { if( !d->canceled ) { - emit infoMessage( i18n("Error while reading session %1.").tqarg(d->currentReadSession), ERROR ); + emit infoMessage( i18n("Error while reading session %1.").arg(d->currentReadSession), ERROR ); if( m_onTheFly ) d->cdrecordWriter->setSourceUnreadable(true); } @@ -1137,14 +1137,14 @@ void K3bCdCopyJob::slotWritingNextTrack( int t, int tt ) { if( d->toc.contentType() == K3bDevice::MIXED ) { if( d->currentWrittenSession == 1 ) - emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(d->toc.count()) ); + emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(d->toc.count()) ); else - emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->toc.count()).tqarg(d->toc.count()) ); + emit newSubTask( i18n("Writing track %1 of %2").arg(d->toc.count()).arg(d->toc.count()) ); } else if( d->numSessions > 1 ) - emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->currentWrittenSession).tqarg(d->toc.count()) ); + emit newSubTask( i18n("Writing track %1 of %2").arg(d->currentWrittenSession).arg(d->toc.count()) ); else - emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) ); + emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) ); } @@ -1159,7 +1159,7 @@ void K3bCdCopyJob::slotReadingNextTrack( int t, int ) else track = d->currentReadSession; - emit newSubTask( i18n("Reading track %1 of %2").tqarg(track).tqarg(d->toc.count()) ); + emit newSubTask( i18n("Reading track %1 of %2").arg(track).arg(d->toc.count()) ); } } diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp index 5202fc4..cab71b9 100644 --- a/libk3b/jobs/k3bcdda2wavreader.cpp +++ b/libk3b/jobs/k3bcdda2wavreader.cpp @@ -95,7 +95,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) d->cdda2wavBin = k3bcore->externalBinManager()->binObject( "cdda2wav" ); if( !d->cdda2wavBin ) { - emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdda2wav"), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").arg("cdda2wav"), ERROR ); jobFinished(false); d->running = false; return; @@ -115,7 +115,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) *d->process << d->cdda2wavBin->path; *d->process << "-vall" << ( d->cdda2wavBin->hasFeature( "gui" ) ? "-gui" : "-g" ); if( d->cdda2wavBin->hasFeature( "dev" ) ) - *d->process << TQString("dev=%1").tqarg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin)); + *d->process << TQString("dev=%1").arg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin)); else *d->process << "-D" << K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin); *d->process << ( d->cdda2wavBin->hasFeature( "bulk" ) ? "-bulk" : "-B" ); @@ -134,7 +134,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bCdda2wavReader) could not start cdda2wav" << endl; - emit infoMessage( i18n("Could not start %1.").tqarg("cdda2wav"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").arg("cdda2wav"), K3bJob::ERROR ); d->running = false; jobFinished(false); } @@ -240,12 +240,12 @@ void K3bCdda2wavReader::slotProcessExited( KProcess* p ) } else { emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .tqarg("Cdda2wav").tqarg(p->exitStatus()), ERROR ); + .arg("Cdda2wav").arg(p->exitStatus()), ERROR ); jobFinished( false ); } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Cdda2wav"), + emit infoMessage( i18n("%1 did not exit cleanly.").arg("Cdda2wav"), ERROR ); jobFinished( false ); } diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp index f8ce4f7..d11ebaa 100644 --- a/libk3b/jobs/k3bclonejob.cpp +++ b/libk3b/jobs/k3bclonejob.cpp @@ -85,13 +85,13 @@ void K3bCloneJob::start() // const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" ); if( !cdrecordBin ) { - emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR ); jobFinished(false); m_running = false; return; } else if( !cdrecordBin->hasFeature( "clone" ) ) { - emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").tqarg(cdrecordBin->version), ERROR ); + emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").arg(cdrecordBin->version), ERROR ); jobFinished(false); m_running = false; return; @@ -109,8 +109,8 @@ void K3bCloneJob::start() if( !writer()->supportsWritingMode( K3bDevice::RAW_R96R ) && !writer()->supportsWritingMode( K3bDevice::RAW_R16 ) ) { emit infoMessage( i18n("CD writer %1 does not support cloning.") - .tqarg(writer()->vendor()) - .tqarg(writer()->description()), ERROR ); + .arg(writer()->vendor()) + .arg(writer()->description()), ERROR ); m_running = false; jobFinished(false); return; @@ -180,7 +180,7 @@ void K3bCloneJob::prepareWriter() connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); @@ -222,7 +222,7 @@ void K3bCloneJob::slotWriterPercent( int p ) void K3bCloneJob::slotWriterNextTrack( int t, int tt ) { - emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(tt) ); + emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) ); } @@ -239,7 +239,7 @@ void K3bCloneJob::slotWriterFinished( bool success ) if( success ) { d->doneCopies++; - emit infoMessage( i18n("Successfully written clone copy %1.").tqarg(d->doneCopies), INFO ); + emit infoMessage( i18n("Successfully written clone copy %1.").arg(d->doneCopies), INFO ); if( d->doneCopies < m_copies ) { K3bDevice::eject( writer() ); @@ -330,7 +330,7 @@ void K3bCloneJob::startWriting() if( m_simulate ) emit newTask( i18n("Simulating clone copy") ); else - emit newTask( i18n("Writing clone copy %1").tqarg(d->doneCopies+1) ); + emit newTask( i18n("Writing clone copy %1").arg(d->doneCopies+1) ); m_writerJob->start(); } diff --git a/libk3b/jobs/k3bclonetocreader.cpp b/libk3b/jobs/k3bclonetocreader.cpp index 2122937..529e49f 100644 --- a/libk3b/jobs/k3bclonetocreader.cpp +++ b/libk3b/jobs/k3bclonetocreader.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp index 9ff5dd5..873a1b8 100644 --- a/libk3b/jobs/k3bdatatrackreader.cpp +++ b/libk3b/jobs/k3bdatatrackreader.cpp @@ -109,7 +109,7 @@ void K3bDataTrackReader::WorkThread::run() emitStarted(); if( !m_device->open() ) { - emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR ); + emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR ); emitFinished(false); return; } @@ -142,7 +142,7 @@ void K3bDataTrackReader::WorkThread::run() } if( !m_libcss->open(m_device) ) { - emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR ); + emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR ); emitFinished(false); return; } @@ -183,14 +183,14 @@ void K3bDataTrackReader::WorkThread::run() } } - emitInfoMessage( i18n("Reading with sector size %1.").tqarg(m_usedSectorSize), K3bJob::INFO ); + emitInfoMessage( i18n("Reading with sector size %1.").arg(m_usedSectorSize), K3bJob::INFO ); emitDebuggingOutput( "K3bDataTrackReader", TQString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.") - .tqarg( m_firstSector.lba() ) - .tqarg( m_lastSector.lba() ) - .tqarg( m_usedSectorSize ) - .tqarg( m_lastSector.lba() - m_firstSector.lba() + 1 ) - .tqarg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) ); + .arg( m_firstSector.lba() ) + .arg( m_lastSector.lba() ) + .arg( m_usedSectorSize ) + .arg( m_lastSector.lba() - m_firstSector.lba() + 1 ) + .arg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) ); TQFile file; if( m_fd == -1 ) { @@ -199,7 +199,7 @@ void K3bDataTrackReader::WorkThread::run() m_device->close(); if( m_useLibdvdcss ) m_libcss->close(); - emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), K3bJob::ERROR ); emitFinished( false ); return; } @@ -231,7 +231,7 @@ void K3bDataTrackReader::WorkThread::run() // s_bufferSizeSectors = K3bDevice::determineMaxReadingBufferSize( m_device, m_firstSector ); if( s_bufferSizeSectors <= 0 ) { - emitInfoMessage( i18n("Error while reading sector %1.").tqarg(m_firstSector.lba()), K3bJob::ERROR ); + emitInfoMessage( i18n("Error while reading sector %1.").arg(m_firstSector.lba()), K3bJob::ERROR ); emitFinished(false); m_device->block( false ); k3bcore->unblockDevice( m_device ); @@ -239,7 +239,7 @@ void K3bDataTrackReader::WorkThread::run() } kdDebug() << "(K3bDataTrackReader) using buffer size of " << s_bufferSizeSectors << " blocks." << endl; - emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").tqarg( s_bufferSizeSectors ) ); + emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").arg( s_bufferSizeSectors ) ); // 2. get it on K3b::Msf currentSector = m_firstSector; @@ -279,7 +279,7 @@ void K3bDataTrackReader::WorkThread::run() << " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl; emitDebuggingOutput( "K3bDataTrackReader", TQString("Error while writing to fd %1. Current sector is %2.") - .tqarg(m_fd).tqarg(currentSector.lba()-m_firstSector.lba()) ); + .arg(m_fd).arg(currentSector.lba()-m_firstSector.lba()) ); writeError = true; break; } @@ -290,7 +290,7 @@ void K3bDataTrackReader::WorkThread::run() << " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl; emitDebuggingOutput( "K3bDataTrackReader", TQString("Error while writing to file %1. Current sector is %2.") - .tqarg(m_imagePath).tqarg(currentSector.lba()-m_firstSector.lba()) ); + .arg(m_imagePath).arg(currentSector.lba()-m_firstSector.lba()) ); writeError = true; break; } @@ -331,8 +331,8 @@ void K3bDataTrackReader::WorkThread::run() emitDebuggingOutput( "K3bDataTrackReader", TQString("Read a total of %1 sectors (%2 bytes)") - .tqarg(totalReadSectors.lba()) - .tqarg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) ); + .arg(totalReadSectors.lba()) + .arg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) ); if( m_canceled ) emitCanceled(); @@ -386,8 +386,8 @@ int K3bDataTrackReader::WorkThread::read( unsigned char* buffer, unsigned long s // here we read every single sector for itself to find the troubleing ones bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned long startSector, unsigned int len ) { - emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").tqarg(startSector) ); - emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").tqarg(startSector), K3bJob::WARNING ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").arg(startSector) ); + emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").arg(startSector), K3bJob::WARNING ); int sectorsRead = -1; bool success = true; @@ -403,16 +403,16 @@ bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned if( !success ) { if( m_ignoreReadErrors ) { - emitInfoMessage( i18n("Ignoring read error in sector %1.").tqarg(sector), K3bJob::ERROR ); - emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").tqarg(sector) ); + emitInfoMessage( i18n("Ignoring read error in sector %1.").arg(sector), K3bJob::ERROR ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").arg(sector) ); ++m_errorSectorCount; // ::memset( &buffer[i], 0, 1 ); success = true; } else { - emitInfoMessage( i18n("Error while reading sector %1.").tqarg(sector), K3bJob::ERROR ); - emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").tqarg(sector) ); + emitInfoMessage( i18n("Error while reading sector %1.").arg(sector), K3bJob::ERROR ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").arg(sector) ); break; } } diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index b123e24..d5382a3 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -122,7 +122,7 @@ void K3bDvdCopyJob::start() k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) { m_onTheFly = false; emit infoMessage( i18n("K3b does not support writing on-the-fly with growisofs %1.") - .tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR ); + .arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR ); emit infoMessage( i18n("Disabling on-the-fly writing."), INFO ); } @@ -295,7 +295,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // TQFileInfo fi( m_imagePath ); if( !fi.isFile() || - questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_imagePath), + questionYesNo( i18n("Do you want to overwrite %1?").arg(m_imagePath), i18n("File Exists") ) ) { if( fi.isDir() ) m_imagePath = K3b::findTempFile( "iso", m_imagePath ); @@ -305,7 +305,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) } // else the user specified a file in an existing dir - emit infoMessage( i18n("Writing image file to %1.").tqarg(m_imagePath), INFO ); + emit infoMessage( i18n("Writing image file to %1.").arg(m_imagePath), INFO ); emit newSubTask( i18n("Reading source medium.") ); } @@ -316,7 +316,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) unsigned long avail, size; TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) ); if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { - emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR ); + emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR ); jobFinished(false); d->running = false; return; @@ -332,7 +332,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) d->imageFile.setName( m_imagePath ); if( !d->imageFile.open( IO_WriteOnly ) ) { - emit infoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), ERROR ); + emit infoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), ERROR ); jobFinished( false ); d->running = false; return; @@ -353,7 +353,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) if( m_simulate ) emit newTask( i18n("Simulating DVD copy") ); else if( m_copies > 1 ) - emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); + emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) ); else emit newTask( i18n("Writing DVD copy") ); @@ -434,7 +434,7 @@ void K3bDvdCopyJob::prepareWriter() connect( d->writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) ); connect( d->writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); connect( d->writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( d->writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( d->writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( d->writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); @@ -548,7 +548,7 @@ void K3bDvdCopyJob::slotReaderFinished( bool success ) if( waitForDvd() ) { prepareWriter(); if( m_copies > 1 ) - emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); + emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) ); else emit newTask( i18n("Writing DVD copy") ); @@ -597,7 +597,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success ) } if( success ) { - emit infoMessage( i18n("Successfully written DVD copy %1.").tqarg(d->doneCopies+1), INFO ); + emit infoMessage( i18n("Successfully written DVD copy %1.").arg(d->doneCopies+1), INFO ); if( d->verifyData && !m_simulate ) { if( !d->verificationJob ) { @@ -620,7 +620,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success ) d->verificationJob->addTrack( 1, d->inPipe.checksum(), d->lastSector+1 ); if( m_copies > 1 ) - emit newTask( i18n("Verifying DVD copy %1").tqarg(d->doneCopies+1) ); + emit newTask( i18n("Verifying DVD copy %1").arg(d->doneCopies+1) ); else emit newTask( i18n("Verifying DVD copy") ); @@ -637,7 +637,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success ) if( waitForDvd() ) { prepareWriter(); - emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); + emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) ); emit burning(true); @@ -686,7 +686,7 @@ void K3bDvdCopyJob::slotVerificationFinished( bool success ) if( waitForDvd() ) { prepareWriter(); - emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); + emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) ); emit burning(true); @@ -790,8 +790,8 @@ bool K3bDvdCopyJob::waitForDvd() if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. " "Do you really want to continue? The media will be written " "for real.") - .tqarg(m_writerDevice->vendor()) - .tqarg(m_writerDevice->description()), + .arg(m_writerDevice->vendor()) + .arg(m_writerDevice->description()), i18n("No Simulation with DVD-R(W)") ) ) { cancel(); return false; @@ -839,11 +839,11 @@ bool K3bDvdCopyJob::waitForDvd() if( m_writingMode == K3b::DAO ) { // ( m_writingMode == K3b::WRITING_MODE_AUTO && // ( sizeWithDao || !m_onTheFly ) ) ) { - emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO ); d->usedWritingMode = K3b::DAO; } else { - emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO ); d->usedWritingMode = K3b::WRITING_MODE_INCR_SEQ; } } @@ -859,7 +859,7 @@ void K3bDvdCopyJob::removeImageFiles() { if( TQFile::exists( m_imagePath ) ) { d->imageFile.remove(); - emit infoMessage( i18n("Removed image file %1").tqarg(m_imagePath), K3bJob::SUCCESS ); + emit infoMessage( i18n("Removed image file %1").arg(m_imagePath), K3bJob::SUCCESS ); } } diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp index 46c8563..21858e4 100644 --- a/libk3b/jobs/k3bdvdformattingjob.cpp +++ b/libk3b/jobs/k3bdvdformattingjob.cpp @@ -142,7 +142,7 @@ void K3bDvdFormattingJob::start() K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY, K3bDevice::MEDIA_WRITABLE_DVD, i18n("Please insert a rewritable DVD medium into drive

%1 %2 (%3).") - .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) { + .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) { emit canceled(); d->running = false; jobFinished(false); @@ -267,7 +267,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p ) d->success = true; } else { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdFormatBin->name()).tqarg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdFormatBin->name()).arg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -275,7 +275,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdFormatBin->name()), + emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdFormatBin->name()), ERROR ); d->success = false; } @@ -362,7 +362,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) if( diskInfo.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) { - emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), + emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO ); // mode is ignored @@ -375,7 +375,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) } else { emit infoMessage( i18n("No need to format %1 media more than once.") - .tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO ); + .arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO ); emit infoMessage( i18n("It may simply be overwritten."), INFO ); if( d->force ) { @@ -401,11 +401,11 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) // else { // MEDIA_DVD_RW - emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)), + emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)), INFO ); if( diskInfo.currentProfile() != K3bDevice::MEDIA_UNKNOWN ) { - emit infoMessage( i18n("Formatted in %1 mode.").tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); + emit infoMessage( i18n("Formatted in %1 mode.").arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); // @@ -428,7 +428,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) else if( diskInfo.currentProfile() == K3bDevice::MEDIA_DVD_RW_OVWR && d->mode != K3b::WRITING_MODE_INCR_SEQ ) { emit infoMessage( i18n("No need to format %1 media more than once.") - .tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); + .arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); emit infoMessage( i18n("It may simply be overwritten."), INFO ); if( d->force ) @@ -448,7 +448,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) } emit newSubTask( i18n("Formatting" - " DVD-RW in %1 mode.").tqarg(K3bDevice::mediaTypeString( blank ? + " DVD-RW in %1 mode.").arg(K3bDevice::mediaTypeString( blank ? K3bDevice::MEDIA_DVD_RW_SEQ : K3bDevice::MEDIA_DVD_RW_OVWR )) ); } @@ -472,14 +472,14 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" ); if( !d->dvdFormatBin ) { - emit infoMessage( i18n("Could not find %1 executable.").tqarg("dvd+rw-format"), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-format"), ERROR ); d->running = false; jobFinished(false); return; } if( !d->dvdFormatBin->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(d->dvdFormatBin->name()).tqarg(d->dvdFormatBin->version).tqarg(d->dvdFormatBin->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(d->dvdFormatBin->name()).arg(d->dvdFormatBin->version).arg(d->dvdFormatBin->copyright), INFO ); *d->process << d->dvdFormatBin; @@ -517,7 +517,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bDvdFormattingJob) could not start " << d->dvdFormatBin->path << endl; - emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdFormatBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").arg(d->dvdFormatBin->name()), K3bJob::ERROR ); d->running = false; jobFinished(false); } diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp index cf63da4..bc24d81 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.cpp +++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -86,7 +86,7 @@ void K3bIso9660ImageWritingJob::start() emit newTask( i18n("Preparing data") ); if( !TQFile::exists( m_imagePath ) ) { - emit infoMessage( i18n("Could not find image %1").tqarg(m_imagePath), K3bJob::ERROR ); + emit infoMessage( i18n("Could not find image %1").arg(m_imagePath), K3bJob::ERROR ); jobFinished( false ); return; } @@ -133,7 +133,7 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success ) if( m_copies == 1 ) emit newTask( i18n("Verifying written data") ); else - emit newTask( i18n("Verifying written copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) ); + emit newTask( i18n("Verifying written copy %1 of %2").arg(m_currentCopy).arg(m_copies) ); m_verifyJob->start(); } @@ -200,7 +200,7 @@ void K3bIso9660ImageWritingJob::slotNextTrack( int, int ) if( m_copies == 1 ) emit newSubTask( i18n("Writing image") ); else - emit newSubTask( i18n("Writing copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) ); + emit newSubTask( i18n("Writing copy %1 of %2").arg(m_currentCopy).arg(m_copies) ); } @@ -350,7 +350,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType ) writer->addArgument("-data"); // read from stdin - writer->addArgument( TQString("-tsize=%1s").tqarg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" ); + writer->addArgument( TQString("-tsize=%1s").arg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" ); m_writer = writer; } @@ -424,7 +424,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType ) connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) ); connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) ); connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) ); @@ -451,7 +451,7 @@ TQString K3bIso9660ImageWritingJob::jobDescription() const TQString K3bIso9660ImageWritingJob::jobDetails() const { - return m_imagePath.section("/", -1) + TQString( " (%1)" ).tqarg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath)))); + return m_imagePath.section("/", -1) + TQString( " (%1)" ).arg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath)))); } diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index fb2a7bd..b8b2b0a 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -104,7 +104,7 @@ void K3bReadcdReader::start() // the first thing to do is to check for readcd d->readcdBinObject = k3bcore->externalBinManager()->binObject( "readcd" ); if( !d->readcdBinObject ) { - emit infoMessage( i18n("Could not find %1 executable.").tqarg("readcd"), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").arg("readcd"), ERROR ); jobFinished(false); return; } @@ -120,7 +120,7 @@ void K3bReadcdReader::start() for( TQPtrListIterator it( readcdBins ); it.current(); ++it ) { if( it.current()->hasFeature( "clone" ) ) { d->readcdBinObject = it.current(); - emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").tqarg(d->readcdBinObject->version), INFO ); + emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").arg(d->readcdBinObject->version), INFO ); foundCloneSupport = true; break; } @@ -148,10 +148,10 @@ void K3bReadcdReader::start() *d->process << "-v"; // Again we assume the device to be set! - *d->process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(m_readDevice, + *d->process << TQString("dev=%1").arg(K3b::externalBinDeviceParameter(m_readDevice, d->readcdBinObject)); if( m_speed > 0 ) - *d->process << TQString("speed=%1").tqarg(m_speed); + *d->process << TQString("speed=%1").arg(m_speed); // output @@ -160,8 +160,8 @@ void K3bReadcdReader::start() d->process->dupStdout( d->fdToWriteTo ); } else { - emit newTask( i18n("Writing image to %1.").tqarg(m_imagePath) ); - emit infoMessage( i18n("Writing image to %1.").tqarg(m_imagePath), INFO ); + emit newTask( i18n("Writing image to %1.").arg(m_imagePath) ); + emit infoMessage( i18n("Writing image to %1.").arg(m_imagePath), INFO ); *d->process << "f=" + m_imagePath; } @@ -177,11 +177,11 @@ void K3bReadcdReader::start() if( m_c2Scan ) *d->process << "-c2scan"; - *d->process << TQString("retries=%1").tqarg(m_retries); + *d->process << TQString("retries=%1").arg(m_retries); // readcd does not read the last sector specified if( d->firstSector < d->lastSector ) - *d->process << TQString("sectors=%1-%2").tqarg(d->firstSector.lba()).tqarg(d->lastSector.lba()+1); + *d->process << TQString("sectors=%1-%2").arg(d->firstSector.lba()).arg(d->lastSector.lba()+1); // Joerg sais it is a Linux kernel bug, anyway, with the default value it does not work *d->process << "ts=128k"; @@ -276,7 +276,7 @@ void K3bReadcdReader::slotStdLine( const TQString& line ) kdError() << "(K3bReadcdReader) problemSector parsing error in line: " << line.mid( pos, line.find( TQRegExp("\\D"), pos )-pos ) << endl; } - emit infoMessage( i18n("Retrying from sector %1.").tqarg(problemSector), INFO ); + emit infoMessage( i18n("Retrying from sector %1.").arg(problemSector), INFO ); } else if( (pos = line.find("Error on sector")) >= 0 ) { @@ -291,10 +291,10 @@ void K3bReadcdReader::slotStdLine( const TQString& line ) } if( line.contains( "not corrected") ) { - emit infoMessage( i18n("Uncorrected error in sector %1").tqarg(problemSector), ERROR ); + emit infoMessage( i18n("Uncorrected error in sector %1").arg(problemSector), ERROR ); } else { - emit infoMessage( i18n("Corrected error in sector %1").tqarg(problemSector), ERROR ); + emit infoMessage( i18n("Corrected error in sector %1").arg(problemSector), ERROR ); } } @@ -314,7 +314,7 @@ void K3bReadcdReader::slotProcessExited( KProcess* p ) jobFinished( true ); } else { - emit infoMessage( i18n("%1 returned error: %2").tqarg("Readcd").tqarg(p->exitStatus()), ERROR ); + emit infoMessage( i18n("%1 returned error: %2").arg("Readcd").arg(p->exitStatus()), ERROR ); jobFinished( false ); } } diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index 5b8cc62..e5333fe 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -203,7 +203,7 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) if( (int)d->toc.count() < (*it).trackNumber ) { if ( d->mediumHasBeenReloaded ) { emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)") - .tqarg( "Specified track number not found on medium" ), ERROR ); + .arg( "Specified track number not found on medium" ), ERROR ); jobFinished( false ); return; } @@ -236,7 +236,7 @@ void K3bVerificationJob::readTrack( int trackIndex ) return; } - emit newTask( i18n("Verifying track %1").tqarg( d->tracks[trackIndex].trackNumber ) ); + emit newTask( i18n("Verifying track %1").arg( d->tracks[trackIndex].trackNumber ) ); d->pipe.open(); @@ -304,7 +304,7 @@ void K3bVerificationJob::slotMd5JobFinished( bool success ) if( success && !d->canceled && d->readSuccessful ) { // compare the two sums if( d->tracks[d->currentTrackIndex].checksum != d->md5Job->hexDigest() ) { - emit infoMessage( i18n("Written data in track %1 differs from original.").tqarg(d->tracks[d->currentTrackIndex].trackNumber), ERROR ); + emit infoMessage( i18n("Written data in track %1 differs from original.").arg(d->tracks[d->currentTrackIndex].trackNumber), ERROR ); jobFinished(false); } else { diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp index cf30eed..96d9619 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp @@ -88,15 +88,15 @@ void K3bVideoDVDTitleDetectClippingJob::start() d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode"); if( !d->usedTranscodeBin ) { - emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR ); + emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR ); jobFinished( false ); return; } if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){ emit infoMessage( i18n("%1 version %2 is too old.") - .tqarg("transcode") - .tqarg(d->usedTranscodeBin->version), ERROR ); + .arg("transcode") + .arg(d->usedTranscodeBin->version), ERROR ); jobFinished( false ); return; } @@ -105,11 +105,11 @@ void K3bVideoDVDTitleDetectClippingJob::start() if( !d->usedTranscodeBin->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .tqarg(d->usedTranscodeBin->name()) - .tqarg(d->usedTranscodeBin->version) - .tqarg(d->usedTranscodeBin->copyright), INFO ); + .arg(d->usedTranscodeBin->name()) + .arg(d->usedTranscodeBin->version) + .arg(d->usedTranscodeBin->copyright), INFO ); - emit newTask( i18n("Analysing Title %1 of Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) ); + emit newTask( i18n("Analysing Title %1 of Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) ); startTranscode( 1 ); } @@ -151,16 +151,16 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) *d->process << "-i" << m_dvd.device()->blockDeviceName(); // select the title number and chapter - *d->process << "-T" << TQString("%1,%2").tqarg(m_titleNumber).tqarg(chapter); + *d->process << "-T" << TQString("%1,%2").arg(m_titleNumber).arg(chapter); // null output *d->process << "-y" << "null,null" << "-o" << "/dev/null"; // analyze the first 200 frames - *d->process << "-J" << TQString("detectclipping=range=0-%1/5").tqarg(d->currentFrames); + *d->process << "-J" << TQString("detectclipping=range=0-%1/5").arg(d->currentFrames); // also only decode the first 200 frames - *d->process << "-c" << TQString("0-%1").tqarg(d->currentFrames+1); + *d->process << "-c" << TQString("0-%1").arg(d->currentFrames+1); // additional user parameters from config const TQStringList& params = d->usedTranscodeBin->userParameters(); @@ -181,11 +181,11 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable - emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR ); jobFinished(false); } else { - emit newSubTask( i18n("Analysing Chapter %1 of %2").tqarg(chapter).tqarg(m_dvd[m_titleNumber-1].numPTTs()) ); + emit newSubTask( i18n("Analysing Chapter %1 of %2").arg(chapter).arg(m_dvd[m_titleNumber-1].numPTTs()) ); emit subPercent( 0 ); } } @@ -279,7 +279,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p ) } else { emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()), + .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); } diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index 96d670b..fd115ff 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -87,15 +87,15 @@ void K3bVideoDVDTitleTranscodingJob::start() d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode"); if( !d->usedTranscodeBin ) { - emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR ); + emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR ); jobFinished( false ); return; } if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){ emit infoMessage( i18n("%1 version %2 is too old.") - .tqarg("transcode") - .tqarg(d->usedTranscodeBin->version), ERROR ); + .arg("transcode") + .arg(d->usedTranscodeBin->version), ERROR ); jobFinished( false ); return; } @@ -104,9 +104,9 @@ void K3bVideoDVDTitleTranscodingJob::start() if( !d->usedTranscodeBin->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .tqarg(d->usedTranscodeBin->name()) - .tqarg(d->usedTranscodeBin->version) - .tqarg(d->usedTranscodeBin->copyright), INFO ); + .arg(d->usedTranscodeBin->name()) + .arg(d->usedTranscodeBin->version) + .arg(d->usedTranscodeBin->copyright), INFO ); // // Let's take a look at the filename @@ -119,11 +119,11 @@ void K3bVideoDVDTitleTranscodingJob::start() TQFileInfo fileInfo( m_filename ); TQFileInfo dirInfo( fileInfo.dirPath() ); if( !dirInfo.exists() && !KStandardDirs::makeDir( dirInfo.absFilePath() ) ) { - emit infoMessage( i18n("Unable to create folder '%1'").tqarg(dirInfo.filePath()), ERROR ); + emit infoMessage( i18n("Unable to create folder '%1'").arg(dirInfo.filePath()), ERROR ); return; } else if( !dirInfo.isDir() || !dirInfo.isWritable() ) { - emit infoMessage( i18n("Invalid filename: '%1'").tqarg(m_filename), ERROR ); + emit infoMessage( i18n("Invalid filename: '%1'").arg(m_filename), ERROR ); jobFinished( false ); return; } @@ -134,7 +134,7 @@ void K3bVideoDVDTitleTranscodingJob::start() // d->twoPassEncodingLogFile = K3b::findTempFile( "log" ); - emit newTask( i18n("Transcoding title %1 from Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) ); + emit newTask( i18n("Transcoding title %1 from Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) ); // // Ok then, let's begin @@ -159,7 +159,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) break; default: - emit infoMessage( i18n("Invalid Video codec set: %1").tqarg(m_videoCodec), ERROR ); + emit infoMessage( i18n("Invalid Video codec set: %1").arg(m_videoCodec), ERROR ); jobFinished( false ); return; } @@ -182,7 +182,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) break; default: - emit infoMessage( i18n("Invalid Audio codec set: %1").tqarg(m_audioCodec), ERROR ); + emit infoMessage( i18n("Invalid Audio codec set: %1").arg(m_audioCodec), ERROR ); jobFinished( false ); return; } @@ -218,7 +218,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) *d->process << "-x" << "dvd"; // select the title number - *d->process << "-T" << TQString("%1,-1,1").tqarg( m_titleNumber ); + *d->process << "-T" << TQString("%1,-1,1").arg( m_titleNumber ); // select the audio stream to extract if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 ) @@ -226,14 +226,14 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) // clipping *d->process << "-j" << TQString("%1,%2,%3,%4") - .tqarg(m_clippingTop) - .tqarg(m_clippingLeft) - .tqarg(m_clippingBottom) - .tqarg(m_clippingRight); + .arg(m_clippingTop) + .arg(m_clippingLeft) + .arg(m_clippingBottom) + .arg(m_clippingRight); // select the encoding type (single pass or two-pass) and the log file for two-pass encoding // the latter is unused for pass = 0 - *d->process << "-R" << TQString("%1,%2").tqarg( pass ).tqarg( d->twoPassEncodingLogFile ); + *d->process << "-R" << TQString("%1,%2").arg( pass ).arg( d->twoPassEncodingLogFile ); // depending on the pass we use different options if( pass != 1 ) { @@ -249,7 +249,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) } else { // audio quality settings - *d->process << "-b" << TQString("%1,%2").tqarg(m_audioBitrate).tqarg(m_audioVBR ? 1 : 0); + *d->process << "-b" << TQString("%1,%2").arg(m_audioBitrate).arg(m_audioVBR ? 1 : 0); // resample audio stream to 44.1 khz if( m_resampleAudio ) @@ -261,7 +261,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) } else { // gather information about the video stream, ignore audio - *d->process << "-y" << TQString("%1,null").tqarg( videoCodecString ); + *d->process << "-y" << TQString("%1,null").arg( videoCodecString ); // we ignore the output from the first pass *d->process << "-o" << "/dev/null"; @@ -317,8 +317,8 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) // we only give information about the resizing of the video once if( pass < 2 ) - emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").tqarg(m_titleNumber).tqarg(usedWidth).tqarg(usedHeight), INFO ); - *d->process << "-Z" << TQString("%1x%2").tqarg(usedWidth).tqarg(usedHeight); + emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").arg(m_titleNumber).arg(usedWidth).arg(usedHeight), INFO ); + *d->process << "-Z" << TQString("%1x%2").arg(usedWidth).arg(usedHeight); // additional user parameters from config const TQStringList& params = d->usedTranscodeBin->userParameters(); @@ -339,7 +339,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable - emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR ); jobFinished(false); } else { @@ -372,7 +372,7 @@ void K3bVideoDVDTitleTranscodingJob::cleanup( bool success ) } if( !success && TQFile::exists( m_filename ) ) { - emit infoMessage( i18n("Removing incomplete video file '%1'").tqarg(m_filename), INFO ); + emit infoMessage( i18n("Removing incomplete video file '%1'").arg(m_filename), INFO ); TQFile::remove( m_filename ); } } @@ -440,7 +440,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p ) // FIXME: error handling emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()), + .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -450,7 +450,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p ) } else { cleanup( false ); - emit infoMessage( i18n("Execution of %1 failed.").tqarg("transcode"), ERROR ); + emit infoMessage( i18n("Execution of %1 failed.").arg("transcode"), ERROR ); emit infoMessage( i18n("Please consult the debugging output for details."), ERROR ); jobFinished( false ); } @@ -566,7 +566,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi bin = k3bcore->externalBinManager()->binObject("transcode"); if( !bin ) return false; - return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) ); + return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) ); } @@ -577,7 +577,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi bin = k3bcore->externalBinManager()->binObject("transcode"); if( !bin ) return false; - return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) ); + return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) ); } #include "k3bvideodvdtitletranscodingjob.moc" diff --git a/libk3b/k3bimage.xsd b/libk3b/k3bimage.xsd index 607bd95..ab7f36c 100644 --- a/libk3b/k3bimage.xsd +++ b/libk3b/k3bimage.xsd @@ -1,9 +1,9 @@