summaryrefslogtreecommitdiffstats
path: root/libk3b
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-27 19:21:21 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-27 19:21:21 +0000
commitd8cc8bdfa7fa624a526d5aa1626974e1444cb799 (patch)
treef295f1c545b319963d5357af79fe08991d8141d9 /libk3b
parent2a39a080579fb52a2599c02b2939795385b89093 (diff)
downloadk3b-d8cc8bdfa7fa624a526d5aa1626974e1444cb799.tar.gz
k3b-d8cc8bdfa7fa624a526d5aa1626974e1444cb799.zip
TQt4 port k3b
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libk3b')
-rw-r--r--libk3b/Makefile.am2
-rw-r--r--libk3b/cddb/k3bcddb.cpp80
-rw-r--r--libk3b/cddb/k3bcddb.h25
-rw-r--r--libk3b/cddb/k3bcddbhttpquery.cpp48
-rw-r--r--libk3b/cddb/k3bcddbhttpquery.h29
-rw-r--r--libk3b/cddb/k3bcddblocalquery.cpp42
-rw-r--r--libk3b/cddb/k3bcddblocalquery.h15
-rw-r--r--libk3b/cddb/k3bcddblocalsubmit.cpp32
-rw-r--r--libk3b/cddb/k3bcddblocalsubmit.h9
-rw-r--r--libk3b/cddb/k3bcddbmultientriesdialog.cpp36
-rw-r--r--libk3b/cddb/k3bcddbmultientriesdialog.h7
-rw-r--r--libk3b/cddb/k3bcddbpquery.cpp66
-rw-r--r--libk3b/cddb/k3bcddbpquery.h27
-rw-r--r--libk3b/cddb/k3bcddbquery.cpp88
-rw-r--r--libk3b/cddb/k3bcddbquery.h35
-rw-r--r--libk3b/cddb/k3bcddbresult.h32
-rw-r--r--libk3b/cddb/k3bcddbsubmit.cpp10
-rw-r--r--libk3b/cddb/k3bcddbsubmit.h11
-rw-r--r--libk3b/core/k3bcore.cpp52
-rw-r--r--libk3b/core/k3bcore.h15
-rw-r--r--libk3b/core/k3bdataevent.h10
-rw-r--r--libk3b/core/k3bdefaultexternalprograms.cpp282
-rw-r--r--libk3b/core/k3bdefaultexternalprograms.h30
-rw-r--r--libk3b/core/k3bexternalbinmanager.cpp104
-rw-r--r--libk3b/core/k3bexternalbinmanager.h79
-rw-r--r--libk3b/core/k3bglobals.cpp160
-rw-r--r--libk3b/core/k3bglobals.h54
-rw-r--r--libk3b/core/k3bglobalsettings.cpp4
-rw-r--r--libk3b/core/k3bjob.cpp86
-rw-r--r--libk3b/core/k3bjob.h50
-rw-r--r--libk3b/core/k3bjobhandler.h14
-rw-r--r--libk3b/core/k3bprocess.cpp70
-rw-r--r--libk3b/core/k3bprocess.h30
-rw-r--r--libk3b/core/k3bprogressinfoevent.h28
-rw-r--r--libk3b/core/k3bsimplejobhandler.cpp18
-rw-r--r--libk3b/core/k3bsimplejobhandler.h21
-rw-r--r--libk3b/core/k3bthread.cpp62
-rw-r--r--libk3b/core/k3bthread.h24
-rw-r--r--libk3b/core/k3bthreadjob.cpp18
-rw-r--r--libk3b/core/k3bthreadjob.h13
-rw-r--r--libk3b/core/k3bversion.cpp48
-rw-r--r--libk3b/core/k3bversion.h34
-rw-r--r--libk3b/jobs/k3baudiocuefilewritingjob.cpp52
-rw-r--r--libk3b/jobs/k3baudiocuefilewritingjob.h15
-rw-r--r--libk3b/jobs/k3baudiosessionreadingjob.cpp14
-rw-r--r--libk3b/jobs/k3baudiosessionreadingjob.h7
-rw-r--r--libk3b/jobs/k3bbinimagewritingjob.cpp48
-rw-r--r--libk3b/jobs/k3bbinimagewritingjob.h11
-rw-r--r--libk3b/jobs/k3bblankingjob.cpp24
-rw-r--r--libk3b/jobs/k3bblankingjob.h5
-rw-r--r--libk3b/jobs/k3bcdcopyjob.cpp182
-rw-r--r--libk3b/jobs/k3bcdcopyjob.h11
-rw-r--r--libk3b/jobs/k3bcdda2wavreader.cpp44
-rw-r--r--libk3b/jobs/k3bcdda2wavreader.h9
-rw-r--r--libk3b/jobs/k3bclonejob.cpp78
-rw-r--r--libk3b/jobs/k3bclonejob.h13
-rw-r--r--libk3b/jobs/k3bclonetocreader.cpp14
-rw-r--r--libk3b/jobs/k3bclonetocreader.h2
-rw-r--r--libk3b/jobs/k3bdatatrackreader.cpp66
-rw-r--r--libk3b/jobs/k3bdatatrackreader.h4
-rw-r--r--libk3b/jobs/k3bdvdcopyjob.cpp122
-rw-r--r--libk3b/jobs/k3bdvdcopyjob.h13
-rw-r--r--libk3b/jobs/k3bdvdformattingjob.cpp74
-rw-r--r--libk3b/jobs/k3bdvdformattingjob.h9
-rw-r--r--libk3b/jobs/k3biso9660imagewritingjob.cpp68
-rw-r--r--libk3b/jobs/k3biso9660imagewritingjob.h11
-rw-r--r--libk3b/jobs/k3breadcdreader.cpp74
-rw-r--r--libk3b/jobs/k3breadcdreader.h9
-rw-r--r--libk3b/jobs/k3bverificationjob.cpp62
-rw-r--r--libk3b/jobs/k3bverificationjob.h5
-rw-r--r--libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp68
-rw-r--r--libk3b/jobs/k3bvideodvdtitledetectclippingjob.h5
-rw-r--r--libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp126
-rw-r--r--libk3b/jobs/k3bvideodvdtitletranscodingjob.h19
-rw-r--r--libk3b/k3bimage.xsd6
-rw-r--r--libk3b/plugin/k3baudiodecoder.cpp52
-rw-r--r--libk3b/plugin/k3baudiodecoder.h32
-rw-r--r--libk3b/plugin/k3baudioencoder.cpp38
-rw-r--r--libk3b/plugin/k3baudioencoder.h37
-rw-r--r--libk3b/plugin/k3baudiooutputplugin.h11
-rw-r--r--libk3b/plugin/k3baudioserver.cpp18
-rw-r--r--libk3b/plugin/k3baudioserver.h15
-rw-r--r--libk3b/plugin/k3bplugin.cpp6
-rw-r--r--libk3b/plugin/k3bplugin.h57
-rw-r--r--libk3b/plugin/k3bpluginconfigwidget.cpp4
-rw-r--r--libk3b/plugin/k3bpluginconfigwidget.h7
-rw-r--r--libk3b/plugin/k3bpluginfactory.h10
-rw-r--r--libk3b/plugin/k3bpluginmanager.cpp54
-rw-r--r--libk3b/plugin/k3bpluginmanager.h21
-rw-r--r--libk3b/plugin/k3bprojectplugin.h51
-rw-r--r--libk3b/plugin/libsamplerate/samplerate.h4
-rw-r--r--libk3b/plugin/libsamplerate/src_sinc.c12
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp30
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtrackdrag.h20
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtracksource.cpp26
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtracksource.h8
-rw-r--r--libk3b/projects/audiocd/k3baudiodatasource.h6
-rw-r--r--libk3b/projects/audiocd/k3baudiodatasourceiterator.h2
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.cpp174
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.h75
-rw-r--r--libk3b/projects/audiocd/k3baudiofile.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudiofile.h6
-rw-r--r--libk3b/projects/audiocd/k3baudioimager.cpp18
-rw-r--r--libk3b/projects/audiocd/k3baudioimager.h5
-rw-r--r--libk3b/projects/audiocd/k3baudiojob.cpp136
-rw-r--r--libk3b/projects/audiocd/k3baudiojob.h11
-rw-r--r--libk3b/projects/audiocd/k3baudiojobtempdata.cpp46
-rw-r--r--libk3b/projects/audiocd/k3baudiojobtempdata.h21
-rw-r--r--libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp14
-rw-r--r--libk3b/projects/audiocd/k3baudiomaxspeedjob.h3
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.cpp34
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.h11
-rw-r--r--libk3b/projects/audiocd/k3baudiotrack.cpp46
-rw-r--r--libk3b/projects/audiocd/k3baudiotrack.h42
-rw-r--r--libk3b/projects/audiocd/k3baudiozerodata.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudiozerodata.h4
-rw-r--r--libk3b/projects/datacd/k3bbootitem.cpp4
-rw-r--r--libk3b/projects/datacd/k3bbootitem.h8
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.cpp236
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.h75
-rw-r--r--libk3b/projects/datacd/k3bdataitem.cpp46
-rw-r--r--libk3b/projects/datacd/k3bdataitem.h46
-rw-r--r--libk3b/projects/datacd/k3bdatajob.cpp128
-rw-r--r--libk3b/projects/datacd/k3bdatajob.h13
-rw-r--r--libk3b/projects/datacd/k3bdatapreparationjob.cpp38
-rw-r--r--libk3b/projects/datacd/k3bdatapreparationjob.h3
-rw-r--r--libk3b/projects/datacd/k3bdiritem.cpp104
-rw-r--r--libk3b/projects/datacd/k3bdiritem.h34
-rw-r--r--libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp16
-rw-r--r--libk3b/projects/datacd/k3bfileitem.cpp48
-rw-r--r--libk3b/projects/datacd/k3bfileitem.h18
-rw-r--r--libk3b/projects/datacd/k3bisoimager.cpp218
-rw-r--r--libk3b/projects/datacd/k3bisoimager.h37
-rw-r--r--libk3b/projects/datacd/k3bisooptions.cpp14
-rw-r--r--libk3b/projects/datacd/k3bisooptions.h70
-rw-r--r--libk3b/projects/datacd/k3bmkisofshandler.cpp20
-rw-r--r--libk3b/projects/datacd/k3bmkisofshandler.h8
-rw-r--r--libk3b/projects/datacd/k3bmsinfofetcher.cpp58
-rw-r--r--libk3b/projects/datacd/k3bmsinfofetcher.h9
-rw-r--r--libk3b/projects/datacd/k3bsessionimportitem.cpp10
-rw-r--r--libk3b/projects/datacd/k3bspecialdataitem.h20
-rw-r--r--libk3b/projects/datadvd/k3bdvdbooktypejob.cpp44
-rw-r--r--libk3b/projects/datadvd/k3bdvdbooktypejob.h9
-rw-r--r--libk3b/projects/datadvd/k3bdvddoc.cpp8
-rw-r--r--libk3b/projects/datadvd/k3bdvddoc.h6
-rw-r--r--libk3b/projects/datadvd/k3bdvdjob.cpp42
-rw-r--r--libk3b/projects/datadvd/k3bdvdjob.h9
-rw-r--r--libk3b/projects/datadvd/k3bdvdview.cpp8
-rw-r--r--libk3b/projects/datadvd/k3bdvdview.h5
-rw-r--r--libk3b/projects/k3babstractwriter.cpp12
-rw-r--r--libk3b/projects/k3babstractwriter.h5
-rw-r--r--libk3b/projects/k3bcdrdaowriter.cpp218
-rw-r--r--libk3b/projects/k3bcdrdaowriter.h35
-rw-r--r--libk3b/projects/k3bcdrecordwriter.cpp122
-rw-r--r--libk3b/projects/k3bcdrecordwriter.h19
-rw-r--r--libk3b/projects/k3bcuefileparser.cpp86
-rw-r--r--libk3b/projects/k3bcuefileparser.h8
-rw-r--r--libk3b/projects/k3bdoc.cpp32
-rw-r--r--libk3b/projects/k3bdoc.h43
-rw-r--r--libk3b/projects/k3bdvdrecordwriter.cpp26
-rw-r--r--libk3b/projects/k3bdvdrecordwriter.h3
-rw-r--r--libk3b/projects/k3bgrowisofshandler.cpp68
-rw-r--r--libk3b/projects/k3bgrowisofshandler.h15
-rw-r--r--libk3b/projects/k3bgrowisofswriter.cpp116
-rw-r--r--libk3b/projects/k3bgrowisofswriter.h11
-rw-r--r--libk3b/projects/k3bimagefilereader.cpp18
-rw-r--r--libk3b/projects/k3bimagefilereader.h10
-rw-r--r--libk3b/projects/k3binffilewriter.cpp20
-rw-r--r--libk3b/projects/k3binffilewriter.h50
-rw-r--r--libk3b/projects/k3bpipebuffer.cpp10
-rw-r--r--libk3b/projects/k3bpipebuffer.h2
-rw-r--r--libk3b/projects/k3btocfilewriter.cpp28
-rw-r--r--libk3b/projects/k3btocfilewriter.h22
-rw-r--r--libk3b/projects/mixedcd/k3bmixeddoc.cpp52
-rw-r--r--libk3b/projects/mixedcd/k3bmixeddoc.h19
-rw-r--r--libk3b/projects/mixedcd/k3bmixedjob.cpp186
-rw-r--r--libk3b/projects/mixedcd/k3bmixedjob.h15
-rw-r--r--libk3b/projects/movixcd/k3bmovixdoc.cpp90
-rw-r--r--libk3b/projects/movixcd/k3bmovixdoc.h67
-rw-r--r--libk3b/projects/movixcd/k3bmovixdocpreparer.cpp100
-rw-r--r--libk3b/projects/movixcd/k3bmovixdocpreparer.h9
-rw-r--r--libk3b/projects/movixcd/k3bmovixfileitem.cpp18
-rw-r--r--libk3b/projects/movixcd/k3bmovixfileitem.h6
-rw-r--r--libk3b/projects/movixcd/k3bmovixjob.cpp48
-rw-r--r--libk3b/projects/movixcd/k3bmovixjob.h7
-rw-r--r--libk3b/projects/movixcd/k3bmovixprogram.cpp112
-rw-r--r--libk3b/projects/movixcd/k3bmovixprogram.h54
-rw-r--r--libk3b/projects/movixdvd/k3bmovixdvddoc.cpp8
-rw-r--r--libk3b/projects/movixdvd/k3bmovixdvddoc.h7
-rw-r--r--libk3b/projects/movixdvd/k3bmovixdvdjob.cpp46
-rw-r--r--libk3b/projects/movixdvd/k3bmovixdvdjob.h7
-rw-r--r--libk3b/projects/videocd/cdi/cdi_imag.rtfbin1314877 -> 1314875 bytes
-rw-r--r--libk3b/projects/videocd/cdi/cdi_vcd.appbin102400 -> 102402 bytes
-rw-r--r--libk3b/projects/videocd/cdi/icdia.htm4
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.cpp166
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.h55
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.cpp204
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.h21
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.cpp24
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.h52
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.cpp106
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.h72
-rw-r--r--libk3b/projects/videocd/k3bvcdxmlview.cpp174
-rw-r--r--libk3b/projects/videocd/k3bvcdxmlview.h26
-rw-r--r--libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp40
-rw-r--r--libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h6
-rw-r--r--libk3b/projects/videodvd/k3bvideodvddoc.cpp8
-rw-r--r--libk3b/projects/videodvd/k3bvideodvddoc.h6
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdimager.cpp46
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdimager.h7
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdjob.cpp18
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdjob.h7
-rw-r--r--libk3b/tools/k3bactivepipe.cpp24
-rw-r--r--libk3b/tools/k3bactivepipe.h16
-rw-r--r--libk3b/tools/k3bbusywidget.cpp24
-rw-r--r--libk3b/tools/k3bbusywidget.h19
-rw-r--r--libk3b/tools/k3bcdparanoialib.cpp18
-rw-r--r--libk3b/tools/k3bcdparanoialib.h6
-rw-r--r--libk3b/tools/k3bcdtextvalidator.cpp6
-rw-r--r--libk3b/tools/k3bcdtextvalidator.h4
-rw-r--r--libk3b/tools/k3bchecksumpipe.cpp4
-rw-r--r--libk3b/tools/k3bchecksumpipe.h2
-rw-r--r--libk3b/tools/k3bcutcombobox.cpp76
-rw-r--r--libk3b/tools/k3bcutcombobox.h37
-rw-r--r--libk3b/tools/k3bdevicecombobox.cpp36
-rw-r--r--libk3b/tools/k3bdevicecombobox.h7
-rw-r--r--libk3b/tools/k3bdevicehandler.cpp14
-rw-r--r--libk3b/tools/k3bdevicehandler.h17
-rw-r--r--libk3b/tools/k3bdeviceselectiondialog.cpp40
-rw-r--r--libk3b/tools/k3bdeviceselectiondialog.h23
-rw-r--r--libk3b/tools/k3bdirsizejob.cpp28
-rw-r--r--libk3b/tools/k3bdirsizejob.h3
-rw-r--r--libk3b/tools/k3bexceptions.cpp4
-rw-r--r--libk3b/tools/k3bfilesplitter.cpp51
-rw-r--r--libk3b/tools/k3bfilesplitter.h27
-rw-r--r--libk3b/tools/k3bfilesysteminfo.cpp22
-rw-r--r--libk3b/tools/k3bfilesysteminfo.h10
-rw-r--r--libk3b/tools/k3bintmapcombobox.cpp40
-rw-r--r--libk3b/tools/k3bintmapcombobox.h7
-rw-r--r--libk3b/tools/k3bintvalidator.cpp32
-rw-r--r--libk3b/tools/k3bintvalidator.h22
-rw-r--r--libk3b/tools/k3biso9660.cpp144
-rw-r--r--libk3b/tools/k3biso9660.h104
-rw-r--r--libk3b/tools/k3biso9660backend.cpp8
-rw-r--r--libk3b/tools/k3biso9660backend.h6
-rw-r--r--libk3b/tools/k3blibdvdcss.cpp18
-rw-r--r--libk3b/tools/k3blistview.cpp444
-rw-r--r--libk3b/tools/k3blistview.h163
-rw-r--r--libk3b/tools/k3blistviewitemanimator.cpp26
-rw-r--r--libk3b/tools/k3blistviewitemanimator.h31
-rw-r--r--libk3b/tools/k3bmd5job.cpp52
-rw-r--r--libk3b/tools/k3bmd5job.h13
-rw-r--r--libk3b/tools/k3bmsfedit.cpp50
-rw-r--r--libk3b/tools/k3bmsfedit.h21
-rw-r--r--libk3b/tools/k3bmultichoicedialog.cpp76
-rw-r--r--libk3b/tools/k3bmultichoicedialog.h23
-rw-r--r--libk3b/tools/k3bprogressdialog.cpp28
-rw-r--r--libk3b/tools/k3bprogressdialog.h17
-rw-r--r--libk3b/tools/k3bpushbutton.cpp54
-rw-r--r--libk3b/tools/k3bpushbutton.h15
-rw-r--r--libk3b/tools/k3bradioaction.cpp52
-rw-r--r--libk3b/tools/k3bradioaction.h53
-rw-r--r--libk3b/tools/k3brichtextlabel.cpp52
-rw-r--r--libk3b/tools/k3brichtextlabel.h21
-rw-r--r--libk3b/tools/k3bsignalwaiter.cpp16
-rw-r--r--libk3b/tools/k3bsignalwaiter.h7
-rw-r--r--libk3b/tools/k3bstdguiitems.cpp128
-rw-r--r--libk3b/tools/k3bstdguiitems.h38
-rw-r--r--libk3b/tools/k3bstringutils.cpp10
-rw-r--r--libk3b/tools/k3bstringutils.h8
-rw-r--r--libk3b/tools/k3btempfile.cpp12
-rw-r--r--libk3b/tools/k3btempfile.h4
-rw-r--r--libk3b/tools/k3bthreadwidget.cpp38
-rw-r--r--libk3b/tools/k3bthreadwidget.h17
-rw-r--r--libk3b/tools/k3bthroughputestimator.cpp10
-rw-r--r--libk3b/tools/k3bthroughputestimator.h7
-rw-r--r--libk3b/tools/k3btitlelabel.cpp86
-rw-r--r--libk3b/tools/k3btitlelabel.h29
-rw-r--r--libk3b/tools/k3btoolbox.cpp135
-rw-r--r--libk3b/tools/k3btoolbox.h50
-rw-r--r--libk3b/tools/k3btoolbutton.cpp44
-rw-r--r--libk3b/tools/k3btoolbutton.h16
-rw-r--r--libk3b/tools/k3bvalidators.cpp58
-rw-r--r--libk3b/tools/k3bvalidators.h52
-rw-r--r--libk3b/tools/k3bwavefilewriter.cpp10
-rw-r--r--libk3b/tools/k3bwavefilewriter.h16
-rw-r--r--libk3b/tools/kcutlabel.cpp66
-rw-r--r--libk3b/tools/kcutlabel.h21
-rw-r--r--libk3b/tools/libisofs/COPYING4
-rw-r--r--libk3b/tools/libisofs/iso_fs.h4
-rw-r--r--libk3b/tools/libisofs/isofs.h4
-rw-r--r--libk3b/videodvd/k3bvideodvd.cpp24
-rw-r--r--libk3b/videodvd/k3bvideodvd.h18
-rw-r--r--libk3b/videodvd/k3bvideodvdaudiostream.h16
-rw-r--r--libk3b/videodvd/k3bvideodvdsubpicturestream.h6
-rw-r--r--libk3b/videodvd/k3bvideodvdtime.cpp6
-rw-r--r--libk3b/videodvd/k3bvideodvdtime.h4
-rw-r--r--libk3b/videodvd/k3bvideodvdtitle.h10
298 files changed, 5903 insertions, 5794 deletions
diff --git a/libk3b/Makefile.am b/libk3b/Makefile.am
index 4c74f7d..84efe35 100644
--- a/libk3b/Makefile.am
+++ b/libk3b/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = $(all_includes)
+
if include_videodvdrip
VIDEODVDDIR = videodvd
VIDEODVDLIB = videodvd/libvideodvd.la
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index a0e4fe1..d0131e8 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -15,10 +15,10 @@
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kconfig.h>
@@ -36,8 +36,8 @@
#include "k3bcddbmultientriesdialog.h"
-K3bCddb::K3bCddb( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bCddb::K3bCddb( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
m_httpQuery = 0;
m_cddbpQuery = 0;
@@ -61,8 +61,8 @@ void K3bCddb::readConfig( KConfig* c )
m_bLocalCddbQuery = c->readBoolEntry( "use local cddb query", false );
// old config <= 0.7.3
- QStringList cddbpServer = c->readListEntry( "cddbp server" );
- QStringList httpServer = c->readListEntry( "http server" );
+ TQStringList cddbpServer = c->readListEntry( "cddbp server" );
+ TQStringList httpServer = c->readListEntry( "http server" );
// new config
m_cddbServer = c->readListEntry( "cddb server" );
@@ -77,12 +77,12 @@ void K3bCddb::readConfig( KConfig* c )
// old config <= 0.7.3
if( !httpServer.isEmpty() ) {
- for( QStringList::iterator it = httpServer.begin(); it != httpServer.end(); ++it ) {
+ for( TQStringList::iterator it = httpServer.begin(); it != httpServer.end(); ++it ) {
m_cddbServer.append( "Http " + *it );
}
}
if( !cddbpServer.isEmpty() ) {
- for( QStringList::iterator it = cddbpServer.begin(); it != cddbpServer.end(); ++it ) {
+ for( TQStringList::iterator it = cddbpServer.begin(); it != cddbpServer.end(); ++it ) {
m_cddbServer.append( "Cddbp " + *it );
}
}
@@ -98,14 +98,14 @@ void K3bCddb::query( const K3bDevice::Toc& toc )
if( m_bLocalCddbQuery ) {
m_iCurrentQueriedLocalDir = 0;
- QTimer::singleShot( 0, this, SLOT(localQuery()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(localQuery()) );
}
else if( m_bRemoteCddbQuery ) {
m_iCurrentQueriedServer = 0;
- QTimer::singleShot( 0, this, SLOT(remoteQuery()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(remoteQuery()) );
}
else {
- QTimer::singleShot( 0, this, SLOT(slotNoEntry()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(slotNoEntry()) );
}
}
@@ -141,7 +141,7 @@ void K3bCddb::slotQueryFinished( K3bCddbQuery* query )
m_lastResult = m_lastUsedQuery->result();
// make sure the result has the requested discid since otherwise local saving does not make much sense
- m_lastResult.discid = QString::number( m_toc.discId(), 16 ).rightJustify( 8, '0' );
+ m_lastResult.discid = TQString::number( m_toc.discId(), 16 ).rightJustify( 8, '0' );
emit queryFinished( K3bCddbQuery::SUCCESS );
}
@@ -169,37 +169,37 @@ void K3bCddb::slotQueryFinished( K3bCddbQuery* query )
}
-K3bCddbQuery* K3bCddb::getQuery( const QString& s )
+K3bCddbQuery* K3bCddb::getQuery( const TQString& s )
{
- QStringList buf = QStringList::split( ":", s.mid( s.find(" ")+1 ) );
- QString server = buf[0];
+ TQStringList buf = TQStringList::split( ":", s.mid( s.tqfind(" ")+1 ) );
+ TQString server = buf[0];
int port = buf[1].toInt();
if( s.startsWith("Http") ) {
if( !m_httpQuery ) {
m_httpQuery = new K3bCddbHttpQuery( this );
- connect( m_httpQuery, SIGNAL(infoMessage(const QString&)),
- this, SIGNAL(infoMessage(const QString&)) );
- connect( m_httpQuery, SIGNAL(queryFinished(K3bCddbQuery*)),
- this, SLOT(slotQueryFinished(K3bCddbQuery*)) );
- connect( m_httpQuery, SIGNAL(inexactMatches(K3bCddbQuery*)),
- this, SLOT(slotMultibleMatches(K3bCddbQuery*)) );
+ connect( m_httpQuery, TQT_SIGNAL(infoMessage(const TQString&)),
+ this, TQT_SIGNAL(infoMessage(const TQString&)) );
+ connect( m_httpQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)),
+ this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) );
+ connect( m_httpQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)),
+ this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
}
m_httpQuery->setServer( server, port );
- m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : QString::fromLatin1("/~cddb/cddb.cgi") );
+ m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::tqfromLatin1("/~cddb/cddb.cgi") );
return m_httpQuery;
}
else {
if( !m_cddbpQuery ) {
m_cddbpQuery = new K3bCddbpQuery( this );
- connect( m_cddbpQuery, SIGNAL(infoMessage(const QString&)),
- this, SIGNAL(infoMessage(const QString&)) );
- connect( m_cddbpQuery, SIGNAL(queryFinished(K3bCddbQuery*)),
- this, SLOT(slotQueryFinished(K3bCddbQuery*)) );
- connect( m_cddbpQuery, SIGNAL(inexactMatches(K3bCddbQuery*)),
- this, SLOT(slotMultibleMatches(K3bCddbQuery*)) );
+ connect( m_cddbpQuery, TQT_SIGNAL(infoMessage(const TQString&)),
+ this, TQT_SIGNAL(infoMessage(const TQString&)) );
+ connect( m_cddbpQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)),
+ this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) );
+ connect( m_cddbpQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)),
+ this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
}
m_cddbpQuery->setServer( server, port );
@@ -213,12 +213,12 @@ void K3bCddb::localQuery()
{
if( !m_localQuery ) {
m_localQuery = new K3bCddbLocalQuery( this );
- connect( m_localQuery, SIGNAL(infoMessage(const QString&)),
- this, SIGNAL(infoMessage(const QString&)) );
- connect( m_localQuery, SIGNAL(queryFinished(K3bCddbQuery*)),
- this, SLOT(slotQueryFinished(K3bCddbQuery*)) );
- connect( m_localQuery, SIGNAL(inexactMatches(K3bCddbQuery*)),
- this, SLOT(slotMultibleMatches(K3bCddbQuery*)) );
+ connect( m_localQuery, TQT_SIGNAL(infoMessage(const TQString&)),
+ this, TQT_SIGNAL(infoMessage(const TQString&)) );
+ connect( m_localQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)),
+ this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) );
+ connect( m_localQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)),
+ this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) );
}
m_localQuery->setCddbDir( m_localCddbDirs[m_iCurrentQueriedLocalDir] );
@@ -227,7 +227,7 @@ void K3bCddb::localQuery()
}
-QString K3bCddb::errorString() const
+TQString K3bCddb::errorString() const
{
if( !m_lastUsedQuery )
return "no query";
@@ -241,7 +241,7 @@ QString K3bCddb::errorString() const
return i18n("Error while connecting to host.");
case K3bCddbQuery::WORKING:
return i18n("Working...");
- case K3bCddbQuery::QUERY_ERROR:
+ case K3bCddbQuery::TQUERY_ERROR:
case K3bCddbQuery::READ_ERROR:
case K3bCddbQuery::FAILURE:
default:
@@ -261,8 +261,8 @@ void K3bCddb::saveEntry( const K3bCddbResultEntry& entry )
{
if( !m_localSubmit ) {
m_localSubmit = new K3bCddbLocalSubmit( this );
- connect( m_localSubmit, SIGNAL(submitFinished(K3bCddbSubmit*)),
- this, SLOT(slotSubmitFinished(K3bCddbSubmit*)) );
+ connect( m_localSubmit, TQT_SIGNAL(submitFinished(K3bCddbSubmit*)),
+ this, TQT_SLOT(slotSubmitFinished(K3bCddbSubmit*)) );
}
m_localSubmit->setCddbDir( m_localCddbDirs[0] );
diff --git a/libk3b/cddb/k3bcddb.h b/libk3b/cddb/k3bcddb.h
index 86b67c5..b7e5a47 100644
--- a/libk3b/cddb/k3bcddb.h
+++ b/libk3b/cddb/k3bcddb.h
@@ -17,9 +17,9 @@
#ifndef K3BCDDB_H
#define K3BCDDB_H
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqobject.h>
#include <k3btoc.h>
@@ -35,15 +35,16 @@ class K3bCddbSubmit;
class K3bCddbLocalSubmit;
-class LIBK3B_EXPORT K3bCddb : public QObject
+class LIBK3B_EXPORT K3bCddb : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCddb( QObject* parent = 0, const char* name = 0 );
+ K3bCddb( TQObject* tqparent = 0, const char* name = 0 );
~K3bCddb();
- QString errorString() const;
+ TQString errorString() const;
/**
* Do NOT call this before queryResult has
@@ -60,7 +61,7 @@ class LIBK3B_EXPORT K3bCddb : public QObject
signals:
void queryFinished( int error );
void submitFinished( bool success );
- void infoMessage( const QString& );
+ void infoMessage( const TQString& );
private slots:
void localQuery();
@@ -71,7 +72,7 @@ class LIBK3B_EXPORT K3bCddb : public QObject
void slotNoEntry();
private:
- K3bCddbQuery* getQuery( const QString& );
+ K3bCddbQuery* getQuery( const TQString& );
K3bCddbHttpQuery* m_httpQuery;
K3bCddbpQuery* m_cddbpQuery;
@@ -86,13 +87,13 @@ class LIBK3B_EXPORT K3bCddb : public QObject
K3bCddbResultEntry m_lastResult;
// config
- QStringList m_cddbServer;
- QString m_proxyServer;
+ TQStringList m_cddbServer;
+ TQString m_proxyServer;
int m_proxyPort;
- QString m_cgiPath;
+ TQString m_cgiPath;
bool m_bUseProxyServer;
bool m_bUseKdeSettings;
- QStringList m_localCddbDirs;
+ TQStringList m_localCddbDirs;
bool m_bSaveCddbEntriesLocally;
bool m_bUseManualCgiPath;
bool m_bRemoteCddbQuery;
diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp
index a453c3e..c21460f 100644
--- a/libk3b/cddb/k3bcddbhttpquery.cpp
+++ b/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -19,9 +19,9 @@
#include "k3bcddbresult.h"
-#include <qstringlist.h>
-#include <qregexp.h>
-#include <qtextstream.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
+#include <tqtextstream.h>
#include <klocale.h>
#include <kdebug.h>
@@ -29,8 +29,8 @@
#include <kio/job.h>
-K3bCddbHttpQuery::K3bCddbHttpQuery( QObject* parent, const char* name )
- : K3bCddbQuery( parent, name )
+K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* tqparent, const char* name )
+ : K3bCddbQuery( tqparent, name )
{
m_server = "freedb.org";
m_port = 80;
@@ -46,7 +46,7 @@ K3bCddbHttpQuery::~K3bCddbHttpQuery()
void K3bCddbHttpQuery::doQuery()
{
setError( WORKING );
- m_state = QUERY;
+ m_state = TQUERY;
performCommand( queryString() );
}
@@ -58,11 +58,11 @@ void K3bCddbHttpQuery::doMatchQuery()
m_state = READ;
m_parsingBuffer.truncate(0);
- performCommand( QString( "cddb read %1 %2").arg( header().category ).arg( header().discid ) );
+ performCommand( TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ) );
}
-void K3bCddbHttpQuery::performCommand( const QString& cmd )
+void K3bCddbHttpQuery::performCommand( const TQString& cmd )
{
KURL url;
url.setProtocol( "http" );
@@ -82,23 +82,23 @@ void K3bCddbHttpQuery::performCommand( const QString& cmd )
if( !job ) {
setError( CONNECTION_ERROR );
- emit infoMessage( i18n("Could not connect to host %1").arg(m_server) );
+ emit infoMessage( i18n("Could not connect to host %1").tqarg(m_server) );
emitQueryFinished();
return;
}
- connect( job, SIGNAL(data(KIO::Job*, const QByteArray&)),
- SLOT(slotData(KIO::Job*, const QByteArray&)) );
- connect( job, SIGNAL(result(KIO::Job*)),
- SLOT(slotResult(KIO::Job*)) );
+ connect( job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
+ TQT_SLOT(slotData(KIO::Job*, const TQByteArray&)) );
+ connect( job, TQT_SIGNAL(result(KIO::Job*)),
+ TQT_SLOT(slotResult(KIO::Job*)) );
}
-void K3bCddbHttpQuery::slotData( KIO::Job*, const QByteArray& data )
+void K3bCddbHttpQuery::slotData( KIO::Job*, const TQByteArray& data )
{
if( data.size() ) {
- QDataStream stream( m_data, IO_WriteOnly | IO_Append );
+ TQDataStream stream( m_data, IO_WriteOnly | IO_Append );
stream.writeRawBytes( data.data(), data.size() );
}
}
@@ -113,16 +113,16 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
return;
}
- QStringList lines = QStringList::split( "\n", QString::fromUtf8( m_data.data(), m_data.size() ) );
+ TQStringList lines = TQStringList::split( "\n", TQString::fromUtf8( m_data.data(), m_data.size() ) );
- for( QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it ) {
- QString line = *it;
+ for( TQStringList::const_iterator it = lines.begin(); it != lines.end(); ++it ) {
+ TQString line = *it;
// kdDebug() << "(K3bCddbHttpQuery) line: " << line << endl;
switch( m_state ) {
- case QUERY:
+ case TQUERY:
if( getCode( line ) == 200 ) {
// parse exact match and send a read command
K3bCddbResultHeader header;
@@ -137,7 +137,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
emit infoMessage( i18n("Found multiple exact matches") );
- m_state = QUERY_DATA;
+ m_state = TQUERY_DATA;
}
else if( getCode( line ) == 211 ) {
@@ -145,7 +145,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
emit infoMessage( i18n("Found inexact matches") );
- m_state = QUERY_DATA;
+ m_state = TQUERY_DATA;
}
else if( getCode( line ) == 202 ) {
@@ -160,14 +160,14 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
else {
kdDebug() << "(K3bCddbHttpQuery) Error while querying: " << line << endl;
emit infoMessage( i18n("Error while querying") );
- setError(QUERY_ERROR);
+ setError(TQUERY_ERROR);
m_state = FINISHED;
emitQueryFinished();
return;
}
break;
- case QUERY_DATA:
+ case TQUERY_DATA:
if( line.startsWith( "." ) ) {
// finished query
// go on reading
@@ -212,7 +212,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
kdDebug() << "(K3bCddbHttpQuery query finished." << endl;
- QTextStream strStream( m_parsingBuffer, IO_ReadOnly );
+ TQTextStream strStream( m_parsingBuffer, IO_ReadOnly );
parseEntry( strStream, result() );
setError(SUCCESS);
diff --git a/libk3b/cddb/k3bcddbhttpquery.h b/libk3b/cddb/k3bcddbhttpquery.h
index b1e544e..12a275e 100644
--- a/libk3b/cddb/k3bcddbhttpquery.h
+++ b/libk3b/cddb/k3bcddbhttpquery.h
@@ -14,13 +14,13 @@
*/
-#ifndef K3BCDDB_HTTP_QUERY_H
-#define K3BCDDB_HTTP_QUERY_H
+#ifndef K3BCDDB_HTTP_TQUERY_H
+#define K3BCDDB_HTTP_TQUERY_H
#include "k3bcddbquery.h"
#include "k3bcddbresult.h"
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
namespace KIO {
class Job;
@@ -29,35 +29,36 @@ namespace KIO {
class K3bCddbHttpQuery : public K3bCddbQuery
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCddbHttpQuery( QObject* parent = 0, const char* name = 0 );
+ K3bCddbHttpQuery( TQObject* tqparent = 0, const char* name = 0 );
~K3bCddbHttpQuery();
public slots:
- void setServer( const QString& s, int port = 80 ) { m_server = s; m_port = port; }
- void setCgiPath( const QString& p ) { m_cgiPath = p; }
+ void setServer( const TQString& s, int port = 80 ) { m_server = s; m_port = port; }
+ void setCgiPath( const TQString& p ) { m_cgiPath = p; }
protected slots:
void doQuery();
void doMatchQuery();
void slotResult( KIO::Job* );
- void slotData( KIO::Job*, const QByteArray& data );
+ void slotData( KIO::Job*, const TQByteArray& data );
private:
- void performCommand( const QString& );
+ void performCommand( const TQString& );
- enum State { QUERY, QUERY_DATA, READ, READ_DATA, FINISHED };
+ enum State { TQUERY, TQUERY_DATA, READ, READ_DATA, FINISHED };
int m_state;
- QString m_server;
+ TQString m_server;
int m_port;
- QString m_cgiPath;
+ TQString m_cgiPath;
- QString m_currentlyConnectingServer;
+ TQString m_currentlyConnectingServer;
- QByteArray m_data;
- QString m_parsingBuffer;
+ TQByteArray m_data;
+ TQString m_parsingBuffer;
};
#endif
diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp
index b3a1264..f70b6d8 100644
--- a/libk3b/cddb/k3bcddblocalquery.cpp
+++ b/libk3b/cddb/k3bcddblocalquery.cpp
@@ -16,17 +16,17 @@
#include "k3bcddblocalquery.h"
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kapplication.h>
#include <klocale.h>
#include <kdebug.h>
-K3bCddbLocalQuery::K3bCddbLocalQuery( QObject* parent , const char* name )
- : K3bCddbQuery( parent, name )
+K3bCddbLocalQuery::K3bCddbLocalQuery( TQObject* tqparent , const char* name )
+ : K3bCddbQuery( tqparent, name )
{
}
@@ -38,33 +38,33 @@ K3bCddbLocalQuery::~K3bCddbLocalQuery()
void K3bCddbLocalQuery::doQuery()
{
- emit infoMessage( i18n("Searching entry in %1").arg( m_cddbDir ) );
+ emit infoMessage( i18n("Searching entry in %1").tqarg( m_cddbDir ) );
kapp->processEvents(); //BAD!
- QString path = preparePath( m_cddbDir );
+ TQString path = preparePath( m_cddbDir );
kdDebug() << "(K3bCddbLocalQuery) searching in dir " << path << " for "
- << QString::number( toc().discId(), 16 ).rightJustify( 8, '0' ) << endl;
+ << TQString::number( toc().discId(), 16 ).rightJustify( 8, '0' ) << endl;
- for( QStringList::const_iterator it = categories().begin();
+ for( TQStringList::const_iterator it = categories().begin();
it != categories().end(); ++it ) {
- QString file = path + *it + "/" + QString::number( toc().discId(), 16 ).rightJustify( 8, '0' );
+ TQString file = path + *it + "/" + TQString::number( toc().discId(), 16 ).rightJustify( 8, '0' );
- if( QFile::exists( file ) ) {
+ if( TQFile::exists( file ) ) {
// found file
- QFile f( file );
+ TQFile f( file );
if( !f.open( IO_ReadOnly ) ) {
kdDebug() << "(K3bCddbLocalQuery) Could not open file" << endl;
}
else {
- QTextStream t( &f );
+ TQTextStream t( &f );
K3bCddbResultEntry entry;
parseEntry( t, entry );
K3bCddbResultHeader header;
- header.discid = QString::number( toc().discId(), 16 ).rightJustify( 8, '0' );
+ header.discid = TQString::number( toc().discId(), 16 ).rightJustify( 8, '0' );
header.category = *it;
header.title = entry.cdTitle;
header.artist = entry.cdArtist;
@@ -94,15 +94,15 @@ void K3bCddbLocalQuery::doQuery()
void K3bCddbLocalQuery::doMatchQuery()
{
- QString path = preparePath( m_cddbDir ) + header().category + "/" + header().discid;
+ TQString path = preparePath( m_cddbDir ) + header().category + "/" + header().discid;
- QFile f( path );
+ TQFile f( path );
if( !f.open( IO_ReadOnly ) ) {
kdDebug() << "(K3bCddbLocalQuery) Could not open file" << endl;
setError( READ_ERROR );
}
else {
- QTextStream t( &f );
+ TQTextStream t( &f );
parseEntry( t, result() );
result().discid = header().discid;
@@ -113,13 +113,13 @@ void K3bCddbLocalQuery::doMatchQuery()
}
-QString K3bCddbLocalQuery::preparePath( const QString& p )
+TQString K3bCddbLocalQuery::preparePath( const TQString& p )
{
- QString path = p;
+ TQString path = p;
if( path.startsWith( "~" ) )
- path.replace( 0, 1, QDir::homeDirPath() );
+ path.tqreplace( 0, 1, TQDir::homeDirPath() );
else if( !path.startsWith( "/" ) )
- path.prepend( QDir::homeDirPath() );
+ path.prepend( TQDir::homeDirPath() );
if( path[path.length()-1] != '/' )
path.append( "/" );
diff --git a/libk3b/cddb/k3bcddblocalquery.h b/libk3b/cddb/k3bcddblocalquery.h
index d68d379..f373698 100644
--- a/libk3b/cddb/k3bcddblocalquery.h
+++ b/libk3b/cddb/k3bcddblocalquery.h
@@ -15,34 +15,35 @@
-#ifndef K3BCDDB_LOCAL_QUERY_H
-#define K3BCDDB_LOCAL_QUERY_H
+#ifndef K3BCDDB_LOCAL_TQUERY_H
+#define K3BCDDB_LOCAL_TQUERY_H
#include "k3bcddbquery.h"
#include "k3bcddbresult.h"
-#include <qstring.h>
+#include <tqstring.h>
class K3bCddbLocalQuery : public K3bCddbQuery
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCddbLocalQuery( QObject* parent = 0, const char* name = 0 );
+ K3bCddbLocalQuery( TQObject* tqparent = 0, const char* name = 0 );
~K3bCddbLocalQuery();
public slots:
- void setCddbDir( const QString& dir ) { m_cddbDir = dir; }
+ void setCddbDir( const TQString& dir ) { m_cddbDir = dir; }
protected:
void doQuery();
void doMatchQuery();
private:
- QString preparePath( const QString& p );
+ TQString preparePath( const TQString& p );
- QString m_cddbDir;
+ TQString m_cddbDir;
};
#endif
diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp
index f2d1e69..ed1fdcb 100644
--- a/libk3b/cddb/k3bcddblocalsubmit.cpp
+++ b/libk3b/cddb/k3bcddblocalsubmit.cpp
@@ -17,16 +17,16 @@
#include "k3bcddblocalsubmit.h"
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kdebug.h>
#include <klocale.h>
-K3bCddbLocalSubmit::K3bCddbLocalSubmit( QObject* parent, const char* name )
- : K3bCddbSubmit( parent, name )
+K3bCddbLocalSubmit::K3bCddbLocalSubmit( TQObject* tqparent, const char* name )
+ : K3bCddbSubmit( tqparent, name )
{
}
@@ -38,29 +38,29 @@ K3bCddbLocalSubmit::~K3bCddbLocalSubmit()
void K3bCddbLocalSubmit::doSubmit()
{
- QString path = m_cddbDir;
+ TQString path = m_cddbDir;
if( path.startsWith( "~" ) )
- path.replace( 0, 1, QDir::homeDirPath() + "/" );
+ path.tqreplace( 0, 1, TQDir::homeDirPath() + "/" );
else if( !path.startsWith( "/" ) )
- path.prepend( QDir::homeDirPath() + "/" );
+ path.prepend( TQDir::homeDirPath() + "/" );
if( path[path.length()-1] != '/' )
path.append( "/" );
- if( !QFile::exists( path ) && !QDir().mkdir( path ) ) {
+ if( !TQFile::exists( path ) && !TQDir().mkdir( path ) ) {
kdDebug() << "(K3bCddbLocalSubmit) could not create directory: " << path << endl;
setError( IO_ERROR );
emit submitFinished( this );
return;
}
- if( QFile::exists( path ) ) {
+ if( TQFile::exists( path ) ) {
// if the category dir does not exists
// create it
path += resultEntry().category;
- if( !QFile::exists( path ) ) {
- if( !QDir().mkdir( path ) ) {
+ if( !TQFile::exists( path ) ) {
+ if( !TQDir().mkdir( path ) ) {
kdDebug() << "(K3bCddbLocalSubmit) could not create directory: " << path << endl;
setError( IO_ERROR );
emit submitFinished( this );
@@ -70,7 +70,7 @@ void K3bCddbLocalSubmit::doSubmit()
// we always overwrite existing entries
path += "/" + resultEntry().discid;
- QFile entryFile( path );
+ TQFile entryFile( path );
if( entryFile.exists() ) {
kdDebug() << "(K3bCddbLocalSubmit) file already exists: " << path << endl;
}
@@ -82,8 +82,8 @@ void K3bCddbLocalSubmit::doSubmit()
}
else {
kdDebug() << "(K3bCddbLocalSubmit) creating file: " << path << endl;
- QTextStream entryStream( &entryFile );
- entryStream.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream entryStream( &entryFile );
+ entryStream.setEncoding( TQTextStream::UnicodeUTF8 );
entryStream << resultEntry().rawData;
entryFile.close();
@@ -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").arg(path) );
+ emit infoMessage( i18n("Could not find directory: %1").tqarg(path) );
emit submitFinished( this );
}
}
diff --git a/libk3b/cddb/k3bcddblocalsubmit.h b/libk3b/cddb/k3bcddblocalsubmit.h
index 8b7ea91..88f127c 100644
--- a/libk3b/cddb/k3bcddblocalsubmit.h
+++ b/libk3b/cddb/k3bcddblocalsubmit.h
@@ -19,25 +19,26 @@
#include "k3bcddbsubmit.h"
-#include <qstring.h>
+#include <tqstring.h>
class K3bCddbLocalSubmit : public K3bCddbSubmit
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCddbLocalSubmit( QObject* parent = 0, const char* name = 0 );
+ K3bCddbLocalSubmit( TQObject* tqparent = 0, const char* name = 0 );
~K3bCddbLocalSubmit();
public slots:
- void setCddbDir( const QString& dir ) { m_cddbDir = dir; }
+ void setCddbDir( const TQString& dir ) { m_cddbDir = dir; }
protected slots:
void doSubmit();
private:
- QString m_cddbDir;
+ TQString m_cddbDir;
};
#endif
diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
index 094176a..df5a938 100644
--- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp
+++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
@@ -16,42 +16,42 @@
#include "k3bcddbmultientriesdialog.h"
-#include <qlayout.h>
-#include <qframe.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqframe.h>
+#include <tqlabel.h>
#include <klistbox.h>
#include <klocale.h>
-K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( QWidget* parent, const char* name )
- : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name )
+K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* tqparent, const char* name )
+ : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, tqparent, name )
{
- QFrame* frame = plainPage();
- QVBoxLayout* layout = new QVBoxLayout( frame );
- layout->setAutoAdd( true );
- layout->setSpacing( spacingHint() );
- layout->setMargin( 0 );
+ TQFrame* frame = plainPage();
+ TQVBoxLayout* tqlayout = new TQVBoxLayout( frame );
+ tqlayout->setAutoAdd( true );
+ tqlayout->setSpacing( spacingHint() );
+ tqlayout->setMargin( 0 );
- QLabel* infoLabel = new QLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame );
- infoLabel->setAlignment( WordBreak );
+ TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame );
+ infoLabel->tqsetAlignment( WordBreak );
m_listBox = new KListBox( frame, "list_box");
setMinimumSize( 280, 200 );
}
-K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* query, QWidget* parent )
+K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* query, TQWidget* tqparent )
{
- K3bCddbMultiEntriesDialog d( parent );
+ K3bCddbMultiEntriesDialog d( tqparent );
- const QValueList<K3bCddbResultHeader> headers = query->getInexactMatches();
+ const TQValueList<K3bCddbResultHeader> headers = query->getInexactMatches();
int i = 1;
- for( QValueListConstIterator<K3bCddbResultHeader> it = headers.begin();
+ for( TQValueListConstIterator<K3bCddbResultHeader> it = headers.begin();
it != headers.end(); ++it ) {
- d.m_listBox->insertItem( QString::number(i) + " " +
+ d.m_listBox->insertItem( TQString::number(i) + " " +
(*it).artist + " - " +
(*it).title + " (" +
(*it).category + ")" );
@@ -60,7 +60,7 @@ K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* qu
d.m_listBox->setSelected( 0, true );
- if( d.exec() == QDialog::Accepted )
+ if( d.exec() == TQDialog::Accepted )
return headers[ d.m_listBox->currentItem() >= 0 ? d.m_listBox->currentItem() : 0 ];
else
return K3bCddbResultHeader();
diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.h b/libk3b/cddb/k3bcddbmultientriesdialog.h
index 15cc6f8..43c409e 100644
--- a/libk3b/cddb/k3bcddbmultientriesdialog.h
+++ b/libk3b/cddb/k3bcddbmultientriesdialog.h
@@ -23,7 +23,7 @@
#include "k3bcddbresult.h"
-class QStringList;
+class TQStringList;
class KListBox;
/**
@@ -32,14 +32,15 @@ class KListBox;
class K3bCddbMultiEntriesDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
~K3bCddbMultiEntriesDialog();
- static K3bCddbResultHeader selectCddbEntry( K3bCddbQuery* query, QWidget* parent = 0 );
+ static K3bCddbResultHeader selectCddbEntry( K3bCddbQuery* query, TQWidget* tqparent = 0 );
protected:
- K3bCddbMultiEntriesDialog( QWidget* parent = 0, const char* name = 0);
+ K3bCddbMultiEntriesDialog( TQWidget* tqparent = 0, const char* name = 0);
private:
KListBox *m_listBox;
diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp
index fefc8e4..15f3e18 100644
--- a/libk3b/cddb/k3bcddbpquery.cpp
+++ b/libk3b/cddb/k3bcddbpquery.cpp
@@ -15,9 +15,9 @@
#include "k3bcddbpquery.h"
-#include <qstringlist.h>
-#include <qsocket.h>
-#include <qtextstream.h>
+#include <tqstringlist.h>
+#include <tqsocket.h>
+#include <tqtextstream.h>
#include <klocale.h>
#include <kdebug.h>
@@ -25,18 +25,18 @@
-K3bCddbpQuery::K3bCddbpQuery( QObject* parent, const char* name )
- :K3bCddbQuery( parent, name )
+K3bCddbpQuery::K3bCddbpQuery( TQObject* tqparent, const char* name )
+ :K3bCddbQuery( tqparent, name )
{
- m_socket = new QSocket( this );
+ m_socket = new TQSocket( this );
m_stream.setDevice( m_socket );
- m_stream.setEncoding( QTextStream::UnicodeUTF8 );
+ m_stream.setEncoding( TQTextStream::UnicodeUTF8 );
- connect( m_socket, SIGNAL(connected()), this, SLOT(slotConnected()) );
- connect( m_socket, SIGNAL(hostFound()), this, SLOT(slotHostFound()) );
- connect( m_socket, SIGNAL(connectionClosed()), this, SLOT(slotConnectionClosed()) );
- connect( m_socket, SIGNAL(error(int)), this, SLOT(slotError(int)) );
- connect( m_socket, SIGNAL(readyRead()), this, SLOT(slotReadyRead()) );
+ connect( m_socket, TQT_SIGNAL(connected()), this, TQT_SLOT(slotConnected()) );
+ connect( m_socket, TQT_SIGNAL(hostFound()), this, TQT_SLOT(slotHostFound()) );
+ connect( m_socket, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotConnectionClosed()) );
+ connect( m_socket, TQT_SIGNAL(error(int)), this, TQT_SLOT(slotError(int)) );
+ connect( m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()) );
}
@@ -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").arg(m_server).arg(m_port) );
+ emit infoMessage( i18n("Searching %1 on port %2").tqarg(m_server).tqarg(m_port) );
}
@@ -63,7 +63,7 @@ void K3bCddbpQuery::doMatchQuery()
// we should still be connected
// TODO: check this
- QString read = QString( "cddb read %1 %2").arg( header().category ).arg( header().discid );
+ TQString read = TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid );
m_state = READ;
m_parsingBuffer = "";
@@ -95,7 +95,7 @@ void K3bCddbpQuery::slotConnectionClosed()
void K3bCddbpQuery::cddbpQuit()
{
- m_state = QUIT;
+ m_state = TQUIT;
m_stream << "quit" << endl << flush;
}
@@ -103,7 +103,7 @@ void K3bCddbpQuery::cddbpQuit()
void K3bCddbpQuery::slotReadyRead()
{
while( m_socket->canReadLine() ) {
- QString line = m_stream.readLine();
+ TQString line = m_stream.readLine();
// kdDebug() << "(K3bCddbpQuery) line: " << line << endl;
@@ -146,13 +146,13 @@ void K3bCddbpQuery::slotReadyRead()
}
// just ignore the reply since it's not important for the functionality
- m_state = QUERY;
+ m_state = TQUERY;
m_stream << queryString() << endl << flush;
break;
}
- case QUERY:
+ case TQUERY:
if( getCode( line ) == 200 ) {
// parse exact match and send a read command
K3bCddbResultHeader header;
@@ -169,7 +169,7 @@ void K3bCddbpQuery::slotReadyRead()
emit infoMessage( i18n("Found multiple exact matches") );
- m_state = QUERY_DATA;
+ m_state = TQUERY_DATA;
}
else if( getCode( line ) == 211 ) {
@@ -177,7 +177,7 @@ void K3bCddbpQuery::slotReadyRead()
emit infoMessage( i18n("Found inexact matches") );
- m_state = QUERY_DATA;
+ m_state = TQUERY_DATA;
}
else if( getCode( line ) == 202 ) {
@@ -190,12 +190,12 @@ void K3bCddbpQuery::slotReadyRead()
else {
kdDebug() << "(K3bCddbpQuery) Error while querying: " << line << endl;
emit infoMessage( i18n("Error while querying") );
- setError( QUERY_ERROR );
+ setError( TQUERY_ERROR );
cddbpQuit();
}
break;
- case QUERY_DATA:
+ case TQUERY_DATA:
if( line.startsWith( "." ) ) {
// finished query
// go on reading
@@ -234,7 +234,7 @@ void K3bCddbpQuery::slotReadyRead()
kdDebug() << "(K3bCddbpQuery) query finished." << endl;
- QTextStream strStream( m_parsingBuffer, IO_ReadOnly );
+ TQTextStream strStream( m_parsingBuffer, IO_ReadOnly );
parseEntry( strStream, result() );
setError( SUCCESS );
@@ -246,7 +246,7 @@ void K3bCddbpQuery::slotReadyRead()
}
break;
- case QUIT:
+ case TQUIT:
// no parsing needed
break;
}
@@ -257,17 +257,17 @@ void K3bCddbpQuery::slotReadyRead()
void K3bCddbpQuery::slotError( int e )
{
switch(e) {
- case QSocket::ErrConnectionRefused:
- kdDebug() << i18n("Connection to %1 refused").arg( m_server ) << endl;
- emit infoMessage( i18n("Connection to %1 refused").arg( m_server ) );
+ case TQSocket::ErrConnectionRefused:
+ kdDebug() << i18n("Connection to %1 refused").tqarg( m_server ) << endl;
+ emit infoMessage( i18n("Connection to %1 refused").tqarg( m_server ) );
break;
- case QSocket::ErrHostNotFound:
- kdDebug() << i18n("Could not find host %1").arg( m_server ) << endl;
- emit infoMessage( i18n("Could not find host %1").arg( m_server ) );
+ 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 ) );
break;
- case QSocket::ErrSocketRead:
- kdDebug() << i18n("Error while reading from %1").arg( m_server ) << endl;
- emit infoMessage( i18n("Error while reading from %1").arg( m_server ) );
+ 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 ) );
break;
}
diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h
index 78fe5df..423cad1 100644
--- a/libk3b/cddb/k3bcddbpquery.h
+++ b/libk3b/cddb/k3bcddbpquery.h
@@ -13,28 +13,29 @@
*/
-#ifndef K3BCDDBP_QUERY_H
-#define K3BCDDBP_QUERY_H
+#ifndef K3BCDDBP_TQUERY_H
+#define K3BCDDBP_TQUERY_H
#include "k3bcddbquery.h"
#include "k3bcddbresult.h"
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qtextstream.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqtextstream.h>
-class QSocket;
+class TQSocket;
class K3bCddbpQuery : public K3bCddbQuery
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCddbpQuery( QObject* parent = 0, const char* name = 0 );
+ K3bCddbpQuery( TQObject* tqparent = 0, const char* name = 0 );
~K3bCddbpQuery();
public slots:
- void setServer( const QString& s, int port = 8080 ) { m_server = s; m_port = port; }
+ void setServer( const TQString& s, int port = 8080 ) { m_server = s; m_port = port; }
protected slots:
void slotHostFound();
@@ -47,16 +48,16 @@ class K3bCddbpQuery : public K3bCddbQuery
private:
void cddbpQuit();
- enum State { GREETING, HANDSHAKE, PROTO, QUERY, QUERY_DATA, READ, READ_DATA, QUIT };
+ enum State { GREETING, HANDSHAKE, PROTO, TQUERY, TQUERY_DATA, READ, READ_DATA, TQUIT };
int m_state;
- QString m_server;
+ TQString m_server;
int m_port;
- QSocket* m_socket;
- QTextStream m_stream;
+ TQSocket* m_socket;
+ TQTextStream m_stream;
- QString m_parsingBuffer;
+ TQString m_parsingBuffer;
};
#endif
diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp
index 783f9a4..6cf8eb0 100644
--- a/libk3b/cddb/k3bcddbquery.cpp
+++ b/libk3b/cddb/k3bcddbquery.cpp
@@ -25,18 +25,18 @@
#include <klocale.h>
-#include <qtextstream.h>
-#include <qstringlist.h>
-#include <qregexp.h>
-#include <qtimer.h>
+#include <tqtextstream.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
#include <stdlib.h>
-K3bCddbQuery::K3bCddbQuery( QObject* parent, const char* name )
- : QObject(parent, name)
+K3bCddbQuery::K3bCddbQuery( TQObject* tqparent, const char* name )
+ : TQObject(tqparent, name)
{
m_bQueryFinishedEmited = false;
}
@@ -53,7 +53,7 @@ void K3bCddbQuery::query( const K3bDevice::Toc& toc )
m_toc = toc;
m_inexactMatches.clear();
- QTimer::singleShot( 0, this, SLOT(doQuery()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(doQuery()) );
}
@@ -64,26 +64,26 @@ void K3bCddbQuery::queryMatch( const K3bCddbResultHeader& header )
m_result.category = header.category;
m_result.discid = header.discid;
- QTimer::singleShot( 0, this, SLOT(doMatchQuery()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(doMatchQuery()) );
}
-const QStringList& K3bCddbQuery::categories()
+const TQStringList& K3bCddbQuery::categories()
{
- static QStringList s_cat = QStringList::split( ",", "rock,blues,misc,classical,"
+ static TQStringList s_cat = TQStringList::split( ",", "rock,blues,misc,classical,"
"country,data,folk,jazz,newage,reggae,soundtrack" );
return s_cat;
}
-bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry )
+bool K3bCddbQuery::parseEntry( TQTextStream& stream, K3bCddbResultEntry& entry )
{
entry.rawData = "";
- stream.setEncoding( QTextStream::UnicodeUTF8 );
+ stream.setEncoding( TQTextStream::UnicodeUTF8 );
// parse data
- QString line;
+ TQString line;
while( !(line = stream.readLine()).isNull() ) {
entry.rawData.append(line + "\n");
@@ -94,7 +94,7 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry )
}
else if( line.startsWith( "DYEAR" ) ) {
- QString year = line.mid( 6 );
+ TQString year = line.mid( 6 );
if( year.length() == 4 )
entry.year = year.toInt();
}
@@ -108,7 +108,7 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry )
}
else if( line.startsWith( "TTITLE" ) ) {
- int eqSgnPos = line.find( "=" );
+ int eqSgnPos = line.tqfind( "=" );
bool ok;
uint trackNum = (uint)line.mid( 6, eqSgnPos - 6 ).toInt( &ok );
if( !ok )
@@ -129,7 +129,7 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry )
}
else if( line.startsWith( "EXTT" ) ) {
- int eqSgnPos = line.find( "=" );
+ int eqSgnPos = line.tqfind( "=" );
bool ok;
uint trackNum = (uint)line.mid( 4, eqSgnPos - 4 ).toInt( &ok );
if( !ok )
@@ -157,8 +157,8 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry )
// now split the titles in the last added match
// if no " / " delimiter is present title and artist are the same
// -------------------------------------------------------------------
- QString fullTitle = entry.cdTitle;
- int splitPos = fullTitle.find( " / " );
+ TQString fullTitle = entry.cdTitle;
+ int splitPos = fullTitle.tqfind( " / " );
if( splitPos < 0 )
entry.cdArtist = fullTitle;
else {
@@ -168,10 +168,10 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry )
}
- for( QStringList::iterator it = entry.titles.begin();
+ for( TQStringList::iterator it = entry.titles.begin();
it != entry.titles.end(); ++it ) {
- QString fullTitle = *it;
- int splitPos = fullTitle.find( " / " );
+ TQString fullTitle = *it;
+ int splitPos = fullTitle.tqfind( " / " );
if( splitPos < 0 )
entry.artists.append( entry.cdArtist );
else {
@@ -183,31 +183,31 @@ bool K3bCddbQuery::parseEntry( QTextStream& stream, K3bCddbResultEntry& entry )
// replace all "\\n" with "\n"
- for( QStringList::iterator it = entry.titles.begin();
+ for( TQStringList::iterator it = entry.titles.begin();
it != entry.titles.end(); ++it ) {
- (*it).replace( "\\\\\\\\n", "\\n" );
+ (*it).tqreplace( "\\\\\\\\n", "\\n" );
}
- for( QStringList::iterator it = entry.artists.begin();
+ for( TQStringList::iterator it = entry.artists.begin();
it != entry.artists.end(); ++it ) {
- (*it).replace( "\\\\\\\\n", "\\n" );
+ (*it).tqreplace( "\\\\\\\\n", "\\n" );
}
- for( QStringList::iterator it = entry.extInfos.begin();
+ for( TQStringList::iterator it = entry.extInfos.begin();
it != entry.extInfos.end(); ++it ) {
- (*it).replace( "\\\\\\\\n", "\\n" );
+ (*it).tqreplace( "\\\\\\\\n", "\\n" );
}
- entry.cdTitle.replace( "\\\\\\\\n", "\\n" );
- entry.cdArtist.replace( "\\\\\\\\n", "\\n" );
- entry.cdExtInfo.replace( "\\\\\\\\n", "\\n" );
- entry.genre.replace( "\\\\\\\\n", "\\n" );
+ entry.cdTitle.tqreplace( "\\\\\\\\n", "\\n" );
+ entry.cdArtist.tqreplace( "\\\\\\\\n", "\\n" );
+ entry.cdExtInfo.tqreplace( "\\\\\\\\n", "\\n" );
+ entry.genre.tqreplace( "\\\\\\\\n", "\\n" );
return true;
}
-int K3bCddbQuery::getCode( const QString& line )
+int K3bCddbQuery::getCode( const TQString& line )
{
bool ok;
int code = line.left( 3 ).toInt( &ok );
@@ -217,44 +217,44 @@ int K3bCddbQuery::getCode( const QString& line )
}
-QString K3bCddbQuery::handshakeString() const
+TQString K3bCddbQuery::handshakeString() const
{
- QString user( getenv("USER") );
- QString host( getenv("HOST") );
+ TQString user( getenv("USER") );
+ TQString host( getenv("HOST") );
if( user.isEmpty() )
user = "kde-user";
if( host.isEmpty() )
host = "kde-host";
- return QString("%1 %2 K3b %3").arg(user).arg(host).arg(kapp->aboutData()->version());
+ return TQString("%1 %2 K3b %3").tqarg(user).tqarg(host).tqarg(kapp->aboutData()->version());
}
-QString K3bCddbQuery::queryString() const
+TQString K3bCddbQuery::queryString() const
{
- QString query = "cddb query "
- + QString::number( m_toc.discId(), 16 ).rightJustify( 8, '0' )
+ TQString query = "cddb query "
+ + TQString::number( m_toc.discId(), 16 ).rightJustify( 8, '0' )
+ " "
- + QString::number( (unsigned int)m_toc.count() );
+ + TQString::number( (unsigned int)m_toc.count() );
for( K3bDevice::Toc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) {
- query.append( QString( " %1" ).arg( (*it).firstSector().lba() ) );
+ query.append( TQString( " %1" ).tqarg( (*it).firstSector().lba() ) );
}
- query.append( QString( " %1" ).arg( m_toc.length().lba() / 75 ) );
+ query.append( TQString( " %1" ).tqarg( m_toc.length().lba() / 75 ) );
return query;
}
-bool K3bCddbQuery::parseMatchHeader( const QString& line, K3bCddbResultHeader& header )
+bool K3bCddbQuery::parseMatchHeader( const TQString& line, K3bCddbResultHeader& header )
{
// format: category id title
// where title could be artist and title splitted with a /
header.category = line.section( ' ', 0, 0 );
header.discid = line.section( ' ', 1, 1 );
header.title = line.mid( header.category.length() + header.discid.length() + 2 );
- int slashPos = header.title.find( "/" );
+ int slashPos = header.title.tqfind( "/" );
if( slashPos > 0 ) {
header.artist = header.title.left(slashPos).stripWhiteSpace();
header.title = header.title.mid( slashPos+1 ).stripWhiteSpace();
diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h
index 569e882..eebc4cb 100644
--- a/libk3b/cddb/k3bcddbquery.h
+++ b/libk3b/cddb/k3bcddbquery.h
@@ -14,12 +14,12 @@
*/
-#ifndef K3BCDDB_QUERY_H
-#define K3BCDDB_QUERY_H
+#ifndef K3BCDDB_TQUERY_H
+#define K3BCDDB_TQUERY_H
-#include <qobject.h>
-#include <qstring.h>
-#include <qtextstream.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
#include "k3bcddbresult.h"
@@ -27,12 +27,13 @@
#include "k3b_export.h"
-class LIBK3B_EXPORT K3bCddbQuery : public QObject
+class LIBK3B_EXPORT K3bCddbQuery : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCddbQuery( QObject* parent = 0, const char* name = 0 );
+ K3bCddbQuery( TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bCddbQuery();
void query( const K3bDevice::Toc& );
@@ -48,15 +49,15 @@ class LIBK3B_EXPORT K3bCddbQuery : public QObject
* After emitting the signal inexactMatches one has to choose one
* of these entries and query it with queryInexactMatch
*/
- const QValueList<K3bCddbResultHeader>& getInexactMatches() const { return m_inexactMatches; }
+ const TQValueList<K3bCddbResultHeader>& getInexactMatches() const { return m_inexactMatches; }
- static const QStringList& categories();
+ static const TQStringList& categories();
enum Error { SUCCESS = 0,
CANCELED,
NO_ENTRY_FOUND,
CONNECTION_ERROR,
- QUERY_ERROR,
+ TQUERY_ERROR,
READ_ERROR,
FAILURE,
WORKING };
@@ -76,7 +77,7 @@ class LIBK3B_EXPORT K3bCddbQuery : public QObject
*/
void inexactMatches( K3bCddbQuery* );
- void infoMessage( const QString& );
+ void infoMessage( const TQString& );
protected slots:
virtual void doQuery() = 0;
@@ -88,11 +89,11 @@ class LIBK3B_EXPORT K3bCddbQuery : public QObject
K3bCddbResultEntry& result() { return m_result; }
void setError( int e ) { m_error = e; }
- bool parseEntry( QTextStream&, K3bCddbResultEntry& );
- int getCode( const QString& );
- QString handshakeString() const;
- QString queryString() const;
- bool parseMatchHeader( const QString& line, K3bCddbResultHeader& header );
+ bool parseEntry( TQTextStream&, K3bCddbResultEntry& );
+ int getCode( const TQString& );
+ TQString handshakeString() const;
+ TQString queryString() const;
+ bool parseMatchHeader( const TQString& line, K3bCddbResultHeader& header );
/**
* since I'm not quite sure when the socket will emit connectionClosed
@@ -101,7 +102,7 @@ class LIBK3B_EXPORT K3bCddbQuery : public QObject
*/
void emitQueryFinished();
- QValueList<K3bCddbResultHeader> m_inexactMatches;
+ TQValueList<K3bCddbResultHeader> m_inexactMatches;
private:
K3bDevice::Toc m_toc;
diff --git a/libk3b/cddb/k3bcddbresult.h b/libk3b/cddb/k3bcddbresult.h
index 46dcb9a..9486bff 100644
--- a/libk3b/cddb/k3bcddbresult.h
+++ b/libk3b/cddb/k3bcddbresult.h
@@ -19,17 +19,17 @@
#define K3B_CDDB_RESULT_H
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include "k3b_export.h"
class LIBK3B_EXPORT K3bCddbResultHeader
{
public:
- QString category;
- QString title;
- QString artist;
- QString discid;
+ TQString category;
+ TQString title;
+ TQString artist;
+ TQString discid;
};
@@ -42,20 +42,20 @@ class LIBK3B_EXPORT K3bCddbResultEntry
year(0) {
}
- QStringList titles;
- QStringList artists;
- QStringList extInfos;
+ TQStringList titles;
+ TQStringList artists;
+ TQStringList extInfos;
- QString cdTitle;
- QString cdArtist;
- QString cdExtInfo;
+ TQString cdTitle;
+ TQString cdArtist;
+ TQString cdExtInfo;
- QString genre;
- QString category;
+ TQString genre;
+ TQString category;
int year;
- QString discid;
+ TQString discid;
- QString rawData;
+ TQString rawData;
};
@@ -71,7 +71,7 @@ class LIBK3B_EXPORT K3bCddbResult
int foundEntries() const;
private:
- QValueList<K3bCddbResultEntry> m_entries;
+ TQValueList<K3bCddbResultEntry> m_entries;
K3bCddbResultEntry m_emptyEntry;
};
diff --git a/libk3b/cddb/k3bcddbsubmit.cpp b/libk3b/cddb/k3bcddbsubmit.cpp
index a04dbcb..01aa7f8 100644
--- a/libk3b/cddb/k3bcddbsubmit.cpp
+++ b/libk3b/cddb/k3bcddbsubmit.cpp
@@ -16,11 +16,11 @@
#include "k3bcddbsubmit.h"
-#include <qtimer.h>
+#include <tqtimer.h>
-K3bCddbSubmit::K3bCddbSubmit( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bCddbSubmit::K3bCddbSubmit( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
}
@@ -37,7 +37,7 @@ void K3bCddbSubmit::submit( const K3bCddbResultEntry& entry )
if( m_resultEntry.rawData.isEmpty() )
createDataStream( m_resultEntry );
- QTimer::singleShot( 0, this, SLOT(doSubmit()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(doSubmit()) );
}
@@ -45,7 +45,7 @@ void K3bCddbSubmit::createDataStream( K3bCddbResultEntry& entry )
{
entry.rawData.truncate(0);
- QTextStream ts( &entry.rawData, IO_WriteOnly );
+ TQTextStream ts( &entry.rawData, IO_WriteOnly );
ts << "#" << endl
<< "# Submitted via: K3b" << endl
diff --git a/libk3b/cddb/k3bcddbsubmit.h b/libk3b/cddb/k3bcddbsubmit.h
index ff57101..cb9906f 100644
--- a/libk3b/cddb/k3bcddbsubmit.h
+++ b/libk3b/cddb/k3bcddbsubmit.h
@@ -17,19 +17,20 @@
#ifndef K3BCDDB_SUBMIT_H
#define K3BCDDB_SUBMIT_H
-#include <qobject.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
#include "k3bcddbresult.h"
-class K3bCddbSubmit : public QObject
+class K3bCddbSubmit : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCddbSubmit( QObject* parent = 0, const char* name = 0 );
+ K3bCddbSubmit( TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bCddbSubmit();
int error() const { return m_error; }
@@ -40,7 +41,7 @@ class K3bCddbSubmit : public QObject
void submit( const K3bCddbResultEntry& );
signals:
- void infoMessage( const QString& );
+ void infoMessage( const TQString& );
void submitFinished( K3bCddbSubmit* );
protected slots:
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index c10fec0..38d3c07 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -37,14 +37,14 @@
#include <kstandarddirs.h>
#include <kapplication.h>
-#include <qptrlist.h>
-#include <qthread.h>
-#include <qmutex.h>
+#include <tqptrlist.h>
+#include <tqthread.h>
+#include <tqmutex.h>
-static Qt::HANDLE s_guiThreadHandle = QThread::currentThread();
+static TQt::HANDLE s_guiThreadHandle = TQThread::currentThread();
-// We cannot use QWaitCondition here since the event might be handled faster
+// We cannot use TQWaitCondition here since the event might be handled faster
// than the thread starts the waiting
class DeviceBlockingEventDoneCondition {
public:
@@ -69,15 +69,15 @@ public:
}
private:
- QMutex m_doneMutex;
+ TQMutex m_doneMutex;
bool m_done;
};
-class DeviceBlockingEvent : public QCustomEvent
+class DeviceBlockingEvent : public TQCustomEvent
{
public:
DeviceBlockingEvent( bool block_, K3bDevice::Device* dev, DeviceBlockingEventDoneCondition* cond_, bool* success_ )
- : QCustomEvent( QEvent::User + 33 ),
+ : TQCustomEvent( TQEvent::User + 33 ),
block(block_),
device(dev),
cond(cond_),
@@ -111,8 +111,8 @@ public:
K3bPluginManager* pluginManager;
K3bGlobalSettings* globalSettings;
- QValueList<K3bJob*> runningJobs;
- QValueList<K3bDevice::Device*> blockedDevices;
+ TQValueList<K3bJob*> runningJobs;
+ TQValueList<K3bDevice::Device*> blockedDevices;
};
@@ -121,8 +121,8 @@ K3bCore* K3bCore::s_k3bCore = 0;
-K3bCore::K3bCore( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bCore::K3bCore( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
d = new Private();
@@ -205,11 +205,11 @@ void K3bCore::init()
externalBinManager()->search();
#ifdef HAVE_HAL
- connect( K3bDevice::HalConnection::instance(), SIGNAL(deviceAdded(const QString&)),
- deviceManager(), SLOT(addDevice(const QString&)) );
- connect( K3bDevice::HalConnection::instance(), SIGNAL(deviceRemoved(const QString&)),
- deviceManager(), SLOT(removeDevice(const QString&)) );
- QStringList devList = K3bDevice::HalConnection::instance()->devices();
+ connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)),
+ deviceManager(), TQT_SLOT(addDevice(const TQString&)) );
+ connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)),
+ deviceManager(), TQT_SLOT(removeDevice(const TQString&)) );
+ TQStringList devList = K3bDevice::HalConnection::instance()->devices();
if( devList.isEmpty() )
deviceManager()->scanBus();
else
@@ -257,7 +257,7 @@ void K3bCore::readSettings( KConfig* cnf )
if( !c )
c = config();
- QString oldGrp = c->group();
+ TQString oldGrp = c->group();
globalSettings()->readSettings( c );
deviceManager()->readConfig( c );
@@ -273,7 +273,7 @@ void K3bCore::saveSettings( KConfig* cnf )
if( !c )
c = config();
- QString oldGrp = c->group();
+ TQString oldGrp = c->group();
c->setGroup( "General Options" );
c->writeEntry( "config version", version() );
@@ -310,7 +310,7 @@ bool K3bCore::jobsRunning() const
}
-const QValueList<K3bJob*>& K3bCore::runningJobs() const
+const TQValueList<K3bJob*>& K3bCore::runningJobs() const
{
return d->runningJobs;
}
@@ -318,13 +318,13 @@ const QValueList<K3bJob*>& K3bCore::runningJobs() const
bool K3bCore::blockDevice( K3bDevice::Device* dev )
{
- if( QThread::currentThread() == s_guiThreadHandle ) {
+ if( TQThread::currentThread() == s_guiThreadHandle ) {
return internalBlockDevice( dev );
}
else {
bool success = false;
DeviceBlockingEventDoneCondition w;
- QApplication::postEvent( this, new DeviceBlockingEvent( true, dev, &w, &success ) );
+ TQApplication::postEvent( this, new DeviceBlockingEvent( true, dev, &w, &success ) );
w.wait();
return success;
}
@@ -333,12 +333,12 @@ bool K3bCore::blockDevice( K3bDevice::Device* dev )
void K3bCore::unblockDevice( K3bDevice::Device* dev )
{
- if( QThread::currentThread() == s_guiThreadHandle ) {
+ if( TQThread::currentThread() == s_guiThreadHandle ) {
internalUnblockDevice( dev );
}
else {
DeviceBlockingEventDoneCondition w;
- QApplication::postEvent( this, new DeviceBlockingEvent( false, dev, &w, 0 ) );
+ TQApplication::postEvent( this, new DeviceBlockingEvent( false, dev, &w, 0 ) );
w.wait();
}
}
@@ -346,7 +346,7 @@ void K3bCore::unblockDevice( K3bDevice::Device* dev )
bool K3bCore::internalBlockDevice( K3bDevice::Device* dev )
{
- if( !d->blockedDevices.contains( dev ) ) {
+ if( !d->blockedDevices.tqcontains( dev ) ) {
d->blockedDevices.append( dev );
return true;
}
@@ -361,7 +361,7 @@ void K3bCore::internalUnblockDevice( K3bDevice::Device* dev )
}
-void K3bCore::customEvent( QCustomEvent* e )
+void K3bCore::customEvent( TQCustomEvent* e )
{
if( DeviceBlockingEvent* de = dynamic_cast<DeviceBlockingEvent*>(e) ) {
if( de->block )
diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h
index ce73e32..f97430c 100644
--- a/libk3b/core/k3bcore.h
+++ b/libk3b/core/k3bcore.h
@@ -17,8 +17,8 @@
#ifndef _K3B_CORE_H_
#define _K3B_CORE_H_
-#include <qobject.h>
-#include <qvaluelist.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
#include "k3b_export.h"
@@ -36,7 +36,7 @@ class K3bJob;
class K3bBurnJob;
class K3bGlobalSettings;
class K3bPluginManager;
-class QCustomEvent;
+class TQCustomEvent;
namespace K3bDevice {
@@ -52,19 +52,20 @@ namespace K3bDevice {
* This is the heart of the K3b system. Every plugin may use this
* to get the information it needs.
*/
-class LIBK3B_EXPORT K3bCore : public QObject
+class LIBK3B_EXPORT K3bCore : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Although K3bCore is a singlelton it's constructor is not private to make inheritance
* possible. Just make sure to only create one instance.
*/
- K3bCore( QObject* parent = 0, const char* name = 0 );
+ K3bCore( TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bCore();
- const QValueList<K3bJob*>& runningJobs() const;
+ const TQValueList<K3bJob*>& runningJobs() const;
/**
* Equals to !runningJobs().isEmpty()
@@ -169,7 +170,7 @@ class LIBK3B_EXPORT K3bCore : public QObject
virtual void initDeviceManager();
virtual void initPluginManager();
- virtual void customEvent( QCustomEvent* e );
+ virtual void customEvent( TQCustomEvent* e );
private:
class Private;
diff --git a/libk3b/core/k3bdataevent.h b/libk3b/core/k3bdataevent.h
index b6a4334..c88bfaa 100644
--- a/libk3b/core/k3bdataevent.h
+++ b/libk3b/core/k3bdataevent.h
@@ -16,23 +16,23 @@
#ifndef K3B_DATA_EVENT_H
#define K3B_DATA_EVENT_H
-#include <qevent.h>
+#include <tqevent.h>
/**
* Custom event class for posting events corresponding to the
* K3bJob signals. This is useful for a threaded job since
* in that case it's not possible to emit signals that directly
- * change the GUI (see QThread docu).
+ * change the GUI (see TQThread docu).
*/
-class K3bDataEvent : public QCustomEvent
+class K3bDataEvent : public TQCustomEvent
{
public:
// make sure we get not in the way of K3bProgressInfoEvent
- static const int EVENT_TYPE = QEvent::User + 100;
+ static const int EVENT_TYPE = TQEvent::User + 100;
K3bDataEvent( const char* data, int len )
- : QCustomEvent( EVENT_TYPE ),
+ : TQCustomEvent( EVENT_TYPE ),
m_data(data),
m_length(len)
{}
diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp
index b654d22..94ff212 100644
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
@@ -18,12 +18,12 @@
#include "k3bexternalbinmanager.h"
#include <k3bglobals.h>
-#include <qfile.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qobject.h>
-#include <qregexp.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqobject.h>
+#include <tqregexp.h>
+#include <tqtextstream.h>
#include <k3bprocess.h>
#include <kdebug.h>
@@ -92,18 +92,18 @@ K3bCdrecordProgram::K3bCdrecordProgram( bool dvdPro )
// But since it may be that someone manually installed cdrecord
// replacing the wrapper we check if cdrecord is a script.
//
-static QString& debianWeirdnessHack( QString& path )
+static TQString& debianWeirdnessHack( TQString& path )
{
- if( QFile::exists( path + ".mmap" ) ) {
+ if( TQFile::exists( path + ".mmap" ) ) {
kdDebug() << "(K3bCdrecordProgram) checking for Debian cdrecord wrapper script." << endl;
- if( QFileInfo( path ).size() < 1024 ) {
+ if( TQFileInfo( path ).size() < 1024 ) {
kdDebug() << "(K3bCdrecordProgram) Debian Wrapper script size fits. Checking file." << endl;
- QFile f( path );
+ TQFile f( path );
f.open( IO_ReadOnly );
- QString s = QTextStream( &f ).read();
- if( s.contains( "cdrecord.mmap" ) && s.contains( "cdrecord.shm" ) ) {
+ TQString s = TQTextStream( &f ).read();
+ if( s.tqcontains( "cdrecord.mmap" ) && s.tqcontains( "cdrecord.shm" ) ) {
kdDebug() << "(K3bCdrecordProgram) Found Debian Wrapper script." << endl;
- QString ext;
+ TQString ext;
if( K3b::kernelVersion().versionString().left(3) > "2.2" )
ext = ".mmap";
else
@@ -120,23 +120,23 @@ static QString& debianWeirdnessHack( QString& path )
}
-bool K3bCdrecordProgram::scan( const QString& p )
+bool K3bCdrecordProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
bool wodim = false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
- if( QFile::exists( path + "wodim" ) ) {
+ if( TQFile::exists( path + "wodim" ) ) {
wodim = true;
path += "wodim";
}
- else if( QFile::exists( path + "cdrecord" ) ) {
+ else if( TQFile::exists( path + "cdrecord" ) ) {
path += "cdrecord";
}
else
@@ -155,23 +155,23 @@ bool K3bCdrecordProgram::scan( const QString& p )
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
int pos = -1;
if( wodim ) {
- pos = out.output().find( "Wodim" );
+ pos = out.output().tqfind( "Wodim" );
}
else if( m_dvdPro ) {
- pos = out.output().find( "Cdrecord-ProDVD" );
+ pos = out.output().tqfind( "Cdrecord-ProDVD" );
}
else {
- pos = out.output().find( "Cdrecord" );
+ pos = out.output().tqfind( "Cdrecord" );
}
if( pos < 0 )
return false;
- pos = out.output().find( QRegExp("[0-9]"), pos );
+ pos = out.output().tqfind( TQRegExp("[0-9]"), pos );
if( pos < 0 )
return false;
- int endPos = out.output().find( QRegExp("\\s"), pos+1 );
+ int endPos = out.output().tqfind( TQRegExp("\\s"), pos+1 );
if( endPos < 0 )
return false;
@@ -182,11 +182,11 @@ bool K3bCdrecordProgram::scan( const QString& p )
if( wodim )
bin->addFeature( "wodim" );
- pos = out.output().find( "Copyright") + 14;
- endPos = out.output().find( "\n", pos );
+ pos = out.output().tqfind( "Copyright") + 14;
+ endPos = out.output().tqfind( "\n", pos );
// cdrecord does not use local encoding for the copyright statement but plain latin1
- bin->copyright = QString::fromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace();
+ bin->copyright = TQString::tqfromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace();
}
else {
kdDebug() << "(K3bCdrecordProgram) could not start " << path << endl;
@@ -195,7 +195,7 @@ bool K3bCdrecordProgram::scan( const QString& p )
if( !m_dvdPro && bin->version.suffix().endsWith( "-dvd" ) ) {
bin->addFeature( "dvd-patch" );
- bin->version = QString(bin->version.versionString()).remove("-dvd");
+ bin->version = TQString(bin->version.versionString()).remove("-dvd");
}
// probe features
@@ -203,17 +203,17 @@ bool K3bCdrecordProgram::scan( const QString& p )
out.setProcess( &fp );
fp << path << "-help";
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
- if( out.output().contains( "gracetime" ) )
+ if( out.output().tqcontains( "gracetime" ) )
bin->addFeature( "gracetime" );
- if( out.output().contains( "-overburn" ) )
+ if( out.output().tqcontains( "-overburn" ) )
bin->addFeature( "overburn" );
- if( out.output().contains( "-text" ) )
+ if( out.output().tqcontains( "-text" ) )
bin->addFeature( "cdtext" );
- if( out.output().contains( "-clone" ) )
+ if( out.output().tqcontains( "-clone" ) )
bin->addFeature( "clone" );
- if( out.output().contains( "-tao" ) )
+ if( out.output().tqcontains( "-tao" ) )
bin->addFeature( "tao" );
- if( out.output().contains( "cuefile=" ) &&
+ if( out.output().tqcontains( "cuefile=" ) &&
( wodim || bin->version > K3bVersion( 2, 1, -1, "a14") ) ) // cuefile handling was still buggy in a14
bin->addFeature( "cuefile" );
@@ -222,14 +222,14 @@ bool K3bCdrecordProgram::scan( const QString& p )
// just double-checked and the help page is proper but there is no harm in having
// two checks)
// and the version check does not handle versions like 2.01-dvd properly
- if( out.output().contains( "-xamix" ) ||
+ if( out.output().tqcontains( "-xamix" ) ||
bin->version >= K3bVersion( 2, 1, -1, "a12" ) ||
wodim )
bin->addFeature( "xamix" );
// check if we run cdrecord as root
struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
+ if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
bin->addFeature( "suidroot" );
}
@@ -271,23 +271,23 @@ K3bMkisofsProgram::K3bMkisofsProgram()
{
}
-bool K3bMkisofsProgram::scan( const QString& p )
+bool K3bMkisofsProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
bool genisoimage = false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
- if( QFile::exists( path + "genisoimage" ) ) {
+ if( TQFile::exists( path + "genisoimage" ) ) {
genisoimage = true;
path += "genisoimage";
}
- else if( QFile::exists( path + "mkisofs" ) ) {
+ else if( TQFile::exists( path + "mkisofs" ) ) {
path += "mkisofs";
}
else
@@ -303,18 +303,18 @@ bool K3bMkisofsProgram::scan( const QString& p )
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
int pos = -1;
if( genisoimage )
- pos = out.output().find( "genisoimage" );
+ pos = out.output().tqfind( "genisoimage" );
else
- pos = out.output().find( "mkisofs" );
+ pos = out.output().tqfind( "mkisofs" );
if( pos < 0 )
return false;
- pos = out.output().find( QRegExp("[0-9]"), pos );
+ pos = out.output().tqfind( TQRegExp("[0-9]"), pos );
if( pos < 0 )
return false;
- int endPos = out.output().find( ' ', pos+1 );
+ int endPos = out.output().tqfind( ' ', pos+1 );
if( endPos < 0 )
return false;
@@ -337,20 +337,20 @@ bool K3bMkisofsProgram::scan( const QString& p )
fp << path << "-help";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
- if( out.output().contains( "-udf" ) )
+ if( out.output().tqcontains( "-udf" ) )
bin->addFeature( "udf" );
- if( out.output().contains( "-dvd-video" ) )
+ if( out.output().tqcontains( "-dvd-video" ) )
bin->addFeature( "dvd-video" );
- if( out.output().contains( "-joliet-long" ) )
+ if( out.output().tqcontains( "-joliet-long" ) )
bin->addFeature( "joliet-long" );
- if( out.output().contains( "-xa" ) )
+ if( out.output().tqcontains( "-xa" ) )
bin->addFeature( "xa" );
- if( out.output().contains( "-sectype" ) )
+ if( out.output().tqcontains( "-sectype" ) )
bin->addFeature( "sectype" );
// check if we run mkisofs as root
struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
+ if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
bin->addFeature( "suidroot" );
}
@@ -383,30 +383,30 @@ K3bReadcdProgram::K3bReadcdProgram()
{
}
-bool K3bReadcdProgram::scan( const QString& p )
+bool K3bReadcdProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
bool readom = false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
- if( QFile::exists( path + "readom" ) ) {
+ if( TQFile::exists( path + "readom" ) ) {
readom = true;
path += "readom";
}
- else if( QFile::exists( path + "readcd" ) ) {
+ else if( TQFile::exists( path + "readcd" ) ) {
path += "readcd";
}
else
return false;
}
- if( !QFile::exists( path ) )
+ if( !TQFile::exists( path ) )
return false;
K3bExternalBin* bin = 0;
@@ -418,17 +418,17 @@ bool K3bReadcdProgram::scan( const QString& p )
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
int pos = -1;
if( readom )
- pos = out.output().find( "readom" );
+ pos = out.output().tqfind( "readom" );
else
- pos = out.output().find( "readcd" );
+ pos = out.output().tqfind( "readcd" );
if( pos < 0 )
return false;
- pos = out.output().find( QRegExp("[0-9]"), pos );
+ pos = out.output().tqfind( TQRegExp("[0-9]"), pos );
if( pos < 0 )
return false;
- int endPos = out.output().find( ' ', pos+1 );
+ int endPos = out.output().tqfind( ' ', pos+1 );
if( endPos < 0 )
return false;
@@ -451,12 +451,12 @@ bool K3bReadcdProgram::scan( const QString& p )
fp << path << "-help";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
- if( out.output().contains( "-clone" ) )
+ if( out.output().tqcontains( "-clone" ) )
bin->addFeature( "clone" );
// check if we run mkisofs as root
struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
+ if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
bin->addFeature( "suidroot" );
}
@@ -484,20 +484,20 @@ K3bCdrdaoProgram::K3bCdrdaoProgram()
{
}
-bool K3bCdrdaoProgram::scan( const QString& p )
+bool K3bCdrdaoProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
path.append("cdrdao");
}
- if( !QFile::exists( path ) )
+ if( !TQFile::exists( path ) )
return false;
K3bExternalBin* bin = 0;
@@ -507,15 +507,15 @@ bool K3bCdrdaoProgram::scan( const QString& p )
vp << path ;
K3bProcessOutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
- int pos = out.output().find( "Cdrdao version" );
+ int pos = out.output().tqfind( "Cdrdao version" );
if( pos < 0 )
return false;
- pos = out.output().find( QRegExp("[0-9]"), pos );
+ pos = out.output().tqfind( TQRegExp("[0-9]"), pos );
if( pos < 0 )
return false;
- int endPos = out.output().find( ' ', pos+1 );
+ int endPos = out.output().tqfind( ' ', pos+1 );
if( endPos < 0 )
return false;
@@ -523,8 +523,8 @@ bool K3bCdrdaoProgram::scan( const QString& p )
bin->path = path;
bin->version = out.output().mid( pos, endPos-pos );
- pos = out.output().find( "(C)", endPos+1 ) + 4;
- endPos = out.output().find( '\n', pos );
+ pos = out.output().tqfind( "(C)", endPos+1 ) + 4;
+ endPos = out.output().tqfind( '\n', pos );
bin->copyright = out.output().mid( pos, endPos-pos );
}
else {
@@ -539,17 +539,17 @@ bool K3bCdrdaoProgram::scan( const QString& p )
fp << path << "write" << "-h";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
- if( out.output().contains( "--overburn" ) )
+ if( out.output().tqcontains( "--overburn" ) )
bin->addFeature( "overburn" );
- if( out.output().contains( "--multi" ) )
+ if( out.output().tqcontains( "--multi" ) )
bin->addFeature( "multisession" );
- if( out.output().contains( "--buffer-under-run-protection" ) )
+ if( out.output().tqcontains( "--buffer-under-run-protection" ) )
bin->addFeature( "disable-burnproof" );
// check if we run cdrdao as root
struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
+ if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
bin->addFeature( "suidroot" );
}
@@ -578,24 +578,24 @@ bool K3bCdrdaoProgram::scan( const QString& p )
}
-K3bTranscodeProgram::K3bTranscodeProgram( const QString& transcodeProgram )
+K3bTranscodeProgram::K3bTranscodeProgram( const TQString& transcodeProgram )
: K3bExternalProgram( transcodeProgram ),
m_transcodeProgram( transcodeProgram )
{
}
-bool K3bTranscodeProgram::scan( const QString& p )
+bool K3bTranscodeProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
+ TQString path = p;
if( path[path.length()-1] != '/' )
path.append("/");
- QString appPath = path + m_transcodeProgram;
+ TQString appPath = path + m_transcodeProgram;
- if( !QFile::exists( appPath ) )
+ if( !TQFile::exists( appPath ) )
return false;
K3bExternalBin* bin = 0;
@@ -605,13 +605,13 @@ bool K3bTranscodeProgram::scan( const QString& p )
vp << appPath << "-v";
K3bProcessOutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
- int pos = out.output().find( "transcode v" );
+ int pos = out.output().tqfind( "transcode v" );
if( pos < 0 )
return false;
pos += 11;
- int endPos = out.output().find( QRegExp("[\\s\\)]"), pos+1 );
+ int endPos = out.output().tqfind( TQRegExp("[\\s\\)]"), pos+1 );
if( endPos < 0 )
return false;
@@ -627,20 +627,20 @@ bool K3bTranscodeProgram::scan( const QString& p )
//
// Check features
//
- QString modInfoBin = path + "tcmodinfo";
+ TQString modInfoBin = path + "tcmodinfo";
KProcess modp;
modp << modInfoBin << "-p";
out.setProcess( &modp );
if( modp.start( KProcess::Block, KProcess::AllOutput ) ) {
- QString modPath = out.output().stripWhiteSpace();
- QDir modDir( modPath );
- if( !modDir.entryList( "*export_xvid*", QDir::Files ).isEmpty() )
+ TQString modPath = out.output().stripWhiteSpace();
+ TQDir modDir( modPath );
+ if( !modDir.entryList( "*export_xvid*", TQDir::Files ).isEmpty() )
bin->addFeature( "xvid" );
- if( !modDir.entryList( "*export_lame*", QDir::Files ).isEmpty() )
+ if( !modDir.entryList( "*export_lame*", TQDir::Files ).isEmpty() )
bin->addFeature( "lame" );
- if( !modDir.entryList( "*export_ffmpeg*", QDir::Files ).isEmpty() )
+ if( !modDir.entryList( "*export_ffmpeg*", TQDir::Files ).isEmpty() )
bin->addFeature( "ffmpeg" );
- if( !modDir.entryList( "*export_ac3*", QDir::Files ).isEmpty() )
+ if( !modDir.entryList( "*export_ac3*", TQDir::Files ).isEmpty() )
bin->addFeature( "ac3" );
}
@@ -650,26 +650,26 @@ bool K3bTranscodeProgram::scan( const QString& p )
-K3bVcdbuilderProgram::K3bVcdbuilderProgram( const QString& p )
+K3bVcdbuilderProgram::K3bVcdbuilderProgram( const TQString& p )
: K3bExternalProgram( p ),
m_vcdbuilderProgram( p )
{
}
-bool K3bVcdbuilderProgram::scan( const QString& p )
+bool K3bVcdbuilderProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
path.append(m_vcdbuilderProgram);
}
- if( !QFile::exists( path ) )
+ if( !TQFile::exists( path ) )
return false;
K3bExternalBin* bin = 0;
@@ -679,13 +679,13 @@ bool K3bVcdbuilderProgram::scan( const QString& p )
vp << path << "-V";
K3bProcessOutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
- int pos = out.output().find( "GNU VCDImager" );
+ int pos = out.output().tqfind( "GNU VCDImager" );
if( pos < 0 )
return false;
pos += 14;
- int endPos = out.output().find( QRegExp("[\\n\\)]"), pos+1 );
+ int endPos = out.output().tqfind( TQRegExp("[\\n\\)]"), pos+1 );
if( endPos < 0 )
return false;
@@ -693,8 +693,8 @@ bool K3bVcdbuilderProgram::scan( const QString& p )
bin->path = path;
bin->version = out.output().mid( pos, endPos-pos ).stripWhiteSpace();
- pos = out.output().find( "Copyright" ) + 14;
- endPos = out.output().find( "\n", pos );
+ pos = out.output().tqfind( "Copyright" ) + 14;
+ endPos = out.output().tqfind( "\n", pos );
bin->copyright = out.output().mid( pos, endPos-pos ).stripWhiteSpace();
}
else {
@@ -713,20 +713,20 @@ K3bNormalizeProgram::K3bNormalizeProgram()
}
-bool K3bNormalizeProgram::scan( const QString& p )
+bool K3bNormalizeProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
path.append("normalize-audio");
}
- if( !QFile::exists( path ) )
+ if( !TQFile::exists( path ) )
return false;
K3bExternalBin* bin = 0;
@@ -737,15 +737,15 @@ bool K3bNormalizeProgram::scan( const QString& p )
vp << path << "--version";
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
- int pos = out.output().find( "normalize" );
+ int pos = out.output().tqfind( "normalize" );
if( pos < 0 )
return false;
- pos = out.output().find( QRegExp("\\d"), pos );
+ pos = out.output().tqfind( TQRegExp("\\d"), pos );
if( pos < 0 )
return false;
- int endPos = out.output().find( QRegExp("\\s"), pos+1 );
+ int endPos = out.output().tqfind( TQRegExp("\\s"), pos+1 );
if( endPos < 0 )
return false;
@@ -753,8 +753,8 @@ bool K3bNormalizeProgram::scan( const QString& p )
bin->path = path;
bin->version = out.output().mid( pos, endPos-pos );
- pos = out.output().find( "Copyright" )+14;
- endPos = out.output().find( "\n", pos );
+ pos = out.output().tqfind( "Copyright" )+14;
+ endPos = out.output().tqfind( "\n", pos );
bin->copyright = out.output().mid( pos, endPos-pos ).stripWhiteSpace();
}
else {
@@ -772,20 +772,20 @@ K3bGrowisofsProgram::K3bGrowisofsProgram()
{
}
-bool K3bGrowisofsProgram::scan( const QString& p )
+bool K3bGrowisofsProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
path.append("growisofs");
}
- if( !QFile::exists( path ) )
+ if( !TQFile::exists( path ) )
return false;
K3bExternalBin* bin = 0;
@@ -796,15 +796,15 @@ bool K3bGrowisofsProgram::scan( const QString& p )
vp << path << "-version";
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
- int pos = out.output().find( "growisofs" );
+ int pos = out.output().tqfind( "growisofs" );
if( pos < 0 )
return false;
- pos = out.output().find( QRegExp("\\d"), pos );
+ pos = out.output().tqfind( TQRegExp("\\d"), pos );
if( pos < 0 )
return false;
- int endPos = out.output().find( ",", pos+1 );
+ int endPos = out.output().tqfind( ",", pos+1 );
if( endPos < 0 )
return false;
@@ -822,7 +822,7 @@ bool K3bGrowisofsProgram::scan( const QString& p )
// check if we run growisofs as root
struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
+ if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
bin->addFeature( "suidroot" );
}
@@ -837,20 +837,20 @@ K3bDvdformatProgram::K3bDvdformatProgram()
{
}
-bool K3bDvdformatProgram::scan( const QString& p )
+bool K3bDvdformatProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
path.append("dvd+rw-format");
}
- if( !QFile::exists( path ) )
+ if( !TQFile::exists( path ) )
return false;
K3bExternalBin* bin = 0;
@@ -863,18 +863,18 @@ bool K3bDvdformatProgram::scan( const QString& p )
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
// different locales make searching for the +- char difficult
// so we simply ignore it.
- int pos = out.output().find( QRegExp("DVD.*RAM format utility") );
+ int pos = out.output().tqfind( TQRegExp("DVD.*RAM format utility") );
if( pos < 0 )
return false;
- pos = out.output().find( "version", pos );
+ pos = out.output().tqfind( "version", pos );
if( pos < 0 )
return false;
pos += 8;
// the version ends in a dot.
- int endPos = out.output().find( QRegExp("\\.\\D"), pos );
+ int endPos = out.output().tqfind( TQRegExp("\\.\\D"), pos );
if( endPos < 0 )
return false;
@@ -892,7 +892,7 @@ bool K3bDvdformatProgram::scan( const QString& p )
// check if we run dvd+rw-format as root
struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
+ if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
bin->addFeature( "suidroot" );
}
@@ -907,20 +907,20 @@ K3bDvdBooktypeProgram::K3bDvdBooktypeProgram()
{
}
-bool K3bDvdBooktypeProgram::scan( const QString& p )
+bool K3bDvdBooktypeProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
path.append("dvd+rw-booktype");
}
- if( !QFile::exists( path ) )
+ if( !TQFile::exists( path ) )
return false;
K3bExternalBin* bin = 0;
@@ -931,7 +931,7 @@ bool K3bDvdBooktypeProgram::scan( const QString& p )
vp << path;
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
- int pos = out.output().find( "dvd+rw-booktype" );
+ int pos = out.output().tqfind( "dvd+rw-booktype" );
if( pos < 0 )
return false;
@@ -956,20 +956,20 @@ K3bCdda2wavProgram::K3bCdda2wavProgram()
{
}
-bool K3bCdda2wavProgram::scan( const QString& p )
+bool K3bCdda2wavProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
- QFileInfo fi( path );
+ TQString path = p;
+ TQFileInfo fi( path );
if( fi.isDir() ) {
if( path[path.length()-1] != '/' )
path.append("/");
path.append("cdda2wav");
}
- if( !QFile::exists( path ) )
+ if( !TQFile::exists( path ) )
return false;
K3bExternalBin* bin = 0;
@@ -980,18 +980,18 @@ bool K3bCdda2wavProgram::scan( const QString& p )
vp << path << "-h";
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
- int pos = out.output().find( "cdda2wav" );
+ int pos = out.output().tqfind( "cdda2wav" );
if( pos < 0 )
return false;
- pos = out.output().find( "Version", pos );
+ pos = out.output().tqfind( "Version", pos );
if( pos < 0 )
return false;
pos += 8;
// the version does not end in a space but the kernel info
- int endPos = out.output().find( QRegExp("[^\\d\\.]"), pos );
+ int endPos = out.output().tqfind( TQRegExp("[^\\d\\.]"), pos );
if( endPos < 0 )
return false;
@@ -1001,15 +1001,15 @@ bool K3bCdda2wavProgram::scan( const QString& p )
// features (we do this since the cdda2wav help says that the short
// options will disappear soon)
- if( out.output().find( "-info-only" ) )
+ if( out.output().tqfind( "-info-only" ) )
bin->addFeature( "info-only" ); // otherwise use the -J option
- if( out.output().find( "-no-infofile" ) )
+ if( out.output().tqfind( "-no-infofile" ) )
bin->addFeature( "no-infofile" ); // otherwise use the -H option
- if( out.output().find( "-gui" ) )
+ if( out.output().tqfind( "-gui" ) )
bin->addFeature( "gui" ); // otherwise use the -g option
- if( out.output().find( "-bulk" ) )
+ if( out.output().tqfind( "-bulk" ) )
bin->addFeature( "bulk" ); // otherwise use the -B option
- if( out.output().find( "dev=" ) )
+ if( out.output().tqfind( "dev=" ) )
bin->addFeature( "dev" ); // otherwise use the -B option
}
else {
@@ -1019,7 +1019,7 @@ bool K3bCdda2wavProgram::scan( const QString& p )
// check if we run as root
struct stat s;
- if( !::stat( QFile::encodeName(path), &s ) ) {
+ if( !::stat( TQFile::encodeName(path), &s ) ) {
if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
bin->addFeature( "suidroot" );
}
diff --git a/libk3b/core/k3bdefaultexternalprograms.h b/libk3b/core/k3bdefaultexternalprograms.h
index 3212727..bc4d41c 100644
--- a/libk3b/core/k3bdefaultexternalprograms.h
+++ b/libk3b/core/k3bdefaultexternalprograms.h
@@ -35,7 +35,7 @@ class LIBK3B_EXPORT K3bCdrecordProgram : public K3bExternalProgram
public:
K3bCdrecordProgram( bool dvdPro );
- bool scan( const QString& );
+ bool scan( const TQString& );
private:
bool m_dvdPro;
@@ -47,7 +47,7 @@ class LIBK3B_EXPORT K3bMkisofsProgram : public K3bExternalProgram
public:
K3bMkisofsProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
};
@@ -56,7 +56,7 @@ class LIBK3B_EXPORT K3bReadcdProgram : public K3bExternalProgram
public:
K3bReadcdProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
};
@@ -65,34 +65,34 @@ class LIBK3B_EXPORT K3bCdrdaoProgram : public K3bExternalProgram
public:
K3bCdrdaoProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
};
class LIBK3B_EXPORT K3bTranscodeProgram : public K3bExternalProgram
{
public:
- K3bTranscodeProgram( const QString& transcodeProgram );
+ K3bTranscodeProgram( const TQString& transcodeProgram );
- bool scan( const QString& );
+ bool scan( const TQString& );
// no user parameters (yet)
bool supportsUserParameters() const { return false; }
private:
- QString m_transcodeProgram;
+ TQString m_transcodeProgram;
};
class LIBK3B_EXPORT K3bVcdbuilderProgram : public K3bExternalProgram
{
public:
- K3bVcdbuilderProgram( const QString& );
+ K3bVcdbuilderProgram( const TQString& );
- bool scan( const QString& );
+ bool scan( const TQString& );
private:
- QString m_vcdbuilderProgram;
+ TQString m_vcdbuilderProgram;
};
@@ -101,7 +101,7 @@ class LIBK3B_EXPORT K3bNormalizeProgram : public K3bExternalProgram
public:
K3bNormalizeProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
};
@@ -110,7 +110,7 @@ class LIBK3B_EXPORT K3bGrowisofsProgram : public K3bExternalProgram
public:
K3bGrowisofsProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
};
@@ -119,7 +119,7 @@ class LIBK3B_EXPORT K3bDvdformatProgram : public K3bExternalProgram
public:
K3bDvdformatProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
};
@@ -128,7 +128,7 @@ class LIBK3B_EXPORT K3bDvdBooktypeProgram : public K3bExternalProgram
public:
K3bDvdBooktypeProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
};
@@ -137,7 +137,7 @@ class LIBK3B_EXPORT K3bCdda2wavProgram : public K3bExternalProgram
public:
K3bCdda2wavProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
};
#endif
diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp
index 2b21a85..7afc81e 100644
--- a/libk3b/core/k3bexternalbinmanager.cpp
+++ b/libk3b/core/k3bexternalbinmanager.cpp
@@ -20,11 +20,11 @@
#include <kconfig.h>
#include <kdeversion.h>
-#include <qstring.h>
-#include <qregexp.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqregexp.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqptrlist.h>
#include <unistd.h>
#include <sys/stat.h>
@@ -32,7 +32,7 @@
-QString K3bExternalBinManager::m_noPath = "";
+TQString K3bExternalBinManager::m_noPath = "";
// ///////////////////////////////////////////////////////////
@@ -53,25 +53,25 @@ bool K3bExternalBin::isEmpty() const
}
-const QString& K3bExternalBin::name() const
+const TQString& K3bExternalBin::name() const
{
return m_program->name();
}
-bool K3bExternalBin::hasFeature( const QString& f ) const
+bool K3bExternalBin::hasFeature( const TQString& f ) const
{
- return m_features.contains( f );
+ return m_features.tqcontains( f );
}
-void K3bExternalBin::addFeature( const QString& f )
+void K3bExternalBin::addFeature( const TQString& f )
{
m_features.append( f );
}
-const QStringList& K3bExternalBin::userParameters() const
+const TQStringList& K3bExternalBin::userParameters() const
{
return m_program->userParameters();
}
@@ -85,7 +85,7 @@ const QStringList& K3bExternalBin::userParameters() const
// ///////////////////////////////////////////////////////////
-K3bExternalProgram::K3bExternalProgram( const QString& name )
+K3bExternalProgram::K3bExternalProgram( const TQString& name )
: m_name( name )
{
m_bins.setAutoDelete( true );
@@ -99,7 +99,7 @@ K3bExternalProgram::~K3bExternalProgram()
const K3bExternalBin* K3bExternalProgram::mostRecentBin() const
{
- QPtrListIterator<K3bExternalBin> it( m_bins );
+ TQPtrListIterator<K3bExternalBin> it( m_bins );
K3bExternalBin* bin = *it;
++it;
while( *it ) {
@@ -113,7 +113,7 @@ const K3bExternalBin* K3bExternalProgram::mostRecentBin() const
void K3bExternalProgram::addBin( K3bExternalBin* bin )
{
- if( !m_bins.contains( bin ) ) {
+ if( !m_bins.tqcontains( bin ) ) {
// insertion sort
// the first bin in the list is always the one used
// so we default to using the newest one
@@ -127,17 +127,17 @@ void K3bExternalProgram::addBin( K3bExternalBin* bin )
void K3bExternalProgram::setDefault( const K3bExternalBin* bin )
{
- if( m_bins.contains( bin ) )
- m_bins.take( m_bins.find( bin ) );
+ if( m_bins.tqcontains( bin ) )
+ m_bins.take( m_bins.tqfind( bin ) );
// the first bin in the list is always the one used
m_bins.insert( 0, bin );
}
-void K3bExternalProgram::setDefault( const QString& path )
+void K3bExternalProgram::setDefault( const TQString& path )
{
- for( QPtrListIterator<K3bExternalBin> it( m_bins ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bExternalBin> it( m_bins ); it.current(); ++it ) {
if( it.current()->path == path ) {
setDefault( it.current() );
return;
@@ -146,9 +146,9 @@ void K3bExternalProgram::setDefault( const QString& path )
}
-void K3bExternalProgram::addUserParameter( const QString& p )
+void K3bExternalProgram::addUserParameter( const TQString& p )
{
- if( !m_userParameters.contains( p ) )
+ if( !m_userParameters.tqcontains( p ) )
m_userParameters.append(p);
}
@@ -161,8 +161,8 @@ void K3bExternalProgram::addUserParameter( const QString& p )
// ///////////////////////////////////////////////////////////
-K3bExternalBinManager::K3bExternalBinManager( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bExternalBinManager::K3bExternalBinManager( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
}
@@ -184,14 +184,14 @@ bool K3bExternalBinManager::readConfig( KConfig* c )
search();
- for ( QMap<QString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) {
+ for ( TQMap<TQString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) {
K3bExternalProgram* p = it.data();
if( c->hasKey( p->name() + " default" ) ) {
p->setDefault( c->readEntry( p->name() + " default" ) );
}
if( c->hasKey( p->name() + " user parameters" ) ) {
- QStringList list = c->readListEntry( p->name() + " user parameters" );
- for( QStringList::iterator strIt = list.begin(); strIt != list.end(); ++strIt )
+ TQStringList list = c->readListEntry( p->name() + " user parameters" );
+ for( TQStringList::iterator strIt = list.begin(); strIt != list.end(); ++strIt )
p->addUserParameter( *strIt );
}
if( c->hasKey( p->name() + " last seen newest version" ) ) {
@@ -212,7 +212,7 @@ bool K3bExternalBinManager::saveConfig( KConfig* c )
c->setGroup( "External Programs" );
c->writePathEntry( "search path", m_searchPath );
- for ( QMap<QString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) {
+ for ( TQMap<TQString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) {
K3bExternalProgram* p = it.data();
if( p->defaultBin() )
c->writeEntry( p->name() + " default", p->defaultBin()->path );
@@ -228,18 +228,18 @@ bool K3bExternalBinManager::saveConfig( KConfig* c )
}
-bool K3bExternalBinManager::foundBin( const QString& name )
+bool K3bExternalBinManager::foundBin( const TQString& name )
{
- if( m_programs.find( name ) == m_programs.end() )
+ if( m_programs.tqfind( name ) == m_programs.end() )
return false;
else
return (m_programs[name]->defaultBin() != 0);
}
-const QString& K3bExternalBinManager::binPath( const QString& name )
+const TQString& K3bExternalBinManager::binPath( const TQString& name )
{
- if( m_programs.find( name ) == m_programs.end() )
+ if( m_programs.tqfind( name ) == m_programs.end() )
return m_noPath;
if( m_programs[name]->defaultBin() != 0 )
@@ -249,9 +249,9 @@ const QString& K3bExternalBinManager::binPath( const QString& name )
}
-const K3bExternalBin* K3bExternalBinManager::binObject( const QString& name )
+const K3bExternalBin* K3bExternalBinManager::binObject( const TQString& name )
{
- if( m_programs.find( name ) == m_programs.end() )
+ if( m_programs.tqfind( name ) == m_programs.end() )
return 0;
return m_programs[name]->defaultBin();
@@ -266,7 +266,7 @@ void K3bExternalBinManager::addProgram( K3bExternalProgram* p )
void K3bExternalBinManager::clear()
{
- for( QMap<QString, K3bExternalProgram*>::Iterator it = m_programs.begin(); it != m_programs.end(); ++it )
+ for( TQMap<TQString, K3bExternalProgram*>::Iterator it = m_programs.begin(); it != m_programs.end(); ++it )
delete it.data();
m_programs.clear();
}
@@ -277,36 +277,36 @@ void K3bExternalBinManager::search()
if( m_searchPath.isEmpty() )
loadDefaultSearchPath();
- for( QMap<QString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) {
+ for( TQMap<TQString, K3bExternalProgram*>::iterator it = m_programs.begin(); it != m_programs.end(); ++it ) {
it.data()->clear();
}
// do not search one path twice
- QStringList paths;
- for( QStringList::const_iterator it = m_searchPath.begin(); it != m_searchPath.end(); ++it ) {
- QString p = *it;
+ TQStringList paths;
+ for( TQStringList::const_iterator it = m_searchPath.begin(); it != m_searchPath.end(); ++it ) {
+ TQString p = *it;
if( p[p.length()-1] == '/' )
p.truncate( p.length()-1 );
- if( !paths.contains( p ) && !paths.contains( p + "/" ) )
+ if( !paths.tqcontains( p ) && !paths.tqcontains( p + "/" ) )
paths.append(p);
}
// get the environment path variable
char* env_path = ::getenv("PATH");
if( env_path ) {
- QStringList env_pathList = QStringList::split(":", QString::fromLocal8Bit(env_path));
- for( QStringList::const_iterator it = env_pathList.begin(); it != env_pathList.end(); ++it ) {
- QString p = *it;
+ TQStringList env_pathList = TQStringList::split(":", TQString::fromLocal8Bit(env_path));
+ for( TQStringList::const_iterator it = env_pathList.begin(); it != env_pathList.end(); ++it ) {
+ TQString p = *it;
if( p[p.length()-1] == '/' )
p.truncate( p.length()-1 );
- if( !paths.contains( p ) && !paths.contains( p + "/" ) )
+ if( !paths.tqcontains( p ) && !paths.tqcontains( p + "/" ) )
paths.append(p);
}
}
- for( QStringList::const_iterator it = paths.begin(); it != paths.end(); ++it )
- for( QMap<QString, K3bExternalProgram*>::iterator pit = m_programs.begin(); pit != m_programs.end(); ++pit )
+ for( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it )
+ for( TQMap<TQString, K3bExternalProgram*>::iterator pit = m_programs.begin(); pit != m_programs.end(); ++pit )
pit.data()->scan(*it);
// TESTING
@@ -332,9 +332,9 @@ void K3bExternalBinManager::search()
}
-K3bExternalProgram* K3bExternalBinManager::program( const QString& name ) const
+K3bExternalProgram* K3bExternalBinManager::program( const TQString& name ) const
{
- if( m_programs.find( name ) == m_programs.end() )
+ if( m_programs.tqfind( name ) == m_programs.end() )
return 0;
else
return m_programs[name];
@@ -358,26 +358,26 @@ void K3bExternalBinManager::loadDefaultSearchPath()
}
-void K3bExternalBinManager::setSearchPath( const QStringList& list )
+void K3bExternalBinManager::setSearchPath( const TQStringList& list )
{
loadDefaultSearchPath();
- for( QStringList::const_iterator it = list.begin(); it != list.end(); ++it ) {
- if( !m_searchPath.contains( *it ) )
+ for( TQStringList::const_iterator it = list.begin(); it != list.end(); ++it ) {
+ if( !m_searchPath.tqcontains( *it ) )
m_searchPath.append( *it );
}
}
-void K3bExternalBinManager::addSearchPath( const QString& path )
+void K3bExternalBinManager::addSearchPath( const TQString& path )
{
- if( !m_searchPath.contains( path ) )
+ if( !m_searchPath.tqcontains( path ) )
m_searchPath.append( path );
}
-const K3bExternalBin* K3bExternalBinManager::mostRecentBinObject( const QString& name )
+const K3bExternalBin* K3bExternalBinManager::mostRecentBinObject( const TQString& name )
{
if( K3bExternalProgram* p = program( name ) )
return p->mostRecentBin();
diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h
index e7fe601..11a8dcb 100644
--- a/libk3b/core/k3bexternalbinmanager.h
+++ b/libk3b/core/k3bexternalbinmanager.h
@@ -16,11 +16,11 @@
#ifndef K3B_EXTERNAL_BIN_MANAGER_H
#define K3B_EXTERNAL_BIN_MANAGER_H
-#include <qmap.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qptrlist.h>
+#include <tqmap.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqptrlist.h>
#include "k3b_export.h"
#include "k3bversion.h"
@@ -44,21 +44,21 @@ class LIBK3B_EXPORT K3bExternalBin
virtual ~K3bExternalBin() {}
K3bVersion version;
- QString path;
- QString copyright;
+ TQString path;
+ TQString copyright;
- const QString& name() const;
+ const TQString& name() const;
bool isEmpty() const;
- const QStringList& userParameters() const;
- const QStringList& features() const { return m_features; }
+ const TQStringList& userParameters() const;
+ const TQStringList& features() const { return m_features; }
- bool hasFeature( const QString& ) const;
- void addFeature( const QString& );
+ bool hasFeature( const TQString& ) const;
+ void addFeature( const TQString& );
K3bExternalProgram* program() const { return m_program; }
private:
- QStringList m_features;
+ TQStringList m_features;
K3bExternalProgram* m_program;
};
@@ -72,31 +72,31 @@ class LIBK3B_EXPORT K3bExternalBin
class LIBK3B_EXPORT K3bExternalProgram
{
public:
- K3bExternalProgram( const QString& name );
+ K3bExternalProgram( const TQString& name );
virtual ~K3bExternalProgram();
const K3bExternalBin* defaultBin() const { return m_bins.getFirst(); }
const K3bExternalBin* mostRecentBin() const;
- void addUserParameter( const QString& );
- void setUserParameters( const QStringList& list ) { m_userParameters = list; }
+ void addUserParameter( const TQString& );
+ void setUserParameters( const TQStringList& list ) { m_userParameters = list; }
- const QStringList& userParameters() const { return m_userParameters; }
- const QString& name() const { return m_name; }
+ const TQStringList& userParameters() const { return m_userParameters; }
+ const TQString& name() const { return m_name; }
void addBin( K3bExternalBin* );
void clear() { m_bins.clear(); }
void setDefault( const K3bExternalBin* );
- void setDefault( const QString& path );
+ void setDefault( const TQString& path );
- const QPtrList<K3bExternalBin>& bins() const { return m_bins; }
+ const TQPtrList<K3bExternalBin>& bins() const { return m_bins; }
/**
* this scans for the program in the given path,
* adds the found bin object to the list and returnes true.
* if nothing could be found false is returned.
*/
- virtual bool scan( const QString& ) {return false;}//= 0;
+ virtual bool scan( const TQString& ) {return false;}//= 0;
/**
* reimplement this if it does not make sense to have the user be able
@@ -105,18 +105,19 @@ class LIBK3B_EXPORT K3bExternalProgram
virtual bool supportsUserParameters() const { return true; }
private:
- QString m_name;
- QStringList m_userParameters;
- QPtrList<K3bExternalBin> m_bins;
+ TQString m_name;
+ TQStringList m_userParameters;
+ TQPtrList<K3bExternalBin> m_bins;
};
-class LIBK3B_EXPORT K3bExternalBinManager : public QObject
+class LIBK3B_EXPORT K3bExternalBinManager : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bExternalBinManager( QObject* parent = 0, const char* name = 0 );
+ K3bExternalBinManager( TQObject* tqparent = 0, const char* name = 0 );
~K3bExternalBinManager();
void search();
@@ -132,31 +133,31 @@ class LIBK3B_EXPORT K3bExternalBinManager : public QObject
*/
bool saveConfig( KConfig* );
- bool foundBin( const QString& name );
- const QString& binPath( const QString& name );
- const K3bExternalBin* binObject( const QString& name );
- const K3bExternalBin* mostRecentBinObject( const QString& name );
+ bool foundBin( const TQString& name );
+ const TQString& binPath( const TQString& name );
+ const K3bExternalBin* binObject( const TQString& name );
+ const K3bExternalBin* mostRecentBinObject( const TQString& name );
- K3bExternalProgram* program( const QString& ) const;
- const QMap<QString, K3bExternalProgram*>& programs() const { return m_programs; }
+ K3bExternalProgram* program( const TQString& ) const;
+ const TQMap<TQString, K3bExternalProgram*>& programs() const { return m_programs; }
/** always extends the default searchpath */
- void setSearchPath( const QStringList& );
- void addSearchPath( const QString& );
+ void setSearchPath( const TQStringList& );
+ void addSearchPath( const TQString& );
void loadDefaultSearchPath();
- const QStringList& searchPath() const { return m_searchPath; }
+ const TQStringList& searchPath() const { return m_searchPath; }
void addProgram( K3bExternalProgram* );
void clear();
private:
- QMap<QString, K3bExternalProgram*> m_programs;
- QStringList m_searchPath;
+ TQMap<TQString, K3bExternalProgram*> m_programs;
+ TQStringList m_searchPath;
- static QString m_noPath; // used for binPath() to return const string
+ static TQString m_noPath; // used for binPath() to return const string
- QString m_gatheredOutput;
+ TQString m_gatheredOutput;
};
#endif
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index fc5a4e1..f5a9e29 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -38,9 +38,9 @@
#include <dcopref.h>
#include <kprocess.h>
-#include <qdatastream.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <tqdatastream.h>
+#include <tqdir.h>
+#include <tqfile.h>
#include <cmath>
#include <sys/utsname.h>
@@ -88,13 +88,13 @@ struct Sample {
};
*/
-QString K3b::framesToString( int h, bool showFrames )
+TQString K3b::framesToString( int h, bool showFrames )
{
int m = h / 4500;
int s = (h % 4500) / 75;
int f = h % 75;
- QString str;
+ TQString str;
if( showFrames ) {
// cdrdao needs the MSF format where 1 second has 75 frames!
@@ -106,28 +106,28 @@ QString K3b::framesToString( int h, bool showFrames )
return str;
}
-/*QString K3b::sizeToTime(long size)
+/*TQString K3b::sizeToTime(long size)
{
int h = size / sizeof(Sample) / 588;
return framesToString(h, false);
}*/
-Q_INT16 K3b::swapByteOrder( const Q_INT16& i )
+TQ_INT16 K3b::swapByteOrder( const TQ_INT16& i )
{
return bswap_16( i );
//((i << 8) & 0xff00) | ((i >> 8 ) & 0xff);
}
-Q_INT32 K3b::swapByteOrder( const Q_INT32& i )
+TQ_INT32 K3b::swapByteOrder( const TQ_INT32& i )
{
//return ((i << 24) & 0xff000000) | ((i << 8) & 0xff0000) | ((i >> 8) & 0xff00) | ((i >> 24) & 0xff );
return bswap_32( i );
}
-Q_INT64 K3b::swapByteOrder( const Q_INT64& i )
+TQ_INT64 K3b::swapByteOrder( const TQ_INT64& i )
{
return bswap_64( i );
}
@@ -139,75 +139,75 @@ int K3b::round( double d )
}
-QString K3b::findUniqueFilePrefix( const QString& _prefix, const QString& path )
+TQString K3b::findUniqueFilePrefix( const TQString& _prefix, const TQString& path )
{
- QString url;
- if( path.isEmpty() || !QFile::exists(path) )
+ TQString url;
+ if( path.isEmpty() || !TQFile::exists(path) )
url = defaultTempPath();
else
url = prepareDir( path );
- QString prefix = _prefix;
+ TQString prefix = _prefix;
if( prefix.isEmpty() )
prefix = "k3b_";
// now create the unique prefix
- QDir dir( url );
- QStringList entries = dir.entryList( QDir::DefaultFilter, QDir::Name );
+ TQDir dir( url );
+ TQStringList entries = dir.entryList( TQDir::DefaultFilter, TQDir::Name );
int i = 0;
- for( QStringList::iterator it = entries.begin();
+ for( TQStringList::iterator it = entries.begin();
it != entries.end(); ++it ) {
- if( (*it).startsWith( prefix + QString::number(i) ) ) {
+ if( (*it).startsWith( prefix + TQString::number(i) ) ) {
i++;
it = entries.begin();
}
}
- return url + prefix + QString::number(i);
+ return url + prefix + TQString::number(i);
}
-QString K3b::findTempFile( const QString& ending, const QString& d )
+TQString K3b::findTempFile( const TQString& ending, const TQString& d )
{
- return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? QString::null : (QString::fromLatin1(".") + ending) );
+ return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::tqfromLatin1(".") + ending) );
}
-QString K3b::defaultTempPath()
+TQString K3b::defaultTempPath()
{
- QString oldGroup = kapp->config()->group();
+ TQString oldGroup = kapp->config()->group();
kapp->config()->setGroup( "General Options" );
- QString url = kapp->config()->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() );
+ TQString url = kapp->config()->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() );
kapp->config()->setGroup( oldGroup );
return prepareDir(url);
}
-QString K3b::prepareDir( const QString& dir )
+TQString K3b::prepareDir( const TQString& dir )
{
return (dir + (dir[dir.length()-1] != '/' ? "/" : ""));
}
-QString K3b::parentDir( const QString& path )
+TQString K3b::tqparentDir( const TQString& path )
{
- QString parent = path;
+ TQString tqparent = path;
if( path[path.length()-1] == '/' )
- parent.truncate( parent.length()-1 );
+ tqparent.truncate( tqparent.length()-1 );
- int pos = parent.findRev( '/' );
+ int pos = tqparent.tqfindRev( '/' );
if( pos >= 0 )
- parent.truncate( pos+1 );
+ tqparent.truncate( pos+1 );
else // relative path, do anything...
- parent = "/";
+ tqparent = "/";
- return parent;
+ return tqparent;
}
-QString K3b::fixupPath( const QString& path )
+TQString K3b::fixupPath( const TQString& path )
{
- QString s;
+ TQString s;
bool lastWasSlash = false;
for( unsigned int i = 0; i < path.length(); ++i ) {
if( path[i] == '/' ) {
@@ -232,7 +232,7 @@ K3bVersion K3b::kernelVersion()
K3bVersion v;
utsname unameinfo;
if( ::uname(&unameinfo) == 0 ) {
- v = QString::fromLocal8Bit( unameinfo.release );
+ v = TQString::fromLocal8Bit( unameinfo.release );
kdDebug() << "kernel version: " << v << endl;
}
else
@@ -247,12 +247,12 @@ K3bVersion K3b::simpleKernelVersion()
}
-QString K3b::systemName()
+TQString K3b::systemName()
{
- QString v;
+ TQString v;
utsname unameinfo;
if( ::uname(&unameinfo) == 0 ) {
- v = QString::fromLocal8Bit( unameinfo.sysname );
+ v = TQString::fromLocal8Bit( unameinfo.sysname );
}
else
kdError() << "could not determine system name." << endl;
@@ -260,10 +260,10 @@ QString K3b::systemName()
}
-bool K3b::kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail )
+bool K3b::kbFreeOnFs( const TQString& path, unsigned long& size, unsigned long& avail )
{
struct statvfs fs;
- if( ::statvfs( QFile::encodeName(path), &fs ) == 0 ) {
+ if( ::statvfs( TQFile::encodeName(path), &fs ) == 0 ) {
unsigned long kBfak = fs.f_frsize/1024;
size = fs.f_blocks*kBfak;
@@ -280,7 +280,7 @@ KIO::filesize_t K3b::filesize( const KURL& url )
{
if( url.isLocalFile() ) {
k3b_struct_stat buf;
- if ( !k3b_stat( QFile::encodeName( url.path() ), &buf ) ) {
+ if ( !k3b_stat( TQFile::encodeName( url.path() ), &buf ) ) {
return (KIO::filesize_t)buf.st_size;
}
}
@@ -301,19 +301,19 @@ KIO::filesize_t K3b::imageFilesize( const KURL& url )
{
KIO::filesize_t size = K3b::filesize( url );
int cnt = 0;
- while( KIO::NetAccess::exists( KURL::fromPathOrURL( url.url() + '.' + QString::number(cnt).rightJustify( 3, '0' ) ), true ) )
- size += K3b::filesize( KURL::fromPathOrURL( url.url() + '.' + QString::number(cnt++).rightJustify( 3, '0' ) ) );
+ while( KIO::NetAccess::exists( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt).rightJustify( 3, '0' ) ), true ) )
+ size += K3b::filesize( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt++).rightJustify( 3, '0' ) ) );
return size;
}
-QString K3b::cutFilename( const QString& name, unsigned int len )
+TQString K3b::cutFilename( const TQString& name, unsigned int len )
{
if( name.length() > len ) {
- QString ret = name;
+ TQString ret = name;
// determine extension (we think of an extension to be at most 5 chars in length)
- int pos = name.find( '.', -6 );
+ int pos = name.tqfind( '.', -6 );
if( pos > 0 )
len -= (name.length() - pos);
@@ -329,28 +329,28 @@ QString K3b::cutFilename( const QString& name, unsigned int len )
}
-QString K3b::removeFilenameExtension( const QString& name )
+TQString K3b::removeFilenameExtension( const TQString& name )
{
- QString v = name;
- int dotpos = v.findRev( '.' );
+ TQString v = name;
+ int dotpos = v.tqfindRev( '.' );
if( dotpos > 0 )
v.truncate( dotpos );
return v;
}
-QString K3b::appendNumberToFilename( const QString& name, int num, unsigned int maxlen )
+TQString K3b::appendNumberToFilename( const TQString& name, int num, unsigned int maxlen )
{
// determine extension (we think of an extension to be at most 5 chars in length)
- QString result = name;
- QString ext;
- int pos = name.find( '.', -6 );
+ TQString result = name;
+ TQString ext;
+ int pos = name.tqfind( '.', -6 );
if( pos > 0 ) {
ext = name.mid(pos);
result.truncate( pos );
}
- ext.prepend( QString::number(num) );
+ ext.prepend( TQString::number(num) );
result.truncate( maxlen - ext.length() );
return result + ext;
@@ -372,7 +372,7 @@ bool K3b::hackedAtapiSupport()
}
-QString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExternalBin* bin )
+TQString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExternalBin* bin )
{
#ifdef Q_OS_LINUX
//
@@ -387,11 +387,11 @@ QString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExtern
else if( (plainAtapiSupport() && bin->hasFeature("plain-atapi") ) )
return dev->blockDeviceName();
else
- return QString("ATAPI:%1").arg(dev->blockDeviceName());
+ return TQString("ATAPI:%1").tqarg(dev->blockDeviceName());
}
-int K3b::writingAppFromString( const QString& s )
+int K3b::writingAppFromString( const TQString& s )
{
if( s.lower() == "cdrdao" )
return K3b::CDRDAO;
@@ -408,7 +408,7 @@ int K3b::writingAppFromString( const QString& s )
}
-QString K3b::writingModeString( int mode )
+TQString K3b::writingModeString( int mode )
{
if( mode == WRITING_MODE_AUTO )
return i18n("Auto");
@@ -417,16 +417,16 @@ QString K3b::writingModeString( int mode )
}
-QString K3b::resolveLink( const QString& file )
+TQString K3b::resolveLink( const TQString& file )
{
- QFileInfo f( file );
- QStringList steps( f.absFilePath() );
+ TQFileInfo f( file );
+ TQStringList steps( f.absFilePath() );
while( f.isSymLink() ) {
- QString p = f.readLink();
+ TQString p = f.readLink();
if( !p.startsWith( "/" ) )
p.prepend( f.dirPath(true) + "/" );
f.setFile( p );
- if( steps.contains( f.absFilePath() ) ) {
+ if( steps.tqcontains( f.absFilePath() ) ) {
kdDebug() << "(K3b) symlink loop detected." << endl;
break;
}
@@ -442,8 +442,8 @@ K3bDevice::Device* K3b::urlToDevice( const KURL& deviceUrl )
if( deviceUrl.protocol() == "media" || deviceUrl.protocol() == "system" ) {
kdDebug() << "(K3b) Asking mediamanager for " << deviceUrl.fileName() << endl;
DCOPRef mediamanager("kded", "mediamanager");
- DCOPReply reply = mediamanager.call("properties(QString)", deviceUrl.fileName());
- QStringList properties = reply;
+ DCOPReply reply = mediamanager.call("properties(TQString)", deviceUrl.fileName());
+ TQStringList properties = reply;
if( !reply.isValid() || properties.count() < 6 ) {
kdError() << "(K3b) Invalid reply from mediamanager" << endl;
return 0;
@@ -493,40 +493,40 @@ KURL::List K3b::convertToLocalUrls( const KURL::List& urls )
}
-Q_INT16 K3b::fromLe16( char* data )
+TQ_INT16 K3b::fromLe16( char* data )
{
#ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN
- return swapByteOrder( *((Q_INT16*)data) );
+ return swapByteOrder( *((TQ_INT16*)data) );
#else
- return *((Q_INT16*)data);
+ return *((TQ_INT16*)data);
#endif
}
-Q_INT32 K3b::fromLe32( char* data )
+TQ_INT32 K3b::fromLe32( char* data )
{
#ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN
- return swapByteOrder( *((Q_INT32*)data) );
+ return swapByteOrder( *((TQ_INT32*)data) );
#else
- return *((Q_INT32*)data);
+ return *((TQ_INT32*)data);
#endif
}
-Q_INT64 K3b::fromLe64( char* data )
+TQ_INT64 K3b::fromLe64( char* data )
{
#ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN
- return swapByteOrder( *((Q_INT64*)data) );
+ return swapByteOrder( *((TQ_INT64*)data) );
#else
- return *((Q_INT64*)data);
+ return *((TQ_INT64*)data);
#endif
}
-QString K3b::findExe( const QString& name )
+TQString K3b::findExe( const TQString& name )
{
// first we search the path
- QString bin = KStandardDirs::findExe( name );
+ TQString bin = KStandardDirs::findExe( name );
// then go on with our own little list
if( bin.isEmpty() )
@@ -550,7 +550,7 @@ bool K3b::unmount( K3bDevice::Device* dev )
if( !dev )
return false;
- QString mntDev = dev->blockDeviceName();
+ TQString mntDev = dev->blockDeviceName();
#if KDE_IS_VERSION(3,4,0)
// first try to unmount it the standard way
@@ -558,7 +558,7 @@ bool K3b::unmount( K3bDevice::Device* dev )
return true;
#endif
- QString umountBin = K3b::findExe( "umount" );
+ TQString umountBin = K3b::findExe( "umount" );
if( !umountBin.isEmpty() ) {
KProcess p;
p << umountBin;
@@ -570,7 +570,7 @@ bool K3b::unmount( K3bDevice::Device* dev )
}
// now try pmount
- QString pumountBin = K3b::findExe( "pumount" );
+ TQString pumountBin = K3b::findExe( "pumount" );
if( !pumountBin.isEmpty() ) {
KProcess p;
p << pumountBin;
@@ -594,7 +594,7 @@ bool K3b::mount( K3bDevice::Device* dev )
if( !dev )
return false;
- QString mntDev = dev->blockDeviceName();
+ TQString mntDev = dev->blockDeviceName();
#if KDE_IS_VERSION(3,4,0)
// first try to mount it the standard way
@@ -608,7 +608,7 @@ bool K3b::mount( K3bDevice::Device* dev )
#endif
// now try pmount
- QString pmountBin = K3b::findExe( "pmount" );
+ TQString pmountBin = K3b::findExe( "pmount" );
if( !pmountBin.isEmpty() ) {
KProcess p;
p << pmountBin;
diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h
index 2795630..56f7f1b 100644
--- a/libk3b/core/k3bglobals.h
+++ b/libk3b/core/k3bglobals.h
@@ -21,8 +21,8 @@
#include <config.h>
#endif
-#include <qstring.h>
-#include <qfile.h>
+#include <tqstring.h>
+#include <tqfile.h>
#include <kio/global.h>
#include <kurl.h>
#include <k3bdevicetypes.h>
@@ -62,7 +62,7 @@ namespace K3b
DVD_RW_FORMAT = 32
};
- LIBK3B_EXPORT int writingAppFromString( const QString& );
+ LIBK3B_EXPORT int writingAppFromString( const TQString& );
/**
* DATA_MODE_AUTO - let K3b determine the best mode
@@ -106,14 +106,14 @@ namespace K3b
WRITING_MODE_RES_OVWR = K3bDevice::WRITINGMODE_RES_OVWR // Restricted Overwrite
};
- LIBK3B_EXPORT QString writingModeString( int );
+ LIBK3B_EXPORT TQString writingModeString( int );
- LIBK3B_EXPORT QString framesToString( int h, bool showFrames = true );
- /*LIBK3B_EXPORT QString sizeToTime( long size );*/
+ LIBK3B_EXPORT TQString framesToString( int h, bool showFrames = true );
+ /*LIBK3B_EXPORT TQString sizeToTime( long size );*/
- LIBK3B_EXPORT Q_INT16 swapByteOrder( const Q_INT16& i );
- LIBK3B_EXPORT Q_INT32 swapByteOrder( const Q_INT32& i );
- LIBK3B_EXPORT Q_INT64 swapByteOrder( const Q_INT64& i );
+ LIBK3B_EXPORT TQ_INT16 swapByteOrder( const TQ_INT16& i );
+ LIBK3B_EXPORT TQ_INT32 swapByteOrder( const TQ_INT32& i );
+ LIBK3B_EXPORT TQ_INT64 swapByteOrder( const TQ_INT64& i );
int round( double );
@@ -122,61 +122,61 @@ namespace K3b
* We use this since we encountered problems with the KDE version.
* @returns true on success.
*/
- LIBK3B_EXPORT bool kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail );
+ LIBK3B_EXPORT bool kbFreeOnFs( const TQString& path, unsigned long& size, unsigned long& avail );
/**
* Cut a filename preserving the extension
*/
- LIBK3B_EXPORT QString cutFilename( const QString& name, unsigned int len );
+ LIBK3B_EXPORT TQString cutFilename( const TQString& name, unsigned int len );
- LIBK3B_EXPORT QString removeFilenameExtension( const QString& name );
+ LIBK3B_EXPORT TQString removeFilenameExtension( const TQString& name );
/**
* Append a number to a filename preserving the extension.
* The resulting name's length will not exceed @p maxlen
*/
- LIBK3B_EXPORT QString appendNumberToFilename( const QString& name, int num, unsigned int maxlen );
+ LIBK3B_EXPORT TQString appendNumberToFilename( const TQString& name, int num, unsigned int maxlen );
- LIBK3B_EXPORT QString findUniqueFilePrefix( const QString& _prefix = QString::null, const QString& path = QString::null );
+ LIBK3B_EXPORT TQString findUniqueFilePrefix( const TQString& _prefix = TQString(), const TQString& path = TQString() );
/**
* Find a unique filename in directory d (if d is empty the method uses the defaultTempPath)
*/
- LIBK3B_EXPORT QString findTempFile( const QString& ending = QString::null, const QString& d = QString::null );
+ LIBK3B_EXPORT TQString findTempFile( const TQString& ending = TQString(), const TQString& d = TQString() );
/**
* Wrapper around KStandardDirs::findExe which searches the PATH and some additional
* directories to find system tools which are normally only in root's PATH.
*/
- LIBK3B_EXPORT QString findExe( const QString& name );
+ LIBK3B_EXPORT TQString findExe( const TQString& name );
/**
* get the default K3b temp path to store image files
*/
- LIBK3B_EXPORT QString defaultTempPath();
+ LIBK3B_EXPORT TQString defaultTempPath();
/**
* makes sure a path ends with a "/"
*/
- LIBK3B_EXPORT QString prepareDir( const QString& dir );
+ LIBK3B_EXPORT TQString prepareDir( const TQString& dir );
/**
- * returns the parent dir of a path.
+ * returns the tqparent dir of a path.
* CAUTION: this does only work well with absolut paths.
*
* Example: /usr/share/doc -> /usr/share/
*/
- QString parentDir( const QString& path );
+ TQString tqparentDir( const TQString& path );
/**
* For now this just replaces multiple occurrences of / with a single /
*/
- LIBK3B_EXPORT QString fixupPath( const QString& );
+ LIBK3B_EXPORT TQString fixupPath( const TQString& );
/**
* resolves a symlinks completely. Meaning it also handles links to links to links...
*/
- LIBK3B_EXPORT QString resolveLink( const QString& );
+ LIBK3B_EXPORT TQString resolveLink( const TQString& );
LIBK3B_EXPORT K3bVersion kernelVersion();
@@ -185,7 +185,7 @@ namespace K3b
*/
LIBK3B_EXPORT K3bVersion simpleKernelVersion();
- QString systemName();
+ TQString systemName();
LIBK3B_EXPORT KIO::filesize_t filesize( const KURL& );
@@ -214,7 +214,7 @@ namespace K3b
* Used to create a parameter for cdrecord, cdrdao or readcd.
* Takes care of SCSI and ATAPI.
*/
- QString externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExternalBin* );
+ TQString externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExternalBin* );
/**
* Convert an url pointing to a local device to a K3bDevice.
@@ -228,9 +228,9 @@ namespace K3b
LIBK3B_EXPORT KURL convertToLocalUrl( const KURL& url );
LIBK3B_EXPORT KURL::List convertToLocalUrls( const KURL::List& l );
- LIBK3B_EXPORT Q_INT16 fromLe16( char* );
- LIBK3B_EXPORT Q_INT32 fromLe32( char* );
- LIBK3B_EXPORT Q_INT64 fromLe64( char* );
+ LIBK3B_EXPORT TQ_INT16 fromLe16( char* );
+ LIBK3B_EXPORT TQ_INT32 fromLe32( char* );
+ LIBK3B_EXPORT TQ_INT64 fromLe64( char* );
LIBK3B_EXPORT bool isMounted( K3bDevice::Device* );
diff --git a/libk3b/core/k3bglobalsettings.cpp b/libk3b/core/k3bglobalsettings.cpp
index 6f58592..ac6a2f0 100644
--- a/libk3b/core/k3bglobalsettings.cpp
+++ b/libk3b/core/k3bglobalsettings.cpp
@@ -31,7 +31,7 @@ K3bGlobalSettings::K3bGlobalSettings()
void K3bGlobalSettings::readSettings( KConfig* c )
{
- QString lastG = c->group();
+ TQString lastG = c->group();
c->setGroup( "General Options" );
m_eject = !c->readBoolEntry( "No cd eject", false );
@@ -47,7 +47,7 @@ void K3bGlobalSettings::readSettings( KConfig* c )
void K3bGlobalSettings::saveSettings( KConfig* c )
{
- QString lastG = c->group();
+ TQString lastG = c->group();
c->setGroup( "General Options" );
c->writeEntry( "No cd eject", !m_eject );
diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp
index b545107..046de06 100644
--- a/libk3b/core/k3bjob.cpp
+++ b/libk3b/core/k3bjob.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
#include <kprocess.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kdebug.h>
@@ -34,14 +34,14 @@ public:
const char* K3bJob::DEFAULT_SIGNAL_CONNECTION = "K3bJobDefault";
-K3bJob::K3bJob( K3bJobHandler* handler, QObject* parent, const char* name )
- : QObject( parent, name ),
+K3bJob::K3bJob( K3bJobHandler* handler, TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name ),
m_jobHandler( handler ),
m_canceled(false),
m_active(false)
{
- connect( this, SIGNAL(canceled()),
- this, SLOT(slotCanceled()) );
+ connect( this, TQT_SIGNAL(canceled()),
+ this, TQT_SLOT(slotCanceled()) );
}
K3bJob::~K3bJob()
@@ -97,24 +97,24 @@ void K3bJob::slotCanceled()
int K3bJob::waitForMedia( K3bDevice::Device* device,
int mediaState,
int mediaType,
- const QString& message )
+ const TQString& message )
{
// TODO: What about: emit newSubTask( i18n("Waiting for media") );
return m_jobHandler->waitForMedia( device, mediaState, mediaType, message );
}
-bool K3bJob::questionYesNo( const QString& text,
- const QString& caption,
- const QString& yesText,
- const QString& noText )
+bool K3bJob::questionYesNo( const TQString& text,
+ const TQString& caption,
+ const TQString& yesText,
+ const TQString& noText )
{
return m_jobHandler->questionYesNo( text, caption, yesText, noText );
}
-void K3bJob::blockingInformation( const QString& text,
- const QString& caption )
+void K3bJob::blockingInformation( const TQString& text,
+ const TQString& caption )
{
return m_jobHandler->blockingInformation( text, caption );
}
@@ -128,23 +128,23 @@ void K3bJob::connectSubJob( K3bJob* subJob,
const char* processedSizeSlot,
const char* processedSubSizeSlot )
{
- connect( subJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( subJob, SIGNAL(newSubTask(const QString&)), this, SLOT(slotNewSubTask(const QString&)) );
- connect( subJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
- connect( subJob, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
- connect( subJob, SIGNAL(finished(bool)), this, finishedSlot );
+ connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) );
+ connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot );
if( connectProgress ) {
- connect( subJob, SIGNAL(percent(int)),
- this, progressSlot != 0 ? progressSlot : SIGNAL(subPercent(int)) );
+ connect( subJob, TQT_SIGNAL(percent(int)),
+ this, progressSlot != 0 ? progressSlot : TQT_SIGNAL(subPercent(int)) );
if( subProgressSlot )
- connect( subJob, SIGNAL(subPercent(int)), this, subProgressSlot );
- connect( subJob, SIGNAL(processedSize(int, int)),
- this, processedSizeSlot != 0 ? processedSizeSlot : SIGNAL(processedSubSize(int, int)) );
+ connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot );
+ connect( subJob, TQT_SIGNAL(processedSize(int, int)),
+ this, processedSizeSlot != 0 ? processedSizeSlot : TQT_SIGNAL(processedSubSize(int, int)) );
if( processedSubSizeSlot )
- connect( subJob, SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
+ connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
}
}
@@ -159,42 +159,42 @@ void K3bJob::connectSubJob( K3bJob* subJob,
const char* processedSubSizeSlot )
{
// standard connections
- connect( subJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
- connect( subJob, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
+ connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
// task connections
if( newTaskSlot == DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
+ connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
else if( newTaskSlot )
- connect( subJob, SIGNAL(newTask(const QString&)), this, newTaskSlot );
+ connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, newTaskSlot );
if( newSubTaskSlot == DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, SIGNAL(newSubTask(const QString&)), this, SLOT(slotNewSubTask(const QString&)) );
+ connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) );
else if( newSubTaskSlot )
- connect( subJob, SIGNAL(newSubTask(const QString&)), this, newSubTaskSlot );
+ connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot );
if( finishedSlot && finishedSlot != DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, SIGNAL(finished(bool)), this, finishedSlot );
+ connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot );
// progress
if( progressSlot == DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) );
+ connect( subJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) );
else if( progressSlot )
- connect( subJob, SIGNAL(percent(int)), this, progressSlot );
+ connect( subJob, TQT_SIGNAL(percent(int)), this, progressSlot );
if( subProgressSlot && subProgressSlot != DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, SIGNAL(subPercent(int)), this, subProgressSlot );
+ connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot );
// processed size
if( processedSizeSlot == DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
+ connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
else if( processedSizeSlot )
- connect( subJob, SIGNAL(processedSize(int, int)), this, processedSizeSlot );
+ connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, processedSizeSlot );
if( processedSubSizeSlot && processedSubSizeSlot != DEFAULT_SIGNAL_CONNECTION )
- connect( subJob, SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
+ connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot );
}
@@ -204,7 +204,7 @@ unsigned int K3bJob::numRunningSubJobs() const
}
-void K3bJob::slotNewSubTask( const QString& str )
+void K3bJob::slotNewSubTask( const TQString& str )
{
emit infoMessage( str, INFO );
}
@@ -231,8 +231,8 @@ public:
-K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, QObject* parent, const char* name )
- : K3bJob( handler, parent, name ),
+K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* tqparent, const char* name )
+ : K3bJob( handler, tqparent, name ),
m_writeMethod( K3b::DEFAULT )
{
d = new Private;
diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h
index 59e1f9b..c35118a 100644
--- a/libk3b/core/k3bjob.h
+++ b/libk3b/core/k3bjob.h
@@ -17,8 +17,8 @@
#ifndef K3BJOB_H
#define K3BJOB_H
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
#include "k3bjobhandler.h"
#include "k3b_export.h"
@@ -30,7 +30,7 @@ namespace K3bDevice {
/**
* This is the baseclass for all the jobs in K3b which actually do the work like burning a cd!
- * The K3bJob object takes care of registering with the k3bcore or with a parent K3bJob.
+ * The K3bJob object takes care of registering with the k3bcore or with a tqparent K3bJob.
*
* Every job has a jobhandler which can be another job (in which case the job is handled as
* a subjob) or an arbitrary class implementing the K3bJobHandler interface.
@@ -40,9 +40,10 @@ namespace K3bDevice {
*
* @author Sebastian Trueg
*/
-class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler
+class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual ~K3bJob();
@@ -72,8 +73,8 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler
*/
virtual bool hasBeenCanceled() const { return m_canceled; }
- virtual QString jobDescription() const { return "K3bJob"; }
- virtual QString jobDetails() const { return QString::null; }
+ virtual TQString jobDescription() const { return "K3bJob"; }
+ virtual TQString jobDetails() const { return TQString(); }
/**
* @returns the number of running subjobs.
@@ -81,7 +82,7 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler
*/
unsigned int numRunningSubJobs() const;
- const QPtrList<K3bJob>& runningSubJobs() const { return m_runningSubJobs; }
+ const TQPtrList<K3bJob>& runningSubJobs() const { return m_runningSubJobs; }
/**
* \deprecated
@@ -137,21 +138,21 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler
int waitForMedia( K3bDevice::Device*,
int mediaState = K3bDevice::STATE_EMPTY,
int mediaType = K3bDevice::MEDIA_WRITABLE_CD,
- const QString& message = QString::null );
+ const TQString& message = TQString() );
/**
* reimplemented from K3bJobHandler
*/
- bool questionYesNo( const QString& text,
- const QString& caption = QString::null,
- const QString& yesText = QString::null,
- const QString& noText = QString::null );
+ bool questionYesNo( const TQString& text,
+ const TQString& caption = TQString(),
+ const TQString& yesText = TQString(),
+ const TQString& noText = TQString() );
/**
* reimplemented from K3bJobHandler
*/
- void blockingInformation( const QString& text,
- const QString& caption = QString::null );
+ void blockingInformation( const TQString& text,
+ const TQString& caption = TQString() );
public slots:
/**
@@ -176,14 +177,14 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler
void setJobHandler( K3bJobHandler* );
signals:
- void infoMessage( const QString& msg, int type );
+ void infoMessage( const TQString& msg, int type );
void percent( int p );
void subPercent( int p );
void processedSize( int processed, int size );
void processedSubSize( int processed, int size );
- void newTask( const QString& job );
- void newSubTask( const QString& job );
- void debuggingOutput(const QString&, const QString&);
+ void newTask( const TQString& job );
+ void newSubTask( const TQString& job );
+ void debuggingOutput(const TQString&, const TQString&);
void data( const char* data, int len );
void nextTrack( int track, int numTracks );
@@ -206,12 +207,12 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler
* \param hdl the handler of the job. This allows for some user interaction without
* specifying any details (like the GUI).
* The job handler can also be another job. In that case this job is a sub job
- * and will be part of the parents running sub jobs.
+ * and will be part of the tqparents running sub jobs.
*
* \see runningSubJobs()
* \see numRunningSubJobs()
*/
- K3bJob( K3bJobHandler* hdl, QObject* parent = 0, const char* name = 0 );
+ K3bJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 );
/**
* Call this in start() to properly register the job and emit the started() signal.
@@ -231,14 +232,14 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler
private slots:
void slotCanceled();
- void slotNewSubTask( const QString& str );
+ void slotNewSubTask( const TQString& str );
private:
void registerSubJob( K3bJob* );
void unregisterSubJob( K3bJob* );
K3bJobHandler* m_jobHandler;
- QPtrList<K3bJob> m_runningSubJobs;
+ TQPtrList<K3bJob> m_runningSubJobs;
bool m_canceled;
bool m_active;
@@ -256,9 +257,10 @@ class LIBK3B_EXPORT K3bJob : public QObject, public K3bJobHandler
class LIBK3B_EXPORT K3bBurnJob : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bBurnJob( K3bJobHandler* hdl, QObject* parent = 0, const char* name = 0 );
+ K3bBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bBurnJob();
/**
@@ -283,7 +285,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob
void setWritingApp( int w ) { m_writeMethod = w; }
signals:
- void bufferStatus( int );
+ void buffertqStatus( int );
void deviceBuffer( int );
diff --git a/libk3b/core/k3bjobhandler.h b/libk3b/core/k3bjobhandler.h
index 1262e0e..d4bff91 100644
--- a/libk3b/core/k3bjobhandler.h
+++ b/libk3b/core/k3bjobhandler.h
@@ -44,20 +44,20 @@ class K3bJobHandler
virtual int waitForMedia( K3bDevice::Device*,
int mediaState = K3bDevice::STATE_EMPTY,
int mediaType = K3bDevice::MEDIA_WRITABLE_CD,
- const QString& message = QString::null ) = 0;
+ const TQString& message = TQString() ) = 0;
// FIXME: use KGuiItem
- virtual bool questionYesNo( const QString& text,
- const QString& caption = QString::null,
- const QString& yesText = QString::null,
- const QString& noText = QString::null ) = 0;
+ virtual bool questionYesNo( const TQString& text,
+ const TQString& caption = TQString(),
+ const TQString& yesText = TQString(),
+ const TQString& noText = TQString() ) = 0;
/**
* Use this if you need the user to do something before the job is able to continue.
* In all other cases an infoMessage should be used.
*/
- virtual void blockingInformation( const QString& text,
- const QString& caption = QString::null ) = 0;
+ virtual void blockingInformation( const TQString& text,
+ const TQString& caption = TQString() ) = 0;
};
diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp
index 35ddff4..ca8d2e0 100644
--- a/libk3b/core/k3bprocess.cpp
+++ b/libk3b/core/k3bprocess.cpp
@@ -18,10 +18,10 @@
#include "k3bprocess.h"
#include "k3bexternalbinmanager.h"
-#include <qstringlist.h>
-#include <qsocketnotifier.h>
-#include <qptrqueue.h>
-#include <qapplication.h>
+#include <tqstringlist.h>
+#include <tqsocketnotifier.h>
+#include <tqptrqueue.h>
+#include <tqapplication.h>
#include <kdebug.h>
@@ -37,8 +37,8 @@
class K3bProcess::Data
{
public:
- QString unfinishedStdoutLine;
- QString unfinishedStderrLine;
+ TQString unfinishedStdoutLine;
+ TQString unfinishedStderrLine;
int dupStdoutFd;
int dupStdinFd;
@@ -76,7 +76,7 @@ K3bProcess& K3bProcess::operator<<( const K3bExternalBin* bin )
return this->operator<<( bin->path );
}
-K3bProcess& K3bProcess::operator<<( const QString& arg )
+K3bProcess& K3bProcess::operator<<( const TQString& arg )
{
static_cast<KProcess*>(this)->operator<<( arg );
return *this;
@@ -88,13 +88,13 @@ K3bProcess& K3bProcess::operator<<( const char* arg )
return *this;
}
-K3bProcess& K3bProcess::operator<<( const QCString& arg )
+K3bProcess& K3bProcess::operator<<( const TQCString& arg )
{
static_cast<KProcess*>(this)->operator<<( arg );
return *this;
}
-K3bProcess& K3bProcess::operator<<( const QStringList& args )
+K3bProcess& K3bProcess::operator<<( const TQStringList& args )
{
static_cast<KProcess*>(this)->operator<<( args );
return *this;
@@ -104,12 +104,12 @@ K3bProcess& K3bProcess::operator<<( const QStringList& args )
bool K3bProcess::start( RunMode run, Communication com )
{
if( com & Stderr ) {
- connect( this, SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, SLOT(slotSplitStderr(KProcess*, char*, int)) );
+ connect( this, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
+ this, TQT_SLOT(slotSplitStderr(KProcess*, char*, int)) );
}
if( com & Stdout ) {
- connect( this, SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, SLOT(slotSplitStdout(KProcess*, char*, int)) );
+ connect( this, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
+ this, TQT_SLOT(slotSplitStdout(KProcess*, char*, int)) );
}
return KProcess::start( run, com );
@@ -119,10 +119,10 @@ bool K3bProcess::start( RunMode run, Communication com )
void K3bProcess::slotSplitStdout( KProcess*, char* data, int len )
{
if( m_bSplitStdout ) {
- QStringList lines = splitOutput( data, len, d->unfinishedStdoutLine, d->suppressEmptyLines );
+ TQStringList lines = splitOutput( data, len, d->unfinishedStdoutLine, d->suppressEmptyLines );
- for( QStringList::iterator it = lines.begin(); it != lines.end(); ++it ) {
- QString& str = *it;
+ for( TQStringList::iterator it = lines.begin(); it != lines.end(); ++it ) {
+ TQString& str = *it;
// just to be sure since something in splitOutput does not do this right
if( d->suppressEmptyLines && str.isEmpty() )
@@ -136,10 +136,10 @@ void K3bProcess::slotSplitStdout( KProcess*, char* data, int len )
void K3bProcess::slotSplitStderr( KProcess*, char* data, int len )
{
- QStringList lines = splitOutput( data, len, d->unfinishedStderrLine, d->suppressEmptyLines );
+ TQStringList lines = splitOutput( data, len, d->unfinishedStderrLine, d->suppressEmptyLines );
- for( QStringList::iterator it = lines.begin(); it != lines.end(); ++it ) {
- QString& str = *it;
+ for( TQStringList::iterator it = lines.begin(); it != lines.end(); ++it ) {
+ TQString& str = *it;
// just to be sure since something in splitOutput does not do this right
if( d->suppressEmptyLines && str.isEmpty() )
@@ -150,15 +150,15 @@ void K3bProcess::slotSplitStderr( KProcess*, char* data, int len )
}
-QStringList K3bProcess::splitOutput( char* data, int len,
- QString& unfinishedLine, bool suppressEmptyLines )
+TQStringList K3bProcess::splitOutput( char* data, int len,
+ TQString& unfinishedLine, bool suppressEmptyLines )
{
//
// The stderr splitting is mainly used for parsing of messages
// That's why we simplify the data before proceeding
//
- QString buffer;
+ TQString buffer;
for( int i = 0; i < len; i++ ) {
if( data[i] == '\b' ) {
while( data[i] == '\b' ) // we replace multiple backspaces with a single line feed
@@ -173,12 +173,12 @@ QStringList K3bProcess::splitOutput( char* data, int len,
buffer += data[i];
}
- QStringList lines = QStringList::split( '\n', buffer, !suppressEmptyLines );
+ TQStringList lines = TQStringList::split( '\n', buffer, !suppressEmptyLines );
// in case we suppress empty lines we need to handle the following separately
// to make sure we join unfinished lines correctly
if( suppressEmptyLines && buffer[0] == '\n' )
- lines.prepend( QString::null );
+ lines.prepend( TQString() );
if( !unfinishedLine.isEmpty() ) {
lines.first().prepend( unfinishedLine );
@@ -187,12 +187,12 @@ QStringList K3bProcess::splitOutput( char* data, int len,
kdDebug() << "(K3bProcess) joined line: '" << (lines.first()) << "'" << endl;
}
- QStringList::iterator it;
+ TQStringList::iterator it;
// check if line ends with a newline
// if not save the last line because it is not finished
- QChar c = buffer.right(1).at(0);
- bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != QChar(46) ); // What is unicode 46?? It is printed as a point
+ 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
if( hasUnfinishedLine ) {
kdDebug() << "(K3bProcess) found unfinished line: '" << lines.last() << "'" << endl;
kdDebug() << "(K3bProcess) last char: '" << buffer.right(1) << "'" << endl;
@@ -425,10 +425,10 @@ void K3bProcessOutputCollector::setProcess( KProcess* p )
m_process = p;
if( p ) {
- connect( p, SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, SLOT(slotGatherStdout(KProcess*, char*, int)) );
- connect( p, SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, SLOT(slotGatherStderr(KProcess*, char*, int)) );
+ connect( p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
+ this, TQT_SLOT(slotGatherStdout(KProcess*, char*, int)) );
+ connect( p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
+ this, TQT_SLOT(slotGatherStderr(KProcess*, char*, int)) );
}
m_gatheredOutput.truncate( 0 );
@@ -438,14 +438,14 @@ void K3bProcessOutputCollector::setProcess( KProcess* p )
void K3bProcessOutputCollector::slotGatherStderr( KProcess*, char* data, int len )
{
- m_gatheredOutput.append( QString::fromLocal8Bit( data, len ) );
- m_stderrOutput.append( QString::fromLocal8Bit( data, len ) );
+ m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) );
+ m_stderrOutput.append( TQString::fromLocal8Bit( data, len ) );
}
void K3bProcessOutputCollector::slotGatherStdout( KProcess*, char* data, int len )
{
- m_gatheredOutput.append( QString::fromLocal8Bit( data, len ) );
- m_stdoutOutput.append( QString::fromLocal8Bit( data, len ) );
+ m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) );
+ m_stdoutOutput.append( TQString::fromLocal8Bit( data, len ) );
}
diff --git a/libk3b/core/k3bprocess.h b/libk3b/core/k3bprocess.h
index 959bda1..5b585dd 100644
--- a/libk3b/core/k3bprocess.h
+++ b/libk3b/core/k3bprocess.h
@@ -19,7 +19,7 @@
#include <kprocess.h>
-#include <qstring.h>
+#include <tqstring.h>
#include "k3b_export.h"
class K3bExternalBin;
@@ -38,6 +38,7 @@ class K3bExternalBin;
class LIBK3B_EXPORT K3bProcess : public KProcess
{
Q_OBJECT
+ TQ_OBJECT
public:
class OutputCollector;
@@ -51,10 +52,10 @@ class LIBK3B_EXPORT K3bProcess : public KProcess
*/
K3bProcess& operator<<( const K3bExternalBin* );
- K3bProcess& operator<<( const QString& arg );
+ K3bProcess& operator<<( const TQString& arg );
K3bProcess& operator<<( const char* arg );
- K3bProcess& operator<<( const QCString& arg );
- K3bProcess& operator<<( const QStringList& args );
+ K3bProcess& operator<<( const TQCString& arg );
+ K3bProcess& operator<<( const TQStringList& args );
bool start( RunMode run = NotifyOnExit, Communication com = NoCommunication );
@@ -138,8 +139,8 @@ class LIBK3B_EXPORT K3bProcess : public KProcess
void slotSplitStdout( KProcess*, char*, int );
signals:
- void stderrLine( const QString& line );
- void stdoutLine( const QString& line );
+ void stderrLine( const TQString& line );
+ void stdoutLine( const TQString& line );
/**
* Gets emitted if raw stdout mode has been requested
@@ -169,7 +170,7 @@ class LIBK3B_EXPORT K3bProcess : public KProcess
void commClose();
private:
- static QStringList splitOutput( char*, int, QString&, bool );
+ static TQStringList splitOutput( char*, int, TQString&, bool );
class Data;
Data* d;
@@ -177,26 +178,27 @@ class LIBK3B_EXPORT K3bProcess : public KProcess
bool m_bSplitStdout;
};
-class LIBK3B_EXPORT K3bProcessOutputCollector: public QObject
+class LIBK3B_EXPORT K3bProcessOutputCollector: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
K3bProcessOutputCollector( KProcess* );
void setProcess( KProcess* );
- const QString& output() const { return m_gatheredOutput; }
- const QString& stderrOutput() const { return m_stderrOutput; }
- const QString& stdoutOutput() const { return m_stdoutOutput; }
+ const TQString& output() const { return m_gatheredOutput; }
+ const TQString& stderrOutput() const { return m_stderrOutput; }
+ const TQString& stdoutOutput() const { return m_stdoutOutput; }
private slots:
void slotGatherStderr( KProcess*, char*, int );
void slotGatherStdout( KProcess*, char*, int );
private:
- QString m_gatheredOutput;
- QString m_stderrOutput;
- QString m_stdoutOutput;
+ TQString m_gatheredOutput;
+ TQString m_stderrOutput;
+ TQString m_stdoutOutput;
KProcess* m_process;
};
diff --git a/libk3b/core/k3bprogressinfoevent.h b/libk3b/core/k3bprogressinfoevent.h
index 0e77718..78e17a2 100644
--- a/libk3b/core/k3bprogressinfoevent.h
+++ b/libk3b/core/k3bprogressinfoevent.h
@@ -16,27 +16,27 @@
#ifndef K3B_PROGRESS_INFO_EVENT_H
#define K3B_PROGRESS_INFO_EVENT_H
-#include <qevent.h>
-#include <qstring.h>
+#include <tqevent.h>
+#include <tqstring.h>
/**
* Custom event class for posting events corresponding to the
* K3bJob signals. This is useful for a threaded job since
* in that case it's not possible to emit signals that directly
- * change the GUI (see QThread docu).
+ * change the GUI (see TQThread docu).
*/
-class K3bProgressInfoEvent : public QCustomEvent
+class K3bProgressInfoEvent : public TQCustomEvent
{
public:
K3bProgressInfoEvent( int type )
- : QCustomEvent( type ),
+ : TQCustomEvent( type ),
m_type(type)
{}
- K3bProgressInfoEvent( int type, const QString& v1, const QString& v2 = QString::null,
+ K3bProgressInfoEvent( int type, const TQString& v1, const TQString& v2 = TQString(),
int value1 = 0, int value2 = 0 )
- : QCustomEvent( type ),
+ : TQCustomEvent( type ),
m_type( type),
m_firstValue(value1),
m_secondValue(value2),
@@ -45,20 +45,20 @@ class K3bProgressInfoEvent : public QCustomEvent
{}
K3bProgressInfoEvent( int type, int value1, int value2 = 0 )
- : QCustomEvent( type ),
+ : TQCustomEvent( type ),
m_type( type),
m_firstValue(value1),
m_secondValue(value2)
{}
int type() const { return m_type; }
- const QString& firstString() const { return m_firstString; }
- const QString& secondString() const { return m_secondString; }
+ const TQString& firstString() const { return m_firstString; }
+ const TQString& secondString() const { return m_secondString; }
int firstValue() const { return m_firstValue; }
int secondValue() const { return m_secondValue; }
enum K3bProgressInfoEventType {
- Progress = QEvent::User + 1,
+ Progress = TQEvent::User + 1,
SubProgress,
ProcessedSize,
ProcessedSubSize,
@@ -69,7 +69,7 @@ class K3bProgressInfoEvent : public QCustomEvent
NewTask,
NewSubTask,
DebuggingOutput,
- BufferStatus,
+ BuffertqStatus,
WriteSpeed,
NextTrack
};
@@ -78,8 +78,8 @@ class K3bProgressInfoEvent : public QCustomEvent
int m_type;
int m_firstValue;
int m_secondValue;
- QString m_firstString;
- QString m_secondString;
+ TQString m_firstString;
+ TQString m_secondString;
};
#endif
diff --git a/libk3b/core/k3bsimplejobhandler.cpp b/libk3b/core/k3bsimplejobhandler.cpp
index eaf7cd6..d48349e 100644
--- a/libk3b/core/k3bsimplejobhandler.cpp
+++ b/libk3b/core/k3bsimplejobhandler.cpp
@@ -16,8 +16,8 @@
#include "k3bsimplejobhandler.h"
-K3bSimpleJobHandler::K3bSimpleJobHandler( QObject* parent )
- : QObject( parent ),
+K3bSimpleJobHandler::K3bSimpleJobHandler( TQObject* tqparent )
+ : TQObject( tqparent ),
K3bJobHandler()
{
}
@@ -29,7 +29,7 @@ K3bSimpleJobHandler::~K3bSimpleJobHandler()
int K3bSimpleJobHandler::waitForMedia( K3bDevice::Device* dev,
int mediaState,
int mediaType,
- const QString& message )
+ const TQString& message )
{
Q_UNUSED( dev );
Q_UNUSED( mediaState );
@@ -39,10 +39,10 @@ int K3bSimpleJobHandler::waitForMedia( K3bDevice::Device* dev,
return 0;
}
-bool K3bSimpleJobHandler::questionYesNo( const QString& text,
- const QString& caption,
- const QString& yesText,
- const QString& noText )
+bool K3bSimpleJobHandler::questionYesNo( const TQString& text,
+ const TQString& caption,
+ const TQString& yesText,
+ const TQString& noText )
{
Q_UNUSED( text );
Q_UNUSED( caption );
@@ -52,8 +52,8 @@ bool K3bSimpleJobHandler::questionYesNo( const QString& text,
return true;
}
-void K3bSimpleJobHandler::blockingInformation( const QString& text,
- const QString& caption )
+void K3bSimpleJobHandler::blockingInformation( const TQString& text,
+ const TQString& caption )
{
Q_UNUSED( text );
Q_UNUSED( caption );
diff --git a/libk3b/core/k3bsimplejobhandler.h b/libk3b/core/k3bsimplejobhandler.h
index f84064e..60d4bf9 100644
--- a/libk3b/core/k3bsimplejobhandler.h
+++ b/libk3b/core/k3bsimplejobhandler.h
@@ -18,7 +18,7 @@
#include <k3b_export.h>
-#include <qobject.h>
+#include <tqobject.h>
#include <k3bjobhandler.h>
@@ -28,12 +28,13 @@
* Use it for very simple jobs that don't need the job handler
* methods.
*/
-class LIBK3B_EXPORT K3bSimpleJobHandler : public QObject, public K3bJobHandler
+class LIBK3B_EXPORT K3bSimpleJobHandler : public TQObject, public K3bJobHandler
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bSimpleJobHandler( QObject* parent = 0 );
+ K3bSimpleJobHandler( TQObject* tqparent = 0 );
~K3bSimpleJobHandler();
/*
@@ -42,20 +43,20 @@ class LIBK3B_EXPORT K3bSimpleJobHandler : public QObject, public K3bJobHandler
int waitForMedia( K3bDevice::Device*,
int mediaState = K3bDevice::STATE_EMPTY,
int mediaType = K3bDevice::MEDIA_WRITABLE_CD,
- const QString& message = QString::null );
+ const TQString& message = TQString() );
/**
* \return true
*/
- bool questionYesNo( const QString& text,
- const QString& caption = QString::null,
- const QString& yesText = QString::null,
- const QString& noText = QString::null );
+ bool questionYesNo( const TQString& text,
+ const TQString& caption = TQString(),
+ const TQString& yesText = TQString(),
+ const TQString& noText = TQString() );
/**
* Does nothing
*/
- void blockingInformation( const QString& text,
- const QString& caption = QString::null );
+ void blockingInformation( const TQString& text,
+ const TQString& caption = TQString() );
};
#endif
diff --git a/libk3b/core/k3bthread.cpp b/libk3b/core/k3bthread.cpp
index 07414ad..54b2218 100644
--- a/libk3b/core/k3bthread.cpp
+++ b/libk3b/core/k3bthread.cpp
@@ -20,15 +20,15 @@
#include <kdebug.h>
-#include <qapplication.h>
+#include <tqapplication.h>
-static QPtrList<K3bThread> s_threads;
+static TQPtrList<K3bThread> s_threads;
void K3bThread::waitUntilFinished()
{
- QPtrListIterator<K3bThread> it( s_threads );
+ TQPtrListIterator<K3bThread> it( s_threads );
while( it.current() ) {
kdDebug() << "Waiting for thread " << it.current() << endl;
it.current()->wait();
@@ -46,12 +46,12 @@ public:
: eventHandler( 0 ) {
}
- QObject* eventHandler;
+ TQObject* eventHandler;
};
-K3bThread::K3bThread( QObject* eventHandler )
- : QThread()
+K3bThread::K3bThread( TQObject* eventHandler )
+ : TQThread()
{
d = new Private;
d->eventHandler = eventHandler;
@@ -60,8 +60,8 @@ K3bThread::K3bThread( QObject* eventHandler )
}
-K3bThread::K3bThread( unsigned int stackSize, QObject* eventHandler )
- : QThread( stackSize )
+K3bThread::K3bThread( unsigned int stackSize, TQObject* eventHandler )
+ : TQThread( stackSize )
{
d = new Private;
d->eventHandler = eventHandler;
@@ -77,20 +77,20 @@ K3bThread::~K3bThread()
}
-void K3bThread::setProgressInfoEventHandler( QObject* eventHandler )
+void K3bThread::setProgressInfoEventHandler( TQObject* eventHandler )
{
d->eventHandler = eventHandler;
}
-QString K3bThread::jobDescription() const
+TQString K3bThread::jobDescription() const
{
- return QString::null;
+ return TQString();
}
-QString K3bThread::jobDetails() const
+TQString K3bThread::jobDetails() const
{
- return QString::null;
+ return TQString();
}
@@ -112,11 +112,11 @@ void K3bThread::cancel()
}
-void K3bThread::emitInfoMessage( const QString& msg, int type )
+void K3bThread::emitInfoMessage( const TQString& msg, int type )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler,
- new K3bProgressInfoEvent( K3bProgressInfoEvent::InfoMessage, msg, QString::null, type ) );
+ TQApplication::postEvent( d->eventHandler,
+ new K3bProgressInfoEvent( K3bProgressInfoEvent::InfoMessage, msg, TQString(), type ) );
else
kdWarning() << "(K3bThread) call to emitInfoMessage() without eventHandler." << endl;
}
@@ -124,7 +124,7 @@ void K3bThread::emitInfoMessage( const QString& msg, int type )
void K3bThread::emitPercent( int p )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler,
+ TQApplication::postEvent( d->eventHandler,
new K3bProgressInfoEvent( K3bProgressInfoEvent::Progress, p ) );
else
kdWarning() << "(K3bThread) call to emitPercent() without eventHandler." << endl;
@@ -133,7 +133,7 @@ void K3bThread::emitPercent( int p )
void K3bThread::emitSubPercent( int p )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler,
+ TQApplication::postEvent( d->eventHandler,
new K3bProgressInfoEvent( K3bProgressInfoEvent::SubProgress, p ) );
else
kdWarning() << "(K3bThread) call to emitSubPercent() without eventHandler." << endl;
@@ -142,7 +142,7 @@ void K3bThread::emitSubPercent( int p )
void K3bThread::emitStarted()
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Started ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Started ) );
else
kdWarning() << "(K3bThread) call to emitStarted() without eventHandler." << endl;
}
@@ -150,7 +150,7 @@ void K3bThread::emitStarted()
void K3bThread::emitCanceled()
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Canceled ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Canceled ) );
else
kdWarning() << "(K3bThread) call to emitCanceled() without eventHandler." << endl;
}
@@ -158,7 +158,7 @@ void K3bThread::emitCanceled()
void K3bThread::emitFinished( bool success )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Finished, success ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::Finished, success ) );
else
kdWarning() << "(K3bThread) call to emitFinished() without eventHandler." << endl;
}
@@ -166,7 +166,7 @@ void K3bThread::emitFinished( bool success )
void K3bThread::emitProcessedSize( int p, int size )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::ProcessedSize, p, size ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::ProcessedSize, p, size ) );
else
kdWarning() << "(K3bThread) call to emitProcessedSize() without eventHandler." << endl;
}
@@ -174,31 +174,31 @@ void K3bThread::emitProcessedSize( int p, int size )
void K3bThread::emitProcessedSubSize( int p, int size )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::ProcessedSubSize, p, size ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::ProcessedSubSize, p, size ) );
else
kdWarning() << "(K3bThread) call to emitProcessedSubSize() without eventHandler." << endl;
}
-void K3bThread::emitNewTask( const QString& job )
+void K3bThread::emitNewTask( const TQString& job )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NewTask, job ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NewTask, job ) );
else
kdWarning() << "(K3bThread) call to emitNewTask() without eventHandler." << endl;
}
-void K3bThread::emitNewSubTask( const QString& job )
+void K3bThread::emitNewSubTask( const TQString& job )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NewSubTask, job ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NewSubTask, job ) );
else
kdWarning() << "(K3bThread) call to emitNewSubTask() without eventHandler." << endl;
}
-void K3bThread::emitDebuggingOutput(const QString& group, const QString& text)
+void K3bThread::emitDebuggingOutput(const TQString& group, const TQString& text)
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::DebuggingOutput, group, text ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::DebuggingOutput, group, text ) );
else
kdWarning() << "(K3bThread) call to emitDebuggingOutput() without eventHandler." << endl;
}
@@ -206,7 +206,7 @@ void K3bThread::emitDebuggingOutput(const QString& group, const QString& text)
void K3bThread::emitData( const char* data, int len )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bDataEvent( data, len ) );
+ TQApplication::postEvent( d->eventHandler, new K3bDataEvent( data, len ) );
else
kdWarning() << "(K3bThread) call to emitData() without eventHandler." << endl;
}
@@ -214,7 +214,7 @@ void K3bThread::emitData( const char* data, int len )
void K3bThread::emitNextTrack( int t, int n )
{
if( d->eventHandler )
- QApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NextTrack, t, n ) );
+ TQApplication::postEvent( d->eventHandler, new K3bProgressInfoEvent( K3bProgressInfoEvent::NextTrack, t, n ) );
else
kdWarning() << "(K3bThread) call to emitNextTrack() without eventHandler." << endl;
}
diff --git a/libk3b/core/k3bthread.h b/libk3b/core/k3bthread.h
index f7e68fc..c57ab67 100644
--- a/libk3b/core/k3bthread.h
+++ b/libk3b/core/k3bthread.h
@@ -17,10 +17,10 @@
#ifndef _K3B_THREAD_H_
#define _K3B_THREAD_H_
-#include <qthread.h>
+#include <tqthread.h>
#include "k3b_export.h"
-class QObject;
+class TQObject;
/**
* The threaded couterpart to K3bJob
@@ -34,14 +34,14 @@ class QObject;
*
* See K3bThreadJob for more information.
*/
-class LIBK3B_EXPORT K3bThread : public QThread
+class LIBK3B_EXPORT K3bThread : public TQThread
{
public:
- K3bThread( QObject* eventHandler = 0 );
- K3bThread( unsigned int stackSize, QObject* eventHandler = 0 );
+ K3bThread( TQObject* eventHandler = 0 );
+ K3bThread( unsigned int stackSize, TQObject* eventHandler = 0 );
virtual ~K3bThread();
- void setProgressInfoEventHandler( QObject* eventHandler );
+ void setProgressInfoEventHandler( TQObject* eventHandler );
/**
* Initialize the thread before starting it in the GUi thread.
@@ -58,8 +58,8 @@ class LIBK3B_EXPORT K3bThread : public QThread
*/
virtual void cancel();
- virtual QString jobDescription() const;
- virtual QString jobDetails() const;
+ virtual TQString jobDescription() const;
+ virtual TQString jobDetails() const;
/**
* waits until all running K3bThread have finished.
@@ -73,7 +73,7 @@ class LIBK3B_EXPORT K3bThread : public QThread
/**
* uses the K3bJob::MessageType enum
*/
- void emitInfoMessage( const QString& msg, int type );
+ void emitInfoMessage( const TQString& msg, int type );
void emitPercent( int p );
void emitSubPercent( int p );
void emitStarted();
@@ -81,9 +81,9 @@ class LIBK3B_EXPORT K3bThread : public QThread
void emitFinished( bool success );
void emitProcessedSize( int processed, int size );
void emitProcessedSubSize( int processed, int size );
- void emitNewTask( const QString& job );
- void emitNewSubTask( const QString& job );
- void emitDebuggingOutput(const QString&, const QString&);
+ void emitNewTask( const TQString& job );
+ void emitNewSubTask( const TQString& job );
+ void emitDebuggingOutput(const TQString&, const TQString&);
void emitData( const char* data, int len );
void emitNextTrack( int track, int trackNum );
diff --git a/libk3b/core/k3bthreadjob.cpp b/libk3b/core/k3bthreadjob.cpp
index a13f10a..fcc192e 100644
--- a/libk3b/core/k3bthreadjob.cpp
+++ b/libk3b/core/k3bthreadjob.cpp
@@ -23,15 +23,15 @@
-K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bJob( jh, parent, name ),
+K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bJob( jh, tqparent, name ),
m_running(false)
{
}
-K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bJob( jh, parent, name ),
+K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bJob( jh, tqparent, name ),
m_running(false)
{
setThread(thread);
@@ -43,21 +43,21 @@ K3bThreadJob::~K3bThreadJob()
}
-QString K3bThreadJob::jobDescription() const
+TQString K3bThreadJob::jobDescription() const
{
if( m_thread )
return m_thread->jobDescription();
else
- return QString::null;
+ return TQString();
}
-QString K3bThreadJob::jobDetails() const
+TQString K3bThreadJob::jobDetails() const
{
if( m_thread )
return m_thread->jobDetails();
else
- return QString::null;
+ return TQString();
}
@@ -101,7 +101,7 @@ void K3bThreadJob::cleanupJob( bool success )
}
-void K3bThreadJob::customEvent( QCustomEvent* e )
+void K3bThreadJob::customEvent( TQCustomEvent* e )
{
if( K3bDataEvent* de = dynamic_cast<K3bDataEvent*>(e) ) {
emit data( de->data(), de->length() );
diff --git a/libk3b/core/k3bthreadjob.h b/libk3b/core/k3bthreadjob.h
index 25919f1..34b43fd 100644
--- a/libk3b/core/k3bthreadjob.h
+++ b/libk3b/core/k3bthreadjob.h
@@ -19,7 +19,7 @@
#include "k3bjob.h"
#include "k3b_export.h"
-class QCustomEvent;
+class TQCustomEvent;
class K3bThread;
@@ -40,10 +40,11 @@ class K3bThread;
class LIBK3B_EXPORT K3bThreadJob : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bThreadJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
- K3bThreadJob( K3bThread*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bThreadJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
+ K3bThreadJob( K3bThread*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bThreadJob();
void setThread( K3bThread* t );
@@ -57,8 +58,8 @@ class LIBK3B_EXPORT K3bThreadJob : public K3bJob
*/
virtual bool active() const { return m_running; }
- virtual QString jobDescription() const;
- virtual QString jobDetails() const;
+ virtual TQString jobDescription() const;
+ virtual TQString jobDetails() const;
public slots:
virtual void start();
@@ -68,7 +69,7 @@ class LIBK3B_EXPORT K3bThreadJob : public K3bJob
/**
* converts K3bThread events to K3bJob signals
*/
- virtual void customEvent( QCustomEvent* );
+ virtual void customEvent( TQCustomEvent* );
/**
* Reimplement this method to do some housekeeping once
diff --git a/libk3b/core/k3bversion.cpp b/libk3b/core/k3bversion.cpp
index f7af248..e7ae9b0 100644
--- a/libk3b/core/k3bversion.cpp
+++ b/libk3b/core/k3bversion.cpp
@@ -15,7 +15,7 @@
#include "k3bversion.h"
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kdebug.h>
@@ -35,7 +35,7 @@ K3bVersion::K3bVersion( const K3bVersion& v )
{
}
-K3bVersion::K3bVersion( const QString& version )
+K3bVersion::K3bVersion( const TQString& version )
{
setVersion( version );
}
@@ -43,14 +43,14 @@ K3bVersion::K3bVersion( const QString& version )
K3bVersion::K3bVersion( int majorVersion,
int minorVersion,
int patchlevel,
- const QString& suffix )
+ const TQString& suffix )
{
setVersion( majorVersion, minorVersion, patchlevel, suffix );
}
-void K3bVersion::setVersion( const QString& v )
+void K3bVersion::setVersion( const TQString& v )
{
- QString suffix;
+ TQString suffix;
splitVersionString( v.stripWhiteSpace(), m_majorVersion, suffix );
if( m_majorVersion >= 0 ) {
if( suffix.startsWith(".") ) {
@@ -99,9 +99,9 @@ void K3bVersion::setVersion( const QString& v )
// the dot is removed and the rest put in suffix
// if s does not start with a digit or the first non-digit char is not a dot
// suffix = s and num = -1 is returned
-void K3bVersion::splitVersionString( const QString& s, int& num, QString& suffix )
+void K3bVersion::splitVersionString( const TQString& s, int& num, TQString& suffix )
{
- int pos = s.find( QRegExp("\\D") );
+ int pos = s.tqfind( TQRegExp("\\D") );
if( pos < 0 ) {
num = s.toInt();
suffix = "";
@@ -126,7 +126,7 @@ bool K3bVersion::isValid() const
void K3bVersion::setVersion( int majorVersion,
int minorVersion,
int patchlevel,
- const QString& suffix )
+ const TQString& suffix )
{
m_majorVersion = majorVersion;
m_minorVersion = minorVersion;
@@ -135,7 +135,7 @@ void K3bVersion::setVersion( int majorVersion,
m_versionString = createVersionString( majorVersion, minorVersion, patchlevel, suffix );
}
-K3bVersion& K3bVersion::operator=( const QString& v )
+K3bVersion& K3bVersion::operator=( const TQString& v )
{
setVersion( v );
return *this;
@@ -148,18 +148,18 @@ K3bVersion K3bVersion::simplify() const
return v;
}
-QString K3bVersion::createVersionString( int majorVersion,
+TQString K3bVersion::createVersionString( int majorVersion,
int minorVersion,
int patchlevel,
- const QString& suffix )
+ const TQString& suffix )
{
if( majorVersion >= 0 ) {
- QString s = QString::number(majorVersion);
+ TQString s = TQString::number(majorVersion);
if( minorVersion > -1 ) {
- s.append( QString(".%1").arg(minorVersion) );
+ s.append( TQString(".%1").tqarg(minorVersion) );
if( patchlevel > -1 )
- s.append( QString(".%1").arg(patchlevel) );
+ s.append( TQString(".%1").tqarg(patchlevel) );
}
if( !suffix.isNull() )
@@ -172,12 +172,12 @@ QString K3bVersion::createVersionString( int majorVersion,
}
-int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 )
+int K3bVersion::compareSuffix( const TQString& suffix1, const TQString& suffix2 )
{
- static QRegExp rcRx( "rc(\\d+)" );
- static QRegExp preRx( "pre(\\d+)" );
- static QRegExp betaRx( "beta(\\d+)" );
- static QRegExp alphaRx( "a(?:lpha)?(\\d+)" );
+ static TQRegExp rcRx( "rc(\\d+)" );
+ static TQRegExp preRx( "pre(\\d+)" );
+ static TQRegExp betaRx( "beta(\\d+)" );
+ static TQRegExp alphaRx( "a(?:lpha)?(\\d+)" );
// first we check if one of the suffixes (or both are empty) becasue that case if simple
if( suffix1.isEmpty() ) {
@@ -202,7 +202,7 @@ int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 )
alphaRx.exactMatch( suffix2 ) )
return 1; // rc > than all the others
else
- return QString::compare( suffix1, suffix2 );
+ return TQString::compare( suffix1, suffix2 );
}
else if( preRx.exactMatch( suffix1 ) ) {
@@ -219,7 +219,7 @@ int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 )
alphaRx.exactMatch( suffix2 ) )
return 1; // pre is greater than beta or alpha
else
- return QString::compare( suffix1, suffix2 );
+ return TQString::compare( suffix1, suffix2 );
}
else if( betaRx.exactMatch( suffix1 ) ) {
@@ -235,7 +235,7 @@ int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 )
else if( alphaRx.exactMatch( suffix2 ) )
return 1; // beta is greater then alpha
else
- return QString::compare( suffix1, suffix2 );
+ return TQString::compare( suffix1, suffix2 );
}
else if( alphaRx.exactMatch( suffix1 ) ) {
@@ -250,11 +250,11 @@ int K3bVersion::compareSuffix( const QString& suffix1, const QString& suffix2 )
return ( v1 == v2 ? 0 : ( v1 < v2 ? -1 : 1 ) );
}
else
- return QString::compare( suffix1, suffix2 );
+ return TQString::compare( suffix1, suffix2 );
}
else
- return QString::compare( suffix1, suffix2 );
+ return TQString::compare( suffix1, suffix2 );
}
diff --git a/libk3b/core/k3bversion.h b/libk3b/core/k3bversion.h
index a6e3aee..f1bffba 100644
--- a/libk3b/core/k3bversion.h
+++ b/libk3b/core/k3bversion.h
@@ -17,7 +17,7 @@
#ifndef _K3B_VERSION_H_
#define _K3B_VERSION_H_
-#include <qstring.h>
+#include <tqstring.h>
#include "k3b_export.h"
/**
* \brief Representation of a version.
@@ -32,7 +32,7 @@
* K3bVersion tries to treat version suffixes in an "intelligent" way to properly compare versions
* (see compareSuffix() for more details).
*
- * K3bVersion may also be used everywhere a QString is needed as it automatically converts to a
+ * K3bVersion may also be used everywhere a TQString is needed as it automatically converts to a
* string representation using createVersionString().
*/
class LIBK3B_EXPORT K3bVersion
@@ -53,18 +53,18 @@ class LIBK3B_EXPORT K3bVersion
/**
* this constructor tries to parse the given version string
*/
- K3bVersion( const QString& version );
+ K3bVersion( const TQString& version );
/**
* sets the version and generates a version string from it
*/
- K3bVersion( int majorVersion, int minorVersion, int pachlevel = -1, const QString& suffix = QString::null );
+ K3bVersion( int majorVersion, int minorVersion, int pachlevel = -1, const TQString& suffix = TQString() );
/**
* tries to parse the version string
* used by the constructor
*/
- void setVersion( const QString& );
+ void setVersion( const TQString& );
bool isValid() const;
@@ -74,19 +74,19 @@ class LIBK3B_EXPORT K3bVersion
*
* If minorVersion or pachlevel are -1 they will not be used when generating the version string.
*/
- void setVersion( int majorVersion, int minorVersion = -1, int patchlevel = -1, const QString& suffix = QString::null );
+ void setVersion( int majorVersion, int minorVersion = -1, int patchlevel = -1, const TQString& suffix = TQString() );
- const QString& versionString() const { return m_versionString; }
+ const TQString& versionString() const { return m_versionString; }
int majorVersion() const { return m_majorVersion; }
int minorVersion() const { return m_minorVersion; }
int patchLevel() const { return m_patchLevel; }
- const QString& suffix() const { return m_suffix; }
+ const TQString& suffix() const { return m_suffix; }
/**
- * just to make it possible to use as a QString
+ * just to make it possible to use as a TQString
*/
- operator const QString& () const { return m_versionString; }
- K3bVersion& operator=( const QString& v );
+ operator const TQString& () const { return m_versionString; }
+ K3bVersion& operator=( const TQString& v );
/**
* \return A new K3bVersion object which equals this one except that the suffix is empty.
@@ -97,10 +97,10 @@ class LIBK3B_EXPORT K3bVersion
* If minorVersion or pachlevel are -1 they will not be used when generating the version string.
* If minorVersion is -1 patchlevel will be ignored.
*/
- static QString createVersionString( int majorVersion,
+ static TQString createVersionString( int majorVersion,
int minorVersion = -1,
int patchlevel = -1,
- const QString& suffix = QString::null );
+ const TQString& suffix = TQString() );
/**
* "Intelligent" comparison of two version suffixes.
@@ -118,16 +118,16 @@ class LIBK3B_EXPORT K3bVersion
* alphaX equals aX in this case.)
* \li 1 if suffix1 is greater than suffix2
*/
- static int compareSuffix( const QString& suffix1, const QString& suffix2 );
+ static int compareSuffix( const TQString& suffix1, const TQString& suffix2 );
private:
- static void splitVersionString( const QString& s, int& num, QString& suffix );
+ static void splitVersionString( const TQString& s, int& num, TQString& suffix );
- QString m_versionString;
+ TQString m_versionString;
int m_majorVersion;
int m_minorVersion;
int m_patchLevel;
- QString m_suffix;
+ TQString m_suffix;
};
diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
index 0c5cd9a..9b88345 100644
--- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp
+++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
@@ -50,35 +50,35 @@ private:
};
-K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bBurnJob( jh, parent, name ),
+K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bBurnJob( jh, tqparent, name ),
m_decoder(0)
{
m_analyserThread = new AnalyserThread();
m_analyserJob = new K3bThreadJob( m_analyserThread, this, this );
- connect( m_analyserJob, SIGNAL(finished(bool)), this, SLOT(slotAnalyserThreadFinished(bool)) );
+ connect( m_analyserJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAnalyserThreadFinished(bool)) );
m_audioDoc = new K3bAudioDoc( this );
m_audioDoc->newDocument();
m_audioJob = new K3bAudioJob( m_audioDoc, this, this );
// just loop all through
- connect( m_audioJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( m_audioJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_audioJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
- connect( m_audioJob, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_audioJob, SIGNAL(finished(bool)), this, SIGNAL(finished(bool)) );
- connect( m_audioJob, SIGNAL(canceled()), this, SIGNAL(canceled()) );
- connect( m_audioJob, SIGNAL(percent(int)), this, SIGNAL(percent(int)) );
- connect( m_audioJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) );
- connect( m_audioJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( m_audioJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( m_audioJob, SIGNAL(burning(bool)), this, SIGNAL(burning(bool)) );
- connect( m_audioJob, SIGNAL(bufferStatus(int)), this, SIGNAL(bufferStatus(int)) );
- connect( m_audioJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( m_audioJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
+ connect( m_audioJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( m_audioJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_audioJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( m_audioJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_audioJob, TQT_SIGNAL(finished(bool)), this, TQT_SIGNAL(finished(bool)) );
+ connect( m_audioJob, TQT_SIGNAL(canceled()), this, TQT_SIGNAL(canceled()) );
+ connect( m_audioJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) );
+ connect( m_audioJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
+ 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(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
+ connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
m_canceled = false;
m_audioJobRunning = false;
@@ -98,13 +98,13 @@ K3bDevice::Device* K3bAudioCueFileWritingJob::writer() const
}
-QString K3bAudioCueFileWritingJob::jobDescription() const
+TQString K3bAudioCueFileWritingJob::jobDescription() const
{
return i18n("Writing Audio Cue File");
}
-QString K3bAudioCueFileWritingJob::jobDetails() const
+TQString K3bAudioCueFileWritingJob::jobDetails() const
{
return m_cueFile.section( '/', -1 );
}
@@ -131,7 +131,7 @@ void K3bAudioCueFileWritingJob::cancel()
}
-void K3bAudioCueFileWritingJob::setCueFile( const QString& s )
+void K3bAudioCueFileWritingJob::setCueFile( const TQString& s )
{
m_cueFile = s;
}
@@ -173,7 +173,7 @@ void K3bAudioCueFileWritingJob::setCopies( int c )
}
-void K3bAudioCueFileWritingJob::setTempDir( const QString& s )
+void K3bAudioCueFileWritingJob::setTempDir( const TQString& s )
{
m_audioDoc->setTempDir( s );
}
@@ -252,19 +252,19 @@ void K3bAudioCueFileWritingJob::importCueInProject()
// now analyze the source
emit newTask( i18n("Analysing the audio file") );
- emit newSubTask( i18n("Analysing %1").arg( parser.imageFilename() ) );
+ emit newSubTask( i18n("Analysing %1").tqarg( 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.").arg( m_cueFile ), ERROR );
+ emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").tqarg( m_cueFile ), ERROR );
jobFinished(false);
}
}
else {
- emit infoMessage( i18n("No valid audio cue file: '%1'").arg( m_cueFile ), ERROR );
+ emit infoMessage( i18n("No valid audio cue file: '%1'").tqarg( m_cueFile ), ERROR );
jobFinished(false);
}
}
diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.h b/libk3b/jobs/k3baudiocuefilewritingjob.h
index 6e0a3c2..a59dcb0 100644
--- a/libk3b/jobs/k3baudiocuefilewritingjob.h
+++ b/libk3b/jobs/k3baudiocuefilewritingjob.h
@@ -30,30 +30,31 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bAudioCueFileWritingJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioCueFileWritingJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bAudioCueFileWritingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bAudioCueFileWritingJob();
K3bDevice::Device* writer() const;
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
- const QString& cueFile() const { return m_cueFile; }
+ const TQString& cueFile() const { return m_cueFile; }
public slots:
void start();
void cancel();
- void setCueFile( const QString& );
+ void setCueFile( const TQString& );
void setSpeed( int s );
void setBurnDevice( K3bDevice::Device* dev );
void setWritingMode( int mode );
void setSimulate( bool b );
void setCopies( int c );
void setOnTheFly( bool b );
- void setTempDir( const QString& );
+ void setTempDir( const TQString& );
private slots:
void slotAnalyserThreadFinished(bool);
@@ -63,7 +64,7 @@ class LIBK3B_EXPORT K3bAudioCueFileWritingJob : public K3bBurnJob
K3bDevice::Device* m_device;
- QString m_cueFile;
+ TQString m_cueFile;
K3bAudioDoc* m_audioDoc;
K3bAudioJob* m_audioJob;
K3bAudioDecoder* m_decoder;
diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp
index f4ac550..acf7e9d 100644
--- a/libk3b/jobs/k3baudiosessionreadingjob.cpp
+++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp
@@ -46,7 +46,7 @@ public:
K3bDevice::Device* device;
K3bDevice::Toc toc;
K3bWaveFileWriter* waveFileWriter;
- QStringList filenames;
+ TQStringList filenames;
int paranoiaMode;
int retries;
bool neverSkip;
@@ -93,7 +93,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
toc = device->readToc();
if( !paranoia->initParanoia( device, toc ) ) {
- emitInfoMessage( i18n("Could not open device %1").arg(device->blockDeviceName()),
+ emitInfoMessage( i18n("Could not open device %1").tqarg(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.").arg(filenames[currentTrack-1]), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(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.").arg(trackNum), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(trackNum), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -206,8 +206,8 @@ void K3bAudioSessionReadingJob::WorkThread::cancel()
-K3bAudioSessionReadingJob::K3bAudioSessionReadingJob( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bThreadJob( jh, parent, name )
+K3bAudioSessionReadingJob::K3bAudioSessionReadingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bThreadJob( jh, tqparent, name )
{
m_thread = new WorkThread();
setThread( m_thread );
@@ -238,7 +238,7 @@ void K3bAudioSessionReadingJob::writeToFd( int fd )
m_thread->fd = fd;
}
-void K3bAudioSessionReadingJob::setImageNames( const QStringList& l )
+void K3bAudioSessionReadingJob::setImageNames( const TQStringList& l )
{
m_thread->filenames = l;
m_thread->fd = -1;
diff --git a/libk3b/jobs/k3baudiosessionreadingjob.h b/libk3b/jobs/k3baudiosessionreadingjob.h
index 21f3d50..53ae7fa 100644
--- a/libk3b/jobs/k3baudiosessionreadingjob.h
+++ b/libk3b/jobs/k3baudiosessionreadingjob.h
@@ -18,7 +18,7 @@
#include <k3bthreadjob.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
namespace K3bDevice {
@@ -30,9 +30,10 @@ namespace K3bDevice {
class K3bAudioSessionReadingJob : public K3bThreadJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioSessionReadingJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bAudioSessionReadingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bAudioSessionReadingJob();
/**
@@ -55,7 +56,7 @@ class K3bAudioSessionReadingJob : public K3bThreadJob
/**
* Used if fd == -1
*/
- void setImageNames( const QStringList& l );
+ void setImageNames( const TQStringList& l );
void setParanoiaMode( int m );
void setReadRetries( int );
diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp
index de76e3f..3e39b1c 100644
--- a/libk3b/jobs/k3bbinimagewritingjob.cpp
+++ b/libk3b/jobs/k3bbinimagewritingjob.cpp
@@ -25,13 +25,13 @@
#include <klocale.h>
#include <kdebug.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
-K3bBinImageWritingJob::K3bBinImageWritingJob( K3bJobHandler* hdl, QObject* parent )
- : K3bBurnJob( hdl, parent ),
+K3bBinImageWritingJob::K3bBinImageWritingJob( K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bBurnJob( hdl, tqparent ),
m_device(0),
m_simulate(false),
m_force(false),
@@ -93,10 +93,10 @@ bool K3bBinImageWritingJob::prepareWriter()
// TODO: put this into K3bCueFileParser
// TODO: check K3bCueFileParser::imageFilenameInCue()
// let's see if cdrecord can handle the cue file
- QFile f( m_tocFile );
+ TQFile f( m_tocFile );
if( f.open( IO_ReadOnly ) ) {
- QTextStream fStr( &f );
- if( fStr.read().contains( "MODE1/2352" ) ) {
+ TQTextStream fStr( &f );
+ if( fStr.read().tqcontains( "MODE1/2352" ) ) {
kdDebug() << "(K3bBinImageWritingJob) cuefile contains MODE1/2352 track. using cdrdao." << endl;
usedWritingApp = K3b::CDRDAO;
}
@@ -144,18 +144,18 @@ bool K3bBinImageWritingJob::prepareWriter()
m_writer = writer;
}
- connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_writer, SIGNAL(percent(int)), this, SLOT(copyPercent(int)) );
- connect( m_writer, SIGNAL(subPercent(int)), this, SLOT(copySubPercent(int)) );
- connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) );
- connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) );
- connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( m_writer, SIGNAL(finished(bool)), this, SLOT(writerFinished(bool)) );
- connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotNextTrack(int, int)) );
- connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)), this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ 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(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)) );
+ connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) );
+ connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
return true;
}
@@ -207,26 +207,26 @@ void K3bBinImageWritingJob::writerFinished(bool ok)
void K3bBinImageWritingJob::slotNextTrack( int t, int tt )
{
- emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) );
+ emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) );
}
-QString K3bBinImageWritingJob::jobDescription() const
+TQString K3bBinImageWritingJob::jobDescription() const
{
return ( i18n("Writing cue/bin Image")
+ ( m_copies > 1
? i18n(" - %n Copy", " - %n Copies", m_copies)
- : QString::null ) );
+ : TQString() ) );
}
-QString K3bBinImageWritingJob::jobDetails() const
+TQString K3bBinImageWritingJob::jobDetails() const
{
return m_tocFile.section("/", -1);
}
-void K3bBinImageWritingJob::setTocFile(const QString& s)
+void K3bBinImageWritingJob::setTocFile(const TQString& s)
{
m_tocFile = s;
}
diff --git a/libk3b/jobs/k3bbinimagewritingjob.h b/libk3b/jobs/k3bbinimagewritingjob.h
index 3666793..9782985 100644
--- a/libk3b/jobs/k3bbinimagewritingjob.h
+++ b/libk3b/jobs/k3bbinimagewritingjob.h
@@ -30,15 +30,16 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bBinImageWritingJob( K3bJobHandler*, QObject* parent = 0 );
+ K3bBinImageWritingJob( K3bJobHandler*, TQObject* tqparent = 0 );
~K3bBinImageWritingJob();
K3bDevice::Device* writer() const { return m_device; };
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void start();
@@ -48,7 +49,7 @@ class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob
void setSimulate( bool b ) { m_simulate = b; }
void setForce(bool b) { m_force = b; }
void setMulti( bool b ) { m_noFix = b; }
- void setTocFile( const QString& s);
+ void setTocFile( const TQString& s);
void setCopies(int c) { m_copies = c; }
void setSpeed( int s ) { m_speed = s; }
@@ -66,7 +67,7 @@ class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob
bool m_simulate;
bool m_force;
bool m_noFix;
- QString m_tocFile;
+ TQString m_tocFile;
int m_speed;
int m_copies;
int m_finishedCopies;
diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp
index c11f4b4..80eba84 100644
--- a/libk3b/jobs/k3bblankingjob.cpp
+++ b/libk3b/jobs/k3bblankingjob.cpp
@@ -27,12 +27,12 @@
#include <kio/job.h>
#include <kdebug.h>
-#include <qstring.h>
+#include <tqstring.h>
-K3bBlankingJob::K3bBlankingJob( K3bJobHandler* hdl, QObject* parent )
- : K3bBurnJob( hdl, parent ),
+K3bBlankingJob::K3bBlankingJob( K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bBurnJob( hdl, tqparent ),
m_writerJob(0),
m_force(true),
m_device(0),
@@ -94,7 +94,7 @@ void K3bBlankingJob::slotStartErasing()
K3bCdrecordWriter* writer = new K3bCdrecordWriter( m_device, this );
m_writerJob = writer;
- QString mode;
+ TQString mode;
switch( m_mode ) {
case Fast:
mode = "fast";
@@ -121,19 +121,19 @@ void K3bBlankingJob::slotStartErasing()
writer->setForceNoEject( m_forceNoEject );
}
- connect(m_writerJob, SIGNAL(finished(bool)), this, SLOT(slotFinished(bool)));
- connect(m_writerJob, SIGNAL(infoMessage( const QString&, int)),
- this,SIGNAL(infoMessage( const QString&, int)));
- connect( m_writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect(m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotFinished(bool)));
+ connect(m_writerJob, TQT_SIGNAL(infoMessage( const TQString&, int)),
+ this,TQT_SIGNAL(infoMessage( const TQString&, int)));
+ connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
if( waitForMedia( m_device,
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
K3bDevice::MEDIA_CD_RW,
i18n("Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>.")
- .arg(m_device->vendor())
- .arg(m_device->description())
- .arg(m_device->devicename()) ) < 0 ) {
+ .tqarg(m_device->vendor())
+ .tqarg(m_device->description())
+ .tqarg(m_device->devicename()) ) < 0 ) {
emit canceled();
jobFinished(false);
return;
diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h
index 8cfe0a1..ab6becd 100644
--- a/libk3b/jobs/k3bblankingjob.h
+++ b/libk3b/jobs/k3bblankingjob.h
@@ -19,7 +19,7 @@
#include <k3bjob.h>
#include "k3b_export.h"
class KProcess;
-class QString;
+class TQString;
class K3bDevice::Device;
class K3bAbstractWriter;
@@ -27,9 +27,10 @@ class K3bAbstractWriter;
class LIBK3B_EXPORT K3bBlankingJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bBlankingJob( K3bJobHandler*, QObject* parent = 0 );
+ K3bBlankingJob( K3bJobHandler*, TQObject* tqparent = 0 );
~K3bBlankingJob();
K3bDevice::Device* writer() const;
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index ff8f35d..c55e284 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -42,15 +42,15 @@
#include <kio/job.h>
#include <kio/global.h>
-#include <qtimer.h>
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qregexp.h>
-#include <qtextstream.h>
-#include <qcstring.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qapplication.h>
+#include <tqtimer.h>
+#include <tqstringlist.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqtextstream.h>
+#include <tqcstring.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
+#include <tqapplication.h>
class K3bCdCopyJob::Private
@@ -80,7 +80,7 @@ public:
unsigned int currentWrittenSession;
K3bDevice::Toc toc;
- QByteArray cdTextRaw;
+ TQByteArray cdTextRaw;
K3bReadcdReader* readcdReader;
K3bDataTrackReader* dataTrackReader;
@@ -93,10 +93,10 @@ public:
bool writerRunning;
// image filenames, one for every track
- QStringList imageNames;
+ TQStringList imageNames;
// inf-filenames for writing audio tracks
- QStringList infNames;
+ TQStringList infNames;
// indicates if we created a dir or not
bool deleteTempDir;
@@ -107,16 +107,16 @@ public:
bool haveCddb;
bool haveCdText;
- QValueVector<bool> dataSessionProbablyTAORecorded;
+ TQValueVector<bool> dataSessionProbablyTAORecorded;
// used to determine progress
- QValueVector<long> sessionSizes;
+ TQValueVector<long> sessionSizes;
long overallSize;
};
-K3bCdCopyJob::K3bCdCopyJob( K3bJobHandler* hdl, QObject* parent )
- : K3bBurnJob( hdl, parent ),
+K3bCdCopyJob::K3bCdCopyJob( K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bBurnJob( hdl, tqparent ),
m_simulate(false),
m_copies(1),
m_onlyCreateImages(false),
@@ -173,8 +173,8 @@ void K3bCdCopyJob::start()
// FIXME: read ISRCs and MCN
- connect( K3bDevice::diskInfo( m_readerDevice ), SIGNAL(finished(K3bDevice::DeviceHandler*)),
- this, SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
+ connect( K3bDevice::diskInfo( m_readerDevice ), TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ this, TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
}
@@ -311,9 +311,9 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
}
unsigned long avail, size;
- QString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) );
+ TQString pathToTest = m_tempPath.left( m_tempPath.tqfindRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
+ emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR );
d->error = true;
canCopy = false;
}
@@ -368,9 +368,9 @@ void K3bCdCopyJob::searchCdText()
emit newSubTask( i18n("Searching CD-TEXT") );
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::CD_TEXT_RAW, m_readerDevice ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotCdTextReady(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotCdTextReady(K3bDevice::DeviceHandler*)) );
}
@@ -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).").arg(cdt.performer()).arg(cdt.title()), SUCCESS );
+ emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").tqarg(cdt.performer()).tqarg(cdt.title()), SUCCESS );
d->haveCdText = true;
d->cdTextRaw = dh->cdTextRaw();
}
@@ -411,8 +411,8 @@ void K3bCdCopyJob::queryCddb()
if( !d->cddb ) {
d->cddb = new K3bCddb( this );
- connect( d->cddb, SIGNAL(queryFinished(int)),
- this, SLOT(slotCddbQueryFinished(int)) );
+ connect( d->cddb, TQT_SIGNAL(queryFinished(int)),
+ this, TQT_SLOT(slotCddbQueryFinished(int)) );
}
KConfig* c = k3bcore->config();
@@ -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).").arg(d->cddbInfo.cdArtist).arg(d->cddbInfo.cdTitle), SUCCESS );
+ emit infoMessage( i18n("Found Cddb entry (%1 - %2).").tqarg(d->cddbInfo.cdArtist).tqarg(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).").arg(d->cddb->errorString()), ERROR );
+ emit infoMessage( i18n("Cddb error (%1).").tqarg(d->cddb->errorString()), ERROR );
}
startCopy();
@@ -495,7 +495,7 @@ bool K3bCdCopyJob::prepareImageFiles()
d->infNames.clear();
d->deleteTempDir = false;
- QFileInfo fi( m_tempPath );
+ TQFileInfo fi( m_tempPath );
if( d->toc.count() > 1 || d->toc.contentType() == K3bDevice::AUDIO ) {
// create a directory which contains all the images and inf and stuff
@@ -503,9 +503,9 @@ bool K3bCdCopyJob::prepareImageFiles()
bool tempDirReady = false;
if( !fi.isDir() ) {
- if( QFileInfo( m_tempPath.section( '/', 0, -2 ) ).isDir() ) {
- if( !QFile::exists( m_tempPath ) ) {
- QDir dir( m_tempPath.section( '/', 0, -2 ) );
+ if( TQFileInfo( m_tempPath.section( '/', 0, -2 ) ).isDir() ) {
+ if( !TQFile::exists( m_tempPath ) ) {
+ TQDir dir( m_tempPath.section( '/', 0, -2 ) );
dir.mkdir( m_tempPath.section( '/', -1 ) );
tempDirReady = true;
}
@@ -520,28 +520,28 @@ bool K3bCdCopyJob::prepareImageFiles()
// create temp dir
if( !tempDirReady ) {
- QDir dir( m_tempPath );
+ TQDir dir( m_tempPath );
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'.").arg(m_tempPath), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(m_tempPath), ERROR );
return false;
}
d->deleteTempDir = true;
}
m_tempPath = K3b::prepareDir( m_tempPath );
- emit infoMessage( i18n("Using temporary directory %1.").arg(m_tempPath), INFO );
+ emit infoMessage( i18n("Using temporary directory %1.").tqarg(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 + QString("Track%1.wav").arg(QString::number(i).rightJustify(2, '0')) );
- d->infNames.append( m_tempPath + QString("Track%1.inf").arg(QString::number(i).rightJustify(2, '0')) );
+ 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')) );
}
else
- d->imageNames.append( m_tempPath + QString("Track%1.iso").arg(QString::number(i).rightJustify(2, '0')) );
+ d->imageNames.append( m_tempPath + TQString("Track%1.iso").tqarg(TQString::number(i).rightJustify(2, '0')) );
++i;
}
@@ -554,17 +554,17 @@ bool K3bCdCopyJob::prepareImageFiles()
else {
// we only need a single image file
if( !fi.isFile() ||
- questionYesNo( i18n("Do you want to overwrite %1?").arg(m_tempPath),
+ questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_tempPath),
i18n("File Exists") ) ) {
if( fi.isDir() )
m_tempPath = K3b::findTempFile( "iso", m_tempPath );
- else if( !QFileInfo( m_tempPath.section( '/', 0, -2 ) ).isDir() ) {
+ else if( !TQFileInfo( m_tempPath.section( '/', 0, -2 ) ).isDir() ) {
emit infoMessage( i18n("Specified an unusable temporary path. Using default."), WARNING );
m_tempPath = K3b::findTempFile( "iso" );
}
// else the user specified a file in an existing dir
- emit infoMessage( i18n("Writing image file to %1.").arg(m_tempPath), INFO );
+ emit infoMessage( i18n("Writing image file to %1.").tqarg(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").arg(d->currentReadSession) );
+ emit newTask( i18n("Reading Session %1").tqarg(d->currentReadSession) );
else
emit newTask( i18n("Reading Source Medium") );
if( d->currentReadSession == 1 )
- emit newSubTask( i18n("Reading track %1 of %2").arg(1).arg(d->toc.count()) );
+ emit newSubTask( i18n("Reading track %1 of %2").tqarg(1).tqarg(d->toc.count()) );
}
// there is only one situation where we need the audiosessionreader:
@@ -594,13 +594,13 @@ void K3bCdCopyJob::readNextSession()
if( d->currentReadSession == 1 && d->toc[0].type() == K3bDevice::Track::AUDIO ) {
if( !d->audioSessionReader ) {
d->audioSessionReader = new K3bAudioSessionReadingJob( this, this );
- connect( d->audioSessionReader, SIGNAL(nextTrack(int, int)),
- this, SLOT(slotReadingNextTrack(int, int)) );
+ connect( d->audioSessionReader, TQT_SIGNAL(nextTrack(int, int)),
+ this, TQT_SLOT(slotReadingNextTrack(int, int)) );
connectSubJob( d->audioSessionReader,
- SLOT(slotSessionReaderFinished(bool)),
+ TQT_SLOT(slotSessionReaderFinished(bool)),
true,
- SLOT(slotReaderProgress(int)),
- SLOT(slotReaderSubProgress(int)) );
+ TQT_SLOT(slotReaderProgress(int)),
+ TQT_SLOT(slotReaderSubProgress(int)) );
}
d->audioSessionReader->setDevice( m_readerDevice );
@@ -619,12 +619,12 @@ void K3bCdCopyJob::readNextSession()
else {
if( !d->dataTrackReader ) {
d->dataTrackReader = new K3bDataTrackReader( this, this );
- connect( d->dataTrackReader, SIGNAL(percent(int)), this, SLOT(slotReaderProgress(int)) );
- connect( d->dataTrackReader, SIGNAL(processedSize(int, int)), this, SLOT(slotReaderProcessedSize(int, int)) );
- connect( d->dataTrackReader, SIGNAL(finished(bool)), this, SLOT(slotSessionReaderFinished(bool)) );
- connect( d->dataTrackReader, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( d->dataTrackReader, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotSessionReaderFinished(bool)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
d->dataTrackReader->setDevice( m_readerDevice );
@@ -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").arg(d->currentWrittenSession) );
+ emit newTask( i18n("Simulating Session %1").tqarg(d->currentWrittenSession) );
else if( m_copies > 1 )
- emit newTask( i18n("Writing Copy %1 (Session %2)").arg(d->doneCopies+1).arg(d->currentWrittenSession) );
+ emit newTask( i18n("Writing Copy %1 (Session %2)").tqarg(d->doneCopies+1).tqarg(d->currentWrittenSession) );
else
- emit newTask( i18n("Writing Copy (Session %2)").arg(d->currentWrittenSession) );
+ emit newTask( i18n("Writing Copy (Session %2)").tqarg(d->currentWrittenSession) );
}
else {
if( m_simulate )
emit newTask( i18n("Simulating") );
else if( m_copies > 1 )
- emit newTask( i18n("Writing Copy %1").arg(d->doneCopies+1) );
+ emit newTask( i18n("Writing Copy %1").tqarg(d->doneCopies+1) );
else
emit newTask( i18n("Writing Copy") );
}
@@ -707,20 +707,20 @@ bool K3bCdCopyJob::writeNextSession()
if( !d->cdrecordWriter ) {
d->cdrecordWriter = new K3bCdrecordWriter( m_writerDevice, this, this );
- connect( d->cdrecordWriter, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( d->cdrecordWriter, SIGNAL(percent(int)), this, SLOT(slotWriterProgress(int)) );
- connect( d->cdrecordWriter, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) );
- connect( d->cdrecordWriter, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) );
- connect( d->cdrecordWriter, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( d->cdrecordWriter, SIGNAL(nextTrack(int, int)), this, SLOT(slotWritingNextTrack(int, int)) );
- connect( d->cdrecordWriter, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) );
- connect( d->cdrecordWriter, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( d->cdrecordWriter, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( d->cdrecordWriter, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) );
- // connect( d->cdrecordWriter, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( d->cdrecordWriter, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( d->cdrecordWriter, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( d->cdrecordWriter, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->cdrecordWriter, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) );
+ connect( d->cdrecordWriter, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
+ 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(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)) );
+ // connect( d->cdrecordWriter, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( d->cdrecordWriter, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->cdrecordWriter, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
d->cdrecordWriter->setBurnDevice( m_writerDevice );
@@ -742,7 +742,7 @@ bool K3bCdCopyJob::writeNextSession()
//
// create the inf files if not already done
//
- if( d->infNames.isEmpty() || !QFile::exists( d->infNames[0] ) ) {
+ if( d->infNames.isEmpty() || !TQFile::exists( d->infNames[0] ) ) {
unsigned int trackNumber = 1;
@@ -773,7 +773,7 @@ bool K3bCdCopyJob::writeNextSession()
// It is important that the files have the ending inf because
// cdrecord only checks this
- KTempFile tmp( QString::null, ".inf" );
+ KTempFile tmp( TQString(), ".inf" );
d->infNames.append( tmp.name() );
bool success = d->infFileWriter->save( *tmp.textStream() );
tmp.close();
@@ -841,7 +841,7 @@ bool K3bCdCopyJob::writeNextSession()
}
else {
// make sure the writer job does not create raw cdtext
- d->cdrecordWriter->setRawCdText( QByteArray() );
+ d->cdrecordWriter->setRawCdText( TQByteArray() );
// cdrecord will use the cdtext data in the inf files
d->cdrecordWriter->addArgument( "-text" );
}
@@ -923,7 +923,7 @@ bool K3bCdCopyJob::writeNextSession()
trackLen = trackLen * 2056; // see k3bdatatrackreader.h
else
trackLen = trackLen * 2332; // see k3bdatatrackreader.h
- d->cdrecordWriter->addArgument( QString("-tsize=%1").arg(trackLen) )->addArgument("-");
+ d->cdrecordWriter->addArgument( TQString("-tsize=%1").tqarg(trackLen) )->addArgument("-");
}
else if( d->toc.contentType() == K3bDevice::MIXED )
d->cdrecordWriter->addArgument( d->imageNames[d->toc.count()-1] );
@@ -931,7 +931,7 @@ bool K3bCdCopyJob::writeNextSession()
d->cdrecordWriter->addArgument( d->imageNames[d->currentWrittenSession-1] );
// clear cd text from previous sessions
- d->cdrecordWriter->setRawCdText( QByteArray() );
+ d->cdrecordWriter->setRawCdText( TQByteArray() );
}
@@ -953,7 +953,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success )
if( success ) {
if( d->numSessions > 1 )
- emit infoMessage( i18n("Successfully read session %1.").arg(d->currentReadSession), SUCCESS );
+ emit infoMessage( i18n("Successfully read session %1.").tqarg(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.").arg(d->currentReadSession), ERROR );
+ emit infoMessage( i18n("Error while reading session %1.").tqarg(d->currentReadSession), ERROR );
if( m_onTheFly )
d->cdrecordWriter->setSourceUnreadable(true);
}
@@ -1015,8 +1015,8 @@ void K3bCdCopyJob::slotWriterFinished( bool success )
// reload the media
emit newSubTask( i18n("Reloading the medium") );
- connect( K3bDevice::reload( m_writerDevice ), SIGNAL(finished(K3bDevice::DeviceHandler*)),
- this, SLOT(slotMediaReloadedForNextSession(K3bDevice::DeviceHandler*)) );
+ connect( K3bDevice::reload( m_writerDevice ), TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ this, TQT_SLOT(slotMediaReloadedForNextSession(K3bDevice::DeviceHandler*)) );
}
else {
d->doneCopies++;
@@ -1073,14 +1073,14 @@ void K3bCdCopyJob::cleanup()
{
if( m_onTheFly || !m_keepImage || ((d->canceled || d->error) && !d->readingSuccessful) ) {
emit infoMessage( i18n("Removing temporary files."), INFO );
- for( QStringList::iterator it = d->infNames.begin(); it != d->infNames.end(); ++it )
- QFile::remove( *it );
+ for( TQStringList::iterator it = d->infNames.begin(); it != d->infNames.end(); ++it )
+ TQFile::remove( *it );
}
if( !m_onTheFly && (!m_keepImage || ((d->canceled || d->error) && !d->readingSuccessful)) ) {
emit infoMessage( i18n("Removing image files."), INFO );
- for( QStringList::iterator it = d->imageNames.begin(); it != d->imageNames.end(); ++it )
- QFile::remove( *it );
+ for( TQStringList::iterator it = d->imageNames.begin(); it != d->imageNames.end(); ++it )
+ TQFile::remove( *it );
// remove the tempdir created in prepareImageFiles()
if( d->deleteTempDir ) {
@@ -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").arg(t).arg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(d->toc.count()) );
else
- emit newSubTask( i18n("Writing track %1 of %2").arg(d->toc.count()).arg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->toc.count()).tqarg(d->toc.count()) );
}
else if( d->numSessions > 1 )
- emit newSubTask( i18n("Writing track %1 of %2").arg(d->currentWrittenSession).arg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->currentWrittenSession).tqarg(d->toc.count()) );
else
- emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) );
+ emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) );
}
@@ -1159,12 +1159,12 @@ void K3bCdCopyJob::slotReadingNextTrack( int t, int )
else
track = d->currentReadSession;
- emit newSubTask( i18n("Reading track %1 of %2").arg(track).arg(d->toc.count()) );
+ emit newSubTask( i18n("Reading track %1 of %2").tqarg(track).tqarg(d->toc.count()) );
}
}
-QString K3bCdCopyJob::jobDescription() const
+TQString K3bCdCopyJob::jobDescription() const
{
if( m_onlyCreateImages ) {
return i18n("Creating CD Image");
@@ -1184,7 +1184,7 @@ QString K3bCdCopyJob::jobDescription() const
}
-QString K3bCdCopyJob::jobDetails() const
+TQString K3bCdCopyJob::jobDetails() const
{
return i18n("Creating 1 copy",
"Creating %n copies",
diff --git a/libk3b/jobs/k3bcdcopyjob.h b/libk3b/jobs/k3bcdcopyjob.h
index 3ab77e8..65c7e9f 100644
--- a/libk3b/jobs/k3bcdcopyjob.h
+++ b/libk3b/jobs/k3bcdcopyjob.h
@@ -32,16 +32,17 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCdCopyJob( K3bJobHandler* hdl, QObject* parent = 0 );
+ K3bCdCopyJob( K3bJobHandler* hdl, TQObject* tqparent = 0 );
~K3bCdCopyJob();
K3bDevice::Device* writer() const { return m_onlyCreateImages ? 0 : m_writerDevice; }
K3bDevice::Device* reader() const { return m_readerDevice; }
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void start();
@@ -56,7 +57,7 @@ class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob
void setKeepImage( bool b ) { m_keepImage = b; }
void setOnlyCreateImage( bool b ) { m_onlyCreateImages = b; }
void setSimulate( bool b ) { m_simulate = b; }
- void setTempPath( const QString& path ) { m_tempPath= path; }
+ void setTempPath( const TQString& path ) { m_tempPath= path; }
void setCopies( unsigned int c ) { m_copies = c; }
void setParanoiaMode( int i ) { m_paranoiaMode = i; }
void setIgnoreDataReadErrors( bool b ) { m_ignoreDataReadErrors = b; }
@@ -107,7 +108,7 @@ class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob
int m_audioReadRetries;
bool m_preferCdText;
bool m_copyCdText;
- QString m_tempPath;
+ TQString m_tempPath;
int m_writingMode;
class Private;
diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp
index 3df87d3..901f77b 100644
--- a/libk3b/jobs/k3bcdda2wavreader.cpp
+++ b/libk3b/jobs/k3bcdda2wavreader.cpp
@@ -24,8 +24,8 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qvaluevector.h>
-#include <qregexp.h>
+#include <tqvaluevector.h>
+#include <tqregexp.h>
class K3bCdda2wavReader::Private
@@ -48,12 +48,12 @@ public:
int fdToWriteTo;
int currentTrack;
- QValueVector<int> trackOffsets;
+ TQValueVector<int> trackOffsets;
};
-K3bCdda2wavReader::K3bCdda2wavReader( QObject* parent, const char* name )
- : K3bJob( parent, name )
+K3bCdda2wavReader::K3bCdda2wavReader( TQObject* tqparent, const char* name )
+ : K3bJob( tqparent, name )
{
d = new Private();
}
@@ -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.").arg("cdda2wav"), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdda2wav"), ERROR );
jobFinished(false);
d->running = false;
return;
@@ -107,15 +107,15 @@ void K3bCdda2wavReader::start( bool onlyInfo )
d->process->setSplitStdout(true);
d->process->setSuppressEmptyLines(true);
d->process->setWorkingDirectory( m_imagePath );
- connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotProcessLine(const QString&)) );
- connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotProcessLine(const QString&)) );
- connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) );
+ connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) );
// create the command line
*d->process << d->cdda2wavBin->path;
*d->process << "-vall" << ( d->cdda2wavBin->hasFeature( "gui" ) ? "-gui" : "-g" );
if( d->cdda2wavBin->hasFeature( "dev" ) )
- *d->process << QString("dev=%1").arg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin));
+ *d->process << TQString("dev=%1").tqarg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin));
else
*d->process << "-D" << K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin);
*d->process << ( d->cdda2wavBin->hasFeature( "bulk" ) ? "-bulk" : "-B" );
@@ -125,8 +125,8 @@ void K3bCdda2wavReader::start( bool onlyInfo )
*d->process << ( d->cdda2wavBin->hasFeature( "no-infofile" ) ? "-no-infofile" : "-H" );
// additional user parameters from config
- const QStringList& params = d->cdda2wavBin->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = d->cdda2wavBin->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*d->process << *it;
// start the thing
@@ -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.").arg("cdda2wav"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg("cdda2wav"), K3bJob::ERROR );
d->running = false;
jobFinished(false);
}
@@ -152,7 +152,7 @@ void K3bCdda2wavReader::cancel()
}
-void K3bCdda2wavReader::slotProcessLine( const QString& line )
+void K3bCdda2wavReader::slotProcessLine( const TQString& line )
{
// Tracks:11 44:37.30
// CDINDEX discid: ZvzBXv614ACgzn1bWWy107cs0nA-
@@ -179,11 +179,11 @@ void K3bCdda2wavReader::slotProcessLine( const QString& line )
- static QRegExp rx( "T\\d\\d:" );
+ static TQRegExp rx( "T\\d\\d:" );
if( rx.exactMatch( line.left(4) ) || line.startsWith( "Leadout" ) ) {
- int pos = line.find( " " );
- int endpos = line.find( QRegExp( "\\d" ), pos );
- endpos = line.find( " ", endpos );
+ int pos = line.tqfind( " " );
+ int endpos = line.tqfind( TQRegExp( "\\d" ), pos );
+ endpos = line.tqfind( " ", endpos );
bool ok;
int offset = line.mid( pos, endpos-pos ).toInt(&ok);
if( ok )
@@ -198,12 +198,12 @@ void K3bCdda2wavReader::slotProcessLine( const QString& line )
emit nextTrack( d->currentTrack, d->trackOffsets.count() );
}
- else if( line.contains("successfully recorded") ) {
+ else if( line.tqcontains("successfully recorded") ) {
d->currentTrack++;
emit nextTrack( d->currentTrack, d->trackOffsets.count() );
}
- else if( line.contains("%") ) {
+ else if( line.tqcontains("%") ) {
// parse progress
bool ok;
int p = line.left(3).toInt(&ok);
@@ -240,12 +240,12 @@ void K3bCdda2wavReader::slotProcessExited( KProcess* p )
}
else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .arg("Cdda2wav").arg(p->exitStatus()), ERROR );
+ .tqarg("Cdda2wav").tqarg(p->exitStatus()), ERROR );
jobFinished( false );
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").arg("Cdda2wav"),
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Cdda2wav"),
ERROR );
jobFinished( false );
}
diff --git a/libk3b/jobs/k3bcdda2wavreader.h b/libk3b/jobs/k3bcdda2wavreader.h
index edde65c..938e1a5 100644
--- a/libk3b/jobs/k3bcdda2wavreader.h
+++ b/libk3b/jobs/k3bcdda2wavreader.h
@@ -32,9 +32,10 @@ namespace K3bDevice {
class K3bCdda2wavReader : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCdda2wavReader( QObject* parent = 0, const char* name = 0 );
+ K3bCdda2wavReader( TQObject* tqparent = 0, const char* name = 0 );
~K3bCdda2wavReader();
bool active() const;
@@ -45,7 +46,7 @@ class K3bCdda2wavReader : public K3bJob
void cancel();
void setReadDevice( K3bDevice::Device* dev ) { m_device = dev; }
- void setImagePath( const QString& p ) { m_imagePath = p; }
+ void setImagePath( const TQString& p ) { m_imagePath = p; }
/**
* the data gets written directly into fd instead of the imagefile.
@@ -55,13 +56,13 @@ class K3bCdda2wavReader : public K3bJob
void writeToFd( int fd );
private slots:
- void slotProcessLine( const QString& );
+ void slotProcessLine( const TQString& );
void slotProcessExited( KProcess* );
private:
K3bDevice::Device* m_device;
- QString m_imagePath;
+ TQString m_imagePath;
class Private;
Private* d;
diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp
index 9fb61ab..89c1c1f 100644
--- a/libk3b/jobs/k3bclonejob.cpp
+++ b/libk3b/jobs/k3bclonejob.cpp
@@ -27,8 +27,8 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qfile.h>
-#include <qfileinfo.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
@@ -43,8 +43,8 @@ public:
};
-K3bCloneJob::K3bCloneJob( K3bJobHandler* hdl, QObject* parent, const char* name )
- : K3bBurnJob( hdl, parent, name ),
+K3bCloneJob::K3bCloneJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name )
+ : K3bBurnJob( hdl, tqparent, name ),
m_writerDevice(0),
m_readerDevice(0),
m_writerJob(0),
@@ -85,13 +85,13 @@ void K3bCloneJob::start()
//
const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" );
if( !cdrecordBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), ERROR );
jobFinished(false);
m_running = false;
return;
}
else if( !cdrecordBin->hasFeature( "clone" ) ) {
- emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").arg(cdrecordBin->version), ERROR );
+ emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").tqarg(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.")
- .arg(writer()->vendor())
- .arg(writer()->description()), ERROR );
+ .tqarg(writer()->vendor())
+ .tqarg(writer()->description()), ERROR );
m_running = false;
jobFinished(false);
return;
@@ -120,7 +120,7 @@ void K3bCloneJob::start()
if( m_imagePath.isEmpty() ) {
m_imagePath = K3b::findTempFile( "img" );
}
- else if( QFileInfo(m_imagePath).isDir() ) {
+ else if( TQFileInfo(m_imagePath).isDir() ) {
m_imagePath = K3b::findTempFile( "img", m_imagePath );
}
@@ -152,14 +152,14 @@ void K3bCloneJob::prepareReader()
{
if( !m_readcdReader ) {
m_readcdReader = new K3bReadcdReader( this, this );
- connect( m_readcdReader, SIGNAL(percent(int)), this, SLOT(slotReadingPercent(int)) );
- connect( m_readcdReader, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) );
- connect( m_readcdReader, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( m_readcdReader, SIGNAL(finished(bool)), this, SLOT(slotReadingFinished(bool)) );
- connect( m_readcdReader, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_readcdReader, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_readcdReader, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_readcdReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReadingPercent(int)) );
+ connect( m_readcdReader, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) );
+ connect( m_readcdReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
+ connect( m_readcdReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReadingFinished(bool)) );
+ connect( m_readcdReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_readcdReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_readcdReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
m_readcdReader->setReadDevice( readingDevice() );
@@ -175,19 +175,19 @@ void K3bCloneJob::prepareWriter()
{
if( !m_writerJob ) {
m_writerJob = new K3bCdrecordWriter( writer(), this, this );
- connect( m_writerJob, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_writerJob, SIGNAL(percent(int)), this, SLOT(slotWriterPercent(int)) );
- connect( m_writerJob, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) );
- connect( m_writerJob, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) );
- connect( m_writerJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( m_writerJob, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) );
- connect( m_writerJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( m_writerJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( m_writerJob, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) );
- // connect( m_writerJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( m_writerJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) );
+ 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(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)) );
+ // connect( m_writerJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( m_writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
m_writerJob->clearArguments();
@@ -222,7 +222,7 @@ void K3bCloneJob::slotWriterPercent( int p )
void K3bCloneJob::slotWriterNextTrack( int t, int tt )
{
- emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) );
+ emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(tt) );
}
@@ -239,7 +239,7 @@ void K3bCloneJob::slotWriterFinished( bool success )
if( success ) {
d->doneCopies++;
- emit infoMessage( i18n("Successfully written clone copy %1.").arg(d->doneCopies), INFO );
+ emit infoMessage( i18n("Successfully written clone copy %1.").tqarg(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").arg(d->doneCopies+1) );
+ emit newTask( i18n("Writing clone copy %1").tqarg(d->doneCopies+1) );
m_writerJob->start();
}
@@ -340,15 +340,15 @@ void K3bCloneJob::removeImageFiles()
{
if( !m_onlyBurnExistingImage ) {
emit infoMessage( i18n("Removing image files."), INFO );
- if( QFile::exists( m_imagePath ) )
- QFile::remove( m_imagePath );
- if( QFile::exists( m_imagePath + ".toc" ) )
- QFile::remove( m_imagePath + ".toc" );
+ if( TQFile::exists( m_imagePath ) )
+ TQFile::remove( m_imagePath );
+ if( TQFile::exists( m_imagePath + ".toc" ) )
+ TQFile::remove( m_imagePath + ".toc" );
}
}
-QString K3bCloneJob::jobDescription() const
+TQString K3bCloneJob::jobDescription() const
{
if( m_onlyCreateImage )
return i18n("Creating Clone Image");
@@ -365,7 +365,7 @@ QString K3bCloneJob::jobDescription() const
}
-QString K3bCloneJob::jobDetails() const
+TQString K3bCloneJob::jobDetails() const
{
return i18n("Creating 1 clone copy",
"Creating %n clone copies",
diff --git a/libk3b/jobs/k3bclonejob.h b/libk3b/jobs/k3bclonejob.h
index 80c8ea9..e928f3c 100644
--- a/libk3b/jobs/k3bclonejob.h
+++ b/libk3b/jobs/k3bclonejob.h
@@ -18,7 +18,7 @@
#include <k3bjob.h>
#include "k3b_export.h"
-#include <qstring.h>
+#include <tqstring.h>
namespace K3bDevice {
@@ -31,16 +31,17 @@ class K3bReadcdReader;
class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCloneJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bCloneJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bCloneJob();
K3bDevice::Device* writer() const { return m_writerDevice; }
K3bDevice::Device* readingDevice() const { return m_readerDevice; }
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void start();
@@ -48,7 +49,7 @@ class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob
void setWriterDevice( K3bDevice::Device* w ) { m_writerDevice = w; }
void setReaderDevice( K3bDevice::Device* w ) { m_readerDevice = w; }
- void setImagePath( const QString& p ) { m_imagePath = p; }
+ void setImagePath( const TQString& p ) { m_imagePath = p; }
void setNoCorrection( bool b ) { m_noCorrection = b; }
void setRemoveImageFiles( bool b ) { m_removeImageFiles = b; }
void setOnlyCreateImage( bool b ) { m_onlyCreateImage = b; }
@@ -73,7 +74,7 @@ class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob
K3bDevice::Device* m_writerDevice;
K3bDevice::Device* m_readerDevice;
- QString m_imagePath;
+ TQString m_imagePath;
K3bCdrecordWriter* m_writerJob;
K3bReadcdReader* m_readcdReader;
diff --git a/libk3b/jobs/k3bclonetocreader.cpp b/libk3b/jobs/k3bclonetocreader.cpp
index 5dd8b8b..2122937 100644
--- a/libk3b/jobs/k3bclonetocreader.cpp
+++ b/libk3b/jobs/k3bclonetocreader.cpp
@@ -21,8 +21,8 @@
#include <k3bdeviceglobals.h>
#include <k3bglobals.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kdebug.h>
@@ -35,12 +35,12 @@ public:
}
K3b::Msf size;
- QString tocFile;
+ TQString tocFile;
};
-K3bCloneTocReader::K3bCloneTocReader( const QString& filename )
+K3bCloneTocReader::K3bCloneTocReader( const TQString& filename )
: K3bImageFileReader()
{
d = new Private;
@@ -74,8 +74,8 @@ void K3bCloneTocReader::readFile()
d->tocFile = filename() + ".toc";
// now get rid of the ".toc" extension
- QString imageFileName = d->tocFile.left( d->tocFile.length()-4 );
- if( !QFile::exists( imageFileName ) ) {
+ TQString imageFileName = d->tocFile.left( d->tocFile.length()-4 );
+ if( !TQFile::exists( imageFileName ) ) {
kdDebug() << "(K3bCloneTocReader) could not find image file " << imageFileName << endl;
return;
}
@@ -84,7 +84,7 @@ void K3bCloneTocReader::readFile()
d->size = 0;
- QFile f( d->tocFile );
+ TQFile f( d->tocFile );
if( f.open( IO_ReadOnly ) ) {
//
// Inspired by clone.c from the cdrecord sources
diff --git a/libk3b/jobs/k3bclonetocreader.h b/libk3b/jobs/k3bclonetocreader.h
index 17e80d7..6336050 100644
--- a/libk3b/jobs/k3bclonetocreader.h
+++ b/libk3b/jobs/k3bclonetocreader.h
@@ -30,7 +30,7 @@
class LIBK3B_EXPORT K3bCloneTocReader : public K3bImageFileReader
{
public:
- K3bCloneTocReader( const QString& filename = QString::null );
+ K3bCloneTocReader( const TQString& filename = TQString() );
~K3bCloneTocReader();
const K3b::Msf& imageSize() const;
diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp
index 8300ada..85a14cd 100644
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@ -25,7 +25,7 @@
#include <klocale.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <unistd.h>
@@ -57,7 +57,7 @@ public:
K3b::Msf m_lastSector;
K3b::Msf m_nextReadSector;
int m_fd;
- QString m_imagePath;
+ TQString m_imagePath;
int m_sectorSize;
bool m_useLibdvdcss;
K3bLibDvdCss* m_libcss;
@@ -71,8 +71,8 @@ private:
};
-K3bDataTrackReader::K3bDataTrackReader( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bThreadJob( jh, parent, name )
+K3bDataTrackReader::K3bDataTrackReader( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bThreadJob( jh, tqparent, name )
{
m_thread = new WorkThread();
setThread( m_thread );
@@ -109,7 +109,7 @@ void K3bDataTrackReader::WorkThread::run()
emitStarted();
if( !m_device->open() ) {
- emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open device %1").tqarg(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").arg(m_device->blockDeviceName()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -183,23 +183,23 @@ void K3bDataTrackReader::WorkThread::run()
}
}
- emitInfoMessage( i18n("Reading with sector size %1.").arg(m_usedSectorSize), K3bJob::INFO );
+ emitInfoMessage( i18n("Reading with sector size %1.").tqarg(m_usedSectorSize), K3bJob::INFO );
emitDebuggingOutput( "K3bDataTrackReader",
- QString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.")
- .arg( m_firstSector.lba() )
- .arg( m_lastSector.lba() )
- .arg( m_usedSectorSize )
- .arg( m_lastSector.lba() - m_firstSector.lba() + 1 )
- .arg( Q_UINT64(m_usedSectorSize) * (Q_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) );
-
- QFile file;
+ 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) ) );
+
+ TQFile file;
if( m_fd == -1 ) {
file.setName( m_imagePath );
if( !file.open( IO_WriteOnly ) ) {
m_device->close();
if( m_useLibdvdcss )
m_libcss->close();
- emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(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.").arg(m_firstSector.lba()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while reading sector %1.").tqarg(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", QString("using buffer size of %1 blocks.").arg( s_bufferSizeSectors ) );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").tqarg( s_bufferSizeSectors ) );
// 2. get it on
K3b::Msf currentSector = m_firstSector;
@@ -253,7 +253,7 @@ void K3bDataTrackReader::WorkThread::run()
int bufferLen = s_bufferSizeSectors*m_usedSectorSize;
while( !m_canceled && currentSector <= m_lastSector ) {
- int maxReadSectors = QMIN( bufferLen/m_usedSectorSize, m_lastSector.lba()-currentSector.lba()+1 );
+ int maxReadSectors = TQMIN( bufferLen/m_usedSectorSize, m_lastSector.lba()-currentSector.lba()+1 );
int readSectors = read( buffer,
currentSector.lba(),
@@ -278,8 +278,8 @@ void K3bDataTrackReader::WorkThread::run()
kdDebug() << "(K3bDataTrackReader::WorkThread) error while writing to fd " << m_fd
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader",
- QString("Error while writing to fd %1. Current sector is %2.")
- .arg(m_fd).arg(currentSector.lba()-m_firstSector.lba()) );
+ TQString("Error while writing to fd %1. Current sector is %2.")
+ .tqarg(m_fd).tqarg(currentSector.lba()-m_firstSector.lba()) );
writeError = true;
break;
}
@@ -289,8 +289,8 @@ void K3bDataTrackReader::WorkThread::run()
kdDebug() << "(K3bDataTrackReader::WorkThread) error while writing to file " << m_imagePath
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader",
- QString("Error while writing to file %1. Current sector is %2.")
- .arg(m_imagePath).arg(currentSector.lba()-m_firstSector.lba()) );
+ TQString("Error while writing to file %1. Current sector is %2.")
+ .tqarg(m_imagePath).tqarg(currentSector.lba()-m_firstSector.lba()) );
writeError = true;
break;
}
@@ -330,9 +330,9 @@ void K3bDataTrackReader::WorkThread::run()
delete [] buffer;
emitDebuggingOutput( "K3bDataTrackReader",
- QString("Read a total of %1 sectors (%2 bytes)")
- .arg(totalReadSectors.lba())
- .arg((Q_UINT64)totalReadSectors.lba()*(Q_UINT64)m_usedSectorSize) );
+ TQString("Read a total of %1 sectors (%2 bytes)")
+ .tqarg(totalReadSectors.lba())
+ .tqarg((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", QString( "Problem while reading. Retrying from sector %1.").arg(startSector) );
- emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").arg(startSector), K3bJob::WARNING );
+ 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 );
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.").arg(sector), K3bJob::ERROR );
- emitDebuggingOutput( "K3bDataTrackReader", QString( "Ignoring read error in sector %1.").arg(sector) );
+ emitInfoMessage( i18n("Ignoring read error in sector %1.").tqarg(sector), K3bJob::ERROR );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").tqarg(sector) );
++m_errorSectorCount;
// ::memset( &buffer[i], 0, 1 );
success = true;
}
else {
- emitInfoMessage( i18n("Error while reading sector %1.").arg(sector), K3bJob::ERROR );
- emitDebuggingOutput( "K3bDataTrackReader", QString( "Read error in sector %1.").arg(sector) );
+ emitInfoMessage( i18n("Error while reading sector %1.").tqarg(sector), K3bJob::ERROR );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").tqarg(sector) );
break;
}
}
@@ -502,7 +502,7 @@ void K3bDataTrackReader::writeToFd( int fd )
}
-void K3bDataTrackReader::setImagePath( const QString& p )
+void K3bDataTrackReader::setImagePath( const TQString& p )
{
m_thread->m_imagePath = p;
m_thread->m_fd = -1;
diff --git a/libk3b/jobs/k3bdatatrackreader.h b/libk3b/jobs/k3bdatatrackreader.h
index 814c01c..0782079 100644
--- a/libk3b/jobs/k3bdatatrackreader.h
+++ b/libk3b/jobs/k3bdatatrackreader.h
@@ -41,7 +41,7 @@ namespace K3bDevice {
class K3bDataTrackReader : public K3bThreadJob
{
public:
- K3bDataTrackReader( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bDataTrackReader( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bDataTrackReader();
enum SectorSize {
@@ -77,7 +77,7 @@ class K3bDataTrackReader : public K3bThreadJob
*/
void writeToFd( int fd );
- void setImagePath( const QString& p );
+ void setImagePath( const TQString& p );
private:
class WorkThread;
diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp
index 96d727c..d00cc1d 100644
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
@@ -36,9 +36,9 @@
#include <klocale.h>
#include <kio/global.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qapplication.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqapplication.h>
class K3bDvdCopyJob::Private
@@ -83,8 +83,8 @@ public:
};
-K3bDvdCopyJob::K3bDvdCopyJob( K3bJobHandler* hdl, QObject* parent, const char* name )
- : K3bBurnJob( hdl, parent, name ),
+K3bDvdCopyJob::K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name )
+ : K3bBurnJob( hdl, tqparent, name ),
m_writerDevice(0),
m_readerDevice(0),
m_onTheFly(false),
@@ -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.")
- .arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR );
+ .tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR );
emit infoMessage( i18n("Disabling on-the-fly writing."), INFO );
}
@@ -141,9 +141,9 @@ void K3bDvdCopyJob::start()
emit newSubTask( i18n("Checking source medium") );
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, m_readerDevice ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
}
@@ -293,19 +293,19 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
//
// Check the image path
//
- QFileInfo fi( m_imagePath );
+ TQFileInfo fi( m_imagePath );
if( !fi.isFile() ||
- questionYesNo( i18n("Do you want to overwrite %1?").arg(m_imagePath),
+ questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_imagePath),
i18n("File Exists") ) ) {
if( fi.isDir() )
m_imagePath = K3b::findTempFile( "iso", m_imagePath );
- else if( !QFileInfo( m_imagePath.section( '/', 0, -2 ) ).isDir() ) {
+ else if( !TQFileInfo( m_imagePath.section( '/', 0, -2 ) ).isDir() ) {
emit infoMessage( i18n("Specified an unusable temporary path. Using default."), WARNING );
m_imagePath = K3b::findTempFile( "iso" );
}
// else the user specified a file in an existing dir
- emit infoMessage( i18n("Writing image file to %1.").arg(m_imagePath), INFO );
+ emit infoMessage( i18n("Writing image file to %1.").tqarg(m_imagePath), INFO );
emit newSubTask( i18n("Reading source medium.") );
}
@@ -314,9 +314,9 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
//
KIO::filesize_t imageSpaceNeeded = (KIO::filesize_t)(d->lastSector.lba()+1)*2048;
unsigned long avail, size;
- QString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
+ TQString pathToTest = m_imagePath.left( m_imagePath.tqfindRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
+ emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(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.").arg(m_imagePath), ERROR );
+ emit infoMessage( i18n("Unable to open '%1' for writing.").tqarg(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").arg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
else
emit newTask( i18n("Writing DVD copy") );
@@ -399,13 +399,13 @@ void K3bDvdCopyJob::prepareReader()
{
if( !d->dataTrackReader ) {
d->dataTrackReader = new K3bDataTrackReader( this );
- connect( d->dataTrackReader, SIGNAL(percent(int)), this, SLOT(slotReaderProgress(int)) );
- connect( d->dataTrackReader, SIGNAL(processedSize(int, int)), this, SLOT(slotReaderProcessedSize(int, int)) );
- connect( d->dataTrackReader, SIGNAL(finished(bool)), this, SLOT(slotReaderFinished(bool)) );
- connect( d->dataTrackReader, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( d->dataTrackReader, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( d->dataTrackReader, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReaderFinished(bool)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
d->dataTrackReader->setDevice( m_readerDevice );
@@ -430,18 +430,18 @@ void K3bDvdCopyJob::prepareWriter()
d->writerJob = new K3bGrowisofsWriter( m_writerDevice, this );
- connect( d->writerJob, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( d->writerJob, SIGNAL(percent(int)), this, SLOT(slotWriterProgress(int)) );
- connect( d->writerJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) );
- connect( d->writerJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( d->writerJob, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) );
- connect( d->writerJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( d->writerJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( d->writerJob, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) );
- // connect( d->writerJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( d->writerJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( d->writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( d->writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ 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(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)) );
+ // connect( d->writerJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( d->writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
// these do only make sense with DVD-R(W)
d->writerJob->setSimulate( m_simulate );
@@ -462,7 +462,7 @@ void K3bDvdCopyJob::prepareWriter()
d->writerJob->setTrackSize( d->lastSector.lba()+1 );
}
- d->writerJob->setImageToWrite( QString::null ); // write to stdin
+ d->writerJob->setImageToWrite( TQString() ); // write to stdin
}
@@ -548,7 +548,7 @@ void K3bDvdCopyJob::slotReaderFinished( bool success )
if( waitForDvd() ) {
prepareWriter();
if( m_copies > 1 )
- emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
else
emit newTask( i18n("Writing DVD copy") );
@@ -597,30 +597,30 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
}
if( success ) {
- emit infoMessage( i18n("Successfully written DVD copy %1.").arg(d->doneCopies+1), INFO );
+ emit infoMessage( i18n("Successfully written DVD copy %1.").tqarg(d->doneCopies+1), INFO );
if( d->verifyData && !m_simulate ) {
if( !d->verificationJob ) {
d->verificationJob = new K3bVerificationJob( this, this );
- connect( d->verificationJob, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
- connect( d->verificationJob, SIGNAL(newTask(const QString&)),
- this, SIGNAL(newSubTask(const QString&)) );
- connect( d->verificationJob, SIGNAL(percent(int)),
- this, SLOT(slotVerificationProgress(int)) );
- connect( d->verificationJob, SIGNAL(percent(int)),
- this, SIGNAL(subPercent(int)) );
- connect( d->verificationJob, SIGNAL(finished(bool)),
- this, SLOT(slotVerificationFinished(bool)) );
- connect( d->verificationJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( d->verificationJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->verificationJob, TQT_SIGNAL(newTask(const TQString&)),
+ this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->verificationJob, TQT_SIGNAL(percent(int)),
+ this, TQT_SLOT(slotVerificationProgress(int)) );
+ connect( d->verificationJob, TQT_SIGNAL(percent(int)),
+ this, TQT_SIGNAL(subPercent(int)) );
+ connect( d->verificationJob, TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(slotVerificationFinished(bool)) );
+ connect( d->verificationJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
d->verificationJob->setDevice( m_writerDevice );
d->verificationJob->addTrack( 1, d->inPipe.checksum(), d->lastSector+1 );
if( m_copies > 1 )
- emit newTask( i18n("Verifying DVD copy %1").arg(d->doneCopies+1) );
+ emit newTask( i18n("Verifying DVD copy %1").tqarg(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").arg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").tqarg(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").arg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").tqarg(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.")
- .arg(m_writerDevice->vendor())
- .arg(m_writerDevice->description()),
+ .tqarg(m_writerDevice->vendor())
+ .tqarg(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.").arg( K3bDevice::mediaTypeString(m, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO );
d->usedWritingMode = K3b::DAO;
}
else {
- emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO );
d->usedWritingMode = K3b::WRITING_MODE_INCR_SEQ;
}
}
@@ -857,14 +857,14 @@ bool K3bDvdCopyJob::waitForDvd()
void K3bDvdCopyJob::removeImageFiles()
{
- if( QFile::exists( m_imagePath ) ) {
+ if( TQFile::exists( m_imagePath ) ) {
d->imageFile.remove();
- emit infoMessage( i18n("Removed image file %1").arg(m_imagePath), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Removed image file %1").tqarg(m_imagePath), K3bJob::SUCCESS );
}
}
-QString K3bDvdCopyJob::jobDescription() const
+TQString K3bDvdCopyJob::jobDescription() const
{
if( m_onlyCreateImage ) {
return i18n("Creating DVD Image");
@@ -878,7 +878,7 @@ QString K3bDvdCopyJob::jobDescription() const
}
-QString K3bDvdCopyJob::jobDetails() const
+TQString K3bDvdCopyJob::jobDetails() const
{
return i18n("Creating 1 copy",
"Creating %n copies",
diff --git a/libk3b/jobs/k3bdvdcopyjob.h b/libk3b/jobs/k3bdvdcopyjob.h
index 91da4e9..eb2e51c 100644
--- a/libk3b/jobs/k3bdvdcopyjob.h
+++ b/libk3b/jobs/k3bdvdcopyjob.h
@@ -18,7 +18,7 @@
#include <k3bjob.h>
#include "k3b_export.h"
-#include <qstring.h>
+#include <tqstring.h>
namespace K3bDevice {
@@ -30,16 +30,17 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDvdCopyJob( K3bJobHandler* hdl, QObject* parent = 0, const char* name = 0 );
+ K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 );
~K3bDvdCopyJob();
K3bDevice::Device* writer() const { return m_onlyCreateImage ? 0 : m_writerDevice; }
K3bDevice::Device* readingDevice() const { return m_readerDevice; }
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void start();
@@ -47,7 +48,7 @@ class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob
void setWriterDevice( K3bDevice::Device* w ) { m_writerDevice = w; }
void setReaderDevice( K3bDevice::Device* w ) { m_readerDevice = w; }
- void setImagePath( const QString& p ) { m_imagePath = p; }
+ void setImagePath( const TQString& p ) { m_imagePath = p; }
void setRemoveImageFiles( bool b ) { m_removeImageFiles = b; }
void setOnlyCreateImage( bool b ) { m_onlyCreateImage = b; }
void setSimulate( bool b ) { m_simulate = b; }
@@ -77,7 +78,7 @@ class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob
K3bDevice::Device* m_writerDevice;
K3bDevice::Device* m_readerDevice;
- QString m_imagePath;
+ TQString m_imagePath;
bool m_onTheFly;
bool m_removeImageFiles;
diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp
index 732e404..62ea78e 100644
--- a/libk3b/jobs/k3bdvdformattingjob.cpp
+++ b/libk3b/jobs/k3bdvdformattingjob.cpp
@@ -29,8 +29,8 @@
#include <klocale.h>
#include <kdebug.h>
-#include <qvaluelist.h>
-#include <qregexp.h>
+#include <tqvaluelist.h>
+#include <tqregexp.h>
#include <errno.h>
#include <string.h>
@@ -71,8 +71,8 @@ public:
};
-K3bDvdFormattingJob::K3bDvdFormattingJob( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bBurnJob( jh, parent, name )
+K3bDvdFormattingJob::K3bDvdFormattingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bBurnJob( jh, tqparent, name )
{
d = new Private;
}
@@ -97,18 +97,18 @@ void K3bDvdFormattingJob::setForceNoEject( bool b )
}
-QString K3bDvdFormattingJob::jobDescription() const
+TQString K3bDvdFormattingJob::jobDescription() const
{
return i18n("Formatting DVD"); // Formatting DVD±RW
}
-QString K3bDvdFormattingJob::jobDetails() const
+TQString K3bDvdFormattingJob::jobDetails() const
{
if( d->quick )
return i18n("Quick Format");
else
- return QString::null;
+ return TQString();
}
@@ -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<p><b>%1 %2 (%3)</b>.")
- .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) {
+ .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) {
emit canceled();
d->running = false;
jobFinished(false);
@@ -153,9 +153,9 @@ void K3bDvdFormattingJob::start()
emit newTask( i18n("Checking media") );
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->device ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) );
}
@@ -207,7 +207,7 @@ void K3bDvdFormattingJob::setForce( bool b )
}
-void K3bDvdFormattingJob::slotStderrLine( const QString& line )
+void K3bDvdFormattingJob::slotStderrLine( const TQString& line )
{
// * DVDRW format utility by <appro@fy.chalmers.se>, version 4.4.
// * 4.7GB DVD-RW media in Sequential mode detected.
@@ -218,15 +218,15 @@ void K3bDvdFormattingJob::slotStderrLine( const QString& line )
emit debuggingOutput( "dvd+rw-format", line );
// parsing for the -gui mode (since dvd+rw-format 4.6)
- int pos = line.find( "blanking" );
+ int pos = line.tqfind( "blanking" );
if( pos < 0 )
- pos = line.find( "formatting" );
+ pos = line.tqfind( "formatting" );
if( pos >= 0 ) {
- pos = line.find( QRegExp( "\\d" ), pos );
+ pos = line.tqfind( TQRegExp( "\\d" ), pos );
}
// parsing for \b\b... stuff
else if( !line.startsWith("*") ) {
- pos = line.find( QRegExp( "\\d" ) );
+ pos = line.tqfind( TQRegExp( "\\d" ) );
}
else if( line.startsWith( ":-(" ) ) {
if( line.startsWith( ":-( unable to proceed with format" ) ) {
@@ -235,7 +235,7 @@ void K3bDvdFormattingJob::slotStderrLine( const QString& line )
}
if( pos >= 0 ) {
- int endPos = line.find( QRegExp("[^\\d\\.]"), pos ) - 1;
+ int endPos = line.tqfind( TQRegExp("[^\\d\\.]"), pos ) - 1;
bool ok;
int progress = (int)(line.mid( pos, endPos - pos ).toDouble(&ok));
if( ok ) {
@@ -267,7 +267,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
d->success = true;
}
else {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdFormatBin->name()).arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdFormatBin->name()).tqarg(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.").arg(d->dvdFormatBin->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdFormatBin->name()),
ERROR );
d->success = false;
}
@@ -288,9 +288,9 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
else {
emit infoMessage( i18n("Ejecting DVD..."), INFO );
connect( K3bDevice::eject( d->device ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) );
}
}
@@ -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.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)),
+ emit infoMessage( i18n("Found %1 media.").tqarg(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.")
- .arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO );
+ .tqarg(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.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)),
+ emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)),
INFO );
if( diskInfo.currentProfile() != K3bDevice::MEDIA_UNKNOWN ) {
- emit infoMessage( i18n("Formatted in %1 mode.").arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
+ emit infoMessage( i18n("Formatted in %1 mode.").tqarg(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.")
- .arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
+ .tqarg(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.").arg(K3bDevice::mediaTypeString( blank ?
+ " DVD-RW in %1 mode.").tqarg(K3bDevice::mediaTypeString( blank ?
K3bDevice::MEDIA_DVD_RW_SEQ :
K3bDevice::MEDIA_DVD_RW_OVWR )) );
}
@@ -467,19 +467,19 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
d->process = new K3bProcess();
d->process->setRunPrivileged(true);
// d->process->setSuppressEmptyLines(false);
- connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStderrLine(const QString&)) );
- connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessFinished(KProcess*)) );
+ connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStderrLine(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessFinished(KProcess*)) );
d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" );
if( !d->dvdFormatBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-format"), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("dvd+rw-format"), ERROR );
d->running = false;
jobFinished(false);
return;
}
if( !d->dvdFormatBin->copyright.isEmpty() )
- emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(d->dvdFormatBin->name()).arg(d->dvdFormatBin->version).arg(d->dvdFormatBin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(d->dvdFormatBin->name()).tqarg(d->dvdFormatBin->version).tqarg(d->dvdFormatBin->copyright), INFO );
*d->process << d->dvdFormatBin;
@@ -487,7 +487,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
if( d->dvdFormatBin->version >= K3bVersion( 4, 6 ) )
*d->process << "-gui";
- QString p;
+ TQString p;
if( blank )
p = "-blank";
else
@@ -500,14 +500,14 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
*d->process << d->device->blockDeviceName();
// additional user parameters from config
- const QStringList& params = d->dvdFormatBin->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = d->dvdFormatBin->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*d->process << *it;
kdDebug() << "***** dvd+rw-format parameters:\n";
- const QValueList<QCString>& args = d->process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = d->process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << endl << flush;
@@ -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.").arg(d->dvdFormatBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdFormatBin->name()), K3bJob::ERROR );
d->running = false;
jobFinished(false);
}
diff --git a/libk3b/jobs/k3bdvdformattingjob.h b/libk3b/jobs/k3bdvdformattingjob.h
index 10672cb..cf8b7eb 100644
--- a/libk3b/jobs/k3bdvdformattingjob.h
+++ b/libk3b/jobs/k3bdvdformattingjob.h
@@ -30,13 +30,14 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDvdFormattingJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bDvdFormattingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bDvdFormattingJob();
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
K3bDevice::Device* writer() const;
@@ -75,7 +76,7 @@ class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob
void setForceNoEject( bool );
private slots:
- void slotStderrLine( const QString& );
+ void slotStderrLine( const TQString& );
void slotProcessFinished( KProcess* );
void slotDeviceHandlerFinished( K3bDevice::DeviceHandler* );
void slotEjectingFinished( K3bDevice::DeviceHandler* );
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp
index 1fb3871..cf63da4 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.cpp
+++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp
@@ -36,10 +36,10 @@
#include <ktempfile.h>
#include <kio/global.h>
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qapplication.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
+#include <tqfile.h>
+#include <tqapplication.h>
class K3bIso9660ImageWritingJob::Private
@@ -85,8 +85,8 @@ void K3bIso9660ImageWritingJob::start()
emit newTask( i18n("Preparing data") );
- if( !QFile::exists( m_imagePath ) ) {
- emit infoMessage( i18n("Could not find image %1").arg(m_imagePath), K3bJob::ERROR );
+ if( !TQFile::exists( m_imagePath ) ) {
+ emit infoMessage( i18n("Could not find image %1").tqarg(m_imagePath), K3bJob::ERROR );
jobFinished( false );
return;
}
@@ -121,10 +121,10 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success )
if( !m_verifyJob ) {
m_verifyJob = new K3bVerificationJob( this );
connectSubJob( m_verifyJob,
- SLOT(slotVerificationFinished(bool)),
+ TQT_SLOT(slotVerificationFinished(bool)),
true,
- SLOT(slotVerificationProgress(int)),
- SIGNAL(subPercent(int)) );
+ TQT_SLOT(slotVerificationProgress(int)),
+ TQT_SIGNAL(subPercent(int)) );
}
m_verifyJob->setDevice( m_device );
m_verifyJob->clear();
@@ -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").arg(m_currentCopy).arg(m_copies) );
+ emit newTask( i18n("Verifying written copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) );
m_verifyJob->start();
}
@@ -164,8 +164,8 @@ void K3bIso9660ImageWritingJob::slotVerificationFinished( bool success )
if( success && m_currentCopy < m_copies ) {
m_currentCopy++;
- connect( K3bDevice::eject( m_device ), SIGNAL(finished(bool)),
- this, SLOT(startWriting()) );
+ connect( K3bDevice::eject( m_device ), TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(startWriting()) );
return;
}
@@ -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").arg(m_currentCopy).arg(m_copies) );
+ emit newSubTask( i18n("Writing copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) );
}
@@ -350,7 +350,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
writer->addArgument("-data");
// read from stdin
- writer->addArgument( QString("-tsize=%1s").arg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" );
+ writer->addArgument( TQString("-tsize=%1s").tqarg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" );
m_writer = writer;
}
@@ -365,10 +365,10 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
// now write the tocfile
delete m_tocFile;
- m_tocFile = new KTempFile( QString::null, "toc" );
+ m_tocFile = new KTempFile( TQString(), "toc" );
m_tocFile->setAutoDelete(true);
- if( QTextStream* s = m_tocFile->textStream() ) {
+ if( TQTextStream* s = m_tocFile->textStream() ) {
if( (m_dataMode == K3b::DATA_MODE_AUTO && m_noFix) ||
m_dataMode == K3b::MODE2 ) {
*s << "CD_ROM_XA" << "\n";
@@ -380,7 +380,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
*s << "\n";
*s << "TRACK MODE1" << "\n";
}
- *s << "DATAFILE \"-\" " << QString::number( K3b::imageFilesize( m_imagePath ) ) << "\n";
+ *s << "DATAFILE \"-\" " << TQString::number( K3b::imageFilesize( m_imagePath ) ) << "\n";
m_tocFile->close();
}
@@ -413,31 +413,31 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
writer->setSimulate( m_simulate );
writer->setBurnSpeed( m_speed );
writer->setWritingMode( m_writingMode == K3b::DAO ? K3b::DAO : 0 );
- writer->setImageToWrite( QString::null ); // read from stdin
+ writer->setImageToWrite( TQString() ); // read from stdin
writer->setCloseDvd( !m_noFix );
writer->setTrackSize( K3b::imageFilesize( m_imagePath )/2048 );
m_writer = writer;
}
- connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotNextTrack(int, int)) );
- connect( m_writer, SIGNAL(percent(int)), this, SLOT(slotWriterPercent(int)) );
- connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) );
- connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) );
- connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( m_writer, SIGNAL(finished(bool)), this, SLOT(slotWriterJobFinished(bool)) );
- connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ 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(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)) );
+ connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
return true;
}
-QString K3bIso9660ImageWritingJob::jobDescription() const
+TQString K3bIso9660ImageWritingJob::jobDescription() const
{
if( m_simulate )
return i18n("Simulating ISO9660 Image");
@@ -445,13 +445,13 @@ QString K3bIso9660ImageWritingJob::jobDescription() const
return ( i18n("Burning ISO9660 Image")
+ ( m_copies > 1
? i18n(" - %n Copy", " - %n Copies", m_copies)
- : QString::null ) );
+ : TQString() ) );
}
-QString K3bIso9660ImageWritingJob::jobDetails() const
+TQString K3bIso9660ImageWritingJob::jobDetails() const
{
- return m_imagePath.section("/", -1) + QString( " (%1)" ).arg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
+ return m_imagePath.section("/", -1) + TQString( " (%1)" ).tqarg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
}
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.h b/libk3b/jobs/k3biso9660imagewritingjob.h
index eceb6dc..e8a133b 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.h
+++ b/libk3b/jobs/k3biso9660imagewritingjob.h
@@ -19,7 +19,7 @@
#include <k3bjob.h>
#include "k3b_export.h"
-class QString;
+class TQString;
class K3bAbstractWriter;
class KTempFile;
namespace K3bDevice {
@@ -34,6 +34,7 @@ class K3bVerificationJob;
class LIBK3B_EXPORT K3bIso9660ImageWritingJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
K3bIso9660ImageWritingJob( K3bJobHandler* );
@@ -41,14 +42,14 @@ class LIBK3B_EXPORT K3bIso9660ImageWritingJob : public K3bBurnJob
K3bDevice::Device* writer() const { return m_device; };
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void cancel();
void start();
- void setImagePath( const QString& path ) { m_imagePath = path; }
+ void setImagePath( const TQString& path ) { m_imagePath = path; }
void setSpeed( int s ) { m_speed = s; }
void setBurnDevice( K3bDevice::Device* dev ) { m_device = dev; }
void setWritingMode( int mode ) { m_writingMode = mode; }
@@ -78,7 +79,7 @@ class LIBK3B_EXPORT K3bIso9660ImageWritingJob : public K3bBurnJob
bool m_verifyData;
bool m_dvd;
- QString m_imagePath;
+ TQString m_imagePath;
K3bAbstractWriter* m_writer;
KTempFile* m_tocFile;
diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp
index d75eb63..ae6df10 100644
--- a/libk3b/jobs/k3breadcdreader.cpp
+++ b/libk3b/jobs/k3breadcdreader.cpp
@@ -28,9 +28,9 @@
#include <klocale.h>
#include <kconfig.h>
-#include <qregexp.h>
-#include <qvaluelist.h>
-#include <qstringlist.h>
+#include <tqregexp.h>
+#include <tqvaluelist.h>
+#include <tqstringlist.h>
@@ -60,8 +60,8 @@ public:
-K3bReadcdReader::K3bReadcdReader( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bJob( jh, parent, name ),
+K3bReadcdReader::K3bReadcdReader( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bJob( jh, tqparent, name ),
m_noCorr(false),
m_clone(false),
m_noError(false),
@@ -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.").arg("readcd"), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("readcd"), ERROR );
jobFinished(false);
return;
}
@@ -116,11 +116,11 @@ void K3bReadcdReader::start()
if( !d->readcdBinObject->hasFeature( "clone" ) ) {
// search all readcd installations
K3bExternalProgram* readcdProgram = k3bcore->externalBinManager()->program( "readcd" );
- const QPtrList<K3bExternalBin>& readcdBins = readcdProgram->bins();
- for( QPtrListIterator<K3bExternalBin> it( readcdBins ); it.current(); ++it ) {
+ const TQPtrList<K3bExternalBin>& readcdBins = readcdProgram->bins();
+ for( TQPtrListIterator<K3bExternalBin> 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.").arg(d->readcdBinObject->version), INFO );
+ emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").tqarg(d->readcdBinObject->version), INFO );
foundCloneSupport = true;
break;
}
@@ -138,8 +138,8 @@ void K3bReadcdReader::start()
// create the commandline
delete d->process;
d->process = new K3bProcess();
- connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
- connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) );
+ connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) );
*d->process << d->readcdBinObject;
@@ -148,10 +148,10 @@ void K3bReadcdReader::start()
*d->process << "-v";
// Again we assume the device to be set!
- *d->process << QString("dev=%1").arg(K3b::externalBinDeviceParameter(m_readDevice,
+ *d->process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(m_readDevice,
d->readcdBinObject));
if( m_speed > 0 )
- *d->process << QString("speed=%1").arg(m_speed);
+ *d->process << TQString("speed=%1").tqarg(m_speed);
// output
@@ -160,8 +160,8 @@ void K3bReadcdReader::start()
d->process->dupStdout( d->fdToWriteTo );
}
else {
- emit newTask( i18n("Writing image to %1.").arg(m_imagePath) );
- emit infoMessage( i18n("Writing image to %1.").arg(m_imagePath), INFO );
+ emit newTask( i18n("Writing image to %1.").tqarg(m_imagePath) );
+ emit infoMessage( i18n("Writing image to %1.").tqarg(m_imagePath), INFO );
*d->process << "f=" + m_imagePath;
}
@@ -177,25 +177,25 @@ void K3bReadcdReader::start()
if( m_c2Scan )
*d->process << "-c2scan";
- *d->process << QString("retries=%1").arg(m_retries);
+ *d->process << TQString("retries=%1").tqarg(m_retries);
// readcd does not read the last sector specified
if( d->firstSector < d->lastSector )
- *d->process << QString("sectors=%1-%2").arg(d->firstSector.lba()).arg(d->lastSector.lba()+1);
+ *d->process << TQString("sectors=%1-%2").tqarg(d->firstSector.lba()).tqarg(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";
// additional user parameters from config
- const QStringList& params = d->readcdBinObject->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = d->readcdBinObject->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*d->process << *it;
kdDebug() << "***** readcd parameters:\n";
- const QValueList<QCString>& args = d->process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = d->process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << endl << flush;
@@ -225,7 +225,7 @@ void K3bReadcdReader::cancel()
}
-void K3bReadcdReader::slotStdLine( const QString& line )
+void K3bReadcdReader::slotStdLine( const TQString& line )
{
emit debuggingOutput( "readcd", line );
@@ -243,7 +243,7 @@ void K3bReadcdReader::slotStdLine( const QString& line )
else if( line.startsWith( "addr:" ) ) {
bool ok;
- long currentReadBlock = line.mid( 6, line.find("cnt")-7 ).toInt(&ok);
+ long currentReadBlock = line.mid( 6, line.tqfind("cnt")-7 ).toInt(&ok);
if( d->firstSector < d->lastSector )
currentReadBlock -= d->firstSector.lba();
if( ok ) {
@@ -260,41 +260,41 @@ void K3bReadcdReader::slotStdLine( const QString& line )
}
else
kdError() << "(K3bReadcdReader) currentReadBlock parsing error in line: "
- << line.mid( 6, line.find("cnt")-7 ) << endl;
+ << line.mid( 6, line.tqfind("cnt")-7 ) << endl;
}
- else if( line.contains("Cannot read source disk") ) {
+ else if( line.tqcontains("Cannot read source disk") ) {
emit infoMessage( i18n("Cannot read source disk."), ERROR );
}
- else if( (pos = line.find("Retrying from sector")) >= 0 ) {
+ else if( (pos = line.tqfind("Retrying from sector")) >= 0 ) {
// parse the sector
pos += 21;
bool ok;
- int problemSector = line.mid( pos, line.find( QRegExp("\\D"), pos )-pos ).toInt(&ok);
+ int problemSector = line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ).toInt(&ok);
if( !ok ) {
kdError() << "(K3bReadcdReader) problemSector parsing error in line: "
- << line.mid( pos, line.find( QRegExp("\\D"), pos )-pos ) << endl;
+ << line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ) << endl;
}
- emit infoMessage( i18n("Retrying from sector %1.").arg(problemSector), INFO );
+ emit infoMessage( i18n("Retrying from sector %1.").tqarg(problemSector), INFO );
}
- else if( (pos = line.find("Error on sector")) >= 0 ) {
+ else if( (pos = line.tqfind("Error on sector")) >= 0 ) {
d->unreadableBlocks++;
pos += 16;
bool ok;
- int problemSector = line.mid( pos, line.find( QRegExp("\\D"), pos )-pos ).toInt(&ok);
+ int problemSector = line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ).toInt(&ok);
if( !ok ) {
kdError() << "(K3bReadcdReader) problemSector parsing error in line: "
- << line.mid( pos, line.find( QRegExp("\\D"), pos )-pos ) << endl;
+ << line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ) << endl;
}
- if( line.contains( "not corrected") ) {
- emit infoMessage( i18n("Uncorrected error in sector %1").arg(problemSector), ERROR );
+ if( line.tqcontains( "not corrected") ) {
+ emit infoMessage( i18n("Uncorrected error in sector %1").tqarg(problemSector), ERROR );
}
else {
- emit infoMessage( i18n("Corrected error in sector %1").arg(problemSector), ERROR );
+ emit infoMessage( i18n("Corrected error in sector %1").tqarg(problemSector), ERROR );
}
}
@@ -314,7 +314,7 @@ void K3bReadcdReader::slotProcessExited( KProcess* p )
jobFinished( true );
}
else {
- emit infoMessage( i18n("%1 returned error: %2").arg("Readcd").arg(p->exitStatus()), ERROR );
+ emit infoMessage( i18n("%1 returned error: %2").tqarg("Readcd").tqarg(p->exitStatus()), ERROR );
jobFinished( false );
}
}
diff --git a/libk3b/jobs/k3breadcdreader.h b/libk3b/jobs/k3breadcdreader.h
index 93ebce0..de6f225 100644
--- a/libk3b/jobs/k3breadcdreader.h
+++ b/libk3b/jobs/k3breadcdreader.h
@@ -34,9 +34,10 @@ namespace K3b {
class K3bReadcdReader : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bReadcdReader( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bReadcdReader( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bReadcdReader();
bool active() const;
@@ -59,7 +60,7 @@ class K3bReadcdReader : public K3bJob
void setSectorRange( const K3b::Msf&, const K3b::Msf& );
- void setImagePath( const QString& p ) { m_imagePath = p; }
+ void setImagePath( const TQString& p ) { m_imagePath = p; }
/**
* the data gets written directly into fd instead of the imagefile.
@@ -69,7 +70,7 @@ class K3bReadcdReader : public K3bJob
void writeToFd( int fd );
private slots:
- void slotStdLine( const QString& line );
+ void slotStdLine( const TQString& line );
void slotProcessExited(KProcess*);
private:
@@ -82,7 +83,7 @@ class K3bReadcdReader : public K3bJob
K3bDevice::Device* m_readDevice;
- QString m_imagePath;
+ TQString m_imagePath;
class Private;
Private* d;
diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp
index e73530e..963f1a2 100644
--- a/libk3b/jobs/k3bverificationjob.cpp
+++ b/libk3b/jobs/k3bverificationjob.cpp
@@ -29,10 +29,10 @@
#include <kio/job.h>
#include <kio/netaccess.h>
-#include <qcstring.h>
-#include <qapplication.h>
-#include <qvaluelist.h>
-#include <qpair.h>
+#include <tqcstring.h>
+#include <tqapplication.h>
+#include <tqvaluelist.h>
+#include <tqpair.h>
class K3bVerificationJobTrackEntry
@@ -42,14 +42,14 @@ public:
: trackNumber(0) {
}
- K3bVerificationJobTrackEntry( int tn, const QCString& cs, const K3b::Msf& msf )
+ K3bVerificationJobTrackEntry( int tn, const TQCString& cs, const K3b::Msf& msf )
: trackNumber(tn),
checksum(cs),
length(msf) {
}
int trackNumber;
- QCString checksum;
+ TQCString checksum;
K3b::Msf length;
};
@@ -69,7 +69,7 @@ public:
K3b::Msf grownSessionSize;
- QValueList<K3bVerificationJobTrackEntry> tracks;
+ TQValueList<K3bVerificationJobTrackEntry> tracks;
int currentTrackIndex;
K3bDevice::DiskInfo diskInfo;
@@ -89,16 +89,16 @@ public:
};
-K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, QObject* parent, const char* name )
- : K3bJob( hdl, parent, name )
+K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name )
+ : K3bJob( hdl, tqparent, name )
{
d = new Private();
d->md5Job = new K3bMd5Job( this );
- connect( d->md5Job, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( d->md5Job, SIGNAL(finished(bool)), this, SLOT(slotMd5JobFinished(bool)) );
- connect( d->md5Job, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( d->md5Job, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->md5Job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMd5JobFinished(bool)) );
+ connect( d->md5Job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
@@ -118,7 +118,7 @@ void K3bVerificationJob::cancel()
}
-void K3bVerificationJob::addTrack( int trackNum, const QCString& checksum, const K3b::Msf& length )
+void K3bVerificationJob::addTrack( int trackNum, const TQCString& checksum, const K3b::Msf& length )
{
d->tracks.append( K3bVerificationJobTrackEntry( trackNum, checksum, length ) );
}
@@ -155,9 +155,9 @@ void K3bVerificationJob::start()
d->mediumHasBeenReloaded = false;
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
}
@@ -174,9 +174,9 @@ void K3bVerificationJob::slotMediaReloaded( bool /*success*/ )
emit newTask( i18n("Checking medium") );
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
}
@@ -193,7 +193,7 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
// just to be sure check if we actually have all the tracks
int i = 0;
- for( QValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin();
+ for( TQValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin();
it != d->tracks.end(); ++i, ++it ) {
// 0 means "last track"
@@ -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)")
- .arg( "Specified track number not found on medium" ), ERROR );
+ .tqarg( "Specified track number not found on medium" ), ERROR );
jobFinished( false );
return;
}
@@ -211,9 +211,9 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
// many drives need to reload the medium to return to a proper state
emit newTask( i18n("Reloading the medium") );
connect( K3bDevice::reload( d->device ),
- SIGNAL(finished(bool)),
+ TQT_SIGNAL(finished(bool)),
this,
- SLOT(slotMediaReloaded(bool)) );
+ TQT_SLOT(slotMediaReloaded(bool)) );
return;
}
}
@@ -236,20 +236,20 @@ void K3bVerificationJob::readTrack( int trackIndex )
return;
}
- emit newTask( i18n("Verifying track %1").arg( d->tracks[trackIndex].trackNumber ) );
+ emit newTask( i18n("Verifying track %1").tqarg( d->tracks[trackIndex].trackNumber ) );
d->pipe.open();
if( d->toc[d->tracks[trackIndex].trackNumber-1].type() == K3bDevice::Track::DATA ) {
if( !d->dataTrackReader ) {
d->dataTrackReader = new K3bDataTrackReader( this );
- connect( d->dataTrackReader, SIGNAL(percent(int)), this, SLOT(slotReaderProgress(int)) );
- // connect( d->dataTrackReader, SIGNAL(processedSize(int, int)), this, SLOT(slotReaderProcessedSize(int, int)) );
- connect( d->dataTrackReader, SIGNAL(finished(bool)), this, SLOT(slotReaderFinished(bool)) );
- connect( d->dataTrackReader, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( d->dataTrackReader, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( d->dataTrackReader, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) );
+ // connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReaderFinished(bool)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
d->dataTrackReader->setDevice( d->device );
@@ -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.").arg(d->tracks[d->currentTrackIndex].trackNumber), ERROR );
+ emit infoMessage( i18n("Written data in track %1 differs from original.").tqarg(d->tracks[d->currentTrackIndex].trackNumber), ERROR );
jobFinished(false);
}
else {
diff --git a/libk3b/jobs/k3bverificationjob.h b/libk3b/jobs/k3bverificationjob.h
index ad750ee..945198d 100644
--- a/libk3b/jobs/k3bverificationjob.h
+++ b/libk3b/jobs/k3bverificationjob.h
@@ -47,9 +47,10 @@ namespace K3bDevice {
class K3bVerificationJob : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bVerificationJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bVerificationJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bVerificationJob();
public slots:
@@ -67,7 +68,7 @@ class K3bVerificationJob : public K3bJob
* useful when writing to DVD+RW media and the iso descriptor does not
* contain the exact image size (as true for many commercial Video DVDs)
*/
- void addTrack( int tracknum, const QCString& checksum, const K3b::Msf& length = K3b::Msf() );
+ void addTrack( int tracknum, const TQCString& checksum, const K3b::Msf& length = K3b::Msf() );
/**
* Handle the special case of iso session growing
diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
index fdcc3a4..320717a 100644
--- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
@@ -46,8 +46,8 @@ public:
-K3bVideoDVDTitleDetectClippingJob::K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, QObject* parent )
- : K3bJob( hdl, parent ),
+K3bVideoDVDTitleDetectClippingJob::K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bJob( hdl, tqparent ),
m_clippingTop( 0 ),
m_clippingBottom( 0 ),
m_clippingLeft( 0 ),
@@ -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.").arg("transcode"), ERROR );
+ emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR );
jobFinished( false );
return;
}
if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){
emit infoMessage( i18n("%1 version %2 is too old.")
- .arg("transcode")
- .arg(d->usedTranscodeBin->version), ERROR );
+ .tqarg("transcode")
+ .tqarg(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")
- .arg(d->usedTranscodeBin->name())
- .arg(d->usedTranscodeBin->version)
- .arg(d->usedTranscodeBin->copyright), INFO );
+ .tqarg(d->usedTranscodeBin->name())
+ .tqarg(d->usedTranscodeBin->version)
+ .tqarg(d->usedTranscodeBin->copyright), INFO );
- emit newTask( i18n("Analysing Title %1 of Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) );
+ emit newTask( i18n("Analysing Title %1 of Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) );
startTranscode( 1 );
}
@@ -125,9 +125,9 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
// use the whole chapter
//
if( d->totalChapters == 1 )
- d->currentFrames = QMIN( 3000, QMAX( 1, m_dvd[m_titleNumber-1][d->currentChapter-1].playbackTime().totalFrames() ) );
+ d->currentFrames = TQMIN( 3000, TQMAX( 1, m_dvd[m_titleNumber-1][d->currentChapter-1].playbackTime().totalFrames() ) );
else
- d->currentFrames = QMIN( 200, QMAX( 1, m_dvd[m_titleNumber-1][d->currentChapter-1].playbackTime().totalFrames() ) );
+ d->currentFrames = TQMIN( 200, TQMAX( 1, m_dvd[m_titleNumber-1][d->currentChapter-1].playbackTime().totalFrames() ) );
//
// prepare the process
@@ -136,9 +136,9 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
d->process = new K3bProcess();
d->process->setSuppressEmptyLines(true);
d->process->setSplitStdout(true);
- // connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotTranscodeStderr(const QString&)) );
- connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotTranscodeStderr(const QString&)) );
- connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotTranscodeExited(KProcess*)) );
+ // connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTranscodeExited(KProcess*)) );
// the executable
*d->process << d->usedTranscodeBin;
@@ -151,27 +151,27 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
*d->process << "-i" << m_dvd.device()->blockDeviceName();
// select the title number and chapter
- *d->process << "-T" << QString("%1,%2").arg(m_titleNumber).arg(chapter);
+ *d->process << "-T" << TQString("%1,%2").tqarg(m_titleNumber).tqarg(chapter);
// null output
*d->process << "-y" << "null,null" << "-o" << "/dev/null";
// analyze the first 200 frames
- *d->process << "-J" << QString("detectclipping=range=0-%1/5").arg(d->currentFrames);
+ *d->process << "-J" << TQString("detectclipping=range=0-%1/5").tqarg(d->currentFrames);
// also only decode the first 200 frames
- *d->process << "-c" << QString("0-%1").arg(d->currentFrames+1);
+ *d->process << "-c" << TQString("0-%1").tqarg(d->currentFrames+1);
// additional user parameters from config
- const QStringList& params = d->usedTranscodeBin->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = d->usedTranscodeBin->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*d->process << *it;
// produce some debugging output
kdDebug() << "***** transcode parameters:\n";
- const QValueList<QCString>& args = d->process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = d->process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << flush << endl;
@@ -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.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
- emit newSubTask( i18n("Analysing Chapter %1 of %2").arg(chapter).arg(m_dvd[m_titleNumber-1].numPTTs()) );
+ emit newSubTask( i18n("Analysing Chapter %1 of %2").tqarg(chapter).tqarg(m_dvd[m_titleNumber-1].numPTTs()) );
emit subPercent( 0 );
}
}
@@ -199,15 +199,15 @@ void K3bVideoDVDTitleDetectClippingJob::cancel()
}
-void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const QString& line )
+void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const TQString& line )
{
emit debuggingOutput( "transcode", line );
// parse progress
// encoding frame [185], 24.02 fps, 93.0%, ETA: 0:00:00, ( 0| 0| 0)
if( line.startsWith( "encoding frame" ) ) {
- int pos1 = line.find( '[', 15 );
- int pos2 = line.find( ']', pos1+1 );
+ int pos1 = line.tqfind( '[', 15 );
+ int pos2 = line.tqfind( ']', pos1+1 );
if( pos1 > 0 && pos2 > 0 ) {
bool ok;
int encodedFrames = line.mid( pos1+1, pos2-pos1-1 ).toInt( &ok );
@@ -235,13 +235,13 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const QString& line
// [detectclipping#0] valid area: X: 5..719 Y: 72..507 -> -j 72,6,68,0
else if( line.startsWith( "[detectclipping" ) ) {
- int pos = line.find( "-j" );
+ int pos = line.tqfind( "-j" );
if( pos > 0 ) {
- QStringList values = QStringList::split( ',', line.mid( pos+3 ) );
- m_clippingTop = QMIN( m_clippingTop, values[0].toInt() );
- m_clippingLeft = QMIN( m_clippingLeft, values[1].toInt() );
- m_clippingBottom = QMIN( m_clippingBottom, values[2].toInt() );
- m_clippingRight = QMIN( m_clippingRight, values[3].toInt() );
+ TQStringList values = TQStringList::split( ',', line.mid( pos+3 ) );
+ m_clippingTop = TQMIN( m_clippingTop, values[0].toInt() );
+ m_clippingLeft = TQMIN( m_clippingLeft, values[1].toInt() );
+ m_clippingBottom = TQMIN( m_clippingBottom, values[2].toInt() );
+ m_clippingRight = TQMIN( m_clippingRight, values[3].toInt() );
}
else
kdDebug() << "(K3bVideoDVDTitleDetectClippingJob) failed to parse line: " << line << endl;
@@ -279,7 +279,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p )
}
else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()),
+ .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
}
diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h
index b13bbf8..a102810 100644
--- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h
+++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h
@@ -28,9 +28,10 @@ class KProcess;
class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, QObject* parent );
+ K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* tqparent );
~K3bVideoDVDTitleDetectClippingJob();
const K3bVideoDVD::VideoDVD& videoDVD() const { return m_dvd; }
@@ -82,7 +83,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob
void setLowPriority( bool b ) { m_lowPriority = b; }
private slots:
- void slotTranscodeStderr( const QString& );
+ void slotTranscodeStderr( const TQString& );
void slotTranscodeExited( KProcess* );
private:
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
index 9fec637..08fbb59 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -24,8 +24,8 @@
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <qfile.h>
-#include <qfileinfo.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
class K3bVideoDVDTitleTranscodingJob::Private
@@ -35,7 +35,7 @@ public:
K3bProcess* process;
- QString twoPassEncodingLogFile;
+ TQString twoPassEncodingLogFile;
int currentEncodingPass;
@@ -47,8 +47,8 @@ public:
-K3bVideoDVDTitleTranscodingJob::K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, QObject* parent )
- : K3bJob( hdl, parent ),
+K3bVideoDVDTitleTranscodingJob::K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bJob( hdl, tqparent ),
m_clippingTop( 0 ),
m_clippingBottom( 0 ),
m_clippingLeft( 0 ),
@@ -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.").arg("transcode"), ERROR );
+ emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR );
jobFinished( false );
return;
}
if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){
emit infoMessage( i18n("%1 version %2 is too old.")
- .arg("transcode")
- .arg(d->usedTranscodeBin->version), ERROR );
+ .tqarg("transcode")
+ .tqarg(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")
- .arg(d->usedTranscodeBin->name())
- .arg(d->usedTranscodeBin->version)
- .arg(d->usedTranscodeBin->copyright), INFO );
+ .tqarg(d->usedTranscodeBin->name())
+ .tqarg(d->usedTranscodeBin->version)
+ .tqarg(d->usedTranscodeBin->copyright), INFO );
//
// Let's take a look at the filename
@@ -116,14 +116,14 @@ void K3bVideoDVDTitleTranscodingJob::start()
}
else {
// let's see if the directory exists and we can write to it
- QFileInfo fileInfo( m_filename );
- QFileInfo dirInfo( fileInfo.dirPath() );
+ TQFileInfo fileInfo( m_filename );
+ TQFileInfo dirInfo( fileInfo.dirPath() );
if( !dirInfo.exists() && !KStandardDirs::makeDir( dirInfo.absFilePath() ) ) {
- emit infoMessage( i18n("Unable to create folder '%1'").arg(dirInfo.filePath()), ERROR );
+ emit infoMessage( i18n("Unable to create folder '%1'").tqarg(dirInfo.filePath()), ERROR );
return;
}
else if( !dirInfo.isDir() || !dirInfo.isWritable() ) {
- emit infoMessage( i18n("Invalid filename: '%1'").arg(m_filename), ERROR );
+ emit infoMessage( i18n("Invalid filename: '%1'").tqarg(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").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) );
+ emit newTask( i18n("Transcoding title %1 from Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) );
//
// Ok then, let's begin
@@ -148,7 +148,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
d->currentEncodingPass = pass;
d->lastSubProgress = 0;
- QString videoCodecString;
+ TQString videoCodecString;
switch( m_videoCodec ) {
case VIDEO_CODEC_XVID:
videoCodecString = "xvid";
@@ -159,12 +159,12 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
break;
default:
- emit infoMessage( i18n("Invalid Video codec set: %1").arg(m_videoCodec), ERROR );
+ emit infoMessage( i18n("Invalid Video codec set: %1").tqarg(m_videoCodec), ERROR );
jobFinished( false );
return;
}
- QString audioCodecString;
+ TQString audioCodecString;
switch( m_audioCodec ) {
case AUDIO_CODEC_MP3:
audioCodecString = "0x55";
@@ -182,7 +182,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
break;
default:
- emit infoMessage( i18n("Invalid Audio codec set: %1").arg(m_audioCodec), ERROR );
+ emit infoMessage( i18n("Invalid Audio codec set: %1").tqarg(m_audioCodec), ERROR );
jobFinished( false );
return;
}
@@ -194,9 +194,9 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
d->process = new K3bProcess();
d->process->setSuppressEmptyLines(true);
d->process->setSplitStdout(true);
- connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotTranscodeStderr(const QString&)) );
- connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotTranscodeStderr(const QString&)) );
- connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotTranscodeExited(KProcess*)) );
+ connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotTranscodeExited(KProcess*)) );
// the executable
*d->process << d->usedTranscodeBin;
@@ -207,9 +207,9 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
// we only need 100 steps, but to make sure we use 150
if ( d->usedTranscodeBin->version.simplify() >= K3bVersion( 1, 1, 0 ) )
- *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
+ *d->process << "--progress_meter" << "2" << "--progress_rate" << TQString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
else
- *d->process << "--print_status" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
+ *d->process << "--print_status" << TQString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
// the input
*d->process << "-i" << m_dvd.device()->blockDeviceName();
@@ -218,22 +218,22 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
*d->process << "-x" << "dvd";
// select the title number
- *d->process << "-T" << QString("%1,-1,1").arg( m_titleNumber );
+ *d->process << "-T" << TQString("%1,-1,1").tqarg( m_titleNumber );
// select the audio stream to extract
if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 )
- *d->process << "-a" << QString::number( m_audioStreamIndex );
+ *d->process << "-a" << TQString::number( m_audioStreamIndex );
// clipping
- *d->process << "-j" << QString("%1,%2,%3,%4")
- .arg(m_clippingTop)
- .arg(m_clippingLeft)
- .arg(m_clippingBottom)
- .arg(m_clippingRight);
+ *d->process << "-j" << TQString("%1,%2,%3,%4")
+ .tqarg(m_clippingTop)
+ .tqarg(m_clippingLeft)
+ .tqarg(m_clippingBottom)
+ .tqarg(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" << QString("%1,%2").arg( pass ).arg( d->twoPassEncodingLogFile );
+ *d->process << "-R" << TQString("%1,%2").tqarg( pass ).tqarg( 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" << QString("%1,%2").arg(m_audioBitrate).arg(m_audioVBR ? 1 : 0);
+ *d->process << "-b" << TQString("%1,%2").tqarg(m_audioBitrate).tqarg(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" << QString("%1,null").arg( videoCodecString );
+ *d->process << "-y" << TQString("%1,null").tqarg( videoCodecString );
// we ignore the output from the first pass
*d->process << "-o" << "/dev/null";
@@ -273,7 +273,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
}
// video bitrate
- *d->process << "-w" << QString::number( m_videoBitrate );
+ *d->process << "-w" << TQString::number( m_videoBitrate );
// video resizing
int usedWidth = m_width;
@@ -317,19 +317,19 @@ 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").arg(m_titleNumber).arg(usedWidth).arg(usedHeight), INFO );
- *d->process << "-Z" << QString("%1x%2").arg(usedWidth).arg(usedHeight);
+ 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);
// additional user parameters from config
- const QStringList& params = d->usedTranscodeBin->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = d->usedTranscodeBin->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*d->process << *it;
// produce some debugging output
kdDebug() << "***** transcode parameters:\n";
- const QValueList<QCString>& args = d->process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = d->process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << flush << endl;
@@ -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.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
@@ -367,26 +367,26 @@ void K3bVideoDVDTitleTranscodingJob::cancel()
void K3bVideoDVDTitleTranscodingJob::cleanup( bool success )
{
- if( QFile::exists( d->twoPassEncodingLogFile ) ) {
- QFile::remove( d->twoPassEncodingLogFile );
+ if( TQFile::exists( d->twoPassEncodingLogFile ) ) {
+ TQFile::remove( d->twoPassEncodingLogFile );
}
- if( !success && QFile::exists( m_filename ) ) {
- emit infoMessage( i18n("Removing incomplete video file '%1'").arg(m_filename), INFO );
- QFile::remove( m_filename );
+ if( !success && TQFile::exists( m_filename ) ) {
+ emit infoMessage( i18n("Removing incomplete video file '%1'").tqarg(m_filename), INFO );
+ TQFile::remove( m_filename );
}
}
-void K3bVideoDVDTitleTranscodingJob::slotTranscodeStderr( const QString& line )
+void K3bVideoDVDTitleTranscodingJob::slotTranscodeStderr( const TQString& line )
{
emit debuggingOutput( "transcode", line );
// parse progress
// encoding frames [000000-000144], 27.58 fps, EMT: 0:00:05, ( 0| 0| 0)
if( line.startsWith( "encoding frame" ) ) {
- int pos1 = line.find( '-', 15 );
- int pos2 = line.find( ']', pos1+1 );
+ int pos1 = line.tqfind( '-', 15 );
+ int pos2 = line.tqfind( ']', pos1+1 );
if( pos1 > 0 && pos2 > 0 ) {
bool ok;
int encodedFrames = line.mid( pos1+1, pos2-pos1-1 ).toInt( &ok );
@@ -440,7 +440,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p )
// FIXME: error handling
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()),
+ .tqarg(d->usedTranscodeBin->name()).tqarg(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.").arg("transcode"), ERROR );
+ emit infoMessage( i18n("Execution of %1 failed.").tqarg("transcode"), ERROR );
emit infoMessage( i18n("Please consult the debugging output for details."), ERROR );
jobFinished( false );
}
@@ -467,7 +467,7 @@ void K3bVideoDVDTitleTranscodingJob::setClipping( int top, int left, int bottom,
//
// transcode seems unable to handle different clipping values for left and right
//
- m_clippingLeft = m_clippingRight = QMIN( m_clippingRight, m_clippingLeft );
+ m_clippingLeft = m_clippingRight = TQMIN( m_clippingRight, m_clippingLeft );
}
@@ -478,7 +478,7 @@ void K3bVideoDVDTitleTranscodingJob::setSize( int width, int height )
}
-QString K3bVideoDVDTitleTranscodingJob::audioCodecString( K3bVideoDVDTitleTranscodingJob::AudioCodec codec )
+TQString K3bVideoDVDTitleTranscodingJob::audioCodecString( K3bVideoDVDTitleTranscodingJob::AudioCodec codec )
{
switch( codec ) {
case AUDIO_CODEC_AC3_STEREO:
@@ -493,7 +493,7 @@ QString K3bVideoDVDTitleTranscodingJob::audioCodecString( K3bVideoDVDTitleTransc
}
-QString K3bVideoDVDTitleTranscodingJob::videoCodecString( K3bVideoDVDTitleTranscodingJob::VideoCodec codec )
+TQString K3bVideoDVDTitleTranscodingJob::videoCodecString( K3bVideoDVDTitleTranscodingJob::VideoCodec codec )
{
switch( codec ) {
case VIDEO_CODEC_FFMPEG_MPEG4:
@@ -506,7 +506,7 @@ QString K3bVideoDVDTitleTranscodingJob::videoCodecString( K3bVideoDVDTitleTransc
}
-QString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitleTranscodingJob::VideoCodec codec )
+TQString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitleTranscodingJob::VideoCodec codec )
{
switch( codec ) {
case VIDEO_CODEC_FFMPEG_MPEG4:
@@ -521,7 +521,7 @@ QString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitleT
"volunteer programmers after the OpenDivX source was closed in July 2001.")
+ "<br>"
+ i18n("XviD features MPEG-4 Advanced Profile settings such as b-frames, global "
- "and quarter pixel motion compensation, lumi masking, trellis quantization, and "
+ "and quarter pixel motion compensation, lumi tqmasking, trellis quantization, and "
"H.263, MPEG and custom quantization matrices.")
+ "<br>"
+ i18n("XviD is a primary competitor of DivX (XviD being DivX spelled backwards). "
@@ -536,9 +536,9 @@ QString K3bVideoDVDTitleTranscodingJob::videoCodecDescription( K3bVideoDVDTitleT
}
-QString K3bVideoDVDTitleTranscodingJob::audioCodecDescription( K3bVideoDVDTitleTranscodingJob::AudioCodec codec )
+TQString K3bVideoDVDTitleTranscodingJob::audioCodecDescription( K3bVideoDVDTitleTranscodingJob::AudioCodec codec )
{
- static QString s_ac3General = i18n("AC3, better known as Dolby Digital is standardized as ATSC A/52. "
+ static TQString s_ac3General = i18n("AC3, better known as Dolby Digital is standardized as ATSC A/52. "
"It contains up to 6 total channels of sound.");
switch( codec ) {
case AUDIO_CODEC_AC3_STEREO:
@@ -566,7 +566,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
return false;
- return bin->hasFeature( QString::fromLatin1( s_codecFeatures[(int)codec] ) );
+ return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) );
}
@@ -577,7 +577,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
return false;
- return bin->hasFeature( QString::fromLatin1( s_codecFeatures[(int)codec] ) );
+ return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) );
}
#include "k3bvideodvdtitletranscodingjob.moc"
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h
index 77a48b5..8523d0e 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h
@@ -33,9 +33,10 @@ class K3bExternalBin;
class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, QObject* parent );
+ K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* tqparent );
~K3bVideoDVDTitleTranscodingJob();
/**
@@ -67,7 +68,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob
int clippingRight() const { return m_clippingRight; }
int height() const { return m_height; }
int width() const { return m_width; }
- const QString& filename() { return m_filename; }
+ const TQString& filename() { return m_filename; }
VideoCodec videoCodec() const { return m_videoCodec; }
int videoBitrate() const { return m_videoBitrate; }
bool twoPassEncoding() const { return m_twoPassEncoding; }
@@ -87,11 +88,11 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob
*/
static bool transcodeBinaryHasSupportFor( AudioCodec codec, const K3bExternalBin* bin = 0 );
- static QString videoCodecString( VideoCodec );
- static QString audioCodecString( AudioCodec );
+ static TQString videoCodecString( VideoCodec );
+ static TQString audioCodecString( AudioCodec );
- static QString videoCodecDescription( VideoCodec );
- static QString audioCodecDescription( AudioCodec );
+ static TQString videoCodecDescription( VideoCodec );
+ static TQString audioCodecDescription( AudioCodec );
public slots:
void start();
@@ -158,7 +159,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob
* The default is some automatically generated filename
* in the default K3b temp directory.
*/
- void setFilename( const QString& name ) { m_filename = name; }
+ void setFilename( const TQString& name ) { m_filename = name; }
/**
* Set the video codec used to encode the video title.
@@ -228,7 +229,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob
void setLowPriority( bool b ) { m_lowPriority = b; }
private slots:
- void slotTranscodeStderr( const QString& );
+ void slotTranscodeStderr( const TQString& );
void slotTranscodeExited( KProcess* );
private:
@@ -243,7 +244,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob
K3bVideoDVD::VideoDVD m_dvd;
- QString m_filename;
+ TQString m_filename;
int m_clippingTop;
int m_clippingBottom;
diff --git a/libk3b/k3bimage.xsd b/libk3b/k3bimage.xsd
index ab7f36c..607bd95 100644
--- a/libk3b/k3bimage.xsd
+++ b/libk3b/k3bimage.xsd
@@ -1,9 +1,9 @@
<!--
- This document describes the layout of the toc.xml file in a K3b image archive.
- A K3b image archive is a TAR archive with a simple layout as follows.
+ This document describes the tqlayout of the toc.xml file in a K3b image archive.
+ A K3b image archive is a TAR archive with a simple tqlayout as follows.
Every K3b image archive contains the toc.xml file as described in this document
- which describes the layout of the CD or DVD saved in the K3b image archive.
+ which describes the tqlayout of the CD or DVD saved in the K3b image archive.
Additionally the K3b image archive contains an arbitrary number of files which
contain the CD/DVD sector data. These files are referenced in the elements of
type "file".
diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp
index 82f4adb..54fe8ad 100644
--- a/libk3b/plugin/k3baudiodecoder.cpp
+++ b/libk3b/plugin/k3baudiodecoder.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kfilemetainfo.h>
-#include <qmap.h>
+#include <tqmap.h>
#include <math.h>
@@ -98,16 +98,16 @@ public:
char* decodingBufferPos;
int decodingBufferFill;
- QMap<QString, QString> technicalInfoMap;
- QMap<MetaDataField, QString> metaInfoMap;
+ TQMap<TQString, TQString> technicalInfoMap;
+ TQMap<MetaDataField, TQString> metaInfoMap;
bool valid;
};
-K3bAudioDecoder::K3bAudioDecoder( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bAudioDecoder::K3bAudioDecoder( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
d = new Private();
}
@@ -129,7 +129,7 @@ K3bAudioDecoder::~K3bAudioDecoder()
}
-void K3bAudioDecoder::setFilename( const QString& filename )
+void K3bAudioDecoder::setFilename( const TQString& filename )
{
m_fileName = filename;
delete d->metaInfo;
@@ -302,7 +302,7 @@ int K3bAudioDecoder::decode( char* _data, int maxLen )
// clear out the decoding buffer
- read = QMIN( maxLen, d->decodingBufferFill );
+ read = TQMIN( maxLen, d->decodingBufferFill );
::memcpy( _data, d->decodingBufferPos, read );
d->decodingBufferPos += read;
d->decodingBufferFill -= read;
@@ -321,7 +321,7 @@ int K3bAudioDecoder::decode( char* _data, int maxLen )
int K3bAudioDecoder::resample( char* data, int maxLen )
{
if( !d->resampleState ) {
- d->resampleState = src_new( SRC_SINC_MEDIUM_QUALITY, d->channels, 0 );
+ d->resampleState = src_new( SRC_SINC_MEDIUM_TQUALITY, d->channels, 0 );
if( !d->resampleState ) {
kdDebug() << "(K3bAudioDecoder) unable to initialize resampler." << endl;
return -1;
@@ -375,7 +375,7 @@ void K3bAudioDecoder::from16bitBeSignedToFloat( char* src, float* dest, int samp
{
while( samples ) {
samples--;
- dest[samples] = static_cast<float>( Q_INT16(((src[2*samples]<<8)&0xff00)|(src[2*samples+1]&0x00ff)) / 32768.0 );
+ dest[samples] = static_cast<float>( TQ_INT16(((src[2*samples]<<8)&0xff00)|(src[2*samples+1]&0x00ff)) / 32768.0 );
}
}
@@ -386,7 +386,7 @@ void K3bAudioDecoder::fromFloatTo16BitBeSigned( float* src, char* dest, int samp
samples--;
float scaled = src[samples] * 32768.0;
- Q_INT16 val = 0;
+ TQ_INT16 val = 0;
// clipping
if( scaled >= ( 1.0 * 0x7FFF ) )
@@ -407,8 +407,8 @@ void K3bAudioDecoder::from8BitTo16BitBeSigned( char* src, char* dest, int sample
while( samples ) {
samples--;
- float scaled = static_cast<float>(Q_UINT8(src[samples])-128) / 128.0 * 32768.0;
- Q_INT16 val = 0;
+ float scaled = static_cast<float>(TQ_UINT8(src[samples])-128) / 128.0 * 32768.0;
+ TQ_INT16 val = 0;
// clipping
if( scaled >= ( 1.0 * 0x7FFF ) )
@@ -462,7 +462,7 @@ bool K3bAudioDecoder::seek( const K3b::Msf& pos )
kdDebug() << "(K3bAudioDecoder) seeking " << bytesToDecode << " bytes." << endl;
char buffi[10*2352];
while( bytesToDecode > 0 ) {
- int read = decode( buffi, QMIN(10*2352, bytesToDecode) );
+ int read = decode( buffi, TQMIN(10*2352, bytesToDecode) );
if( read <= 0 )
return false;
@@ -502,9 +502,9 @@ void K3bAudioDecoder::cleanup()
}
-QString K3bAudioDecoder::metaInfo( MetaDataField f )
+TQString K3bAudioDecoder::metaInfo( MetaDataField f )
{
- if( d->metaInfoMap.contains( f ) )
+ if( d->metaInfoMap.tqcontains( f ) )
return d->metaInfoMap[f];
// fall back to KFileMetaInfo
@@ -512,7 +512,7 @@ QString K3bAudioDecoder::metaInfo( MetaDataField f )
d->metaInfo = new KFileMetaInfo( filename() );
if( d->metaInfo->isValid() ) {
- QString tag;
+ TQString tag;
switch( f ) {
case META_TITLE:
tag = "Title";
@@ -536,11 +536,11 @@ QString K3bAudioDecoder::metaInfo( MetaDataField f )
return item.string();
}
- return QString::null;
+ return TQString();
}
-void K3bAudioDecoder::addMetaInfo( MetaDataField f, const QString& value )
+void K3bAudioDecoder::addMetaInfo( MetaDataField f, const TQString& value )
{
if( !value.isEmpty() )
d->metaInfoMap[f] = value;
@@ -549,23 +549,23 @@ void K3bAudioDecoder::addMetaInfo( MetaDataField f, const QString& value )
}
-QStringList K3bAudioDecoder::supportedTechnicalInfos() const
+TQStringList K3bAudioDecoder::supportedTechnicalInfos() const
{
- QStringList l;
- for( QMap<QString, QString>::const_iterator it = d->technicalInfoMap.begin();
+ TQStringList l;
+ for( TQMap<TQString, TQString>::const_iterator it = d->technicalInfoMap.begin();
it != d->technicalInfoMap.end(); ++it )
l.append( it.key() );
return l;
}
-QString K3bAudioDecoder::technicalInfo( const QString& key ) const
+TQString K3bAudioDecoder::technicalInfo( const TQString& key ) const
{
return d->technicalInfoMap[key];
}
-void K3bAudioDecoder::addTechnicalInfo( const QString& key, const QString& value )
+void K3bAudioDecoder::addTechnicalInfo( const TQString& key, const TQString& value )
{
d->technicalInfoMap[key] = value;
}
@@ -574,17 +574,17 @@ void K3bAudioDecoder::addTechnicalInfo( const QString& key, const QString& value
K3bAudioDecoder* K3bAudioDecoderFactory::createDecoder( const KURL& url )
{
kdDebug() << "(K3bAudioDecoderFactory::createDecoder( " << url.path() << " )" << endl;
- QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioDecoder" );
+ TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioDecoder" );
// first search for a single format decoder
- for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) {
K3bAudioDecoderFactory* f = dynamic_cast<K3bAudioDecoderFactory*>( it.current() );
if( f && !f->multiFormatDecoder() && f->canDecode( url ) ) {
kdDebug() << "1" << endl; return f->createDecoder();}
}
// no single format decoder. Search for a multi format decoder
- for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) {
K3bAudioDecoderFactory* f = dynamic_cast<K3bAudioDecoderFactory*>( it.current() );
if( f && f->multiFormatDecoder() && f->canDecode( url ) ) {
kdDebug() << "2" << endl; return f->createDecoder();}
diff --git a/libk3b/plugin/k3baudiodecoder.h b/libk3b/plugin/k3baudiodecoder.h
index 69f594c..ed13c66 100644
--- a/libk3b/plugin/k3baudiodecoder.h
+++ b/libk3b/plugin/k3baudiodecoder.h
@@ -31,12 +31,13 @@
*
* Instances are created by K3bAudioDecoderFactory
**/
-class LIBK3B_EXPORT K3bAudioDecoder : public QObject
+class LIBK3B_EXPORT K3bAudioDecoder : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioDecoder( QObject* parent = 0, const char* name = 0 );
+ K3bAudioDecoder( TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bAudioDecoder();
@@ -44,7 +45,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
* Set the file to decode. Be aware that one cannot rely
* on the file length until analyseFile() has been called.
*/
- void setFilename( const QString& );
+ void setFilename( const TQString& );
/**
* Since this may take a while depending on the filetype it is best
@@ -87,7 +88,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
* the default implementation returns the infos set via @p addMetaInfo
* and uses KFileMetaInfo if none was set
*/
- virtual QString metaInfo( MetaDataField );
+ virtual TQString metaInfo( MetaDataField );
/**
* The filetype is only used for informational purposes.
@@ -95,7 +96,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
* as it enhances usability.
* @returne The filetype of the decoded file.
*/
- virtual QString fileType() const { return QString::null; }
+ virtual TQString fileType() const { return TQString(); }
/**
* This method may be reimplemented to provide technical information about
@@ -103,7 +104,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
*
* the default implementation returns the infos set via @p addTechnicalInfo
*/
- virtual QStringList supportedTechnicalInfos() const;
+ virtual TQStringList supportedTechnicalInfos() const;
/**
* The framework will call this method with all strings returned by the
@@ -111,7 +112,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
*
* the default implementation returns the infos set via @p addTechnicalInfo
*/
- virtual QString technicalInfo( const QString& ) const;
+ virtual TQString technicalInfo( const TQString& ) const;
/**
* returnes -1 on error, 0 when finished, length of data otherwise
@@ -144,7 +145,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
*/
virtual K3b::Msf length() const { return m_length; }
- const QString& filename() const { return m_fileName; }
+ const TQString& filename() const { return m_fileName; }
// some helper methods
static void fromFloatTo16BitBeSigned( float* src, char* dest, int samples );
@@ -155,13 +156,13 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
/**
* Use this method if using the default implementation of @p metaInfo
*/
- void addMetaInfo( MetaDataField, const QString& );
+ void addMetaInfo( MetaDataField, const TQString& );
/**
* Use this method if using the default implementation of @p technicalInfo
* and @p supportedTechnicalInfos.
*/
- void addTechnicalInfo( const QString&, const QString& );
+ void addTechnicalInfo( const TQString&, const TQString& );
/**
* This will be called once before the first call to decodeInternal.
@@ -191,7 +192,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
private:
int resample( char* data, int maxLen );
- QString m_fileName;
+ TQString m_fileName;
K3b::Msf m_length;
class Private;
@@ -209,16 +210,17 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject
class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioDecoderFactory( QObject* parent = 0, const char* name = 0 )
- : K3bPlugin( parent, name ) {
+ K3bAudioDecoderFactory( TQObject* tqparent = 0, const char* name = 0 )
+ : K3bPlugin( tqparent, name ) {
}
virtual ~K3bAudioDecoderFactory() {
}
- QString group() const { return "AudioDecoder"; }
+ TQString group() const { return "AudioDecoder"; }
/**
* K3b uses this flag to decide which plugins to test first
@@ -239,7 +241,7 @@ class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin
*/
virtual bool canDecode( const KURL& filename ) = 0;
- virtual K3bAudioDecoder* createDecoder( QObject* parent = 0, const char* name = 0 ) const = 0;
+ virtual K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const = 0;
/**
* Searching for an audiodecoder for @p filename.
diff --git a/libk3b/plugin/k3baudioencoder.cpp b/libk3b/plugin/k3baudioencoder.cpp
index 3b1309a..d7f72d1 100644
--- a/libk3b/plugin/k3baudioencoder.cpp
+++ b/libk3b/plugin/k3baudioencoder.cpp
@@ -15,7 +15,7 @@
#include "k3baudioencoder.h"
-#include <qfile.h>
+#include <tqfile.h>
#include <kdebug.h>
@@ -27,15 +27,15 @@ public:
: outputFile(0) {
}
- QFile* outputFile;
- QString outputFilename;
+ TQFile* outputFile;
+ TQString outputFilename;
- QString lastErrorString;
+ TQString lastErrorString;
};
-K3bAudioEncoder::K3bAudioEncoder( QObject* parent, const char* name )
- : K3bPlugin( parent, name )
+K3bAudioEncoder::K3bAudioEncoder( TQObject* tqparent, const char* name )
+ : K3bPlugin( tqparent, name )
{
d = new Private();
}
@@ -48,11 +48,11 @@ K3bAudioEncoder::~K3bAudioEncoder()
}
-bool K3bAudioEncoder::openFile( const QString& ext, const QString& filename, const K3b::Msf& length )
+bool K3bAudioEncoder::openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length )
{
closeFile();
- d->outputFile = new QFile( filename );
+ d->outputFile = new TQFile( filename );
if( d->outputFile->open( IO_WriteOnly ) ) {
return initEncoder( ext, length );
}
@@ -81,35 +81,35 @@ void K3bAudioEncoder::closeFile()
d->outputFile->close();
delete d->outputFile;
d->outputFile = 0;
- d->outputFilename = QString::null;
+ d->outputFilename = TQString();
}
}
-const QString& K3bAudioEncoder::filename() const
+const TQString& K3bAudioEncoder::filename() const
{
if( d->outputFile )
return d->outputFilename;
else
- return QString::null;
+ return TQString();
}
-void K3bAudioEncoder::setMetaData( K3bAudioEncoder::MetaDataField f, const QString& data )
+void K3bAudioEncoder::setMetaData( K3bAudioEncoder::MetaDataField f, const TQString& data )
{
if( !data.isEmpty() )
return setMetaDataInternal( f, data );
}
-long K3bAudioEncoder::encode( const char* data, Q_ULONG len )
+long K3bAudioEncoder::encode( const char* data, TQ_ULONG len )
{
return encodeInternal( data, len );
}
-bool K3bAudioEncoder::initEncoder( const QString& ext, const K3b::Msf& length )
+bool K3bAudioEncoder::initEncoder( const TQString& ext, const K3b::Msf& length )
{
if( !isOpen() ) {
kdDebug() << "(K3bAudioEncoder) call to initEncoder without openFile!" << endl;
@@ -120,7 +120,7 @@ bool K3bAudioEncoder::initEncoder( const QString& ext, const K3b::Msf& length )
}
-Q_LONG K3bAudioEncoder::writeData( const char* data, Q_ULONG len )
+TQ_LONG K3bAudioEncoder::writeData( const char* data, TQ_ULONG len )
{
if( d->outputFile ) {
return d->outputFile->writeBlock( data, len );
@@ -132,14 +132,14 @@ Q_LONG K3bAudioEncoder::writeData( const char* data, Q_ULONG len )
}
-bool K3bAudioEncoder::initEncoderInternal( const QString&, const K3b::Msf& )
+bool K3bAudioEncoder::initEncoderInternal( const TQString&, const K3b::Msf& )
{
// do nothing
return true;
}
-void K3bAudioEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField, const QString& )
+void K3bAudioEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField, const TQString& )
{
// do nothing
}
@@ -158,13 +158,13 @@ void K3bAudioEncoder::finishEncoderInternal()
}
-void K3bAudioEncoder::setLastError( const QString& e )
+void K3bAudioEncoder::setLastError( const TQString& e )
{
d->lastErrorString = e;
}
-QString K3bAudioEncoder::lastErrorString() const
+TQString K3bAudioEncoder::lastErrorString() const
{
if( d->lastErrorString.isEmpty() )
return i18n("An unknown error occurred.");
diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h
index 137b49d..b3fc01b 100644
--- a/libk3b/plugin/k3baudioencoder.h
+++ b/libk3b/plugin/k3baudioencoder.h
@@ -33,9 +33,10 @@
class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioEncoder( QObject* parent = 0, const char* name = 0 );
+ K3bAudioEncoder( TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bAudioEncoder();
// TODO: if the following methods are to be activated the config methods in
@@ -52,7 +53,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
*/
// virtual void readConfig( KConfig* );
- QString group() const { return "AudioEncoder"; }
+ TQString group() const { return "AudioEncoder"; }
/**
* This should return the fileextensions supported by the filetype written in the
@@ -61,19 +62,19 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
* in handy if the encoder is based on some external program or lib which is not
* available on runtime.)
*/
- virtual QStringList extensions() const = 0;
+ virtual TQStringList extensions() const = 0;
/**
* The filetype as presented to the user.
*/
- virtual QString fileTypeComment( const QString& extension ) const = 0;
+ virtual TQString fileTypeComment( const TQString& extension ) const = 0;
/**
* Determine the filesize of the encoded file (~)
* default implementation returnes -1 (unknown)
* First parameter is the extension to be used
*/
- virtual long long fileSize( const QString&, const K3b::Msf& ) const { return -1; }
+ virtual long long fileSize( const TQString&, const K3b::Msf& ) const { return -1; }
/**
* The default implementation openes the file for writing with
@@ -81,7 +82,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
* @param extension the filetype to be used.
*
*/
- virtual bool openFile( const QString& extension, const QString& filename, const K3b::Msf& length );
+ virtual bool openFile( const TQString& extension, const TQString& filename, const K3b::Msf& length );
/**
@@ -101,11 +102,11 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
/**
* The default implementation returnes the filename set in openFile
- * or QString::null if no file has been opened.
+ * or TQString() if no file has been opened.
* Normally this does not need to be reimplemented but it has to be
* if openFile is reimplemented.
*/
- virtual const QString& filename() const;
+ virtual const TQString& filename() const;
enum MetaDataField {
META_TRACK_TITLE,
@@ -123,7 +124,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
* calling openFile and before calling encode.
* This calls setMetaDataInternal.
*/
- void setMetaData( MetaDataField, const QString& );
+ void setMetaData( MetaDataField, const TQString& );
/**
* Returnes the amount of actually written bytes or -1 if an error
@@ -132,20 +133,20 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
* Be aware that the returned amount of written data may very well differ
* from len since the data is encoded.
*/
- long encode( const char*, Q_ULONG len );
+ long encode( const char*, TQ_ULONG len );
/**
* Use this signal in case of an error to provide the user with information
* about the problem.
*/
- virtual QString lastErrorString() const;
+ virtual TQString lastErrorString() const;
protected:
/**
* Called by the default implementation of openFile
* This calls initEncoderInternal.
*/
- bool initEncoder( const QString& extension, const K3b::Msf& length );
+ bool initEncoder( const TQString& extension, const K3b::Msf& length );
/**
* Called by the deafult implementation of openFile
@@ -158,14 +159,14 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
* using the default implementation of openFile
* Returnes the number of bytes actually written.
*/
- Q_LONG writeData( const char*, Q_ULONG len );
+ TQ_LONG writeData( const char*, TQ_ULONG len );
/**
* initzialize the decoder structures.
* default implementation does nothing
* this may already write data.
*/
- virtual bool initEncoderInternal( const QString& extension, const K3b::Msf& length );
+ virtual bool initEncoderInternal( const TQString& extension, const K3b::Msf& length );
/**
* reimplement this if the encoder needs to do some
@@ -180,20 +181,20 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin
* Should return the amount of actually written bytes (may be 0) and -1
* on error.
*/
- // TODO: use Q_INT16* instead of char*
+ // TODO: use TQ_INT16* instead of char*
// FIXME: why little endian while CDs use big endian???
- virtual long encodeInternal( const char*, Q_ULONG len ) = 0;
+ virtual long encodeInternal( const char*, TQ_ULONG len ) = 0;
/**
* default implementation does nothing
* this may already write data.
*/
- virtual void setMetaDataInternal( MetaDataField, const QString& );
+ virtual void setMetaDataInternal( MetaDataField, const TQString& );
/**
* Use this in combination with the default implementation of lastError()
*/
- void setLastError( const QString& );
+ void setLastError( const TQString& );
private:
class Private;
diff --git a/libk3b/plugin/k3baudiooutputplugin.h b/libk3b/plugin/k3baudiooutputplugin.h
index 97e897a..fdd57a5 100644
--- a/libk3b/plugin/k3baudiooutputplugin.h
+++ b/libk3b/plugin/k3baudiooutputplugin.h
@@ -25,18 +25,19 @@
class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual ~K3bAudioOutputPlugin() {
}
- QString group() const { return "AudioOutput"; }
+ TQString group() const { return "AudioOutput"; }
/**
* This is the short name of the sound system which can be used
* to specify the sound system on the command line (like "arts", "alsa", or "oss")
*/
- virtual QCString soundSystem() const = 0;
+ virtual TQCString soundSystem() const = 0;
/**
* Initialize the plugin.
@@ -51,7 +52,7 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin
*/
virtual void cleanup() {}
- virtual QString lastErrorMessage() const { return QString::null; }
+ virtual TQString lastErrorMessage() const { return TQString(); }
/**
* Let there be sound...
@@ -61,8 +62,8 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin
virtual int write( char* data, int len ) = 0;
protected:
- K3bAudioOutputPlugin( QObject* parent = 0, const char* name = 0 )
- : K3bPlugin( parent, name ) {
+ K3bAudioOutputPlugin( TQObject* tqparent = 0, const char* name = 0 )
+ : K3bPlugin( tqparent, name ) {
}
};
diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp
index ecfb25f..3251ed5 100644
--- a/libk3b/plugin/k3baudioserver.cpp
+++ b/libk3b/plugin/k3baudioserver.cpp
@@ -89,8 +89,8 @@ private:
};
-K3bAudioServer::K3bAudioServer( QObject* parent, const char* name )
- : QObject( parent, name ),
+K3bAudioServer::K3bAudioServer( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name ),
m_usedOutputPlugin(0),
m_pluginInitialized(false),
m_client(0)
@@ -107,7 +107,7 @@ K3bAudioServer::~K3bAudioServer()
}
-bool K3bAudioServer::setOutputMethod( const QCString& name )
+bool K3bAudioServer::setOutputMethod( const TQCString& name )
{
if( K3bAudioOutputPlugin* p = findOutputPlugin( name ) ) {
setOutputPlugin( p );
@@ -153,8 +153,8 @@ void K3bAudioServer::attachClient( K3bAudioClient* c )
if( m_usedOutputPlugin && !m_pluginInitialized ) {
if( !m_usedOutputPlugin->init() ) {
emit error( i18n("Could not initialize Audio Output plugin %1 (%2)")
- .arg(m_usedOutputPlugin->pluginInfo().name())
- .arg(m_usedOutputPlugin->lastErrorMessage()) );
+ .tqarg(m_usedOutputPlugin->pluginInfo().name())
+ .tqarg(m_usedOutputPlugin->lastErrorMessage()) );
}
else
m_pluginInitialized = true;
@@ -184,11 +184,11 @@ void K3bAudioServer::detachClient( K3bAudioClient* c )
}
-K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const QCString& name )
+K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const TQCString& name )
{
- QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioOutput" );
+ TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioOutput" );
- for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) {
K3bAudioOutputPlugin* f = dynamic_cast<K3bAudioOutputPlugin*>( it.current() );
if( f && f->soundSystem() == name ) {
@@ -202,7 +202,7 @@ K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const QCString& name )
}
-void K3bAudioServer::customEvent( QCustomEvent* e )
+void K3bAudioServer::customEvent( TQCustomEvent* e )
{
if( K3bProgressInfoEvent* be = dynamic_cast<K3bProgressInfoEvent*>(e) ) {
if( be->type() == K3bProgressInfoEvent::InfoMessage ) {
diff --git a/libk3b/plugin/k3baudioserver.h b/libk3b/plugin/k3baudioserver.h
index 1e8d4a8..b428056 100644
--- a/libk3b/plugin/k3baudioserver.h
+++ b/libk3b/plugin/k3baudioserver.h
@@ -16,7 +16,7 @@
#ifndef _K3B_AUDIO_SERVER_H_
#define _K3B_AUDIO_SERVER_H_
-#include <qobject.h>
+#include <tqobject.h>
#include "k3b_export.h"
class K3bAudioOutputPlugin;
class K3bAudioClient;
@@ -26,18 +26,19 @@ class K3bAudioClient;
* The AudioServer manages AudioClients to play audio data through
* some output plugin.
*/
-class LIBK3B_EXPORT K3bAudioServer : public QObject
+class LIBK3B_EXPORT K3bAudioServer : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioServer( QObject* parent = 0, const char* name = 0 );
+ K3bAudioServer( TQObject* tqparent = 0, const char* name = 0 );
~K3bAudioServer();
/**
* Returns false in case the named output method could not be found.
*/
- bool setOutputMethod( const QCString& name );
+ bool setOutputMethod( const TQCString& name );
void setOutputPlugin( K3bAudioOutputPlugin* p );
/**
@@ -62,13 +63,13 @@ class LIBK3B_EXPORT K3bAudioServer : public QObject
/**
* Find a plugin by classname.
*/
- static K3bAudioOutputPlugin* findOutputPlugin( const QCString& name );
+ static K3bAudioOutputPlugin* findOutputPlugin( const TQCString& name );
signals:
- void error( const QString& );
+ void error( const TQString& );
private:
- void customEvent( QCustomEvent* e );
+ void customEvent( TQCustomEvent* e );
class Private;
friend class Private;
diff --git a/libk3b/plugin/k3bplugin.cpp b/libk3b/plugin/k3bplugin.cpp
index db75bb4..6929bd0 100644
--- a/libk3b/plugin/k3bplugin.cpp
+++ b/libk3b/plugin/k3bplugin.cpp
@@ -17,8 +17,8 @@
#include "k3bplugin.h"
-K3bPlugin::K3bPlugin( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bPlugin::K3bPlugin( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
}
@@ -28,7 +28,7 @@ K3bPlugin::~K3bPlugin()
}
-K3bPluginConfigWidget* K3bPlugin::createConfigWidget( QWidget*, const char* ) const
+K3bPluginConfigWidget* K3bPlugin::createConfigWidget( TQWidget*, const char* ) const
{
return 0;
}
diff --git a/libk3b/plugin/k3bplugin.h b/libk3b/plugin/k3bplugin.h
index f4501a7..1eeb622 100644
--- a/libk3b/plugin/k3bplugin.h
+++ b/libk3b/plugin/k3bplugin.h
@@ -17,7 +17,7 @@
#ifndef _K3B_PLUGIN_H_
#define _K3B_PLUGIN_H_
-#include <qobject.h>
+#include <tqobject.h>
#include <kgenericfactory.h>
#include "k3b_export.h"
@@ -25,7 +25,7 @@
class K3bPluginConfigWidget;
-class QWidget;
+class TQWidget;
@@ -37,13 +37,13 @@ class K3bPluginInfo
K3bPluginInfo() {
}
- K3bPluginInfo( QString libraryName,
- QString name,
- QString author,
- QString email,
- QString comment,
- QString version,
- QString licence )
+ K3bPluginInfo( TQString libraryName,
+ TQString name,
+ TQString author,
+ TQString email,
+ TQString comment,
+ TQString version,
+ TQString licence )
: m_libraryName(libraryName),
m_name(name),
m_author(author),
@@ -53,38 +53,39 @@ class K3bPluginInfo
m_licence(licence) {
}
- const QString& name() const { return m_name; }
- const QString& author() const { return m_author; }
- const QString& email() const { return m_email; }
- const QString& comment() const { return m_comment; }
- const QString& version() const { return m_version; }
- const QString& licence() const { return m_licence; }
+ const TQString& name() const { return m_name; }
+ const TQString& author() const { return m_author; }
+ const TQString& email() const { return m_email; }
+ const TQString& comment() const { return m_comment; }
+ const TQString& version() const { return m_version; }
+ const TQString& licence() const { return m_licence; }
- const QString& libraryName() const { return m_libraryName; }
+ const TQString& libraryName() const { return m_libraryName; }
private:
- QString m_libraryName;
-
- QString m_name;
- QString m_author;
- QString m_email;
- QString m_comment;
- QString m_version;
- QString m_licence;
+ TQString m_libraryName;
+
+ TQString m_name;
+ TQString m_author;
+ TQString m_email;
+ TQString m_comment;
+ TQString m_version;
+ TQString m_licence;
};
/**
* Base class for all plugins. You may use the K3bPluginFactory to make your plugin available.
*/
-class LIBK3B_EXPORT K3bPlugin : public QObject
+class LIBK3B_EXPORT K3bPlugin : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class K3bPluginManager;
public:
- K3bPlugin( QObject* parent = 0, const char* name = 0 );
+ K3bPlugin( TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bPlugin();
const K3bPluginInfo& pluginInfo() const { return m_pluginInfo; }
@@ -97,14 +98,14 @@ class LIBK3B_EXPORT K3bPlugin : public QObject
/**
* The plugin group.
*/
- virtual QString group() const = 0;
+ virtual TQString group() const = 0;
/**
* Returns a widget which configures the plugin.
*
* The caller has to destroy the widget
*/
- virtual K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, const char* name = 0 ) const;
+ virtual K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const;
private:
K3bPluginInfo m_pluginInfo;
diff --git a/libk3b/plugin/k3bpluginconfigwidget.cpp b/libk3b/plugin/k3bpluginconfigwidget.cpp
index 09b7f0b..b93fa9d 100644
--- a/libk3b/plugin/k3bpluginconfigwidget.cpp
+++ b/libk3b/plugin/k3bpluginconfigwidget.cpp
@@ -22,8 +22,8 @@
#include <kdebug.h>
-K3bPluginConfigWidget::K3bPluginConfigWidget( QWidget* parent, const char* name )
- : QWidget( parent, name )
+K3bPluginConfigWidget::K3bPluginConfigWidget( TQWidget* tqparent, const char* name )
+ : TQWidget( tqparent, name )
{
}
diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h
index baa07ab..3e5068d 100644
--- a/libk3b/plugin/k3bpluginconfigwidget.h
+++ b/libk3b/plugin/k3bpluginconfigwidget.h
@@ -17,15 +17,16 @@
#ifndef _K3B_PLUGIN_CONFIG_WIDGET_H_
#define _K3B_PLUGIN_CONFIG_WIDGET_H_
-#include <qwidget.h>
+#include <tqwidget.h>
#include "k3b_export.h"
-class LIBK3B_EXPORT K3bPluginConfigWidget : public QWidget
+class LIBK3B_EXPORT K3bPluginConfigWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bPluginConfigWidget( QWidget* parent = 0, const char* name = 0 );
+ K3bPluginConfigWidget( TQWidget* tqparent = 0, const char* name = 0 );
virtual ~K3bPluginConfigWidget();
public slots:
diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h
index 6dbc6cb..463703f 100644
--- a/libk3b/plugin/k3bpluginfactory.h
+++ b/libk3b/plugin/k3bpluginfactory.h
@@ -23,7 +23,7 @@
#include <klocale.h>
/**
- * Template based on KGenericFactory. This is just here to avoid using the QStringList args parameter
+ * Template based on KGenericFactory. This is just here to avoid using the TQStringList args parameter
* in every plugin's constructor.
*
* Use this as follows:
@@ -64,14 +64,14 @@ class K3bPluginFactory : public KLibFactory
}
}
- virtual QObject* createObject( QObject *parent, const char *name,
- const char*, const QStringList& ) {
+ virtual TQObject* createObject( TQObject *tqparent, const char *name,
+ const char*, const TQStringList& ) {
initializeMessageCatalogue();
- return new T( parent, name );
+ return new T( tqparent, name );
}
private:
- QCString m_instanceName;
+ TQCString m_instanceName;
bool m_catalogueInitialized;
static KInstance* s_instance;
diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp
index 3e963a2..5436251 100644
--- a/libk3b/plugin/k3bpluginmanager.cpp
+++ b/libk3b/plugin/k3bpluginmanager.cpp
@@ -27,23 +27,23 @@
#include <kmessagebox.h>
#include <klibloader.h>
-#include <qptrlist.h>
-#include <qmap.h>
-#include <qdir.h>
+#include <tqptrlist.h>
+#include <tqmap.h>
+#include <tqdir.h>
class K3bPluginManager::Private
{
public:
- QPtrList<K3bPlugin> plugins;
+ TQPtrList<K3bPlugin> plugins;
};
-K3bPluginManager::K3bPluginManager( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bPluginManager::K3bPluginManager( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
d = new Private();
}
@@ -56,14 +56,14 @@ K3bPluginManager::~K3bPluginManager()
-QStringList K3bPluginManager::groups() const
+TQStringList K3bPluginManager::groups() const
{
- QStringList grps;
+ TQStringList grps;
- QPtrList<K3bPlugin> fl;
- for( QPtrListIterator<K3bPlugin> it( d->plugins );
+ TQPtrList<K3bPlugin> fl;
+ for( TQPtrListIterator<K3bPlugin> it( d->plugins );
it.current(); ++it ) {
- if( !grps.contains( it.current()->group() ) )
+ if( !grps.tqcontains( it.current()->group() ) )
grps.append( it.current()->group() );
}
@@ -71,10 +71,10 @@ QStringList K3bPluginManager::groups() const
}
-QPtrList<K3bPlugin> K3bPluginManager::plugins( const QString& group ) const
+TQPtrList<K3bPlugin> K3bPluginManager::plugins( const TQString& group ) const
{
- QPtrList<K3bPlugin> fl;
- for( QPtrListIterator<K3bPlugin> it( d->plugins );
+ TQPtrList<K3bPlugin> fl;
+ for( TQPtrListIterator<K3bPlugin> it( d->plugins );
it.current(); ++it ) {
if( it.current()->group() == group || group.isEmpty() )
fl.append( it.current() );
@@ -83,12 +83,12 @@ QPtrList<K3bPlugin> K3bPluginManager::plugins( const QString& group ) const
}
-void K3bPluginManager::loadPlugin( const QString& fileName )
+void K3bPluginManager::loadPlugin( const TQString& fileName )
{
KSimpleConfig c( fileName, true );
c.setGroup( "K3b Plugin" );
- QString libName = c.readEntry( "Lib" );
+ TQString libName = c.readEntry( "Lib" );
if( libName.isEmpty() ) {
kdDebug() << "(K3bPluginManager) no Lib specified in " << fileName << endl;
return;
@@ -115,7 +115,7 @@ void K3bPluginManager::loadPlugin( const QString& fileName )
// make sure to only use the latest version of one plugin
bool addPlugin = true;
- for( QPtrListIterator<K3bPlugin> it( d->plugins ); *it; ++it ) {
+ for( TQPtrListIterator<K3bPlugin> it( d->plugins ); *it; ++it ) {
if( it.current()->pluginInfo().name() == plugin->pluginInfo().name() ) {
if( K3bVersion(it.current()->pluginInfo().version()) < K3bVersion(plugin->pluginInfo().version()) ) {
K3bPlugin* p = it.current();
@@ -145,12 +145,12 @@ void K3bPluginManager::loadPlugin( const QString& fileName )
void K3bPluginManager::loadAll()
{
// we simply search the K3b plugin dir for now
- QStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" );
+ TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" );
- for( QStringList::const_iterator it = dirs.begin();
+ for( TQStringList::const_iterator it = dirs.begin();
it != dirs.end(); ++it ) {
- QStringList entries = QDir(*it).entryList( "*.plugin", QDir::Files );
- for( QStringList::const_iterator it2 = entries.begin();
+ TQStringList entries = TQDir(*it).entryList( "*.plugin", TQDir::Files );
+ for( TQStringList::const_iterator it2 = entries.begin();
it2 != entries.end(); ++it2 ) {
loadPlugin( *it + *it2 );
}
@@ -163,25 +163,25 @@ int K3bPluginManager::pluginSystemVersion() const
}
-int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, QWidget* parent, const char* name )
+int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* tqparent, const char* name )
{
- KDialogBase dlg( parent,
+ KDialogBase dlg( tqparent,
name,
true,
- i18n("Configure plugin %1").arg( plugin->pluginInfo().name() ) );
+ i18n("Configure plugin %1").tqarg( plugin->pluginInfo().name() ) );
K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg );
if( configWidget ) {
dlg.setMainWidget( configWidget );
- connect( &dlg, SIGNAL(applyClicked()), configWidget, SLOT(saveConfig()) );
- connect( &dlg, SIGNAL(okClicked()), configWidget, SLOT(saveConfig()) );
+ connect( &dlg, TQT_SIGNAL(applyClicked()), configWidget, TQT_SLOT(saveConfig()) );
+ connect( &dlg, TQT_SIGNAL(okClicked()), configWidget, TQT_SLOT(saveConfig()) );
configWidget->loadConfig();
int r = dlg.exec();
delete configWidget;
return r;
}
else {
- KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").arg( plugin->pluginInfo().name() ) );
+ KMessageBox::sorry( tqparent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) );
return 0;
}
}
diff --git a/libk3b/plugin/k3bpluginmanager.h b/libk3b/plugin/k3bpluginmanager.h
index 9295dee..c047c1a 100644
--- a/libk3b/plugin/k3bpluginmanager.h
+++ b/libk3b/plugin/k3bpluginmanager.h
@@ -16,14 +16,14 @@
#ifndef _K3B_PLUGIN_MANAGER_H_
#define _K3B_PLUGIN_MANAGER_H_
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
#include "k3b_export.h"
class K3bPlugin;
-class QWidget;
+class TQWidget;
/**
@@ -32,23 +32,24 @@ class QWidget;
* Like the K3bCore the single instance (which has to be created manually)
* can be obtained with the k3bpluginmanager macro.
*/
-class LIBK3B_EXPORT K3bPluginManager : public QObject
+class LIBK3B_EXPORT K3bPluginManager : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bPluginManager( QObject* parent = 0, const char* name = 0 );
+ K3bPluginManager( TQObject* tqparent = 0, const char* name = 0 );
~K3bPluginManager();
/**
* if group is empty all plugins are returned
*/
- QPtrList<K3bPlugin> plugins( const QString& group = QString::null ) const;
+ TQPtrList<K3bPlugin> plugins( const TQString& group = TQString() ) const;
/**
* Returnes a list of the available groups.
*/
- QStringList groups() const;
+ TQStringList groups() const;
int pluginSystemVersion() const;
@@ -58,9 +59,9 @@ class LIBK3B_EXPORT K3bPluginManager : public QObject
*/
void loadAll();
- void loadPlugin( const QString& fileName );
+ void loadPlugin( const TQString& fileName );
- int execPluginDialog( K3bPlugin*, QWidget* parent = 0, const char* name = 0 );
+ int execPluginDialog( K3bPlugin*, TQWidget* tqparent = 0, const char* name = 0 );
private:
class Private;
diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h
index c15b9a3..a8d0c47 100644
--- a/libk3b/plugin/k3bprojectplugin.h
+++ b/libk3b/plugin/k3bprojectplugin.h
@@ -17,7 +17,7 @@
#define _K3B_PROJECT_PLUGIN_H_
#include <k3bplugin.h>
-#include <qstring.h>
+#include <tqstring.h>
#include "k3b_export.h"
class K3bDoc;
@@ -26,8 +26,8 @@ class K3bDoc;
* K3bProjectPluginGUIBase interface. That way K3b can embed the GUI into
* a fancy dialog which fits the overall look.
*
- * This is not derived from QWidget to make it possible to inherit
- * from other QWidget derivates.
+ * This is not derived from TQWidget to make it possible to inherit
+ * from other TQWidget derivates.
*/
class K3bProjectPluginGUIBase
{
@@ -35,13 +35,13 @@ class K3bProjectPluginGUIBase
K3bProjectPluginGUIBase() {}
virtual ~K3bProjectPluginGUIBase() {}
- virtual QWidget* qWidget() = 0;
+ virtual TQWidget* qWidget() = 0;
/**
* Title used for the GUI
*/
- virtual QString title() const = 0;
- virtual QString subTitle() const { return QString::null; }
+ virtual TQString title() const = 0;
+ virtual TQString subTitle() const { return TQString(); }
virtual void readSettings( KConfigBase* ) {}
virtual void saveSettings( KConfigBase* ) {}
@@ -68,6 +68,7 @@ class K3bProjectPluginGUIBase
class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -76,8 +77,8 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin
* @p activate() will not be used. A plugin has a GUI if it's functionality is started
* by some user input.
*/
- K3bProjectPlugin( int type, bool gui = false, QObject* parent = 0, const char* name = 0 )
- : K3bPlugin( parent, name ),
+ K3bProjectPlugin( int type, bool gui = false, TQObject* tqparent = 0, const char* name = 0 )
+ : K3bPlugin( tqparent, name ),
m_type(type),
m_hasGUI(gui) {
}
@@ -100,7 +101,7 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin
};
// TODO: maybe we should use something like "ProjectPlugin/AudioCD" based on the type?
- QString group() const { return "ProjectPlugin"; }
+ TQString group() const { return "ProjectPlugin"; }
/**
* audio, data, videocd, or videodvd
@@ -112,23 +113,23 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin
/**
* Text used for menu entries and the like.
*/
- const QString& text() const { return m_text; }
- const QString& toolTip() const { return m_toolTip; }
- const QString& whatsThis() const { return m_whatsThis; }
- const QString& icon() const { return m_icon; }
+ const TQString& text() const { return m_text; }
+ const TQString& toolTip() const { return m_toolTip; }
+ const TQString& whatsThis() const { return m_whatsThis; }
+ const TQString& icon() const { return m_icon; }
bool hasGUI() const { return m_hasGUI; }
/**
* Create the GUI which provides the features for the plugin.
* This only needs to be implemented in case hasGUI returns true.
- * The returned object has to be a QWidget based class.
+ * The returned object has to be a TQWidget based class.
*
* @param doc based on the type returned by the factory
* this will be the doc to work on. It should
* be dynamically casted to the needed project type.
*/
- virtual K3bProjectPluginGUIBase* createGUI( K3bDoc* doc, QWidget* = 0, const char* = 0 ) { Q_UNUSED(doc); return 0; }
+ virtual K3bProjectPluginGUIBase* createGUI( K3bDoc* doc, TQWidget* = 0, const char* = 0 ) { Q_UNUSED(doc); return 0; }
/**
* This is where the action happens.
@@ -138,23 +139,23 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin
* this will be the doc to work on. It should
* be dynamically casted to the needed project type.
*
- * @param parent the parent widget to be used for things like progress dialogs.
+ * @param tqparent the tqparent widget to be used for things like progress dialogs.
*/
- virtual void activate( K3bDoc* doc, QWidget* parent ) { Q_UNUSED(doc); Q_UNUSED(parent); }
+ virtual void activate( K3bDoc* doc, TQWidget* tqparent ) { Q_UNUSED(doc); Q_UNUSED(tqparent); }
protected:
- void setText( const QString& s ) { m_text = s; }
- void setToolTip( const QString& s ) { m_toolTip = s; }
- void setWhatsThis( const QString& s ) { m_whatsThis = s; }
- void setIcon( const QString& s ) { m_icon = s; }
+ void setText( const TQString& s ) { m_text = s; }
+ void setToolTip( const TQString& s ) { m_toolTip = s; }
+ void setWhatsThis( const TQString& s ) { m_whatsThis = s; }
+ void setIcon( const TQString& s ) { m_icon = s; }
private:
int m_type;
bool m_hasGUI;
- QString m_text;
- QString m_toolTip;
- QString m_whatsThis;
- QString m_icon;
+ TQString m_text;
+ TQString m_toolTip;
+ TQString m_whatsThis;
+ TQString m_icon;
};
diff --git a/libk3b/plugin/libsamplerate/samplerate.h b/libk3b/plugin/libsamplerate/samplerate.h
index dfc4448..f83ae48 100644
--- a/libk3b/plugin/libsamplerate/samplerate.h
+++ b/libk3b/plugin/libsamplerate/samplerate.h
@@ -123,8 +123,8 @@ const char* src_strerror (int error) ;
enum
{
- SRC_SINC_BEST_QUALITY = 0,
- SRC_SINC_MEDIUM_QUALITY = 1,
+ SRC_SINC_BEST_TQUALITY = 0,
+ SRC_SINC_MEDIUM_TQUALITY = 1,
SRC_SINC_FASTEST = 2,
SRC_ZERO_ORDER_HOLD = 3,
SRC_LINEAR = 4
diff --git a/libk3b/plugin/libsamplerate/src_sinc.c b/libk3b/plugin/libsamplerate/src_sinc.c
index ddfc06b..cca8b64 100644
--- a/libk3b/plugin/libsamplerate/src_sinc.c
+++ b/libk3b/plugin/libsamplerate/src_sinc.c
@@ -114,10 +114,10 @@ const char*
sinc_get_name (int src_enum)
{
switch (src_enum)
- { case SRC_SINC_BEST_QUALITY :
+ { case SRC_SINC_BEST_TQUALITY :
return "Best Sinc Interpolator" ;
- case SRC_SINC_MEDIUM_QUALITY :
+ case SRC_SINC_MEDIUM_TQUALITY :
return "Medium Sinc Interpolator" ;
case SRC_SINC_FASTEST :
@@ -131,10 +131,10 @@ const char*
sinc_get_description (int src_enum)
{
switch (src_enum)
- { case SRC_SINC_BEST_QUALITY :
+ { case SRC_SINC_BEST_TQUALITY :
return "Band limitied sinc interpolation, best quality, 97dB SNR, 96% BW." ;
- case SRC_SINC_MEDIUM_QUALITY :
+ case SRC_SINC_MEDIUM_TQUALITY :
return "Band limitied sinc interpolation, medium quality, 97dB SNR, 90% BW." ;
case SRC_SINC_FASTEST :
@@ -170,7 +170,7 @@ sinc_set_converter (SRC_PRIVATE *psrc, int src_enum)
psrc->reset = sinc_reset ;
switch (src_enum)
- { case SRC_SINC_BEST_QUALITY :
+ { case SRC_SINC_BEST_TQUALITY :
temp_filter.coeffs = high_qual_coeffs ;
temp_filter.coeff_half_len = (sizeof (high_qual_coeffs) / sizeof (coeff_t)) - 1 ;
temp_filter.index_inc = 128 ;
@@ -178,7 +178,7 @@ sinc_set_converter (SRC_PRIVATE *psrc, int src_enum)
temp_filter.coeff_len = sizeof (high_qual_coeffs) / sizeof (coeff_t) ;
break ;
- case SRC_SINC_MEDIUM_QUALITY :
+ case SRC_SINC_MEDIUM_TQUALITY :
temp_filter.coeffs = mid_qual_coeffs ;
temp_filter.coeff_half_len = (sizeof (mid_qual_coeffs) / sizeof (coeff_t)) - 1 ;
temp_filter.index_inc = 128 ;
diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
index 8429f25..f8a5b71 100644
--- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
+++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
@@ -21,28 +21,28 @@
#include <k3btrack.h>
#include <k3bcore.h>
-#include <qdatastream.h>
-#include <qcstring.h>
+#include <tqdatastream.h>
+#include <tqcstring.h>
// FIXME: multiple tracks
-K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValueList<int>& cdTrackNumbers,
+K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const TQValueList<int>& cdTrackNumbers,
const K3bCddbResultEntry& cddb,
- K3bDevice::Device* lastDev, QWidget* dragSource, const char* name )
- : QStoredDrag( "k3b/audio_track_drag", dragSource, name ),
+ K3bDevice::Device* lastDev, TQWidget* dragSource, const char* name )
+ : TQStoredDrag( "k3b/audio_track_drag", dragSource, name ),
m_toc(toc),
m_cdTrackNumbers(cdTrackNumbers),
m_cddb(cddb),
m_device(lastDev)
{
- QByteArray data;
- QDataStream s( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream s( data, IO_WriteOnly );
s << (unsigned int)toc.count();
for( K3bDevice::Toc::const_iterator it = toc.begin(); it != toc.end(); ++it ) {
const K3bDevice::Track& track = *it;
s << track.firstSector().lba() << track.lastSector().lba();
}
- QTextStream t( s.device() );
+ TQTextStream t( s.device() );
t << cddb.cdArtist << endl
<< cddb.cdTitle << endl;
for( unsigned int i = 0; i < toc.count(); ++i ) {
@@ -52,7 +52,7 @@ K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValu
s << (unsigned int)cdTrackNumbers.count();
- for( QValueList<int>::const_iterator it = cdTrackNumbers.begin();
+ for( TQValueList<int>::const_iterator it = cdTrackNumbers.begin();
it != cdTrackNumbers.end(); ++it )
s << *it;
@@ -66,13 +66,13 @@ K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValu
}
-bool K3bAudioCdTrackDrag::decode( const QMimeSource* e,
- K3bDevice::Toc& toc, QValueList<int>& trackNumbers,
+bool K3bAudioCdTrackDrag::decode( const TQMimeSource* e,
+ K3bDevice::Toc& toc, TQValueList<int>& trackNumbers,
K3bCddbResultEntry& cddb, K3bDevice::Device** dev )
{
- QByteArray data = e->encodedData( "k3b/audio_track_drag" );
+ TQByteArray data = e->tqencodedData( "k3b/audio_track_drag" );
- QDataStream s( data, IO_ReadOnly );
+ TQDataStream s( data, IO_ReadOnly );
unsigned int trackCnt;
s >> trackCnt;
@@ -83,7 +83,7 @@ bool K3bAudioCdTrackDrag::decode( const QMimeSource* e,
toc.append( K3bDevice::Track( fs, ls, K3bDevice::Track::AUDIO ) );
}
- QTextStream t( s.device() );
+ TQTextStream t( s.device() );
cddb.artists.clear();
cddb.titles.clear();
cddb.cdArtist = t.readLine();
@@ -101,7 +101,7 @@ bool K3bAudioCdTrackDrag::decode( const QMimeSource* e,
trackNumbers.append( trackNumber );
}
- QString devName = t.readLine();
+ TQString devName = t.readLine();
if( dev && !devName.isEmpty() )
*dev = k3bcore->deviceManager()->findDevice( devName );
diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.h b/libk3b/projects/audiocd/k3baudiocdtrackdrag.h
index 3148466..f88c4e5 100644
--- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.h
+++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.h
@@ -16,33 +16,33 @@
#ifndef _K3B_AUDIO_CDTRACK_DRAG_H_
#define _K3B_AUDIO_CDTRACK_DRAG_H_
-#include <qdragobject.h>
-#include <qcstring.h>
-#include <qvaluelist.h>
+#include <tqdragobject.h>
+#include <tqcstring.h>
+#include <tqvaluelist.h>
#include <k3btoc.h>
#include <k3bcddbresult.h>
#include <k3bdevice.h>
#include "k3b_export.h"
-class LIBK3B_EXPORT K3bAudioCdTrackDrag : public QStoredDrag
+class LIBK3B_EXPORT K3bAudioCdTrackDrag : public TQStoredDrag
{
public:
- K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValueList<int>& cdTrackNumbers, const K3bCddbResultEntry& cddb,
- K3bDevice::Device* lastDev = 0, QWidget* dragSource = 0, const char* name = 0 );
+ K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const TQValueList<int>& cdTrackNumbers, const K3bCddbResultEntry& cddb,
+ K3bDevice::Device* lastDev = 0, TQWidget* dragSource = 0, const char* name = 0 );
const K3bDevice::Toc& toc() const { return m_toc; }
- const QValueList<int>& cdTrackNumbers() const { return m_cdTrackNumbers; }
+ const TQValueList<int>& cdTrackNumbers() const { return m_cdTrackNumbers; }
const K3bCddbResultEntry& cddbEntry() const { return m_cddb; }
bool provides( const char* mimetype ) const { return !qstrcmp( mimetype, "k3b/audio_track_drag" ); }
- static bool canDecode( const QMimeSource* s ) { return s->provides( "k3b/audio_track_drag" ); }
- static bool decode( const QMimeSource* s, K3bDevice::Toc&, QValueList<int>& trackNumbers, K3bCddbResultEntry&, K3bDevice::Device** dev = 0 );
+ static bool canDecode( const TQMimeSource* s ) { return s->provides( "k3b/audio_track_drag" ); }
+ static bool decode( const TQMimeSource* s, K3bDevice::Toc&, TQValueList<int>& trackNumbers, K3bCddbResultEntry&, K3bDevice::Device** dev = 0 );
private:
K3bDevice::Toc m_toc;
- QValueList<int> m_cdTrackNumbers;
+ TQValueList<int> m_cdTrackNumbers;
K3bCddbResultEntry m_cddb;
K3bDevice::Device* m_device;
};
diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
index b61e865..6319086 100644
--- a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
+++ b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
@@ -45,8 +45,8 @@ K3bAudioCdTrackSource::K3bAudioCdTrackSource( const K3bDevice::Toc& toc, int cdT
K3bAudioCdTrackSource::K3bAudioCdTrackSource( unsigned int discid, const K3b::Msf& length, int cdTrackNumber,
- const QString& artist, const QString& title,
- const QString& cdArtist, const QString& cdTitle )
+ const TQString& artist, const TQString& title,
+ const TQString& cdArtist, const TQString& cdTitle )
: K3bAudioDataSource(),
m_discId( discid ),
m_length( length ),
@@ -56,8 +56,8 @@ K3bAudioCdTrackSource::K3bAudioCdTrackSource( unsigned int discid, const K3b::Ms
m_initialized( false )
{
for( int i = 1; i < cdTrackNumber; ++i ) {
- m_cddbEntry.titles.append( QString::null );
- m_cddbEntry.artists.append( QString::null );
+ m_cddbEntry.titles.append( TQString() );
+ m_cddbEntry.artists.append( TQString() );
}
m_cddbEntry.titles.append( title );
m_cddbEntry.artists.append( artist );
@@ -98,10 +98,10 @@ bool K3bAudioCdTrackSource::initParanoia()
// ask here for the cd since searchForAudioCD() may also be called from outside
if( !m_lastUsedDevice ) {
// could not find the CD, so ask for it
- QString s = i18n("Please insert Audio CD %1%2")
- .arg(m_discId, 0, 16)
- .arg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty()
- ? QString::null
+ TQString s = i18n("Please insert Audio CD %1%2")
+ .tqarg(m_discId, 0, 16)
+ .tqarg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty()
+ ? TQString()
: " (" + m_cddbEntry.cdArtist + " - " + m_cddbEntry.cdTitle + ")");
while( K3bDevice::Device* dev = K3bThreadWidget::selectDevice( track()->doc()->view(), s ) ) {
@@ -163,8 +163,8 @@ K3bDevice::Device* K3bAudioCdTrackSource::searchForAudioCD() const
if( m_lastUsedDevice && searchForAudioCD( m_lastUsedDevice ) )
return m_lastUsedDevice;
- const QPtrList<K3bDevice::Device>& devices = k3bcore->deviceManager()->readingDevices();
- for( QPtrListIterator<K3bDevice::Device> it(devices); *it; ++it ) {
+ const TQPtrList<K3bDevice::Device>& devices = k3bcore->deviceManager()->readingDevices();
+ for( TQPtrListIterator<K3bDevice::Device> it(devices); *it; ++it ) {
if( searchForAudioCD( *it ) ) {
return *it;
}
@@ -244,15 +244,15 @@ int K3bAudioCdTrackSource::read( char* data, unsigned int )
}
-QString K3bAudioCdTrackSource::type() const
+TQString K3bAudioCdTrackSource::type() const
{
return i18n("CD Track");
}
-QString K3bAudioCdTrackSource::sourceComment() const
+TQString K3bAudioCdTrackSource::sourceComment() const
{
- return i18n("Track %1 from Audio CD %2").arg(m_cdTrackNumber).arg(m_discId,0,16);
+ return i18n("Track %1 from Audio CD %2").tqarg(m_cdTrackNumber).tqarg(m_discId,0,16);
}
diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.h b/libk3b/projects/audiocd/k3baudiocdtracksource.h
index 6eaaa5b..b6e4ea4 100644
--- a/libk3b/projects/audiocd/k3baudiocdtracksource.h
+++ b/libk3b/projects/audiocd/k3baudiocdtracksource.h
@@ -50,8 +50,8 @@ class LIBK3B_EXPORT K3bAudioCdTrackSource : public K3bAudioDataSource
* Constructor to create sources when loading from a project file without toc information
*/
K3bAudioCdTrackSource( unsigned int discid, const K3b::Msf& length, int cdTrackNumber,
- const QString& artist, const QString& title,
- const QString& cdartist, const QString& cdtitle );
+ const TQString& artist, const TQString& title,
+ const TQString& cdartist, const TQString& cdtitle );
K3bAudioCdTrackSource( const K3bAudioCdTrackSource& );
~K3bAudioCdTrackSource();
@@ -62,8 +62,8 @@ class LIBK3B_EXPORT K3bAudioCdTrackSource : public K3bAudioDataSource
K3b::Msf originalLength() const;
bool seek( const K3b::Msf& );
int read( char* data, unsigned int max );
- QString type() const;
- QString sourceComment() const;
+ TQString type() const;
+ TQString sourceComment() const;
K3bAudioDataSource* copy() const;
/**
diff --git a/libk3b/projects/audiocd/k3baudiodatasource.h b/libk3b/projects/audiocd/k3baudiodatasource.h
index d12fd10..5ac7336 100644
--- a/libk3b/projects/audiocd/k3baudiodatasource.h
+++ b/libk3b/projects/audiocd/k3baudiodatasource.h
@@ -79,12 +79,12 @@ class LIBK3B_EXPORT K3bAudioDataSource
/**
* Type of the data in readable form.
*/
- virtual QString type() const = 0;
+ virtual TQString type() const = 0;
/**
* The source in readable form (this is the filename for files)
*/
- virtual QString sourceComment() const = 0;
+ virtual TQString sourceComment() const = 0;
/**
* Used in case an error occurred. For now this is used if the
@@ -150,7 +150,7 @@ class LIBK3B_EXPORT K3bAudioDataSource
protected:
/**
- * Informs the parent track about changes.
+ * Informs the tqparent track about changes.
*/
void emitChange();
diff --git a/libk3b/projects/audiocd/k3baudiodatasourceiterator.h b/libk3b/projects/audiocd/k3baudiodatasourceiterator.h
index 7a0ce59..f340fce 100644
--- a/libk3b/projects/audiocd/k3baudiodatasourceiterator.h
+++ b/libk3b/projects/audiocd/k3baudiodatasourceiterator.h
@@ -26,7 +26,7 @@ class K3bAudioDoc;
*
* Be aware that this iterator does not properly update when the doc
* changes. A manual update can be issued with first(). This is becasue
- * an update would either involve slots (this being a QObject) which is
+ * an update would either involve slots (this being a TQObject) which is
* too much overhead or the AudioDoc would need to have knowledge of all
* the iterators which is also overhead that would be overkill.
*/
diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp
index e7661ba..817d5fa 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
@@ -29,16 +29,16 @@
// QT-includes
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdatastream.h>
-#include <qdir.h>
-#include <qdom.h>
-#include <qdatetime.h>
-#include <qtextstream.h>
-#include <qsemaphore.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdatastream.h>
+#include <tqdir.h>
+#include <tqdom.h>
+#include <tqdatetime.h>
+#include <tqtextstream.h>
+#include <tqsemaphore.h>
// KDE-includes
#include <kprocess.h>
@@ -69,8 +69,8 @@ public:
};
-K3bAudioDoc::K3bAudioDoc( QObject* parent )
- : K3bDoc( parent ),
+K3bAudioDoc::K3bAudioDoc( TQObject* tqparent )
+ : K3bDoc( tqparent ),
m_firstTrack(0),
m_lastTrack(0)
{
@@ -111,7 +111,7 @@ bool K3bAudioDoc::newDocument()
}
-QString K3bAudioDoc::name() const
+TQString K3bAudioDoc::name() const
{
if( !m_cdTextData.title().isEmpty() )
return m_cdTextData.title();
@@ -212,7 +212,7 @@ KURL::List K3bAudioDoc::extractUrlList( const KURL::List& urls )
while( it != allUrls.end() ) {
const KURL& url = *it;
- QFileInfo fi( url.path() );
+ TQFileInfo fi( url.path() );
if( !url.isLocalFile() ) {
kdDebug() << url.path() << " no local file" << endl;
@@ -227,11 +227,11 @@ KURL::List K3bAudioDoc::extractUrlList( const KURL::List& urls )
else if( fi.isDir() ) {
it = allUrls.remove( it );
// add all files in the dir
- QDir dir(fi.filePath());
- QStringList entries = dir.entryList( QDir::Files );
+ TQDir dir(fi.filePath());
+ TQStringList entries = dir.entryList( TQDir::Files );
KURL::List::iterator oldIt = it;
// add all files into the list after the current item
- for( QStringList::iterator dirIt = entries.begin();
+ for( TQStringList::iterator dirIt = entries.begin();
dirIt != entries.end(); ++dirIt )
it = allUrls.insert( oldIt, KURL::fromPathOrURL( dir.absPath() + "/" + *dirIt ) );
}
@@ -256,14 +256,14 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist )
// check if the file is a m3u playlist
// and if so add all listed files
- QFile f( url.path() );
+ TQFile f( url.path() );
if( !f.open( IO_ReadOnly ) )
return false;
- QTextStream t( &f );
+ TQTextStream t( &f );
char buf[7];
t.readRawBytes( buf, 7 );
- if( QString::fromLatin1( buf, 7 ) != "#EXTM3U" )
+ if( TQString::tqfromLatin1( buf, 7 ) != "#EXTM3U" )
return false;
// skip the first line
@@ -271,7 +271,7 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist )
// read the file
while( !t.atEnd() ) {
- QString line = t.readLine();
+ TQString line = t.readLine();
if( line[0] != '#' ) {
KURL mp3url;
// relative paths
@@ -288,11 +288,11 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist )
}
-void K3bAudioDoc::addSources( K3bAudioTrack* parent,
+void K3bAudioDoc::addSources( K3bAudioTrack* tqparent,
const KURL::List& urls,
K3bAudioDataSource* sourceAfter )
{
- kdDebug() << "(K3bAudioDoc::addSources( " << parent << ", "
+ kdDebug() << "(K3bAudioDoc::addSources( " << tqparent << ", "
<< urls.first().path() << ", "
<< sourceAfter << " )" << endl;
KURL::List allUrls = extractUrlList( urls );
@@ -302,7 +302,7 @@ void K3bAudioDoc::addSources( K3bAudioTrack* parent,
if( sourceAfter )
file->moveAfter( sourceAfter );
else
- file->moveAhead( parent->firstSource() );
+ file->moveAhead( tqparent->firstSource() );
sourceAfter = file;
}
}
@@ -312,7 +312,7 @@ void K3bAudioDoc::addSources( K3bAudioTrack* parent,
}
-K3bAudioTrack* K3bAudioDoc::importCueFile( const QString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder )
+K3bAudioTrack* K3bAudioDoc::importCueFile( const TQString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder )
{
if( !after )
after = m_lastTrack;
@@ -382,7 +382,7 @@ K3bAudioDecoder* K3bAudioDoc::getDecoderForUrl( const KURL& url, bool* reused )
K3bAudioDecoder* decoder = 0;
// check if we already have a proper decoder
- if( m_decoderPresenceMap.contains( url.path() ) ) {
+ if( m_decoderPresenceMap.tqcontains( url.path() ) ) {
decoder = m_decoderPresenceMap[url.path()];
*reused = true;
}
@@ -400,7 +400,7 @@ K3bAudioDecoder* K3bAudioDoc::getDecoderForUrl( const KURL& url, bool* reused )
K3bAudioFile* K3bAudioDoc::createAudioFile( const KURL& url )
{
- if( !QFile::exists( url.path() ) ) {
+ if( !TQFile::exists( url.path() ) ) {
m_notFoundFiles.append( url.path() );
kdDebug() << "(K3bAudioDoc) could not find file " << url.path() << endl;
return 0;
@@ -488,24 +488,24 @@ void K3bAudioDoc::moveTrack( K3bAudioTrack* track, K3bAudioTrack* after )
}
-QString K3bAudioDoc::typeString() const
+TQString K3bAudioDoc::typeString() const
{
return "audio";
}
-bool K3bAudioDoc::loadDocumentData( QDomElement* root )
+bool K3bAudioDoc::loadDocumentData( TQDomElement* root )
{
newDocument();
// we will parse the dom-tree and create a K3bAudioTrack for all entries immediately
// this should not take long and so not block the gui
- QDomNodeList nodes = root->childNodes();
+ TQDomNodeList nodes = root->childNodes();
for( uint i = 0; i < nodes.count(); i++ ) {
- QDomElement e = nodes.item(i).toElement();
+ TQDomElement e = nodes.item(i).toElement();
if( e.isNull() )
return false;
@@ -522,7 +522,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root )
setHideFirstTrack( e.text() == "yes" );
else if( e.nodeName() == "audio_ripping" ) {
- QDomNodeList ripNodes = e.childNodes();
+ TQDomNodeList ripNodes = e.childNodes();
for( uint j = 0; j < ripNodes.length(); j++ ) {
if( ripNodes.item(j).nodeName() == "paranoia_mode" )
setAudioRippingParanoiaMode( ripNodes.item(j).toElement().text().toInt() );
@@ -540,7 +540,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root )
writeCdText( e.attributeNode( "activated" ).value() == "yes" );
- QDomNodeList cdTextNodes = e.childNodes();
+ TQDomNodeList cdTextNodes = e.childNodes();
for( uint j = 0; j < cdTextNodes.length(); j++ ) {
if( cdTextNodes.item(j).nodeName() == "title" )
setTitle( cdTextNodes.item(j).toElement().text() );
@@ -570,11 +570,11 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root )
else if( e.nodeName() == "contents" ) {
- QDomNodeList contentNodes = e.childNodes();
+ TQDomNodeList contentNodes = e.childNodes();
for( uint j = 0; j< contentNodes.length(); j++ ) {
- QDomElement trackElem = contentNodes.item(j).toElement();
+ TQDomElement trackElem = contentNodes.item(j).toElement();
// first of all we need a track
K3bAudioTrack* track = new K3bAudioTrack();
@@ -582,7 +582,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root )
// backwards compatibility
// -----------------------------------------------------------------------------------------------------
- QDomAttr oldUrlAttr = trackElem.attributeNode( "url" );
+ TQDomAttr oldUrlAttr = trackElem.attributeNode( "url" );
if( !oldUrlAttr.isNull() ) {
if( K3bAudioFile* file =
createAudioFile( KURL::fromPathOrURL( oldUrlAttr.value() ) ) ) {
@@ -592,13 +592,13 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root )
// -----------------------------------------------------------------------------------------------------
- QDomNodeList trackNodes = trackElem.childNodes();
+ TQDomNodeList trackNodes = trackElem.childNodes();
for( uint trackJ = 0; trackJ < trackNodes.length(); trackJ++ ) {
if( trackNodes.item(trackJ).nodeName() == "sources" ) {
- QDomNodeList sourcesNodes = trackNodes.item(trackJ).childNodes();
+ TQDomNodeList sourcesNodes = trackNodes.item(trackJ).childNodes();
for( unsigned int sourcesIndex = 0; sourcesIndex < sourcesNodes.length(); sourcesIndex++ ) {
- QDomElement sourceElem = sourcesNodes.item(sourcesIndex).toElement();
+ TQDomElement sourceElem = sourcesNodes.item(sourcesIndex).toElement();
if( sourceElem.nodeName() == "file" ) {
if( K3bAudioFile* file =
createAudioFile( KURL::fromPathOrURL( sourceElem.attributeNode( "url" ).value() ) ) ) {
@@ -616,11 +616,11 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root )
K3b::Msf length = K3b::Msf::fromString( sourceElem.attributeNode( "length" ).value() );
int titlenum = 0;
unsigned int discid = 0;
- QString title, artist, cdTitle, cdArtist;
+ TQString title, artist, cdTitle, cdArtist;
- QDomNodeList cdTrackSourceNodes = sourceElem.childNodes();
+ TQDomNodeList cdTrackSourceNodes = sourceElem.childNodes();
for( unsigned int cdTrackSourceIndex = 0; cdTrackSourceIndex < cdTrackSourceNodes.length(); ++cdTrackSourceIndex ) {
- QDomElement cdTrackSourceItemElem = cdTrackSourceNodes.item(cdTrackSourceIndex).toElement();
+ TQDomElement cdTrackSourceItemElem = cdTrackSourceNodes.item(cdTrackSourceIndex).toElement();
if( cdTrackSourceItemElem.nodeName() == "title_number" )
titlenum = cdTrackSourceItemElem.text().toInt();
else if( cdTrackSourceItemElem.nodeName() == "disc_id" )
@@ -657,7 +657,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root )
// load cd-text
else if( trackNodes.item(trackJ).nodeName() == "cd-text" ) {
- QDomNodeList cdTextNodes = trackNodes.item(trackJ).childNodes();
+ TQDomNodeList cdTextNodes = trackNodes.item(trackJ).childNodes();
for( uint trackCdTextJ = 0; trackCdTextJ < cdTextNodes.length(); trackCdTextJ++ ) {
if( cdTextNodes.item(trackCdTextJ).nodeName() == "title" )
track->setTitle( cdTextNodes.item(trackCdTextJ).toElement().text() );
@@ -713,33 +713,33 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root )
return true;
}
-bool K3bAudioDoc::saveDocumentData( QDomElement* docElem )
+bool K3bAudioDoc::saveDocumentData( TQDomElement* docElem )
{
- QDomDocument doc = docElem->ownerDocument();
+ TQDomDocument doc = docElem->ownerDocument();
saveGeneralDocumentData( docElem );
// add normalize
- QDomElement normalizeElem = doc.createElement( "normalize" );
+ TQDomElement normalizeElem = doc.createElement( "normalize" );
normalizeElem.appendChild( doc.createTextNode( normalize() ? "yes" : "no" ) );
docElem->appendChild( normalizeElem );
// add hide track
- QDomElement hideFirstTrackElem = doc.createElement( "hide_first_track" );
+ TQDomElement hideFirstTrackElem = doc.createElement( "hide_first_track" );
hideFirstTrackElem.appendChild( doc.createTextNode( hideFirstTrack() ? "yes" : "no" ) );
docElem->appendChild( hideFirstTrackElem );
// save the audio cd ripping settings
// paranoia mode, read retries, and ignore read errors
// ------------------------------------------------------------
- QDomElement ripMain = doc.createElement( "audio_ripping" );
+ TQDomElement ripMain = doc.createElement( "audio_ripping" );
docElem->appendChild( ripMain );
- QDomElement ripElem = doc.createElement( "paranoia_mode" );
- ripElem.appendChild( doc.createTextNode( QString::number( audioRippingParanoiaMode() ) ) );
+ TQDomElement ripElem = doc.createElement( "paranoia_mode" );
+ ripElem.appendChild( doc.createTextNode( TQString::number( audioRippingParanoiaMode() ) ) );
ripMain.appendChild( ripElem );
ripElem = doc.createElement( "read_retries" );
- ripElem.appendChild( doc.createTextNode( QString::number( audioRippingRetries() ) ) );
+ ripElem.appendChild( doc.createTextNode( TQString::number( audioRippingRetries() ) ) );
ripMain.appendChild( ripElem );
ripElem = doc.createElement( "ignore_read_errors" );
@@ -749,9 +749,9 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem )
// save disc cd-text
// -------------------------------------------------------------
- QDomElement cdTextMain = doc.createElement( "cd-text" );
+ TQDomElement cdTextMain = doc.createElement( "cd-text" );
cdTextMain.setAttribute( "activated", cdText() ? "yes" : "no" );
- QDomElement cdTextElem = doc.createElement( "title" );
+ TQDomElement cdTextElem = doc.createElement( "title" );
cdTextElem.appendChild( doc.createTextNode( (title())) );
cdTextMain.appendChild( cdTextElem );
@@ -788,42 +788,42 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem )
// save the tracks
// -------------------------------------------------------------
- QDomElement contentsElem = doc.createElement( "contents" );
+ TQDomElement contentsElem = doc.createElement( "contents" );
for( K3bAudioTrack* track = firstTrack(); track != 0; track = track->next() ) {
- QDomElement trackElem = doc.createElement( "track" );
+ TQDomElement trackElem = doc.createElement( "track" );
// add sources
- QDomElement sourcesParent = doc.createElement( "sources" );
+ TQDomElement sourcesParent = doc.createElement( "sources" );
for( K3bAudioDataSource* source = track->firstSource(); source; source = source->next() ) {
// TODO: save a source element with a type attribute and start- and endoffset
// then distict between the different source types.
if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>(source) ) {
- QDomElement sourceElem = doc.createElement( "file" );
+ TQDomElement sourceElem = doc.createElement( "file" );
sourceElem.setAttribute( "url", file->filename() );
sourceElem.setAttribute( "start_offset", file->startOffset().toString() );
sourceElem.setAttribute( "end_offset", file->endOffset().toString() );
sourcesParent.appendChild( sourceElem );
}
else if( K3bAudioZeroData* zero = dynamic_cast<K3bAudioZeroData*>(source) ) {
- QDomElement sourceElem = doc.createElement( "silence" );
+ TQDomElement sourceElem = doc.createElement( "silence" );
sourceElem.setAttribute( "length", zero->length().toString() );
sourcesParent.appendChild( sourceElem );
}
else if( K3bAudioCdTrackSource* cdTrack = dynamic_cast<K3bAudioCdTrackSource*>(source) ) {
- QDomElement sourceElem = doc.createElement( "cdtrack" );
+ TQDomElement sourceElem = doc.createElement( "cdtrack" );
sourceElem.setAttribute( "length", cdTrack->originalLength().toString() );
sourceElem.setAttribute( "start_offset", cdTrack->startOffset().toString() );
sourceElem.setAttribute( "end_offset", cdTrack->endOffset().toString() );
- QDomElement subElem = doc.createElement( "title_number" );
- subElem.appendChild( doc.createTextNode( QString::number(cdTrack->cdTrackNumber()) ) );
+ TQDomElement subElem = doc.createElement( "title_number" );
+ subElem.appendChild( doc.createTextNode( TQString::number(cdTrack->cdTrackNumber()) ) );
sourceElem.appendChild( subElem );
subElem = doc.createElement( "disc_id" );
- subElem.appendChild( doc.createTextNode( QString::number(cdTrack->discId(), 16) ) );
+ subElem.appendChild( doc.createTextNode( TQString::number(cdTrack->discId(), 16) ) );
sourceElem.appendChild( subElem );
subElem = doc.createElement( "title" );
@@ -852,7 +852,7 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem )
trackElem.appendChild( sourcesParent );
// index 0
- QDomElement index0Elem = doc.createElement( "index0" );
+ TQDomElement index0Elem = doc.createElement( "index0" );
index0Elem.appendChild( doc.createTextNode( track->index0().toString() ) );
trackElem.appendChild( index0Elem );
@@ -891,7 +891,7 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem )
trackElem.appendChild( cdTextMain );
// add copy protection
- QDomElement copyElem = doc.createElement( "copy_protection" );
+ TQDomElement copyElem = doc.createElement( "copy_protection" );
copyElem.appendChild( doc.createTextNode( track->copyProtection() ? "yes" : "no" ) );
trackElem.appendChild( copyElem );
@@ -916,20 +916,20 @@ int K3bAudioDoc::numOfTracks() const
}
-K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent )
+K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
{
- return new K3bAudioJob( this, hdl, parent );
+ return new K3bAudioJob( this, hdl, tqparent );
}
void K3bAudioDoc::informAboutNotFoundFiles()
{
if( !m_notFoundFiles.isEmpty() ) {
- QStringList l;
+ TQStringList l;
for( KURL::List::const_iterator it = m_notFoundFiles.begin();
it != m_notFoundFiles.end(); ++it )
l.append( (*it).path() );
- KMessageBox::informationList( qApp->activeWindow(),
+ KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()),
i18n("Could not find the following files:"),
l,
i18n("Not Found") );
@@ -937,11 +937,11 @@ void K3bAudioDoc::informAboutNotFoundFiles()
m_notFoundFiles.clear();
}
if( !m_unknownFileFormatFiles.isEmpty() ) {
- QStringList l;
+ TQStringList l;
for( KURL::List::const_iterator it = m_unknownFileFormatFiles.begin();
it != m_unknownFileFormatFiles.end(); ++it )
l.append( (*it).path() );
- KMessageBox::informationList( qApp->activeWindow(),
+ KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()),
i18n("<p>Unable to handle the following files due to an unsupported format:"
"<p>You may manually convert these audio files to wave using another "
"application supporting the audio format and then add the wave files "
@@ -997,7 +997,7 @@ void K3bAudioDoc::slotTrackRemoved( K3bAudioTrack* track )
void K3bAudioDoc::increaseDecoderUsage( K3bAudioDecoder* decoder )
{
kdDebug() << "(K3bAudioDoc::increaseDecoderUsage)" << endl;
- if( !m_decoderUsageCounterMap.contains( decoder ) ) {
+ if( !m_decoderUsageCounterMap.tqcontains( decoder ) ) {
m_decoderUsageCounterMap[decoder] = 1;
m_decoderPresenceMap[decoder->filename()] = decoder;
}
@@ -1049,76 +1049,76 @@ K3bDevice::Toc K3bAudioDoc::toToc() const
}
-void K3bAudioDoc::setTitle( const QString& v )
+void K3bAudioDoc::setTitle( const TQString& v )
{
m_cdTextData.setTitle( v );
emit changed();
}
-void K3bAudioDoc::setArtist( const QString& v )
+void K3bAudioDoc::setArtist( const TQString& v )
{
setPerformer( v );
}
-void K3bAudioDoc::setPerformer( const QString& v )
+void K3bAudioDoc::setPerformer( const TQString& v )
{
- QString s( v );
+ TQString s( v );
d->cdTextValidator->fixup( s );
m_cdTextData.setPerformer( s );
emit changed();
}
-void K3bAudioDoc::setDisc_id( const QString& v )
+void K3bAudioDoc::setDisc_id( const TQString& v )
{
- QString s( v );
+ TQString s( v );
d->cdTextValidator->fixup( s );
m_cdTextData.setDiscId( s );
emit changed();
}
-void K3bAudioDoc::setArranger( const QString& v )
+void K3bAudioDoc::setArranger( const TQString& v )
{
- QString s( v );
+ TQString s( v );
d->cdTextValidator->fixup( s );
m_cdTextData.setArranger( s );
emit changed();
}
-void K3bAudioDoc::setSongwriter( const QString& v )
+void K3bAudioDoc::setSongwriter( const TQString& v )
{
- QString s( v );
+ TQString s( v );
d->cdTextValidator->fixup( s );
m_cdTextData.setSongwriter( s );
emit changed();
}
-void K3bAudioDoc::setComposer( const QString& v )
+void K3bAudioDoc::setComposer( const TQString& v )
{
- QString s( v );
+ TQString s( v );
d->cdTextValidator->fixup( s );
m_cdTextData.setComposer( s );
emit changed();
}
-void K3bAudioDoc::setUpc_ean( const QString& v )
+void K3bAudioDoc::setUpc_ean( const TQString& v )
{
- QString s( v );
+ TQString s( v );
d->cdTextValidator->fixup( s );
m_cdTextData.setUpcEan( s );
emit changed();
}
-void K3bAudioDoc::setCdTextMessage( const QString& v )
+void K3bAudioDoc::setCdTextMessage( const TQString& v )
{
- QString s( v );
+ TQString s( v );
d->cdTextValidator->fixup( s );
m_cdTextData.setMessage( s );
emit changed();
diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h
index 87a512e..943bf14 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.h
+++ b/libk3b/projects/audiocd/k3baudiodoc.h
@@ -22,21 +22,21 @@
#include <k3bcdtext.h>
#include <k3btoc.h>
-#include <qptrlist.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qtextstream.h>
+#include <tqptrlist.h>
+#include <tqfile.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
+#include <tqtextstream.h>
#include "k3b_export.h"
#include <kurl.h>
class K3bApp;
class K3bAudioTrack;
-class QWidget;
-class QTimer;
-class QDomDocument;
-class QDomElement;
+class TQWidget;
+class TQTimer;
+class TQDomDocument;
+class TQDomElement;
class K3bThreadJob;
class KConfig;
class K3bAudioDataSource;
@@ -50,16 +50,17 @@ class K3bAudioFile;
class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
{
Q_OBJECT
+ TQ_OBJECT
friend class K3bMixedDoc;
friend class K3bAudioTrack;
friend class K3bAudioFile;
public:
- K3bAudioDoc( QObject* );
+ K3bAudioDoc( TQObject* );
~K3bAudioDoc();
- QString name() const;
+ TQString name() const;
bool newDocument();
@@ -88,14 +89,14 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
// CD-Text
bool cdText() const { return m_cdText; }
- const QString& title() const { return m_cdTextData.title(); }
- const QString& artist() const { return m_cdTextData.performer(); }
- const QString& disc_id() const { return m_cdTextData.discId(); }
- const QString& arranger() const { return m_cdTextData.arranger(); }
- const QString& songwriter() const { return m_cdTextData.songwriter(); }
- const QString& composer() const { return m_cdTextData.composer(); }
- const QString& upc_ean() const { return m_cdTextData.upcEan(); }
- const QString& cdTextMessage() const { return m_cdTextData.message(); }
+ const TQString& title() const { return m_cdTextData.title(); }
+ const TQString& artist() const { return m_cdTextData.performer(); }
+ const TQString& disc_id() const { return m_cdTextData.discId(); }
+ const TQString& arranger() const { return m_cdTextData.arranger(); }
+ const TQString& songwriter() const { return m_cdTextData.songwriter(); }
+ const TQString& composer() const { return m_cdTextData.composer(); }
+ const TQString& upc_ean() const { return m_cdTextData.upcEan(); }
+ const TQString& cdTextMessage() const { return m_cdTextData.message(); }
/**
* Create complete CD-Text including the tracks' data.
@@ -111,7 +112,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
*/
K3bDevice::Toc toToc() const;
- K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 );
+ K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 );
/**
* Shows dialogs.
@@ -130,7 +131,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
*
* BE AWARE THAT THE DECODER HAS TO FIT THE AUDIO FILE IN THE CUE.
*/
- K3bAudioTrack* importCueFile( const QString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder = 0 );
+ K3bAudioTrack* importCueFile( const TQString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder = 0 );
/**
* Create a decoder for a specific url. If another AudioFileSource with this
@@ -158,7 +159,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
*/
void addTrack( K3bAudioTrack* track, uint position = 0 );
- void addSources( K3bAudioTrack* parent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 );
+ void addSources( K3bAudioTrack* tqparent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 );
void removeTrack( K3bAudioTrack* );
void moveTrack( K3bAudioTrack* track, K3bAudioTrack* after );
@@ -168,15 +169,15 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
// CD-Text
void writeCdText( bool b ) { m_cdText = b; }
- void setTitle( const QString& v );
- void setArtist( const QString& v );
- void setPerformer( const QString& v );
- void setDisc_id( const QString& v );
- void setArranger( const QString& v );
- void setSongwriter( const QString& v );
- void setComposer( const QString& v );
- void setUpc_ean( const QString& v );
- void setCdTextMessage( const QString& v );
+ void setTitle( const TQString& v );
+ void setArtist( const TQString& v );
+ void setPerformer( const TQString& v );
+ void setDisc_id( const TQString& v );
+ void setArranger( const TQString& v );
+ void setSongwriter( const TQString& v );
+ void setComposer( const TQString& v );
+ void setUpc_ean( const TQString& v );
+ void setCdTextMessage( const TQString& v );
// Audio-CD Ripping
void setAudioRippingParanoiaMode( int i ) { m_audioRippingParanoiaMode = i; }
@@ -195,11 +196,11 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
protected:
/** reimplemented from K3bDoc */
- bool loadDocumentData( QDomElement* );
+ bool loadDocumentData( TQDomElement* );
/** reimplemented from K3bDoc */
- bool saveDocumentData( QDomElement* );
+ bool saveDocumentData( TQDomElement* );
- QString typeString() const;
+ TQString typeString() const;
private:
// the stuff for adding files
@@ -251,9 +252,9 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc
// decoder housekeeping
// --------------------------------------------------
// used to check if we may delete a decoder
- QMap<K3bAudioDecoder*, int> m_decoderUsageCounterMap;
+ TQMap<K3bAudioDecoder*, int> m_decoderUsageCounterMap;
// used to check if we already have a decoder for a specific file
- QMap<QString, K3bAudioDecoder*> m_decoderPresenceMap;
+ TQMap<TQString, K3bAudioDecoder*> m_decoderPresenceMap;
class Private;
Private* d;
diff --git a/libk3b/projects/audiocd/k3baudiofile.cpp b/libk3b/projects/audiocd/k3baudiofile.cpp
index 2011e73..955dab0 100644
--- a/libk3b/projects/audiocd/k3baudiofile.cpp
+++ b/libk3b/projects/audiocd/k3baudiofile.cpp
@@ -47,19 +47,19 @@ K3bAudioFile::~K3bAudioFile()
}
-QString K3bAudioFile::type() const
+TQString K3bAudioFile::type() const
{
return m_decoder->fileType();
}
-QString K3bAudioFile::sourceComment() const
+TQString K3bAudioFile::sourceComment() const
{
return m_decoder->filename().section( "/", -1 );
}
-const QString& K3bAudioFile::filename() const
+const TQString& K3bAudioFile::filename() const
{
return m_decoder->filename();
}
diff --git a/libk3b/projects/audiocd/k3baudiofile.h b/libk3b/projects/audiocd/k3baudiofile.h
index 83f75eb..74d0a12 100644
--- a/libk3b/projects/audiocd/k3baudiofile.h
+++ b/libk3b/projects/audiocd/k3baudiofile.h
@@ -55,15 +55,15 @@ class LIBK3B_EXPORT K3bAudioFile : public K3bAudioDataSource
*/
~K3bAudioFile();
- const QString& filename() const;
+ const TQString& filename() const;
/**
* The complete length of the file used by this source.
*/
K3b::Msf originalLength() const;
- QString type() const;
- QString sourceComment() const;
+ TQString type() const;
+ TQString sourceComment() const;
bool isValid() const;
diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp
index b8a7a11..0a385e9 100644
--- a/libk3b/projects/audiocd/k3baudioimager.cpp
+++ b/libk3b/projects/audiocd/k3baudioimager.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <unistd.h>
@@ -40,7 +40,7 @@ public:
bool m_canceled;
int m_fd;
- QStringList m_imageNames;
+ TQStringList m_imageNames;
K3bAudioImager::ErrorType lastError;
private:
@@ -68,7 +68,7 @@ void K3bAudioImager::WorkThread::run()
//
//
//
- QStringList::iterator imageFileIt = m_imageNames.begin();
+ TQStringList::iterator imageFileIt = m_imageNames.begin();
K3bWaveFileWriter waveFileWriter;
K3bAudioTrack* track = m_doc->firstTrack();
@@ -85,7 +85,7 @@ void K3bAudioImager::WorkThread::run()
// Seek to the beginning of the track
//
if( !track->seek(0) ) {
- emitInfoMessage( i18n("Unable to seek in track %1.").arg(trackNumber), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to seek in track %1.").tqarg(trackNumber), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -101,7 +101,7 @@ void K3bAudioImager::WorkThread::run()
//
if( m_fd == -1 ) {
if( !waveFileWriter.open( *imageFileIt ) ) {
- emitInfoMessage( i18n("Could not open %1 for writing").arg(*imageFileIt), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open %1 for writing").tqarg(*imageFileIt), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -142,7 +142,7 @@ void K3bAudioImager::WorkThread::run()
}
if( read < 0 ) {
- emitInfoMessage( i18n("Error while decoding track %1.").arg(trackNumber), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while decoding track %1.").tqarg(trackNumber), K3bJob::ERROR );
kdDebug() << "(K3bAudioImager::WorkThread) read error on track " << trackNumber
<< " at pos " << K3b::Msf(trackRead/2352) << endl;
lastError = K3bAudioImager::ERROR_DECODING_TRACK;
@@ -167,8 +167,8 @@ void K3bAudioImager::WorkThread::cancel()
-K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bThreadJob( jh, parent, name ),
+K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bThreadJob( jh, tqparent, name ),
m_doc(doc)
{
m_thread = new WorkThread(doc);
@@ -188,7 +188,7 @@ void K3bAudioImager::writeToFd( int fd )
}
-void K3bAudioImager::setImageFilenames( const QStringList& p )
+void K3bAudioImager::setImageFilenames( const TQStringList& p )
{
m_thread->m_imageNames = p;
m_thread->m_fd = -1;
diff --git a/libk3b/projects/audiocd/k3baudioimager.h b/libk3b/projects/audiocd/k3baudioimager.h
index df4ae7a..bfa1d83 100644
--- a/libk3b/projects/audiocd/k3baudioimager.h
+++ b/libk3b/projects/audiocd/k3baudioimager.h
@@ -23,9 +23,10 @@ class K3bAudioDoc;
class K3bAudioImager : public K3bThreadJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bAudioImager();
/**
@@ -39,7 +40,7 @@ class K3bAudioImager : public K3bThreadJob
* Image path. Should be an empty directory or a non-existing
* directory in which case it will be created.
*/
- void setImageFilenames( const QStringList& p );
+ void setImageFilenames( const TQStringList& p );
enum ErrorType {
ERROR_FD_WRITE,
diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp
index c2e62c2..ddf15a3 100644
--- a/libk3b/projects/audiocd/k3baudiojob.cpp
+++ b/libk3b/projects/audiocd/k3baudiojob.cpp
@@ -38,8 +38,8 @@
#include <k3btocfilewriter.h>
#include <k3binffilewriter.h>
-#include <qfile.h>
-#include <qvaluevector.h>
+#include <tqfile.h>
+#include <tqvaluevector.h>
#include <kdebug.h>
#include <klocale.h>
@@ -48,11 +48,11 @@
-static QString createNonExistingFilesString( const QValueList<K3bAudioFile*>& items, unsigned int max )
+static TQString createNonExistingFilesString( const TQValueList<K3bAudioFile*>& items, unsigned int max )
{
- QString s;
+ TQString s;
unsigned int cnt = 0;
- for( QValueList<K3bAudioFile*>::const_iterator it = items.begin();
+ for( TQValueList<K3bAudioFile*>::const_iterator it = items.begin();
it != items.end(); ++it ) {
s += KStringHandler::csqueeze( (*it)->filename(), 60 );
@@ -92,8 +92,8 @@ class K3bAudioJob::Private
};
-K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, QObject* parent )
- : K3bBurnJob( hdl, parent ),
+K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bBurnJob( hdl, tqparent ),
m_doc( doc ),
m_normalizeJob(0),
m_maxSpeedJob(0)
@@ -101,16 +101,16 @@ K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, QObject* parent
d = new Private;
m_audioImager = new K3bAudioImager( m_doc, this, this );
- connect( m_audioImager, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_audioImager, SIGNAL(percent(int)),
- this, SLOT(slotAudioDecoderPercent(int)) );
- connect( m_audioImager, SIGNAL(subPercent(int)),
- this, SLOT(slotAudioDecoderSubPercent(int)) );
- connect( m_audioImager, SIGNAL(finished(bool)),
- this, SLOT(slotAudioDecoderFinished(bool)) );
- connect( m_audioImager, SIGNAL(nextTrack(int, int)),
- this, SLOT(slotAudioDecoderNextTrack(int, int)) );
+ connect( m_audioImager, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_audioImager, TQT_SIGNAL(percent(int)),
+ this, TQT_SLOT(slotAudioDecoderPercent(int)) );
+ connect( m_audioImager, TQT_SIGNAL(subPercent(int)),
+ this, TQT_SLOT(slotAudioDecoderSubPercent(int)) );
+ connect( m_audioImager, TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(slotAudioDecoderFinished(bool)) );
+ connect( m_audioImager, TQT_SIGNAL(nextTrack(int, int)),
+ this, TQT_SLOT(slotAudioDecoderNextTrack(int, int)) );
m_writer = 0;
m_tempData = new K3bAudioJobTempData( m_doc, this );
@@ -159,13 +159,13 @@ void K3bAudioJob::start()
//
// Check if all files exist
//
- QValueList<K3bAudioFile*> nonExistingFiles;
+ TQValueList<K3bAudioFile*> nonExistingFiles;
K3bAudioTrack* track = m_doc->firstTrack();
while( track ) {
K3bAudioDataSource* source = track->firstSource();
while( source ) {
if( K3bAudioFile* file = dynamic_cast<K3bAudioFile*>( source ) ) {
- if( !QFile::exists( file->filename() ) )
+ if( !TQFile::exists( file->filename() ) )
nonExistingFiles.append( file );
}
source = source->next();
@@ -179,7 +179,7 @@ void K3bAudioJob::start()
i18n("Warning"),
i18n("Remove missing files and continue"),
i18n("Cancel and go back") ) ) {
- for( QValueList<K3bAudioFile*>::const_iterator it = nonExistingFiles.begin();
+ for( TQValueList<K3bAudioFile*>::const_iterator it = nonExistingFiles.begin();
it != nonExistingFiles.end(); ++it ) {
delete *it;
}
@@ -297,7 +297,7 @@ void K3bAudioJob::start()
d->useCdText ) {
if( !cdrecordCdText ) {
emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.")
- .arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
+ .tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
d->useCdText = false;
}
else if( m_usedWritingMode == K3b::TAO ) {
@@ -314,10 +314,10 @@ void K3bAudioJob::start()
emit newSubTask( i18n("Determining maximum writing speed") );
if( !m_maxSpeedJob ) {
m_maxSpeedJob = new K3bAudioMaxSpeedJob( m_doc, this, this );
- connect( m_maxSpeedJob, SIGNAL(percent(int)),
- this, SIGNAL(subPercent(int)) );
- connect( m_maxSpeedJob, SIGNAL(finished(bool)),
- this, SLOT(slotMaxSpeedJobFinished(bool)) );
+ connect( m_maxSpeedJob, TQT_SIGNAL(percent(int)),
+ this, TQT_SIGNAL(subPercent(int)) );
+ connect( m_maxSpeedJob, TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(slotMaxSpeedJobFinished(bool)) );
}
m_maxSpeedJob->start();
return;
@@ -346,10 +346,10 @@ void K3bAudioJob::start()
}
else {
emit burning(false);
- emit infoMessage( i18n("Creating image files in %1").arg(m_doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating image files in %1").tqarg(m_doc->tempDir()), INFO );
emit newTask( i18n("Creating image files") );
m_tempData->prepareTempFileNames( doc()->tempDir() );
- QStringList filenames;
+ TQStringList filenames;
for( int i = 1; i <= m_doc->numOfTracks(); ++i )
filenames += m_tempData->bufferFileName( i );
m_audioImager->setImageFilenames( filenames );
@@ -480,10 +480,10 @@ void K3bAudioJob::slotAudioDecoderNextTrack( int t, int tt )
if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) {
K3bAudioTrack* track = m_doc->getTrack(t);
emit newSubTask( i18n("Decoding audio track %1 of %2%3")
- .arg(t)
- .arg(tt)
- .arg( track->title().isEmpty() || track->artist().isEmpty()
- ? QString::null
+ .tqarg(t)
+ .tqarg(tt)
+ .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ ? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
}
}
@@ -533,10 +533,10 @@ bool K3bAudioJob::prepareWriter()
while( track ) {
if( m_doc->onTheFly() ) {
// this is only supported by cdrecord versions >= 2.01a13
- writer->addArgument( QFile::encodeName( m_tempData->infFileName( track ) ) );
+ writer->addArgument( TQFile::encodeName( m_tempData->infFileName( track ) ) );
}
else {
- writer->addArgument( QFile::encodeName( m_tempData->bufferFileName( track ) ) );
+ writer->addArgument( TQFile::encodeName( m_tempData->bufferFileName( track ) ) );
}
track = track->next();
}
@@ -562,20 +562,20 @@ bool K3bAudioJob::prepareWriter()
m_writer = writer;
}
- connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_writer, SIGNAL(percent(int)), this, SLOT(slotWriterJobPercent(int)) );
- connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) );
- connect( m_writer, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) );
- connect( m_writer, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) );
- connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) );
- connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( m_writer, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) );
- // connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterJobPercent(int)) );
+ connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
+ connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
+ connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
+ connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
+ connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(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(slotWriterFinished(bool)) );
+ // connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
return true;
}
@@ -588,10 +588,10 @@ void K3bAudioJob::slotWriterNextTrack( int t, int tt )
if( m_doc->hideFirstTrack() )
track = m_doc->getTrack(t+1);
emit newSubTask( i18n("Writing track %1 of %2%3")
- .arg(t)
- .arg(tt)
- .arg( track->title().isEmpty() || track->artist().isEmpty()
- ? QString::null
+ .tqarg(t)
+ .tqarg(tt)
+ .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ ? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
}
@@ -650,7 +650,7 @@ bool K3bAudioJob::startWriting()
if( m_doc->dummy() )
emit newTask( i18n("Simulating") );
else if( d->copies > 1 )
- emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) );
else
emit newTask( i18n("Writing") );
@@ -706,19 +706,19 @@ void K3bAudioJob::normalizeFiles()
if( !m_normalizeJob ) {
m_normalizeJob = new K3bAudioNormalizeJob( this, this );
- connect( m_normalizeJob, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_normalizeJob, SIGNAL(percent(int)), this, SLOT(slotNormalizeProgress(int)) );
- connect( m_normalizeJob, SIGNAL(subPercent(int)), this, SLOT(slotNormalizeSubProgress(int)) );
- connect( m_normalizeJob, SIGNAL(finished(bool)), this, SLOT(slotNormalizeJobFinished(bool)) );
- connect( m_normalizeJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_normalizeJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_normalizeJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_normalizeJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotNormalizeProgress(int)) );
+ connect( m_normalizeJob, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotNormalizeSubProgress(int)) );
+ connect( m_normalizeJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotNormalizeJobFinished(bool)) );
+ connect( m_normalizeJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_normalizeJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
// add all the files
// TODO: we may need to split the wave files and put them back together!
- QValueVector<QString> files;
+ TQValueVector<TQString> files;
K3bAudioTrack* track = m_doc->firstTrack();
while( track ) {
files.append( m_tempData->bufferFileName(track) );
@@ -779,7 +779,7 @@ bool K3bAudioJob::writeTocFile()
if( d->useCdText )
tocWriter.setCdText( m_doc->cdTextData() );
if( !m_doc->onTheFly() ) {
- QStringList filenames;
+ TQStringList filenames;
for( int i = 1; i <= m_doc->numOfTracks(); ++i )
filenames += m_tempData->bufferFileName( i );
tocWriter.setFilenames( filenames );
@@ -842,23 +842,23 @@ bool K3bAudioJob::checkAudioSources()
}
-QString K3bAudioJob::jobDescription() const
+TQString K3bAudioJob::jobDescription() const
{
return i18n("Writing Audio CD")
+ ( m_doc->title().isEmpty()
- ? QString::null
- : QString( " (%1)" ).arg(m_doc->title()) );
+ ? TQString()
+ : TQString( " (%1)" ).tqarg(m_doc->title()) );
}
-QString K3bAudioJob::jobDetails() const
+TQString K3bAudioJob::jobDetails() const
{
return ( i18n( "1 track (%1 minutes)",
"%n tracks (%1 minutes)",
- m_doc->numOfTracks() ).arg(m_doc->length().toString())
+ m_doc->numOfTracks() ).tqarg(m_doc->length().toString())
+ ( m_doc->copies() > 1 && !m_doc->dummy()
? i18n(" - %n copy", " - %n copies", m_doc->copies())
- : QString::null ) );
+ : TQString() ) );
}
#include "k3baudiojob.moc"
diff --git a/libk3b/projects/audiocd/k3baudiojob.h b/libk3b/projects/audiocd/k3baudiojob.h
index af37639..309d3f3 100644
--- a/libk3b/projects/audiocd/k3baudiojob.h
+++ b/libk3b/projects/audiocd/k3baudiojob.h
@@ -22,8 +22,8 @@
class K3bAudioDoc;
class K3bAudioImager;
-class QFile;
-class QDataStream;
+class TQFile;
+class TQDataStream;
class K3bAbstractWriter;
class KTempFile;
class K3bCdrecordWriter;
@@ -38,16 +38,17 @@ class K3bAudioMaxSpeedJob;
class K3bAudioJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, QObject* parent = 0 );
+ K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0 );
~K3bAudioJob();
K3bDoc* doc() const;
K3bDevice::Device* writer() const;
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void cancel();
diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
index af98c2e..538d454 100644
--- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
+++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
@@ -21,9 +21,9 @@
#include <k3bmsf.h>
#include <k3bcore.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qvaluevector.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqvaluevector.h>
#include <kdebug.h>
@@ -35,16 +35,16 @@ public:
: doc(_doc) {
}
- QValueVector<QString> bufferFiles;
- QValueVector<QString> infFiles;
- QString tocFile;
+ TQValueVector<TQString> bufferFiles;
+ TQValueVector<TQString> infFiles;
+ TQString tocFile;
K3bAudioDoc* doc;
};
-K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, QObject* parent, const char* name )
- : QObject( parent, name )
+K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
d = new Private( doc );
}
@@ -56,20 +56,20 @@ K3bAudioJobTempData::~K3bAudioJobTempData()
}
-const QString& K3bAudioJobTempData::bufferFileName( int track )
+const TQString& K3bAudioJobTempData::bufferFileName( int track )
{
if( (int)d->bufferFiles.count() < track )
prepareTempFileNames();
return d->bufferFiles.at(track-1);
}
-const QString& K3bAudioJobTempData::bufferFileName( K3bAudioTrack* track )
+const TQString& K3bAudioJobTempData::bufferFileName( K3bAudioTrack* track )
{
return bufferFileName( track->trackNumber() );
}
-const QString& K3bAudioJobTempData::tocFileName()
+const TQString& K3bAudioJobTempData::tocFileName()
{
if( d->tocFile.isEmpty() )
prepareTempFileNames();
@@ -77,14 +77,14 @@ const QString& K3bAudioJobTempData::tocFileName()
}
-const QString& K3bAudioJobTempData::infFileName( int track )
+const TQString& K3bAudioJobTempData::infFileName( int track )
{
if( (int)d->infFiles.count() < track )
prepareTempFileNames();
return d->infFiles.at( track - 1 );
}
-const QString& K3bAudioJobTempData::infFileName( K3bAudioTrack* track )
+const TQString& K3bAudioJobTempData::infFileName( K3bAudioTrack* track )
{
return infFileName( track->trackNumber() );
}
@@ -96,16 +96,16 @@ K3bAudioDoc* K3bAudioJobTempData::doc() const
}
-void K3bAudioJobTempData::prepareTempFileNames( const QString& path )
+void K3bAudioJobTempData::prepareTempFileNames( const TQString& path )
{
d->bufferFiles.clear();
d->infFiles.clear();
- QString prefix = K3b::findUniqueFilePrefix( "k3b_audio_", path ) + "_";
+ TQString prefix = K3b::findUniqueFilePrefix( "k3b_audio_", path ) + "_";
for( int i = 0; i < d->doc->numOfTracks(); i++ ) {
- d->bufferFiles.append( prefix + QString::number( i+1 ).rightJustify( 2, '0' ) + ".wav" );
- d->infFiles.append( prefix + QString::number( i+1 ).rightJustify( 2, '0' ) + ".inf" );
+ d->bufferFiles.append( prefix + TQString::number( i+1 ).rightJustify( 2, '0' ) + ".wav" );
+ d->infFiles.append( prefix + TQString::number( i+1 ).rightJustify( 2, '0' ) + ".inf" );
}
d->tocFile = prefix + ".toc";
@@ -115,17 +115,17 @@ void K3bAudioJobTempData::prepareTempFileNames( const QString& path )
void K3bAudioJobTempData::cleanup()
{
for( uint i = 0; i < d->infFiles.count(); ++i ) {
- if( QFile::exists( d->infFiles[i] ) )
- QFile::remove( d->infFiles[i] );
+ if( TQFile::exists( d->infFiles[i] ) )
+ TQFile::remove( d->infFiles[i] );
}
for( uint i = 0; i < d->bufferFiles.count(); ++i ) {
- if( QFile::exists( d->bufferFiles[i] ) )
- QFile::remove( d->bufferFiles[i] );
+ if( TQFile::exists( d->bufferFiles[i] ) )
+ TQFile::remove( d->bufferFiles[i] );
}
- if( QFile::exists( d->tocFile ) )
- QFile::remove( d->tocFile );
+ if( TQFile::exists( d->tocFile ) )
+ TQFile::remove( d->tocFile );
}
diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.h b/libk3b/projects/audiocd/k3baudiojobtempdata.h
index 72b753f..62bc7e7 100644
--- a/libk3b/projects/audiocd/k3baudiojobtempdata.h
+++ b/libk3b/projects/audiocd/k3baudiojobtempdata.h
@@ -17,29 +17,30 @@
#ifndef _K3B_AUDIO_JOB_TEMPDATA_H_
#define _K3B_AUDIO_JOB_TEMPDATA_H_
-#include <qobject.h>
+#include <tqobject.h>
#include <k3bmsf.h>
class K3bAudioTrack;
class K3bAudioDoc;
-class QTextStream;
+class TQTextStream;
-class K3bAudioJobTempData : public QObject
+class K3bAudioJobTempData : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioJobTempData( K3bAudioDoc* doc, QObject* parent = 0, const char* name = 0 );
+ K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 );
~K3bAudioJobTempData();
- const QString& bufferFileName( int track );
- const QString& bufferFileName( K3bAudioTrack* track );
+ const TQString& bufferFileName( int track );
+ const TQString& bufferFileName( K3bAudioTrack* track );
- const QString& infFileName( int track );
- const QString& infFileName( K3bAudioTrack* track );
+ const TQString& infFileName( int track );
+ const TQString& infFileName( K3bAudioTrack* track );
- const QString& tocFileName();
+ const TQString& tocFileName();
K3bAudioDoc* doc() const;
@@ -48,7 +49,7 @@ class K3bAudioJobTempData : public QObject
* a specific directory
* it defaults to the default K3b temp dir
*/
- void prepareTempFileNames( const QString& path = QString::null );
+ void prepareTempFileNames( const TQString& path = TQString() );
/**
* remove all temp files (this does not include the audio buffer files
diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp
index 975ab89..cde09c9 100644
--- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp
+++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qdatetime.h>
+#include <tqdatetime.h>
class K3bAudioMaxSpeedJob::WorkThread : public K3bThread
@@ -106,7 +106,7 @@ void K3bAudioMaxSpeedJob::WorkThread::run()
}
else if( speed > 0 ) {
// update the max speed
- maxSpeed = QMIN( maxSpeed, speed );
+ maxSpeed = TQMIN( maxSpeed, speed );
}
it.next();
@@ -142,7 +142,7 @@ int K3bAudioMaxSpeedJob::WorkThread::speedTest( K3bAudioDataSource* source )
}
}
- QTime t;
+ TQTime t;
int dataRead = 0;
int r = 0;
@@ -183,11 +183,11 @@ int K3bAudioMaxSpeedJob::WorkThread::maxSpeedByMedia() const
{
int s = 0;
- QValueList<int> speeds = m_doc->burner()->determineSupportedWriteSpeeds();
+ TQValueList<int> speeds = m_doc->burner()->determineSupportedWriteSpeeds();
// simply use what we have and let the writer decide if the speeds are empty
if( !speeds.isEmpty() ) {
// start with the highest speed and go down the list until we are below our max
- QValueListIterator<int> it = speeds.end();
+ TQValueListIterator<int> it = speeds.end();
--it;
while( *it > maxSpeed && it != speeds.begin() )
--it;
@@ -203,8 +203,8 @@ int K3bAudioMaxSpeedJob::WorkThread::maxSpeedByMedia() const
-K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bThreadJob( jh, parent, name )
+K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bThreadJob( jh, tqparent, name )
{
m_thread = new WorkThread( doc );
setThread( m_thread );
diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h
index 876bc7f..9526d4a 100644
--- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h
+++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h
@@ -24,9 +24,10 @@ class K3bAudioDoc;
class K3bAudioMaxSpeedJob : public K3bThreadJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bAudioMaxSpeedJob();
/**
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
index 782712b..a732bb5 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
@@ -23,8 +23,8 @@
#include <klocale.h>
-K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, QObject* parent, const char* name )
- : K3bJob( hdl, parent, name ),
+K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name )
+ : K3bJob( hdl, tqparent, name ),
m_process(0)
{
}
@@ -49,8 +49,8 @@ void K3bAudioNormalizeJob::start()
delete m_process;
m_process = new K3bProcess();
- connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
- connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) );
+ connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) );
+ connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) );
const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" );
@@ -61,14 +61,14 @@ void K3bAudioNormalizeJob::start()
}
if( !bin->copyright.isEmpty() )
- emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(bin->name()).arg(bin->version).arg(bin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(bin->name()).tqarg(bin->version).tqarg(bin->copyright), INFO );
// create the commandline
*m_process << bin;
// additional user parameters from config
- const QStringList& params = bin->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = bin->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*m_process << *it;
// end the options
@@ -100,11 +100,11 @@ void K3bAudioNormalizeJob::cancel()
}
-void K3bAudioNormalizeJob::slotStdLine( const QString& line )
+void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
{
// percent, subPercent, newTask (compute level and adjust)
- // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) );
+ // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").tqarg(t).tqarg(tt).tqarg(m_files.at(t-1)) );
emit debuggingOutput( "normalize-audio", line );
@@ -121,15 +121,15 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line )
}
}
- else if( line.contains( "already normalized" ) ) {
+ else if( line.tqcontains( "already normalized" ) ) {
// no normalization necessary for the current track
- emit infoMessage( i18n("Track %1 is already normalized.").arg(m_currentTrack), INFO );
+ emit infoMessage( i18n("Track %1 is already normalized.").tqarg(m_currentTrack), INFO );
m_currentTrack++;
}
- else if( line.contains( "--% done") ) {
+ else if( line.tqcontains( "--% done") ) {
if( m_currentAction == ADJUSTING_LEVELS ) {
- emit newTask( i18n("Adjusting volume level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
+ emit newTask( i18n("Adjusting volume level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track "
<< m_currentTrack
<< " "
@@ -137,7 +137,7 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line )
<< endl;
}
else {
- emit newTask( i18n("Computing level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
+ emit newTask( i18n("Computing level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) computing level for track "
<< m_currentTrack
<< " "
@@ -148,7 +148,7 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line )
m_currentTrack++;
}
- else if( int pos = line.find( "% done" ) > 0 ) {
+ else if( int pos = line.tqfind( "% done" ) > 0 ) {
// parse progress: "XXX% done" and "batch XXX% done"
pos -= 3;
bool ok;
@@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p )
break;
default:
if( !m_canceled ) {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("normalize-audio").tqarg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
@@ -197,7 +197,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p )
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").arg("Normalize"), K3bJob::ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Normalize"), K3bJob::ERROR );
jobFinished( false );
}
}
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h
index e56086b..b623a41 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.h
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.h
@@ -20,7 +20,7 @@
#include <k3bjob.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
class K3bProcess;
class KProcess;
@@ -29,25 +29,26 @@ class KProcess;
class K3bAudioNormalizeJob : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bAudioNormalizeJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bAudioNormalizeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bAudioNormalizeJob();
public slots:
void start();
void cancel();
- void setFilesToNormalize( const QValueVector<QString>& files ) { m_files = files; }
+ void setFilesToNormalize( const TQValueVector<TQString>& files ) { m_files = files; }
private slots:
- void slotStdLine( const QString& line );
+ void slotStdLine( const TQString& line );
void slotProcessExited( KProcess* p );
private:
K3bProcess* m_process;
- QValueVector<QString> m_files;
+ TQValueVector<TQString> m_files;
bool m_canceled;
enum Action {
diff --git a/libk3b/projects/audiocd/k3baudiotrack.cpp b/libk3b/projects/audiocd/k3baudiotrack.cpp
index a1d12e4..53d1d34 100644
--- a/libk3b/projects/audiocd/k3baudiotrack.cpp
+++ b/libk3b/projects/audiocd/k3baudiotrack.cpp
@@ -22,7 +22,7 @@
#include <k3bcore.h>
#include <k3bcdtextvalidator.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <kdebug.h>
@@ -59,8 +59,8 @@ K3bAudioTrack::K3bAudioTrack()
}
-K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* parent )
- : m_parent(parent),
+K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* tqparent )
+ : m_parent(tqparent),
m_copy(false),
m_preEmp(false),
m_index0Offset(150),
@@ -106,67 +106,67 @@ void K3bAudioTrack::emitChanged()
}
-void K3bAudioTrack::setArtist( const QString& a )
+void K3bAudioTrack::setArtist( const TQString& a )
{
setPerformer( a );
}
-void K3bAudioTrack::setPerformer( const QString& a )
+void K3bAudioTrack::setPerformer( const TQString& a )
{
- QString s( a );
+ TQString s( a );
d->cdTextValidator->fixup( s );
m_cdText.setPerformer(s);
emitChanged();
}
-void K3bAudioTrack::setTitle( const QString& t )
+void K3bAudioTrack::setTitle( const TQString& t )
{
- QString s( t );
+ TQString s( t );
d->cdTextValidator->fixup( s );
m_cdText.setTitle(s);
emitChanged();
}
-void K3bAudioTrack::setArranger( const QString& t )
+void K3bAudioTrack::setArranger( const TQString& t )
{
- QString s( t );
+ TQString s( t );
d->cdTextValidator->fixup( s );
m_cdText.setArranger(s);
emitChanged();
}
-void K3bAudioTrack::setSongwriter( const QString& t )
+void K3bAudioTrack::setSongwriter( const TQString& t )
{
- QString s( t );
+ TQString s( t );
d->cdTextValidator->fixup( s );
m_cdText.setSongwriter(s);
emitChanged();
}
-void K3bAudioTrack::setComposer( const QString& t )
+void K3bAudioTrack::setComposer( const TQString& t )
{
- QString s( t );
+ TQString s( t );
d->cdTextValidator->fixup( s );
m_cdText.setComposer(s);
emitChanged();
}
-void K3bAudioTrack::setIsrc( const QString& t )
+void K3bAudioTrack::setIsrc( const TQString& t )
{
m_cdText.setIsrc(t);
emitChanged();
}
-void K3bAudioTrack::setCdTextMessage( const QString& t )
+void K3bAudioTrack::setCdTextMessage( const TQString& t )
{
- QString s( t );
+ TQString s( t );
d->cdTextValidator->fixup( s );
m_cdText.setMessage(s);
emitChanged();
@@ -282,7 +282,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track )
kdDebug() << "(K3bAudioTrack::moveAfter( " << track << " )" << endl;
if( !track ) {
if( !doc() ) {
- kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl;
+ kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl;
return;
}
@@ -302,7 +302,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track )
// remove this from the list
take();
- // set the new parent doc
+ // set the new tqparent doc
m_parent = track->doc();
K3bAudioTrack* oldNext = track->m_next;
@@ -330,7 +330,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track )
{
if( !track ) {
if( !doc() ) {
- kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl;
+ kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl;
return;
}
@@ -350,7 +350,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track )
// remove this from the list
take();
- // set the new parent doc
+ // set the new tqparent doc
m_parent = track->doc();
K3bAudioTrack* oldPrev = track->m_prev;
@@ -568,7 +568,7 @@ K3bAudioTrack* K3bAudioTrack::split( const K3b::Msf& pos )
splitTrack->addSource( addSource );
}
- kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with parent " << doc() << endl;
+ kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with tqparent " << doc() << endl;
splitTrack->moveAfter( this );
return splitTrack;
@@ -604,7 +604,7 @@ K3bDevice::Track K3bAudioTrack::toCdTrack() const
if( doc()->lastTrack() != this )
cdTrack.setIndex0( index0() );
- // FIXME: convert to QCString
+ // FIXME: convert to TQCString
// cdTrack.setIsrc( isrc() );
return cdTrack;
diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h
index ab0ee1b..0edef0a 100644
--- a/libk3b/projects/audiocd/k3baudiotrack.h
+++ b/libk3b/projects/audiocd/k3baudiotrack.h
@@ -17,10 +17,10 @@
#ifndef K3BAUDIOTRACK_H
#define K3BAUDIOTRACK_H
-#include <qstring.h>
-#include <qfileinfo.h>
-#include <qfile.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqfileinfo.h>
+#include <tqfile.h>
+#include <tqptrlist.h>
#include <kio/global.h>
@@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bAudioTrack
public:
K3bAudioTrack();
- K3bAudioTrack( K3bAudioDoc* parent );
+ K3bAudioTrack( K3bAudioDoc* tqparent );
~K3bAudioTrack();
K3bAudioDoc* doc() const { return m_parent; }
@@ -58,14 +58,14 @@ class LIBK3B_EXPORT K3bAudioTrack
K3b::Msf length() const;
KIO::filesize_t size() const;
- const QString& artist() const { return m_cdText.performer(); }
- const QString& performer() const { return m_cdText.performer(); }
- const QString& title() const { return m_cdText.title(); }
- const QString& arranger() const { return m_cdText.arranger(); }
- const QString& songwriter() const { return m_cdText.songwriter(); }
- const QString& composer() const { return m_cdText.composer(); }
- const QString& isrc() const { return m_cdText.isrc(); }
- const QString& cdTextMessage() const { return m_cdText.message(); }
+ const TQString& artist() const { return m_cdText.performer(); }
+ const TQString& performer() const { return m_cdText.performer(); }
+ const TQString& title() const { return m_cdText.title(); }
+ const TQString& arranger() const { return m_cdText.arranger(); }
+ const TQString& songwriter() const { return m_cdText.songwriter(); }
+ const TQString& composer() const { return m_cdText.composer(); }
+ const TQString& isrc() const { return m_cdText.isrc(); }
+ const TQString& cdTextMessage() const { return m_cdText.message(); }
const K3bDevice::TrackCdText& cdText() const { return m_cdText; }
bool copyProtection() const { return m_copy; }
@@ -74,14 +74,14 @@ class LIBK3B_EXPORT K3bAudioTrack
/**
* @obsolete use setPerformer
**/
- void setArtist( const QString& a );
- void setPerformer( const QString& a );
- void setTitle( const QString& t );
- void setArranger( const QString& t );
- void setSongwriter( const QString& t );
- void setComposer( const QString& t );
- void setIsrc( const QString& t );
- void setCdTextMessage( const QString& t );
+ void setArtist( const TQString& a );
+ void setPerformer( const TQString& a );
+ void setTitle( const TQString& t );
+ void setArranger( const TQString& t );
+ void setSongwriter( const TQString& t );
+ void setComposer( const TQString& t );
+ void setIsrc( const TQString& t );
+ void setCdTextMessage( const TQString& t );
void setCdText( const K3bDevice::TrackCdText& cdtext );
diff --git a/libk3b/projects/audiocd/k3baudiozerodata.cpp b/libk3b/projects/audiocd/k3baudiozerodata.cpp
index f5c985d..aff0cf9 100644
--- a/libk3b/projects/audiocd/k3baudiozerodata.cpp
+++ b/libk3b/projects/audiocd/k3baudiozerodata.cpp
@@ -55,15 +55,15 @@ void K3bAudioZeroData::setLength( const K3b::Msf& msf )
}
-QString K3bAudioZeroData::type() const
+TQString K3bAudioZeroData::type() const
{
return i18n("Silence");
}
-QString K3bAudioZeroData::sourceComment() const
+TQString K3bAudioZeroData::sourceComment() const
{
- return QString::null;
+ return TQString();
}
diff --git a/libk3b/projects/audiocd/k3baudiozerodata.h b/libk3b/projects/audiocd/k3baudiozerodata.h
index 8cb2911..6475cd1 100644
--- a/libk3b/projects/audiocd/k3baudiozerodata.h
+++ b/libk3b/projects/audiocd/k3baudiozerodata.h
@@ -29,8 +29,8 @@ class LIBK3B_EXPORT K3bAudioZeroData : public K3bAudioDataSource
K3b::Msf originalLength() const { return m_length; }
void setLength( const K3b::Msf& msf );
- QString type() const;
- QString sourceComment() const;
+ TQString type() const;
+ TQString sourceComment() const;
bool seek( const K3b::Msf& );
int read( char* data, unsigned int max );
diff --git a/libk3b/projects/datacd/k3bbootitem.cpp b/libk3b/projects/datacd/k3bbootitem.cpp
index e94830e..f5a8725 100644
--- a/libk3b/projects/datacd/k3bbootitem.cpp
+++ b/libk3b/projects/datacd/k3bbootitem.cpp
@@ -19,10 +19,10 @@
#include <klocale.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
-K3bBootItem::K3bBootItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName )
+K3bBootItem::K3bBootItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName )
: K3bFileItem( fileName, doc, dir, k3bName, FILE|BOOT_IMAGE ),
m_noBoot(false),
m_bootInfoTable(false),
diff --git a/libk3b/projects/datacd/k3bbootitem.h b/libk3b/projects/datacd/k3bbootitem.h
index 9dd8704..78478ea 100644
--- a/libk3b/projects/datacd/k3bbootitem.h
+++ b/libk3b/projects/datacd/k3bbootitem.h
@@ -21,7 +21,7 @@
class K3bBootItem : public K3bFileItem
{
public:
- K3bBootItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 );
+ K3bBootItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 );
K3bBootItem( const K3bBootItem& );
~K3bBootItem();
@@ -39,7 +39,7 @@ class K3bBootItem : public K3bFileItem
void setLoadSize( int s ) { m_loadSize = s; }
void setImageType( int t ) { m_imageType = t; }
- void setTempPath( const QString& p ) { m_tempPath = p; }
+ void setTempPath( const TQString& p ) { m_tempPath = p; }
bool noBoot() const { return m_noBoot; }
bool bootInfoTable() const { return m_bootInfoTable; }
@@ -51,7 +51,7 @@ class K3bBootItem : public K3bFileItem
* mkisofs changes boot images on disk. That is why the iso imager
* buffers them and saves the path to the buffered copy here.
*/
- const QString& tempPath() const { return m_tempPath; }
+ const TQString& tempPath() const { return m_tempPath; }
private:
bool m_noBoot;
@@ -60,7 +60,7 @@ class K3bBootItem : public K3bFileItem
int m_loadSize;
int m_imageType;
- QString m_tempPath;
+ TQString m_tempPath;
};
#endif
diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index d12c8d2..44b6214 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -34,14 +34,14 @@
#include <k3bmultichoicedialog.h>
#include <k3bvalidators.h>
-#include <qdir.h>
-#include <qstring.h>
-#include <qfileinfo.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qtimer.h>
-#include <qdom.h>
-#include <qptrlist.h>
+#include <tqdir.h>
+#include <tqstring.h>
+#include <tqfileinfo.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqtimer.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
#include <kstandarddirs.h>
#include <kurl.h>
@@ -67,8 +67,8 @@
* \li or create your own K3bDirItems and K3bFileItems. The doc will be properly updated
* by the constructors of the items.
*/
-K3bDataDoc::K3bDataDoc( QObject* parent )
- : K3bDoc( parent )
+K3bDataDoc::K3bDataDoc( TQObject* tqparent )
+ : K3bDoc( tqparent )
{
m_root = 0;
@@ -92,8 +92,8 @@ bool K3bDataDoc::newDocument()
m_bExistingItemsReplaceAll = m_bExistingItemsIgnoreAll = false;
if( m_root ) {
- while( m_root->children().getFirst() )
- removeItem( m_root->children().getFirst() );
+ while( m_root->tqchildren().getFirst() )
+ removeItem( m_root->tqchildren().getFirst() );
}
else
m_root = new K3bRootItem( this );
@@ -109,7 +109,7 @@ bool K3bDataDoc::newDocument()
}
-QString K3bDataDoc::name() const
+TQString K3bDataDoc::name() const
{
return m_isoOptions.volumeID();
}
@@ -122,7 +122,7 @@ void K3bDataDoc::setIsoOptions( const K3bIsoOptions& o )
}
-void K3bDataDoc::setVolumeID( const QString& v )
+void K3bDataDoc::setVolumeID( const TQString& v )
{
m_isoOptions.setVolumeID( v );
emit changed();
@@ -144,8 +144,8 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) {
const KURL& url = *it;
- QFileInfo f( url.path() );
- QString k3bname = f.absFilePath().section( "/", -1 );
+ TQFileInfo f( url.path() );
+ TQString k3bname = f.absFilePath().section( "/", -1 );
// filenames cannot end in backslashes (mkisofs problem. See comments in k3bisoimager.cpp (escapeGraftPoint()))
while( k3bname[k3bname.length()-1] == '\\' )
@@ -162,10 +162,10 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
bool ok = false;
while( !ok ) {
ok = true;
- QString name( k3bname );
+ TQString name( k3bname );
if( cnt > 0 )
- name += QString("_%1").arg(cnt);
- if( K3bDataItem* oldItem = dir->find( name ) ) {
+ name += TQString("_%1").tqarg(cnt);
+ if( K3bDataItem* oldItem = dir->tqfind( name ) ) {
if( f.isDir() && oldItem->isDir() ) {
// ok, just reuse the dir
newDirItem = static_cast<K3bDirItem*>(oldItem);
@@ -182,9 +182,9 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
}
}
if( cnt > 0 )
- k3bname += QString("_%1").arg(cnt);
+ k3bname += TQString("_%1").tqarg(cnt);
- // QFileInfo::exists and QFileInfo::isReadable return false for broken symlinks :(
+ // TQFileInfo::exists and TQFileInfo::isReadable return false for broken symlinks :(
if( f.isDir() && !f.isSymLink() ) {
if( !newDirItem ) {
newDirItem = new K3bDirItem( k3bname, this, dir );
@@ -192,11 +192,11 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
}
// recursively add all the files in the directory
- QStringList dlist = QDir( f.absFilePath() ).entryList( QDir::All|QDir::System|QDir::Hidden );
+ TQStringList dlist = TQDir( f.absFilePath() ).entryList( TQDir::All|TQDir::System|TQDir::Hidden );
dlist.remove(".");
dlist.remove("..");
KURL::List newUrls;
- for( QStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it )
+ for( TQStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it )
newUrls.append( KURL::fromPathOrURL( f.absFilePath() + "/" + *it ) );
addUrls( newUrls, newDirItem );
}
@@ -210,18 +210,18 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
}
-bool K3bDataDoc::nameAlreadyInDir( const QString& name, K3bDirItem* dir )
+bool K3bDataDoc::nameAlreadyInDir( const TQString& name, K3bDirItem* dir )
{
if( !dir )
return false;
else
- return ( dir->find( name ) != 0 );
+ return ( dir->tqfind( name ) != 0 );
}
-K3bDirItem* K3bDataDoc::addEmptyDir( const QString& name, K3bDirItem* parent )
+K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* tqparent )
{
- K3bDirItem* item = new K3bDirItem( name, this, parent );
+ K3bDirItem* item = new K3bDirItem( name, this, tqparent );
setModified( true );
@@ -261,21 +261,21 @@ K3b::Msf K3bDataDoc::burningLength() const
}
-QString K3bDataDoc::typeString() const
+TQString K3bDataDoc::typeString() const
{
- return QString::fromLatin1("data");
+ return TQString::tqfromLatin1("data");
}
-bool K3bDataDoc::loadDocumentData( QDomElement* rootElem )
+bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem )
{
if( !root() )
newDocument();
- QDomNodeList nodes = rootElem->childNodes();
+ TQDomNodeList nodes = rootElem->childNodes();
if( nodes.item(0).nodeName() != "general" ) {
- kdDebug() << "(K3bDataDoc) could not find 'general' section." << endl;
+ kdDebug() << "(K3bDataDoc) could not tqfind 'general' section." << endl;
return false;
}
if( !readGeneralDocumentData( nodes.item(0).toElement() ) )
@@ -285,7 +285,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem )
// parse options
// -----------------------------------------------------------------
if( nodes.item(1).nodeName() != "options" ) {
- kdDebug() << "(K3bDataDoc) could not find 'options' section." << endl;
+ kdDebug() << "(K3bDataDoc) could not tqfind 'options' section." << endl;
return false;
}
if( !loadDocumentDataOptions( nodes.item(1).toElement() ) )
@@ -297,7 +297,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem )
// parse header
// -----------------------------------------------------------------
if( nodes.item(2).nodeName() != "header" ) {
- kdDebug() << "(K3bDataDoc) could not find 'header' section." << endl;
+ kdDebug() << "(K3bDataDoc) could not tqfind 'header' section." << endl;
return false;
}
if( !loadDocumentDataHeader( nodes.item(2).toElement() ) )
@@ -309,17 +309,17 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem )
// parse files
// -----------------------------------------------------------------
if( nodes.item(3).nodeName() != "files" ) {
- kdDebug() << "(K3bDataDoc) could not find 'files' section." << endl;
+ kdDebug() << "(K3bDataDoc) could not tqfind 'files' section." << endl;
return false;
}
if( m_root == 0 )
m_root = new K3bRootItem( this );
- QDomNodeList filesList = nodes.item(3).childNodes();
+ TQDomNodeList filesList = nodes.item(3).childNodes();
for( uint i = 0; i < filesList.count(); i++ ) {
- QDomElement e = filesList.item(i).toElement();
+ TQDomElement e = filesList.item(i).toElement();
if( !loadDataItem( e, root() ) )
return false;
}
@@ -332,7 +332,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem )
// file we create a default one here.
//
if( !m_bootImages.isEmpty() && !m_bootCataloge )
- createBootCatalogeItem( m_bootImages.first()->parent() );
+ createBootCatalogeItem( m_bootImages.first()->tqparent() );
informAboutNotFoundFiles();
@@ -341,12 +341,12 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem )
}
-bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem )
+bool K3bDataDoc::loadDocumentDataOptions( TQDomElement elem )
{
- QDomNodeList headerList = elem.childNodes();
+ TQDomNodeList headerList = elem.childNodes();
for( uint i = 0; i < headerList.count(); i++ ) {
- QDomElement e = headerList.item(i).toElement();
+ TQDomElement e = headerList.item(i).toElement();
if( e.isNull() )
return false;
@@ -428,7 +428,7 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem )
else if( e.text() == "extended" )
m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::extended );
else if( e.text() == "extended" )
- m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::replace );
+ m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::tqreplace );
else
m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::noChange );
}
@@ -446,7 +446,7 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem )
}
else if( e.nodeName() == "multisession" ) {
- QString mode = e.text();
+ TQString mode = e.text();
if( mode == "start" )
setMultiSessionMode( START );
else if( mode == "continue" )
@@ -470,12 +470,12 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem )
}
-bool K3bDataDoc::loadDocumentDataHeader( QDomElement headerElem )
+bool K3bDataDoc::loadDocumentDataHeader( TQDomElement headerElem )
{
- QDomNodeList headerList = headerElem.childNodes();
+ TQDomNodeList headerList = headerElem.childNodes();
for( uint i = 0; i < headerList.count(); i++ ) {
- QDomElement e = headerList.item(i).toElement();
+ TQDomElement e = headerList.item(i).toElement();
if( e.isNull() )
return false;
@@ -511,31 +511,31 @@ bool K3bDataDoc::loadDocumentDataHeader( QDomElement headerElem )
}
-bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent )
+bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent )
{
K3bDataItem* newItem = 0;
if( elem.nodeName() == "file" ) {
- QDomElement urlElem = elem.firstChild().toElement();
+ TQDomElement urlElem = elem.firstChild().toElement();
if( urlElem.isNull() ) {
kdDebug() << "(K3bDataDoc) file-element without url!" << endl;
return false;
}
- QFileInfo f( urlElem.text() );
+ TQFileInfo f( urlElem.text() );
// We canot use exists() here since this always disqualifies broken symlinks
if( !f.isFile() && !f.isSymLink() )
m_notFoundFiles.append( urlElem.text() );
- // broken symlinks are not readable according to QFileInfo which is wrong in our case
+ // broken symlinks are not readable according to TQFileInfo which is wrong in our case
else if( f.isFile() && !f.isReadable() )
m_noPermissionFiles.append( urlElem.text() );
else if( !elem.attribute( "bootimage" ).isEmpty() ) {
K3bBootItem* bootItem = new K3bBootItem( urlElem.text(),
this,
- parent,
+ tqparent,
elem.attributeNode( "name" ).value() );
if( elem.attribute( "bootimage" ) == "floppy" )
bootItem->setImageType( K3bBootItem::FLOPPY );
@@ -554,18 +554,18 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent )
else {
newItem = new K3bFileItem( urlElem.text(),
this,
- parent,
+ tqparent,
elem.attributeNode( "name" ).value() );
}
}
else if( elem.nodeName() == "special" ) {
if( elem.attributeNode( "type" ).value() == "boot cataloge" )
- createBootCatalogeItem( parent )->setK3bName( elem.attributeNode( "name" ).value() );
+ createBootCatalogeItem( tqparent )->setK3bName( elem.attributeNode( "name" ).value() );
}
else if( elem.nodeName() == "directory" ) {
// This is for the VideoDVD project which already contains the *_TS folders
K3bDirItem* newDirItem = 0;
- if( K3bDataItem* item = parent->find( elem.attributeNode( "name" ).value() ) ) {
+ if( K3bDataItem* item = tqparent->tqfind( elem.attributeNode( "name" ).value() ) ) {
if( item->isDir() ) {
newDirItem = static_cast<K3bDirItem*>(item);
}
@@ -576,11 +576,11 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent )
}
if( !newDirItem )
- newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, parent );
- QDomNodeList childNodes = elem.childNodes();
+ newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, tqparent );
+ TQDomNodeList childNodes = elem.childNodes();
for( uint i = 0; i < childNodes.count(); i++ ) {
- QDomElement e = childNodes.item(i).toElement();
+ TQDomElement e = childNodes.item(i).toElement();
if( !loadDataItem( e, newDirItem ) )
return false;
}
@@ -600,31 +600,31 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent )
}
-bool K3bDataDoc::saveDocumentData( QDomElement* docElem )
+bool K3bDataDoc::saveDocumentData( TQDomElement* docElem )
{
- QDomDocument doc = docElem->ownerDocument();
+ TQDomDocument doc = docElem->ownerDocument();
saveGeneralDocumentData( docElem );
// all options
// ----------------------------------------------------------------------
- QDomElement optionsElem = doc.createElement( "options" );
+ TQDomElement optionsElem = doc.createElement( "options" );
saveDocumentDataOptions( optionsElem );
docElem->appendChild( optionsElem );
// ----------------------------------------------------------------------
// the header stuff
// ----------------------------------------------------------------------
- QDomElement headerElem = doc.createElement( "header" );
+ TQDomElement headerElem = doc.createElement( "header" );
saveDocumentDataHeader( headerElem );
docElem->appendChild( headerElem );
// now do the "real" work: save the entries
// ----------------------------------------------------------------------
- QDomElement topElem = doc.createElement( "files" );
+ TQDomElement topElem = doc.createElement( "files" );
- QPtrListIterator<K3bDataItem> it( root()->children() );
+ TQPtrListIterator<K3bDataItem> it( root()->tqchildren() );
for( ; it.current(); ++it ) {
saveDataItem( it.current(), &doc, &topElem );
}
@@ -636,11 +636,11 @@ bool K3bDataDoc::saveDocumentData( QDomElement* docElem )
}
-void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem )
+void K3bDataDoc::saveDocumentDataOptions( TQDomElement& optionsElem )
{
- QDomDocument doc = optionsElem.ownerDocument();
+ TQDomDocument doc = optionsElem.ownerDocument();
- QDomElement topElem = doc.createElement( "rock_ridge" );
+ TQDomElement topElem = doc.createElement( "rock_ridge" );
topElem.setAttribute( "activated", isoOptions().createRockRidge() ? "yes" : "no" );
optionsElem.appendChild( topElem );
@@ -709,7 +709,7 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem )
optionsElem.appendChild( topElem );
topElem = doc.createElement( "iso_level" );
- topElem.appendChild( doc.createTextNode( QString::number(isoOptions().ISOLevel()) ) );
+ topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().ISOLevel()) ) );
optionsElem.appendChild( topElem );
topElem = doc.createElement( "discard_symlinks" );
@@ -745,8 +745,8 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem )
case K3bIsoOptions::extended:
topElem.appendChild( doc.createTextNode( "extended" ) );
break;
- case K3bIsoOptions::replace:
- topElem.appendChild( doc.createTextNode( "replace" ) );
+ case K3bIsoOptions::tqreplace:
+ topElem.appendChild( doc.createTextNode( "tqreplace" ) );
break;
default:
topElem.appendChild( doc.createTextNode( "noChange" ) );
@@ -796,11 +796,11 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem )
}
-void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem )
+void K3bDataDoc::saveDocumentDataHeader( TQDomElement& headerElem )
{
- QDomDocument doc = headerElem.ownerDocument();
+ TQDomDocument doc = headerElem.ownerDocument();
- QDomElement topElem = doc.createElement( "volume_id" );
+ TQDomElement topElem = doc.createElement( "volume_id" );
topElem.appendChild( doc.createTextNode( isoOptions().volumeID() ) );
headerElem.appendChild( topElem );
@@ -809,11 +809,11 @@ void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem )
headerElem.appendChild( topElem );
topElem = doc.createElement( "volume_set_size" );
- topElem.appendChild( doc.createTextNode( QString::number(isoOptions().volumeSetSize()) ) );
+ topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().volumeSetSize()) ) );
headerElem.appendChild( topElem );
topElem = doc.createElement( "volume_set_number" );
- topElem.appendChild( doc.createTextNode( QString::number(isoOptions().volumeSetNumber()) ) );
+ topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().volumeSetNumber()) ) );
headerElem.appendChild( topElem );
topElem = doc.createElement( "system_id" );
@@ -835,23 +835,23 @@ void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem )
}
-void K3bDataDoc::saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement* parent )
+void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent )
{
if( K3bFileItem* fileItem = dynamic_cast<K3bFileItem*>( item ) ) {
- if( m_oldSession.contains( fileItem ) ) {
+ if( m_oldSession.tqcontains( fileItem ) ) {
kdDebug() << "(K3bDataDoc) ignoring fileitem " << fileItem->k3bName() << " from old session while saving..." << endl;
}
else {
- QDomElement topElem = doc->createElement( "file" );
+ TQDomElement topElem = doc->createElement( "file" );
topElem.setAttribute( "name", fileItem->k3bName() );
- QDomElement subElem = doc->createElement( "url" );
+ TQDomElement subElem = doc->createElement( "url" );
subElem.appendChild( doc->createTextNode( fileItem->localPath() ) );
topElem.appendChild( subElem );
if( item->sortWeight() != 0 )
- topElem.setAttribute( "sort_weight", QString::number(item->sortWeight()) );
+ topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) );
- parent->appendChild( topElem );
+ tqparent->appendChild( topElem );
// add boot options as attributes to preserve compatibility to older K3b versions
if( K3bBootItem* bootItem = dynamic_cast<K3bBootItem*>( fileItem ) ) {
@@ -864,31 +864,31 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement
topElem.setAttribute( "no_boot", bootItem->noBoot() ? "yes" : "no" );
topElem.setAttribute( "boot_info_table", bootItem->bootInfoTable() ? "yes" : "no" );
- topElem.setAttribute( "load_segment", QString::number( bootItem->loadSegment() ) );
- topElem.setAttribute( "load_size", QString::number( bootItem->loadSize() ) );
+ topElem.setAttribute( "load_segment", TQString::number( bootItem->loadSegment() ) );
+ topElem.setAttribute( "load_size", TQString::number( bootItem->loadSize() ) );
}
}
}
else if( item == m_bootCataloge ) {
- QDomElement topElem = doc->createElement( "special" );
+ TQDomElement topElem = doc->createElement( "special" );
topElem.setAttribute( "name", m_bootCataloge->k3bName() );
topElem.setAttribute( "type", "boot cataloge" );
- parent->appendChild( topElem );
+ tqparent->appendChild( topElem );
}
else if( K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( item ) ) {
- QDomElement topElem = doc->createElement( "directory" );
+ TQDomElement topElem = doc->createElement( "directory" );
topElem.setAttribute( "name", dirItem->k3bName() );
if( item->sortWeight() != 0 )
- topElem.setAttribute( "sort_weight", QString::number(item->sortWeight()) );
+ topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) );
- QPtrListIterator<K3bDataItem> it( dirItem->children() );
+ TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() );
for( ; it.current(); ++it ) {
saveDataItem( it.current(), doc, &topElem );
}
- parent->appendChild( topElem );
+ tqparent->appendChild( topElem );
}
}
@@ -944,7 +944,7 @@ void K3bDataDoc::itemAddedToDir( K3bDirItem*, K3bDataItem* item )
void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent )
{
if( !item || !newParent ) {
- kdDebug() << "(K3bDataDoc) item or parentitem was NULL while moving." << endl;
+ kdDebug() << "(K3bDataDoc) item or tqparentitem was NULL while moving." << endl;
return;
}
@@ -957,14 +957,14 @@ void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent )
}
-void K3bDataDoc::moveItems( QPtrList<K3bDataItem> itemList, K3bDirItem* newParent )
+void K3bDataDoc::moveItems( TQPtrList<K3bDataItem> itemList, K3bDirItem* newParent )
{
if( !newParent ) {
kdDebug() << "(K3bDataDoc) tried to move items to nowhere...!" << endl;
return;
}
- QPtrListIterator<K3bDataItem> it( itemList );
+ TQPtrListIterator<K3bDataItem> it( itemList );
for( ; it.current(); ++it ) {
// check if newParent is subdir of item
if( K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( it.current() ) ) {
@@ -979,13 +979,13 @@ void K3bDataDoc::moveItems( QPtrList<K3bDataItem> itemList, K3bDirItem* newParen
}
-K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent )
+K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
{
- return new K3bDataJob( this, hdl, parent );
+ return new K3bDataJob( this, hdl, tqparent );
}
-QString K3bDataDoc::treatWhitespace( const QString& path )
+TQString K3bDataDoc::treatWhitespace( const TQString& path )
{
// TODO:
@@ -996,10 +996,10 @@ QString K3bDataDoc::treatWhitespace( const QString& path )
if( isoOptions().whiteSpaceTreatment() != K3bIsoOptions::noChange ) {
- QString result = path;
+ TQString result = path;
- if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::replace ) {
- result.replace( ' ', isoOptions().whiteSpaceTreatmentReplaceString() );
+ if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::tqreplace ) {
+ result.tqreplace( ' ', isoOptions().whiteSpaceTreatmentReplaceString() );
}
else if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::strip ) {
result.remove( ' ' );
@@ -1064,8 +1064,8 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir )
if( !dir )
return;
- QPtrList<K3bDataItem> sortedChildren;
- QPtrListIterator<K3bDataItem> it( dir->children() );
+ TQPtrList<K3bDataItem> sortedChildren;
+ TQPtrListIterator<K3bDataItem> it( dir->tqchildren() );
for( it.toLast(); it.current(); --it ) {
K3bDataItem* item = it.current();
@@ -1083,7 +1083,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir )
if( isoOptions().createJoliet() || isoOptions().createRockRidge() ) {
- QPtrList<K3bDataItem> sameNameList;
+ TQPtrList<K3bDataItem> sameNameList;
while( !sortedChildren.isEmpty() ) {
sameNameList.clear();
@@ -1105,7 +1105,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir )
}
int cnt = 1;
- for( QPtrListIterator<K3bDataItem> it( sameNameList );
+ for( TQPtrListIterator<K3bDataItem> it( sameNameList );
it.current(); ++it ) {
it.current()->setWrittenName( K3b::appendNumberToFilename( it.current()->writtenName(), cnt++, maxlen ) );
}
@@ -1118,13 +1118,13 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir )
void K3bDataDoc::informAboutNotFoundFiles()
{
if( !m_notFoundFiles.isEmpty() ) {
- KMessageBox::informationList( qApp->activeWindow(), i18n("Could not find the following files:"),
+ KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("Could not find the following files:"),
m_notFoundFiles, i18n("Not Found") );
m_notFoundFiles.clear();
}
if( !m_noPermissionFiles.isEmpty() ) {
- KMessageBox::informationList( qApp->activeWindow(), i18n("No permission to read the following files:"),
+ KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("No permission to read the following files:"),
m_noPermissionFiles, i18n("No Read Permission") );
m_noPermissionFiles.clear();
@@ -1188,7 +1188,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device )
// TODO: also import some other pd fields
const K3bIso9660Directory* rootDir = iso.firstRRDirEntry();
- // Jrg Schilling says that it is impossible to import the joliet tree for multisession
+ // J�rg Schilling says that it is impossible to import the joliet tree for multisession
// if( !rootDir )
// rootDir = iso.firstJolietDirEntry();
if( !rootDir )
@@ -1211,16 +1211,16 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device )
}
-void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* parent )
+void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* tqparent )
{
Q_ASSERT(importDir);
- QStringList entries = importDir->entries();
+ TQStringList entries = importDir->entries();
entries.remove( "." );
entries.remove( ".." );
- for( QStringList::const_iterator it = entries.begin();
+ for( TQStringList::const_iterator it = entries.begin();
it != entries.end(); ++it ) {
const K3bIso9660Entry* entry = importDir->entry( *it );
- K3bDataItem* oldItem = parent->find( entry->name() );
+ K3bDataItem* oldItem = tqparent->tqfind( entry->name() );
if( entry->isDirectory() ) {
K3bDirItem* dir = 0;
if( oldItem && oldItem->isDir() ) {
@@ -1230,7 +1230,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir,
// we overwrite without warning!
if( oldItem )
removeItem( oldItem );
- dir = new K3bDirItem( entry->name(), this, parent );
+ dir = new K3bDirItem( entry->name(), this, tqparent );
}
dir->setRemoveable(false);
@@ -1250,7 +1250,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir,
if( oldItem )
removeItem( oldItem );
- K3bSessionImportItem* item = new K3bSessionImportItem( file, this, parent );
+ K3bSessionImportItem* item = new K3bSessionImportItem( file, this, tqparent );
item->setExtraInfo( i18n("From previous session") );
m_oldSession.append( item );
}
@@ -1277,8 +1277,8 @@ void K3bDataDoc::clearImportedSession()
delete dir;
}
else {
- for( QPtrListIterator<K3bDataItem> it( dir->children() ); it.current(); ++it ) {
- if( !m_oldSession.contains(it.current()) ) {
+ for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); it.current(); ++it ) {
+ if( !m_oldSession.tqcontains(it.current()) ) {
m_oldSession.remove();
// now the dir becomes a totally normal dir
dir->setRemoveable(true);
@@ -1308,7 +1308,7 @@ void K3bDataDoc::clearImportedSession()
K3bDirItem* K3bDataDoc::bootImageDir()
{
- K3bDataItem* b = m_root->find( "boot" );
+ K3bDataItem* b = m_root->tqfind( "boot" );
if( !b ) {
b = new K3bDirItem( "boot", this, m_root );
setModified( true );
@@ -1322,7 +1322,7 @@ K3bDirItem* K3bDataDoc::bootImageDir()
}
-K3bBootItem* K3bDataDoc::createBootItem( const QString& filename, K3bDirItem* dir )
+K3bBootItem* K3bDataDoc::createBootItem( const TQString& filename, K3bDirItem* dir )
{
if( !dir )
dir = bootImageDir();
@@ -1339,11 +1339,11 @@ K3bBootItem* K3bDataDoc::createBootItem( const QString& filename, K3bDirItem* di
K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir )
{
if( !m_bootCataloge ) {
- QString newName = "boot.catalog";
+ TQString newName = "boot.catalog";
int i = 0;
while( dir->alreadyInDirectory( "boot.catalog" ) ) {
++i;
- newName = QString( "boot%1.catalog" ).arg(i);
+ newName = TQString( "boot%1.catalog" ).tqarg(i);
}
K3bSpecialDataItem* b = new K3bSpecialDataItem( this, 0, dir, newName );
@@ -1361,10 +1361,10 @@ K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir )
}
-QValueList<K3bDataItem*> K3bDataDoc::findItemByLocalPath( const QString& path ) const
+TQValueList<K3bDataItem*> K3bDataDoc::findItemByLocalPath( const TQString& path ) const
{
Q_UNUSED( path );
- return QValueList<K3bDataItem*>();
+ return TQValueList<K3bDataItem*>();
}
diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h
index e09177a..eccbde9 100644
--- a/libk3b/projects/datacd/k3bdatadoc.h
+++ b/libk3b/projects/datacd/k3bdatadoc.h
@@ -22,9 +22,9 @@
#include "k3bisooptions.h"
-#include <qptrlist.h>
-#include <qfileinfo.h>
-#include <qstringlist.h>
+#include <tqptrlist.h>
+#include <tqfileinfo.h>
+#include <tqstringlist.h>
#include <kurl.h>
#include <kio/global.h>
@@ -41,11 +41,11 @@ class K3bFileCompilationSizeHandler;
class KProgressDialog;
//class K3bView;
class KConfig;
-class QString;
-class QStringList;
-class QWidget;
-class QDomDocument;
-class QDomElement;
+class TQString;
+class TQStringList;
+class TQWidget;
+class TQDomDocument;
+class TQDomElement;
class K3bIso9660Directory;
namespace K3bDevice {
@@ -61,15 +61,16 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDataDoc( QObject* parent = 0 );
+ K3bDataDoc( TQObject* tqparent = 0 );
virtual ~K3bDataDoc();
virtual int type() const { return DATA; }
- virtual QString typeString() const;
+ virtual TQString typeString() const;
- virtual QString name() const;
+ virtual TQString name() const;
enum MultiSessionMode {
/**
@@ -108,13 +109,13 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
* Simply calls reparent.
*/
void moveItem( K3bDataItem* item, K3bDirItem* newParent );
- void moveItems( QPtrList<K3bDataItem> itemList, K3bDirItem* newParent );
+ void moveItems( TQPtrList<K3bDataItem> itemList, K3bDirItem* newParent );
- K3bDirItem* addEmptyDir( const QString& name, K3bDirItem* parent );
+ K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* tqparent );
- QString treatWhitespace( const QString& );
+ TQString treatWhitespace( const TQString& );
- virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent = 0 );
+ virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 );
MultiSessionMode multiSessionMode() const { return m_multisessionMode; }
void setMultiSessionMode( MultiSessionMode mode );
@@ -125,7 +126,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
void setVerifyData( bool b ) { m_verifyData = b; }
bool verifyData() const { return m_verifyData; }
- static bool nameAlreadyInDir( const QString&, K3bDirItem* );
+ static bool nameAlreadyInDir( const TQString&, K3bDirItem* );
/**
* Most of the options that map to the mkisofs parameters are grouped
@@ -135,7 +136,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
const K3bIsoOptions& isoOptions() const { return m_isoOptions; }
void setIsoOptions( const K3bIsoOptions& );
- const QPtrList<K3bBootItem>& bootImages() { return m_bootImages; }
+ const TQPtrList<K3bBootItem>& bootImages() { return m_bootImages; }
K3bDataItem* bootCataloge() { return m_bootCataloge; }
K3bDirItem* bootImageDir();
@@ -150,7 +151,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
* \return The new boot item on success or 0 in case a file with the same
* name already exists.
*/
- K3bBootItem* createBootItem( const QString& filename, K3bDirItem* bootDir = 0 );
+ K3bBootItem* createBootItem( const TQString& filename, K3bDirItem* bootDir = 0 );
/**
* Create a new boot catalog item.
@@ -178,7 +179,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
*/
bool needToCutFilenames() const { return m_needToCutFilenames; }
- const QValueList<K3bDataItem*>& needToCutFilenameItems() const { return m_needToCutFilenameItems; }
+ const TQValueList<K3bDataItem*>& needToCutFilenameItems() const { return m_needToCutFilenameItems; }
/**
* Imports a session into the project. This will create K3bSessionImportItems
@@ -203,7 +204,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
*
* \return The items that correspond to the specified local path.
*/
- QValueList<K3bDataItem*> findItemByLocalPath( const QString& path ) const;
+ TQValueList<K3bDataItem*> findItemByLocalPath( const TQString& path ) const;
public slots:
virtual void addUrls( const KURL::List& urls );
@@ -221,7 +222,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
* Just a convience method to prevent using setIsoOptions for this
* often used value.
*/
- void setVolumeID( const QString& );
+ void setVolumeID( const TQString& );
signals:
void itemRemoved( K3bDataItem* );
@@ -229,14 +230,14 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
protected:
/** reimplemented from K3bDoc */
- virtual bool loadDocumentData( QDomElement* root );
+ virtual bool loadDocumentData( TQDomElement* root );
/** reimplemented from K3bDoc */
- virtual bool saveDocumentData( QDomElement* );
+ virtual bool saveDocumentData( TQDomElement* );
- void saveDocumentDataOptions( QDomElement& optionsElem );
- void saveDocumentDataHeader( QDomElement& headerElem );
- bool loadDocumentDataOptions( QDomElement optionsElem );
- bool loadDocumentDataHeader( QDomElement optionsElem );
+ void saveDocumentDataOptions( TQDomElement& optionsElem );
+ void saveDocumentDataHeader( TQDomElement& headerElem );
+ bool loadDocumentDataOptions( TQDomElement optionsElem );
+ bool loadDocumentDataHeader( TQDomElement optionsElem );
K3bFileCompilationSizeHandler* m_sizeHandler;
@@ -245,27 +246,27 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
private:
void prepareFilenamesInDir( K3bDirItem* dir );
- void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* parent );
+ void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* tqparent );
/**
* used by K3bDirItem to inform about removed items.
*/
- void itemRemovedFromDir( K3bDirItem* parent, K3bDataItem* removedItem );
- void itemAddedToDir( K3bDirItem* parent, K3bDataItem* addedItem );
+ void itemRemovedFromDir( K3bDirItem* tqparent, K3bDataItem* removedItem );
+ void itemAddedToDir( K3bDirItem* tqparent, K3bDataItem* addedItem );
/**
* load recursivly
*/
- bool loadDataItem( QDomElement& e, K3bDirItem* parent );
+ bool loadDataItem( TQDomElement& e, K3bDirItem* tqparent );
/**
* save recursivly
*/
- void saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement* parent );
+ void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent );
void informAboutNotFoundFiles();
- QStringList m_notFoundFiles;
- QStringList m_noPermissionFiles;
+ TQStringList m_notFoundFiles;
+ TQStringList m_noPermissionFiles;
K3bRootItem* m_root;
@@ -278,17 +279,17 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc
K3bIsoOptions m_isoOptions;
MultiSessionMode m_multisessionMode;
- QPtrList<K3bDataItem> m_oldSession;
+ TQPtrList<K3bDataItem> m_oldSession;
// boot cd stuff
K3bDataItem* m_bootCataloge;
- QPtrList<K3bBootItem> m_bootImages;
+ TQPtrList<K3bBootItem> m_bootImages;
bool m_bExistingItemsReplaceAll;
bool m_bExistingItemsIgnoreAll;
bool m_needToCutFilenames;
- QValueList<K3bDataItem*> m_needToCutFilenameItems;
+ TQValueList<K3bDataItem*> m_needToCutFilenameItems;
friend class K3bMixedDoc;
friend class K3bDirItem;
diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp
index 6f2a861..ff6aa61 100644
--- a/libk3b/projects/datacd/k3bdataitem.cpp
+++ b/libk3b/projects/datacd/k3bdataitem.cpp
@@ -29,7 +29,7 @@ public:
};
-K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags )
+K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags )
: m_bHideOnRockRidge(false),
m_bHideOnJoliet(false),
m_bRemoveable(true),
@@ -45,8 +45,8 @@ K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags )
m_doc = doc;
m_bHideOnRockRidge = m_bHideOnJoliet = false;
- if( parent )
- m_parentDir = parent->getDirItem();
+ if( tqparent )
+ m_parentDir = tqparent->getDirItem();
else
m_parentDir = 0;
}
@@ -113,16 +113,16 @@ K3b::Msf K3bDataItem::itemBlocks( bool followSymbolicLinks ) const
}
-void K3bDataItem::setK3bName( const QString& name ) {
+void K3bDataItem::setK3bName( const TQString& name ) {
if ( name != m_k3bName ) {
// test for not-allowed characters
- if( name.contains('/') ) {
+ if( name.tqcontains('/') ) {
kdDebug() << "(K3bDataItem) name contained invalid characters!" << endl;
return;
}
- if( parent() ) {
- K3bDataItem* item = parent()->find( name );
+ if( tqparent() ) {
+ K3bDataItem* item = tqparent()->tqfind( name );
if( item && item != this ) {
kdDebug() << "(K3bDataItem) item with that name already exists." << endl;
return;
@@ -135,7 +135,7 @@ void K3bDataItem::setK3bName( const QString& name ) {
}
-const QString& K3bDataItem::k3bName() const
+const TQString& K3bDataItem::k3bName() const
{
return m_k3bName;
}
@@ -143,17 +143,17 @@ const QString& K3bDataItem::k3bName() const
K3bDataItem* K3bDataItem::take()
{
- if( parent() )
- parent()->takeDataItem( this );
+ if( tqparent() )
+ tqparent()->takeDataItem( this );
return this;
}
-QString K3bDataItem::k3bPath() const
+TQString K3bDataItem::k3bPath() const
{
if( !getParent() )
- return QString::null; // the root item is the only one not having a parent
+ return TQString(); // the root item is the only one not having a tqparent
else if( isDir() )
return getParent()->k3bPath() + k3bName() + "/";
else
@@ -161,10 +161,10 @@ QString K3bDataItem::k3bPath() const
}
-QString K3bDataItem::writtenPath() const
+TQString K3bDataItem::writtenPath() const
{
if( !getParent() )
- return QString::null; // the root item is the only one not having a parent
+ return TQString(); // the root item is the only one not having a tqparent
else if( isDir() )
return getParent()->writtenPath() + writtenName() + "/";
else
@@ -172,10 +172,10 @@ QString K3bDataItem::writtenPath() const
}
-QString K3bDataItem::iso9660Path() const
+TQString K3bDataItem::iso9660Path() const
{
if( !getParent() )
- return QString::null; // the root item is the only one not having a parent
+ return TQString(); // the root item is the only one not having a tqparent
else if( isDir() )
return getParent()->iso9660Path() + iso9660Name() + "/";
else
@@ -186,14 +186,14 @@ QString K3bDataItem::iso9660Path() const
K3bDataItem* K3bDataItem::nextSibling() const
{
K3bDataItem* item = const_cast<K3bDataItem*>(this); // urg, but we know that we don't mess with it, so...
- K3bDirItem* parentItem = getParent();
+ K3bDirItem* tqparentItem = getParent();
- while( parentItem ) {
- if( K3bDataItem* i = parentItem->nextChild( item ) )
+ while( tqparentItem ) {
+ if( K3bDataItem* i = tqparentItem->nextChild( item ) )
return i;
- item = parentItem;
- parentItem = item->getParent();
+ item = tqparentItem;
+ tqparentItem = item->getParent();
}
return 0;
@@ -232,7 +232,7 @@ bool K3bDataItem::hideOnJoliet() const
void K3bDataItem::setHideOnRockRidge( bool b )
{
// there is no use in changing the value if
- // it is already set by the parent
+ // it is already set by the tqparent
if( ( !getParent() || !getParent()->hideOnRockRidge() ) &&
b != m_bHideOnRockRidge ) {
m_bHideOnRockRidge = b;
@@ -245,7 +245,7 @@ void K3bDataItem::setHideOnRockRidge( bool b )
void K3bDataItem::setHideOnJoliet( bool b )
{
// there is no use in changing the value if
- // it is already set by the parent
+ // it is already set by the tqparent
if( ( !getParent() || !getParent()->hideOnJoliet() ) &&
b != m_bHideOnJoliet ) {
m_bHideOnJoliet = b;
diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h
index 36cdf05..db7452b 100644
--- a/libk3b/projects/datacd/k3bdataitem.h
+++ b/libk3b/projects/datacd/k3bdataitem.h
@@ -21,7 +21,7 @@
class K3bDirItem;
class K3bDataDoc;
-#include <qstring.h>
+#include <tqstring.h>
#include <kio/global.h>
@@ -35,12 +35,12 @@ class K3bDataDoc;
class LIBK3B_EXPORT K3bDataItem
{
public:
- K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent = 0, int flags = 0 );
+ K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent = 0, int flags = 0 );
/**
* Default copy constructor.
*
- * The result is an exact copy except that no parent dir it set and, thus, also no doc.
+ * The result is an exact copy except that no tqparent dir it set and, thus, also no doc.
*/
K3bDataItem( const K3bDataItem& );
@@ -49,44 +49,44 @@ class LIBK3B_EXPORT K3bDataItem
/**
* Return an exact copy of this data item.
*
- * The result is an exact copy except that no parent dir it set and, thus, also no doc.
+ * The result is an exact copy except that no tqparent dir it set and, thus, also no doc.
*
* Implementations should use the default constructor.
*/
virtual K3bDataItem* copy() const = 0;
- K3bDirItem* parent() { return m_parentDir; }
+ K3bDirItem* tqparent() { return m_parentDir; }
K3bDirItem* getParent() const { return m_parentDir; }
/**
- * Remove this item from it's parent and return a pointer to it.
+ * Remove this item from it's tqparent and return a pointer to it.
*/
K3bDataItem* take();
K3bDataDoc* doc() const { return m_doc; }
- virtual const QString& k3bName() const;
- virtual void setK3bName( const QString& );
+ virtual const TQString& k3bName() const;
+ virtual void setK3bName( const TQString& );
/**
* returns the path as defined by the k3b-hierachy, NOT starting with a slash
* (since this is used for graft-points!)
* directories have a trailing "/"
*/
- virtual QString k3bPath() const;
+ virtual TQString k3bPath() const;
/**
* Returns the name of the item as used on the CD or DVD image.
*
* This is only valid after a call to @p K3bDataDoc::prepareFilenames()
*/
- const QString& writtenName() const { return m_writtenName; }
+ const TQString& writtenName() const { return m_writtenName; }
/**
* \return the pure name used in the Iso9660 tree.
*
* This is only valid after a call to @p K3bDataDoc::prepareFilenames()
*/
- const QString& iso9660Name() const { return m_rawIsoName; }
+ const TQString& iso9660Name() const { return m_rawIsoName; }
/**
* Returns the path of the item as written to the CD or DVD image.
@@ -95,24 +95,24 @@ class LIBK3B_EXPORT K3bDataItem
*
* This is only valid after a call to @p K3bDataDoc::prepareFilenames()
*/
- virtual QString writtenPath() const;
+ virtual TQString writtenPath() const;
- virtual QString iso9660Path() const;
+ virtual TQString iso9660Path() const;
/**
* Used to set the written name by @p K3bDataDoc::prepareFilenames()
*/
- void setWrittenName( const QString& s ) { m_writtenName = s; }
+ void setWrittenName( const TQString& s ) { m_writtenName = s; }
/**
* Used to set the pure Iso9660 name by @p K3bDataDoc::prepareFilenames()
*/
- void setIso9660Name( const QString& s ) { m_rawIsoName = s; }
+ void setIso9660Name( const TQString& s ) { m_rawIsoName = s; }
virtual K3bDataItem* nextSibling() const;
/** returns the path to the file on the local filesystem */
- virtual QString localPath() const { return QString::null; }
+ virtual TQString localPath() const { return TQString(); }
/**
* The size of the item
@@ -133,7 +133,7 @@ class LIBK3B_EXPORT K3bDataItem
virtual void reparent( K3bDirItem* );
// FIXME: use all these flags and make the isXXX methods
- // non-virtual. Then move the parent()->addDataItem call
+ // non-virtual. Then move the tqparent()->addDataItem call
// to the K3bDataItem constructor
enum ItemFlags {
DIR = 0x1,
@@ -173,14 +173,14 @@ class LIBK3B_EXPORT K3bDataItem
virtual bool isRenameable() const { return m_bRenameable; }
virtual bool isHideable() const { return m_bHideable; }
virtual bool writeToCd() const { return m_bWriteToCd; }
- virtual const QString& extraInfo() const { return m_extraInfo; }
+ virtual const TQString& extraInfo() const { return m_extraInfo; }
void setRenameable( bool b ) { m_bRenameable = b; }
void setMoveable( bool b ) { m_bMovable = b; }
void setRemoveable( bool b ) { m_bRemoveable = b; }
void setHideable( bool b ) { m_bHideable = b; }
void setWriteToCd( bool b ) { m_bWriteToCd = b; }
- void setExtraInfo( const QString& i ) { m_extraInfo = i; }
+ void setExtraInfo( const TQString& i ) { m_extraInfo = i; }
protected:
virtual KIO::filesize_t itemSize( bool followSymlinks ) const = 0;
@@ -194,7 +194,7 @@ class LIBK3B_EXPORT K3bDataItem
*/
virtual K3b::Msf itemBlocks( bool followSymlinks ) const;
- QString m_k3bName;
+ TQString m_k3bName;
void setFlags( int flags );
@@ -202,8 +202,8 @@ class LIBK3B_EXPORT K3bDataItem
class Private;
Private* d;
- QString m_writtenName;
- QString m_rawIsoName;
+ TQString m_writtenName;
+ TQString m_rawIsoName;
K3bDataDoc* m_doc;
K3bDirItem* m_parentDir;
@@ -215,7 +215,7 @@ class LIBK3B_EXPORT K3bDataItem
bool m_bMovable;
bool m_bHideable;
bool m_bWriteToCd;
- QString m_extraInfo;
+ TQString m_extraInfo;
long m_sortWeight;
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index 7009a43..abceb3a 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -43,11 +43,11 @@
#include <kio/global.h>
#include <kio/job.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qdatastream.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
+#include <tqfile.h>
+#include <tqdatastream.h>
#include <kdebug.h>
@@ -83,8 +83,8 @@ public:
};
-K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent )
- : K3bBurnJob( hdl, parent )
+K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bBurnJob( hdl, tqparent )
{
d = new Private;
@@ -95,10 +95,10 @@ K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent )
m_isoImager = 0;
m_msInfoFetcher = new K3bMsInfoFetcher( this, this );
- connect( m_msInfoFetcher, SIGNAL(finished(bool)), this, SLOT(slotMsInfoFetched(bool)) );
- connect( m_msInfoFetcher, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_msInfoFetcher, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_msInfoFetcher, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMsInfoFetched(bool)) );
+ connect( m_msInfoFetcher, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_msInfoFetcher, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
d->imageFinished = true;
}
@@ -179,7 +179,7 @@ void K3bDataJob::prepareWriting()
m_msInfoFetcher->start();
}
else {
- m_isoImager->setMultiSessionInfo( QString::null );
+ m_isoImager->setMultiSessionInfo( TQString() );
prepareData();
d->initializingImager = true;
@@ -196,7 +196,7 @@ void K3bDataJob::slotMsInfoFetched(bool success)
prepareData();
if( d->usedWritingApp == K3b::CDRDAO ) // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord
- m_isoImager->setMultiSessionInfo( QString("%1,%2").arg(m_msInfoFetcher->lastSessionStart()).arg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() );
+ m_isoImager->setMultiSessionInfo( TQString("%1,%2").tqarg(m_msInfoFetcher->lastSessionStart()).tqarg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() );
else
m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo(), d->doc->burner() );
@@ -226,7 +226,7 @@ void K3bDataJob::writeImage()
emit newTask( i18n("Creating image file") );
emit newSubTask( i18n("Track 1 of 1") );
- emit infoMessage( i18n("Creating image file in %1").arg(d->doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating image file in %1").tqarg(d->doc->tempDir()), INFO );
m_isoImager->writeToImageFile( d->doc->tempDir() );
m_isoImager->start();
@@ -324,7 +324,7 @@ void K3bDataJob::slotIsoImagerFinished( bool success )
d->doc->onlyCreateImages() ) {
if( success ) {
- emit infoMessage( i18n("Image successfully created in %1").arg(d->doc->tempDir()), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Image successfully created in %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS );
d->imageFinished = true;
if( d->doc->onlyCreateImages() ) {
@@ -370,7 +370,7 @@ bool K3bDataJob::startWriterJob()
if( d->doc->dummy() )
emit newTask( i18n("Simulating") );
else if( d->copies > 1 )
- emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) );
else
emit newTask( i18n("Writing") );
@@ -408,7 +408,7 @@ void K3bDataJob::slotWriterJobPercent( int p )
void K3bDataJob::slotWriterNextTrack( int t, int tt )
{
- emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) );
+ emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(tt) );
}
@@ -432,20 +432,20 @@ void K3bDataJob::slotWriterJobFinished( bool success )
if( d->doc->verifyData() ) {
if( !d->verificationJob ) {
d->verificationJob = new K3bVerificationJob( this, this );
- connect( d->verificationJob, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
- connect( d->verificationJob, SIGNAL(newTask(const QString&)),
- this, SIGNAL(newSubTask(const QString&)) );
- connect( d->verificationJob, SIGNAL(newSubTask(const QString&)),
- this, SIGNAL(newSubTask(const QString&)) );
- connect( d->verificationJob, SIGNAL(percent(int)),
- this, SLOT(slotVerificationProgress(int)) );
- connect( d->verificationJob, SIGNAL(percent(int)),
- this, SIGNAL(subPercent(int)) );
- connect( d->verificationJob, SIGNAL(finished(bool)),
- this, SLOT(slotVerificationFinished(bool)) );
- connect( d->verificationJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( d->verificationJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->verificationJob, TQT_SIGNAL(newTask(const TQString&)),
+ this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->verificationJob, TQT_SIGNAL(newSubTask(const TQString&)),
+ this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->verificationJob, TQT_SIGNAL(percent(int)),
+ this, TQT_SLOT(slotVerificationProgress(int)) );
+ connect( d->verificationJob, TQT_SIGNAL(percent(int)),
+ this, TQT_SIGNAL(subPercent(int)) );
+ connect( d->verificationJob, TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(slotVerificationFinished(bool)) );
+ connect( d->verificationJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
d->verificationJob->clear();
@@ -541,19 +541,19 @@ void K3bDataJob::setWriterJob( K3bAbstractWriter* writer )
{
// FIXME: progressedsize for multiple copies
m_writerJob = writer;
- connect( m_writerJob, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_writerJob, SIGNAL(percent(int)), this, SLOT(slotWriterJobPercent(int)) );
- connect( m_writerJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) );
- connect( m_writerJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) );
- connect( m_writerJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( m_writerJob, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) );
- connect( m_writerJob, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) );
- connect( m_writerJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( m_writerJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( m_writerJob, SIGNAL(finished(bool)), this, SLOT(slotWriterJobFinished(bool)) );
- connect( m_writerJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterJobPercent(int)) );
+ connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
+ connect( m_writerJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
+ connect( m_writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
+ connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
+ connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(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(slotWriterJobFinished(bool)) );
+ connect( m_writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
@@ -572,11 +572,11 @@ void K3bDataJob::setImager( K3bIsoImager* imager )
void K3bDataJob::connectImager()
{
m_isoImager->disconnect( this );
- connect( m_isoImager, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_isoImager, SIGNAL(percent(int)), this, SLOT(slotIsoImagerPercent(int)) );
- connect( m_isoImager, SIGNAL(finished(bool)), this, SLOT(slotIsoImagerFinished(bool)) );
- connect( m_isoImager, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
+ connect( m_isoImager, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_isoImager, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotIsoImagerPercent(int)) );
+ connect( m_isoImager, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotIsoImagerFinished(bool)) );
+ connect( m_isoImager, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
}
@@ -632,7 +632,7 @@ bool K3bDataJob::prepareWriterJob()
writer->addArgument( "-xa1" );
}
- writer->addArgument( QString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-");
+ writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-");
setWriterJob( writer );
}
@@ -648,10 +648,10 @@ bool K3bDataJob::prepareWriterJob()
// now write the tocfile
if( d->tocFile ) delete d->tocFile;
- d->tocFile = new KTempFile( QString::null, "toc" );
+ d->tocFile = new KTempFile( TQString(), "toc" );
d->tocFile->setAutoDelete(true);
- if( QTextStream* s = d->tocFile->textStream() ) {
+ if( TQTextStream* s = d->tocFile->textStream() ) {
if( d->usedDataMode == K3b::MODE1 ) {
*s << "CD_ROM" << "\n";
*s << "\n";
@@ -790,9 +790,9 @@ void K3bDataJob::determineMultiSessionMode()
else {
// now we need to determine the media's size
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->doc->burner() ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) );
}
}
else {
@@ -905,7 +905,7 @@ bool K3bDataJob::waitForMedium()
}
-QString K3bDataJob::jobDescription() const
+TQString K3bDataJob::jobDescription() const
{
if( d->doc->onlyCreateImages() ) {
return i18n("Creating Data Image File");
@@ -914,19 +914,19 @@ QString K3bDataJob::jobDescription() const
d->doc->multiSessionMode() == K3bDataDoc::AUTO ) {
return i18n("Writing Data CD")
+ ( d->doc->isoOptions().volumeID().isEmpty()
- ? QString::null
- : QString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) );
+ ? TQString()
+ : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) );
}
else {
return i18n("Writing Multisession CD")
+ ( d->doc->isoOptions().volumeID().isEmpty()
- ? QString::null
- : QString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) );
+ ? TQString()
+ : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) );
}
}
-QString K3bDataJob::jobDetails() const
+TQString K3bDataJob::jobDetails() const
{
if( d->doc->copies() > 1 &&
!d->doc->dummy() &&
@@ -935,10 +935,10 @@ QString K3bDataJob::jobDetails() const
return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
"ISO9660 Filesystem (Size: %1) - %n copies",
d->doc->copies() )
- .arg(KIO::convertSize( d->doc->size() ));
+ .tqarg(KIO::convertSize( d->doc->size() ));
else
return i18n("ISO9660 Filesystem (Size: %1)")
- .arg(KIO::convertSize( d->doc->size() ));
+ .tqarg(KIO::convertSize( d->doc->size() ));
}
@@ -951,9 +951,9 @@ K3bDataDoc::MultiSessionMode K3bDataJob::usedMultiSessionMode() const
void K3bDataJob::cleanup()
{
if( !d->doc->onTheFly() && d->doc->removeImages() ) {
- if( QFile::exists( d->doc->tempDir() ) ) {
+ if( TQFile::exists( d->doc->tempDir() ) ) {
d->imageFile.remove();
- emit infoMessage( i18n("Removed image file %1").arg(d->doc->tempDir()), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Removed image file %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS );
}
}
diff --git a/libk3b/projects/datacd/k3bdatajob.h b/libk3b/projects/datacd/k3bdatajob.h
index 58de969..a55e2d9 100644
--- a/libk3b/projects/datacd/k3bdatajob.h
+++ b/libk3b/projects/datacd/k3bdatajob.h
@@ -20,10 +20,10 @@
#include <k3bjob.h>
#include <k3bdatadoc.h>
-#include <qfile.h>
+#include <tqfile.h>
-class QString;
-class QDataStream;
+class TQString;
+class TQDataStream;
class K3bAbstractWriter;
class K3bIsoImager;
class KTempFile;
@@ -40,9 +40,10 @@ namespace K3bDevice {
class K3bDataJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDataJob( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0 );
+ K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 );
virtual ~K3bDataJob();
K3bDoc* doc() const;
@@ -50,8 +51,8 @@ class K3bDataJob : public K3bBurnJob
virtual bool hasBeenCanceled() const;
- virtual QString jobDescription() const;
- virtual QString jobDetails() const;
+ virtual TQString jobDescription() const;
+ virtual TQString jobDetails() const;
public slots:
void cancel();
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
index dd29d6d..d9d4893 100644
--- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp
+++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
@@ -26,8 +26,8 @@
#include <klocale.h>
#include <kstringhandler.h>
-#include <qfile.h>
-#include <qvaluelist.h>
+#include <tqfile.h>
+#include <tqvaluelist.h>
class K3bDataPreparationJob::Private : public K3bThread
@@ -40,9 +40,9 @@ public:
K3bDataDoc* doc;
- QValueList<K3bDataItem*> nonExistingItems;
- QString listOfRenamedItems;
- QValueList<K3bDataItem*> folderSymLinkItems;
+ TQValueList<K3bDataItem*> nonExistingItems;
+ TQString listOfRenamedItems;
+ TQValueList<K3bDataItem*> folderSymLinkItems;
K3bThreadJob* threadJob;
@@ -71,14 +71,14 @@ void K3bDataPreparationJob::Private::run()
// create the message string for the renamed files
if( doc->needToCutFilenames() ) {
int maxlines = 10;
- QValueList<K3bDataItem*>::const_iterator it;
+ TQValueList<K3bDataItem*>::const_iterator it;
for( it = doc->needToCutFilenameItems().begin();
maxlines > 0 && it != doc->needToCutFilenameItems().end();
++it, --maxlines ) {
K3bDataItem* item = *it;
listOfRenamedItems += i18n("<em>%1</em> renamed to <em>%2</em>")
- .arg( KStringHandler::csqueeze( item->k3bName(), 30 ) )
- .arg( KStringHandler::csqueeze( item->writtenName(), 30 ) );
+ .tqarg( KStringHandler::csqueeze( item->k3bName(), 30 ) )
+ .tqarg( KStringHandler::csqueeze( item->writtenName(), 30 ) );
listOfRenamedItems += "<br>";
}
if( it != doc->needToCutFilenameItems().end() )
@@ -93,7 +93,7 @@ void K3bDataPreparationJob::Private::run()
if( item->isSymLink() ) {
if( doc->isoOptions().followSymbolicLinks() ) {
- QFileInfo f( K3b::resolveLink( item->localPath() ) );
+ TQFileInfo f( K3b::resolveLink( item->localPath() ) );
if( !f.exists() ) {
nonExistingItems.append( item );
}
@@ -102,7 +102,7 @@ void K3bDataPreparationJob::Private::run()
}
}
}
- else if( item->isFile() && !QFile::exists( item->localPath() ) ) {
+ else if( item->isFile() && !TQFile::exists( item->localPath() ) ) {
nonExistingItems.append( item );
}
@@ -126,11 +126,11 @@ void K3bDataPreparationJob::Private::cancel()
-static QString createItemsString( const QValueList<K3bDataItem*>& items, unsigned int max )
+static TQString createItemsString( const TQValueList<K3bDataItem*>& items, unsigned int max )
{
- QString s;
+ TQString s;
unsigned int cnt = 0;
- for( QValueList<K3bDataItem*>::const_iterator it = items.begin();
+ for( TQValueList<K3bDataItem*>::const_iterator it = items.begin();
it != items.end(); ++it ) {
s += KStringHandler::csqueeze( (*it)->localPath(), 60 );
@@ -149,12 +149,12 @@ static QString createItemsString( const QValueList<K3bDataItem*>& items, unsigne
}
-K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent )
- : K3bJob( hdl, parent )
+K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bJob( hdl, tqparent )
{
d = new Private( doc );
d->threadJob = new K3bThreadJob( d, this, this );
- connectSubJob( d->threadJob, SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION );
+ connectSubJob( d->threadJob, TQT_SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION );
}
@@ -182,7 +182,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success )
"of the Joliet extensions. If the Joliet extensions are disabled filenames "
"do not have to be shortened but long filenames will not be available on "
"Windows systems.")
- .arg( d->doc->isoOptions().jolietLong() ? 103 : 64 )
+ .tqarg( d->doc->isoOptions().jolietLong() ? 103 : 64 )
+ "<p>" + d->listOfRenamedItems,
i18n("Warning"),
i18n("Shorten Filenames"),
@@ -207,7 +207,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success )
"restrict the length of the volume descriptior (the name of the filesystem) "
"to %1 characters. The selected descriptor '%2' is longer than that. Do you "
"want it to be cut or do you want to go back and change it manually?")
- .arg( 16 ).arg( d->doc->isoOptions().volumeID() ),
+ .tqarg( 16 ).tqarg( d->doc->isoOptions().volumeID() ),
i18n("Warning"),
i18n("Cut volume descriptor in the Joliet tree"),
i18n("Cancel and go back") ) ) {
@@ -228,7 +228,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success )
i18n("Warning"),
i18n("Remove missing files and continue"),
i18n("Cancel and go back") ) ) {
- for( QValueList<K3bDataItem*>::const_iterator it = d->nonExistingItems.begin();
+ for( TQValueList<K3bDataItem*>::const_iterator it = d->nonExistingItems.begin();
it != d->nonExistingItems.end(); ++it ) {
delete *it;
}
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.h b/libk3b/projects/datacd/k3bdatapreparationjob.h
index 1c83a42..3ac7d7d 100644
--- a/libk3b/projects/datacd/k3bdatapreparationjob.h
+++ b/libk3b/projects/datacd/k3bdatapreparationjob.h
@@ -29,9 +29,10 @@ class K3bJobHandler;
class K3bDataPreparationJob : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent );
+ K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent );
~K3bDataPreparationJob();
bool hasBeenCanceled() const;
diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp
index 3ea3236..c36595e 100644
--- a/libk3b/projects/datacd/k3bdiritem.cpp
+++ b/libk3b/projects/datacd/k3bdiritem.cpp
@@ -19,14 +19,14 @@
#include "k3bsessionimportitem.h"
#include "k3bfileitem.h"
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <kdebug.h>
-K3bDirItem::K3bDirItem(const QString& name, K3bDataDoc* doc, K3bDirItem* parentDir)
- : K3bDataItem( doc, parentDir ),
+K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* tqparentDir)
+ : K3bDataItem( doc, tqparentDir ),
m_size(0),
m_followSymlinksSize(0),
m_blocks(0),
@@ -37,8 +37,8 @@ K3bDirItem::K3bDirItem(const QString& name, K3bDataDoc* doc, K3bDirItem* parentD
m_k3bName = name;
// add automagically like a qlistviewitem
- if( parent() )
- parent()->addDataItem( this );
+ if( tqparent() )
+ tqparent()->addDataItem( this );
}
@@ -52,26 +52,26 @@ K3bDirItem::K3bDirItem( const K3bDirItem& item )
m_dirs(0),
m_localPath( item.m_localPath )
{
- for( QPtrListIterator<K3bDataItem> it( item.children() ); *it; ++it )
+ for( TQPtrListIterator<K3bDataItem> it( item.tqchildren() ); *it; ++it )
addDataItem( (*it)->copy() );
}
K3bDirItem::~K3bDirItem()
{
- // delete all children
+ // delete all tqchildren
// doing this by hand is much saver than using the
// auto-delete feature since some of the items' destructors
// may change the list
- K3bDataItem* i = m_children.first();
+ K3bDataItem* i = m_tqchildren.first();
while( i ) {
// it is important to use takeDataItem here to be sure
// the size gets updated properly
takeDataItem(i);
delete i;
- i = m_children.first();
+ i = m_tqchildren.first();
}
- // this has to be done after deleting the children
+ // this has to be done after deleting the tqchildren
// because the directory itself has a size of 0 in K3b
// and all it's files' sizes have already been substracted
take();
@@ -99,14 +99,14 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
}
}
- if( m_children.findRef( item ) == -1 ) {
+ if( m_tqchildren.tqfindRef( item ) == -1 ) {
if( item->isFile() ) {
// do we replace an old item?
- QString name = item->k3bName();
+ TQString name = item->k3bName();
int cnt = 1;
- while( K3bDataItem* oldItem = find( name ) ) {
+ while( K3bDataItem* oldItem = tqfind( name ) ) {
if( !oldItem->isDir() && oldItem->isFromOldSession() ) {
- // in this case we remove this item from it's parent and save it in the new one
+ // in this case we remove this item from it's tqparent and save it in the new one
// to be able to recover it
oldItem->take();
static_cast<K3bSessionImportItem*>(oldItem)->setReplaceItem( static_cast<K3bFileItem*>(item) );
@@ -118,15 +118,15 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
// add a counter to the filename
//
if( item->k3bName()[item->k3bName().length()-4] == '.' )
- name = item->k3bName().left( item->k3bName().length()-4 ) + QString::number(cnt++) + item->k3bName().right(4);
+ name = item->k3bName().left( item->k3bName().length()-4 ) + TQString::number(cnt++) + item->k3bName().right(4);
else
- name = item->k3bName() + QString::number(cnt++);
+ name = item->k3bName() + TQString::number(cnt++);
}
}
item->setK3bName( name );
}
- m_children.append( item->take() );
+ m_tqchildren.append( item->take() );
updateSize( item, false );
if( item->isDir() )
updateFiles( ((K3bDirItem*)item)->numFiles(), ((K3bDirItem*)item)->numDirs()+1 );
@@ -146,9 +146,9 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item )
{
- int x = m_children.findRef( item );
+ int x = m_tqchildren.tqfindRef( item );
if( x > -1 ) {
- K3bDataItem* item = m_children.take();
+ K3bDataItem* item = m_tqchildren.take();
updateSize( item, true );
if( item->isDir() )
updateFiles( -1*((K3bDirItem*)item)->numFiles(), -1*((K3bDirItem*)item)->numDirs()-1 );
@@ -176,8 +176,8 @@ K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item )
K3bDataItem* K3bDirItem::nextSibling() const
{
- if( !m_children.isEmpty() )
- return m_children.getFirst();
+ if( !m_tqchildren.isEmpty() )
+ return m_tqchildren.getFirst();
else
return K3bDataItem::nextSibling();
}
@@ -185,24 +185,24 @@ K3bDataItem* K3bDirItem::nextSibling() const
K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const
{
- // search for prev in children
- if( m_children.findRef( prev ) < 0 ) {
+ // search for prev in tqchildren
+ if( m_tqchildren.tqfindRef( prev ) < 0 ) {
return 0;
}
else
- return m_children.next();
+ return m_tqchildren.next();
}
-bool K3bDirItem::alreadyInDirectory( const QString& filename ) const
+bool K3bDirItem::alreadyInDirectory( const TQString& filename ) const
{
- return (find( filename ) != 0);
+ return (tqfind( filename ) != 0);
}
-K3bDataItem* K3bDirItem::find( const QString& filename ) const
+K3bDataItem* K3bDirItem::tqfind( const TQString& filename ) const
{
- for( QPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
if( it.current()->k3bName() == filename )
return it.current();
}
@@ -210,20 +210,20 @@ K3bDataItem* K3bDirItem::find( const QString& filename ) const
}
-K3bDataItem* K3bDirItem::findByPath( const QString& p )
+K3bDataItem* K3bDirItem::findByPath( const TQString& p )
{
if( p.isEmpty() || p == "/" )
return this;
- QString path = p;
+ TQString path = p;
if( path.startsWith("/") )
path = path.mid(1);
- int pos = path.find( "/" );
+ int pos = path.tqfind( "/" );
if( pos < 0 )
- return find( path );
+ return tqfind( path );
else {
// do it recursivly
- K3bDataItem* item = find( path.left(pos) );
+ K3bDataItem* item = tqfind( path.left(pos) );
if( item && item->isDir() )
return ((K3bDirItem*)item)->findByPath( path.mid( pos+1 ) );
else
@@ -232,14 +232,14 @@ K3bDataItem* K3bDirItem::findByPath( const QString& p )
}
-bool K3bDirItem::mkdir( const QString& dirPath )
+bool K3bDirItem::mkdir( const TQString& dirPath )
{
//
// An absolut path always starts at the root item
//
if( dirPath[0] == '/' ) {
- if( parent() )
- return parent()->mkdir( dirPath );
+ if( tqparent() )
+ return tqparent()->mkdir( dirPath );
else
return mkdir( dirPath.mid( 1 ) );
}
@@ -247,9 +247,9 @@ bool K3bDirItem::mkdir( const QString& dirPath )
if( findByPath( dirPath ) )
return false;
- QString restPath;
- QString dirName;
- int pos = dirPath.find( '/' );
+ TQString restPath;
+ TQString dirName;
+ int pos = dirPath.tqfind( '/' );
if( pos == -1 ) {
dirName = dirPath;
}
@@ -258,7 +258,7 @@ bool K3bDirItem::mkdir( const QString& dirPath )
restPath = dirPath.mid( pos+1 );
}
- K3bDataItem* dir = find( dirName );
+ K3bDataItem* dir = tqfind( dirName );
if( !dir )
dir = new K3bDirItem( dirName, doc(), this );
else if( !dir->isDir() )
@@ -294,12 +294,12 @@ bool K3bDirItem::isSubItem( K3bDataItem* item ) const
if( dynamic_cast<K3bDirItem*>(item) == this )
return true;
- K3bDirItem* d = item->parent();
+ K3bDirItem* d = item->tqparent();
while( d ) {
if( d == this ) {
return true;
}
- d = d->parent();
+ d = d->tqparent();
}
return false;
@@ -323,7 +323,7 @@ bool K3bDirItem::isRemoveable() const
if( !K3bDataItem::isRemoveable() )
return false;
- for( QPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
if( !it.current()->isRemoveable() )
return false;
}
@@ -349,22 +349,22 @@ void K3bDirItem::updateSize( K3bDataItem* item, bool removed )
}
}
- if( parent() )
- parent()->updateSize( item, removed );
+ if( tqparent() )
+ tqparent()->updateSize( item, removed );
}
void K3bDirItem::updateFiles( long files, long dirs )
{
m_files += files;
m_dirs += dirs;
- if( parent() )
- parent()->updateFiles( files, dirs );
+ if( tqparent() )
+ tqparent()->updateFiles( files, dirs );
}
bool K3bDirItem::isFromOldSession() const
{
- for( QPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
if( (*it)->isFromOldSession() )
return true;
}
@@ -375,7 +375,7 @@ bool K3bDirItem::isFromOldSession() const
bool K3bDirItem::writeToCd() const
{
// check if this dir contains items to write
- for( QPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
if( (*it)->writeToCd() )
return true;
}
@@ -394,13 +394,13 @@ K3bRootItem::~K3bRootItem()
}
-const QString& K3bRootItem::k3bName() const
+const TQString& K3bRootItem::k3bName() const
{
return doc()->isoOptions().volumeID();
}
-void K3bRootItem::setK3bName( const QString& text )
+void K3bRootItem::setK3bName( const TQString& text )
{
doc()->setVolumeID( text );
}
diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h
index a64b4fd..61b6c8a 100644
--- a/libk3b/projects/datacd/k3bdiritem.h
+++ b/libk3b/projects/datacd/k3bdiritem.h
@@ -18,8 +18,8 @@
#define K3BDIRITEM_H
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <kio/global.h>
@@ -34,11 +34,11 @@ class K3bDataDoc;
class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
{
public:
- K3bDirItem( const QString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 );
+ K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* tqparentDir = 0 );
/**
- * Default copy constructor. Copies the dir including all children. However, none of the
- * children will have set a doc and the copy dir will not have set a parent dir.
+ * Default copy constructor. Copies the dir including all tqchildren. However, none of the
+ * tqchildren will have set a doc and the copy dir will not have set a tqparent dir.
*/
K3bDirItem( const K3bDirItem& );
@@ -48,16 +48,16 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
K3bDirItem* getDirItem() const;
- const QPtrList<K3bDataItem>& children() const { return m_children; }
+ const TQPtrList<K3bDataItem>& tqchildren() const { return m_tqchildren; }
K3bDirItem* addDataItem( K3bDataItem* item );
K3bDataItem* takeDataItem( K3bDataItem* item );
K3bDataItem* nextSibling() const;
K3bDataItem* nextChild( K3bDataItem* ) const;
- bool alreadyInDirectory( const QString& fileName ) const;
- K3bDataItem* find( const QString& filename ) const;
- K3bDataItem* findByPath( const QString& );
+ bool alreadyInDirectory( const TQString& fileName ) const;
+ K3bDataItem* tqfind( const TQString& filename ) const;
+ K3bDataItem* findByPath( const TQString& );
long numFiles() const;
long numDirs() const;
@@ -83,10 +83,10 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
/**
* Recursively creates a directory.
*/
- bool mkdir( const QString& dir );
+ bool mkdir( const TQString& dir );
- void setLocalPath( const QString& p ) { m_localPath = p; }
- QString localPath() const { return m_localPath; }
+ void setLocalPath( const TQString& p ) { m_localPath = p; }
+ TQString localPath() const { return m_localPath; }
/**
* \reimplemented
@@ -111,7 +111,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
private:
/**
* this recursivly updates the size of the directories.
- * The size of this dir and the parent dir is updated.
+ * The size of this dir and the tqparent dir is updated.
* These values are just used for user information.
*/
void updateSize( K3bDataItem*, bool removed = false );
@@ -121,7 +121,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
*/
void updateFiles( long files, long dirs );
- mutable QPtrList<K3bDataItem> m_children;
+ mutable TQPtrList<K3bDataItem> m_tqchildren;
// size of the items simply added
KIO::filesize_t m_size;
@@ -136,7 +136,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
// HACK: store the original path to be able to use it's permissions
// remove this once we have a backup project
- QString m_localPath;
+ TQString m_localPath;
};
@@ -146,8 +146,8 @@ class K3bRootItem : public K3bDirItem
K3bRootItem( K3bDataDoc* );
~K3bRootItem();
- const QString& k3bName() const;
- void setK3bName( const QString& );
+ const TQString& k3bName() const;
+ void setK3bName( const TQString& );
bool isMoveable() const { return false; }
bool isRemoveable() const { return false; }
diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
index 0ddab76..7d92e7e 100644
--- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
+++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp
@@ -18,9 +18,9 @@
#include <kdebug.h>
-#include <qfile.h>
-#include <qmap.h>
-#include <qptrlist.h>
+#include <tqfile.h>
+#include <tqmap.h>
+#include <tqptrlist.h>
// TODO: remove the items from the project if the savedSize differs
@@ -71,7 +71,7 @@ public:
*/
K3b::Msf blocks() const { return K3b::Msf( usedBlocks(savedSize) ); }
- QPtrList<K3bDataItem> items;
+ TQPtrList<K3bDataItem> items;
};
@@ -114,7 +114,7 @@ public:
void removeFile( K3bFileItem* item, bool followSymlinks ) {
InodeInfo& inodeInfo = inodeMap[item->localId(followSymlinks)];
- if( inodeInfo.items.findRef( item ) == -1 ) {
+ if( inodeInfo.items.tqfindRef( item ) == -1 ) {
kdError() << "(K3bFileCompilationSizeHandler) "
<< item->localPath()
<< " has been removed without being added!" << endl;
@@ -136,7 +136,7 @@ public:
void removeSpecialItem( K3bDataItem* item ) {
// special files do not have a corresponding local file
// so we just substract their k3bSize
- if( specialItems.findRef( item ) == -1 ) {
+ if( specialItems.tqfindRef( item ) == -1 ) {
kdError() << "(K3bFileCompilationSizeHandler) Special item "
<< item->k3bName()
<< " has been removed without being added!" << endl;
@@ -152,12 +152,12 @@ public:
/**
* This maps from inodes to the number of occurrences of the inode.
*/
- QMap<K3bFileItem::Id, InodeInfo> inodeMap;
+ TQMap<K3bFileItem::Id, InodeInfo> inodeMap;
KIO::filesize_t size;
K3b::Msf blocks;
- QPtrList<K3bDataItem> specialItems;
+ TQPtrList<K3bDataItem> specialItems;
};
diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp
index d9e288f..cc71b3a 100644
--- a/libk3b/projects/datacd/k3bfileitem.cpp
+++ b/libk3b/projects/datacd/k3bfileitem.cpp
@@ -22,11 +22,11 @@
#include "k3bisooptions.h"
#include <k3bglobals.h>
-#include <qfileinfo.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qregexp.h>
-#include <qfile.h>
+#include <tqfileinfo.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
+#include <tqfile.h>
#include <kurl.h>
#include <kdebug.h>
@@ -57,7 +57,7 @@ bool operator>( const K3bFileItem::Id& id1, const K3bFileItem::Id& id2 )
-K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName, int flags )
+K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName, int flags )
: K3bDataItem( doc, dir, flags ),
m_replacedItemFromOldSession(0),
m_localPath(filePath)
@@ -71,7 +71,7 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem*
// we need to use lstat here since for symlinks both KDE and QT return the size of the file pointed to
// instead the size of the link.
k3b_struct_stat statBuf;
- if( k3b_lstat( QFile::encodeName(filePath), &statBuf ) ) {
+ if( k3b_lstat( TQFile::encodeName(filePath), &statBuf ) ) {
m_size = K3b::filesize( filePath );
m_id.inode = 0;
m_id.device = 0;
@@ -104,7 +104,7 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem*
if( isSymLink() ) {
k3b_struct_stat statBuf;
- if( k3b_stat( QFile::encodeName(filePath), &statBuf ) == 0 ) {
+ if( k3b_stat( TQFile::encodeName(filePath), &statBuf ) == 0 ) {
m_idFollowed.inode = statBuf.st_ino;
m_idFollowed.device = statBuf.st_dev;
@@ -113,14 +113,14 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem*
}
// add automagically like a qlistviewitem
- if( parent() )
- parent()->addDataItem( this );
+ if( tqparent() )
+ tqparent()->addDataItem( this );
}
K3bFileItem::K3bFileItem( const k3b_struct_stat* stat,
const k3b_struct_stat* followedStat,
- const QString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName )
+ const TQString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName )
: K3bDataItem( doc, dir ),
m_replacedItemFromOldSession(0),
m_localPath(filePath)
@@ -151,8 +151,8 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat,
m_sizeFollowed = m_size;
}
- if( parent() )
- parent()->addDataItem( this );
+ if( tqparent() )
+ tqparent()->addDataItem( this );
}
@@ -171,7 +171,7 @@ K3bFileItem::K3bFileItem( const K3bFileItem& item )
K3bFileItem::~K3bFileItem()
{
- // remove this from parentdir
+ // remove this from tqparentdir
take();
}
@@ -211,14 +211,14 @@ bool K3bFileItem::exists() const
return true;
}
-QString K3bFileItem::absIsoPath()
+TQString K3bFileItem::absIsoPath()
{
// return m_dir->absIsoPath() + m_isoName;
- return QString::null;
+ return TQString();
}
-QString K3bFileItem::localPath() const
+TQString K3bFileItem::localPath() const
{
return m_localPath;
}
@@ -235,9 +235,9 @@ bool K3bFileItem::isSymLink() const
}
-QString K3bFileItem::linkDest() const
+TQString K3bFileItem::linkDest() const
{
- return QFileInfo( localPath() ).readLink();
+ return TQFileInfo( localPath() ).readLink();
}
@@ -247,10 +247,10 @@ bool K3bFileItem::isValid() const
// this link is not valid if we cannot follow it if we want to
if( doc()->isoOptions().followSymbolicLinks() ) {
- return QFile::exists( K3b::resolveLink( localPath() ) );
+ return TQFile::exists( K3b::resolveLink( localPath() ) );
}
- QString dest = linkDest();
+ TQString dest = linkDest();
if( dest[0] == '/' )
return false; // absolut links can never be part of the compilation!
@@ -258,7 +258,7 @@ bool K3bFileItem::isValid() const
// parse the link
K3bDirItem* dir = getParent();
- QStringList tokens = QStringList::split( QRegExp("/+"), dest ); // two slashes or more do the same as one does!
+ TQStringList tokens = TQStringList::split( TQRegExp("/+"), dest ); // two slashes or more do the same as one does!
unsigned int i = 0;
while( i < tokens.size() ) {
@@ -267,13 +267,13 @@ bool K3bFileItem::isValid() const
}
else if( tokens[i] == ".." ) {
// change the directory
- dir = dir->parent();
+ dir = dir->tqparent();
if( dir == 0 )
return false;
}
else {
// search for the item in dir
- K3bDataItem* d = dir->find( tokens[i] );
+ K3bDataItem* d = dir->tqfind( tokens[i] );
if( d == 0 )
return false;
diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h
index f23644f..68ee49d 100644
--- a/libk3b/projects/datacd/k3bfileitem.h
+++ b/libk3b/projects/datacd/k3bfileitem.h
@@ -22,7 +22,7 @@
#include <k3bglobals.h>
#include <kio/global.h>
-#include <qstring.h>
+#include <tqstring.h>
#include "k3b_export.h"
@@ -39,7 +39,7 @@ public:
/**
* Creates a new K3bFileItem
*/
- K3bFileItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0, int flags = 0 );
+ K3bFileItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0, int flags = 0 );
/**
* Constructor for optimized file item creation which does no additional stat.
@@ -48,12 +48,12 @@ public:
*/
K3bFileItem( const k3b_struct_stat* stat,
const k3b_struct_stat* followedStat,
- const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 );
+ const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 );
/**
* Default copy constructor
* Creates a copy of the fileitem. The copy, however, is not an exact duplicate of this item.
- * The copy does not have a parent dir set and any old session items are set to 0.
+ * The copy does not have a tqparent dir set and any old session items are set to 0.
*/
K3bFileItem( const K3bFileItem& );
@@ -63,10 +63,10 @@ public:
bool exists() const;
- QString absIsoPath();
+ TQString absIsoPath();
/** reimplemented from K3bDataItem */
- QString localPath() const;
+ TQString localPath() const;
/**
* Identification of the files on the local device.
@@ -77,7 +77,7 @@ public:
};
/**
- * This is not the normal inode number but it also contains
+ * This is not the normal inode number but it also tqcontains
* the device number.
*/
Id localId() const;
@@ -90,7 +90,7 @@ public:
K3bDirItem* getDirItem() const;
bool isSymLink() const;
- QString linkDest() const;
+ TQString linkDest() const;
bool isFile() const { return true; }
/** returns true if the item is not a link or
@@ -113,7 +113,7 @@ public:
Id m_id;
Id m_idFollowed;
- QString m_localPath;
+ TQString m_localPath;
bool m_bSymLink;
};
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index f44d3ab..b7ff5ad 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -39,11 +39,11 @@
#include <kio/job.h>
#include <kstringhandler.h>
-#include <qfile.h>
-#include <qregexp.h>