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 )
{
// * DVD±RW 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();
- // Jörg 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>
-#include <qdir.h>
-#include <qapplication.h>
-#include <qvaluestack.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqdir.h>
+#include <tqapplication.h>
+#include <tqvaluestack.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -65,7 +65,7 @@ public:
delete pipe;
}
- QString imagePath;
+ TQString imagePath;
K3bFileSplitter imageFile;
const K3bExternalBin* mkisofsBin;
@@ -85,8 +85,8 @@ public:
};
-K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent, const char* name )
- : K3bJob( hdl, parent, name ),
+K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent, const char* name )
+ : K3bJob( hdl, tqparent, name ),
m_pathSpecFile(0),
m_rrHideFile(0),
m_jolietHideFile(0),
@@ -103,7 +103,7 @@ K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent
d = new Private();
d->dataPreparationJob = new K3bDataPreparationJob( doc, this, this );
connectSubJob( d->dataPreparationJob,
- SLOT(slotDataPreparationDone(bool)),
+ TQT_SLOT(slotDataPreparationDone(bool)),
DEFAULT_SIGNAL_CONNECTION );
}
@@ -127,14 +127,14 @@ void K3bIsoImager::writeToFd( int fd )
}
-void K3bIsoImager::writeToImageFile( const QString& path )
+void K3bIsoImager::writeToImageFile( const TQString& path )
{
d->imagePath = path;
m_fdToWriteTo = -1;
}
-void K3bIsoImager::slotReceivedStderr( const QString& line )
+void K3bIsoImager::slotReceivedStderr( const TQString& line )
{
parseMkisofsOutput( line );
emit debuggingOutput( "mkisofs", line );
@@ -147,7 +147,7 @@ void K3bIsoImager::handleMkisofsProgress( int p )
}
-void K3bIsoImager::handleMkisofsInfoMessage( const QString& line, int type )
+void K3bIsoImager::handleMkisofsInfoMessage( const TQString& line, int type )
{
emit infoMessage( line, type );
if( type == ERROR )
@@ -164,15 +164,15 @@ void K3bIsoImager::slotProcessExited( KProcess* p )
d->pipe->close();
emit debuggingOutput( "K3bIsoImager",
- QString("Pipe throughput: %1 bytes read, %2 bytes written.")
- .arg(d->pipe->bytesRead()).arg(d->pipe->bytesWritten()) );
+ TQString("Pipe throughput: %1 bytes read, %2 bytes written.")
+ .tqarg(d->pipe->bytesRead()).tqarg(d->pipe->bytesWritten()) );
if( d->imageFile.isOpen() ) {
d->imageFile.close();
if( m_canceled || p->exitStatus() != 0 ) {
d->imageFile.remove();
- emit infoMessage( i18n("Removed incomplete image file %1.").arg(d->imageFile.name()), WARNING );
+ emit infoMessage( i18n("Removed incomplete image file %1.").tqarg(d->imageFile.name()), WARNING );
}
}
@@ -210,7 +210,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p )
default:
if( !d->knownError && !mkisofsReadError() ) {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("mkisofs").arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("mkisofs").tqarg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
}
@@ -220,7 +220,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p )
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").arg("mkisofs"), ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("mkisofs"), ERROR );
jobFinished( false );
}
}
@@ -238,9 +238,9 @@ void K3bIsoImager::cleanup()
delete m_sortWeightFile;
// remove boot-images-temp files
- for( QStringList::iterator it = m_tempFiles.begin();
+ for( TQStringList::iterator it = m_tempFiles.begin();
it != m_tempFiles.end(); ++it )
- QFile::remove( *it );
+ TQFile::remove( *it );
m_tempFiles.clear();
m_pathSpecFile = m_jolietHideFile = m_rrHideFile = m_sortWeightFile = 0;
@@ -319,9 +319,9 @@ void K3bIsoImager::startSizeCalculation()
// *m_process << dummyDir();
kdDebug() << "***** mkisofs calculate size parameters:\n";
- const QValueList<QCString>& args = m_process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = m_process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << endl << flush;
@@ -340,23 +340,23 @@ void K3bIsoImager::startSizeCalculation()
// TODO: use K3bProcess::OutputCollector instead iof our own two slots.
- connect( m_process, SIGNAL(receivedStderr(KProcess*, char*, int)),
- this, SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) );
- connect( m_process, SIGNAL(stdoutLine(const QString&)),
- this, SLOT(slotCollectMkisofsPrintSizeStdout(const QString&)) );
- connect( m_process, SIGNAL(processExited(KProcess*)),
- this, SLOT(slotMkisofsPrintSizeFinished()) );
+ connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
+ this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) );
+ connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)),
+ this, TQT_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) );
+ connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
+ this, TQT_SLOT(slotMkisofsPrintSizeFinished()) );
// we also want error messages
- connect( m_process, SIGNAL(stderrLine( const QString& )),
- this, SLOT(slotReceivedStderr( const QString& )) );
+ connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )),
+ this, TQT_SLOT(slotReceivedStderr( const TQString& )) );
- m_collectedMkisofsPrintSizeStdout = QString::null;
- m_collectedMkisofsPrintSizeStderr = QString::null;
+ m_collectedMkisofsPrintSizeStdout = TQString();
+ m_collectedMkisofsPrintSizeStderr = TQString();
m_mkisofsPrintSizeResult = 0;
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
- emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR );
cleanup();
jobFinished( false );
@@ -367,12 +367,12 @@ void K3bIsoImager::startSizeCalculation()
void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(KProcess*, char* data , int len)
{
- emit debuggingOutput( "mkisofs", QString::fromLocal8Bit( data, len ) );
- m_collectedMkisofsPrintSizeStderr.append( QString::fromLocal8Bit( data, len ) );
+ emit debuggingOutput( "mkisofs", TQString::fromLocal8Bit( data, len ) );
+ m_collectedMkisofsPrintSizeStderr.append( TQString::fromLocal8Bit( data, len ) );
}
-void K3bIsoImager::slotCollectMkisofsPrintSizeStdout( const QString& line )
+void K3bIsoImager::slotCollectMkisofsPrintSizeStdout( const TQString& line )
{
// newer versions of mkisofs outut additional lines of junk before the size :(
// so we only use the last line
@@ -400,7 +400,7 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished()
else {
// parse the stderr output
// I hope parsing the last line is enough!
- int pos = m_collectedMkisofsPrintSizeStderr.findRev( "extents scheduled to be written" );
+ int pos = m_collectedMkisofsPrintSizeStderr.tqfindRev( "extents scheduled to be written" );
if( pos == -1 )
success = false;
@@ -409,9 +409,9 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished()
}
emit debuggingOutput( "K3bIsoImager",
- QString("mkisofs print size result: %1 (%2 bytes)")
- .arg(m_mkisofsPrintSizeResult)
- .arg(Q_UINT64(m_mkisofsPrintSizeResult)*2048ULL) );
+ TQString("mkisofs print size result: %1 (%2 bytes)")
+ .tqarg(m_mkisofsPrintSizeResult)
+ .tqarg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) );
cleanup();
@@ -485,18 +485,18 @@ void K3bIsoImager::start()
return;
}
- connect( m_process, SIGNAL(processExited(KProcess*)),
- this, SLOT(slotProcessExited(KProcess*)) );
+ connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
+ this, TQT_SLOT(slotProcessExited(KProcess*)) );
- connect( m_process, SIGNAL(stderrLine( const QString& )),
- this, SLOT(slotReceivedStderr( const QString& )) );
+ connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )),
+ this, TQT_SLOT(slotReceivedStderr( const TQString& )) );
//
// Check the image file
if( m_fdToWriteTo == -1 ) {
d->imageFile.setName( d->imagePath );
if( !d->imageFile.open( IO_WriteOnly ) ) {
- emit infoMessage( i18n("Could not open %1 for writing").arg(d->imagePath), ERROR );
+ emit infoMessage( i18n("Could not open %1 for writing").tqarg(d->imagePath), ERROR );
cleanup();
jobFinished(false);
return;
@@ -520,9 +520,9 @@ void K3bIsoImager::start()
kdDebug() << "***** mkisofs parameters:\n";
- const QValueList<QCString>& args = m_process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = m_process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << endl << flush;
@@ -532,7 +532,7 @@ void K3bIsoImager::start()
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bIsoImager) could not start mkisofs" << endl;
- emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR );
jobFinished( false );
cleanup();
}
@@ -553,7 +553,7 @@ void K3bIsoImager::cancel()
}
-void K3bIsoImager::setMultiSessionInfo( const QString& info, K3bDevice::Device* dev )
+void K3bIsoImager::setMultiSessionInfo( const TQString& info, K3bDevice::Device* dev )
{
m_multiSessionInfo = info;
m_device = dev;
@@ -563,11 +563,11 @@ void K3bIsoImager::setMultiSessionInfo( const QString& info, K3bDevice::Device*
// iso9660 + RR use some latin1 variant. So we need to cut the desc fields
// counting 8bit chars. The GUI should take care of restricting the length
// and the charset
-static void truncateTheHardWay( QString& s, int max )
+static void truncateTheHardWay( TQString& s, int max )
{
- QCString cs = s.utf8();
+ TQCString cs = s.utf8();
cs.truncate(max);
- s = QString::fromUtf8( cs );
+ s = TQString::fromUtf8( cs );
}
@@ -588,7 +588,7 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize )
*m_process << "-print-size" << "-quiet";
if( !m_doc->isoOptions().volumeID().isEmpty() ) {
- QString s = m_doc->isoOptions().volumeID();
+ TQString s = m_doc->isoOptions().volumeID();
truncateTheHardWay(s, 32); // ensure max length
*m_process << "-volid" << s;
}
@@ -597,7 +597,7 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize )
*m_process << "-volid" << "CDROM";
}
- QString s = m_doc->isoOptions().volumeSetId();
+ TQString s = m_doc->isoOptions().volumeSetId();
truncateTheHardWay(s, 128); // ensure max length
*m_process << "-volset" << s;
@@ -639,8 +639,8 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize )
<< " with volume set size: " << volsetSize << endl;
volsetSeqNo = volsetSize;
}
- *m_process << "-volset-size" << QString::number(volsetSize);
- *m_process << "-volset-seqno" << QString::number(volsetSeqNo);
+ *m_process << "-volset-size" << TQString::number(volsetSize);
+ *m_process << "-volset-seqno" << TQString::number(volsetSeqNo);
if( m_sortWeightFile ) {
*m_process << "-sort" << m_sortWeightFile->name();
@@ -733,18 +733,18 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize )
if( m_doc->isoOptions().hideTRANS_TBL() )
*m_process << "-hide-joliet-trans-tbl";
- *m_process << "-iso-level" << QString::number(m_doc->isoOptions().ISOLevel());
+ *m_process << "-iso-level" << TQString::number(m_doc->isoOptions().ISOLevel());
if( m_doc->isoOptions().forceInputCharset() )
*m_process << "-input-charset" << m_doc->isoOptions().inputCharset();
- *m_process << "-path-list" << QFile::encodeName(m_pathSpecFile->name());
+ *m_process << "-path-list" << TQFile::encodeName(m_pathSpecFile->name()).data();
// boot stuff
if( !m_doc->bootImages().isEmpty() ) {
bool first = true;
- for( QPtrListIterator<K3bBootItem> it( m_doc->bootImages() );
+ for( TQPtrListIterator<K3bBootItem> it( m_doc->bootImages() );
*it; ++it ) {
if( !first )
*m_process << "-eltorito-alt-boot";
@@ -760,9 +760,9 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize )
else if( bootItem->imageType() == K3bBootItem::NONE ) {
*m_process << "-no-emul-boot";
if( bootItem->loadSegment() > 0 )
- *m_process << "-boot-load-seg" << QString::number(bootItem->loadSegment());
+ *m_process << "-boot-load-seg" << TQString::number(bootItem->loadSegment());
if( bootItem->loadSize() > 0 )
- *m_process << "-boot-load-size" << QString::number(bootItem->loadSize());
+ *m_process << "-boot-load-size" << TQString::number(bootItem->loadSize());
}
if( bootItem->imageType() != K3bBootItem::NONE && bootItem->noBoot() )
@@ -778,8 +778,8 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize )
// additional parameters from config
- const QStringList& params = k3bcore->externalBinManager()->binObject( "mkisofs" )->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = k3bcore->externalBinManager()->binObject( "mkisofs" )->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*m_process << *it;
return true;
@@ -792,7 +792,7 @@ int K3bIsoImager::writePathSpec()
m_pathSpecFile = new KTempFile();
m_pathSpecFile->setAutoDelete(true);
- if( QTextStream* t = m_pathSpecFile->textStream() ) {
+ if( TQTextStream* t = m_pathSpecFile->textStream() ) {
// recursive path spec writing
int num = writePathSpecForDir( m_doc->root(), *t );
@@ -805,7 +805,7 @@ int K3bIsoImager::writePathSpec()
}
-int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream )
+int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream )
{
if( !m_noDeepDirectoryRelocation && dirItem->depth() > 7 ) {
kdDebug() << "(K3bIsoImager) found directory depth > 7. Enabling no deep directory relocation." << endl;
@@ -814,7 +814,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream
// now create the graft points
int num = 0;
- for( QPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); it.current(); ++it ) {
K3bDataItem* item = it.current();
bool writeItem = item->writeToCd();
@@ -825,29 +825,29 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream
writeItem = false;
else if( d->usedLinkHandling == Private::FOLLOW ) {
- QFileInfo f( K3b::resolveLink( item->localPath() ) );
+ TQFileInfo f( K3b::resolveLink( item->localPath() ) );
if( !f.exists() ) {
emit infoMessage( i18n("Could not follow link %1 to non-existing file %2. Skipping...")
- .arg(item->k3bName())
- .arg(f.filePath()), WARNING );
+ .tqarg(item->k3bName())
+ .tqarg(f.filePath()), WARNING );
writeItem = false;
}
else if( f.isDir() ) {
emit infoMessage( i18n("Ignoring link %1 to folder %2. K3b is unable to follow links to folders.")
- .arg(item->k3bName())
- .arg(f.filePath()), WARNING );
+ .tqarg(item->k3bName())
+ .tqarg(f.filePath()), WARNING );
writeItem = false;
}
}
}
else if( item->isFile() ) {
- QFileInfo f( item->localPath() );
+ TQFileInfo f( item->localPath() );
if( !f.exists() ) {
- emit infoMessage( i18n("Could not find file %1. Skipping...").arg(item->localPath()), WARNING );
+ emit infoMessage( i18n("Could not find file %1. Skipping...").tqarg(item->localPath()), WARNING );
writeItem = false;
}
else if( !f.isReadable() ) {
- emit infoMessage( i18n("Could not read file %1. Skipping...").arg(item->localPath()), WARNING );
+ emit infoMessage( i18n("Could not read file %1. Skipping...").tqarg(item->localPath()), WARNING );
writeItem = false;
}
}
@@ -857,7 +857,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream
// some versions of mkisofs seem to have a bug that prevents to use filenames
// that contain one or more backslashes
- if( item->writtenPath().contains("\\") )
+ if( item->writtenPath().tqcontains("\\") )
m_containsFilesWithMultibleBackslashes = true;
@@ -882,20 +882,20 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream
}
-void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, QTextStream& stream )
+void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream )
{
stream << escapeGraftPoint( item->writtenPath() )
<< "=";
- if( m_doc->bootImages().containsRef( dynamic_cast<K3bBootItem*>(item) ) ) { // boot-image-backup-hack
+ if( m_doc->bootImages().tqcontainsRef( dynamic_cast<K3bBootItem*>(item) ) ) { // boot-image-backup-hack
// create temp file
KTempFile temp;
- QString tempPath = temp.name();
+ TQString tempPath = temp.name();
temp.unlink();
if( !KIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) {
- emit infoMessage( i18n("Failed to backup boot image file %1").arg(item->localPath()), ERROR );
+ emit infoMessage( i18n("Failed to backup boot image file %1").tqarg(item->localPath()), ERROR );
return;
}
@@ -917,7 +917,7 @@ bool K3bIsoImager::writeRRHideFile()
m_rrHideFile = new KTempFile();
m_rrHideFile->setAutoDelete(true);
- if( QTextStream* t = m_rrHideFile->textStream() ) {
+ if( TQTextStream* t = m_rrHideFile->textStream() ) {
K3bDataItem* item = m_doc->root();
while( item ) {
@@ -942,7 +942,7 @@ bool K3bIsoImager::writeJolietHideFile()
m_jolietHideFile = new KTempFile();
m_jolietHideFile->setAutoDelete(true);
- if( QTextStream* t = m_jolietHideFile->textStream() ) {
+ if( TQTextStream* t = m_jolietHideFile->textStream() ) {
K3bDataItem* item = m_doc->root();
while( item ) {
@@ -967,7 +967,7 @@ bool K3bIsoImager::writeSortWeightFile()
m_sortWeightFile = new KTempFile();
m_sortWeightFile->setAutoDelete(true);
- if( QTextStream* t = m_sortWeightFile->textStream() ) {
+ if( TQTextStream* t = m_sortWeightFile->textStream() ) {
//
// We need to write the local path in combination with the sort weight
// mkisofs will take care of multiple entries for one local file and always
@@ -976,7 +976,7 @@ bool K3bIsoImager::writeSortWeightFile()
K3bDataItem* item = m_doc->root();
while( (item = item->nextSibling()) ) { // we skip the root here
if( item->sortWeight() != 0 ) {
- if( m_doc->bootImages().containsRef( dynamic_cast<K3bBootItem*>(item) ) ) { // boot-image-backup-hack
+ if( m_doc->bootImages().tqcontainsRef( dynamic_cast<K3bBootItem*>(item) ) ) { // boot-image-backup-hack
*t << escapeGraftPoint( static_cast<K3bBootItem*>(item)->tempPath() ) << " " << item->sortWeight() << endl;
}
else if( item->isDir() ) {
@@ -999,9 +999,9 @@ bool K3bIsoImager::writeSortWeightFile()
}
-QString K3bIsoImager::escapeGraftPoint( const QString& str )
+TQString K3bIsoImager::escapeGraftPoint( const TQString& str )
{
- QString enc = str;
+ TQString enc = str;
//
// mkisofs manpage (-graft-points) is incorrect (as of mkisofs 2.01.01)
@@ -1018,8 +1018,8 @@ QString K3bIsoImager::escapeGraftPoint( const QString& str )
//
//
- // we do not use QString::replace to have full control
- // this might be slow since QString::insert is slow but we don't care
+ // we do not use TQString::replace to have full control
+ // this might be slow since TQString::insert is slow but we don't care
// since this is only called to prepare the iso creation which is not
// time critical. :)
//
@@ -1049,8 +1049,8 @@ QString K3bIsoImager::escapeGraftPoint( const QString& str )
++pos;
}
-// enc.replace( "\\\\", "\\\\\\\\" );
-// enc.replace( "=", "\\=" );
+// enc.tqreplace( "\\\\", "\\\\\\\\" );
+// enc.tqreplace( "=", "\\=" );
return enc;
}
@@ -1093,43 +1093,43 @@ bool K3bIsoImager::prepareMkisofsFiles()
}
-QString K3bIsoImager::dummyDir( K3bDirItem* dir )
+TQString K3bIsoImager::dummyDir( K3bDirItem* dir )
{
//
// since we use virtual folders in order to have folders with different weight factors and different
// permissions we create different dummy dirs to be passed to mkisofs
//
- QDir _appDir( locateLocal( "appdata", "temp/" ) );
+ TQDir _appDir( locateLocal( "appdata", "temp/" ) );
//
// create a unique isoimager session id
// This might become important in case we will allow multiple instances of the isoimager
// to run at the same time.
//
- QString jobId = qApp->sessionId() + "_" + QString::number( m_sessionNumber );
+ TQString jobId = tqApp->sessionId() + "_" + TQString::number( m_sessionNumber );
if( !_appDir.cd( jobId ) ) {
_appDir.mkdir( jobId );
_appDir.cd( jobId );
}
- QString name( "dummydir_" );
- name += QString::number( dir->sortWeight() );
+ TQString name( "dummydir_" );
+ name += TQString::number( dir->sortWeight() );
bool perm = false;
k3b_struct_stat statBuf;
if( !dir->localPath().isEmpty() ) {
// permissions
- if( k3b_stat( QFile::encodeName(dir->localPath()), &statBuf ) == 0 ) {
+ if( k3b_stat( TQFile::encodeName(dir->localPath()), &statBuf ) == 0 ) {
name += "_";
- name += QString::number( statBuf.st_uid );
+ name += TQString::number( statBuf.st_uid );
name += "_";
- name += QString::number( statBuf.st_gid );
+ name += TQString::number( statBuf.st_gid );
name += "_";
- name += QString::number( statBuf.st_mode );
+ name += TQString::number( statBuf.st_mode );
name += "_";
- name += QString::number( statBuf.st_mtime );
+ name += TQString::number( statBuf.st_mtime );
perm = true;
}
@@ -1144,11 +1144,11 @@ QString K3bIsoImager::dummyDir( K3bDirItem* dir )
_appDir.cd( name );
if( perm ) {
- ::chmod( QFile::encodeName( _appDir.absPath() ), statBuf.st_mode );
- ::chown( QFile::encodeName( _appDir.absPath() ), statBuf.st_uid, statBuf.st_gid );
+ ::chmod( TQFile::encodeName( _appDir.absPath() ), statBuf.st_mode );
+ ::chown( TQFile::encodeName( _appDir.absPath() ), statBuf.st_uid, statBuf.st_gid );
struct utimbuf tb;
tb.actime = tb.modtime = statBuf.st_mtime;
- ::utime( QFile::encodeName( _appDir.absPath() ), &tb );
+ ::utime( TQFile::encodeName( _appDir.absPath() ), &tb );
}
}
@@ -1158,11 +1158,11 @@ QString K3bIsoImager::dummyDir( K3bDirItem* dir )
void K3bIsoImager::clearDummyDirs()
{
- QString jobId = qApp->sessionId() + "_" + QString::number( m_sessionNumber );
- QDir appDir( locateLocal( "appdata", "temp/" ) );
+ TQString jobId = tqApp->sessionId() + "_" + TQString::number( m_sessionNumber );
+ TQDir appDir( locateLocal( "appdata", "temp/" ) );
if( appDir.cd( jobId ) ) {
- QStringList dummyDirEntries = appDir.entryList( "dummydir*", QDir::Dirs );
- for( QStringList::iterator it = dummyDirEntries.begin(); it != dummyDirEntries.end(); ++it )
+ TQStringList dummyDirEntries = appDir.entryList( "dummydir*", TQDir::Dirs );
+ for( TQStringList::iterator it = dummyDirEntries.begin(); it != dummyDirEntries.end(); ++it )
appDir.rmdir( *it );
appDir.cdUp();
appDir.rmdir( jobId );
@@ -1170,12 +1170,12 @@ void K3bIsoImager::clearDummyDirs()
}
-QCString K3bIsoImager::checksum() const
+TQCString K3bIsoImager::checksum() const
{
if( K3bChecksumPipe* p = dynamic_cast<K3bChecksumPipe*>( d->pipe ) )
return p->checksum();
else
- return QCString();
+ return TQCString();
}
diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h
index 82501ba..446fef8 100644
--- a/libk3b/projects/datacd/k3bisoimager.h
+++ b/libk3b/projects/datacd/k3bisoimager.h
@@ -19,14 +19,14 @@
#include <k3bjob.h>
#include "k3bmkisofshandler.h"
-#include <qptrqueue.h>
-#include <qstringlist.h>
+#include <tqptrqueue.h>
+#include <tqstringlist.h>
class K3bDataDoc;
class K3bDirItem;
class K3bDataItem;
class K3bFileItem;
-class QTextStream;
+class TQTextStream;
class K3bProcess;
class KProcess;
class K3bDevice::Device;
@@ -36,9 +36,10 @@ class KTempFile;
class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bIsoImager( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bIsoImager();
virtual bool active() const;
@@ -50,7 +51,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
/**
* Get the checksum calculated during the creation of the image.
*/
- QCString checksum() const;
+ TQCString checksum() const;
public slots:
/**
@@ -86,20 +87,20 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
*/
void writeToFd( int fd );
- void writeToImageFile( const QString& path );
+ void writeToImageFile( const TQString& path );
/**
* If dev == 0 K3bIsoImager will ignore the data in the previous session.
* This is usable for CD-Extra.
*/
- void setMultiSessionInfo( const QString&, K3bDevice::Device* dev = 0 );
+ void setMultiSessionInfo( const TQString&, K3bDevice::Device* dev = 0 );
K3bDevice::Device* device() const { return m_device; }
K3bDataDoc* doc() const { return m_doc; }
protected:
virtual void handleMkisofsProgress( int );
- virtual void handleMkisofsInfoMessage( const QString&, int );
+ virtual void handleMkisofsInfoMessage( const TQString&, int );
virtual bool addMkisofsParameters( bool printSize = false );
@@ -113,7 +114,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
*
* @return an empty dummy dir for use with K3bDirItems.
*/
- QString dummyDir( K3bDirItem* );
+ TQString dummyDir( K3bDirItem* );
void outputData();
void initVariables();
@@ -129,9 +130,9 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
bool writeSortWeightFile();
// used by writePathSpec
- virtual int writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream );
- virtual void writePathSpecForFile( K3bFileItem*, QTextStream& stream );
- QString escapeGraftPoint( const QString& str );
+ virtual int writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream );
+ virtual void writePathSpecForFile( K3bFileItem*, TQTextStream& stream );
+ TQString escapeGraftPoint( const TQString& str );
KTempFile* m_pathSpecFile;
KTempFile* m_rrHideFile;
@@ -144,12 +145,12 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
bool m_canceled;
protected slots:
- virtual void slotReceivedStderr( const QString& );
+ virtual void slotReceivedStderr( const TQString& );
virtual void slotProcessExited( KProcess* );
private slots:
void slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int);
- void slotCollectMkisofsPrintSizeStdout( const QString& );
+ void slotCollectMkisofsPrintSizeStdout( const TQString& );
void slotMkisofsPrintSizeFinished();
void slotDataPreparationDone( bool success );
@@ -164,15 +165,15 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
bool m_noDeepDirectoryRelocation;
bool m_importSession;
- QString m_multiSessionInfo;
+ TQString m_multiSessionInfo;
K3bDevice::Device* m_device;
// used for mkisofs -print-size parsing
- QString m_collectedMkisofsPrintSizeStdout;
- QString m_collectedMkisofsPrintSizeStderr;
+ TQString m_collectedMkisofsPrintSizeStdout;
+ TQString m_collectedMkisofsPrintSizeStderr;
int m_mkisofsPrintSizeResult;
- QStringList m_tempFiles;
+ TQStringList m_tempFiles;
int m_fdToWriteTo;
diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp
index bd7314d..5adca1a 100644
--- a/libk3b/projects/datacd/k3bisooptions.cpp
+++ b/libk3b/projects/datacd/k3bisooptions.cpp
@@ -20,12 +20,12 @@
#include <kconfig.h>
#include <klocale.h>
-#include <qstring.h>
+#include <tqstring.h>
K3bIsoOptions::K3bIsoOptions()
: m_volumeID( "K3b data project" ),
- m_applicationID( QString("K3B THE CD KREATOR (C) 1998-2006 SEBASTIAN TRUEG AND THE K3B TEAM") ),
+ m_applicationID( TQString("K3B THE CD KREATOR (C) 1998-2006 SEBASTIAN TRUEG AND THE K3B TEAM") ),
m_systemId( K3b::systemName().upper() ),
m_inputCharset( "iso8859-1" ),
m_whiteSpaceTreatmentReplaceString( "_" )
@@ -118,8 +118,8 @@ void K3bIsoOptions::save( KConfigBase* c, bool saveVolumeDesc )
case extended:
c->writeEntry( "white_space_treatment", "extended" );
break;
- case replace:
- c->writeEntry( "white_space_treatment", "replace" );
+ case tqreplace:
+ c->writeEntry( "white_space_treatment", "tqreplace" );
break;
default:
c->writeEntry( "white_space_treatment", "noChange" );
@@ -188,9 +188,9 @@ K3bIsoOptions K3bIsoOptions::load( KConfigBase* c, bool loadVolumeDesc )
options.setDoNotCacheInodes( c->readBoolEntry( "do not cache inodes", options.doNotCacheInodes() ) );
- QString w = c->readEntry( "white_space_treatment", "noChange" );
- if( w == "replace" )
- options.setWhiteSpaceTreatment( replace );
+ TQString w = c->readEntry( "white_space_treatment", "noChange" );
+ if( w == "tqreplace" )
+ options.setWhiteSpaceTreatment( tqreplace );
else if( w == "strip" )
options.setWhiteSpaceTreatment( strip );
else if( w == "extended" )
diff --git a/libk3b/projects/datacd/k3bisooptions.h b/libk3b/projects/datacd/k3bisooptions.h
index 254c998..570f3d3 100644
--- a/libk3b/projects/datacd/k3bisooptions.h
+++ b/libk3b/projects/datacd/k3bisooptions.h
@@ -16,7 +16,7 @@
#ifndef K3B_ISO_OPTIONS_H
#define K3B_ISO_OPTIONS_H
-#include <qstring.h>
+#include <tqstring.h>
#include "k3b_export.h"
class KConfigBase;
@@ -28,10 +28,10 @@ class LIBK3B_EXPORT K3bIsoOptions
K3bIsoOptions();
bool forceInputCharset() const { return m_bForceInputCharset; }
- const QString& inputCharset() const { return m_inputCharset; }
+ const TQString& inputCharset() const { return m_inputCharset; }
void setForceInputCharset( bool b ) { m_bForceInputCharset = b; }
- void setInputCharset( const QString& cs ) { m_inputCharset = cs; }
+ void setInputCharset( const TQString& cs ) { m_inputCharset = cs; }
// -- mkisofs-options ----------------------------------------------------------------------
@@ -56,17 +56,17 @@ class LIBK3B_EXPORT K3bIsoOptions
bool preserveFilePermissions() const { return m_preserveFilePermissions; }
int ISOLevel() const { return m_isoLevel; }
- const QString& systemId() const { return m_systemId; }
- const QString& applicationID() const { return m_applicationID; }
- const QString& volumeID() const { return m_volumeID; }
- const QString& volumeSetId() const { return m_volumeSetId; }
+ const TQString& systemId() const { return m_systemId; }
+ const TQString& applicationID() const { return m_applicationID; }
+ const TQString& volumeID() const { return m_volumeID; }
+ const TQString& volumeSetId() const { return m_volumeSetId; }
int volumeSetSize() const { return m_volumeSetSize; }
int volumeSetNumber() const { return m_volumeSetNumber; }
- const QString& publisher() const { return m_publisher; }
- const QString& preparer() const { return m_preparer; }
- const QString& abstractFile() const { return m_abstractFile; }
- const QString& copyrightFile() const { return m_copyrightFile; }
- const QString& bibliographFile() const { return m_bibliographFile; }
+ const TQString& publisher() const { return m_publisher; }
+ const TQString& preparer() const { return m_preparer; }
+ const TQString& abstractFile() const { return m_abstractFile; }
+ const TQString& copyrightFile() const { return m_copyrightFile; }
+ const TQString& bibliographFile() const { return m_bibliographFile; }
void setCreateRockRidge( bool b ) { m_createRockRidge = b; }
void setCreateJoliet( bool b ) { m_createJoliet = b; }
@@ -87,33 +87,33 @@ class LIBK3B_EXPORT K3bIsoOptions
void setJolietLong( bool b ) { m_jolietLong = b; }
void setISOLevel( int i ) { m_isoLevel = i; }
- void setSystemId( const QString& s ) { m_systemId = s; }
- void setApplicationID( const QString& s ) { m_applicationID = s; }
+ void setSystemId( const TQString& s ) { m_systemId = s; }
+ void setApplicationID( const TQString& s ) { m_applicationID = s; }
/**
* Set the filesystems volume id.
*
* max length for this field is 32 chars.
*/
- void setVolumeID( const QString& s ) { m_volumeID = s; }
- void setVolumeSetId( const QString& s ) { m_volumeSetId = s; }
+ void setVolumeID( const TQString& s ) { m_volumeID = s; }
+ void setVolumeSetId( const TQString& s ) { m_volumeSetId = s; }
void setVolumeSetSize( int size ) { m_volumeSetSize = size; }
void setVolumeSetNumber( int n ) { m_volumeSetNumber = n; }
- void setPublisher( const QString& s ) { m_publisher = s; }
- void setPreparer( const QString& s ) { m_preparer = s; }
- void setAbstractFile( const QString& s ) { m_abstractFile = s; }
- void setCoprightFile( const QString& s ) { m_copyrightFile = s; }
- void setBibliographFile( const QString& s ) { m_bibliographFile = s; }
+ void setPublisher( const TQString& s ) { m_publisher = s; }
+ void setPreparer( const TQString& s ) { m_preparer = s; }
+ void setAbstractFile( const TQString& s ) { m_abstractFile = s; }
+ void setCoprightFile( const TQString& s ) { m_copyrightFile = s; }
+ void setBibliographFile( const TQString& s ) { m_bibliographFile = s; }
void setPreserveFilePermissions( bool b ) { m_preserveFilePermissions = b; }
// ----------------------------------------------------------------- mkisofs-options -----------
- enum whiteSpaceTreatments { noChange = 0, replace = 1, strip = 2, extended = 3 };
+ enum whiteSpaceTreatments { noChange = 0, tqreplace = 1, strip = 2, extended = 3 };
void setWhiteSpaceTreatment( int i ) { m_whiteSpaceTreatment = i; }
int whiteSpaceTreatment() const { return m_whiteSpaceTreatment; }
- const QString& whiteSpaceTreatmentReplaceString() const { return m_whiteSpaceTreatmentReplaceString; }
- void setWhiteSpaceTreatmentReplaceString( const QString& s ) { m_whiteSpaceTreatmentReplaceString = s; }
+ const TQString& whiteSpaceTreatmentReplaceString() const { return m_whiteSpaceTreatmentReplaceString; }
+ void setWhiteSpaceTreatmentReplaceString( const TQString& s ) { m_whiteSpaceTreatmentReplaceString = s; }
bool discardSymlinks() const { return m_discardSymlinks; }
void setDiscardSymlinks( bool b ) { m_discardSymlinks = b; }
@@ -131,21 +131,21 @@ class LIBK3B_EXPORT K3bIsoOptions
private:
// volume descriptor
- QString m_volumeID;
- QString m_applicationID;
- QString m_preparer;
- QString m_publisher;
- QString m_systemId;
- QString m_volumeSetId;
- QString m_abstractFile;
- QString m_copyrightFile;
- QString m_bibliographFile;
+ TQString m_volumeID;
+ TQString m_applicationID;
+ TQString m_preparer;
+ TQString m_publisher;
+ TQString m_systemId;
+ TQString m_volumeSetId;
+ TQString m_abstractFile;
+ TQString m_copyrightFile;
+ TQString m_bibliographFile;
int m_volumeSetSize;
int m_volumeSetNumber;
bool m_bForceInputCharset;
- QString m_inputCharset;
+ TQString m_inputCharset;
// mkisofs options -------------------------------------
bool m_createRockRidge; // -r or -R
@@ -174,7 +174,7 @@ class LIBK3B_EXPORT K3bIsoOptions
int m_whiteSpaceTreatment;
- QString m_whiteSpaceTreatmentReplaceString;
+ TQString m_whiteSpaceTreatmentReplaceString;
bool m_discardSymlinks;
bool m_discardBrokenSymlinks;
diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp
index a3579ec..5fdb526 100644
--- a/libk3b/projects/datacd/k3bmkisofshandler.cpp
+++ b/libk3b/projects/datacd/k3bmkisofshandler.cpp
@@ -61,7 +61,7 @@ const K3bExternalBin* K3bMkisofsHandler::initMkisofs()
if( d->mkisofsBin ) {
if( !d->mkisofsBin->copyright.isEmpty() )
handleMkisofsInfoMessage( i18n("Using %1 %2 - Copyright (C) %3")
- .arg("mkisofs").arg(d->mkisofsBin->version).arg(d->mkisofsBin->copyright),
+ .tqarg("mkisofs").tqarg(d->mkisofsBin->version).tqarg(d->mkisofsBin->copyright),
K3bJob::INFO );
d->firstProgressValue = -1;
@@ -76,14 +76,14 @@ const K3bExternalBin* K3bMkisofsHandler::initMkisofs()
}
-void K3bMkisofsHandler::parseMkisofsOutput( const QString& line )
+void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line )
{
if( !line.isEmpty() ) {
if( line.startsWith( d->mkisofsBin->path ) ) {
// error or warning
- QString errorLine = line.mid( d->mkisofsBin->path.length() + 2 );
+ TQString errorLine = line.mid( d->mkisofsBin->path.length() + 2 );
if( errorLine.startsWith( "Input/output error. Cannot read from" ) ) {
- handleMkisofsInfoMessage( i18n("Read error from file '%1'").arg( errorLine.mid( 38, errorLine.length()-40 ) ),
+ handleMkisofsInfoMessage( i18n("Read error from file '%1'").tqarg( errorLine.mid( 38, errorLine.length()-40 ) ),
K3bJob::ERROR );
d->readError = true;
}
@@ -93,17 +93,17 @@ void K3bMkisofsHandler::parseMkisofsOutput( const QString& line )
d->readError = true;
}
}
- else if( line.contains( "done, estimate" ) ) {
+ else if( line.tqcontains( "done, estimate" ) ) {
int p = parseMkisofsProgress( line );
if( p != -1 )
handleMkisofsProgress( p );
}
- else if( line.contains( "extents written" ) ) {
+ else if( line.tqcontains( "extents written" ) ) {
handleMkisofsProgress( 100 );
}
else if( line.startsWith( "Incorrectly encoded string" ) ) {
handleMkisofsInfoMessage( i18n("Encountered an incorrectly encoded filename '%1'")
- .arg(line.section( QRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR );
+ .tqarg(line.section( TQRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR );
handleMkisofsInfoMessage( i18n("This may be caused by a system update which changed the local character set."), K3bJob::ERROR );
handleMkisofsInfoMessage( i18n("You may use convmv (http://j3e.de/linux/convmv/) to fix the filename encoding."), K3bJob::ERROR );
d->readError = true;
@@ -124,7 +124,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const QString& line )
}
-int K3bMkisofsHandler::parseMkisofsProgress( const QString& line )
+int K3bMkisofsHandler::parseMkisofsProgress( const TQString& line )
{
//
// in multisession mode mkisofs' progress does not start at 0 but at (X+Y)/X
@@ -133,8 +133,8 @@ int K3bMkisofsHandler::parseMkisofsProgress( const QString& line )
// We just save the first emitted progress value and to some math ;)
//
- QString perStr = line;
- perStr.truncate( perStr.find('%') );
+ TQString perStr = line;
+ perStr.truncate( perStr.tqfind('%') );
bool ok;
double p = perStr.toDouble( &ok );
if( !ok ) {
diff --git a/libk3b/projects/datacd/k3bmkisofshandler.h b/libk3b/projects/datacd/k3bmkisofshandler.h
index 32576bc..0692b4e 100644
--- a/libk3b/projects/datacd/k3bmkisofshandler.h
+++ b/libk3b/projects/datacd/k3bmkisofshandler.h
@@ -16,7 +16,7 @@
#ifndef _K3B_MKISOfS_HANDLER_H_
#define _K3B_MKISOfS_HANDLER_H_
-#include <qstring.h>
+#include <tqstring.h>
class K3bExternalBin;
@@ -45,13 +45,13 @@ class K3bMkisofsHandler
*/
const K3bExternalBin* initMkisofs();
- void parseMkisofsOutput( const QString& line );
+ void parseMkisofsOutput( const TQString& line );
/**
* Used internally by handleMkisofsOutput.
* May be used in case handleMkisofsOutput is not sufficient.
*/
- int parseMkisofsProgress( const QString& line );
+ int parseMkisofsProgress( const TQString& line );
/**
* Called by handleMkisofsOutput
@@ -63,7 +63,7 @@ class K3bMkisofsHandler
*
* Uses K3bJob::MessageType
*/
- virtual void handleMkisofsInfoMessage( const QString&, int ) = 0;
+ virtual void handleMkisofsInfoMessage( const TQString&, int ) = 0;
private:
class Private;
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
index c30d0ff..14eca4f 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -27,11 +27,11 @@
#include <kprocess.h>
#include <kdebug.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
-K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bJob( jh, parent, name ),
+K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bJob( jh, tqparent, name ),
m_process(0),
m_device(0),
m_dvd(false)
@@ -53,7 +53,7 @@ void K3bMsInfoFetcher::start()
if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) {
kdDebug() << "(K3bMsInfoFetcher) could not find cdrecord executable" << endl;
- emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), K3bJob::ERROR );
jobFinished(false);
return;
}
@@ -70,9 +70,9 @@ void K3bMsInfoFetcher::start()
//
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_device ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) );
}
@@ -89,7 +89,7 @@ void K3bMsInfoFetcher::getMsInfo()
bin = k3bcore->externalBinManager()->binObject( "cdrecord" );
if( !bin ) {
- emit infoMessage( i18n("Could not find %1 executable.").arg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR );
jobFinished(false);
return;
}
@@ -97,38 +97,38 @@ void K3bMsInfoFetcher::getMsInfo()
*m_process << bin->path;
// add the device (e.g. /dev/sg1)
- *m_process << QString("dev=%1").arg( K3b::externalBinDeviceParameter(m_device, bin) );
+ *m_process << TQString("dev=%1").tqarg( K3b::externalBinDeviceParameter(m_device, bin) );
*m_process << "-msinfo";
// 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;
kdDebug() << "***** " << bin->name() << " parameters:\n";
- const QValueList<QCString>& args = m_process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = m_process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << flush << endl;
emit debuggingOutput( "msinfo command:", s );
- // connect( m_process, SIGNAL(receivedStderr(KProcess*, char*, int)),
- // this, SLOT(slotCollectOutput(KProcess*, char*, int)) );
- connect( m_process, SIGNAL(receivedStdout(KProcess*, char*, int)),
- this, SLOT(slotCollectOutput(KProcess*, char*, int)) );
- connect( m_process, SIGNAL(processExited(KProcess*)),
- this, SLOT(slotProcessExited()) );
+ // connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
+ // this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) );
+ connect( m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
+ this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) );
+ connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
+ this, TQT_SLOT(slotProcessExited()) );
- m_msInfo = QString::null;
- m_collectedOutput = QString::null;
+ m_msInfo = TQString();
+ m_collectedOutput = TQString();
m_canceled = false;
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
- emit infoMessage( i18n("Could not start %1.").arg(bin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(bin->name()), K3bJob::ERROR );
jobFinished(false);
}
}
@@ -161,7 +161,7 @@ void K3bMsInfoFetcher::slotMediaDetectionFinished( K3bDevice::DeviceHandler* h )
}
else {
emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.")
- .arg( m_device->vendor() + " " + m_device->description() ), ERROR );
+ .tqarg( m_device->vendor() + " " + m_device->description() ), ERROR );
jobFinished( false );
}
}
@@ -190,8 +190,8 @@ void K3bMsInfoFetcher::slotProcessExited()
kdDebug() << "(K3bMsInfoFetcher) msinfo fetched" << endl;
// now parse the output
- QString firstLine = m_collectedOutput.left( m_collectedOutput.find("\n") );
- QStringList list = QStringList::split( ",", firstLine );
+ TQString firstLine = m_collectedOutput.left( m_collectedOutput.tqfind("\n") );
+ TQStringList list = TQStringList::split( ",", firstLine );
if( list.count() == 2 ) {
bool ok1, ok2;
m_lastSessionStart = list.first().toInt( &ok1 );
@@ -199,10 +199,10 @@ void K3bMsInfoFetcher::slotProcessExited()
if( ok1 && ok2 )
m_msInfo = firstLine.stripWhiteSpace();
else
- m_msInfo = QString::null;
+ m_msInfo = TQString();
}
else {
- m_msInfo = QString::null;
+ m_msInfo = TQString();
}
kdDebug() << "(K3bMsInfoFetcher) msinfo parsed: " << m_msInfo << endl;
@@ -220,9 +220,9 @@ void K3bMsInfoFetcher::slotProcessExited()
void K3bMsInfoFetcher::slotCollectOutput( KProcess*, char* output, int len )
{
- emit debuggingOutput( "msinfo", QString::fromLocal8Bit( output, len ) );
+ emit debuggingOutput( "msinfo", TQString::fromLocal8Bit( output, len ) );
- m_collectedOutput += QString::fromLocal8Bit( output, len );
+ m_collectedOutput += TQString::fromLocal8Bit( output, len );
}
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h
index 593664f..da609cb 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.h
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.h
@@ -27,12 +27,13 @@ class KProcess;
class K3bMsInfoFetcher : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMsInfoFetcher( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bMsInfoFetcher( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bMsInfoFetcher();
- const QString& msInfo() const { return m_msInfo; }
+ const TQString& msInfo() const { return m_msInfo; }
int lastSessionStart() const { return m_lastSessionStart; }
int nextSessionStart() const { return m_nextSessionStart; }
@@ -49,10 +50,10 @@ class K3bMsInfoFetcher : public K3bJob
void getMsInfo();
private:
- QString m_msInfo;
+ TQString m_msInfo;
int m_lastSessionStart;
int m_nextSessionStart;
- QString m_collectedOutput;
+ TQString m_collectedOutput;
KProcess* m_process;
K3bDevice::Device* m_device;
diff --git a/libk3b/projects/datacd/k3bsessionimportitem.cpp b/libk3b/projects/datacd/k3bsessionimportitem.cpp
index 35f7936..9173d5e 100644
--- a/libk3b/projects/datacd/k3bsessionimportitem.cpp
+++ b/libk3b/projects/datacd/k3bsessionimportitem.cpp
@@ -29,8 +29,8 @@ K3bSessionImportItem::K3bSessionImportItem( const K3bIso9660File* isoF, K3bDataD
setK3bName( isoF->name() );
// add automagically like a qlistviewitem
- if( parent() )
- parent()->addDataItem( this );
+ if( tqparent() )
+ tqparent()->addDataItem( this );
}
@@ -47,9 +47,9 @@ K3bSessionImportItem::~K3bSessionImportItem()
if( m_replaceItem )
m_replaceItem->setReplacedItemFromOldSession(0);
- // remove this from parentdir
- if( parent() )
- parent()->takeDataItem( this );
+ // remove this from tqparentdir
+ if( tqparent() )
+ tqparent()->takeDataItem( this );
}
diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h
index 05005ed..e2efa6c 100644
--- a/libk3b/projects/datacd/k3bspecialdataitem.h
+++ b/libk3b/projects/datacd/k3bspecialdataitem.h
@@ -29,15 +29,15 @@
class K3bSpecialDataItem : public K3bDataItem
{
public:
- K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* parent = 0, const QString& k3bName = QString::null )
- : K3bDataItem( doc, parent ),
+ K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* tqparent = 0, const TQString& k3bName = TQString() )
+ : K3bDataItem( doc, tqparent ),
m_size( size )
{
setK3bName( k3bName );
// add automagically like a qlistviewitem
- if( parent )
- parent->addDataItem( this );
+ if( tqparent )
+ tqparent->addDataItem( this );
}
K3bSpecialDataItem( const K3bSpecialDataItem& item )
@@ -47,17 +47,17 @@ class K3bSpecialDataItem : public K3bDataItem
}
~K3bSpecialDataItem() {
- // remove this from parentdir
- if( parent() )
- parent()->takeDataItem( this );
+ // remove this from tqparentdir
+ if( tqparent() )
+ tqparent()->takeDataItem( this );
}
K3bDataItem* copy() const {
return new K3bSpecialDataItem( *this );
}
- void setMimeType( const QString& s ) { m_mimeType = s; }
- const QString& mimeType() const { return m_mimeType; }
+ void setMimeType( const TQString& s ) { m_mimeType = s; }
+ const TQString& mimeType() const { return m_mimeType; }
bool isSpecialFile() const { return true; }
@@ -68,7 +68,7 @@ class K3bSpecialDataItem : public K3bDataItem
KIO::filesize_t itemSize( bool ) const { return m_size; }
private:
- QString m_mimeType;
+ TQString m_mimeType;
KIO::filesize_t m_size;
};
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
index f703452..f5dea6b 100644
--- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.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>
@@ -61,8 +61,8 @@ public:
};
-K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bJob( jh, parent, name ),
+K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bJob( jh, tqparent, name ),
m_action(0)
{
d = new Private;
@@ -82,15 +82,15 @@ void K3bDvdBooktypeJob::setForceNoEject( bool b )
}
-QString K3bDvdBooktypeJob::jobDescription() const
+TQString K3bDvdBooktypeJob::jobDescription() const
{
return i18n("Changing DVD Booktype"); // Changing DVD±R(W) Booktype
}
-QString K3bDvdBooktypeJob::jobDetails() const
+TQString K3bDvdBooktypeJob::jobDetails() const
{
- return QString::null;
+ return TQString();
}
@@ -118,7 +118,7 @@ void K3bDvdBooktypeJob::start()
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY,
K3bDevice::MEDIA_DVD_PLUS_RW|K3bDevice::MEDIA_DVD_PLUS_R,
i18n("Please insert an empty DVD+R or a DVD+RW 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();
jobFinished(false);
d->running = false;
@@ -129,9 +129,9 @@ void K3bDvdBooktypeJob::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*)) );
}
else {
// change writer defaults
@@ -170,7 +170,7 @@ void K3bDvdBooktypeJob::setDevice( K3bDevice::Device* dev )
}
-void K3bDvdBooktypeJob::slotStderrLine( const QString& line )
+void K3bDvdBooktypeJob::slotStderrLine( const TQString& line )
{
emit debuggingOutput( "dvd+rw-booktype", line );
// FIXME
@@ -189,7 +189,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p )
d->success = true;
}
else {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdBooktypeBin->name()).arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdBooktypeBin->name()).tqarg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
@@ -197,7 +197,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p )
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdBooktypeBin->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdBooktypeBin->name()),
ERROR );
d->success = false;
}
@@ -216,9 +216,9 @@ void K3bDvdBooktypeJob::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*)) );
}
}
else {
@@ -280,12 +280,12 @@ void K3bDvdBooktypeJob::startBooktypeChange()
d->process = new K3bProcess();
d->process->setRunPrivileged(true);
d->process->setSuppressEmptyLines(true);
- 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->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" );
if( !d->dvdBooktypeBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-booktype"), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("dvd+rw-booktype"), ERROR );
d->running = false;
jobFinished(false);
return;
@@ -326,9 +326,9 @@ void K3bDvdBooktypeJob::startBooktypeChange()
*d->process << d->device->blockDeviceName();
kdDebug() << "***** dvd+rw-booktype 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;
@@ -338,7 +338,7 @@ void K3bDvdBooktypeJob::startBooktypeChange()
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->dvdBooktypeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdBooktypeBin->name()), K3bJob::ERROR );
d->running = false;
jobFinished(false);
}
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h
index b9e7e4b..6605007 100644
--- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h
+++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h
@@ -34,13 +34,14 @@ namespace K3bDevice {
class K3bDvdBooktypeJob : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDvdBooktypeJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bDvdBooktypeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bDvdBooktypeJob();
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
/**
* @list SET_MEDIA_DVD_ROM Change media identification on current media to DVD-ROM.
@@ -81,7 +82,7 @@ class K3bDvdBooktypeJob : public K3bJob
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/projects/datadvd/k3bdvddoc.cpp b/libk3b/projects/datadvd/k3bdvddoc.cpp
index 4ab8b9f..2d6ae46 100644
--- a/libk3b/projects/datadvd/k3bdvddoc.cpp
+++ b/libk3b/projects/datadvd/k3bdvddoc.cpp
@@ -22,8 +22,8 @@
#include <kconfig.h>
-K3bDvdDoc::K3bDvdDoc( QObject* parent )
- : K3bDataDoc( parent )
+K3bDvdDoc::K3bDvdDoc( TQObject* tqparent )
+ : K3bDataDoc( tqparent )
{
}
@@ -31,9 +31,9 @@ K3bDvdDoc::~K3bDvdDoc()
{
}
-K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent )
+K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
{
- return new K3bDvdJob( this, hdl, parent );
+ return new K3bDvdJob( this, hdl, tqparent );
}
//#include "k3bdvddoc.moc"
diff --git a/libk3b/projects/datadvd/k3bdvddoc.h b/libk3b/projects/datadvd/k3bdvddoc.h
index 03b5c3d..20b039e 100644
--- a/libk3b/projects/datadvd/k3bdvddoc.h
+++ b/libk3b/projects/datadvd/k3bdvddoc.h
@@ -23,15 +23,15 @@ class KConfig;
class LIBK3B_EXPORT K3bDvdDoc : public K3bDataDoc
{
public:
- K3bDvdDoc( QObject* parent = 0 );
+ K3bDvdDoc( TQObject* tqparent = 0 );
virtual ~K3bDvdDoc();
virtual int type() const { return DVD; }
- virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent = 0 );
+ virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 );
protected:
- virtual QString typeString() const { return "dvd"; }
+ virtual TQString typeString() const { return "dvd"; }
};
#endif
diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp
index 3cd1521..d8bb75c 100644
--- a/libk3b/projects/datadvd/k3bdvdjob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdjob.cpp
@@ -39,8 +39,8 @@ public:
};
-K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent )
- : K3bDataJob( doc, hdl, parent ),
+K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bDataJob( doc, hdl, tqparent ),
m_doc( doc )
{
d = new Private();
@@ -79,7 +79,7 @@ bool K3bDvdJob::prepareWriterJob()
writer->setCloseDvd( usedMultiSessionMode() == K3bDataDoc::NONE ||
usedMultiSessionMode() == K3bDataDoc::FINISH );
- writer->setImageToWrite( QString::null ); // read from stdin
+ writer->setImageToWrite( TQString() ); // read from stdin
writer->setTrackSize( m_isoImager->size() );
if( usedMultiSessionMode() != K3bDataDoc::NONE ) {
@@ -105,9 +105,9 @@ void K3bDvdJob::determineMultiSessionMode()
}
else {
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_doc->burner() ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) );
}
}
@@ -243,8 +243,8 @@ bool K3bDvdJob::waitForMedium()
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_doc->burner()->vendor())
- .arg(m_doc->burner()->description()),
+ .tqarg(m_doc->burner()->vendor())
+ .tqarg(m_doc->burner()->description()),
i18n("No Simulation with DVD-R(W)") ) ) {
return false;
}
@@ -271,7 +271,7 @@ bool K3bDvdJob::waitForMedium()
if( m_doc->writingMode() == K3b::DAO )
// || ( m_doc->writingMode() == K3b::WRITING_MODE_AUTO &&
// usedMultiSessionMode() == K3bDataDoc::NONE ) )
- emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
else {
// check if the writer supports writing sequential and thus multisession (on -1 the burner cannot handle
@@ -279,14 +279,14 @@ bool K3bDvdJob::waitForMedium()
if( m_doc->burner()->featureCurrent( K3bDevice::FEATURE_INCREMENTAL_STREAMING_WRITABLE ) == 0 ) {
if( !questionYesNo( i18n("Your writer (%1 %2) does not support Incremental Streaming with %3 "
"media. Multisession will not be possible. Continue anyway?")
- .arg(m_doc->burner()->vendor())
- .arg(m_doc->burner()->description())
- .arg( K3bDevice::mediaTypeString(foundMedium, true) ),
+ .tqarg(m_doc->burner()->vendor())
+ .tqarg(m_doc->burner()->description())
+ .tqarg( K3bDevice::mediaTypeString(foundMedium, true) ),
i18n("No Incremental Streaming") ) ) {
return false;
}
else {
- emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
}
}
else {
@@ -294,7 +294,7 @@ bool K3bDvdJob::waitForMedium()
m_doc->writingMode() == K3b::WRITING_MODE_RES_OVWR )
emit infoMessage( i18n("Restricted Overwrite is not possible with DVD-R media."), INFO );
- emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
}
}
}
@@ -305,7 +305,7 @@ bool K3bDvdJob::waitForMedium()
}
-QString K3bDvdJob::jobDescription() const
+TQString K3bDvdJob::jobDescription() const
{
if( m_doc->onlyCreateImages() ) {
return i18n("Creating Data Image File");
@@ -314,19 +314,19 @@ QString K3bDvdJob::jobDescription() const
m_doc->multiSessionMode() == K3bDataDoc::AUTO ) {
return i18n("Writing Data DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty()
- ? QString::null
- : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
+ ? TQString()
+ : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) );
}
else {
return i18n("Writing Multisession DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty()
- ? QString::null
- : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
+ ? TQString()
+ : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) );
}
}
-QString K3bDvdJob::jobDetails() const
+TQString K3bDvdJob::jobDetails() const
{
if( m_doc->copies() > 1 &&
!m_doc->dummy() &&
@@ -335,10 +335,10 @@ QString K3bDvdJob::jobDetails() const
return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
"ISO9660 Filesystem (Size: %1) - %n copies",
m_doc->copies())
- .arg(KIO::convertSize( m_doc->size() ));
+ .tqarg(KIO::convertSize( m_doc->size() ));
else
return i18n("ISO9660 Filesystem (Size: %1)")
- .arg(KIO::convertSize( m_doc->size() ));
+ .tqarg(KIO::convertSize( m_doc->size() ));
}
#include "k3bdvdjob.moc"
diff --git a/libk3b/projects/datadvd/k3bdvdjob.h b/libk3b/projects/datadvd/k3bdvdjob.h
index 381bc1d..3bdf7b6 100644
--- a/libk3b/projects/datadvd/k3bdvdjob.h
+++ b/libk3b/projects/datadvd/k3bdvdjob.h
@@ -19,7 +19,7 @@
#include <k3bdatajob.h>
-#include <qfile.h>
+#include <tqfile.h>
class K3bDataDoc;
class K3bGrowisofsWriter;
@@ -28,16 +28,17 @@ class K3bGrowisofsWriter;
class K3bDvdJob : public K3bDataJob
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* To be more flexible we allow writing of any data doc
*/
- K3bDvdJob( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0 );
+ K3bDvdJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 );
virtual ~K3bDvdJob();
- virtual QString jobDescription() const;
- virtual QString jobDetails() const;
+ virtual TQString jobDescription() const;
+ virtual TQString jobDetails() const;
protected:
void prepareData();
diff --git a/libk3b/projects/datadvd/k3bdvdview.cpp b/libk3b/projects/datadvd/k3bdvdview.cpp
index 512ec4b..dc5f67a 100644
--- a/libk3b/projects/datadvd/k3bdvdview.cpp
+++ b/libk3b/projects/datadvd/k3bdvdview.cpp
@@ -22,8 +22,8 @@
#include <klocale.h>
-K3bDvdView::K3bDvdView( K3bDvdDoc* doc, QWidget *parent, const char *name )
- : K3bDataView( doc, parent, name )
+K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name )
+ : K3bDataView( doc, tqparent, name )
{
m_doc = doc;
@@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView()
}
-K3bProjectBurnDialog* K3bDvdView::newBurnDialog( QWidget* parent, const char* name )
+K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name )
{
- return new K3bDvdBurnDialog( m_doc, parent, name, true );
+ return new K3bDvdBurnDialog( m_doc, tqparent, name, true );
}
#include "k3bdvdview.moc"
diff --git a/libk3b/projects/datadvd/k3bdvdview.h b/libk3b/projects/datadvd/k3bdvdview.h
index d9f30f3..1072cc2 100644
--- a/libk3b/projects/datadvd/k3bdvdview.h
+++ b/libk3b/projects/datadvd/k3bdvdview.h
@@ -25,13 +25,14 @@ class K3bDvdDoc;
class K3bDvdView : public K3bDataView
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDvdView( K3bDvdDoc* doc, QWidget *parent = 0, const char *name = 0 );
+ K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 );
~K3bDvdView();
protected:
- virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 );
+ virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 );
private:
K3bDvdDoc* m_doc;
diff --git a/libk3b/projects/k3babstractwriter.cpp b/libk3b/projects/k3babstractwriter.cpp
index df22bc3..61d2ac6 100644
--- a/libk3b/projects/k3babstractwriter.cpp
+++ b/libk3b/projects/k3babstractwriter.cpp
@@ -26,8 +26,8 @@
-K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bJob( jh, parent, name ),
+K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bJob( jh, tqparent, name ),
m_burnDevice(dev),
m_burnSpeed(1),
m_simulate(false),
@@ -55,8 +55,8 @@ void K3bAbstractWriter::cancel()
if( burnDevice() ) {
// we need to unlock the writer because cdrecord locked it while writing
emit infoMessage( i18n("Unlocking drive..."), INFO );
- connect( K3bDevice::unblock( burnDevice() ), SIGNAL(finished(bool)),
- this, SLOT(slotUnblockWhileCancellationFinished(bool)) );
+ connect( K3bDevice::unblock( burnDevice() ), TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(slotUnblockWhileCancellationFinished(bool)) );
}
else {
emit canceled();
@@ -72,8 +72,8 @@ void K3bAbstractWriter::slotUnblockWhileCancellationFinished( bool success )
if( k3bcore->globalSettings()->ejectMedia() ) {
emit newSubTask( i18n("Ejecting CD") ); // FIXME: "media" instead of "CD"
- connect( K3bDevice::eject( burnDevice() ), SIGNAL(finished(bool)),
- this, SLOT(slotEjectWhileCancellationFinished(bool)) );
+ connect( K3bDevice::eject( burnDevice() ), TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(slotEjectWhileCancellationFinished(bool)) );
}
else {
emit canceled();
diff --git a/libk3b/projects/k3babstractwriter.h b/libk3b/projects/k3babstractwriter.h
index 3f91ee3..b6f4e1d 100644
--- a/libk3b/projects/k3babstractwriter.h
+++ b/libk3b/projects/k3babstractwriter.h
@@ -20,7 +20,7 @@
#include "k3bjob.h"
-#include <qdatetime.h>
+#include <tqdatetime.h>
class K3bDevice::Device;
class K3bJobHandler;
@@ -29,6 +29,7 @@ class K3bJobHandler;
class K3bAbstractWriter : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual ~K3bAbstractWriter();
@@ -73,7 +74,7 @@ class K3bAbstractWriter : public K3bJob
protected:
K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* hdl,
- QObject* parent = 0, const char* name = 0 );
+ TQObject* tqparent = 0, const char* name = 0 );
bool wasSourceUnreadable() const { return m_sourceUnreadable; }
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index c49cb4b..3339581 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -27,16 +27,16 @@
#include <k3bglobals.h>
#include <k3bglobalsettings.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qregexp.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qurl.h>
-#include <qsocket.h>
-#include <qsocketdevice.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqregexp.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
+#include <tqurl.h>
+#include <tqsocket.h>
+#include <tqsocketdevice.h>
#include <klocale.h>
#include <kdebug.h>
@@ -124,8 +124,8 @@ public:
K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl,
- QObject* parent, const char* name )
- : K3bAbstractWriter( dev, hdl, parent, name ),
+ TQObject* tqparent, const char* name )
+ : K3bAbstractWriter( dev, hdl, tqparent, name ),
m_command(WRITE),
m_blankMode(MINIMAL),
m_sourceDevice(0),
@@ -146,8 +146,8 @@ K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl,
{
d = new Private();
d->speedEst = new K3bThroughputEstimator( this );
- connect( d->speedEst, SIGNAL(throughput(int)),
- this, SLOT(slotThroughput(int)) );
+ connect( d->speedEst, TQT_SIGNAL(throughput(int)),
+ this, TQT_SLOT(slotThroughput(int)) );
m_eject = k3bcore->globalSettings()->ejectMedia();
@@ -161,13 +161,13 @@ K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl,
else
{
delete m_comSock;
- m_comSock = new QSocket();
+ m_comSock = new TQSocket();
m_comSock->setSocket(m_cdrdaoComm[1]);
m_comSock->socketDevice()->setReceiveBufferSize(49152);
- // magic number from Qt documentation
+ // magic number from TQt documentation
m_comSock->socketDevice()->setBlocking(false);
- connect( m_comSock, SIGNAL(readyRead()),
- this, SLOT(parseCdrdaoMessage()));
+ connect( m_comSock, TQT_SIGNAL(readyRead()),
+ this, TQT_SLOT(parseCdrdaoMessage()));
}
}
@@ -253,7 +253,7 @@ void K3bCdrdaoWriter::setWriteArguments()
{
*m_process << "--driver";
if( burnDevice()->cdTextCapable() == 1 )
- *m_process << QString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() );
+ *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() );
else
*m_process << burnDevice()->cdrdaoDriver();
}
@@ -264,7 +264,7 @@ void K3bCdrdaoWriter::setWriteArguments()
// burn speed
if( d->usedSpeed != 0 )
- *m_process << "--speed" << QString("%1").arg(d->usedSpeed);
+ *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed);
//simulate
if( simulate() )
@@ -283,7 +283,7 @@ void K3bCdrdaoWriter::setWriteArguments()
if( m_cdrdaoBinObject->hasFeature( "disable-burnproof" ) )
*m_process << "--buffer-under-run-protection" << "0";
else
- emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").arg(m_cdrdaoBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").tqarg(m_cdrdaoBinObject->version), WARNING );
}
if( k3bcore->globalSettings()->force() ) {
@@ -298,7 +298,7 @@ void K3bCdrdaoWriter::setWriteArguments()
// one buffer in cdrdao holds 1 second of audio data = 75 frames = 75 * 2352 bytes
//
int bufSizeInMb = k3bcore->globalSettings()->bufferSize();
- *m_process << "--buffers" << QString::number( bufSizeInMb*1024*1024/(75*2352) );
+ *m_process << "--buffers" << TQString::number( bufSizeInMb*1024*1024/(75*2352) );
}
bool overburn =
@@ -307,7 +307,7 @@ void K3bCdrdaoWriter::setWriteArguments()
if( m_cdrdaoBinObject->hasFeature("overburn") )
*m_process << "--overburn";
else
- emit infoMessage( i18n("Cdrdao %1 does not support overburning.").arg(m_cdrdaoBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrdao %1 does not support overburning.").tqarg(m_cdrdaoBinObject->version), WARNING );
}
}
@@ -342,17 +342,17 @@ void K3bCdrdaoWriter::setReadArguments()
// TAO Source Adjust
if ( m_taoSourceAdjust != -1 )
*m_process << "--tao-source-adjust"
- << QString("%1").arg(m_taoSourceAdjust);
+ << TQString("%1").tqarg(m_taoSourceAdjust);
// paranoia Mode
if ( m_paranoiaMode != -1 )
*m_process << "--paranoia-mode"
- << QString("%1").arg(m_paranoiaMode);
+ << TQString("%1").tqarg(m_paranoiaMode);
// session
if ( m_session != -1 )
*m_process << "--session"
- << QString("%1").arg(m_session);
+ << TQString("%1").tqarg(m_session);
// fast TOC
if ( m_fastToc )
@@ -386,7 +386,7 @@ void K3bCdrdaoWriter::setBlankArguments()
{
*m_process << "--driver";
if( burnDevice()->cdTextCapable() == 1 )
- *m_process << QString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() );
+ *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() );
else
*m_process << burnDevice()->cdrdaoDriver();
}
@@ -397,7 +397,7 @@ void K3bCdrdaoWriter::setBlankArguments()
// burn speed
if( d->usedSpeed != 0 )
- *m_process << "--speed" << QString("%1").arg(d->usedSpeed);
+ *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed);
// blank-mode
*m_process << "--blank-mode";
@@ -416,8 +416,8 @@ void K3bCdrdaoWriter::setCommonArguments()
{
// additional user parameters from config
- const QStringList& params = m_cdrdaoBinObject->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = m_cdrdaoBinObject->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*m_process << *it;
@@ -432,7 +432,7 @@ void K3bCdrdaoWriter::setCommonArguments()
*m_process << "--eject";
// remote
- *m_process << "--remote" << QString("%1").arg(m_cdrdaoComm[0]);
+ *m_process << "--remote" << TQString("%1").tqarg(m_cdrdaoComm[0]);
// data File
if ( ! m_dataFile.isEmpty() )
@@ -446,7 +446,7 @@ void K3bCdrdaoWriter::setCommonArguments()
*m_process << m_tocFile;
}
-K3bCdrdaoWriter* K3bCdrdaoWriter::addArgument( const QString& arg )
+K3bCdrdaoWriter* K3bCdrdaoWriter::addArgument( const TQString& arg )
{
*m_process << arg;
return this;
@@ -464,10 +464,10 @@ void K3bCdrdaoWriter::start()
m_process->setRunPrivileged(true);
m_process->setSplitStdout(false);
m_process->setRawStdin(true);
- 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*)) );
m_canceled = false;
m_knownError = false;
@@ -475,7 +475,7 @@ void K3bCdrdaoWriter::start()
m_cdrdaoBinObject = k3bcore->externalBinManager()->binObject("cdrdao");
if( !m_cdrdaoBinObject ) {
- emit infoMessage( i18n("Could not find %1 executable.").arg("cdrdao"), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrdao"), ERROR );
jobFinished(false);
return;
}
@@ -483,7 +483,7 @@ void K3bCdrdaoWriter::start()
emit debuggingOutput( "Used versions", "cdrdao: " + m_cdrdaoBinObject->version );
if( !m_cdrdaoBinObject->copyright.isEmpty() )
- emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(m_cdrdaoBinObject->name()).arg(m_cdrdaoBinObject->version).arg(m_cdrdaoBinObject->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(m_cdrdaoBinObject->name()).tqarg(m_cdrdaoBinObject->version).tqarg(m_cdrdaoBinObject->copyright), INFO );
// the message size changed in cdrdao 1.1.8)
@@ -516,7 +516,7 @@ void K3bCdrdaoWriter::start()
m_backupTocFile = m_tocFile + ".k3bbak";
// workaround, cdrdao deletes the tocfile when --remote parameter is set
- if ( !KIO::NetAccess::copy(KURL(m_tocFile),KURL(m_backupTocFile), (QWidget*) 0) )
+ if ( !KIO::NetAccess::copy(KURL(m_tocFile),KURL(m_backupTocFile), (TQWidget*) 0) )
{
kdDebug() << "(K3bCdrdaoWriter) could not backup " << m_tocFile << " to " << m_backupTocFile << endl;
emit infoMessage( i18n("Could not backup tocfile."), ERROR );
@@ -532,12 +532,12 @@ void K3bCdrdaoWriter::start()
}
prepareArgumentList();
// set working dir to dir part of toc file (to allow rel names in toc-file)
- m_process->setWorkingDirectory(QUrl(m_tocFile).dirPath());
+ m_process->setWorkingDirectory(TQUrl(m_tocFile).dirPath());
kdDebug() << "***** cdrdao parameters:\n";
- const QValueList<QCString>& args = m_process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it )
+ const TQValueList<TQCString>& args = m_process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it )
{
s += *it + " ";
}
@@ -582,7 +582,7 @@ void K3bCdrdaoWriter::start()
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bCdrdaoWriter) could not start cdrdao" << endl;
- emit infoMessage( i18n("Could not start %1.").arg("cdrdao"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg("cdrdao"), K3bJob::ERROR );
jobFinished(false);
}
else
@@ -592,13 +592,13 @@ void K3bCdrdaoWriter::start()
case WRITE:
if( simulate() )
{
- emit infoMessage(i18n("Starting DAO simulation at %1x speed...").arg(d->usedSpeed),
+ emit infoMessage(i18n("Starting DAO simulation at %1x speed...").tqarg(d->usedSpeed),
K3bJob::INFO );
emit newTask( i18n("Simulating") );
}
else
{
- emit infoMessage( i18n("Starting DAO writing at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage( i18n("Starting DAO writing at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Writing") );
}
break;
@@ -609,12 +609,12 @@ void K3bCdrdaoWriter::start()
case COPY:
if( simulate() )
{
- emit infoMessage(i18n("Starting simulation copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage(i18n("Starting simulation copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Simulating") );
}
else
{
- emit infoMessage( i18n("Starting copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage( i18n("Starting copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Copying") );
}
break;
@@ -658,41 +658,41 @@ bool K3bCdrdaoWriter::cueSheet()
// TODO: do this in the K3bCueFileParser
if ( m_tocFile.lower().endsWith( ".cue" ) ) {
- QFile f( m_tocFile );
+ TQFile f( m_tocFile );
if ( f.open( IO_ReadOnly ) ) {
- QTextStream ts( &f );
+ TQTextStream ts( &f );
if ( !ts.eof() ) {
- QString line = ts.readLine();
+ TQString line = ts.readLine();
f.close();
- int pos = line.find( "FILE \"" );
+ int pos = line.tqfind( "FILE \"" );
if( pos < 0 )
return false;
pos += 6;
- int endPos = line.find( "\" BINARY", pos+1 );
+ int endPos = line.tqfind( "\" BINARY", pos+1 );
if( endPos < 0 )
return false;
line = line.mid( pos, endPos-pos );
- QFileInfo fi( QFileInfo( m_tocFile ).dirPath() + "/" + QFileInfo( line ).fileName() );
- QString binpath = fi.filePath();
- kdDebug() << QString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").arg( line ) << endl;
- kdDebug() << QString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").arg( binpath ) << endl;
+ TQFileInfo fi( TQFileInfo( m_tocFile ).dirPath() + "/" + TQFileInfo( line ).fileName() );
+ TQString binpath = fi.filePath();
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").tqarg( line ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").tqarg( binpath ) << endl;
if ( !fi.exists() )
return false;
KTempFile tempF;
- QString tempFile = tempF.name();
+ TQString tempFile = tempF.name();
tempF.unlink();
- if ( symlink(QFile::encodeName( binpath ), QFile::encodeName( tempFile + ".bin") ) == -1 )
+ if ( symlink(TQFile::encodeName( binpath ), TQFile::encodeName( tempFile + ".bin") ) == -1 )
return false;
- if ( symlink(QFile::encodeName( m_tocFile ), QFile::encodeName( tempFile + ".cue") ) == -1 )
+ if ( symlink(TQFile::encodeName( m_tocFile ), TQFile::encodeName( tempFile + ".cue") ) == -1 )
return false;
- kdDebug() << QString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").arg( tempFile ) << endl;
- kdDebug() << QString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").arg( tempFile ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").tqarg( tempFile ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").tqarg( tempFile ) << endl;
m_binFileLnk = tempFile + ".bin";
m_cueFileLnk = tempFile + ".cue";
return true;
@@ -703,7 +703,7 @@ bool K3bCdrdaoWriter::cueSheet()
return false;
}
-void K3bCdrdaoWriter::slotStdLine( const QString& line )
+void K3bCdrdaoWriter::slotStdLine( const TQString& line )
{
parseCdrdaoLine(line);
}
@@ -722,20 +722,20 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
case WRITE:
case COPY:
if ( !m_binFileLnk.isEmpty() ) {
- KIO::NetAccess::del(KURL::fromPathOrURL(m_cueFileLnk), (QWidget*) 0);
- KIO::NetAccess::del(KURL::fromPathOrURL(m_binFileLnk), (QWidget*) 0);
+ KIO::NetAccess::del(KURL::fromPathOrURL(m_cueFileLnk), (TQWidget*) 0);
+ KIO::NetAccess::del(KURL::fromPathOrURL(m_binFileLnk), (TQWidget*) 0);
}
- else if( (!QFile::exists( m_tocFile ) || K3b::filesize( KURL::fromPathOrURL(m_tocFile) ) == 0 ) && !m_onTheFly )
+ else if( (!TQFile::exists( m_tocFile ) || K3b::filesize( KURL::fromPathOrURL(m_tocFile) ) == 0 ) && !m_onTheFly )
{
// cdrdao removed the tocfile :(
// we need to recover it
- if ( !KIO::NetAccess::copy(KURL::fromPathOrURL(m_backupTocFile), KURL::fromPathOrURL(m_tocFile), (QWidget*) 0) )
+ if ( !KIO::NetAccess::copy(KURL::fromPathOrURL(m_backupTocFile), KURL::fromPathOrURL(m_tocFile), (TQWidget*) 0) )
{
kdDebug() << "(K3bCdrdaoWriter) restoring tocfile " << m_tocFile << " failed." << endl;
emit infoMessage( i18n("Due to a bug in cdrdao the toc/cue file %1 has been deleted. "
- "K3b was unable to restore it from the backup %2.").arg(m_tocFile).arg(m_backupTocFile), ERROR );
+ "K3b was unable to restore it from the backup %2.").tqarg(m_tocFile).tqarg(m_backupTocFile), ERROR );
}
- else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (QWidget*) 0) )
+ else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (TQWidget*) 0) )
{
kdDebug() << "(K3bCdrdaoWriter) delete tocfile backkup " << m_backupTocFile << " failed." << endl;
}
@@ -775,7 +775,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
if( m_command == WRITE || m_command == COPY ) {
int s = d->speedEst->average();
- emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
+ emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
}
jobFinished( true );
@@ -783,7 +783,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
default:
if( !m_knownError && !wasSourceUnreadable() ) {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(m_cdrdaoBinObject->name()).arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(m_cdrdaoBinObject->name()).tqarg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please include the debugging output in your problem report."), K3bJob::ERROR );
}
@@ -794,24 +794,24 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
}
else
{
- emit infoMessage( i18n("%1 did not exit cleanly.").arg("cdrdao"), K3bJob::ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("cdrdao"), K3bJob::ERROR );
jobFinished( false );
}
}
-void K3bCdrdaoWriter::unknownCdrdaoLine( const QString& line )
+void K3bCdrdaoWriter::unknownCdrdaoLine( const TQString& line )
{
- if( line.contains( "at speed" ) )
+ if( line.tqcontains( "at speed" ) )
{
// parse the speed and inform the user if cdrdao switched it down
- int pos = line.find( "at speed" );
- int po2 = line.find( QRegExp("\\D"), pos + 9 );
+ int pos = line.tqfind( "at speed" );
+ int po2 = line.tqfind( TQRegExp("\\D"), pos + 9 );
int speed = line.mid( pos+9, po2-pos-9 ).toInt();
if( speed < d->usedSpeed )
{
- emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING );
- emit infoMessage( i18n("Switching down burn speed to %1x").arg(speed), K3bJob::WARNING );
+ emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING );
+ emit infoMessage( i18n("Switching down burn speed to %1x").tqarg(speed), K3bJob::WARNING );
}
}
}
@@ -825,7 +825,7 @@ void K3bCdrdaoWriter::reinitParser()
m_currentTrack=0;
}
-void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str )
+void K3bCdrdaoWriter::parseCdrdaoLine( const TQString& str )
{
emit debuggingOutput( "cdrdao", str );
// kdDebug() << "(cdrdaoparse)" << str << endl;
@@ -835,7 +835,7 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str )
{
parseCdrdaoError( str );
}
- else if( (str).startsWith( "Wrote" ) && !str.contains("blocks") )
+ else if( (str).startsWith( "Wrote" ) && !str.tqcontains("blocks") )
{
parseCdrdaoWrote( str );
}
@@ -870,62 +870,62 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str )
}
else if( str.startsWith( "Found pre-gap" ) )
{
- emit infoMessage( i18n("Found pregap: %1").arg( str.mid(str.find(":")+1) ), K3bJob::INFO );
+ emit infoMessage( i18n("Found pregap: %1").tqarg( str.mid(str.tqfind(":")+1) ), K3bJob::INFO );
}
else
unknownCdrdaoLine(str);
}
-void K3bCdrdaoWriter::parseCdrdaoError( const QString& line )
+void K3bCdrdaoWriter::parseCdrdaoError( const TQString& line )
{
int pos = -1;
- if( line.contains( "No driver found" ) ||
- line.contains( "use option --driver" ) )
+ if( line.tqcontains( "No driver found" ) ||
+ line.tqcontains( "use option --driver" ) )
{
emit infoMessage( i18n("No cdrdao driver found."), K3bJob::ERROR );
emit infoMessage( i18n("Please select one manually in the device settings."), K3bJob::ERROR );
emit infoMessage( i18n("For most current drives this would be 'generic-mmc'."), K3bJob::ERROR );
m_knownError = true;
}
- else if( line.contains( "Cannot setup device" ) )
+ else if( line.tqcontains( "Cannot setup device" ) )
{
// no nothing...
}
- else if( line.contains( "not ready") )
+ else if( line.tqcontains( "not ready") )
{
emit infoMessage( i18n("Device not ready, waiting."),K3bJob::WARNING );
}
- else if( line.contains("Drive does not accept any cue sheet") )
+ else if( line.tqcontains("Drive does not accept any cue sheet") )
{
emit infoMessage( i18n("Cue sheet not accepted."), K3bJob::ERROR );
m_knownError = true;
}
- else if( (pos = line.find( "Illegal option" )) > 0 ) {
+ else if( (pos = line.tqfind( "Illegal option" )) > 0 ) {
// ERROR: Illegal option: -wurst
- emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrdaoBinObject->name()).arg(line.mid(pos+16)),
+ emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrdaoBinObject->name()).tqarg(line.mid(pos+16)),
ERROR );
m_knownError = true;
}
- else if( line.contains( "exceeds capacity" ) ) {
+ else if( line.tqcontains( "exceeds capacity" ) ) {
emit infoMessage( i18n("Data does not fit on disk."), ERROR );
if( m_cdrdaoBinObject->hasFeature("overburn") )
emit infoMessage( i18n("Enable overburning in the advanced K3b settings to burn anyway."), INFO );
m_knownError = true;
}
- // else if( !line.contains( "remote progress message" ) )
+ // else if( !line.tqcontains( "remote progress message" ) )
// emit infoMessage( line, K3bJob::ERROR );
}
-void K3bCdrdaoWriter::parseCdrdaoWrote( const QString& line )
+void K3bCdrdaoWriter::parseCdrdaoWrote( const TQString& line )
{
int pos, po2;
- pos = line.find( "Wrote" );
- po2 = line.find( " ", pos + 6 );
+ pos = line.tqfind( "Wrote" );
+ po2 = line.tqfind( " ", pos + 6 );
int processed = line.mid( pos+6, po2-pos-6 ).toInt();
- pos = line.find( "of" );
- po2 = line.find( " ", pos + 3 );
+ pos = line.tqfind( "of" );
+ po2 = line.tqfind( " ", pos + 3 );
m_size = line.mid( pos+3, po2-pos-3 ).toInt();
d->speedEst->dataWritten( processed*1024 );
@@ -1035,21 +1035,21 @@ void K3bCdrdaoWriter::slotThroughput( int t )
}
-QString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin )
+TQString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin )
{
if( !bin )
- return QString::null;
+ return TQString();
// cdrdao normally in (prefix)/bin and driver table in (prefix)/share/cdrdao
- QString path = bin->path;
- path.truncate( path.findRev("/") );
- path.truncate( path.findRev("/") );
+ TQString path = bin->path;
+ path.truncate( path.tqfindRev("/") );
+ path.truncate( path.tqfindRev("/") );
path += "/share/cdrdao/drivers";
- if( QFile::exists(path) )
+ if( TQFile::exists(path) )
return path;
else {
kdDebug() << "(K3bCdrdaoWriter) could not find cdrdao driver table." << endl;
- return QString::null;
+ return TQString();
}
}
@@ -1058,15 +1058,15 @@ QString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin )
// TODO: cache the drivers
bool K3bCdrdaoWriter::defaultToGenericMMC( K3bDevice::Device* dev, bool writer )
{
- QString driverTable = findDriverFile( m_cdrdaoBinObject );
+ TQString driverTable = findDriverFile( m_cdrdaoBinObject );
if( !driverTable.isEmpty() ) {
- QFile f( driverTable );
+ TQFile f( driverTable );
if( f.open( IO_ReadOnly ) ) {
// read all drivers
- QStringList drivers;
- QTextStream fStr( &f );
+ TQStringList drivers;
+ TQTextStream fStr( &f );
while( !fStr.atEnd() ) {
- QString line = fStr.readLine();
+ TQString line = fStr.readLine();
if( line.isEmpty() )
continue;
if( line[0] == '#' )
@@ -1079,7 +1079,7 @@ bool K3bCdrdaoWriter::defaultToGenericMMC( K3bDevice::Device* dev, bool writer )
}
// search for the driver
- for( QStringList::const_iterator it = drivers.begin(); it != drivers.end(); ++it ) {
+ for( TQStringList::const_iterator it = drivers.begin(); it != drivers.end(); ++it ) {
if( (*it).section( '|', 1, 1 ) == dev->vendor() &&
(*it).section( '|', 2, 2 ) == dev->description() )
return false;
diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h
index 94a0c9f..704125d 100644
--- a/libk3b/projects/k3bcdrdaowriter.h
+++ b/libk3b/projects/k3bcdrdaowriter.h
@@ -25,13 +25,14 @@ class K3bExternalBin;
class K3bProcess;
class KProcess;
class K3bDevice::Device;
-class QSocket;
+class TQSocket;
class K3bCdrdaoWriter : public K3bAbstractWriter
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -40,13 +41,13 @@ class K3bCdrdaoWriter : public K3bAbstractWriter
enum SubMode { None, RW, RW_RAW };
K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler*,
- QObject* parent = 0, const char* name = 0 );
+ TQObject* tqparent = 0, const char* name = 0 );
~K3bCdrdaoWriter();
/**
* to be used in chain: addArgument(x)->addArgument(y)
*/
- K3bCdrdaoWriter* addArgument( const QString& );
+ K3bCdrdaoWriter* addArgument( const TQString& );
K3bDevice::Device* sourceDevice() { return m_sourceDevice; };
int fd() const;
@@ -55,9 +56,9 @@ class K3bCdrdaoWriter : public K3bAbstractWriter
private:
void reinitParser();
- void parseCdrdaoLine( const QString& line );
- void parseCdrdaoWrote( const QString& line );
- void parseCdrdaoError( const QString& line );
+ void parseCdrdaoLine( const TQString& line );
+ void parseCdrdaoWrote( const TQString& line );
+ void parseCdrdaoError( const TQString& line );
public slots:
void start();
@@ -70,8 +71,8 @@ class K3bCdrdaoWriter : public K3bAbstractWriter
void setMulti( bool b ) { m_multi = b; }
void setForce( bool b ) { m_force = b; }
void setOnTheFly( bool b ) { m_onTheFly = b; }
- void setDataFile( const QString& s ) { m_dataFile = s; }
- void setTocFile( const QString& s ) { m_tocFile = s; }
+ void setDataFile( const TQString& s ) { m_dataFile = s; }
+ void setTocFile( const TQString& s ) { m_tocFile = s; }
void setSourceDevice( K3bDevice::Device* dev ) { m_sourceDevice = dev; }
void setFastToc( bool b ) { m_fastToc = b; }
@@ -91,13 +92,13 @@ class K3bCdrdaoWriter : public K3bAbstractWriter
void setForceNoEject( bool b ) { m_forceNoEject = b; }
private slots:
- void slotStdLine( const QString& line );
+ void slotStdLine( const TQString& line );
void slotProcessExited(KProcess*);
void parseCdrdaoMessage();
void slotThroughput( int t );
private:
- void unknownCdrdaoLine( const QString& );
+ void unknownCdrdaoLine( const TQString& );
void prepareArgumentList();
void setWriteArguments();
void setReadArguments();
@@ -107,7 +108,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter
bool cueSheet();
- QString findDriverFile( const K3bExternalBin* bin );
+ TQString findDriverFile( const K3bExternalBin* bin );
bool defaultToGenericMMC( K3bDevice::Device* dev, bool writer );
// options
@@ -115,11 +116,11 @@ class K3bCdrdaoWriter : public K3bAbstractWriter
int m_command;
int m_blankMode;
K3bDevice::Device* m_sourceDevice;
- QString m_dataFile;
- QString m_tocFile;
- QString m_cueFileLnk;
- QString m_binFileLnk;
- QString m_backupTocFile;
+ TQString m_dataFile;
+ TQString m_tocFile;
+ TQString m_cueFileLnk;
+ TQString m_binFileLnk;
+ TQString m_backupTocFile;
bool m_readRaw;
bool m_multi;
bool m_force;
@@ -137,7 +138,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter
K3bProcess* m_process;
int m_cdrdaoComm[2];
- QSocket *m_comSock;
+ TQSocket *m_comSock;
bool m_canceled;
diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp
index e87c767..1b02290 100644
--- a/libk3b/projects/k3bcdrecordwriter.cpp
+++ b/libk3b/projects/k3bcdrecordwriter.cpp
@@ -29,12 +29,12 @@
#include <k3bglobalsettings.h>
#include <k3btempfile.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qurl.h>
-#include <qvaluelist.h>
-#include <qregexp.h>
-#include <qfile.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqurl.h>
+#include <tqvaluelist.h>
+#include <tqregexp.h>
+#include <tqfile.h>
#include <klocale.h>
#include <kdebug.h>
@@ -59,23 +59,23 @@ public:
bool audio;
};
- QValueList<Track> tracks;
+ TQValueList<Track> tracks;
KTempFile* cdTextFile;
};
K3bCdrecordWriter::K3bCdrecordWriter( K3bDevice::Device* dev, K3bJobHandler* hdl,
- QObject* parent, const char* name )
- : K3bAbstractWriter( dev, hdl, parent, name ),
+ TQObject* tqparent, const char* name )
+ : K3bAbstractWriter( dev, hdl, tqparent, name ),
m_clone(false),
m_cue(false),
m_forceNoEject(false)
{
d = new Private();
d->speedEst = new K3bThroughputEstimator( this );
- connect( d->speedEst, SIGNAL(throughput(int)),
- this, SLOT(slotThroughput(int)) );
+ connect( d->speedEst, TQT_SIGNAL(throughput(int)),
+ this, TQT_SLOT(slotThroughput(int)) );
m_process = 0;
m_writingMode = K3b::TAO;
@@ -110,7 +110,7 @@ void K3bCdrecordWriter::setDao( bool b )
m_writingMode = ( b ? K3b::DAO : K3b::TAO );
}
-void K3bCdrecordWriter::setCueFile( const QString& s)
+void K3bCdrecordWriter::setCueFile( const TQString& s)
{
m_cue = true;
m_cueFile = s;
@@ -145,9 +145,9 @@ void K3bCdrecordWriter::prepareProcess()
m_process->setSplitStdout(true);
m_process->setSuppressEmptyLines(true);
m_process->setRawStdin(true); // we only use stdin when writing on-the-fly
- connect( m_process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
- 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(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) );
+ 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*)) );
m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord");
@@ -163,7 +163,7 @@ void K3bCdrecordWriter::prepareProcess()
*m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?)
// Again we assume the device to be set!
- *m_process << QString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
+ *m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
d->usedSpeed = burnSpeed();
if( d->usedSpeed == 0 ) {
@@ -174,7 +174,7 @@ void K3bCdrecordWriter::prepareProcess()
}
d->usedSpeed /= 175;
if( d->usedSpeed != 0 )
- *m_process << QString("speed=%1").arg(d->usedSpeed);
+ *m_process << TQString("speed=%1").tqarg(d->usedSpeed);
if( m_writingMode == K3b::DAO || m_cue ) {
if( burnDevice()->dao() )
@@ -226,8 +226,8 @@ void K3bCdrecordWriter::prepareProcess()
}
if( m_cue ) {
- m_process->setWorkingDirectory(QUrl(m_cueFile).dirPath());
- *m_process << QString("cuefile=%1").arg( m_cueFile );
+ m_process->setWorkingDirectory(TQUrl(m_cueFile).dirPath());
+ *m_process << TQString("cuefile=%1").tqarg( m_cueFile );
}
if( m_clone )
@@ -235,7 +235,7 @@ void K3bCdrecordWriter::prepareProcess()
if( m_rawCdText.size() > 0 ) {
delete d->cdTextFile;
- d->cdTextFile = new K3bTempFile( QString::null, ".dat" );
+ d->cdTextFile = new K3bTempFile( TQString(), ".dat" );
d->cdTextFile->setAutoDelete(true);
d->cdTextFile->file()->writeBlock( m_rawCdText );
d->cdTextFile->close();
@@ -249,7 +249,7 @@ void K3bCdrecordWriter::prepareProcess()
bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
if( manualBufferSize ) {
- *m_process << QString("fs=%1m").arg( k3bcore->globalSettings()->bufferSize() );
+ *m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->bufferSize() );
}
bool overburn = k3bcore->globalSettings()->overburn();
@@ -257,20 +257,20 @@ void K3bCdrecordWriter::prepareProcess()
if( m_cdrecordBinObject->hasFeature("overburn") )
*m_process << "-overburn";
else
- emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), WARNING );
// additional user parameters from config
- const QStringList& params = m_cdrecordBinObject->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = m_cdrecordBinObject->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*m_process << *it;
// add the user parameters
- for( QStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it )
+ for( TQStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it )
*m_process << *it;
}
-K3bCdrecordWriter* K3bCdrecordWriter::addArgument( const QString& arg )
+K3bCdrecordWriter* K3bCdrecordWriter::addArgument( const TQString& arg )
{
m_arguments.append( arg );
return this;
@@ -293,7 +293,7 @@ void K3bCdrecordWriter::start()
prepareProcess();
if( !m_cdrecordBinObject ) {
- emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), ERROR );
jobFinished(false);
return;
}
@@ -302,15 +302,15 @@ void K3bCdrecordWriter::start()
if( !m_cdrecordBinObject->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
- .arg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" )
- .arg(m_cdrecordBinObject->version)
- .arg(m_cdrecordBinObject->copyright), INFO );
+ .tqarg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" )
+ .tqarg(m_cdrecordBinObject->version)
+ .tqarg(m_cdrecordBinObject->copyright), INFO );
kdDebug() << "***** " << m_cdrecordBinObject->name() << " parameters:\n";
- const QValueList<QCString>& args = m_process->args();
- QString s;
- for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = m_process->args();
+ TQString s;
+ for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << flush << endl;
@@ -343,22 +343,22 @@ void K3bCdrecordWriter::start()
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bCdrecordWriter) could not start " << m_cdrecordBinObject->name() << endl;
- emit infoMessage( i18n("Could not start %1.").arg(m_cdrecordBinObject->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(m_cdrecordBinObject->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
if( simulate() ) {
emit newTask( i18n("Simulating") );
emit infoMessage( i18n("Starting %1 simulation at %2x speed...")
- .arg(K3b::writingModeString(m_writingMode))
- .arg(d->usedSpeed),
+ .tqarg(K3b::writingModeString(m_writingMode))
+ .tqarg(d->usedSpeed),
K3bJob::INFO );
}
else {
emit newTask( i18n("Writing") );
emit infoMessage( i18n("Starting %1 writing at %2x speed...")
- .arg(K3b::writingModeString(m_writingMode))
- .arg(d->usedSpeed),
+ .tqarg(K3b::writingModeString(m_writingMode))
+ .tqarg(d->usedSpeed),
K3bJob::INFO );
}
}
@@ -375,17 +375,17 @@ void K3bCdrecordWriter::cancel()
}
-void K3bCdrecordWriter::slotStdLine( const QString& line )
+void K3bCdrecordWriter::slotStdLine( const TQString& line )
{
- static QRegExp s_burnfreeCounterRx( "^BURN\\-Free\\swas\\s(\\d+)\\stimes\\sused" );
- static QRegExp s_burnfreeCounterRxPredict( "^Total\\sof\\s(\\d+)\\s\\spossible\\sbuffer\\sunderruns\\spredicted" );
+ static TQRegExp s_burnfreeCounterRx( "^BURN\\-Free\\swas\\s(\\d+)\\stimes\\sused" );
+ static TQRegExp s_burnfreeCounterRxPredict( "^Total\\sof\\s(\\d+)\\s\\spossible\\sbuffer\\sunderruns\\spredicted" );
// tracknumber: cap(1)
// done: cap(2)
// complete: cap(3)
// fifo: cap(4) (it seems as if some patched cdrecord versions do not emit the fifo info but only the buf... :(
// buffer: cap(5)
- static QRegExp s_progressRx( "Track\\s(\\d\\d)\\:\\s*(\\d*)\\sof\\s*(\\d*)\\sMB\\swritten\\s(?:\\(fifo\\s*(\\d*)\\%\\)\\s*)?(?:\\[buf\\s*(\\d*)\\%\\])?.*" );
+ static TQRegExp s_progressRx( "Track\\s(\\d\\d)\\:\\s*(\\d*)\\sof\\s*(\\d*)\\sMB\\swritten\\s(?:\\(fifo\\s*(\\d*)\\%\\)\\s*)?(?:\\[buf\\s*(\\d*)\\%\\])?.*" );
emit debuggingOutput( m_cdrecordBinObject->name(), line );
@@ -406,8 +406,8 @@ void K3bCdrecordWriter::slotStdLine( const QString& line )
m_totalTracks = tt;
- int sizeStart = line.find( QRegExp("\\d"), 10 );
- int sizeEnd = line.find( "MB", sizeStart );
+ int sizeStart = line.tqfind( TQRegExp("\\d"), 10 );
+ int sizeEnd = line.tqfind( "MB", sizeStart );
track.size = line.mid( sizeStart, sizeEnd-sizeStart ).toInt(&ok);
if( ok ) {
@@ -474,7 +474,7 @@ void K3bCdrecordWriter::slotStdLine( const QString& line )
line.startsWith( m_cdrecordBinObject->path ) ||
line.startsWith( m_cdrecordBinObject->path.left(m_cdrecordBinObject->path.length()-5) ) ) {
// get rid of the path and the following colon and space
- QString errStr = line.mid( line.find(':') + 2 );
+ TQString errStr = line.mid( line.tqfind(':') + 2 );
if( errStr.startsWith( "Drive does not support SAO" ) ) {
emit infoMessage( i18n("DAO (Disk At Once) recording not supported with this writer"), K3bJob::ERROR );
@@ -508,9 +508,9 @@ void K3bCdrecordWriter::slotStdLine( const QString& line )
else if( errStr.startsWith("Bad Option") ) {
m_cdrecordError = BAD_OPTION;
// parse option
- int pos = line.find( "Bad Option" ) + 13;
+ int pos = line.tqfind( "Bad Option" ) + 13;
int len = line.length() - pos - 1;
- emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrecordBinObject->name()).arg(line.mid(pos, len)),
+ emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrecordBinObject->name()).tqarg(line.mid(pos, len)),
ERROR );
}
else if( errStr.startsWith("Cannot set speed/dummy") ) {
@@ -556,17 +556,17 @@ void K3bCdrecordWriter::slotStdLine( const QString& line )
// All other messages
//
- else if( line.contains( "at speed" ) ) {
+ else if( line.tqcontains( "at speed" ) ) {
// parse the speed and inform the user if cdrdao switched it down
- int pos = line.find( "at speed" );
- int pos2 = line.find( "in", pos+9 );
+ int pos = line.tqfind( "at speed" );
+ int pos2 = line.tqfind( "in", pos+9 );
int speed = static_cast<int>( line.mid( pos+9, pos2-pos-10 ).toDouble() ); // cdrecord-dvd >= 2.01a25 uses 8.0 and stuff
if( speed != d->usedSpeed ) {
- emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING );
+ emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING );
if( speed > d->usedSpeed )
- emit infoMessage( i18n("Switching burn speed up to %1x").arg(speed), K3bJob::WARNING );
+ emit infoMessage( i18n("Switching burn speed up to %1x").tqarg(speed), K3bJob::WARNING );
else
- emit infoMessage( i18n("Switching burn speed down to %1x").arg(speed), K3bJob::WARNING );
+ emit infoMessage( i18n("Switching burn speed down to %1x").tqarg(speed), K3bJob::WARNING );
}
}
else if( line.startsWith( "Starting new" ) ) {
@@ -640,10 +640,10 @@ void K3bCdrecordWriter::slotStdLine( const QString& line )
if( ok )
emit infoMessage( i18n("Buffer was low 1 time.", "Buffer was low %n times.", num), INFO );
}
- else if( line.contains("Medium Error") ) {
+ else if( line.tqcontains("Medium Error") ) {
m_cdrecordError = MEDIUM_ERROR;
}
- else if( line.startsWith( "Error trying to open" ) && line.contains( "(Device or resource busy)" ) ) {
+ else if( line.startsWith( "Error trying to open" ) && line.tqcontains( "(Device or resource busy)" ) ) {
m_cdrecordError = DEVICE_BUSY;
}
else {
@@ -682,7 +682,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
emit infoMessage( i18n("Writing successfully completed"), K3bJob::SUCCESS );
int s = d->speedEst->average();
- emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
+ emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
jobFinished( true );
}
@@ -709,14 +709,14 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
// error message has already been emited earlier since we needed the actual line
break;
case SHMGET_FAILED:
- emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").arg(m_cdrecordBinObject->name()), ERROR );
+ emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").tqarg(m_cdrecordBinObject->name()), ERROR );
emit infoMessage( i18n("Probably you chose a too large buffer size."), ERROR );
break;
case OPC_FAILED:
emit infoMessage( i18n("OPC failed. Probably the writer does not like the medium."), ERROR );
break;
case CANNOT_SET_SPEED:
- emit infoMessage( i18n("Unable to set write speed to %1.").arg(d->usedSpeed), ERROR );
+ emit infoMessage( i18n("Unable to set write speed to %1.").tqarg(d->usedSpeed), ERROR );
emit infoMessage( i18n("Probably this is lower than your writer's lowest writing speed."), ERROR );
break;
case CANNOT_SEND_CUE_SHEET:
@@ -734,7 +734,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
emit infoMessage( i18n("Try DAO writing mode."), ERROR );
break;
case PERMISSION_DENIED:
- emit infoMessage( i18n("%1 has no permission to open the device.").arg("Cdrecord"), ERROR );
+ emit infoMessage( i18n("%1 has no permission to open the device.").tqarg("Cdrecord"), ERROR );
#ifdef HAVE_K3BSETUP
emit infoMessage( i18n("You may use K3bsetup2 to solve this problem."), ERROR );
#endif
@@ -776,7 +776,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
}
else if( !wasSourceUnreadable() ) {
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .arg(m_cdrecordBinObject->name()).arg(p->exitStatus()),
+ .tqarg(m_cdrecordBinObject->name()).tqarg(p->exitStatus()),
K3bJob::ERROR );
if( p->exitStatus() >= 254 && m_writingMode == K3b::DAO ) {
@@ -795,7 +795,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").arg(m_cdrecordBinObject->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(m_cdrecordBinObject->name()),
ERROR );
jobFinished( false );
}
diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h
index 9333588..6bb9792 100644
--- a/libk3b/projects/k3bcdrecordwriter.h
+++ b/libk3b/projects/k3bcdrecordwriter.h
@@ -20,7 +20,7 @@
#include "k3babstractwriter.h"
-#include <qstringlist.h>
+#include <tqstringlist.h>
class K3bExternalBin;
class K3bProcess;
@@ -31,10 +31,11 @@ class K3bDevice::Device;
class K3bCdrecordWriter : public K3bAbstractWriter
{
Q_OBJECT
+ TQ_OBJECT
public:
K3bCdrecordWriter( K3bDevice::Device*, K3bJobHandler* hdl,
- QObject* parent = 0, const char* name = 0 );
+ TQObject* tqparent = 0, const char* name = 0 );
~K3bCdrecordWriter();
bool active() const;
@@ -42,7 +43,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter
/**
* to be used in chain: addArgument(x)->addArgument(y)
*/
- K3bCdrecordWriter* addArgument( const QString& );
+ K3bCdrecordWriter* addArgument( const TQString& );
void clearArguments();
int fd() const;
@@ -53,10 +54,10 @@ class K3bCdrecordWriter : public K3bAbstractWriter
void setDao( bool b );
void setWritingMode( int );
- void setCueFile( const QString& s);
+ void setCueFile( const TQString& s);
void setClone( bool b );
- void setRawCdText( const QByteArray& a ) { m_rawCdText = a; }
+ void setRawCdText( const TQByteArray& a ) { m_rawCdText = a; }
/**
* If set true the job ignores the global K3b setting
@@ -65,7 +66,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter
void setForceNoEject( bool b ) { m_forceNoEject = b; }
protected slots:
- void slotStdLine( const QString& line );
+ void slotStdLine( const TQString& line );
void slotProcessExited(KProcess*);
void slotThroughput( int t );
@@ -80,7 +81,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter
bool m_clone;
bool m_cue;
- QString m_cueFile;
+ TQString m_cueFile;
enum CdrecordError { UNKNOWN,
OVERSIZE,
@@ -100,7 +101,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter
DEVICE_BUSY,
BLANK_FAILED };
- QStringList m_arguments;
+ TQStringList m_arguments;
private:
unsigned int m_currentTrack;
@@ -114,7 +115,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter
bool m_forceNoEject;
- QByteArray m_rawCdText;
+ TQByteArray m_rawCdText;
class Private;
Private* d;
diff --git a/libk3b/projects/k3bcuefileparser.cpp b/libk3b/projects/k3bcuefileparser.cpp
index 49ca4fc..7e00c5a 100644
--- a/libk3b/projects/k3bcuefileparser.cpp
+++ b/libk3b/projects/k3bcuefileparser.cpp
@@ -20,29 +20,29 @@
#include <k3btrack.h>
#include <k3bcdtext.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
+#include <tqdir.h>
#include <kdebug.h>
-// avoid usage of QTextStream since K3b often
+// avoid usage of TQTextStream since K3b often
// tries to open big files (iso images) in a
// cue file parser to test it.
-static QString readLine( QFile* f )
+static TQString readLine( TQFile* f )
{
- QString s;
- Q_LONG r = f->readLine( s, 1024 );
+ TQString s;
+ TQ_LONG r = f->readLine( s, 1024 );
if( r >= 0 ) {
// remove the trailing newline
return s.stripWhiteSpace();
}
else {
// end of file or error
- return QString::null;
+ return TQString();
}
}
@@ -70,7 +70,7 @@ public:
-K3bCueFileParser::K3bCueFileParser( const QString& filename )
+K3bCueFileParser::K3bCueFileParser( const TQString& filename )
: K3bImageFileReader()
{
d = new Private;
@@ -94,9 +94,9 @@ void K3bCueFileParser::readFile()
d->cdText.clear();
d->currentParsedTrack = 0;
- QFile f( filename() );
+ TQFile f( filename() );
if( f.open( IO_ReadOnly ) ) {
- QString line = readLine( &f );
+ TQString line = readLine( &f );
while( !line.isNull() ) {
if( !parseLine(line) ) {
@@ -136,33 +136,33 @@ void K3bCueFileParser::readFile()
}
-bool K3bCueFileParser::parseLine( QString& line )
+bool K3bCueFileParser::parseLine( TQString& line )
{
// use cap(1) for the filename
- static QRegExp fileRx( "FILE\\s\"?([^\"]*)\"?\\s[^\"\\s]*" );
+ static TQRegExp fileRx( "FILE\\s\"?([^\"]*)\"?\\s[^\"\\s]*" );
// use cap(1) for the flags
- static QRegExp flagsRx( "FLAGS(\\s(DCP|4CH|PRE|SCMS)){1,4}" );
+ static TQRegExp flagsRx( "FLAGS(\\s(DCP|4CH|PRE|SCMS)){1,4}" );
// use cap(1) for the tracknumber and cap(2) for the datatype
- static QRegExp trackRx( "TRACK\\s(\\d{1,2})\\s(AUDIO|CDG|MODE1/2048|MODE1/2352|MODE2/2336|MODE2/2352|CDI/2336|CDI/2352)" );
+ static TQRegExp trackRx( "TRACK\\s(\\d{1,2})\\s(AUDIO|CDG|MODE1/2048|MODE1/2352|MODE2/2336|MODE2/2352|CDI/2336|CDI/2352)" );
// use cap(1) for the index number, cap(3) for the minutes, cap(4) for the seconds, cap(5) for the frames,
// and cap(2) for the MSF value string
- static QRegExp indexRx( "INDEX\\s(\\d{1,2})\\s((\\d+):([0-5]\\d):((?:[0-6]\\d)|(?:7[0-4])))" );
+ static TQRegExp indexRx( "INDEX\\s(\\d{1,2})\\s((\\d+):([0-5]\\d):((?:[0-6]\\d)|(?:7[0-4])))" );
// use cap(1) for the MCN
- static QRegExp catalogRx( "CATALOG\\s(\\w{13,13})" );
+ static TQRegExp catalogRx( "CATALOG\\s(\\w{13,13})" );
// use cap(1) for the ISRC
- static QRegExp isrcRx( "ISRC\\s(\\w{5,5}\\d{7,7})" );
+ static TQRegExp isrcRx( "ISRC\\s(\\w{5,5}\\d{7,7})" );
- static QString cdTextRxStr = "\"?([^\"]{0,80})\"?";
+ static TQString cdTextRxStr = "\"?([^\"]{0,80})\"?";
// use cap(1) for the string
- static QRegExp titleRx( "TITLE\\s" + cdTextRxStr );
- static QRegExp performerRx( "PERFORMER\\s" + cdTextRxStr );
- static QRegExp songwriterRx( "SONGWRITER\\s" + cdTextRxStr );
+ static TQRegExp titleRx( "TITLE\\s" + cdTextRxStr );
+ static TQRegExp performerRx( "PERFORMER\\s" + cdTextRxStr );
+ static TQRegExp songwriterRx( "SONGWRITER\\s" + cdTextRxStr );
// simplify all white spaces except those in filenames and CD-TEXT
@@ -235,7 +235,7 @@ bool K3bCueFileParser::parseLine( QString& line )
d->rawData = (trackRx.cap(2) == "MODE2/2352");
}
else {
- kdDebug() << "(K3bCueFileParser) unsupported track type: " << trackRx.cap(2) << endl;
+ kdDebug() << "(K3bCueFileParser) unsupported track type: " << TQString(trackRx.cap(2)) << endl;
return false;
}
}
@@ -360,7 +360,7 @@ bool K3bCueFileParser::parseLine( QString& line )
}
-void K3bCueFileParser::simplifyWhiteSpace( QString& s )
+void K3bCueFileParser::simplifyWhiteSpace( TQString& s )
{
s = s.stripWhiteSpace();
@@ -392,7 +392,7 @@ const K3bDevice::CdText& K3bCueFileParser::cdText() const
}
-bool K3bCueFileParser::findImageFileName( const QString& dataFile )
+bool K3bCueFileParser::findImageFileName( const TQString& dataFile )
{
//
// CDRDAO does not use this image filename but replaces the extension from the cue file
@@ -402,21 +402,21 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile )
m_imageFilenameInCue = true;
// first try filename as a hole (absolut)
- if( QFile::exists( dataFile ) ) {
- setImageFilename( QFileInfo(dataFile).absFilePath() );
+ if( TQFile::exists( dataFile ) ) {
+ setImageFilename( TQFileInfo(dataFile).absFilePath() );
return true;
}
// try the filename in the cue's directory
- if( QFileInfo( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) {
- setImageFilename( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) );
+ if( TQFileInfo( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) {
+ setImageFilename( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) );
kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl;
return true;
}
// try the filename ignoring case
- if( QFileInfo( K3b::parentDir(filename()) + dataFile.section( '/', -1 ).lower() ).isFile() ) {
- setImageFilename( K3b::parentDir(filename()) + dataFile.section( '/', -1 ).lower() );
+ if( TQFileInfo( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ).isFile() ) {
+ setImageFilename( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() );
kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl;
return true;
}
@@ -424,7 +424,7 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile )
m_imageFilenameInCue = false;
// try removing the ending from the cue file (image.bin.cue and image.bin)
- if( QFileInfo( filename().left( filename().length()-4 ) ).isFile() ) {
+ if( TQFileInfo( filename().left( filename().length()-4 ) ).isFile() ) {
setImageFilename( filename().left( filename().length()-4 ) );
kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl;
return true;
@@ -435,21 +435,21 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile )
// Search for another one having the same filename as the cue but a different extension
//
- QDir parentDir( K3b::parentDir(filename()) );
- QString filenamePrefix = filename().section( '/', -1 );
+ TQDir tqparentDir( K3b::tqparentDir(filename()) );
+ TQString filenamePrefix = filename().section( '/', -1 );
filenamePrefix.truncate( filenamePrefix.length() - 3 ); // remove cue extension
- kdDebug() << "(K3bCueFileParser) checking folder " << parentDir.path() << " for files: " << filenamePrefix << "*" << endl;
+ kdDebug() << "(K3bCueFileParser) checking folder " << tqparentDir.path() << " for files: " << filenamePrefix << "*" << endl;
//
- // we cannot use the nameFilter in QDir because of the spaces that may occur in filenames
+ // we cannot use the nameFilter in TQDir because of the spaces that may occur in filenames
//
- QStringList possibleImageFiles = parentDir.entryList( QDir::Files );
+ TQStringList possibleImageFiles = tqparentDir.entryList( TQDir::Files );
int cnt = 0;
- for( QStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) {
- if( (*it).lower() == dataFile.section( '/', -1 ).lower() ||
+ for( TQStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) {
+ if( (*it).lower() == TQString(dataFile.section( '/', -1 )).lower() ||
(*it).startsWith( filenamePrefix ) && !(*it).endsWith( "cue" ) ) {
++cnt;
- setImageFilename( K3b::parentDir(filename()) + *it );
+ setImageFilename( K3b::tqparentDir(filename()) + *it );
}
}
@@ -457,5 +457,5 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile )
// we only do this if there is one unique file which fits the requirements.
// Otherwise we cannot be certain to have the right file.
//
- return ( cnt == 1 && QFileInfo( imageFilename() ).isFile() );
+ return ( cnt == 1 && TQFileInfo( imageFilename() ).isFile() );
}
diff --git a/libk3b/projects/k3bcuefileparser.h b/libk3b/projects/k3bcuefileparser.h
index 41a5ee6..112caec 100644
--- a/libk3b/projects/k3bcuefileparser.h
+++ b/libk3b/projects/k3bcuefileparser.h
@@ -29,7 +29,7 @@
class LIBK3B_EXPORT K3bCueFileParser : public K3bImageFileReader
{
public:
- K3bCueFileParser( const QString& filename = QString::null );
+ K3bCueFileParser( const TQString& filename = TQString() );
~K3bCueFileParser();
/**
@@ -44,9 +44,9 @@ class LIBK3B_EXPORT K3bCueFileParser : public K3bImageFileReader
private:
void readFile();
- bool parseLine( QString& line );
- void simplifyWhiteSpace( QString& s );
- bool findImageFileName( const QString& fileEntry );
+ bool parseLine( TQString& line );
+ void simplifyWhiteSpace( TQString& s );
+ bool findImageFileName( const TQString& fileEntry );
bool m_imageFilenameInCue;
diff --git a/libk3b/projects/k3bdoc.cpp b/libk3b/projects/k3bdoc.cpp
index ac5346d..29648a7 100644
--- a/libk3b/projects/k3bdoc.cpp
+++ b/libk3b/projects/k3bdoc.cpp
@@ -14,10 +14,10 @@
*/
-// include files for Qt
-#include <qwidget.h>
-#include <qstring.h>
-#include <qdom.h>
+// include files for TQt
+#include <tqwidget.h>
+#include <tqstring.h>
+#include <tqdom.h>
// include files for KDE
#include <klocale.h>
@@ -40,12 +40,12 @@
#include <k3bdevicemanager.h>
-K3bDoc::K3bDoc( QObject* parent )
- : QObject( parent ),
+K3bDoc::K3bDoc( TQObject* tqparent )
+ : TQObject( tqparent ),
m_modified(false),
m_view(0)
{
- connect( this, SIGNAL(changed()), this, SLOT(slotChanged()) );
+ connect( this, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) );
}
@@ -107,7 +107,7 @@ const KURL& K3bDoc::URL() const
}
-QString K3bDoc::name() const
+TQString K3bDoc::name() const
{
return URL().path().section( '/', -1 );
}
@@ -132,12 +132,12 @@ bool K3bDoc::newDocument()
}
-bool K3bDoc::saveGeneralDocumentData( QDomElement* part )
+bool K3bDoc::saveGeneralDocumentData( TQDomElement* part )
{
- QDomDocument doc = part->ownerDocument();
- QDomElement mainElem = doc.createElement( "general" );
+ TQDomDocument doc = part->ownerDocument();
+ TQDomElement mainElem = doc.createElement( "general" );
- QDomElement propElem = doc.createElement( "writing_mode" );
+ TQDomElement propElem = doc.createElement( "writing_mode" );
switch( writingMode() ) {
case K3b::DAO:
propElem.appendChild( doc.createTextNode( "dao" ) );
@@ -176,20 +176,20 @@ bool K3bDoc::saveGeneralDocumentData( QDomElement* part )
}
-bool K3bDoc::readGeneralDocumentData( const QDomElement& elem )
+bool K3bDoc::readGeneralDocumentData( const TQDomElement& elem )
{
if( elem.nodeName() != "general" )
return false;
- QDomNodeList nodes = elem.childNodes();
+ TQDomNodeList nodes = elem.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;
if( e.nodeName() == "writing_mode") {
- QString mode = e.text();
+ TQString mode = e.text();
if( mode == "dao" )
setWritingMode( K3b::DAO );
else if( mode == "tao" )
diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h
index f241487..1cdde4f 100644
--- a/libk3b/projects/k3bdoc.h
+++ b/libk3b/projects/k3bdoc.h
@@ -22,9 +22,9 @@
#endif
// include files for QT
-#include <qobject.h>
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
// include files for KDE
@@ -33,11 +33,11 @@
#include "k3b_export.h"
// forward declaration of the K3b classes
-class QTimer;
+class TQTimer;
class KTempFile;
class K3bBurnJob;
-class QDomDocument;
-class QDomElement;
+class TQDomDocument;
+class TQDomElement;
class KConfig;
class KActionCollection;
class K3bJobHandler;
@@ -54,12 +54,13 @@ namespace K3b {
* K3bDoc is the base document class.
* It handles some general settings.
*/
-class LIBK3B_EXPORT K3bDoc : public QObject
+class LIBK3B_EXPORT K3bDoc : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDoc( QObject* = 0 );
+ K3bDoc( TQObject* = 0 );
virtual ~K3bDoc();
enum DocType {
@@ -79,22 +80,22 @@ class LIBK3B_EXPORT K3bDoc : public QObject
* \return A name for the project which might for example be used as a suggestion for a file name
* when saving. The default implementation extracts a name from the URL.
*/
- virtual QString name() const;
+ virtual TQString name() const;
/**
* \return A string representation of the document type.
*/
- virtual QString typeString() const = 0;
+ virtual TQString typeString() const = 0;
/**
* returns the view widget set with setView() or null if none has been set.
*/
- QWidget* view() const { return m_view; }
+ TQWidget* view() const { return m_view; }
/**
* Just for convenience to make an easy mapping from doc to GUI possible.
*/
- void setView( QWidget* v ) { m_view = v; }
+ void setView( TQWidget* v ) { m_view = v; }
/**
* sets the modified flag for the document after a modifying action on the view connected to the document.
@@ -118,14 +119,14 @@ class LIBK3B_EXPORT K3bDoc : public QObject
*
* This is used to load/save k3b projects.
*/
- virtual bool loadDocumentData( QDomElement* root ) = 0;
+ virtual bool loadDocumentData( TQDomElement* root ) = 0;
/**
* Save a project to an xml stream.
*
* This is used to load/save k3b projects.
*/
- virtual bool saveDocumentData( QDomElement* docElem ) = 0;
+ virtual bool saveDocumentData( TQDomElement* docElem ) = 0;
/** returns the KURL of the document */
const KURL& URL() const;
@@ -144,7 +145,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject
virtual K3b::Msf length() const = 0;
// FIXME: rename this to something like imagePath
- const QString& tempDir() const { return m_tempDir; }
+ const TQString& tempDir() const { return m_tempDir; }
virtual int numOfTracks() const { return 1; }
@@ -154,7 +155,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject
* easier this way since you don't need to distinguish between the different
* project types.
*/
- virtual K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 ) = 0;
+ virtual K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ) = 0;
int writingApp() const { return m_writingApp; }
void setWritingApp( int a ) { m_writingApp = a; }
@@ -179,7 +180,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject
void setOnTheFly( bool b ) { m_onTheFly = b; }
void setSpeed( int speed );
void setBurner( K3bDevice::Device* dev );
- void setTempDir( const QString& dir ) { m_tempDir = dir; }
+ void setTempDir( const TQString& dir ) { m_tempDir = dir; }
void setRemoveImages( bool b ) { m_removeImages = b; }
void setOnlyCreateImages( bool b ) { m_onlyCreateImages = b; }
void setCopies( int c ) { m_copies = c; }
@@ -194,9 +195,9 @@ class LIBK3B_EXPORT K3bDoc : public QObject
protected:
int m_docType;
- bool saveGeneralDocumentData( QDomElement* );
+ bool saveGeneralDocumentData( TQDomElement* );
- bool readGeneralDocumentData( const QDomElement& );
+ bool readGeneralDocumentData( const TQDomElement& );
private slots:
void slotChanged();
@@ -206,9 +207,9 @@ class LIBK3B_EXPORT K3bDoc : public QObject
bool m_modified;
KURL doc_url;
- QWidget* m_view;
+ TQWidget* m_view;
- QString m_tempDir;
+ TQString m_tempDir;
K3bDevice::Device* m_burner;
bool m_dummy;
bool m_onTheFly;
diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp
index 0910d4a..ae33599 100644
--- a/libk3b/projects/k3bdvdrecordwriter.cpp
+++ b/libk3b/projects/k3bdvdrecordwriter.cpp
@@ -26,8 +26,8 @@
#include <klocale.h>
-K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, QObject* parent, const char* name )
- : K3bCdrecordWriter( dev, parent, name )
+K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* tqparent, const char* name )
+ : K3bCdrecordWriter( dev, tqparent, name )
{
}
@@ -42,10 +42,10 @@ void K3bDvdrecordWriter::prepareProcess()
m_process = new K3bProcess();
m_process->setRunPrivileged(true);
m_process->setSplitStdout(true);
- connect( m_process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
- 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, SIGNAL(wroteStdin(KProcess*)), this, SIGNAL(dataWritten()) );
+ connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) );
+ 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*)) );
+ connect( m_process, TQT_SIGNAL(wroteStdin(KProcess*)), this, TQT_SIGNAL(dataWritten()) );
// if( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "dvd-patch" ) )
// m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord");
@@ -66,8 +66,8 @@ void K3bDvdrecordWriter::prepareProcess()
*m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?)
// Again we assume the device to be set!
- *m_process << QString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
- *m_process << QString("speed=%1").arg(burnSpeed());
+ *m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
+ *m_process << TQString("speed=%1").tqarg(burnSpeed());
// DVDs are only written in DAO mode (and Packet, but we do not support that since it does not
// make much sense here)
@@ -95,7 +95,7 @@ void K3bDvdrecordWriter::prepareProcess()
bool manualBufferSize = k3bcore->globalSettings()->manualBufferSize();
if( manualBufferSize ) {
- *m_process << QString("fs=%1m").arg( k3bcore->globalSettings()->writingBuffer() );
+ *m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->writingBuffer() );
}
bool overburn = k3bcore->globalSettings()->overburn();
@@ -103,15 +103,15 @@ void K3bDvdrecordWriter::prepareProcess()
if( m_cdrecordBinObject->hasFeature("overburn") )
*m_process << "-overburn";
else
- emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), INFO );
+ emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), INFO );
// additional user parameters from config
- const QStringList& params = m_cdrecordBinObject->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = m_cdrecordBinObject->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*m_process << *it;
// add the user parameters
- for( QStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it )
+ for( TQStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it )
*m_process << *it;
}
diff --git a/libk3b/projects/k3bdvdrecordwriter.h b/libk3b/projects/k3bdvdrecordwriter.h
index f9dcf4a..02421bb 100644
--- a/libk3b/projects/k3bdvdrecordwriter.h
+++ b/libk3b/projects/k3bdvdrecordwriter.h
@@ -28,9 +28,10 @@ class K3bDevice::Device;
class K3bDvdrecordWriter : public K3bCdrecordWriter
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDvdrecordWriter( K3bDevice::Device*, QObject* parent = 0, const char* name = 0 );
+ K3bDvdrecordWriter( K3bDevice::Device*, TQObject* tqparent = 0, const char* name = 0 );
~K3bDvdrecordWriter();
protected:
diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp
index 0b582ce..926c959 100644
--- a/libk3b/projects/k3bgrowisofshandler.cpp
+++ b/libk3b/projects/k3bgrowisofshandler.cpp
@@ -25,7 +25,7 @@
#include <kglobal.h>
#include <kdebug.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include <errno.h>
#include <string.h>
@@ -39,8 +39,8 @@ public:
};
-K3bGrowisofsHandler::K3bGrowisofsHandler( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bGrowisofsHandler::K3bGrowisofsHandler( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
d = new Private;
reset();
@@ -65,18 +65,18 @@ void K3bGrowisofsHandler::reset( K3bDevice::Device* dev, bool dao )
void K3bGrowisofsHandler::handleStart()
{
-// QTimer::singleShot( 2000, this, SLOT(slotCheckBufferStatus()) );
+// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBuffertqStatus()) );
}
-void K3bGrowisofsHandler::handleLine( const QString& line )
+void K3bGrowisofsHandler::handleLine( const TQString& line )
{
int pos = 0;
if( line.startsWith( ":-[" ) ) {
// Error
- if( line.contains( "ASC=30h" ) )
+ if( line.tqcontains( "ASC=30h" ) )
m_error = ERROR_MEDIA;
// :-[ PERFORM OPC failed with SK=3h/ASC=73h/ASCQ=03h
@@ -85,7 +85,7 @@ void K3bGrowisofsHandler::handleLine( const QString& line )
// :-[ attempt -blank=full or re-run with -dvd-compat -dvd-compat to engage DAO ]
else if( !m_dao &&
- ( line.contains( "engage DAO" ) || line.contains( "media is not formatted or unsupported" ) ) )
+ ( line.tqcontains( "engage DAO" ) || line.tqcontains( "media is not formatted or unsupported" ) ) )
emit infoMessage( i18n("Please try again with writing mode DAO."), K3bJob::ERROR );
else if( line.startsWith( ":-[ Failed to change write speed" ) ) {
@@ -93,10 +93,10 @@ void K3bGrowisofsHandler::handleLine( const QString& line )
}
}
else if( line.startsWith( ":-(" ) ) {
- if( line.contains( "No space left on device" ) )
+ if( line.tqcontains( "No space left on device" ) )
m_error = ERROR_OVERSIZE;
- else if( line.contains( "blocks are free" ) && line.contains( "to be written" ) ) {
+ else if( line.tqcontains( "blocks are free" ) && line.tqcontains( "to be written" ) ) {
m_error = ERROR_OVERSIZE;
if( k3bcore->globalSettings()->overburn() )
emit infoMessage( i18n("Trying to write more than the official disk capacity"), K3bJob::WARNING );
@@ -116,7 +116,7 @@ void K3bGrowisofsHandler::handleLine( const QString& line )
else if( line.startsWith( "PERFORM OPC" ) ) {
m_error = ERROR_OPC;
}
- else if( line.contains( "flushing cache" ) ) {
+ else if( line.tqcontains( "flushing cache" ) ) {
// here is where we already should stop queriying the buffer fill
// since the device is only used there so far...
m_device = 0;
@@ -131,34 +131,34 @@ void K3bGrowisofsHandler::handleLine( const QString& line )
// line = line.mid( dev->blockDeviceName().length() );
// if( line.startsWith( "closing.....
- else if( line.contains( "closing track" ) ) {
+ else if( line.tqcontains( "closing track" ) ) {
emit newSubTask( i18n("Closing Track") );
}
- else if( line.contains( "closing disc" ) ) {
+ else if( line.tqcontains( "closing disc" ) ) {
emit newSubTask( i18n("Closing Disk") );
}
- else if( line.contains( "closing session" ) ) {
+ else if( line.tqcontains( "closing session" ) ) {
emit newSubTask( i18n("Closing Session") );
}
- else if( line.contains( "updating RMA" ) ) {
+ else if( line.tqcontains( "updating RMA" ) ) {
emit newSubTask( i18n("Updating RMA") );
emit infoMessage( i18n("Updating RMA") + "...", K3bJob::INFO );
}
- else if( line.contains( "closing session" ) ) {
+ else if( line.tqcontains( "closing session" ) ) {
emit newSubTask( i18n("Closing Session") );
emit infoMessage( i18n("Closing Session") + "...", K3bJob::INFO );
}
- else if( line.contains( "writing lead-out" ) ) {
+ else if( line.tqcontains( "writing lead-out" ) ) {
emit newSubTask( i18n("Writing Lead-out") );
emit infoMessage( i18n("Writing the lead-out may take some time."), K3bJob::INFO );
}
- else if( line.contains( "Quick Grow" ) ) {
+ else if( line.tqcontains( "Quick Grow" ) ) {
emit infoMessage( i18n("Removing reference to lead-out."), K3bJob::INFO );
}
- else if( line.contains( "copying volume descriptor" ) ) {
+ else if( line.tqcontains( "copying volume descriptor" ) ) {
emit infoMessage( i18n("Modifying ISO9660 volume descriptor"), K3bJob::INFO );
}
- else if( line.contains( "FEATURE 21h is not on" ) ) {
+ else if( line.tqcontains( "FEATURE 21h is not on" ) ) {
if( !m_dao ) {
// FIXME: it's not only the writer. It may be the media: something like does not support it with this media
// da war was mit: wenn einmal formattiert, dann geht nur noch dao oder wenn einmal als overwrite
@@ -167,28 +167,28 @@ void K3bGrowisofsHandler::handleLine( const QString& line )
emit infoMessage( i18n("Engaging DAO"), K3bJob::WARNING );
}
}
- else if( ( pos = line.find( "Current Write Speed" ) ) > 0 ) {
+ else if( ( pos = line.tqfind( "Current Write Speed" ) ) > 0 ) {
// parse write speed
// /dev/sr0: "Current Write Speed" is 2.4x1385KBps
pos += 24;
- int endPos = line.find( 'x', pos+1 );
+ int endPos = line.tqfind( 'x', pos+1 );
bool ok = true;
double speed = line.mid( pos, endPos-pos ).toDouble(&ok);
if( ok )
emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)")
- .arg((int)(speed*1385.0))
- .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO );
+ .tqarg((int)(speed*1385.0))
+ .tqarg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO );
else
kdDebug() << "(K3bGrowisofsHandler) parsing error: '" << line.mid( pos, endPos-pos ) << "'" << endl;
}
- else if( (pos = line.find( "RBU" )) > 0 ) {
+ else if( (pos = line.tqfind( "RBU" )) > 0 ) {
- // FIXME: use QRegExp
+ // FIXME: use TQRegExp
// parse ring buffer fill for growisofs >= 6.0
pos += 4;
- int endPos = line.find( '%', pos+1 );
+ int endPos = line.tqfind( '%', pos+1 );
bool ok = true;
double val = line.mid( pos, endPos-pos ).toDouble( &ok );
if( ok ) {
@@ -199,8 +199,8 @@ void K3bGrowisofsHandler::handleLine( const QString& line )
}
// device buffer for growisofs >= 7.0
- pos = line.find( "UBU", pos );
- endPos = line.find( '%', pos+5 );
+ pos = line.tqfind( "UBU", pos );
+ endPos = line.tqfind( '%', pos+5 );
if( pos > 0 ) {
pos += 4;
val = line.mid( pos, endPos-pos ).toDouble( &ok );
@@ -274,7 +274,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode )
// for now we just emit a message with the error
// in the future when I know more about what kinds of errors may occur
// we will enhance this
- emit infoMessage( i18n("Fatal error at startup: %1").arg(strerror(exitCode-128)),
+ emit infoMessage( i18n("Fatal error at startup: %1").tqarg(strerror(exitCode-128)),
K3bJob::ERROR );
}
else if( exitCode == 1 ) {
@@ -286,7 +286,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode )
emit infoMessage( i18n("Most likely mkisofs failed in some way."), K3bJob::ERROR );
}
else {
- emit infoMessage( i18n("Fatal error during recording: %1").arg(strerror(exitCode)),
+ emit infoMessage( i18n("Fatal error during recording: %1").tqarg(strerror(exitCode)),
K3bJob::ERROR );
}
}
@@ -295,12 +295,12 @@ void K3bGrowisofsHandler::handleExit( int exitCode )
}
-void K3bGrowisofsHandler::slotCheckBufferStatus()
+void K3bGrowisofsHandler::slotCheckBuffertqStatus()
{
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::BUFFER_CAPACITY, m_device ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotCheckBufferStatusDone(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotCheckBufferStatusDone(K3bDevice::DeviceHandler*)) );
}
@@ -308,7 +308,7 @@ void K3bGrowisofsHandler::slotCheckBufferStatusDone( K3bDevice::DeviceHandler* d
{
if( dh->success() && dh->bufferCapacity() > 0 ) {
emit deviceBuffer( 100 * (dh->bufferCapacity() - dh->availableBufferCapacity() ) / dh->bufferCapacity() );
- QTimer::singleShot( 500, this, SLOT(slotCheckBufferStatus()) );
+ TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBuffertqStatus()) );
}
else {
kdDebug() << "(K3bGrowisofsHandler) stopping buffer check." << endl;
diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h
index 42fcd2a..5243ebc 100644
--- a/libk3b/projects/k3bgrowisofshandler.h
+++ b/libk3b/projects/k3bgrowisofshandler.h
@@ -16,7 +16,7 @@
#ifndef _K3B_GROWISOFS_HANDLER_H_
#define _K3B_GROWISOFS_HANDLER_H_
-#include <qobject.h>
+#include <tqobject.h>
namespace K3bDevice {
class Device;
@@ -29,12 +29,13 @@ namespace K3bDevice {
* We put it in an extra class since we have two classes
* using growisofs: the writer and the imager.
*/
-class K3bGrowisofsHandler : public QObject
+class K3bGrowisofsHandler : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bGrowisofsHandler( QObject* parent = 0, const char* name = 0 );
+ K3bGrowisofsHandler( TQObject* tqparent = 0, const char* name = 0 );
~K3bGrowisofsHandler();
enum ErrorType {
@@ -57,12 +58,12 @@ class K3bGrowisofsHandler : public QObject
void reset( K3bDevice::Device* = 0, bool dao = false );
void handleStart();
- void handleLine( const QString& );
+ void handleLine( const TQString& );
void handleExit( int exitCode );
signals:
- void infoMessage( const QString&, int );
- void newSubTask( const QString& );
+ void infoMessage( const TQString&, int );
+ void newSubTask( const TQString& );
void buffer( int );
void deviceBuffer( int );
@@ -72,7 +73,7 @@ class K3bGrowisofsHandler : public QObject
void flushingCache();
private slots:
- void slotCheckBufferStatus();
+ void slotCheckBuffertqStatus();
void slotCheckBufferStatusDone( K3bDevice::DeviceHandler* );
private:
diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp
index 3144547..3480711 100644
--- a/libk3b/projects/k3bgrowisofswriter.cpp
+++ b/libk3b/projects/k3bgrowisofswriter.cpp
@@ -33,8 +33,8 @@
#include <kdebug.h>
#include <kglobal.h>
-#include <qvaluelist.h>
-#include <qfile.h>
+#include <tqvaluelist.h>
+#include <tqfile.h>
#include <unistd.h>
@@ -60,13 +60,13 @@ public:
bool multiSession;
K3bProcess* process;
const K3bExternalBin* growisofsBin;
- QString image;
+ TQString image;
bool success;
bool canceled;
bool finished;
- QTime lastSpeedCalculationTime;
+ TQTime lastSpeedCalculationTime;
int lastSpeedCalculationBytes;
int lastProgress;
unsigned int lastProgressed;
@@ -85,37 +85,37 @@ public:
unsigned long long overallSizeFromOutput;
long long firstSizeFromOutput;
- QFile inputFile;
+ TQFile inputFile;
bool usingRingBuffer;
K3bPipeBuffer* ringBuffer;
- QString multiSessionInfo;
+ TQString multiSessionInfo;
bool forceNoEject;
};
K3bGrowisofsWriter::K3bGrowisofsWriter( K3bDevice::Device* dev, K3bJobHandler* hdl,
- QObject* parent, const char* name )
- : K3bAbstractWriter( dev, hdl, parent, name )
+ TQObject* tqparent, const char* name )
+ : K3bAbstractWriter( dev, hdl, tqparent, name )
{
d = new Private;
d->speedEst = new K3bThroughputEstimator( this );
- connect( d->speedEst, SIGNAL(throughput(int)),
- this, SLOT(slotThroughput(int)) );
+ connect( d->speedEst, TQT_SIGNAL(throughput(int)),
+ this, TQT_SLOT(slotThroughput(int)) );
d->gh = new K3bGrowisofsHandler( this );
- connect( d->gh, SIGNAL(infoMessage(const QString&, int)),
- this,SIGNAL(infoMessage(const QString&, int)) );
- connect( d->gh, SIGNAL(newSubTask(const QString&)),
- this, SIGNAL(newSubTask(const QString&)) );
- connect( d->gh, SIGNAL(buffer(int)),
- this, SIGNAL(buffer(int)) );
- connect( d->gh, SIGNAL(deviceBuffer(int)),
- this, SIGNAL(deviceBuffer(int)) );
- connect( d->gh, SIGNAL(flushingCache()),
- this, SLOT(slotFlushingCache()) );
+ connect( d->gh, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this,TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( d->gh, TQT_SIGNAL(newSubTask(const TQString&)),
+ this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( d->gh, TQT_SIGNAL(buffer(int)),
+ this, TQT_SIGNAL(buffer(int)) );
+ connect( d->gh, TQT_SIGNAL(deviceBuffer(int)),
+ this, TQT_SIGNAL(deviceBuffer(int)) );
+ connect( d->gh, TQT_SIGNAL(flushingCache()),
+ this, TQT_SLOT(slotFlushingCache()) );
}
@@ -155,13 +155,13 @@ bool K3bGrowisofsWriter::prepareProcess()
{
d->growisofsBin = k3bcore->externalBinManager()->binObject( "growisofs" );
if( !d->growisofsBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").arg("growisofs"), ERROR );
+ emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("growisofs"), ERROR );
return false;
}
if( d->growisofsBin->version < K3bVersion( 5, 10 ) ) {
emit infoMessage( i18n("Growisofs version %1 is too old. "
- "K3b needs at least version 5.10.").arg(d->growisofsBin->version),
+ "K3b needs at least version 5.10.").tqarg(d->growisofsBin->version),
ERROR );
return false;
}
@@ -169,8 +169,8 @@ bool K3bGrowisofsWriter::prepareProcess()
emit debuggingOutput( "Used versions", "growisofs: " + d->growisofsBin->version );
if( !d->growisofsBin->copyright.isEmpty() )
- emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg("growisofs")
- .arg(d->growisofsBin->version).arg(d->growisofsBin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg("growisofs")
+ .tqarg(d->growisofsBin->version).tqarg(d->growisofsBin->copyright), INFO );
//
@@ -182,9 +182,9 @@ bool K3bGrowisofsWriter::prepareProcess()
// d->process->setPriority( KProcess::PrioHighest );
d->process->setSplitStdout(true);
d->process->setRawStdin(true);
- connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotReceivedStderr(const QString&)) );
- connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotReceivedStderr(const QString&)) );
- connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) );
+ connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(const TQString&)) );
+ connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) );
//
@@ -212,7 +212,7 @@ bool K3bGrowisofsWriter::prepareProcess()
// set this var to true to enable the ringbuffer
d->usingRingBuffer = ( d->growisofsBin->version < K3bVersion( 6, 0 ) );
- QString s = burnDevice()->blockDeviceName() + "=";
+ TQString s = burnDevice()->blockDeviceName() + "=";
if( d->usingRingBuffer || d->image.isEmpty() ) {
// we always read from stdin since the ringbuffer does the actual reading from the source
s += "/dev/fd/0";
@@ -234,7 +234,7 @@ bool K3bGrowisofsWriter::prepareProcess()
d->inputFile.setName( d->image );
d->trackSize = (K3b::filesize( d->image ) + 1024) / 2048;
if( !d->inputFile.open( IO_ReadOnly ) ) {
- emit infoMessage( i18n("Could not open file %1.").arg(d->image), ERROR );
+ emit infoMessage( i18n("Could not open file %1.").tqarg(d->image), ERROR );
return false;
}
}
@@ -249,13 +249,13 @@ bool K3bGrowisofsWriter::prepareProcess()
// DL writing with forced layer break
if( d->layerBreak > 0 ) {
- *d->process << "-use-the-force-luke=break:" + QString::number(d->layerBreak);
+ *d->process << "-use-the-force-luke=break:" + TQString::number(d->layerBreak);
dvdCompat = true;
}
// the tracksize parameter takes priority over the dao:tracksize parameter since growisofs 5.18
else if( d->growisofsBin->version > K3bVersion( 5, 17 ) && d->trackSize > 0 )
- *d->process << "-use-the-force-luke=tracksize:" + QString::number(d->trackSize + trackSizePadding);
+ *d->process << "-use-the-force-luke=tracksize:" + TQString::number(d->trackSize + trackSizePadding);
if( simulate() )
*d->process << "-use-the-force-luke=dummy";
@@ -263,7 +263,7 @@ bool K3bGrowisofsWriter::prepareProcess()
if( d->writingMode == K3b::DAO ) {
dvdCompat = true;
if( d->growisofsBin->version >= K3bVersion( 5, 15 ) && d->trackSize > 0 )
- *d->process << "-use-the-force-luke=dao:" + QString::number(d->trackSize + trackSizePadding);
+ *d->process << "-use-the-force-luke=dao:" + TQString::number(d->trackSize + trackSizePadding);
else
*d->process << "-use-the-force-luke=dao";
d->gh->reset( burnDevice(), true );
@@ -299,9 +299,9 @@ bool K3bGrowisofsWriter::prepareProcess()
// speed may be a float number. example: DVD+R(W): 2.4x
if( speed != 0 )
- *d->process << QString("-speed=%1").arg( speed%1385 > 0
- ? QString::number( (float)speed/1385.0, 'f', 1 )
- : QString::number( speed/1385 ) );
+ *d->process << TQString("-speed=%1").tqarg( speed%1385 > 0
+ ? TQString::number( (float)speed/1385.0, 'f', 1 )
+ : TQString::number( speed/1385 ) );
}
if( k3bcore->globalSettings()->overburn() )
@@ -310,12 +310,12 @@ bool K3bGrowisofsWriter::prepareProcess()
if( !d->usingRingBuffer && d->growisofsBin->version >= K3bVersion( 6, 0 ) ) {
bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
int bufSize = ( manualBufferSize ? k3bcore->globalSettings()->bufferSize() : 32 );
- *d->process << QString("-use-the-force-luke=bufsize:%1m").arg(bufSize);
+ *d->process << TQString("-use-the-force-luke=bufsize:%1m").tqarg(bufSize);
}
// additional user parameters from config
- const QStringList& params = d->growisofsBin->userParameters();
- for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = d->growisofsBin->userParameters();
+ for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*d->process << *it;
emit debuggingOutput( "Burned media", K3bDevice::mediaTypeString(mediaType) );
@@ -332,7 +332,7 @@ void K3bGrowisofsWriter::start()
d->lastProgressed = 0;
d->lastProgress = 0;
d->firstSizeFromOutput = -1;
- d->lastSpeedCalculationTime = QTime::currentTime();
+ d->lastSpeedCalculationTime = TQTime::currentTime();
d->lastSpeedCalculationBytes = 0;
d->writingStarted = false;
d->canceled = false;
@@ -345,9 +345,9 @@ void K3bGrowisofsWriter::start()
else {
kdDebug() << "***** " << d->growisofsBin->name() << " 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;
@@ -374,7 +374,7 @@ void K3bGrowisofsWriter::start()
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bGrowisofsWriter) could not start " << d->growisofsBin->path << endl;
- emit infoMessage( i18n("Could not start %1.").arg(d->growisofsBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(d->growisofsBin->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
@@ -394,8 +394,8 @@ void K3bGrowisofsWriter::start()
if( d->usingRingBuffer ) {
if( !d->ringBuffer ) {
d->ringBuffer = new K3bPipeBuffer( this, this );
- connect( d->ringBuffer, SIGNAL(percent(int)), this, SIGNAL(buffer(int)) );
- connect( d->ringBuffer, SIGNAL(finished(bool)), this, SLOT(slotRingBufferFinished(bool)) );
+ connect( d->ringBuffer, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(buffer(int)) );
+ connect( d->ringBuffer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotRingBufferFinished(bool)) );
}
d->ringBuffer->writeToFd( d->process->stdinFd() );
@@ -455,17 +455,17 @@ void K3bGrowisofsWriter::setMultiSession( bool b )
}
-void K3bGrowisofsWriter::setImageToWrite( const QString& filename )
+void K3bGrowisofsWriter::setImageToWrite( const TQString& filename )
{
d->image = filename;
}
-void K3bGrowisofsWriter::slotReceivedStderr( const QString& line )
+void K3bGrowisofsWriter::slotReceivedStderr( const TQString& line )
{
emit debuggingOutput( d->growisofsBin->name(), line );
- if( line.contains( "remaining" ) ) {
+ if( line.tqcontains( "remaining" ) ) {
if( !d->writingStarted ) {
d->writingStarted = true;
@@ -473,10 +473,10 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line )
}
// parse progress
- int pos = line.find( "/" );
+ int pos = line.tqfind( "/" );
unsigned long long done = line.left( pos ).toULongLong();
bool ok = true;
- d->overallSizeFromOutput = line.mid( pos+1, line.find( "(", pos ) - pos - 1 ).toULongLong( &ok );
+ d->overallSizeFromOutput = line.mid( pos+1, line.tqfind( "(", pos ) - pos - 1 ).toULongLong( &ok );
if( d->firstSizeFromOutput == -1 )
d->firstSizeFromOutput = done;
done -= d->firstSizeFromOutput;
@@ -495,10 +495,10 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line )
}
// try parsing write speed (since growisofs 5.11)
- pos = line.find( '@' );
+ pos = line.tqfind( '@' );
if( pos != -1 ) {
pos += 1;
- double speed = line.mid( pos, line.find( 'x', pos ) - pos ).toDouble(&ok);
+ double speed = line.mid( pos, line.tqfind( 'x', pos ) - pos ).toDouble(&ok);
if( ok ) {
if( d->lastWritingSpeed != speed )
emit writeSpeed( (int)(speed*1385.0), 1385 );
@@ -506,7 +506,7 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line )
}
else
kdDebug() << "(K3bGrowisofsWriter) speed parsing failed: '"
- << line.mid( pos, line.find( 'x', pos ) - pos ) << "'" << endl;
+ << line.mid( pos, line.tqfind( 'x', pos ) - pos ) << "'" << endl;
}
else {
d->speedEst->dataWritten( done/1024 );
@@ -514,7 +514,7 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line )
}
else
kdDebug() << "(K3bGrowisofsWriter) progress parsing failed: '"
- << line.mid( pos+1, line.find( "(", pos ) - pos - 1 ).stripWhiteSpace() << "'" << endl;
+ << line.mid( pos+1, line.tqfind( "(", pos ) - pos - 1 ).stripWhiteSpace() << "'" << endl;
}
// else
@@ -551,7 +551,7 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p )
int s = d->speedEst->average();
if( s > 0 )
emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)")
- .arg(s).arg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO );
+ .tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO );
if( simulate() )
emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS );
@@ -571,9 +571,9 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p )
else {
emit newSubTask( i18n("Ejecting DVD") );
connect( K3bDevice::eject( burnDevice() ),
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
- SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) );
+ TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) );
}
}
@@ -616,7 +616,7 @@ void K3bGrowisofsWriter::slotFlushingCache()
}
-void K3bGrowisofsWriter::setMultiSessionInfo( const QString& info )
+void K3bGrowisofsWriter::setMultiSessionInfo( const TQString& info )
{
d->multiSessionInfo = info;
}
diff --git a/libk3b/projects/k3bgrowisofswriter.h b/libk3b/projects/k3bgrowisofswriter.h
index ed69923..b65b894 100644
--- a/libk3b/projects/k3bgrowisofswriter.h
+++ b/libk3b/projects/k3bgrowisofswriter.h
@@ -30,10 +30,11 @@ class KProcess;
class K3bGrowisofsWriter : public K3bAbstractWriter
{
Q_OBJECT
+ TQ_OBJECT
public:
K3bGrowisofsWriter( K3bDevice::Device*, K3bJobHandler*,
- QObject* parent = 0, const char* name = 0 );
+ TQObject* tqparent = 0, const char* name = 0 );
~K3bGrowisofsWriter();
bool active() const;
@@ -74,16 +75,16 @@ class K3bGrowisofsWriter : public K3bAbstractWriter
void setCloseDvd( bool );
/**
- * set this to QString::null or an empty string to let the writer
+ * set this to TQString() or an empty string to let the writer
* read it's data from fd()
*/
- void setImageToWrite( const QString& );
+ void setImageToWrite( const TQString& );
/**
* While reading the image from stdin growisofs needs
* a valid -C parameter for multisession.
*/
- void setMultiSessionInfo( const QString& );
+ void setMultiSessionInfo( const TQString& );
void setForceNoEject( bool );
@@ -91,7 +92,7 @@ class K3bGrowisofsWriter : public K3bAbstractWriter
bool prepareProcess();
protected slots:
- void slotReceivedStderr( const QString& );
+ void slotReceivedStderr( const TQString& );
void slotProcessExited( KProcess* );
void slotEjectingFinished( K3bDevice::DeviceHandler* dh );
void slotThroughput( int t );
diff --git a/libk3b/projects/k3bimagefilereader.cpp b/libk3b/projects/k3bimagefilereader.cpp
index 70ece16..76d8e92 100644
--- a/libk3b/projects/k3bimagefilereader.cpp
+++ b/libk3b/projects/k3bimagefilereader.cpp
@@ -15,8 +15,8 @@
#include "k3bimagefilereader.h"
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kdebug.h>
@@ -29,8 +29,8 @@ public:
: isValid(false) {
}
- QString filename;
- QString imageFilename;
+ TQString filename;
+ TQString imageFilename;
bool isValid;
};
@@ -47,10 +47,10 @@ K3bImageFileReader::~K3bImageFileReader()
}
-void K3bImageFileReader::openFile( const QString& filename )
+void K3bImageFileReader::openFile( const TQString& filename )
{
d->filename = filename;
- d->imageFilename = QString::null;
+ d->imageFilename = TQString();
setValid(false);
if( !filename.isEmpty() )
@@ -64,7 +64,7 @@ void K3bImageFileReader::setValid( bool b )
}
-void K3bImageFileReader::setImageFilename( const QString& filename )
+void K3bImageFileReader::setImageFilename( const TQString& filename )
{
d->imageFilename = filename;
}
@@ -76,13 +76,13 @@ bool K3bImageFileReader::isValid() const
}
-const QString& K3bImageFileReader::filename() const
+const TQString& K3bImageFileReader::filename() const
{
return d->filename;
}
-const QString& K3bImageFileReader::imageFilename() const
+const TQString& K3bImageFileReader::imageFilename() const
{
return d->imageFilename;
}
diff --git a/libk3b/projects/k3bimagefilereader.h b/libk3b/projects/k3bimagefilereader.h
index 2bf727e..aca0fc5 100644
--- a/libk3b/projects/k3bimagefilereader.h
+++ b/libk3b/projects/k3bimagefilereader.h
@@ -16,7 +16,7 @@
#ifndef _K3B_IMAGE_FILE_READER_H_
#define _K3B_IMAGE_FILE_READER_H_
-#include <qstring.h>
+#include <tqstring.h>
#include "k3b_export.h"
class LIBK3B_EXPORT K3bImageFileReader
@@ -28,24 +28,24 @@ class LIBK3B_EXPORT K3bImageFileReader
/**
* Open a file. In most cases the TOC file
*/
- void openFile( const QString& filename );
+ void openFile( const TQString& filename );
virtual bool isValid() const;
/**
* Return the current set filename;
*/
- const QString& filename() const;
+ const TQString& filename() const;
/**
* returns the name of the corresponding image file.
*/
- virtual const QString& imageFilename() const;
+ virtual const TQString& imageFilename() const;
protected:
virtual void readFile() = 0;
void setValid( bool );
- void setImageFilename( const QString& );
+ void setImageFilename( const TQString& );
private:
class Private;
diff --git a/libk3b/projects/k3binffilewriter.cpp b/libk3b/projects/k3binffilewriter.cpp
index 9395b2a..ecfb912 100644
--- a/libk3b/projects/k3binffilewriter.cpp
+++ b/libk3b/projects/k3binffilewriter.cpp
@@ -21,9 +21,9 @@
#include <k3bcore.h>
#include <k3bversion.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qdatetime.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqdatetime.h>
@@ -39,28 +39,28 @@ K3bInfFileWriter::K3bInfFileWriter()
}
-bool K3bInfFileWriter::save( const QString& filename )
+bool K3bInfFileWriter::save( const TQString& filename )
{
- QFile f( filename );
+ TQFile f( filename );
if( !f.open( IO_WriteOnly ) ) {
kdDebug() << "(K3bInfFileWriter) could not open file " << f.name() << endl;
return false;
}
- QTextStream s( &f );
+ TQTextStream s( &f );
return save( s );
}
-bool K3bInfFileWriter::save( QTextStream& s )
+bool K3bInfFileWriter::save( TQTextStream& s )
{
// now write the inf data
// ----------------------
// header
s << "# Cdrecord-Inf-File written by K3b " << k3bcore->version()
- << ", " << QDateTime::currentDateTime().toString() << endl
+ << ", " << TQDateTime::tqcurrentDateTime().toString() << endl
<< "#" << endl;
s << "ISRC=\t\t" << m_isrc << endl;
@@ -130,7 +130,7 @@ bool K3bInfFileWriter::save( QTextStream& s )
s << "Index0=\t\t" << m_index0 << endl;
- return ( s.device()->status() == IO_Ok );
+ return ( s.tqdevice()->status() == IO_Ok );
}
@@ -141,7 +141,7 @@ void K3bInfFileWriter::setTrack( const K3bDevice::Track& track )
// the first index always has to be a zero (cdrecord manpage)
m_indices.append( 0 );
- const QValueVector<K3b::Msf>& indexList = track.indices();
+ const TQValueVector<K3b::Msf>& indexList = track.indices();
for( unsigned int i = 0; i < indexList.count(); ++i )
m_indices.append( indexList[i].lba() );
diff --git a/libk3b/projects/k3binffilewriter.h b/libk3b/projects/k3binffilewriter.h
index 74e23e4..93164ed 100644
--- a/libk3b/projects/k3binffilewriter.h
+++ b/libk3b/projects/k3binffilewriter.h
@@ -16,8 +16,8 @@
#ifndef _K3B_INF_FILE_WRITER_H_
#define _K3B_INF_FILE_WRITER_H_
-#include <qvaluevector.h>
-#include <qtextstream.h>
+#include <tqvaluevector.h>
+#include <tqtextstream.h>
#include <k3bmsf.h>
@@ -34,8 +34,8 @@ class K3bInfFileWriter
public:
K3bInfFileWriter();
- bool save( QTextStream& );
- bool save( const QString& filename );
+ bool save( TQTextStream& );
+ bool save( const TQString& filename );
/**
* Use this to set:
@@ -76,24 +76,24 @@ class K3bInfFileWriter
void setBigEndian( bool b ) { m_bigEndian = b; }
void setTrackCdText( const K3bDevice::TrackCdText& );
- void setTrackTitle( const QString& s ) { m_trackTitle = s; }
- void setTrackPerformer( const QString& s ) { m_trackPerformer = s; }
- void setTrackSongwriter( const QString& s ) { m_trackSongwriter = s; }
- void setTrackComposer( const QString& s ) { m_trackComposer = s; }
- void setTrackArranger( const QString& s ) { m_trackArranger = s; }
- void setTrackMessage( const QString& s ) { m_trackMessage = s; }
+ void setTrackTitle( const TQString& s ) { m_trackTitle = s; }
+ void setTrackPerformer( const TQString& s ) { m_trackPerformer = s; }
+ void setTrackSongwriter( const TQString& s ) { m_trackSongwriter = s; }
+ void setTrackComposer( const TQString& s ) { m_trackComposer = s; }
+ void setTrackArranger( const TQString& s ) { m_trackArranger = s; }
+ void setTrackMessage( const TQString& s ) { m_trackMessage = s; }
void setCdText( const K3bDevice::CdText& );
- void setAlbumTitle( const QString& s ) { m_albumTitle = s; }
- void setAlbumPerformer( const QString& s ) { m_albumPerformer = s; }
+ void setAlbumTitle( const TQString& s ) { m_albumTitle = s; }
+ void setAlbumPerformer( const TQString& s ) { m_albumPerformer = s; }
- void setIsrc( const QCString& s ) { m_isrc = s; }
- void setMcn( const QCString& s ) { m_mcn = s; }
+ void setIsrc( const TQCString& s ) { m_isrc = s; }
+ void setMcn( const TQCString& s ) { m_mcn = s; }
private:
long m_index0;
- QValueVector<long> m_indices;
+ TQValueVector<long> m_indices;
int m_trackNumber;
K3b::Msf m_trackStart;
@@ -102,18 +102,18 @@ class K3bInfFileWriter
bool m_copyPermitted;
bool m_bigEndian;
- QString m_trackTitle;
- QString m_trackPerformer;
- QString m_trackSongwriter;
- QString m_trackComposer;
- QString m_trackArranger;
- QString m_trackMessage;
+ TQString m_trackTitle;
+ TQString m_trackPerformer;
+ TQString m_trackSongwriter;
+ TQString m_trackComposer;
+ TQString m_trackArranger;
+ TQString m_trackMessage;
- QString m_albumTitle;
- QString m_albumPerformer;
+ TQString m_albumTitle;
+ TQString m_albumPerformer;
- QCString m_isrc;
- QCString m_mcn;
+ TQCString m_isrc;
+ TQCString m_mcn;
};
#endif
diff --git a/libk3b/projects/k3bpipebuffer.cpp b/libk3b/projects/k3bpipebuffer.cpp
index 3b61116..4dbfd38 100644
--- a/libk3b/projects/k3bpipebuffer.cpp
+++ b/libk3b/projects/k3bpipebuffer.cpp
@@ -115,7 +115,7 @@ public:
//
// wait for data
//
- int ret = select( QMAX(usedInFd, outFd) + 1, &readFds, &writeFds, NULL, NULL);
+ int ret = select( TQMAX(usedInFd, outFd) + 1, &readFds, &writeFds, NULL, NULL);
//
// Do the buffering
@@ -128,7 +128,7 @@ public:
// Read from the buffer and write to the output
//
if( FD_ISSET(outFd, &writeFds) ) {
- unsigned int maxLen = QMIN(bufSize - bufPos, dataLen);
+ unsigned int maxLen = TQMIN(bufSize - bufPos, dataLen);
ret = ::write( outFd, &buffer[bufPos], maxLen );
@@ -155,7 +155,7 @@ public:
//
else if( FD_ISSET(usedInFd, &readFds) ) {
unsigned int readPos = (bufPos + dataLen) % bufSize;
- unsigned int maxLen = QMIN(bufSize - readPos, bufSize - dataLen);
+ unsigned int maxLen = TQMIN(bufSize - readPos, bufSize - dataLen);
//
// never read more than xxx bytes
// This is some tuning to prevent the reading from blocking the whole thread
@@ -221,8 +221,8 @@ public:
};
-K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bThreadJob( jh, parent, name )
+K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bThreadJob( jh, tqparent, name )
{
m_thread = new WorkThread();
setThread( m_thread );
diff --git a/libk3b/projects/k3bpipebuffer.h b/libk3b/projects/k3bpipebuffer.h
index 6aae368..7f6ad1b 100644
--- a/libk3b/projects/k3bpipebuffer.h
+++ b/libk3b/projects/k3bpipebuffer.h
@@ -25,7 +25,7 @@
class K3bPipeBuffer : public K3bThreadJob
{
public:
- K3bPipeBuffer( K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bPipeBuffer( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bPipeBuffer();
/**
diff --git a/libk3b/projects/k3btocfilewriter.cpp b/libk3b/projects/k3btocfilewriter.cpp
index 77662d6..249ef84 100644
--- a/libk3b/projects/k3btocfilewriter.cpp
+++ b/libk3b/projects/k3btocfilewriter.cpp
@@ -20,9 +20,9 @@
#include <k3bcore.h>
#include <k3bversion.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qdatetime.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqdatetime.h>
K3bTocFileWriter::K3bTocFileWriter()
@@ -32,22 +32,22 @@ K3bTocFileWriter::K3bTocFileWriter()
}
-bool K3bTocFileWriter::save( const QString& filename )
+bool K3bTocFileWriter::save( const TQString& filename )
{
- QFile f( filename );
+ TQFile f( filename );
if( !f.open( IO_WriteOnly ) ) {
kdDebug() << "(K3bCueFileWriter) could not open file " << f.name() << endl;
return false;
}
- QTextStream s( &f );
+ TQTextStream s( &f );
return save( s );
}
-bool K3bTocFileWriter::save( QTextStream& t )
+bool K3bTocFileWriter::save( TQTextStream& t )
{
writeHeader(t);
@@ -149,15 +149,15 @@ bool K3bTocFileWriter::save( QTextStream& t )
trackIndex++;
}
- return ( t.device()->status() == IO_Ok );
+ return ( t.tqdevice()->status() == IO_Ok );
}
-void K3bTocFileWriter::writeHeader( QTextStream& t )
+void K3bTocFileWriter::writeHeader( TQTextStream& t )
{
// little comment
t << "// TOC-file to use with cdrdao created by K3b " << k3bcore->version()
- << ", " << QDateTime::currentDateTime().toString() << endl << endl;
+ << ", " << TQDateTime::tqcurrentDateTime().toString() << endl << endl;
t << "// " << m_toc.count() << " tracks" << endl;
if( m_toc.back().session() > 0 ) {
@@ -193,7 +193,7 @@ void K3bTocFileWriter::writeHeader( QTextStream& t )
}
-void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, QTextStream& t )
+void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, TQTextStream& t )
{
const K3bDevice::Track& track = m_toc[index];
@@ -305,7 +305,7 @@ void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, Q
}
-void K3bTocFileWriter::writeGlobalCdText( QTextStream& t )
+void K3bTocFileWriter::writeGlobalCdText( TQTextStream& t )
{
t << "CD_TEXT {" << endl;
t << " LANGUAGE_MAP { 0: EN }" << endl;
@@ -325,7 +325,7 @@ void K3bTocFileWriter::writeGlobalCdText( QTextStream& t )
}
-void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, QTextStream& t )
+void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, TQTextStream& t )
{
t << "CD_TEXT {" << endl;
t << " LANGUAGE 0 {" << endl;
@@ -341,7 +341,7 @@ void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, QT
}
-void K3bTocFileWriter::writeDataSource( unsigned int trackIndex, QTextStream& t )
+void K3bTocFileWriter::writeDataSource( unsigned int trackIndex, TQTextStream& t )
{
if( readFromStdin() )
t << "\"-\" ";
diff --git a/libk3b/projects/k3btocfilewriter.h b/libk3b/projects/k3btocfilewriter.h
index 1c1da47..3127fca 100644
--- a/libk3b/projects/k3btocfilewriter.h
+++ b/libk3b/projects/k3btocfilewriter.h
@@ -16,8 +16,8 @@
#ifndef _K3B_TOC_FILE_WRITER_H_
#define _K3B_TOC_FILE_WRITER_H_
-#include <qtextstream.h>
-#include <qstringlist.h>
+#include <tqtextstream.h>
+#include <tqstringlist.h>
#include <k3btoc.h>
#include <k3bcdtext.h>
@@ -31,12 +31,12 @@ class K3bTocFileWriter
public:
K3bTocFileWriter();
- bool save( QTextStream& );
- bool save( const QString& filename );
+ bool save( TQTextStream& );
+ bool save( const TQString& filename );
void setData( const K3bDevice::Toc& toc ) { m_toc = toc; }
void setCdText( const K3bDevice::CdText& text ) { m_cdText = text; }
- void setFilenames( const QStringList& names ) { m_filenames = names; }
+ void setFilenames( const TQStringList& names ) { m_filenames = names; }
void setHideFirstTrack( bool b ) { m_hideFirstTrack = b; }
/**
@@ -45,16 +45,16 @@ class K3bTocFileWriter
void setSession( int s ) { m_sessionToWrite = s; }
private:
- void writeHeader( QTextStream& t );
- void writeGlobalCdText( QTextStream& t );
- void writeTrackCdText( const K3bDevice::TrackCdText& track, QTextStream& t );
- void writeTrack( unsigned int index, const K3b::Msf& offset, QTextStream& t );
- void writeDataSource( unsigned int trackNumber, QTextStream& t );
+ void writeHeader( TQTextStream& t );
+ void writeGlobalCdText( TQTextStream& t );
+ void writeTrackCdText( const K3bDevice::TrackCdText& track, TQTextStream& t );
+ void writeTrack( unsigned int index, const K3b::Msf& offset, TQTextStream& t );
+ void writeDataSource( unsigned int trackNumber, TQTextStream& t );
bool readFromStdin() const;
K3bDevice::Toc m_toc;
K3bDevice::CdText m_cdText;
- QStringList m_filenames;
+ TQStringList m_filenames;
bool m_hideFirstTrack;
int m_sessionToWrite;
};
diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp
index a2c76b0..2160581 100644
--- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp
+++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp
@@ -21,8 +21,8 @@
#include <k3bglobals.h>
#include <k3bmsf.h>
-#include <qfileinfo.h>
-#include <qdom.h>
+#include <tqfileinfo.h>
+#include <tqdom.h>
#include <klocale.h>
#include <kconfig.h>
@@ -31,16 +31,16 @@
-K3bMixedDoc::K3bMixedDoc( QObject* parent )
- : K3bDoc( parent )
+K3bMixedDoc::K3bMixedDoc( TQObject* tqparent )
+ : K3bDoc( tqparent )
{
m_dataDoc = new K3bDataDoc( this );
m_audioDoc = new K3bAudioDoc( this );
- connect( m_dataDoc, SIGNAL(changed()),
- this, SIGNAL(changed()) );
- connect( m_audioDoc, SIGNAL(changed()),
- this, SIGNAL(changed()) );
+ connect( m_dataDoc, TQT_SIGNAL(changed()),
+ this, TQT_SIGNAL(changed()) );
+ connect( m_audioDoc, TQT_SIGNAL(changed()),
+ this, TQT_SIGNAL(changed()) );
}
@@ -58,7 +58,7 @@ bool K3bMixedDoc::newDocument()
}
-QString K3bMixedDoc::name() const
+TQString K3bMixedDoc::name() const
{
return m_dataDoc->name();
}
@@ -102,9 +102,9 @@ int K3bMixedDoc::numOfTracks() const
}
-K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent )
+K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
{
- return new K3bMixedJob( this, hdl, parent );
+ return new K3bMixedJob( this, hdl, tqparent );
}
@@ -114,9 +114,9 @@ void K3bMixedDoc::addUrls( const KURL::List& urls )
}
-bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem )
+bool K3bMixedDoc::loadDocumentData( TQDomElement* rootElem )
{
- QDomNodeList nodes = rootElem->childNodes();
+ TQDomNodeList nodes = rootElem->childNodes();
if( nodes.length() < 4 )
return false;
@@ -128,23 +128,23 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem )
if( nodes.item(1).nodeName() != "audio" )
return false;
- QDomElement audioElem = nodes.item(1).toElement();
+ TQDomElement audioElem = nodes.item(1).toElement();
if( !m_audioDoc->loadDocumentData( &audioElem ) )
return false;
if( nodes.item(2).nodeName() != "data" )
return false;
- QDomElement dataElem = nodes.item(2).toElement();
+ TQDomElement dataElem = nodes.item(2).toElement();
if( !m_dataDoc->loadDocumentData( &dataElem ) )
return false;
if( nodes.item(3).nodeName() != "mixed" )
return false;
- QDomNodeList optionList = nodes.item(3).childNodes();
+ TQDomNodeList optionList = nodes.item(3).childNodes();
for( uint i = 0; i < optionList.count(); i++ ) {
- QDomElement e = optionList.item(i).toElement();
+ TQDomElement e = optionList.item(i).toElement();
if( e.isNull() )
return false;
@@ -153,7 +153,7 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem )
else if( e.nodeName() == "image_path" )
setTempDir( e.toElement().text() );
else if( e.nodeName() == "mixed_type" ) {
- QString mt = e.toElement().text();
+ TQString mt = e.toElement().text();
if( mt == "last_track" )
setMixedType( DATA_LAST_TRACK );
else if( mt == "second_session" )
@@ -167,31 +167,31 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem )
}
-bool K3bMixedDoc::saveDocumentData( QDomElement* docElem )
+bool K3bMixedDoc::saveDocumentData( TQDomElement* docElem )
{
- QDomDocument doc = docElem->ownerDocument();
+ TQDomDocument doc = docElem->ownerDocument();
saveGeneralDocumentData( docElem );
- QDomElement audioElem = doc.createElement( "audio" );
+ TQDomElement audioElem = doc.createElement( "audio" );
m_audioDoc->saveDocumentData( &audioElem );
docElem->appendChild( audioElem );
- QDomElement dataElem = doc.createElement( "data" );
+ TQDomElement dataElem = doc.createElement( "data" );
m_dataDoc->saveDocumentData( &dataElem );
docElem->appendChild( dataElem );
- QDomElement mixedElem = doc.createElement( "mixed" );
+ TQDomElement mixedElem = doc.createElement( "mixed" );
docElem->appendChild( mixedElem );
- QDomElement bufferFilesElem = doc.createElement( "remove_buffer_files" );
+ TQDomElement bufferFilesElem = doc.createElement( "remove_buffer_files" );
bufferFilesElem.appendChild( doc.createTextNode( removeImages() ? "yes" : "no" ) );
mixedElem.appendChild( bufferFilesElem );
- QDomElement imagePathElem = doc.createElement( "image_path" );
+ TQDomElement imagePathElem = doc.createElement( "image_path" );
imagePathElem.appendChild( doc.createTextNode( tempDir() ) );
mixedElem.appendChild( imagePathElem );
- QDomElement mixedTypeElem = doc.createElement( "mixed_type" );
+ TQDomElement mixedTypeElem = doc.createElement( "mixed_type" );
switch( mixedType() ) {
case DATA_FIRST_TRACK:
mixedTypeElem.appendChild( doc.createTextNode( "first_track" ) );
diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h
index 7d71b39..b4ebc07 100644
--- a/libk3b/projects/mixedcd/k3bmixeddoc.h
+++ b/libk3b/projects/mixedcd/k3bmixeddoc.h
@@ -22,23 +22,24 @@
#include <k3btoc.h>
#include "k3b_export.h"
-class QDomDocument;
-class QDomElement;
+class TQDomDocument;
+class TQDomElement;
class K3bBurnJob;
//class K3bView;
-class QWidget;
+class TQWidget;
class KConfig;
class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMixedDoc( QObject* parent = 0 );
+ K3bMixedDoc( TQObject* tqparent = 0 );
~K3bMixedDoc();
- QString name() const;
+ TQString name() const;
bool newDocument();
@@ -50,7 +51,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc
int numOfTracks() const;
- K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 );
+ K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 );
K3bAudioDoc* audioDoc() const { return m_audioDoc; }
K3bDataDoc* dataDoc() const { return m_dataDoc; }
@@ -80,9 +81,9 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc
void addUrls( const KURL::List& urls );
protected:
- bool loadDocumentData( QDomElement* );
- bool saveDocumentData( QDomElement* );
- QString typeString() const { return "mixed"; }
+ bool loadDocumentData( TQDomElement* );
+ bool saveDocumentData( TQDomElement* );
+ TQString typeString() const { return "mixed"; }
private:
K3bDataDoc* m_dataDoc;
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp
index a4be92c..8fbe2ff 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.cpp
+++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp
@@ -43,9 +43,9 @@
#include <k3bglobalsettings.h>
#include <k3baudiofile.h>
-#include <qfile.h>
-#include <qdatastream.h>
-#include <qapplication.h>
+#include <tqfile.h>
+#include <tqdatastream.h>
+#include <tqapplication.h>
#include <kdebug.h>
#include <klocale.h>
@@ -55,11 +55,11 @@
#include <kstringhandler.h>
-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 );
@@ -95,31 +95,31 @@ public:
};
-K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, QObject* parent )
- : K3bBurnJob( hdl, parent ),
+K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, TQObject* tqparent )
+ : K3bBurnJob( hdl, tqparent ),
m_doc( doc ),
m_normalizeJob(0)
{
d = new Private;
m_isoImager = new K3bIsoImager( doc->dataDoc(), this, 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&)) );
m_audioImager = new K3bAudioImager( doc->audioDoc(), 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_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, 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)) );
m_writer = 0;
m_tocFile = 0;
@@ -168,13 +168,13 @@ void K3bMixedJob::start()
//
// Check if all files exist
//
- QValueList<K3bAudioFile*> nonExistingFiles;
+ TQValueList<K3bAudioFile*> nonExistingFiles;
K3bAudioTrack* track = m_doc->audioDoc()->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();
@@ -188,7 +188,7 @@ void K3bMixedJob::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;
}
@@ -226,7 +226,7 @@ void K3bMixedJob::start()
// we do not have msinfo yet
m_currentAction = INITIALIZING_IMAGER;
- m_isoImager->setMultiSessionInfo( QString::null );
+ m_isoImager->setMultiSessionInfo( TQString() );
m_isoImager->init();
}
@@ -251,10 +251,10 @@ void K3bMixedJob::startFirstCopy()
// the maxspeed job gets the device from the doc:
m_doc->audioDoc()->setBurner( m_doc->burner() );
d->maxSpeedJob = new K3bAudioMaxSpeedJob( m_doc->audioDoc(), this, this );
- connect( d->maxSpeedJob, SIGNAL(percent(int)),
- this, SIGNAL(subPercent(int)) );
- connect( d->maxSpeedJob, SIGNAL(finished(bool)),
- this, SLOT(slotMaxSpeedJobFinished(bool)) );
+ connect( d->maxSpeedJob, TQT_SIGNAL(percent(int)),
+ this, TQT_SIGNAL(subPercent(int)) );
+ connect( d->maxSpeedJob, TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(slotMaxSpeedJobFinished(bool)) );
}
d->maxSpeedJob->start();
}
@@ -271,7 +271,7 @@ void K3bMixedJob::startFirstCopy()
else {
emit burning(false);
- emit infoMessage( i18n("Creating audio image files in %1").arg(m_doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating audio image files in %1").tqarg(m_doc->tempDir()), INFO );
m_tempFilePrefix = K3b::findUniqueFilePrefix( ( !m_doc->audioDoc()->title().isEmpty()
? m_doc->audioDoc()->title()
@@ -279,7 +279,7 @@ void K3bMixedJob::startFirstCopy()
m_doc->tempDir() );
m_tempData->prepareTempFileNames( m_doc->tempDir() );
- QStringList filenames;
+ TQStringList filenames;
for( K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); track; track = track->next() )
filenames += m_tempData->bufferFileName( track );
m_audioImager->setImageFilenames( filenames );
@@ -374,9 +374,9 @@ void K3bMixedJob::slotMsInfoFetched( bool success )
if( m_usedDataWritingApp == K3b::CDRECORD )
m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo() );
else // 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) );
+ m_isoImager->setMultiSessionInfo( TQString("%1,%2")
+ .tqarg(m_msInfoFetcher->lastSessionStart())
+ .tqarg(m_msInfoFetcher->nextSessionStart()+150) );
if( m_doc->onTheFly() ) {
m_currentAction = PREPARING_DATA;
@@ -510,8 +510,8 @@ void K3bMixedJob::slotWriterFinished( bool success )
// reload the media (as a subtask so the user does not see the "Flushing cache" or "Fixating" messages while
// doing so
emit newSubTask( i18n("Reloading the medium") );
- connect( K3bDevice::reload( m_doc->burner() ), SIGNAL(finished(bool)),
- this, SLOT(slotMediaReloadedForSecondSession(bool)) );
+ connect( K3bDevice::reload( m_doc->burner() ), TQT_SIGNAL(finished(bool)),
+ this, TQT_SLOT(slotMediaReloadedForSecondSession(bool)) );
}
else {
d->copiesDone++;
@@ -611,10 +611,10 @@ void K3bMixedJob::slotAudioDecoderNextTrack( int t, int tt )
if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) {
K3bAudioTrack* track = m_doc->audioDoc()->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() + ")" ) );
}
}
@@ -690,20 +690,20 @@ bool K3bMixedJob::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;
}
@@ -734,11 +734,11 @@ bool K3bMixedJob::writeTocFile()
// FIXME: create the tocfile in the same directory like all the other files.
if( m_tocFile ) delete m_tocFile;
- m_tocFile = new KTempFile( QString::null, "toc" );
+ m_tocFile = new KTempFile( TQString(), "toc" );
m_tocFile->setAutoDelete(true);
// write the toc-file
- if( QTextStream* s = m_tocFile->textStream() ) {
+ if( TQTextStream* s = m_tocFile->textStream() ) {
K3bTocFileWriter tocFileWriter;
@@ -774,7 +774,7 @@ bool K3bMixedJob::writeTocFile()
// image filenames
//
if( !m_doc->onTheFly() ) {
- QStringList files;
+ TQStringList files;
K3bAudioTrack* track = m_doc->audioDoc()->firstTrack();
while( track ) {
files += m_tempData->bufferFileName( track );
@@ -827,10 +827,10 @@ void K3bMixedJob::addAudioTracks( K3bCdrecordWriter* writer )
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();
}
@@ -850,7 +850,7 @@ void K3bMixedJob::addDataTrack( K3bCdrecordWriter* writer )
writer->addArgument( "-data" );
if( m_doc->onTheFly() )
- writer->addArgument( QString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-");
+ writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-");
else
writer->addArgument( m_isoImageFilePath );
}
@@ -875,13 +875,13 @@ void K3bMixedJob::slotWriterNextTrack( int t, int )
if( track )
emit newSubTask( i18n("Writing track %1 of %2%3")
- .arg(t)
- .arg(m_doc->numOfTracks())
- .arg( track->title().isEmpty() || track->artist().isEmpty()
- ? QString::null
+ .tqarg(t)
+ .tqarg(m_doc->numOfTracks())
+ .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ ? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
else
- emit newSubTask( i18n("Writing track %1 of %2 (%3)").arg(t).arg(m_doc->numOfTracks()).arg(i18n("ISO9660 data")) );
+ emit newSubTask( i18n("Writing track %1 of %2 (%3)").tqarg(t).tqarg(m_doc->numOfTracks()).tqarg(i18n("ISO9660 data")) );
}
@@ -989,7 +989,7 @@ bool K3bMixedJob::startWriting()
if( m_doc->dummy() )
emit newTask( i18n("Simulating second session") );
else if( d->copies > 1 )
- emit newTask( i18n("Writing second session of copy %1").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing second session of copy %1").tqarg(d->copiesDone+1) );
else
emit newTask( i18n("Writing second session") );
}
@@ -997,7 +997,7 @@ bool K3bMixedJob::startWriting()
if( m_doc->dummy() )
emit newTask( i18n("Simulating first session") );
else if( d->copies > 1 )
- emit newTask( i18n("Writing first session of copy %1").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing first session of copy %1").tqarg(d->copiesDone+1) );
else
emit newTask( i18n("Writing first session") );
}
@@ -1005,7 +1005,7 @@ bool K3bMixedJob::startWriting()
else if( m_doc->dummy() )
emit newTask( i18n("Simulating") );
else
- emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) );
// if we append the second session the cd is already in the drive
@@ -1070,8 +1070,8 @@ void K3bMixedJob::createIsoImage()
if( !m_doc->onTheFly() )
emit newTask( i18n("Creating ISO image file") );
- emit newSubTask( i18n("Creating ISO image in %1").arg(m_isoImageFilePath) );
- emit infoMessage( i18n("Creating ISO image in %1").arg(m_isoImageFilePath), INFO );
+ emit newSubTask( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath) );
+ emit infoMessage( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath), INFO );
m_isoImager->writeToImageFile( m_isoImageFilePath );
m_isoImager->start();
@@ -1100,9 +1100,9 @@ void K3bMixedJob::removeBufferFiles()
emit infoMessage( i18n("Removing buffer files."), INFO );
}
- if( QFile::exists( m_isoImageFilePath ) )
- if( !QFile::remove( m_isoImageFilePath ) )
- emit infoMessage( i18n("Could not delete file %1.").arg(m_isoImageFilePath), ERROR );
+ if( TQFile::exists( m_isoImageFilePath ) )
+ if( !TQFile::remove( m_isoImageFilePath ) )
+ emit infoMessage( i18n("Could not delete file %1.").tqarg(m_isoImageFilePath), ERROR );
// removes buffer images and temp toc or inf files
m_tempData->cleanup();
@@ -1213,7 +1213,7 @@ void K3bMixedJob::determineWritingMode()
if( m_doc->audioDoc()->cdText() ) {
if( !cdrecordCdText ) {
m_doc->audioDoc()->writeCdText( false );
- emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
+ emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
}
else if( m_usedAudioWritingMode == K3b::TAO ) {
emit infoMessage( i18n("It is not possible to write CD-Text in TAO mode. Try DAO or RAW."), WARNING );
@@ -1228,18 +1228,18 @@ void K3bMixedJob::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
- QValueVector<QString> files;
+ TQValueVector<TQString> files;
K3bAudioTrack* track = m_doc->audioDoc()->firstTrack();
while( track ) {
files.append( m_tempData->bufferFileName(track) );
@@ -1310,30 +1310,30 @@ void K3bMixedJob::prepareProgressInformation()
}
-QString K3bMixedJob::jobDescription() const
+TQString K3bMixedJob::jobDescription() const
{
if( m_doc->mixedType() == K3bMixedDoc::DATA_SECOND_SESSION )
return i18n("Writing Enhanced Audio CD")
+ ( m_doc->audioDoc()->title().isEmpty()
- ? QString::null
- : QString( " (%1)" ).arg(m_doc->audioDoc()->title()) );
+ ? TQString()
+ : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) );
else
return i18n("Writing Mixed Mode CD")
+ ( m_doc->audioDoc()->title().isEmpty()
- ? QString::null
- : QString( " (%1)" ).arg(m_doc->audioDoc()->title()) );
+ ? TQString()
+ : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) );
}
-QString K3bMixedJob::jobDetails() const
+TQString K3bMixedJob::jobDetails() const
{
return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)")
- .arg(m_doc->numOfTracks())
- .arg(m_doc->audioDoc()->length().toString())
- .arg(KIO::convertSize(m_doc->dataDoc()->size()))
+ .tqarg(m_doc->numOfTracks())
+ .tqarg(m_doc->audioDoc()->length().toString())
+ .tqarg(KIO::convertSize(m_doc->dataDoc()->size()))
+ ( m_doc->copies() > 1 && !m_doc->dummy()
? i18n(" - %n copy", " - %n copies", m_doc->copies())
- : QString::null ) );
+ : TQString() ) );
}
#include "k3bmixedjob.moc"
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.h b/libk3b/projects/mixedcd/k3bmixedjob.h
index 50a1dc7..a00a0ce 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.h
+++ b/libk3b/projects/mixedcd/k3bmixedjob.h
@@ -23,8 +23,8 @@
class K3bMixedDoc;
class K3bIsoImager;
class K3bAudioImager;
-class QFile;
-class QDataStream;
+class TQFile;
+class TQDataStream;
class K3bAbstractWriter;
class K3bWaveFileWriter;
class KTempFile;
@@ -40,16 +40,17 @@ class K3bDevice::Device;
class K3bMixedJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, QObject* parent = 0 );
+ K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, TQObject* tqparent = 0 );
~K3bMixedJob();
K3bDoc* doc() const;
K3bDevice::Device* writer() const;
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void cancel();
@@ -109,7 +110,7 @@ class K3bMixedJob : public K3bBurnJob
K3bMsInfoFetcher* m_msInfoFetcher;
K3bAudioNormalizeJob* m_normalizeJob;
- QString m_isoImageFilePath;
+ TQString m_isoImageFilePath;
KTempFile* m_tocFile;
@@ -133,7 +134,7 @@ class K3bMixedJob : public K3bBurnJob
int m_usedDataWritingMode;
int m_usedAudioWritingMode;
- QString m_tempFilePrefix;
+ TQString m_tempFilePrefix;
K3b::Msf m_projectSize;
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp
index f7b2198..5b5ea82 100644
--- a/libk3b/projects/movixcd/k3bmovixdoc.cpp
+++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp
@@ -30,15 +30,15 @@
#include <kconfig.h>
#include <kapplication.h>
-#include <qdom.h>
-#include <qfileinfo.h>
+#include <tqdom.h>
+#include <tqfileinfo.h>
-K3bMovixDoc::K3bMovixDoc( QObject* parent )
- : K3bDataDoc( parent )
+K3bMovixDoc::K3bMovixDoc( TQObject* tqparent )
+ : K3bDataDoc( tqparent )
{
- connect( this, SIGNAL(itemRemoved(K3bDataItem*)),
- this, SLOT(slotDataItemRemoved(K3bDataItem*)) );
+ connect( this, TQT_SIGNAL(itemRemoved(K3bDataItem*)),
+ this, TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) );
}
@@ -47,9 +47,9 @@ K3bMovixDoc::~K3bMovixDoc()
}
-K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent )
+K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
{
- return new K3bMovixJob( this, hdl, parent );
+ return new K3bMovixJob( this, hdl, tqparent );
}
@@ -79,11 +79,11 @@ void K3bMovixDoc::addMovixFile( const KURL& _url, int pos )
{
KURL url = K3b::convertToLocalUrl( _url );
- QFileInfo f( url.path() );
+ TQFileInfo f( url.path() );
if( !f.isFile() || !url.isLocalFile() )
return;
- QString newName = f.fileName();
+ TQString newName = f.fileName();
if( nameAlreadyInDir( newName, root() ) ) {
kapp->config()->setGroup("Data project settings");
bool dropDoubles = kapp->config()->readBoolEntry( "Drop doubles", false );
@@ -113,15 +113,15 @@ void K3bMovixDoc::addMovixFile( const KURL& _url, int pos )
}
-bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
+bool K3bMovixDoc::loadDocumentData( TQDomElement* rootElem )
{
if( !root() )
newDocument();
- QDomNodeList nodes = rootElem->childNodes();
+ TQDomNodeList nodes = rootElem->childNodes();
if( nodes.item(0).nodeName() != "general" ) {
- kdDebug() << "(K3bMovixDoc) could not find 'general' section." << endl;
+ kdDebug() << "(K3bMovixDoc) could not tqfind 'general' section." << endl;
return false;
}
if( !readGeneralDocumentData( nodes.item(0).toElement() ) )
@@ -131,7 +131,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
// parse options
// -----------------------------------------------------------------
if( nodes.item(1).nodeName() != "data_options" ) {
- kdDebug() << "(K3bMovixDoc) could not find 'data_options' section." << endl;
+ kdDebug() << "(K3bMovixDoc) could not tqfind 'data_options' section." << endl;
return false;
}
if( !loadDocumentDataOptions( nodes.item(1).toElement() ) )
@@ -143,7 +143,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
// parse header
// -----------------------------------------------------------------
if( nodes.item(2).nodeName() != "data_header" ) {
- kdDebug() << "(K3bMovixDoc) could not find 'data_header' section." << endl;
+ kdDebug() << "(K3bMovixDoc) could not tqfind 'data_header' section." << endl;
return false;
}
if( !loadDocumentDataHeader( nodes.item(2).toElement() ) )
@@ -155,15 +155,15 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
// parse movix options
// -----------------------------------------------------------------
if( nodes.item(3).nodeName() != "movix_options" ) {
- kdDebug() << "(K3bMovixDoc) could not find 'movix_options' section." << endl;
+ kdDebug() << "(K3bMovixDoc) could not tqfind 'movix_options' section." << endl;
return false;
}
// load the options
- QDomNodeList optionList = nodes.item(3).childNodes();
+ TQDomNodeList optionList = nodes.item(3).childNodes();
for( uint i = 0; i < optionList.count(); i++ ) {
- QDomElement e = optionList.item(i).toElement();
+ TQDomElement e = optionList.item(i).toElement();
if( e.isNull() )
return false;
@@ -186,7 +186,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
else if( e.nodeName() == "keyboard_language")
setKeyboardLayout( e.text() );
else if( e.nodeName() == "codecs")
- setCodecs( QStringList::split( ',', e.text() ) );
+ setCodecs( TQStringList::split( ',', e.text() ) );
else if( e.nodeName() == "default_boot_label")
setDefaultBootLabel( e.text() );
else if( e.nodeName() == "additional_mplayer_options")
@@ -203,15 +203,15 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
// parse files
// -----------------------------------------------------------------
if( nodes.item(4).nodeName() != "movix_files" ) {
- kdDebug() << "(K3bMovixDoc) could not find 'movix_files' section." << endl;
+ kdDebug() << "(K3bMovixDoc) could not tqfind 'movix_files' section." << endl;
return false;
}
// load file items
- QDomNodeList fileList = nodes.item(4).childNodes();
+ TQDomNodeList fileList = nodes.item(4).childNodes();
for( uint i = 0; i < fileList.count(); i++ ) {
- QDomElement e = fileList.item(i).toElement();
+ TQDomElement e = fileList.item(i).toElement();
if( e.isNull() )
return false;
@@ -221,7 +221,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
return false;
}
- QDomElement urlElem = e.firstChild().toElement();
+ TQDomElement urlElem = e.firstChild().toElement();
if( urlElem.isNull() ) {
kdDebug() << "(K3bMovixDoc) found file tag without url child." << endl;
return false;
@@ -235,7 +235,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
m_movixFiles.append( newK3bItem );
// subtitle file?
- QDomElement subTitleElem = e.childNodes().item(1).toElement();
+ TQDomElement subTitleElem = e.childNodes().item(1).toElement();
if( !subTitleElem.isNull() && subTitleElem.nodeName() == "subtitle_file" ) {
urlElem = subTitleElem.firstChild().toElement();
if( urlElem.isNull() ) {
@@ -243,7 +243,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
return false;
}
- QString name = K3bMovixFileItem::subTitleFileName( newK3bItem->k3bName() );
+ TQString name = K3bMovixFileItem::subTitleFileName( newK3bItem->k3bName() );
K3bFileItem* subItem = new K3bFileItem( urlElem.text(), this, root(), name );
newK3bItem->setSubTitleItem( subItem );
}
@@ -262,24 +262,24 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem )
}
-bool K3bMovixDoc::saveDocumentData( QDomElement* docElem )
+bool K3bMovixDoc::saveDocumentData( TQDomElement* docElem )
{
- QDomDocument doc = docElem->ownerDocument();
+ TQDomDocument doc = docElem->ownerDocument();
saveGeneralDocumentData( docElem );
- QDomElement optionsElem = doc.createElement( "data_options" );
+ TQDomElement optionsElem = doc.createElement( "data_options" );
saveDocumentDataOptions( optionsElem );
- QDomElement headerElem = doc.createElement( "data_header" );
+ TQDomElement headerElem = doc.createElement( "data_header" );
saveDocumentDataHeader( headerElem );
- QDomElement movixOptElem = doc.createElement( "movix_options" );
- QDomElement movixFilesElem = doc.createElement( "movix_files" );
+ TQDomElement movixOptElem = doc.createElement( "movix_options" );
+ TQDomElement movixFilesElem = doc.createElement( "movix_files" );
// save the movix options
- QDomElement propElem = doc.createElement( "shutdown" );
+ TQDomElement propElem = doc.createElement( "shutdown" );
propElem.setAttribute( "activated", shutdown() ? "yes" : "no" );
movixOptElem.appendChild( propElem );
@@ -332,22 +332,22 @@ bool K3bMovixDoc::saveDocumentData( QDomElement* docElem )
movixOptElem.appendChild( propElem );
propElem = doc.createElement( "loop_playlist" );
- propElem.appendChild( doc.createTextNode( QString::number(loopPlaylist()) ) );
+ propElem.appendChild( doc.createTextNode( TQString::number(loopPlaylist()) ) );
movixOptElem.appendChild( propElem );
// save the movix items
- for( QPtrListIterator<K3bMovixFileItem> it( m_movixFiles );
+ for( TQPtrListIterator<K3bMovixFileItem> it( m_movixFiles );
*it; ++it ) {
K3bMovixFileItem* item = *it;
- QDomElement topElem = doc.createElement( "file" );
+ TQDomElement topElem = doc.createElement( "file" );
topElem.setAttribute( "name", item->k3bName() );
- QDomElement urlElem = doc.createElement( "url" );
+ TQDomElement urlElem = doc.createElement( "url" );
urlElem.appendChild( doc.createTextNode( item->localPath() ) );
topElem.appendChild( urlElem );
if( item->subTitleItem() ) {
- QDomElement subElem = doc.createElement( "subtitle_file" );
+ TQDomElement subElem = doc.createElement( "subtitle_file" );
urlElem = doc.createElement( "url" );
urlElem.appendChild( doc.createTextNode( item->subTitleItem()->localPath() ) );
subElem.appendChild( urlElem );
@@ -370,7 +370,7 @@ void K3bMovixDoc::slotDataItemRemoved( K3bDataItem* item )
{
// check if it's a movix item
if( K3bMovixFileItem* fi = dynamic_cast<K3bMovixFileItem*>(item) )
- if( m_movixFiles.containsRef( fi ) ) {
+ if( m_movixFiles.tqcontainsRef( fi ) ) {
emit movixItemRemoved( fi );
m_movixFiles.removeRef( fi );
setModified(true);
@@ -380,7 +380,7 @@ void K3bMovixDoc::slotDataItemRemoved( K3bDataItem* item )
int K3bMovixDoc::indexOf( K3bMovixFileItem* item )
{
- return m_movixFiles.findRef(item)+1;
+ return m_movixFiles.tqfindRef(item)+1;
}
@@ -390,12 +390,12 @@ void K3bMovixDoc::moveMovixItem( K3bMovixFileItem* item, K3bMovixFileItem* itemA
return;
// set the current item to track
- m_movixFiles.findRef( item );
+ m_movixFiles.tqfindRef( item );
// take the current item
item = m_movixFiles.take();
- // if after == 0 findRef returnes -1
- int pos = m_movixFiles.findRef( itemAfter );
+ // if after == 0 tqfindRef returnes -1
+ int pos = m_movixFiles.tqfindRef( itemAfter );
m_movixFiles.insert( pos+1, item );
emit newMovixFileItems();
@@ -409,15 +409,15 @@ void K3bMovixDoc::addSubTitleItem( K3bMovixFileItem* item, const KURL& url )
if( item->subTitleItem() )
removeSubTitleItem( item );
- QFileInfo f( url.path() );
+ TQFileInfo f( url.path() );
if( !f.isFile() || !url.isLocalFile() )
return;
// check if there already is a file named like we want to name the subTitle file
- QString name = K3bMovixFileItem::subTitleFileName( item->k3bName() );
+ TQString name = K3bMovixFileItem::subTitleFileName( item->k3bName() );
if( nameAlreadyInDir( name, root() ) ) {
- KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").arg(name) );
+ KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").tqarg(name) );
return;
}
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h
index 53debfc..cd46dbf 100644
--- a/libk3b/projects/movixcd/k3bmovixdoc.h
+++ b/libk3b/projects/movixcd/k3bmovixdoc.h
@@ -20,11 +20,11 @@
#include <k3bdatadoc.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include "k3b_export.h"
//class K3bView;
class KURL;
-class QDomElement;
+class TQDomElement;
class K3bFileItem;
class K3bMovixFileItem;
class K3bDataItem;
@@ -34,18 +34,19 @@ class KConfig;
class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMovixDoc( QObject* parent = 0 );
+ K3bMovixDoc( TQObject* tqparent = 0 );
virtual ~K3bMovixDoc();
virtual int type() const { return MOVIX; }
- virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent );
+ virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent );
bool newDocument();
- const QPtrList<K3bMovixFileItem>& movixFileItems() const { return m_movixFiles; }
+ const TQPtrList<K3bMovixFileItem>& movixFileItems() const { return m_movixFiles; }
int indexOf( K3bMovixFileItem* );
@@ -54,14 +55,14 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc
bool reboot() const { return m_reboot; }
bool ejectDisk() const { return m_ejectDisk; }
bool randomPlay() const { return m_randomPlay; }
- const QString& subtitleFontset() const { return m_subtitleFontset; }
- const QString& bootMessageLanguage() const { return m_bootMessageLanguage; }
- const QString& audioBackground() const { return m_audioBackground; }
- const QString& keyboardLayout() const { return m_keyboardLayout; }
- const QStringList& codecs() const { return m_codecs; }
- const QString& defaultBootLabel() const { return m_defaultBootLabel; }
- const QString& additionalMPlayerOptions() const { return m_additionalMPlayerOptions; }
- const QString& unwantedMPlayerOptions() const { return m_unwantedMPlayerOptions; }
+ const TQString& subtitleFontset() const { return m_subtitleFontset; }
+ const TQString& bootMessageLanguage() const { return m_bootMessageLanguage; }
+ const TQString& audioBackground() const { return m_audioBackground; }
+ const TQString& keyboardLayout() const { return m_keyboardLayout; }
+ const TQStringList& codecs() const { return m_codecs; }
+ const TQString& defaultBootLabel() const { return m_defaultBootLabel; }
+ const TQString& additionalMPlayerOptions() const { return m_additionalMPlayerOptions; }
+ const TQString& unwantedMPlayerOptions() const { return m_unwantedMPlayerOptions; }
int loopPlaylist() const { return m_loopPlaylist; }
bool noDma() const { return m_noDma; }
@@ -69,14 +70,14 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc
void setReboot( bool v ) { m_reboot = v; }
void setEjectDisk( bool v ) { m_ejectDisk = v; }
void setRandomPlay( bool v ) { m_randomPlay = v; }
- void setSubtitleFontset( const QString& v ) { m_subtitleFontset = v; }
- void setBootMessageLanguage( const QString& v ) { m_bootMessageLanguage = v; }
- void setAudioBackground( const QString& b ) { m_audioBackground = b; }
- void setKeyboardLayout( const QString& l ) { m_keyboardLayout = l; }
- void setCodecs( const QStringList& c ) { m_codecs = c; }
- void setDefaultBootLabel( const QString& v ) { m_defaultBootLabel = v; }
- void setAdditionalMPlayerOptions( const QString& v ) { m_additionalMPlayerOptions = v; }
- void setUnwantedMPlayerOptions( const QString& v ) { m_unwantedMPlayerOptions = v; }
+ void setSubtitleFontset( const TQString& v ) { m_subtitleFontset = v; }
+ void setBootMessageLanguage( const TQString& v ) { m_bootMessageLanguage = v; }
+ void setAudioBackground( const TQString& b ) { m_audioBackground = b; }
+ void setKeyboardLayout( const TQString& l ) { m_keyboardLayout = l; }
+ void setCodecs( const TQStringList& c ) { m_codecs = c; }
+ void setDefaultBootLabel( const TQString& v ) { m_defaultBootLabel = v; }
+ void setAdditionalMPlayerOptions( const TQString& v ) { m_additionalMPlayerOptions = v; }
+ void setUnwantedMPlayerOptions( const TQString& v ) { m_unwantedMPlayerOptions = v; }
void setLoopPlaylist( int v ) { m_loopPlaylist = v; }
void setNoDma( bool b ) { m_noDma = b; }
@@ -94,30 +95,30 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc
protected:
/** reimplemented from K3bDoc */
- bool loadDocumentData( QDomElement* root );
+ bool loadDocumentData( TQDomElement* root );
/** reimplemented from K3bDoc */
- bool saveDocumentData( QDomElement* );
+ bool saveDocumentData( TQDomElement* );
- virtual QString typeString() const { return "movix"; }
+ virtual TQString typeString() const { return "movix"; }
private slots:
void slotDataItemRemoved( K3bDataItem* );
private:
- QPtrList<K3bMovixFileItem> m_movixFiles;
+ TQPtrList<K3bMovixFileItem> m_movixFiles;
bool m_shutdown;
bool m_reboot;
bool m_ejectDisk;
bool m_randomPlay;
- QString m_subtitleFontset;
- QString m_bootMessageLanguage;
- QString m_audioBackground;
- QString m_keyboardLayout;
- QStringList m_codecs;
- QString m_defaultBootLabel;
- QString m_additionalMPlayerOptions;
- QString m_unwantedMPlayerOptions;
+ TQString m_subtitleFontset;
+ TQString m_bootMessageLanguage;
+ TQString m_audioBackground;
+ TQString m_keyboardLayout;
+ TQStringList m_codecs;
+ TQString m_defaultBootLabel;
+ TQString m_additionalMPlayerOptions;
+ TQString m_unwantedMPlayerOptions;
int m_loopPlaylist;
bool m_noDma;
};
diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
index 57e18af..04afd83 100644
--- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
+++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
@@ -31,8 +31,8 @@
#include <ktempfile.h>
#include <kio/global.h>
-#include <qtextstream.h>
-#include <qdir.h>
+#include <tqtextstream.h>
+#include <tqdir.h>
class K3bMovixDocPreparer::Private
@@ -62,14 +62,14 @@ public:
K3bDirItem* mplayerDir;
K3bFileItem* playlistFileItem;
- QPtrList<K3bDataItem> newMovixItems;
+ TQPtrList<K3bDataItem> newMovixItems;
bool structuresCreated;
};
-K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bJob( jh, parent, name )
+K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bJob( jh, tqparent, name )
{
d = new Private();
d->doc = doc;
@@ -175,11 +175,11 @@ bool K3bMovixDocPreparer::writePlaylistFile()
d->playlistFile = new KTempFile();
d->playlistFile->setAutoDelete(true);
- if( QTextStream* s = d->playlistFile->textStream() ) {
+ if( TQTextStream* s = d->playlistFile->textStream() ) {
- const QPtrList<K3bMovixFileItem>& movixFileItems = d->doc->movixFileItems();
+ const TQPtrList<K3bMovixFileItem>& movixFileItems = d->doc->movixFileItems();
- for( QPtrListIterator<K3bMovixFileItem> it( movixFileItems );
+ for( TQPtrListIterator<K3bMovixFileItem> it( movixFileItems );
*it; ++it ) {
*s << "/cdrom/";
*s << it.current()->writtenName();
@@ -190,33 +190,33 @@ bool K3bMovixDocPreparer::writePlaylistFile()
return true;
}
else {
- emit infoMessage( i18n("Could not write to temporary file %1").arg(d->playlistFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->playlistFile->name()), ERROR );
return false;
}
}
-bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const QString& originalPath )
+bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const TQString& originalPath )
{
delete d->isolinuxConfigFile;
d->isolinuxConfigFile = new KTempFile();
d->isolinuxConfigFile->setAutoDelete(true);
- if( QTextStream* s = d->isolinuxConfigFile->textStream() ) {
+ if( TQTextStream* s = d->isolinuxConfigFile->textStream() ) {
- // now open the default isolinux.cfg and copy everything except the first line which contains
+ // now open the default isolinux.cfg and copy everything except the first line which tqcontains
// the default boot label
- QFile f( originalPath );
+ TQFile f( originalPath );
if( f.open( IO_ReadOnly ) ) {
- QTextStream isolinuxConfigOrig( &f );
+ TQTextStream isolinuxConfigOrig( &f );
if( d->doc->defaultBootLabel() != i18n("default") ) {
isolinuxConfigOrig.readLine(); // skip first line
*s << "default " << d->doc->defaultBootLabel() << endl;
}
- QString line = isolinuxConfigOrig.readLine();
+ TQString line = isolinuxConfigOrig.readLine();
while( !line.isNull() ) {
*s << line << endl;
line = isolinuxConfigOrig.readLine();
@@ -229,7 +229,7 @@ bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const QString& originalPath )
return false;
}
else {
- emit infoMessage( i18n("Could not write to temporary file %1").arg(d->isolinuxConfigFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->isolinuxConfigFile->name()), ERROR );
return false;
}
}
@@ -241,7 +241,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile()
d->movixRcFile = new KTempFile();
d->movixRcFile->setAutoDelete(true);
- if( QTextStream* s = d->movixRcFile->textStream() ) {
+ if( TQTextStream* s = d->movixRcFile->textStream() ) {
if( !d->doc->additionalMPlayerOptions().isEmpty() )
*s << "extra-mplayer-options=" << d->doc->additionalMPlayerOptions() << endl;
@@ -263,7 +263,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile()
return true;
}
else {
- emit infoMessage( i18n("Could not write to temporary file %1").arg(d->movixRcFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->movixRcFile->name()), ERROR );
return false;
}
}
@@ -297,28 +297,28 @@ bool K3bMovixDocPreparer::addMovixFiles()
// the following sucks! Redesign it!
// add all the isolinux files
- QStringList isolinuxFiles = d->eMovixBin->isolinuxFiles();
+ TQStringList isolinuxFiles = d->eMovixBin->isolinuxFiles();
isolinuxFiles.remove( "isolinux.bin" );
isolinuxFiles.remove( "isolinux.cfg" );
isolinuxFiles.remove( "kernel/vmlinuz" );
- for( QStringList::const_iterator it = isolinuxFiles.begin();
+ for( TQStringList::const_iterator it = isolinuxFiles.begin();
it != isolinuxFiles.end(); ++it ) {
- QString path = d->eMovixBin->path + "/isolinux/" + *it;
+ TQString path = d->eMovixBin->path + "/isolinux/" + *it;
(void)new K3bFileItem( path, d->doc, d->isolinuxDir );
}
- const QStringList& movixFiles = d->eMovixBin->movixFiles();
- for( QStringList::const_iterator it = movixFiles.begin();
+ const TQStringList& movixFiles = d->eMovixBin->movixFiles();
+ for( TQStringList::const_iterator it = movixFiles.begin();
it != movixFiles.end(); ++it ) {
- QString path = d->eMovixBin->path + "/movix/" + *it;
+ TQString path = d->eMovixBin->path + "/movix/" + *it;
(void)new K3bFileItem( path, d->doc, d->movixDir );
}
// add doku files
- QString path = d->eMovixBin->languageDir( d->doc->bootMessageLanguage() );
- QDir dir(path);
- QStringList helpFiles = dir.entryList(QDir::Files);
- for( QStringList::const_iterator it = helpFiles.begin();
+ TQString path = d->eMovixBin->languageDir( d->doc->bootMessageLanguage() );
+ TQDir dir(path);
+ TQStringList helpFiles = dir.entryList(TQDir::Files);
+ for( TQStringList::const_iterator it = helpFiles.begin();
it != helpFiles.end(); ++it ) {
// some emovix installations include backup-files, no one's perfect ;)
if( !(*it).endsWith( "~" ) )
@@ -331,13 +331,13 @@ bool K3bMovixDocPreparer::addMovixFiles()
d->doc->subtitleFontset() != i18n("none") ) {
d->mplayerDir = new K3bDirItem( "mplayer", d->doc, d->doc->root() );
- QString fontPath = d->eMovixBin->subtitleFontDir( d->doc->subtitleFontset() );
- QFileInfo fontType( fontPath );
+ TQString fontPath = d->eMovixBin->subtitleFontDir( d->doc->subtitleFontset() );
+ TQFileInfo fontType( fontPath );
if( fontType.isDir() ) {
K3bDirItem* fontDir = new K3bDirItem( "font", d->doc, d->mplayerDir );
- QDir dir( fontPath );
- QStringList fontFiles = dir.entryList( QDir::Files );
- for( QStringList::const_iterator it = fontFiles.begin();
+ TQDir dir( fontPath );
+ TQStringList fontFiles = dir.entryList( TQDir::Files );
+ for( TQStringList::const_iterator it = fontFiles.begin();
it != fontFiles.end(); ++it ) {
(void)new K3bFileItem( fontPath + "/" + *it, d->doc, fontDir );
}
@@ -378,16 +378,16 @@ bool K3bMovixDocPreparer::addMovixFilesNew()
// 4. set weights for isolinux files
// FIXME: use the settings from the doc
- QStringList files = d->eMovixBin->files( d->doc->keyboardLayout(),
+ TQStringList files = d->eMovixBin->files( d->doc->keyboardLayout(),
d->doc->subtitleFontset(),
d->doc->audioBackground(),
d->doc->bootMessageLanguage(),
"all" /*d->doc->codecs()*/ ); // for now we simply don't allow selection
- for( QStringList::iterator it = files.begin(); it != files.end(); ++it ) {
- QString docPath = (*it).section( ' ', 0, 0 );
- QString filePath = (*it).section( ' ', 1, 1 );
- QString fileName = filePath.section( '/', -1 );
+ for( TQStringList::iterator it = files.begin(); it != files.end(); ++it ) {
+ TQString docPath = (*it).section( ' ', 0, 0 );
+ TQString filePath = (*it).section( ' ', 1, 1 );
+ TQString fileName = filePath.section( '/', -1 );
if( fileName == "isolinux.cfg" ) {
// replace the local file with our modified one
@@ -406,7 +406,7 @@ bool K3bMovixDocPreparer::addMovixFilesNew()
// set the proper sort weight
bootItem->setSortWeight( 200 );
- bootItem->parent()->setSortWeight( 100 );
+ bootItem->tqparent()->setSortWeight( 100 );
}
else if( fileName != "movixrc" ) { // we create our own movixrc
K3bFileItem* item = createItem( filePath, docPath );
@@ -424,10 +424,10 @@ bool K3bMovixDocPreparer::addMovixFilesNew()
// eMovix supplied codecs. These codecs are not picked up by the movix-conf script
K3bDirItem* codecDir = dynamic_cast<K3bDirItem*>( d->doc->root()->findByPath( "/eMoviX/codecs" ) );
if( !codecDir || codecDir->isEmpty() ) {
- QDir localCodecDir( d->eMovixBin->movixDataDir() + "/codecs" );
+ TQDir localCodecDir( d->eMovixBin->movixDataDir() + "/codecs" );
if( localCodecDir.exists() ) {
- QStringList codecFiles = localCodecDir.entryList( QDir::Files );
- for( QStringList::const_iterator it = codecFiles.begin(); it != codecFiles.end(); ++it )
+ TQStringList codecFiles = localCodecDir.entryList( TQDir::Files );
+ for( TQStringList::const_iterator it = codecFiles.begin(); it != codecFiles.end(); ++it )
createItem( localCodecDir.path() + '/' + *it, "/eMoviX/codecs" );
}
}
@@ -443,7 +443,7 @@ bool K3bMovixDocPreparer::addMovixFilesNew()
}
-K3bFileItem* K3bMovixDocPreparer::createItem( const QString& localPath, const QString& docPath )
+K3bFileItem* K3bMovixDocPreparer::createItem( const TQString& localPath, const TQString& docPath )
{
// make sure the path in the doc exists
K3bDirItem* dir = createDir( docPath );
@@ -459,12 +459,12 @@ K3bFileItem* K3bMovixDocPreparer::createItem( const QString& localPath, const QS
}
-K3bDirItem* K3bMovixDocPreparer::createDir( const QString& docPath )
+K3bDirItem* K3bMovixDocPreparer::createDir( const TQString& docPath )
{
- QStringList docPathSections = QStringList::split( '/', docPath );
+ TQStringList docPathSections = TQStringList::split( '/', docPath );
K3bDirItem* dir = d->doc->root();
- for( QStringList::iterator it = docPathSections.begin(); it != docPathSections.end(); ++it ) {
- K3bDataItem* next = dir->find( *it );
+ for( TQStringList::iterator it = docPathSections.begin(); it != docPathSections.end(); ++it ) {
+ K3bDataItem* next = dir->tqfind( *it );
if( !next )
dir = new K3bDirItem( *it, d->doc, dir );
else if( next->isDir() )
@@ -478,9 +478,9 @@ K3bDirItem* K3bMovixDocPreparer::createDir( const QString& docPath )
// remember the dir to remove it
if( dir != d->doc->root() ) {
K3bDirItem* delDir = dir;
- while( delDir->parent() != d->doc->root() )
- delDir = delDir->parent();
- if( d->newMovixItems.findRef( delDir ) == -1 )
+ while( delDir->tqparent() != d->doc->root() )
+ delDir = delDir->tqparent();
+ if( d->newMovixItems.tqfindRef( delDir ) == -1 )
d->newMovixItems.append( delDir );
}
diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.h b/libk3b/projects/movixcd/k3bmovixdocpreparer.h
index 3844eae..8d4ba1e 100644
--- a/libk3b/projects/movixcd/k3bmovixdocpreparer.h
+++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.h
@@ -30,9 +30,10 @@ class K3bDirItem;
class K3bMovixDocPreparer : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bMovixDocPreparer();
K3bMovixDoc* doc() const;
@@ -53,12 +54,12 @@ class K3bMovixDocPreparer : public K3bJob
private:
bool writePlaylistFile();
- bool writeIsolinuxConfigFile( const QString& );
+ bool writeIsolinuxConfigFile( const TQString& );
bool writeMovixRcFile();
bool addMovixFiles();
bool addMovixFilesNew();
- K3bFileItem* createItem( const QString& localPath, const QString& docPath );
- K3bDirItem* createDir( const QString& docPath );
+ K3bFileItem* createItem( const TQString& localPath, const TQString& docPath );
+ K3bDirItem* createDir( const TQString& docPath );
class Private;
Private* d;
diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.cpp b/libk3b/projects/movixcd/k3bmovixfileitem.cpp
index 12803a2..ccc387f 100644
--- a/libk3b/projects/movixcd/k3bmovixfileitem.cpp
+++ b/libk3b/projects/movixcd/k3bmovixfileitem.cpp
@@ -20,10 +20,10 @@
#include <k3bdiritem.h>
-K3bMovixFileItem::K3bMovixFileItem( const QString& fileName,
+K3bMovixFileItem::K3bMovixFileItem( const TQString& fileName,
K3bMovixDoc* doc,
K3bDirItem* dir,
- const QString& k3bName )
+ const TQString& k3bName )
: K3bFileItem( fileName, doc, dir, k3bName ),
m_doc(doc),
m_subTitleItem(0)
@@ -36,16 +36,16 @@ K3bMovixFileItem::~K3bMovixFileItem()
if( m_subTitleItem )
m_doc->removeSubTitleItem( this );
- // remove this from parentdir
+ // remove this from tqparentdir
// it is important to do it here and not
// rely on the K3bFileItem destructor becasue
// otherwise the doc is not informed early enough
- if( parent() )
- parent()->takeDataItem( this );
+ if( tqparent() )
+ tqparent()->takeDataItem( this );
}
-void K3bMovixFileItem::setK3bName( const QString& newName )
+void K3bMovixFileItem::setK3bName( const TQString& newName )
{
K3bFileItem::setK3bName( newName );
@@ -56,11 +56,11 @@ void K3bMovixFileItem::setK3bName( const QString& newName )
}
-QString K3bMovixFileItem::subTitleFileName( const QString& name )
+TQString K3bMovixFileItem::subTitleFileName( const TQString& name )
{
// remove ending from k3bName
- QString subName = name;
- int pos = subName.findRev(".");
+ TQString subName = name;
+ int pos = subName.tqfindRev(".");
if( pos > 0 )
subName.truncate( pos );
subName += ".sub";
diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.h b/libk3b/projects/movixcd/k3bmovixfileitem.h
index 343f00b..a605434 100644
--- a/libk3b/projects/movixcd/k3bmovixfileitem.h
+++ b/libk3b/projects/movixcd/k3bmovixfileitem.h
@@ -25,7 +25,7 @@ class K3bMovixDoc;
class K3bMovixFileItem : public K3bFileItem
{
public:
- K3bMovixFileItem( const QString& fileName, K3bMovixDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 );
+ K3bMovixFileItem( const TQString& fileName, K3bMovixDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 );
~K3bMovixFileItem();
K3bFileItem* subTitleItem() const { return m_subTitleItem; }
@@ -35,13 +35,13 @@ class K3bMovixFileItem : public K3bFileItem
* reimplemented from K3bDataItem
* also renames the subTitleItem
*/
- void setK3bName( const QString& );
+ void setK3bName( const TQString& );
/**
* returnes the name that the subtitle file must have in
* order to work with mplayer
*/
- static QString subTitleFileName( const QString& );
+ static TQString subTitleFileName( const TQString& );
private:
K3bMovixDoc* m_doc;
diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp
index 2579453..220a8da 100644
--- a/libk3b/projects/movixcd/k3bmovixjob.cpp
+++ b/libk3b/projects/movixcd/k3bmovixjob.cpp
@@ -27,34 +27,34 @@
#include <kdebug.h>
-K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, QObject* parent )
- : K3bBurnJob( jh, parent ),
+K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent )
+ : K3bBurnJob( jh, tqparent ),
m_doc(doc)
{
m_dataJob = new K3bDataJob( doc, this, this );
m_movixDocPreparer = new K3bMovixDocPreparer( doc, this, this );
// pipe signals
- connect( m_dataJob, SIGNAL(percent(int)), this, SIGNAL(percent(int)) );
- connect( m_dataJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) );
- connect( m_dataJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( m_dataJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) );
- connect( m_dataJob, SIGNAL(bufferStatus(int)), this, SIGNAL(bufferStatus(int)) );
- connect( m_dataJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) );
- connect( m_dataJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( m_dataJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( m_dataJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_dataJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
- connect( m_dataJob, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_dataJob, SIGNAL(burning(bool)), this, SIGNAL(burning(bool)) );
+ connect( m_dataJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) );
+ connect( m_dataJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
+ connect( m_dataJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
+ connect( m_dataJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
+ connect( m_dataJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_dataJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
+ connect( m_dataJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
+ connect( m_dataJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( m_dataJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_dataJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( m_dataJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_dataJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) );
// we need to clean up here
- connect( m_dataJob, SIGNAL(finished(bool)), this, SLOT(slotDataJobFinished(bool)) );
+ connect( m_dataJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDataJobFinished(bool)) );
- connect( m_movixDocPreparer, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
+ connect( m_movixDocPreparer, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
}
@@ -110,23 +110,23 @@ void K3bMovixJob::slotDataJobFinished( bool success )
}
-QString K3bMovixJob::jobDescription() const
+TQString K3bMovixJob::jobDescription() const
{
if( m_doc->isoOptions().volumeID().isEmpty() )
return i18n("Writing eMovix CD");
else
- return i18n("Writing eMovix CD (%1)").arg(m_doc->isoOptions().volumeID());
+ return i18n("Writing eMovix CD (%1)").tqarg(m_doc->isoOptions().volumeID());
}
-QString K3bMovixJob::jobDetails() const
+TQString K3bMovixJob::jobDetails() const
{
return ( i18n("1 file (%1) and about 8 MB eMovix data",
"%n files (%1) and about 8 MB eMovix data",
- m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size()))
+ m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size()))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
- : QString::null ) );
+ : TQString() ) );
}
#include "k3bmovixjob.moc"
diff --git a/libk3b/projects/movixcd/k3bmovixjob.h b/libk3b/projects/movixcd/k3bmovixjob.h
index 81dea8e..d1689f6 100644
--- a/libk3b/projects/movixcd/k3bmovixjob.h
+++ b/libk3b/projects/movixcd/k3bmovixjob.h
@@ -31,16 +31,17 @@ class K3bFileItem;
class K3bMovixJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, QObject* parent = 0 );
+ K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 );
~K3bMovixJob();
K3bDoc* doc() const;
K3bDevice::Device* writer() const;
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void start();
diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp
index 8720e8d..522e700 100644
--- a/libk3b/projects/movixcd/k3bmovixprogram.cpp
+++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp
@@ -21,9 +21,9 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
K3bMovixProgram::K3bMovixProgram()
@@ -31,17 +31,17 @@ K3bMovixProgram::K3bMovixProgram()
{
}
-bool K3bMovixProgram::scan( const QString& p )
+bool K3bMovixProgram::scan( const TQString& p )
{
if( p.isEmpty() )
return false;
- QString path = p;
+ TQString path = p;
if( path[path.length()-1] != '/' )
path.append("/");
// first test if we have a version info (eMovix >= 0.8.0pre3)
- if( !QFile::exists( path + "movix-version" ) )
+ if( !TQFile::exists( path + "movix-version" ) )
return false;
K3bMovixBin* bin = 0;
@@ -74,19 +74,19 @@ bool K3bMovixProgram::scan( const QString& p )
}
-bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const QString& path )
+bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const TQString& path )
{
- QStringList files = bin->files();
- for( QStringList::iterator it = files.begin();
+ TQStringList files = bin->files();
+ for( TQStringList::iterator it = files.begin();
it != files.end(); ++it ) {
- if( (*it).contains( "isolinux.cfg" ) ) {
- bin->m_supportedBootLabels = determineSupportedBootLabels( QStringList::split( " ", *it )[1] );
+ if( (*it).tqcontains( "isolinux.cfg" ) ) {
+ bin->m_supportedBootLabels = determineSupportedBootLabels( TQStringList::split( " ", *it )[1] );
break;
}
}
// here we simply check for the movix-conf program
- if( QFile::exists( path + "movix-conf" ) ) {
+ if( TQFile::exists( path + "movix-conf" ) ) {
bin->addFeature( "newfiles" );
addBin(bin);
return true;
@@ -98,29 +98,29 @@ bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const QString& path )
}
-bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path )
+bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const TQString& path )
{
//
// first check if all necessary directories are present
//
- QDir dir( bin->movixDataDir() );
- QStringList subdirs = dir.entryList( QDir::Dirs );
- if( !subdirs.contains( "boot-messages" ) ) {
+ TQDir dir( bin->movixDataDir() );
+ TQStringList subdirs = dir.entryList( TQDir::Dirs );
+ if( !subdirs.tqcontains( "boot-messages" ) ) {
kdDebug() << "(K3bMovixProgram) could not find subdir 'boot-messages'" << endl;
delete bin;
return false;
}
- if( !subdirs.contains( "isolinux" ) ) {
+ if( !subdirs.tqcontains( "isolinux" ) ) {
kdDebug() << "(K3bMovixProgram) could not find subdir 'isolinux'" << endl;
delete bin;
return false;
}
- if( !subdirs.contains( "movix" ) ) {
+ if( !subdirs.tqcontains( "movix" ) ) {
kdDebug() << "(K3bMovixProgram) could not find subdir 'movix'" << endl;
delete bin;
return false;
}
- if( !subdirs.contains( "mplayer-fonts" ) ) {
+ if( !subdirs.tqcontains( "mplayer-fonts" ) ) {
kdDebug() << "(K3bMovixProgram) could not find subdir 'mplayer-fonts'" << endl;
delete bin;
return false;
@@ -130,14 +130,14 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path )
//
// check if we have a version of eMovix which contains the movix-files script
//
- if( QFile::exists( path + "movix-files" ) ) {
+ if( TQFile::exists( path + "movix-files" ) ) {
bin->addFeature( "files" );
KProcess p;
K3bProcessOutputCollector out( &p );
p << bin->path + "movix-files";
if( p.start( KProcess::Block, KProcess::AllOutput ) ) {
- bin->m_movixFiles = QStringList::split( "\n", out.output() );
+ bin->m_movixFiles = TQStringList::split( "\n", out.output() );
}
}
@@ -145,8 +145,8 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path )
// fallback: to be compatible with 0.8.0rc2 we just add all files in the movix directory
//
if( bin->m_movixFiles.isEmpty() ) {
- QDir dir( bin->movixDataDir() + "/movix" );
- bin->m_movixFiles = dir.entryList(QDir::Files);
+ TQDir dir( bin->movixDataDir() + "/movix" );
+ bin->m_movixFiles = dir.entryList(TQDir::Files);
}
//
@@ -164,9 +164,9 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path )
//
// check every single necessary file :(
//
- for( QStringList::const_iterator it = bin->m_isolinuxFiles.begin();
+ for( TQStringList::const_iterator it = bin->m_isolinuxFiles.begin();
it != bin->m_isolinuxFiles.end(); ++it ) {
- if( !QFile::exists( bin->movixDataDir() + "/isolinux/" + *it ) ) {
+ if( !TQFile::exists( bin->movixDataDir() + "/isolinux/" + *it ) ) {
kdDebug() << "(K3bMovixProgram) Could not find file " << *it << endl;
delete bin;
return false;
@@ -177,7 +177,7 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path )
// now check the boot-messages languages
//
dir.cd( "boot-messages" );
- bin->m_supportedLanguages = dir.entryList(QDir::Dirs);
+ bin->m_supportedLanguages = dir.entryList(TQDir::Dirs);
bin->m_supportedLanguages.remove(".");
bin->m_supportedLanguages.remove("..");
bin->m_supportedLanguages.remove("CVS"); // the eMovix makefile stuff seems not perfect ;)
@@ -189,12 +189,12 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path )
// FIXME: every font dir needs to contain the "font.desc" file!
//
dir.cd( "mplayer-fonts" );
- bin->m_supportedSubtitleFonts = dir.entryList( QDir::Dirs );
+ bin->m_supportedSubtitleFonts = dir.entryList( TQDir::Dirs );
bin->m_supportedSubtitleFonts.remove(".");
bin->m_supportedSubtitleFonts.remove("..");
bin->m_supportedSubtitleFonts.remove("CVS"); // the eMovix makefile stuff seems not perfect ;)
// new ttf fonts in 0.8.0rc2
- bin->m_supportedSubtitleFonts += dir.entryList( "*.ttf", QDir::Files );
+ bin->m_supportedSubtitleFonts += dir.entryList( "*.ttf", TQDir::Files );
bin->m_supportedSubtitleFonts.prepend( i18n("none") );
dir.cdUp();
@@ -213,17 +213,17 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path )
}
-QStringList K3bMovixProgram::determineSupportedBootLabels( const QString& isoConfigFile ) const
+TQStringList K3bMovixProgram::determineSupportedBootLabels( const TQString& isoConfigFile ) const
{
- QStringList list( i18n("default") );
+ TQStringList list( i18n("default") );
- QFile f( isoConfigFile );
+ TQFile f( isoConfigFile );
if( !f.open( IO_ReadOnly ) ) {
kdDebug() << "(K3bMovixProgram) could not open file '" << f.name() << "'" << endl;
}
else {
- QTextStream fs( &f );
- QString line = fs.readLine();
+ TQTextStream fs( &f );
+ TQString line = fs.readLine();
while( !line.isNull() ) {
if( line.startsWith( "label" ) )
list.append( line.mid( 5 ).stripWhiteSpace() );
@@ -237,84 +237,84 @@ QStringList K3bMovixProgram::determineSupportedBootLabels( const QString& isoCon
}
-QString K3bMovixBin::subtitleFontDir( const QString& font ) const
+TQString K3bMovixBin::subtitleFontDir( const TQString& font ) const
{
if( font == i18n("none" ) )
return "";
- else if( m_supportedSubtitleFonts.contains( font ) )
+ else if( m_supportedSubtitleFonts.tqcontains( font ) )
return path + "/mplayer-fonts/" + font;
else
return "";
}
-QString K3bMovixBin::languageDir( const QString& lang ) const
+TQString K3bMovixBin::languageDir( const TQString& lang ) const
{
if( lang == i18n("default") )
return languageDir( "en" );
- else if( m_supportedLanguages.contains( lang ) )
+ else if( m_supportedLanguages.tqcontains( lang ) )
return path + "/boot-messages/" + lang;
else
return "";
}
-QStringList K3bMovixBin::supportedSubtitleFonts() const
+TQStringList K3bMovixBin::supportedSubtitleFonts() const
{
if( version >= K3bVersion( 0, 9, 0 ) )
- return QStringList( i18n("default") ) += supported( "font" );
+ return TQStringList( i18n("default") ) += supported( "font" );
else
return m_supportedSubtitleFonts;
}
-QStringList K3bMovixBin::supportedLanguages() const
+TQStringList K3bMovixBin::supportedLanguages() const
{
if( version >= K3bVersion( 0, 9, 0 ) )
- return QStringList( i18n("default") ) += supported( "lang" );
+ return TQStringList( i18n("default") ) += supported( "lang" );
else
return m_supportedLanguages;
}
// only used for eMovix >= 0.9.0
-QStringList K3bMovixBin::supportedKbdLayouts() const
+TQStringList K3bMovixBin::supportedKbdLayouts() const
{
- return QStringList( i18n("default") ) += supported( "kbd" );
+ return TQStringList( i18n("default") ) += supported( "kbd" );
}
// only used for eMovix >= 0.9.0
-QStringList K3bMovixBin::supportedBackgrounds() const
+TQStringList K3bMovixBin::supportedBackgrounds() const
{
- return QStringList( i18n("default") ) += supported( "background" );
+ return TQStringList( i18n("default") ) += supported( "background" );
}
// only used for eMovix >= 0.9.0
-QStringList K3bMovixBin::supportedCodecs() const
+TQStringList K3bMovixBin::supportedCodecs() const
{
return supported( "codecs" );
}
-QStringList K3bMovixBin::supported( const QString& type ) const
+TQStringList K3bMovixBin::supported( const TQString& type ) const
{
KProcess p;
K3bProcessOutputCollector out( &p );
p << path + "movix-conf" << "--supported=" + type;
if( p.start( KProcess::Block, KProcess::AllOutput ) )
- return QStringList::split( "\n", out.output() );
+ return TQStringList::split( "\n", out.output() );
else
- return QStringList();
+ return TQStringList();
}
-QStringList K3bMovixBin::files( const QString& kbd,
- const QString& font,
- const QString& bg,
- const QString& lang,
- const QStringList& codecs ) const
+TQStringList K3bMovixBin::files( const TQString& kbd,
+ const TQString& font,
+ const TQString& bg,
+ const TQString& lang,
+ const TQStringList& codecs ) const
{
KProcess p;
K3bProcessOutputCollector out( &p );
@@ -333,7 +333,7 @@ QStringList K3bMovixBin::files( const QString& kbd,
p << "--codecs" << codecs.join( "," );
if( p.start( KProcess::Block, KProcess::AllOutput ) )
- return QStringList::split( "\n", out.output() );
+ return TQStringList::split( "\n", out.output() );
else
- return QStringList();
+ return TQStringList();
}
diff --git a/libk3b/projects/movixcd/k3bmovixprogram.h b/libk3b/projects/movixcd/k3bmovixprogram.h
index a6a9ac0..7508626 100644
--- a/libk3b/projects/movixcd/k3bmovixprogram.h
+++ b/libk3b/projects/movixcd/k3bmovixprogram.h
@@ -26,58 +26,58 @@ class LIBK3B_EXPORT K3bMovixBin : public K3bExternalBin
: K3bExternalBin( p ) {
}
- const QString& movixDataDir() const { return m_movixPath; }
+ const TQString& movixDataDir() const { return m_movixPath; }
- const QStringList& supportedBootLabels() const { return m_supportedBootLabels; }
- QStringList supportedSubtitleFonts() const;
- QStringList supportedLanguages() const;
- QStringList supportedKbdLayouts() const;
- QStringList supportedBackgrounds() const;
- QStringList supportedCodecs() const;
+ const TQStringList& supportedBootLabels() const { return m_supportedBootLabels; }
+ TQStringList supportedSubtitleFonts() const;
+ TQStringList supportedLanguages() const;
+ TQStringList supportedKbdLayouts() const;
+ TQStringList supportedBackgrounds() const;
+ TQStringList supportedCodecs() const;
/*
* Unused for eMovix versions 0.9.0 and above
*/
- const QStringList& movixFiles() const { return m_movixFiles; }
+ const TQStringList& movixFiles() const { return m_movixFiles; }
/*
* Unused for eMovix versions 0.9.0 and above
*/
- const QStringList& isolinuxFiles() const { return m_isolinuxFiles; }
+ const TQStringList& isolinuxFiles() const { return m_isolinuxFiles; }
/**
* returnes empty string if font was not found
*
* Unused for eMovix versions 0.9.0 and above
*/
- QString subtitleFontDir( const QString& font ) const;
+ TQString subtitleFontDir( const TQString& font ) const;
/**
* returnes empty string if lang was not found
*
* Unused for eMovix versions 0.9.0 and above
*/
- QString languageDir( const QString& lang ) const;
+ TQString languageDir( const TQString& lang ) const;
/**
* Interface for the movix-conf --files interface for
* versions >= 0.9.0
*/
- QStringList files( const QString& kbd = QString::null,
- const QString& font = QString::null,
- const QString& bg = QString::null,
- const QString& lang = QString::null,
- const QStringList& codecs = QStringList() ) const;
+ TQStringList files( const TQString& kbd = TQString(),
+ const TQString& font = TQString(),
+ const TQString& bg = TQString(),
+ const TQString& lang = TQString(),
+ const TQStringList& codecs = TQStringList() ) const;
private:
- QStringList supported( const QString& ) const;
+ TQStringList supported( const TQString& ) const;
- QString m_movixPath;
- QStringList m_movixFiles;
- QStringList m_isolinuxFiles;
- QStringList m_supportedBootLabels;
- QStringList m_supportedSubtitleFonts;
- QStringList m_supportedLanguages;
+ TQString m_movixPath;
+ TQStringList m_movixFiles;
+ TQStringList m_isolinuxFiles;
+ TQStringList m_supportedBootLabels;
+ TQStringList m_supportedSubtitleFonts;
+ TQStringList m_supportedLanguages;
friend class K3bMovixProgram;
};
@@ -88,14 +88,14 @@ class LIBK3B_EXPORT K3bMovixProgram : public K3bExternalProgram
public:
K3bMovixProgram();
- bool scan( const QString& );
+ bool scan( const TQString& );
bool supportsUserParameters() const { return false; }
private:
- bool scanNewEMovix( K3bMovixBin* bin, const QString& );
- bool scanOldEMovix( K3bMovixBin* bin, const QString& );
- QStringList determineSupportedBootLabels( const QString& ) const;
+ bool scanNewEMovix( K3bMovixBin* bin, const TQString& );
+ bool scanOldEMovix( K3bMovixBin* bin, const TQString& );
+ TQStringList determineSupportedBootLabels( const TQString& ) const;
};
diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp
index 80b8ec2..d05c75a 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp
+++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp
@@ -19,8 +19,8 @@
#include <kconfig.h>
-K3bMovixDvdDoc::K3bMovixDvdDoc( QObject* parent )
- : K3bMovixDoc( parent )
+K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* tqparent )
+ : K3bMovixDoc( tqparent )
{
}
@@ -28,9 +28,9 @@ K3bMovixDvdDoc::~K3bMovixDvdDoc()
{
}
-K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent )
+K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
{
- return new K3bMovixDvdJob( this, hdl, parent );
+ return new K3bMovixDvdJob( this, hdl, tqparent );
}
#include "k3bmovixdvddoc.moc"
diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.h b/libk3b/projects/movixdvd/k3bmovixdvddoc.h
index 85943f0..cd19cc8 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvddoc.h
+++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.h
@@ -24,17 +24,18 @@ class KConfig;
class LIBK3B_EXPORT K3bMovixDvdDoc : public K3bMovixDoc
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMovixDvdDoc( QObject* parent = 0 );
+ K3bMovixDvdDoc( TQObject* tqparent = 0 );
~K3bMovixDvdDoc();
int type() const { return MOVIX_DVD; }
- K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent );
+ K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent );
protected:
- QString typeString() const { return "movixdvd"; }
+ TQString typeString() const { return "movixdvd"; }
};
#endif
diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
index b556997..d97f42a 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
+++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
@@ -27,33 +27,33 @@
#include <kdebug.h>
-K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, QObject* parent )
- : K3bBurnJob( jh, parent ),
+K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent )
+ : K3bBurnJob( jh, tqparent ),
m_doc(doc)
{
m_dvdJob = new K3bDvdJob( doc, this, this );
m_movixDocPreparer = new K3bMovixDocPreparer( doc, this, this );
// pipe signals
- connect( m_dvdJob, SIGNAL(percent(int)), this, SIGNAL(percent(int)) );
- connect( m_dvdJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) );
- connect( m_dvdJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) );
- connect( m_dvdJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) );
- connect( m_dvdJob, SIGNAL(bufferStatus(int)), this, SIGNAL(bufferStatus(int)) );
- connect( m_dvdJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) );
- connect( m_dvdJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) );
- connect( m_dvdJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) );
- connect( m_dvdJob, SIGNAL(debuggingOutput(const QString&, const QString&)),
- this, SIGNAL(debuggingOutput(const QString&, const QString&)) );
- connect( m_dvdJob, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
- connect( m_dvdJob, SIGNAL(burning(bool)), this, SIGNAL(burning(bool)) );
+ connect( m_dvdJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) );
+ connect( m_dvdJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
+ connect( m_dvdJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
+ connect( m_dvdJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
+ connect( m_dvdJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_dvdJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
+ connect( m_dvdJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) );
+ connect( m_dvdJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) );
+ connect( m_dvdJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)),
+ this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) );
+ connect( m_dvdJob, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
+ connect( m_dvdJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) );
// we need to clean up here
- connect( m_dvdJob, SIGNAL(finished(bool)), this, SLOT(slotDvdJobFinished(bool)) );
+ connect( m_dvdJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDvdJobFinished(bool)) );
- connect( m_movixDocPreparer, SIGNAL(infoMessage(const QString&, int)),
- this, SIGNAL(infoMessage(const QString&, int)) );
+ connect( m_movixDocPreparer, TQT_SIGNAL(infoMessage(const TQString&, int)),
+ this, TQT_SIGNAL(infoMessage(const TQString&, int)) );
}
@@ -109,23 +109,23 @@ void K3bMovixDvdJob::slotDvdJobFinished( bool success )
}
-QString K3bMovixDvdJob::jobDescription() const
+TQString K3bMovixDvdJob::jobDescription() const
{
if( m_doc->isoOptions().volumeID().isEmpty() )
return i18n("Writing eMovix DVD");
else
- return i18n("Writing eMovix DVD (%1)").arg(m_doc->isoOptions().volumeID());
+ return i18n("Writing eMovix DVD (%1)").tqarg(m_doc->isoOptions().volumeID());
}
-QString K3bMovixDvdJob::jobDetails() const
+TQString K3bMovixDvdJob::jobDetails() const
{
return ( i18n("1 file (%1) and about 8 MB eMovix data",
"%n files (%1) and about 8 MB eMovix data",
- m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size()))
+ m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size()))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
- : QString::null ) );
+ : TQString() ) );
}
#include "k3bmovixdvdjob.moc"
diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.h b/libk3b/projects/movixdvd/k3bmovixdvdjob.h
index 2b9ce10..a803b75 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvdjob.h
+++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.h
@@ -31,16 +31,17 @@ class K3bFileItem;
class K3bMovixDvdJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, QObject* parent = 0 );
+ K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 );
~K3bMovixDvdJob();
K3bDoc* doc() const;
K3bDevice::Device* writer() const;
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void start();
diff --git a/libk3b/projects/videocd/cdi/cdi_imag.rtf b/libk3b/projects/videocd/cdi/cdi_imag.rtf
index 809145f..f866494 100644
--- a/libk3b/projects/videocd/cdi/cdi_imag.rtf
+++ b/libk3b/projects/videocd/cdi/cdi_imag.rtf
Binary files differ
diff --git a/libk3b/projects/videocd/cdi/cdi_vcd.app b/libk3b/projects/videocd/cdi/cdi_vcd.app
index ceb31fc..31a7527 100644
--- a/libk3b/projects/videocd/cdi/cdi_vcd.app
+++ b/libk3b/projects/videocd/cdi/cdi_vcd.app
Binary files differ
diff --git a/libk3b/projects/videocd/cdi/icdia.htm b/libk3b/projects/videocd/cdi/icdia.htm
index cd6c47b..53f9121 100644
--- a/libk3b/projects/videocd/cdi/icdia.htm
+++ b/libk3b/projects/videocd/cdi/icdia.htm
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<META HTTP-EQUIV="Refresh" CONTENT="0; URL=http://www.icdia.org/">
+<META HTTP-ETQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<META HTTP-ETQUIV="Refresh" CONTENT="0; URL=http://www.icdia.org/">
<TITLE>The New International CD-i Association</TITLE>
</HEAD>
<BODY>
diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index 462aea3..0898fdf 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -14,14 +14,14 @@
*/
// QT-includes
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qdatastream.h>
-#include <qdom.h>
-#include <qdatetime.h>
-#include <qtimer.h>
-#include <qtextstream.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqfile.h>
+#include <tqdatastream.h>
+#include <tqdom.h>
+#include <tqdatetime.h>
+#include <tqtimer.h>
+#include <tqtextstream.h>
// KDE-includes
#include <kprocess.h>
@@ -49,8 +49,8 @@ bool print_progress = true;
bool aspect_correction = false;
byte forced_sequence_header = 0;
-K3bVcdDoc::K3bVcdDoc( QObject* parent )
- : K3bDoc( parent )
+K3bVcdDoc::K3bVcdDoc( TQObject* tqparent )
+ : K3bDoc( tqparent )
{
m_tracks = 0L;
m_vcdOptions = new K3bVcdOptions();
@@ -58,12 +58,12 @@ K3bVcdDoc::K3bVcdDoc( QObject* parent )
m_docType = VCD;
m_vcdType = NONE;
- m_urlAddingTimer = new QTimer( this );
- connect( m_urlAddingTimer, SIGNAL( timeout() ), this, SLOT( slotWorkUrlQueue() ) );
+ m_urlAddingTimer = new TQTimer( this );
+ connect( m_urlAddingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotWorkUrlQueue() ) );
// FIXME: remove the newTracks() signal and replace it with the changed signal
- connect( this, SIGNAL( newTracks() ), this, SIGNAL( changed() ) );
- connect( this, SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, SIGNAL( changed() ) );
+ connect( this, TQT_SIGNAL( newTracks() ), this, TQT_SIGNAL( changed() ) );
+ connect( this, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQT_SIGNAL( changed() ) );
}
K3bVcdDoc::~K3bVcdDoc()
@@ -82,14 +82,14 @@ bool K3bVcdDoc::newDocument()
while ( m_tracks->first() )
removeTrack( m_tracks->first() );
else
- m_tracks = new QPtrList<K3bVcdTrack>;
+ m_tracks = new TQPtrList<K3bVcdTrack>;
m_tracks->setAutoDelete( false );
return K3bDoc::newDocument();
}
-QString K3bVcdDoc::name() const
+TQString K3bVcdDoc::name() const
{
return m_vcdOptions->volumeId();
}
@@ -133,8 +133,8 @@ K3b::Msf K3bVcdDoc::length() const
bool K3bVcdDoc::isImage( const KURL& url )
{
- QImage p;
- return p.load( QFile::encodeName( url.path() ) );
+ TQImage p;
+ return p.load( TQFile::encodeName( url.path() ) );
}
void K3bVcdDoc::addUrls( const KURL::List& urls )
@@ -168,7 +168,7 @@ void K3bVcdDoc::slotWorkUrlQueue()
return ;
}
- if ( !QFile::exists( item->url.path() ) ) {
+ if ( !TQFile::exists( item->url.path() ) ) {
kdDebug() << "(K3bVcdDoc) file not found: " << item->url.path() << endl;
m_notFoundFiles.append( item->url.path() );
return ;
@@ -195,8 +195,8 @@ void K3bVcdDoc::slotWorkUrlQueue()
K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
{
char filename[ 255 ];
- QString error_string = "";
- strcpy( filename, QFile::encodeName( url.path() ) );
+ TQString error_string = "";
+ strcpy( filename, TQFile::encodeName( url.path() ) );
K3bMpegInfo* Mpeg = new K3bMpegInfo( filename );
if ( Mpeg ) {
@@ -211,8 +211,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
i18n( "K3b will create a %1 image from the given MPEG "
"files, but these files must already be in %2 "
"format. K3b does not yet resample MPEG files." )
- .arg( i18n( "VCD" ) )
- .arg( i18n( "VCD" ) ),
+ .tqarg( i18n( "VCD" ) )
+ .tqarg( i18n( "VCD" ) ),
i18n( "Information" ) );
m_urlAddingTimer->start( 0 );
} else if ( vcdType() == NONE ) {
@@ -223,8 +223,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
i18n( "K3b will create a %1 image from the given MPEG "
"files, but these files must already be in %2 "
"format. K3b does not yet resample MPEG files." )
- .arg( i18n( "SVCD" ) )
- .arg( i18n( "SVCD" ) )
+ .tqarg( i18n( "SVCD" ) )
+ .tqarg( i18n( "SVCD" ) )
+ "\n\n"
+ i18n( "Note: Forcing MPEG2 as VCD is not supported by "
"some standalone DVD players." ),
@@ -336,7 +336,7 @@ void K3bVcdDoc::removeTrack( K3bVcdTrack* track )
}
// set the current item to track
- if ( m_tracks->findRef( track ) >= 0 ) {
+ if ( m_tracks->tqfindRef( track ) >= 0 ) {
// take the current item
track = m_tracks->take();
@@ -374,12 +374,12 @@ void K3bVcdDoc::moveTrack( const K3bVcdTrack* track, const K3bVcdTrack* after )
return ;
// set the current item to track
- m_tracks->findRef( track );
+ m_tracks->tqfindRef( track );
// take the current item
track = m_tracks->take();
- // if after == 0 findRef returnes -1
- int pos = m_tracks->findRef( after );
+ // if after == 0 tqfindRef returnes -1
+ int pos = m_tracks->tqfindRef( after );
m_tracks->insert( pos + 1, track );
// reorder pbc tracks
@@ -389,15 +389,15 @@ void K3bVcdDoc::moveTrack( const K3bVcdTrack* track, const K3bVcdTrack* after )
}
-QString K3bVcdDoc::typeString() const
+TQString K3bVcdDoc::typeString() const
{
return "vcd";
}
-K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent )
+K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
{
- return new K3bVcdJob( this, hdl, parent );
+ return new K3bVcdJob( this, hdl, tqparent );
}
void K3bVcdDoc::informAboutNotFoundFiles()
@@ -448,9 +448,9 @@ void K3bVcdDoc::setPbcTracks()
if ( m_tracks ) {
int count = m_tracks->count();
- kdDebug() << QString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).arg( count ) << endl;
+ kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).tqarg( count ) << endl;
- QPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks );
+ TQPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks );
K3bVcdTrack* track;
while ( ( track = iterTrack.current() ) != 0 ) {
++iterTrack;
@@ -546,11 +546,11 @@ void K3bVcdDoc::setPbcTracks()
}
-bool K3bVcdDoc::loadDocumentData( QDomElement* root )
+bool K3bVcdDoc::loadDocumentData( TQDomElement* root )
{
newDocument();
- QDomNodeList nodes = root->childNodes();
+ TQDomNodeList nodes = root->childNodes();
if ( nodes.length() < 3 )
return false;
@@ -568,13 +568,13 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root )
// vcd Label
- QDomNodeList vcdNodes = nodes.item( 1 ).childNodes();
+ TQDomNodeList vcdNodes = nodes.item( 1 ).childNodes();
for ( uint i = 0; i < vcdNodes.count(); i++ ) {
- QDomNode item = vcdNodes.item( i );
- QString name = item.nodeName();
+ TQDomNode item = vcdNodes.item( i );
+ TQString name = item.nodeName();
- kdDebug() << QString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).arg( name ) << endl;
+ kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).tqarg( name ) << endl;
if ( name == "volumeId" )
vcdOptions() ->setVolumeId( item.toElement().text() );
@@ -629,14 +629,14 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root )
}
// vcd Tracks
- QDomNodeList trackNodes = nodes.item( 2 ).childNodes();
+ TQDomNodeList trackNodes = nodes.item( 2 ).childNodes();
for ( uint i = 0; i < trackNodes.length(); i++ ) {
// check if url is available
- QDomElement trackElem = trackNodes.item( i ).toElement();
- QString url = trackElem.attributeNode( "url" ).value();
- if ( !QFile::exists( url ) )
+ TQDomElement trackElem = trackNodes.item( i ).toElement();
+ TQString url = trackElem.attributeNode( "url" ).value();
+ if ( !TQFile::exists( url ) )
m_notFoundFiles.append( url );
else {
KURL k;
@@ -645,8 +645,8 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root )
track ->setPlayTime( trackElem.attribute( "playtime", "1" ).toInt() );
track ->setWaitTime( trackElem.attribute( "waittime", "2" ).toInt() );
track ->setReactivity( trackElem.attribute( "reactivity", "0" ).toInt() );
- track -> setPbcNumKeys( ( trackElem.attribute( "numkeys", "yes" ).contains( "yes" ) ) ? true : false );
- track -> setPbcNumKeysUserdefined( ( trackElem.attribute( "userdefinednumkeys", "no" ).contains( "yes" ) ) ? true : false );
+ track -> setPbcNumKeys( ( trackElem.attribute( "numkeys", "yes" ).tqcontains( "yes" ) ) ? true : false );
+ track -> setPbcNumKeysUserdefined( ( trackElem.attribute( "userdefinednumkeys", "no" ).tqcontains( "yes" ) ) ? true : false );
addTrack( track, m_tracks->count() );
}
@@ -662,12 +662,12 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root )
int val;
bool pbctrack;
for ( uint trackId = 0; trackId < trackNodes.length(); trackId++ ) {
- QDomElement trackElem = trackNodes.item( trackId ).toElement();
- QDomNodeList trackNodes = trackElem.childNodes();
+ TQDomElement trackElem = trackNodes.item( trackId ).toElement();
+ TQDomNodeList trackNodes = trackElem.childNodes();
for ( uint i = 0; i < trackNodes.length(); i++ ) {
- QDomElement trackElem = trackNodes.item( i ).toElement();
- QString name = trackElem.tagName();
- if ( name.contains( "pbc" ) ) {
+ TQDomElement trackElem = trackNodes.item( i ).toElement();
+ TQString name = trackElem.tagName();
+ if ( name.tqcontains( "pbc" ) ) {
if ( trackElem.hasAttribute ( "type" ) ) {
type = trackElem.attribute ( "type" ).toInt();
if ( trackElem.hasAttribute ( "pbctrack" ) ) {
@@ -688,7 +688,7 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root )
}
}
}
- } else if ( name.contains( "numkeys" ) ) {
+ } else if ( name.tqcontains( "numkeys" ) ) {
if ( trackElem.hasAttribute ( "key" ) ) {
int key = trackElem.attribute ( "key" ).toInt();
if ( trackElem.hasAttribute ( "val" ) ) {
@@ -717,15 +717,15 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root )
-bool K3bVcdDoc::saveDocumentData( QDomElement * docElem )
+bool K3bVcdDoc::saveDocumentData( TQDomElement * docElem )
{
- QDomDocument doc = docElem->ownerDocument();
+ TQDomDocument doc = docElem->ownerDocument();
saveGeneralDocumentData( docElem );
// save Vcd Label
- QDomElement vcdMain = doc.createElement( "vcd" );
+ TQDomElement vcdMain = doc.createElement( "vcd" );
- QDomElement vcdElem = doc.createElement( "volumeId" );
+ TQDomElement vcdElem = doc.createElement( "volumeId" );
vcdElem.appendChild( doc.createTextNode( vcdOptions() ->volumeId() ) );
vcdMain.appendChild( vcdElem );
@@ -749,98 +749,98 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem )
// systemId()
vcdElem = doc.createElement( "vcdType" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdType() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdType() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "mpegVersion" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->mpegVersion() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->mpegVersion() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "PreGapLeadout" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PreGapLeadout() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PreGapLeadout() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "PreGapTrack" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PreGapTrack() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PreGapTrack() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "FrontMarginTrack" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->FrontMarginTrack() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->FrontMarginTrack() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "RearMarginTrack" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RearMarginTrack() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RearMarginTrack() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "FrontMarginTrackSVCD" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->FrontMarginTrackSVCD() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->FrontMarginTrackSVCD() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "RearMarginTrackSVCD" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RearMarginTrackSVCD() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RearMarginTrackSVCD() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "volumeCount" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->volumeCount() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->volumeCount() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "volumeNumber" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->volumeNumber() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->volumeNumber() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "AutoDetect" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->AutoDetect() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->AutoDetect() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "CdiSupport" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->CdiSupport() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->CdiSupport() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "NonCompliantMode" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->NonCompliantMode() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->NonCompliantMode() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "Sector2336" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->Sector2336() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->Sector2336() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "UpdateScanOffsets" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->UpdateScanOffsets() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->UpdateScanOffsets() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "RelaxedAps" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RelaxedAps() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RelaxedAps() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "UseGaps" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->UseGaps() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->UseGaps() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "PbcEnabled" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PbcEnabled() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PbcEnabled() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "SegmentFolder" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->SegmentFolder() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->SegmentFolder() ) ) );
vcdMain.appendChild( vcdElem );
vcdElem = doc.createElement( "Restriction" );
- vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->Restriction() ) ) );
+ vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->Restriction() ) ) );
vcdMain.appendChild( vcdElem );
docElem->appendChild( vcdMain );
// save the tracks
// -------------------------------------------------------------
- QDomElement contentsElem = doc.createElement( "contents" );
+ TQDomElement contentsElem = doc.createElement( "contents" );
- QPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks );
+ TQPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks );
K3bVcdTrack* track;
while ( ( track = iterTrack.current() ) != 0 ) {
++iterTrack;
- QDomElement trackElem = doc.createElement( "track" );
+ TQDomElement trackElem = doc.createElement( "track" );
trackElem.setAttribute( "url", KIO::decodeFileName( track->absPath() ) );
trackElem.setAttribute( "playtime", track->getPlayTime() );
trackElem.setAttribute( "waittime", track->getWaitTime() );
@@ -853,7 +853,7 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem )
i++ ) {
if ( track->isPbcUserDefined( i ) ) {
// save pbcTracks
- QDomElement pbcElem = doc.createElement( "pbc" );
+ TQDomElement pbcElem = doc.createElement( "pbc" );
pbcElem.setAttribute( "type", i );
if ( track->getPbcTrack( i ) ) {
pbcElem.setAttribute( "pbctrack", "yes" );
@@ -865,13 +865,13 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem )
trackElem.appendChild( pbcElem );
}
}
- QMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey();
- QMap<int, K3bVcdTrack*>::const_iterator trackIt;
+ TQMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey();
+ TQMap<int, K3bVcdTrack*>::const_iterator trackIt;
for ( trackIt = numKeyMap.begin();
trackIt != numKeyMap.end();
++trackIt ) {
- QDomElement numElem = doc.createElement( "numkeys" );
+ TQDomElement numElem = doc.createElement( "numkeys" );
if ( trackIt.data() ) {
numElem.setAttribute( "key", trackIt.key() );
numElem.setAttribute( "val", trackIt.data() ->index() + 1 );
diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h
index 8b10837..4f24200 100644
--- a/libk3b/projects/videocd/k3bvcddoc.h
+++ b/libk3b/projects/videocd/k3bvcddoc.h
@@ -16,14 +16,14 @@
#ifndef K3BVCDDOC_H
#define K3BVCDDOC_H
-// Qt Includes
-#include <qptrqueue.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qtextstream.h>
-#include <qimage.h>
+// TQt Includes
+#include <tqptrqueue.h>
+#include <tqfile.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
+#include <tqtextstream.h>
+#include <tqimage.h>
// Kde Includes
#include <kurl.h>
@@ -37,10 +37,10 @@ class K3bApp;
class K3bVcdTrack;
class K3bVcdJob;
//class K3bView;
-class QWidget;
-class QTimer;
-class QDomDocument;
-class QDomElement;
+class TQWidget;
+class TQTimer;
+class TQDomDocument;
+class TQDomElement;
class KConfig;
@@ -48,16 +48,17 @@ class KConfig;
class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bVcdDoc( QObject* );
+ K3bVcdDoc( TQObject* );
~K3bVcdDoc();
int type() const { return VCD; }
- QString name() const;
+ TQString name() const;
- enum vcdTypes { VCD11, VCD20, SVCD10, HQVCD, NONE};
+ enum vcdTypes { VCD11, VCD20, SVCD10, HTQVCD, NONE};
bool newDocument();
int numOfTracks() const
@@ -65,11 +66,11 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
return m_tracks->count();
}
- const QString& vcdImage() const
+ const TQString& vcdImage() const
{
return m_vcdImage;
}
- void setVcdImage( const QString& s )
+ void setVcdImage( const TQString& s )
{
m_vcdImage = s;
}
@@ -99,7 +100,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
return m_tracks->take( i );
}
- const QPtrList<K3bVcdTrack>* tracks() const
+ const TQPtrList<K3bVcdTrack>* tracks() const
{
return m_tracks;
}
@@ -108,7 +109,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
KIO::filesize_t size() const;
K3b::Msf length() const;
- K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent );
+ K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent );
K3bVcdOptions* vcdOptions() const
{
return m_vcdOptions;
@@ -149,18 +150,18 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
protected:
/** reimplemented from K3bDoc */
- bool loadDocumentData( QDomElement* root );
+ bool loadDocumentData( TQDomElement* root );
/** reimplemented from K3bDoc */
- bool saveDocumentData( QDomElement* );
+ bool saveDocumentData( TQDomElement* );
- QString typeString() const;
+ TQString typeString() const;
private:
K3bVcdTrack* createTrack( const KURL& url );
void informAboutNotFoundFiles();
- QStringList m_notFoundFiles;
- QString m_vcdImage;
+ TQStringList m_notFoundFiles;
+ TQString m_vcdImage;
class PrivateUrlToAdd
{
@@ -173,10 +174,10 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
};
/** Holds all the urls that have to be added to the list of tracks. **/
- QPtrQueue<PrivateUrlToAdd> urlsToAdd;
- QTimer* m_urlAddingTimer;
+ TQPtrQueue<PrivateUrlToAdd> urlsToAdd;
+ TQTimer* m_urlAddingTimer;
- QPtrList<K3bVcdTrack>* m_tracks;
+ TQPtrList<K3bVcdTrack>* m_tracks;
KIO::filesize_t calcTotalSize() const;
KIO::filesize_t ISOsize() const;
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index a1b347a..156c79a 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -20,13 +20,13 @@
#include <ktempfile.h>
#include <kio/global.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qtimer.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqfile.h>
+#include <tqtimer.h>
#include <kdebug.h>
-#include <qregexp.h>
-#include <qdom.h>
+#include <tqregexp.h>
+#include <tqdom.h>
#include "k3bvcdjob.h"
@@ -43,8 +43,8 @@
#include <k3bcdrecordwriter.h>
#include <k3bcdrdaowriter.h>
-K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bBurnJob( jh, parent, name )
+K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bBurnJob( jh, tqparent, name )
{
m_doc = doc;
m_doc->setCopies( m_doc->dummy() || m_doc->onlyCreateImages() ? 1 : m_doc->copies() );
@@ -104,20 +104,20 @@ void K3bVcdJob::cancelAll()
}
// remove bin-file if it is unfinished or the user selected to remove image
- if ( QFile::exists( m_doc->vcdImage() ) ) {
+ if ( TQFile::exists( m_doc->vcdImage() ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) {
- emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS );
- QFile::remove
+ emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS );
+ TQFile::remove
( m_doc->vcdImage() );
m_doc->setVcdImage( "" );
}
}
// remove cue-file if it is unfinished or the user selected to remove image
- if ( QFile::exists( m_cueFile ) ) {
+ if ( TQFile::exists( m_cueFile ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) {
- emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS );
- QFile::remove
+ emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS );
+ TQFile::remove
( m_cueFile );
m_cueFile = "";
}
@@ -133,7 +133,7 @@ void K3bVcdJob::start()
emit burning( false );
m_canceled = false;
- int pos = QString( m_doc->vcdImage() ).find( ".bin", QString( m_doc->vcdImage() ).length() - 4 );
+ int pos = TQString( m_doc->vcdImage() ).tqfind( ".bin", TQString( m_doc->vcdImage() ).length() - 4 );
if ( pos > 0 ) {
m_cueFile = m_doc->vcdImage().left( pos ) + ".cue";
} else {
@@ -184,8 +184,8 @@ void K3bVcdJob::vcdxBuild()
const K3bExternalBin* bin = k3bcore ->externalBinManager() ->binObject( "vcdxbuild" );
if ( !bin ) {
kdDebug() << "(K3bVcdJob) could not find vcdxbuild executable" << endl;
- emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxbuild" ), K3bJob::ERROR );
- emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).arg( ">= 0.7.12" ), K3bJob::INFO );
+ emit infoMessage( i18n( "Could not tqfind %1 executable." ).tqarg( "vcdxbuild" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll();
jobFinished( false );
@@ -194,7 +194,7 @@ void K3bVcdJob::vcdxBuild()
if ( bin->version < K3bVersion( "0.7.12" ) ) {
kdDebug() << "(K3bVcdJob) vcdxbuild executable too old!" << endl;
- emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).arg( "Vcdxbuild" ).arg( "0.7.12" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).tqarg( "Vcdxbuild" ).tqarg( "0.7.12" ), K3bJob::ERROR );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll();
jobFinished( false );
@@ -202,13 +202,13 @@ void K3bVcdJob::vcdxBuild()
}
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 );
*m_process << bin;
// additional user parameters from config
- const QStringList& params = k3bcore->externalBinManager() ->program( "vcdxbuild" ) ->userParameters();
- for ( QStringList::const_iterator it = params.begin(); it != params.end(); ++it )
+ const TQStringList& params = k3bcore->externalBinManager() ->program( "vcdxbuild" ) ->userParameters();
+ for ( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it )
*m_process << *it;
@@ -219,25 +219,25 @@ void K3bVcdJob::vcdxBuild()
*m_process << "--progress" << "--gui";
- *m_process << QString( "--cue-file=%1" ).arg( m_cueFile );
+ *m_process << TQString( "--cue-file=%1" ).tqarg( m_cueFile );
- *m_process << QString( "--bin-file=%1" ).arg( m_doc->vcdImage() );
+ *m_process << TQString( "--bin-file=%1" ).tqarg( m_doc->vcdImage() );
- *m_process << QString( "%1" ).arg( QFile::encodeName( m_xmlFile ) );
+ *m_process << TQString( "%1" ).tqarg( TQFile::encodeName( m_xmlFile ).data() );
- connect( m_process, SIGNAL( receivedStderr( KProcess*, char*, int ) ),
- this, SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) );
- connect( m_process, SIGNAL( receivedStdout( KProcess*, char*, int ) ),
- this, SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) );
- connect( m_process, SIGNAL( processExited( KProcess* ) ),
- this, SLOT( slotVcdxBuildFinished() ) );
+ connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
+ this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) );
+ connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
+ this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) );
+ connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ),
+ this, TQT_SLOT( slotVcdxBuildFinished() ) );
// vcdxbuild commandline parameters
kdDebug() << "***** vcdxbuild parameters:" << endl;
;
- const QValueList<QCString>& args = m_process->args();
- QString s;
- for ( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+ const TQValueList<TQCString>& args = m_process->args();
+ TQString s;
+ for ( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
s += *it + " ";
}
kdDebug() << s << flush << endl;
@@ -245,7 +245,7 @@ void K3bVcdJob::vcdxBuild()
if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
kdDebug() << "(K3bVcdJob) could not start vcdxbuild" << endl;
- emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxbuild" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxbuild" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
}
@@ -253,44 +253,44 @@ void K3bVcdJob::vcdxBuild()
void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len )
{
- QString buffer = QString::fromLocal8Bit( output, len );
+ TQString buffer = TQString::fromLocal8Bit( output, len );
// split to lines
- QStringList lines = QStringList::split( "\n", buffer );
+ TQStringList lines = TQStringList::split( "\n", buffer );
- QDomDocument xml_doc;
- QDomElement xml_root;
+ TQDomDocument xml_doc;
+ TQDomElement xml_root;
// do every line
- for ( QStringList::Iterator str = lines.begin(); str != lines.end(); ++str ) {
+ for ( TQStringList::Iterator str = lines.begin(); str != lines.end(); ++str ) {
*str = ( *str ).stripWhiteSpace();
emit debuggingOutput( "vcdxbuild", *str );
- xml_doc.setContent( QString( "<?xml version='1.0'?><vcdxbuild>" ) + *str + "</vcdxbuild>" );
+ xml_doc.setContent( TQString( "<?xml version='1.0'?><vcdxbuild>" ) + *str + "</vcdxbuild>" );
xml_root = xml_doc.documentElement();
// There should be only one... but ...
- for ( QDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) {
- QDomElement el = node.toElement();
+ for ( TQDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) {
+ TQDomElement el = node.toElement();
if ( el.isNull() )
continue;
- const QString tagName = el.tagName().lower();
+ const TQString tagName = el.tagName().lower();
if ( tagName == "progress" ) {
- const QString oper = el.attribute( "operation" ).lower();
+ const TQString oper = el.attribute( "operation" ).lower();
const unsigned long long pos = el.attribute( "position" ).toLong();
const long long size = el.attribute( "size" ).toLong();
if ( oper == "scan" ) {
// Scan Video Files
if ( m_stage == stageUnknown || pos < m_bytesFinished ) {
- const uint index = el.attribute( "id" ).replace( QRegExp( "sequence-" ), "" ).toUInt();
+ const uint index = el.attribute( "id" ).tqreplace( TQRegExp( "sequence-" ), "" ).toUInt();
m_currentWrittenTrack = m_doc->at( m_currentWrittenTrackNumber );
- emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).arg( index + 1 ).arg( doc() ->numOfTracks() ).arg( m_currentWrittenTrack->fileName() ) );
+ emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).tqarg( index + 1 ).tqarg( doc() ->numOfTracks() ).tqarg( m_currentWrittenTrack->fileName() ) );
m_bytesFinished = 0;
if ( !firstTrack ) {
@@ -319,20 +319,20 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len )
return ;
}
} else if ( tagName == "log" ) {
- QDomText tel = el.firstChild().toText();
- const QString level = el.attribute( "level" ).lower();
+ TQDomText tel = el.firstChild().toText();
+ const TQString level = el.attribute( "level" ).lower();
if ( tel.isText() ) {
- const QString text = tel.data();
+ const TQString text = tel.data();
if ( m_stage == stageWrite && level == "information" )
- kdDebug() << QString( "(K3bVcdJob) VcdxBuild information, %1" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).tqarg( text ) << endl;
if ( ( text ).startsWith( "writing track" ) )
- emit newSubTask( i18n( "Creating Image for track %1" ).arg( ( text ).mid( 14 ) ) );
+ emit newSubTask( i18n( "Creating Image for track %1" ).tqarg( ( text ).mid( 14 ) ) );
else {
if ( level != "error" ) {
- kdDebug() << QString( "(K3bVcdJob) vcdxbuild warning, %1" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).tqarg( text ) << endl;
parseInformation( text );
} else {
- kdDebug() << QString( "(K3bVcdJob) vcdxbuild error, %1" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).tqarg( text ) << endl;
emit infoMessage( text, K3bJob::ERROR );
}
}
@@ -353,7 +353,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
m_imageFinished = true;
break;
default:
- emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxbuild" ).arg( m_process->exitStatus() ),
+ emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxbuild" ).tqarg( m_process->exitStatus() ),
K3bJob::ERROR );
emit infoMessage( i18n( "Please send me an email with the last output." ), K3bJob::ERROR );
cancelAll();
@@ -361,18 +361,18 @@ void K3bVcdJob::slotVcdxBuildFinished()
return ;
}
} else {
- emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxbuild" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxbuild" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
return ;
}
//remove xml-file
- if ( QFile::exists( m_xmlFile ) )
- QFile::remove
+ if ( TQFile::exists( m_xmlFile ) )
+ TQFile::remove
( m_xmlFile );
- kdDebug() << QString( "(K3bVcdJob) create only image: %1" ).arg( vcdDoc() ->onlyCreateImages() ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).tqarg( vcdDoc() ->onlyCreateImages() ) << endl;
if ( !vcdDoc() ->onlyCreateImages() )
startWriterjob();
else
@@ -381,7 +381,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
void K3bVcdJob::startWriterjob()
{
- kdDebug() << QString( "(K3bVcdJob) writing copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) << endl;
if ( prepareWriterJob() ) {
if ( waitForMedia( m_doc->burner() ) < 0 ) {
cancel();
@@ -392,7 +392,7 @@ void K3bVcdJob::startWriterjob()
return ;
if ( m_doc->copies() > 1 )
- emit newTask( i18n( "Writing Copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) );
+ emit newTask( i18n( "Writing Copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) );
emit burning( true );
m_writerJob->start();
@@ -432,19 +432,19 @@ bool K3bVcdJob::prepareWriterJob()
}
- 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, SLOT( slotProcessedSize( 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( 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( slotWriterJobPercent( int ) ) );
+ connect( m_writerJob, TQT_SIGNAL( processedSize( int, int ) ), this, TQT_SLOT( slotProcessedSize( 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( 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& ) ) );
return true;
}
@@ -461,7 +461,7 @@ void K3bVcdJob::slotProcessedSize( int cs, int ts )
void K3bVcdJob::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 ) );
}
void K3bVcdJob::slotWriterJobFinished( bool success )
@@ -471,20 +471,20 @@ void K3bVcdJob::slotWriterJobFinished( bool success )
if ( m_currentcopy >= m_doc->copies() ) {
// remove bin-file if it is unfinished or the user selected to remove image
- if ( QFile::exists( m_doc->vcdImage() ) ) {
+ if ( TQFile::exists( m_doc->vcdImage() ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) {
- emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS );
- QFile::remove
+ emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS );
+ TQFile::remove
( m_doc->vcdImage() );
m_doc->setVcdImage( "" );
}
}
// remove cue-file if it is unfinished or the user selected to remove image
- if ( QFile::exists( m_cueFile ) ) {
+ if ( TQFile::exists( m_cueFile ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) {
- emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS );
- QFile::remove
+ emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS );
+ TQFile::remove
( m_cueFile );
m_cueFile = "";
}
@@ -506,38 +506,38 @@ void K3bVcdJob::slotWriterJobFinished( bool success )
}
}
-void K3bVcdJob::parseInformation( const QString &text )
+void K3bVcdJob::parseInformation( const TQString &text )
{
// parse warning
- if ( text.contains( "mpeg user scan data: one or more BCD fields out of range for" ) ) {
- int index = text.find( " for" );
+ if ( text.tqcontains( "mpeg user scan data: one or more BCD fields out of range for" ) ) {
+ int index = text.tqfind( " for" );
- emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).arg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING );
+ emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).tqarg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING );
- } else if ( text.contains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) {
+ } else if ( text.tqcontains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) {
emit infoMessage( i18n( "From now on, scan information data errors will not be reported anymore" ), K3bJob::INFO );
emit infoMessage( i18n( "Consider enabling the 'update scan offsets' option, if it is not enabled already." ), K3bJob::INFO );
- } else if ( text.contains( "APS' pts seems out of order (actual pts" ) ) {
- int index = text.find( "(actual pts" );
- int index2 = text.find( ", last seen pts" );
- int index3 = text.find( ") -- ignoring this aps" );
+ } else if ( text.tqcontains( "APS' pts seems out of order (actual pts" ) ) {
+ int index = text.tqfind( "(actual pts" );
+ int index2 = text.tqfind( ", last seen pts" );
+ int index3 = text.tqfind( ") -- ignoring this aps" );
- emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).arg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).arg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING );
+ emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).tqarg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING );
emit infoMessage( i18n( "Ignoring this aps" ), K3bJob::INFO );
- } else if ( text.contains( "bad packet at packet" ) ) {
- int index = text.find( "at packet #" );
- int index2 = text.find( "(stream byte offset" );
- int index3 = text.find( ") -- remaining " );
- int index4 = text.find( "bytes of stream will be ignored" );
+ } else if ( text.tqcontains( "bad packet at packet" ) ) {
+ int index = text.tqfind( "at packet #" );
+ int index2 = text.tqfind( "(stream byte offset" );
+ int index3 = text.tqfind( ") -- remaining " );
+ int index4 = text.tqfind( "bytes of stream will be ignored" );
- emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).arg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).arg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING );
- emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).arg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING );
+ emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).tqarg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING );
+ emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).tqarg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING );
}
}
-QString K3bVcdJob::jobDescription() const
+TQString K3bVcdJob::jobDescription() const
{
switch ( m_doc->vcdType() ) {
case K3bVcdDoc::VCD11:
@@ -546,7 +546,7 @@ QString K3bVcdJob::jobDescription() const
return i18n( "Writing Video CD (Version 2.0)" );
case K3bVcdDoc::SVCD10:
return i18n( "Writing Super Video CD" );
- case K3bVcdDoc::HQVCD:
+ case K3bVcdDoc::HTQVCD:
return i18n( "Writing High-Quality Video CD" );
default:
return i18n( "Writing Video CD" );
@@ -554,14 +554,14 @@ QString K3bVcdJob::jobDescription() const
}
-QString K3bVcdJob::jobDetails() const
+TQString K3bVcdJob::jobDetails() const
{
return ( i18n( "1 MPEG (%1)",
"%n MPEGs (%1)",
- m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) )
+ m_doc->tracks() ->count() ).tqarg( KIO::convertSize( m_doc->size() ) )
+ ( m_doc->copies() > 1
? i18n( " - %n copy", " - %n copies", m_doc->copies() )
- : QString::null ) );
+ : TQString() ) );
}
#include "k3bvcdjob.moc"
diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h
index 917c8b1..96d9026 100644
--- a/libk3b/projects/videocd/k3bvcdjob.h
+++ b/libk3b/projects/videocd/k3bvcdjob.h
@@ -20,10 +20,10 @@
class K3bVcdDoc;
class K3bVcdTrack;
-class QString;
+class TQString;
class K3bProcess;
class KProcess;
-class QDataStream;
+class TQDataStream;
class K3bAbstractWriter;
class K3bDevice::Device;
@@ -31,9 +31,10 @@ class K3bDevice::Device;
class K3bVcdJob : public K3bBurnJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
~K3bVcdJob();
K3bDoc* doc() const;
@@ -43,8 +44,8 @@ class K3bVcdJob : public K3bBurnJob
}
K3bDevice::Device* writer() const;
- QString jobDescription() const;
- QString jobDetails() const;
+ TQString jobDescription() const;
+ TQString jobDetails() const;
public slots:
void start();
@@ -68,7 +69,7 @@ class K3bVcdJob : public K3bBurnJob
void xmlGen();
void vcdxBuild();
- void parseInformation( const QString& );
+ void parseInformation( const TQString& );
void startWriterjob();
int m_copies;
@@ -103,10 +104,10 @@ class K3bVcdJob : public K3bBurnJob
bool m_imageFinished;
bool m_canceled;
- QString m_tempPath;
- QString m_cueFile;
- QString m_xmlFile;
- QString m_collectedOutput;
+ TQString m_tempPath;
+ TQString m_cueFile;
+ TQString m_xmlFile;
+ TQString m_collectedOutput;
K3bAbstractWriter* m_writerJob;
K3bProcess* m_process;
diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp
index 6009a4a..854919f 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.cpp
+++ b/libk3b/projects/videocd/k3bvcdoptions.cpp
@@ -20,9 +20,9 @@
#include <klocale.h>
#include <kstandarddirs.h>
-// Qt Includes
-#include <qstring.h>
-#include <qfile.h>
+// TQt Includes
+#include <tqstring.h>
+#include <tqfile.h>
// K3b Includes
#include "k3bvcdoptions.h"
@@ -37,7 +37,7 @@ K3bVcdOptions::K3bVcdOptions()
m_volumeID( "VIDEOCD" ),
m_albumID( "" ),
m_volumeSetId( "" ),
- m_publisher( QString( "K3b - Version %1" ).arg( k3bcore->version() ) ),
+ m_publisher( TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ) ),
m_applicationId( "CDI/CDI_VCD.APP;1" ),
m_systemId( "CD-RTOS CD-BRIDGE" ),
m_vcdclass( "vcd" ),
@@ -65,19 +65,19 @@ K3bVcdOptions::K3bVcdOptions()
bool K3bVcdOptions::checkCdiFiles()
{
m_cdisize = 0;
- if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ) )
+ if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ) )
return false;
- if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_text.fnt" ) ) )
+ if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_text.fnt" ) ) )
return false;
- if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_vcd.app" ) ) )
+ if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_vcd.app" ) ) )
return false;
- if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ) )
+ if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ) )
return false;
- m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ).size();
- m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_text.fnt" ) ).size();
- m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_vcd.app" ) ).size();
- m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ).size();
+ m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ).size();
+ m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_text.fnt" ) ).size();
+ m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_vcd.app" ) ).size();
+ m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ).size();
return true;
}
diff --git a/libk3b/projects/videocd/k3bvcdoptions.h b/libk3b/projects/videocd/k3bvcdoptions.h
index aa5fed2..420e593 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.h
+++ b/libk3b/projects/videocd/k3bvcdoptions.h
@@ -16,7 +16,7 @@
#ifndef K3B_VCD_OPTIONS_H
#define K3B_VCD_OPTIONS_H
-#include <qstring.h>
+#include <tqstring.h>
#include "k3b_export.h"
class KConfigBase;
@@ -25,41 +25,41 @@ class LIBK3B_EXPORT K3bVcdOptions
{
public:
K3bVcdOptions();
- const QString& volumeId() const
+ const TQString& volumeId() const
{
return m_volumeID;
}
- const QString& albumId() const
+ const TQString& albumId() const
{
return m_albumID;
}
- const QString& volumeSetId() const
+ const TQString& volumeSetId() const
{
return m_volumeSetId;
}
- const QString& preparer() const
+ const TQString& preparer() const
{
return m_preparer;
}
- const QString& publisher() const
+ const TQString& publisher() const
{
return m_publisher;
}
- const QString& applicationId() const
+ const TQString& applicationId() const
{
return m_applicationId;
}
- const QString& systemId() const
+ const TQString& systemId() const
{
return m_systemId;
}
- const QString& vcdClass() const
+ const TQString& vcdClass() const
{
return m_vcdclass;
}
- const QString& vcdVersion() const
+ const TQString& vcdVersion() const
{
return m_vcdversion;
}
@@ -140,32 +140,32 @@ class LIBK3B_EXPORT K3bVcdOptions
return m_cdisize;
}
- void setAlbumId( const QString& s )
+ void setAlbumId( const TQString& s )
{
m_albumID = s;
}
- void setVolumeId( const QString& s )
+ void setVolumeId( const TQString& s )
{
m_volumeID = s;
}
- void setVolumeSetId( const QString& s )
+ void setVolumeSetId( const TQString& s )
{
m_volumeSetId = s;
}
- void setPreparer( const QString& s )
+ void setPreparer( const TQString& s )
{
m_preparer = s;
}
- void setPublisher( const QString& s )
+ void setPublisher( const TQString& s )
{
m_publisher = s;
}
- void setVcdClass( const QString& s )
+ void setVcdClass( const TQString& s )
{
m_vcdclass = s;
}
- void setVcdVersion( const QString& s )
+ void setVcdVersion( const TQString& s )
{
m_vcdversion = s;
}
@@ -335,18 +335,18 @@ class LIBK3B_EXPORT K3bVcdOptions
bool m_pbcnumkeysenabled;
// volume descriptor
- QString m_volumeID;
- QString m_albumID;
- QString m_volumeSetId;
+ TQString m_volumeID;
+ TQString m_albumID;
+ TQString m_volumeSetId;
- QString m_preparer;
- QString m_publisher;
+ TQString m_preparer;
+ TQString m_publisher;
- QString m_applicationId;
- QString m_systemId;
+ TQString m_applicationId;
+ TQString m_systemId;
- QString m_vcdclass;
- QString m_vcdversion;
+ TQString m_vcdclass;
+ TQString m_vcdversion;
int m_pregapleadout;
int m_pregaptrack;
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index 7f0043f..68d04fd 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -16,8 +16,8 @@
#include <kapplication.h>
#include <kconfig.h>
-#include <qstring.h>
-#include <qfileinfo.h>
+#include <tqstring.h>
+#include <tqfileinfo.h>
#include <stdio.h>
#include <sys/types.h>
@@ -30,15 +30,15 @@
#include "k3bvcdtrack.h"
#include <k3bglobals.h>
-K3bVcdTrack::K3bVcdTrack( QPtrList<K3bVcdTrack>* parent, const QString& filename )
+K3bVcdTrack::K3bVcdTrack( TQPtrList<K3bVcdTrack>* tqparent, const TQString& filename )
: m_pbcnumkeys( true ),
m_pbcnumkeysuserdefined( false ),
m_file( filename )
{
- m_parent = parent;
- m_title = QFileInfo( m_file ).baseName( true );
+ m_parent = tqparent;
+ m_title = TQFileInfo( m_file ).baseName( true );
- m_revreflist = new QPtrList<K3bVcdTrack>;
+ m_revreflist = new TQPtrList<K3bVcdTrack>;
for ( int i = 0; i < K3bVcdTrack::_maxPbcTracks; i++ ) {
m_pbctrackmap.insert( i, 0L );
@@ -65,9 +65,9 @@ KIO::filesize_t K3bVcdTrack::size() const
int K3bVcdTrack::index() const
{
- int i = m_parent->find( this );
+ int i = m_parent->tqfind( this );
if ( i < 0 )
- kdDebug() << "(K3bVcdTrack) I'm not part of my parent!" << endl;
+ kdDebug() << "(K3bVcdTrack) I'm not part of my tqparent!" << endl;
return i;
}
@@ -119,23 +119,23 @@ void K3bVcdTrack::delRefFromUs()
void K3bVcdTrack::setPbcTrack( int which, K3bVcdTrack* pbctrack )
{
kdDebug() << "K3bVcdTrack::setPbcTrack " << which << ", " << pbctrack << endl;
- m_pbctrackmap.replace( which, pbctrack );
+ m_pbctrackmap.tqreplace( which, pbctrack );
}
void K3bVcdTrack::setPbcNonTrack( int which, int type )
{
kdDebug() << "K3bVcdTrack::setNonPbcTrack " << which << ", " << type << endl;
- m_pbcnontrackmap.replace( which, type );
+ m_pbcnontrackmap.tqreplace( which, type );
}
void K3bVcdTrack::setUserDefined( int which, bool ud )
{
- m_pbcusrdefmap.replace( which, ud );
+ m_pbcusrdefmap.tqreplace( which, ud );
}
K3bVcdTrack* K3bVcdTrack::getPbcTrack( const int& which )
{
- if ( m_pbctrackmap.find( which ) == m_pbctrackmap.end() )
+ if ( m_pbctrackmap.tqfind( which ) == m_pbctrackmap.end() )
return 0;
else
return m_pbctrackmap[ which ];
@@ -143,7 +143,7 @@ K3bVcdTrack* K3bVcdTrack::getPbcTrack( const int& which )
int K3bVcdTrack::getNonPbcTrack( const int& which )
{
- if ( m_pbcnontrackmap.find( which ) == m_pbcnontrackmap.end() )
+ if ( m_pbcnontrackmap.tqfind( which ) == m_pbcnontrackmap.end() )
return 0;
else
return m_pbcnontrackmap[ which ];
@@ -154,12 +154,12 @@ bool K3bVcdTrack::isPbcUserDefined( int which )
return m_pbcusrdefmap[ which ];
}
-const QString K3bVcdTrack::resolution()
+const TQString K3bVcdTrack::resolution()
{
if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) {
- return QString( "%1 x %2" ).arg( mpeg_info->video[ i ].hsize ).arg( mpeg_info->video[ i ].vsize );
+ return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ i ].hsize ).tqarg( mpeg_info->video[ i ].vsize );
}
}
}
@@ -167,22 +167,22 @@ const QString K3bVcdTrack::resolution()
return i18n( "n/a" );
}
-const QString K3bVcdTrack::highresolution()
+const TQString K3bVcdTrack::highresolution()
{
if ( mpeg_info->has_video ) {
if ( mpeg_info->video[ 2 ].seen ) {
- return QString( "%1 x %2" ).arg( mpeg_info->video[ 2 ].hsize ).arg( mpeg_info->video[ 2 ].vsize );
+ return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ 2 ].hsize ).tqarg( mpeg_info->video[ 2 ].vsize );
}
}
return i18n( "n/a" );
}
-const QString K3bVcdTrack::video_frate()
+const TQString K3bVcdTrack::video_frate()
{
if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) {
- return QString::number( mpeg_info->video[ i ].frate );
+ return TQString::number( mpeg_info->video[ i ].frate );
}
}
}
@@ -190,12 +190,12 @@ const QString K3bVcdTrack::video_frate()
return i18n( "n/a" );
}
-const QString K3bVcdTrack::video_bitrate()
+const TQString K3bVcdTrack::video_bitrate()
{
if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) {
- return i18n( "%1 bit/s" ).arg( mpeg_info->video[ i ].bitrate ) ;
+ return i18n( "%1 bit/s" ).tqarg( mpeg_info->video[ i ].bitrate ) ;
}
}
}
@@ -205,7 +205,7 @@ const QString K3bVcdTrack::video_bitrate()
-const QString K3bVcdTrack::video_format()
+const TQString K3bVcdTrack::video_format()
{
if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) {
@@ -238,24 +238,24 @@ const QString K3bVcdTrack::video_format()
return i18n( "n/a" );
}
-const QString K3bVcdTrack::video_chroma()
+const TQString K3bVcdTrack::video_chroma()
{
if ( mpeg_info->has_video ) {
// MPEG1 only supports 4:2:0 Format
if ( version() == K3bMpegInfo::MPEG_VERS_MPEG1 )
- return QString( "4:2:0" );
+ return TQString( "4:2:0" );
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) {
switch ( mpeg_info->video[ i ].chroma_format ) {
case 1 :
- return QString( "4:2:0" );
+ return TQString( "4:2:0" );
break;
case 2 :
- return QString( "4:2:2" );
+ return TQString( "4:2:2" );
break;
case 3 :
- return QString( "4:4:4" );
+ return TQString( "4:4:4" );
break;
}
@@ -266,12 +266,12 @@ const QString K3bVcdTrack::video_chroma()
return i18n( "n/a" );
}
-const QString K3bVcdTrack::audio_layer()
+const TQString K3bVcdTrack::audio_layer()
{
if ( mpeg_info->has_audio ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->audio[ i ].seen ) {
- return QString::number( mpeg_info->audio[ i ].layer );
+ return TQString::number( mpeg_info->audio[ i ].layer );
}
}
}
@@ -279,12 +279,12 @@ const QString K3bVcdTrack::audio_layer()
return i18n( "n/a" );
}
-const QString K3bVcdTrack::audio_bitrate()
+const TQString K3bVcdTrack::audio_bitrate()
{
if ( mpeg_info->has_audio ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->audio[ i ].seen ) {
- return i18n( "%1 bit/s" ).arg( mpeg_info->audio[ i ].bitrate ) ;
+ return i18n( "%1 bit/s" ).tqarg( mpeg_info->audio[ i ].bitrate ) ;
}
}
}
@@ -292,12 +292,12 @@ const QString K3bVcdTrack::audio_bitrate()
return i18n( "n/a" );
}
-const QString K3bVcdTrack::audio_sampfreq()
+const TQString K3bVcdTrack::audio_sampfreq()
{
if ( mpeg_info->has_audio ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->audio[ i ].seen ) {
- return i18n( "%1 Hz" ).arg( mpeg_info->audio[ i ].sampfreq ) ;
+ return i18n( "%1 Hz" ).tqarg( mpeg_info->audio[ i ].sampfreq ) ;
}
}
}
@@ -305,25 +305,25 @@ const QString K3bVcdTrack::audio_sampfreq()
return i18n( "n/a" );
}
-const QString K3bVcdTrack::audio_mode( )
+const TQString K3bVcdTrack::audio_mode( )
{
if ( mpeg_info->has_audio ) {
for ( int i = 2; i >= 0; i-- )
if ( mpeg_info->audio[ i ].seen )
- return QString( audio_type2str( mpeg_info->audio[ i ].version, mpeg_info->audio[ i ].mode, i ) );
+ return TQString( audio_type2str( mpeg_info->audio[ i ].version, mpeg_info->audio[ i ].mode, i ) );
}
return i18n( "n/a" );
}
-const QString K3bVcdTrack::audio_copyright( )
+const TQString K3bVcdTrack::audio_copyright( )
{
if ( mpeg_info->has_audio ) {
for ( int i = 2; i >= 0; i-- )
if ( mpeg_info->audio[ i ].seen )
if ( mpeg_info->audio[ i ].copyright )
- return QString( "(c) " ) + ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) );
+ return TQString( "(c) " ) + ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) );
else
return ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) );
}
@@ -331,22 +331,22 @@ const QString K3bVcdTrack::audio_copyright( )
return i18n( "n/a" );
}
-const QString K3bVcdTrack::mpegTypeS( bool audio )
+const TQString K3bVcdTrack::mpegTypeS( bool audio )
{
if ( mpeg_info->has_video && !audio ) {
for ( int i = 0; i < 3; i++ )
if ( mpeg_info->video[ i ].seen ) {
if ( i == 0 ) {
- return QString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Motion Picture" );
+ return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Motion Picture" );
} else {
- return QString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Still Picture" );
+ return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Still Picture" );
}
}
}
if ( mpeg_info->has_audio && audio ) {
for ( int i = 0; i < 3; i++ )
if ( mpeg_info->audio[ i ].seen ) {
- return QString( "MPEG%1 " ).arg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).arg( mpeg_info->audio[ i ].layer );
+ return TQString( "MPEG%1 " ).tqarg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).tqarg( mpeg_info->audio[ i ].layer );
}
}
@@ -374,17 +374,17 @@ const int K3bVcdTrack::mpegType( )
return -1; // MPEG_UNKNOWN;
}
-const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int audio_mode, unsigned int audio_type )
+const TQString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int audio_mode, unsigned int audio_type )
{
kdDebug() << "K3bVcdTrack::audio_type2str() version:" << version << " audio_mode:" << audio_mode << " audio_type:" << audio_type << endl;
- QString audio_types[ 3 ][ 5 ] = {
+ TQString audio_types[ 3 ][ 5 ] = {
{
i18n( "unknown" ),
i18n( "invalid" ),
- QString::null,
- QString::null,
- QString::null
+ TQString(),
+ TQString(),
+ TQString()
},
{
i18n( "stereo" ),
@@ -393,11 +393,11 @@ const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int au
i18n( "single channel" )
},
{
- QString::null,
+ TQString(),
i18n( "dual channel" ),
i18n( "surround sound" ),
- QString::null,
- QString::null
+ TQString(),
+ TQString()
}
};
switch ( version ) {
@@ -417,18 +417,18 @@ const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int au
}
// convert a time in second to HH:mm:ss notation
-QString K3bVcdTrack::SecsToHMS( double duration )
+TQString K3bVcdTrack::SecsToHMS( double duration )
{
byte hours = ( byte ) ( duration / 3600 );
byte mins = ( byte ) ( ( duration / 60 ) - ( hours * 60 ) );
float secs = duration - 60 * mins - 3600 * hours;
if ( hours != 0 ) {
- return QString( "%1:" ).arg( hours ).rightJustify( 3, ' ' ) + QString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + QString::number( secs, 'f', 2 );
+ return TQString( "%1:" ).tqarg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
}
if ( mins != 0 ) {
- return QString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + QString::number( secs, 'f', 2 );
+ return TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
}
- return QString::number( secs, 'f', 2 );
+ return TQString::number( secs, 'f', 2 );
}
void K3bVcdTrack::PrintInfo()
diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h
index 0d9a3cf..a06552e 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.h
+++ b/libk3b/projects/videocd/k3bvcdtrack.h
@@ -16,11 +16,11 @@
#ifndef K3BVCDTRACK_H
#define K3BVCDTRACK_H
-// Qt Includes
-#include <qstring.h>
-#include <qfileinfo.h>
-#include <qfile.h>
-#include <qptrlist.h>
+// TQt Includes
+#include <tqstring.h>
+#include <tqfileinfo.h>
+#include <tqfile.h>
+#include <tqptrlist.h>
// Kde Includes
#include <kio/global.h>
@@ -31,25 +31,25 @@
class LIBK3B_EXPORT K3bVcdTrack
{
public:
- K3bVcdTrack( QPtrList<K3bVcdTrack>* parent, const QString& filename );
+ K3bVcdTrack( TQPtrList<K3bVcdTrack>* tqparent, const TQString& filename );
~K3bVcdTrack();
- QString fileName() const
+ TQString fileName() const
{
- return QFileInfo( m_file ).fileName();
+ return TQFileInfo( m_file ).fileName();
}
- QString absPath() const
+ TQString absPath() const
{
- return QFileInfo( m_file ).absFilePath();
+ return TQFileInfo( m_file ).absFilePath();
}
KIO::filesize_t size() const;
int index() const;
- const QString& title() const
+ const TQString& title() const
{
return m_title;
}
- void setTitle( const QString& t )
+ void setTitle( const TQString& t )
{
m_title = t;
}
@@ -131,21 +131,21 @@ class LIBK3B_EXPORT K3bVcdTrack
{
m_definedkeysmap.clear();
}
- QMap<int, K3bVcdTrack*> DefinedNumKey()
+ TQMap<int, K3bVcdTrack*> DefinedNumKey()
{
return m_definedkeysmap;
}
// Mpeg Infos
- const QString resolution();
- const QString highresolution();
- const QString video_frate();
- const QString video_bitrate();
- const QString audio_layer();
- const QString audio_bitrate();
- const QString audio_sampfreq();
+ const TQString resolution();
+ const TQString highresolution();
+ const TQString video_frate();
+ const TQString video_bitrate();
+ const TQString audio_layer();
+ const TQString audio_bitrate();
+ const TQString audio_sampfreq();
- const QString duration()
+ const TQString duration()
{
return SecsToHMS( mpeg_info->playing_time );
};
@@ -157,11 +157,11 @@ class LIBK3B_EXPORT K3bVcdTrack
{
return mpeg_info->muxrate;
};
- const QString video_format( );
- const QString video_chroma( );
- const QString audio_mode( );
- const QString audio_copyright( );
- const QString mpegTypeS( bool audio = false );
+ const TQString video_format( );
+ const TQString video_chroma( );
+ const TQString audio_mode( );
+ const TQString audio_copyright( );
+ const TQString mpegTypeS( bool audio = false );
const int mpegType();
void PrintInfo();
@@ -170,17 +170,17 @@ class LIBK3B_EXPORT K3bVcdTrack
protected:
- const QString audio_type2str( unsigned int , unsigned int, unsigned int );
- QString SecsToHMS( double );
+ const TQString audio_type2str( unsigned int , unsigned int, unsigned int );
+ TQString SecsToHMS( double );
- QPtrList<K3bVcdTrack>* m_parent;
+ TQPtrList<K3bVcdTrack>* m_parent;
// PBC
- QPtrList<K3bVcdTrack>* m_revreflist; // List of Tracks which points to us
- QMap<int, K3bVcdTrack*> m_pbctrackmap; // Pbc Tracks (Previous, Next, ...)
- QMap<int, int> m_pbcnontrackmap; // Pbc NON Track types (Previous, Next, ...)
- QMap<int, bool> m_pbcusrdefmap; // Pbc is userdefined or defaults (Previous, Next, ...)
- QMap<int, K3bVcdTrack*> m_definedkeysmap;
+ TQPtrList<K3bVcdTrack>* m_revreflist; // List of Tracks which points to us
+ TQMap<int, K3bVcdTrack*> m_pbctrackmap; // Pbc Tracks (Previous, Next, ...)
+ TQMap<int, int> m_pbcnontrackmap; // Pbc NON Track types (Previous, Next, ...)
+ TQMap<int, bool> m_pbcusrdefmap; // Pbc is userdefined or defaults (Previous, Next, ...)
+ TQMap<int, K3bVcdTrack*> m_definedkeysmap;
bool m_pbcnumkeys;
bool m_pbcnumkeysuserdefined;
@@ -191,8 +191,8 @@ class LIBK3B_EXPORT K3bVcdTrack
bool m_reactivity;
int m_filetype;
- QFile m_file;
- QString m_title;
+ TQFile m_file;
+ TQString m_title;
};
#endif
diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp
index 0b6f250..0857013 100644
--- a/libk3b/projects/videocd/k3bvcdxmlview.cpp
+++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp
@@ -14,7 +14,7 @@
* See the file "COPYING" for the exact licensing terms.
*/
-#include <qfile.h>
+#include <tqfile.h>
#include <kstandarddirs.h>
#include <kdebug.h>
@@ -35,15 +35,15 @@ K3bVcdXmlView::K3bVcdXmlView( K3bVcdDoc* pDoc )
K3bVcdXmlView::~K3bVcdXmlView()
{}
-bool K3bVcdXmlView::write( const QString& fname )
+bool K3bVcdXmlView::write( const TQString& fname )
{
- QDomDocument xmlDoc( "videocd PUBLIC \"-//GNU//DTD VideoCD//EN\" \"http://www.gnu.org/software/vcdimager/videocd.dtd\"" );
+ TQDomDocument xmlDoc( "videocd PUBLIC \"-//GNU//DTD VideoCD//EN\" \"http://www.gnu.org/software/vcdimager/videocd.dtd\"" );
// xmlDoc.appendChild( xmlDoc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"iso-8859-1\"" ) );
xmlDoc.appendChild( xmlDoc.createProcessingInstruction( "xml", "version=\"1.0\"" ) );
// create root element
- QDomElement root = xmlDoc.createElement( "videocd" );
+ TQDomElement root = xmlDoc.createElement( "videocd" );
root.setAttribute( "xmlns", "http://www.gnu.org/software/vcdimager/1.0/" );
root.setAttribute( "class", m_doc->vcdOptions() ->vcdClass() );
root.setAttribute( "version", m_doc->vcdOptions() ->vcdVersion() );
@@ -53,7 +53,7 @@ bool K3bVcdXmlView::write( const QString& fname )
// Broken SVCD mode - NonCompliantMode
if ( m_doc->vcdOptions() ->NonCompliantMode() ) {
- QDomElement elemOption;
+ TQDomElement elemOption;
elemOption = addSubElement( xmlDoc, root, "option" );
elemOption.setAttribute( "name", "svcd vcd30 mpegav" );
elemOption.setAttribute( "value", "true" );
@@ -65,7 +65,7 @@ bool K3bVcdXmlView::write( const QString& fname )
// VCD3.0 track interpretation
if ( m_doc->vcdOptions() ->VCD30interpretation() ) {
- QDomElement elemOption;
+ TQDomElement elemOption;
elemOption = addSubElement( xmlDoc, root, "option" );
elemOption.setAttribute( "name", "svcd vcd30 tracksvd" );
elemOption.setAttribute( "value", "true" );
@@ -73,7 +73,7 @@ bool K3bVcdXmlView::write( const QString& fname )
// Relaxed aps
if ( m_doc->vcdOptions() ->RelaxedAps() ) {
- QDomElement elemOption;
+ TQDomElement elemOption;
elemOption = addSubElement( xmlDoc, root, "option" );
elemOption.setAttribute( "name", "relaxed aps" );
elemOption.setAttribute( "value", "true" );
@@ -81,7 +81,7 @@ bool K3bVcdXmlView::write( const QString& fname )
// Update scan offsets
if ( m_doc->vcdOptions() ->UpdateScanOffsets() ) {
- QDomElement elemOption;
+ TQDomElement elemOption;
elemOption = addSubElement( xmlDoc, root, "option" );
elemOption.setAttribute( "name", "update scan offsets" );
elemOption.setAttribute( "value", "true" );
@@ -90,7 +90,7 @@ bool K3bVcdXmlView::write( const QString& fname )
// Gaps & Margins
if ( m_doc->vcdOptions() ->UseGaps() ) {
- QDomElement elemOption;
+ TQDomElement elemOption;
elemOption = addSubElement( xmlDoc, root, "option" );
elemOption.setAttribute( "name", "leadout pregap" );
elemOption.setAttribute( "value", m_doc->vcdOptions() ->PreGapLeadout() );
@@ -120,23 +120,23 @@ bool K3bVcdXmlView::write( const QString& fname )
}
// create info element
- QDomElement elemInfo = addSubElement( xmlDoc, root, "info" );
+ TQDomElement elemInfo = addSubElement( xmlDoc, root, "info" );
addSubElement( xmlDoc, elemInfo, "album-id", m_doc->vcdOptions() ->albumId().upper() );
addSubElement( xmlDoc, elemInfo, "volume-count", m_doc->vcdOptions() ->volumeCount() );
addSubElement( xmlDoc, elemInfo, "volume-number", m_doc->vcdOptions() ->volumeNumber() );
addSubElement( xmlDoc, elemInfo, "restriction", m_doc->vcdOptions() ->Restriction() );
// create pvd element
- QDomElement elemPvd = addSubElement( xmlDoc, root, "pvd" );
+ TQDomElement elemPvd = addSubElement( xmlDoc, root, "pvd" );
addSubElement( xmlDoc, elemPvd, "volume-id", m_doc->vcdOptions() ->volumeId().upper() );
addSubElement( xmlDoc, elemPvd, "system-id", m_doc->vcdOptions() ->systemId() );
addSubElement( xmlDoc, elemPvd, "application-id", m_doc->vcdOptions() ->applicationId() );
- addSubElement( xmlDoc, elemPvd, "preparer-id", QString( "K3b - Version %1" ).arg( k3bcore->version() ).upper() );
+ addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ).upper() );
addSubElement( xmlDoc, elemPvd, "publisher-id", m_doc->vcdOptions() ->publisher().upper() );
// create filesystem element
- QDomElement elemFileSystem = addSubElement( xmlDoc, root, "filesystem" );
+ TQDomElement elemFileSystem = addSubElement( xmlDoc, root, "filesystem" );
// SEGMENT folder, some standalone DVD-Player need this
if ( !m_doc->vcdOptions() ->haveSegments() && m_doc->vcdOptions() ->SegmentFolder() )
@@ -144,26 +144,26 @@ bool K3bVcdXmlView::write( const QString& fname )
// create cdi element
if ( m_doc->vcdOptions() ->CdiSupport() ) {
- QDomElement elemFolder = addFolderElement( xmlDoc, elemFileSystem, "CDI" );
+ TQDomElement elemFolder = addFolderElement( xmlDoc, elemFileSystem, "CDI" );
addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_imag.rtf" ), "CDI_IMAG.RTF", true );
addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_text.fnt" ), "CDI_TEXT.FNT" );
addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_vcd.app" ), "CDI_VCD.APP" );
- QString usercdicfg = locateLocal( "appdata", "cdi/cdi_vcd.cfg" );
- if ( QFile::exists( usercdicfg ) )
+ TQString usercdicfg = locateLocal( "appdata", "cdi/cdi_vcd.cfg" );
+ if ( TQFile::exists( usercdicfg ) )
addFileElement( xmlDoc, elemFolder, usercdicfg, "CDI_VCD.CFG" );
else
addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_vcd.cfg" ), "CDI_VCD.CFG" );
}
// sequence-items element & segment-items element
- QDomElement elemsequenceItems;
- QDomElement elemsegmentItems;
+ TQDomElement elemsequenceItems;
+ TQDomElement elemsegmentItems;
// sequence-item element & segment-item element
- QDomElement elemsequenceItem;
- QDomElement elemsegmentItem;
+ TQDomElement elemsequenceItem;
+ TQDomElement elemsegmentItem;
// if we have segments, elemsegmentItems must be before any sequence in xml file order
if ( m_doc->vcdOptions()->haveSegments() )
@@ -173,45 +173,45 @@ bool K3bVcdXmlView::write( const QString& fname )
elemsequenceItems = addSubElement( xmlDoc, root, "sequence-items" );
// if we have no sequence (photo (s)vcd) we must add a dummy sequence they inform the user to turn on pbc on there videoplayer
if ( !m_doc->vcdOptions()->haveSequence() ) {
- QString filename;
+ TQString filename;
if ( m_doc->vcdOptions()->mpegVersion() == 1 )
filename = locate( "data", "k3b/extra/k3bphotovcd.mpg" );
else
filename = locate( "data", "k3b/extra/k3bphotosvcd.mpg" );
elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" );
- elemsequenceItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( filename ) ) );
+ elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( filename ).data() ) );
elemsequenceItem.setAttribute( "id", "sequence-000" );
// default entry
- QDomElement elemdefaultEntry;
+ TQDomElement elemdefaultEntry;
elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" );
elemdefaultEntry.setAttribute( "id", "entry-000" );
}
// pbc
- QDomElement elemPbc;
+ TQDomElement elemPbc;
// Add Tracks to XML
- QPtrListIterator<K3bVcdTrack> it( *m_doc->tracks() );
+ TQPtrListIterator<K3bVcdTrack> it( *m_doc->tracks() );
for ( ; it.current(); ++it ) {
if ( !it.current() ->isSegment() ) {
- QString seqId = QString::number( it.current() ->index() ).rightJustify( 3, '0' );
+ TQString seqId = TQString::number( it.current() ->index() ).rightJustify( 3, '0' );
elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" );
- elemsequenceItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( it.current() ->absPath() ) ) );
- elemsequenceItem.setAttribute( "id", QString( "sequence-%1" ).arg( seqId ) );
+ elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
+ elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).tqarg( seqId ) );
// default entry
- QDomElement elemdefaultEntry;
+ TQDomElement elemdefaultEntry;
elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" );
- elemdefaultEntry.setAttribute( "id", QString( "entry-%1" ).arg( seqId ) );
+ elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).tqarg( seqId ) );
} else {
// sequence-items element needs at least one segment to fit the XML
elemsegmentItem = addSubElement( xmlDoc, elemsegmentItems, "segment-item" );
- elemsegmentItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( it.current() ->absPath() ) ) );
- elemsegmentItem.setAttribute( "id", QString( "segment-%1" ).arg( QString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) );
+ elemsegmentItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
+ elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).tqarg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) );
}
}
@@ -226,17 +226,17 @@ bool K3bVcdXmlView::write( const QString& fname )
}
if ( ! elemPbc.isNull() ) {
- QDomElement elemEndlist = addSubElement( xmlDoc, elemPbc, "endlist" );
+ TQDomElement elemEndlist = addSubElement( xmlDoc, elemPbc, "endlist" );
elemEndlist.setAttribute( "id", "end" );
elemEndlist.setAttribute( "rejected", "true" );
}
m_xmlstring = xmlDoc.toString();
- kdDebug() << QString( "(K3bVcdXmlView) Write Data to %1:" ).arg( fname ) << endl;
+ kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).tqarg( fname ) << endl;
- QFile xmlFile( fname );
+ TQFile xmlFile( fname );
if ( xmlFile.open( IO_WriteOnly ) ) {
- QTextStream ts( & xmlFile );
+ TQTextStream ts( & xmlFile );
ts << m_xmlstring;
xmlFile.close();
return true;
@@ -245,89 +245,89 @@ bool K3bVcdXmlView::write( const QString& fname )
return false;
}
-void K3bVcdXmlView::addComment( QDomDocument& doc, QDomElement& parent, const QString& text )
+void K3bVcdXmlView::addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text )
{
- QDomComment comment = doc.createComment( text );
- parent.appendChild( comment );
+ TQDomComment comment = doc.createComment( text );
+ tqparent.appendChild( comment );
}
-QDomElement K3bVcdXmlView::addSubElement( QDomDocument& doc, QDomElement& parent, const QString& name, const QString& value )
+TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const TQString& value )
{
- QDomElement element = doc.createElement( name );
- parent.appendChild( element );
+ TQDomElement element = doc.createElement( name );
+ tqparent.appendChild( element );
if ( !value.isNull() ) {
- QDomText t = doc.createTextNode( value );
+ TQDomText t = doc.createTextNode( value );
element.appendChild( t );
}
return element;
}
-QDomElement K3bVcdXmlView::addSubElement( QDomDocument& doc, QDomElement& parent, const QString& name, const int& value )
+TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const int& value )
{
- QDomElement element = doc.createElement( name );
- parent.appendChild( element );
+ TQDomElement element = doc.createElement( name );
+ tqparent.appendChild( element );
if ( value >= -1 ) {
- QDomText t = doc.createTextNode( QString( "%1" ).arg( value ) );
+ TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) );
element.appendChild( t );
}
return element;
}
-QDomElement K3bVcdXmlView::addFolderElement( QDomDocument& doc, QDomElement& parent, const QString& name )
+TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name )
{
- QDomElement elemFolder = addSubElement( doc, parent, "folder" );
+ TQDomElement elemFolder = addSubElement( doc, tqparent, "folder" );
addSubElement( doc, elemFolder, "name", name );
return elemFolder;
}
-void K3bVcdXmlView::addFileElement( QDomDocument& doc, QDomElement& parent, const QString& src, const QString& name, bool mixed )
+void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& src, const TQString& name, bool mixed )
{
- QDomElement elemFile = addSubElement( doc, parent, "file" );
- elemFile.setAttribute( "src", QString( "%1" ).arg( src ) );
+ TQDomElement elemFile = addSubElement( doc, tqparent, "file" );
+ elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) );
if ( mixed )
elemFile.setAttribute( "format", "mixed" );
addSubElement( doc, elemFile, "name", name );
}
-void K3bVcdXmlView::doPbc( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track )
+void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track )
{
- QString ref = ( track->isSegment() ) ? "segment" : "sequence";
+ TQString ref = ( track->isSegment() ) ? "segment" : "sequence";
- QDomElement elemSelection = addSubElement( doc, parent, "selection" );
- elemSelection.setAttribute( "id", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ TQDomElement elemSelection = addSubElement( doc, tqparent, "selection" );
+ elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
setNumkeyBSN( doc, elemSelection, track );
for ( int i = 0; i < K3bVcdTrack::_maxPbcTracks; i++ ) {
- QDomElement elemPbcSelectionPNRDT;
+ TQDomElement elemPbcSelectionPNRDT;
if ( track->getPbcTrack( i ) ) {
int index = track->getPbcTrack( i ) ->index();
- QString ref = ( track->getPbcTrack( i ) ->isSegment() ) ? "segment" : "sequence";
+ TQString ref = ( track->getPbcTrack( i ) ->isSegment() ) ? "segment" : "sequence";
switch ( i ) {
case K3bVcdTrack::PREVIOUS:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "prev" );
- elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::NEXT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "next" );
- elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::RETURN:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "return" );
- elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::DEFAULT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "default" );
- elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::AFTERTIMEOUT:
if ( track->getWaitTime() >= 0 ) {
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "timeout" );
- elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
}
break;
}
@@ -363,23 +363,23 @@ void K3bVcdXmlView::doPbc( QDomDocument& doc, QDomElement& parent, K3bVcdTrack*
}
addSubElement( doc, elemSelection, "wait", track->getWaitTime() );
- QDomElement loop = addSubElement( doc, elemSelection, "loop", track->getPlayTime() );
+ TQDomElement loop = addSubElement( doc, elemSelection, "loop", track->getPlayTime() );
if ( track->Reactivity() )
loop.setAttribute( "jump-timing", "delayed" );
else
loop.setAttribute( "jump-timing", "immediate" );
- addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", QString( "%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
setNumkeySEL( doc, elemSelection, track );
}
-void K3bVcdXmlView::setNumkeyBSN( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track )
+void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track )
{
if ( track->PbcNumKeys() ) {
if ( track->PbcNumKeysUserdefined() ) {
- QMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey();
- QMap<int, K3bVcdTrack*>::const_iterator trackIt;
+ TQMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey();
+ TQMap<int, K3bVcdTrack*>::const_iterator trackIt;
m_startkey = 0;
trackIt = numKeyMap.begin();
@@ -387,53 +387,53 @@ void K3bVcdXmlView::setNumkeyBSN( QDomDocument& doc, QDomElement& parent, K3bVcd
m_startkey = trackIt.key();
if ( m_startkey > 0 )
- addSubElement( doc, parent, "bsn", m_startkey );
+ addSubElement( doc, tqparent, "bsn", m_startkey );
else // user has no numKeys defined for this track
track->setPbcNumKeys( false );
} else {
// default start with key #1
- addSubElement( doc, parent, "bsn", 1 );
+ addSubElement( doc, tqparent, "bsn", 1 );
}
}
}
-void K3bVcdXmlView::setNumkeySEL( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track )
+void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track )
{
if ( track->PbcNumKeys() ) {
- QDomElement elemPbcSelectionNumKeySEL;
- QString ref = ( track->isSegment() ) ? "segment" : "sequence";
+ TQDomElement elemPbcSelectionNumKeySEL;
+ TQString ref = ( track->isSegment() ) ? "segment" : "sequence";
int none = m_startkey;
if ( track->PbcNumKeysUserdefined() ) {
- QMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey();
- QMap<int, K3bVcdTrack*>::const_iterator trackIt;
+ TQMap<int, K3bVcdTrack*> numKeyMap = track->DefinedNumKey();
+ TQMap<int, K3bVcdTrack*>::const_iterator trackIt;
for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) {
- kdDebug() << QString( "trackIt key: %1 none: %2" ).arg( trackIt.key() ).arg( none ) << endl;
+ kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl;
while ( none < trackIt.key() ) {
- elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) );
- addComment( doc, parent, QString( "key %1 -> %2 (normal none)" ).arg( none ).arg( QFile::encodeName( track->absPath() ) ) );
+ elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ addComment( doc, tqparent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) );
none++;
}
if ( trackIt.data() ) {
- QString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence";
- elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) );
- addComment( doc, parent, QString( "key %1 -> %2" ).arg( trackIt.key() ).arg( QFile::encodeName( trackIt.data() ->absPath() ) ) );
+ TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence";
+ elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) );
+ addComment( doc, tqparent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) );
} else {
- elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
+ elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" );
elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" );
- addComment( doc, parent, QString( "key %1 -> end" ).arg( trackIt.key() ) );
+ addComment( doc, tqparent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) );
}
none++;
}
} else {
// default reference to itSelf
- elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
}
}
}
diff --git a/libk3b/projects/videocd/k3bvcdxmlview.h b/libk3b/projects/videocd/k3bvcdxmlview.h
index d99549b..cce8341 100644
--- a/libk3b/projects/videocd/k3bvcdxmlview.h
+++ b/libk3b/projects/videocd/k3bvcdxmlview.h
@@ -17,8 +17,8 @@
#ifndef K3B_VCD_XMLVIEW_H
#define K3B_VCD_XMLVIEW_H
-#include <qstring.h>
-#include <qdom.h>
+#include <tqstring.h>
+#include <tqdom.h>
#include <ktempfile.h>
#include <k3bvcddoc.h>
@@ -34,24 +34,24 @@ class K3bVcdXmlView
K3bVcdXmlView( K3bVcdDoc* );
~K3bVcdXmlView();
- bool write( const QString& );
- QString xmlString()
+ bool write( const TQString& );
+ TQString xmlString()
{
return m_xmlstring;
}
private:
- QString m_xmlstring;
+ TQString m_xmlstring;
- void addComment( QDomDocument& doc, QDomElement& parent, const QString& text );
- QDomElement addSubElement( QDomDocument&, QDomElement&, const QString& name, const QString& value = QString::null );
- QDomElement addSubElement( QDomDocument&, QDomElement&, const QString& name, const int& value );
+ void addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text );
+ TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const TQString& value = TQString() );
+ TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const int& value );
- QDomElement addFolderElement( QDomDocument&, QDomElement&, const QString& name );
- void addFileElement( QDomDocument&, QDomElement&, const QString& src, const QString& name, bool mixed = false );
- void doPbc( QDomDocument&, QDomElement&, K3bVcdTrack* );
- void setNumkeyBSN( QDomDocument& , QDomElement&, K3bVcdTrack* );
- void setNumkeySEL( QDomDocument& , QDomElement&, K3bVcdTrack* );
+ TQDomElement addFolderElement( TQDomDocument&, TQDomElement&, const TQString& name );
+ void addFileElement( TQDomDocument&, TQDomElement&, const TQString& src, const TQString& name, bool mixed = false );
+ void doPbc( TQDomDocument&, TQDomElement&, K3bVcdTrack* );
+ void setNumkeyBSN( TQDomDocument& , TQDomElement&, K3bVcdTrack* );
+ void setNumkeySEL( TQDomDocument& , TQDomElement&, K3bVcdTrack* );
K3bVcdDoc* m_doc;
int m_startkey;
};
diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
index 583a0aa..089f22d 100644
--- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
+++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
@@ -41,19 +41,19 @@ K3bMpegInfo::K3bMpegInfo( const char* filename )
m_mpegfile = fopen( filename, "rb" );
if ( m_mpegfile == 0 ) {
- kdDebug() << QString( "Unable to open %1" ).arg( m_filename ) << endl;
+ kdDebug() << TQString( "Unable to open %1" ).tqarg( m_filename ) << endl;
return ;
}
if ( fseeko( m_mpegfile, 0, SEEK_END ) ) {
- kdDebug() << QString( "Unable to seek in file %1" ).arg( m_filename ) << endl;
+ kdDebug() << TQString( "Unable to seek in file %1" ).tqarg( m_filename ) << endl;
return ;
}
llong lof = ftello( m_mpegfile );
if ( lof == -1 ) {
- kdDebug() << QString( "Seeking to end of input file %1 failed." ).arg( m_filename ) << endl;
+ kdDebug() << TQString( "Seeking to end of input file %1 failed." ).tqarg( m_filename ) << endl;
//give up..
return ;
} else
@@ -61,8 +61,8 @@ K3bMpegInfo::K3bMpegInfo( const char* filename )
// nothing to do on an empty file
if ( !m_filesize ) {
- kdDebug() << QString( "File %1 is empty." ).arg( m_filename ) << endl;
- m_error_string = i18n( "File %1 is empty." ).arg( m_filename );
+ kdDebug() << TQString( "File %1 is empty." ).tqarg( m_filename ) << endl;
+ m_error_string = i18n( "File %1 is empty." ).tqarg( m_filename );
return ;
}
@@ -90,7 +90,7 @@ bool K3bMpegInfo::MpegParsePacket ()
if ( !EnsureMPEG( 0, MPEG_PACK_HEADER_CODE ) ) {
llong code = GetNBytes( 0, 4 );
- kdDebug() << QString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).arg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).arg( code, 0, 16 ) << endl;
+ kdDebug() << TQString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).tqarg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).tqarg( code, 0, 16 ) << endl;
if ( code == 0x00000100 + MPEG_SEQUENCE_CODE ) {
kdDebug() << "...this looks like a elementary video stream but a multiplexed program stream was required." << endl;
@@ -120,7 +120,7 @@ bool K3bMpegInfo::MpegParsePacket ()
if ( offset != 0 ) {
// we actually skipped some zeroes
- kdDebug() << QString( "Skipped %1 zeroes at start of file" ).arg( offset ) << endl;
+ kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).tqarg( offset ) << endl;
}
// here while schleife
@@ -155,7 +155,7 @@ bool K3bMpegInfo::MpegParsePacket ()
{
duration = ReadTSMpeg2( last_pack );
} else {
- kdDebug() << QString( "no timestamp found" ) << endl;
+ kdDebug() << TQString( "no timestamp found" ) << endl;
duration = ReadTS( last_pack );
}
@@ -190,7 +190,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
int bits;
case MPEG_PACK_HEADER_CODE:
- // kdDebug() << QString( "MPEG_PACK_HEADER_CODE @ %1" ).arg( offset ) << endl;
+ // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).tqarg( offset ) << endl;
offset += 4;
@@ -214,7 +214,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
if ( m_initial_TS == 0.0 )
{
m_initial_TS = ReadTS( offset );
- kdDebug() << QString( "Initial TS = %1" ).arg( m_initial_TS ) << endl;
+ kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl;
}
} else if ( bits >> 2 == 0x1 ) /* %01xx ISO13818-1 */
@@ -231,11 +231,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
if ( m_initial_TS == 0.0 )
{
m_initial_TS = ReadTSMpeg2( offset );
- kdDebug() << QString( "Initial TS = %1" ).arg( m_initial_TS ) << endl;
+ kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl;
}
} else {
- kdDebug() << QString( "packet not recognized as either version 1 or 2 (%1)" ).arg( bits ) << endl;
+ kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).tqarg( bits ) << endl;
mpeg_info->version = MPEG_VERS_INVALID;
return -1;
}
@@ -254,11 +254,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
offset += 4;
size = GetSize( offset );
offset += 2;
- // kdDebug() << QString( "offset = %1, size = %2" ).arg( offset ).arg( size ) << endl;
+ // kdDebug() << TQString( "offset = %1, size = %2" ).tqarg( offset ).tqarg( size ) << endl;
switch ( mark ) {
case MPEG_SYSTEM_HEADER_CODE:
- // kdDebug() << QString( "Systemheader: %1" ).arg( m_code, 0, 16 ) << endl;
+ // kdDebug() << TQString( "Systemheader: %1" ).tqarg( m_code, 0, 16 ) << endl;
break;
case MPEG_VIDEO_E0_CODE:
@@ -296,18 +296,18 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
break;
case MPEG_PRIVATE_1_CODE:
- kdDebug() << QString( "PrivateCode: %1" ).arg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "PrivateCode: %1" ).tqarg( mark, 0, 16 ) << endl;
break;
}
break;
case MPEG_PROGRAM_END_CODE:
- kdDebug() << QString( "ProgramEndCode: %1" ).arg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "ProgramEndCode: %1" ).tqarg( mark, 0, 16 ) << endl;
offset += 4;
break;
case MPEG_PICTURE_CODE:
- kdDebug() << QString( "PictureCode: %1" ).arg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "PictureCode: %1" ).tqarg( mark, 0, 16 ) << endl;
offset += 3;
break;
@@ -325,7 +325,7 @@ byte K3bMpegInfo::GetByte( llong offset )
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
if ( fseeko( m_mpegfile, offset, SEEK_SET ) ) {
- kdDebug() << QString( "could not get seek to offset (%1) in file %2 (size:%3)" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
return 0x11;
}
nread = fread( m_buffer, 1, BUFFERSIZE, m_mpegfile );
@@ -333,7 +333,7 @@ byte K3bMpegInfo::GetByte( llong offset )
m_buffend = offset + nread;
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
// weird
- kdDebug() << QString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
return 0x11;
}
}
@@ -355,7 +355,7 @@ byte K3bMpegInfo::bdGetByte( llong offset )
m_buffend = start + nread;
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
// weird
- kdDebug() << QString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
return 0x11;
}
diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
index 3436214..461af3a 100644
--- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
+++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h
@@ -30,7 +30,7 @@
#define MPEG_USER_CODE ((uchar) 0xb2)
#define MPEG_SEQUENCE_CODE ((uchar) 0xb3)
#define MPEG_EXT_CODE ((uchar) 0xb5)
-#define MPEG_SEQ_END_CODE ((uchar) 0xb7)
+#define MPEG_SETQ_END_CODE ((uchar) 0xb7)
#define MPEG_GOP_CODE ((uchar) 0xb8)
#define MPEG_PROGRAM_END_CODE ((uchar) 0xb9)
#define MPEG_PACK_HEADER_CODE ((uchar) 0xba)
@@ -127,7 +127,7 @@ class K3bMpegInfo
{
return mpeg_info->version;
};
- const QString error_string()
+ const TQString error_string()
{
return m_error_string;
};
@@ -171,7 +171,7 @@ class K3bMpegInfo
llong m_buffend;
byte* m_buffer;
double m_initial_TS;
- QString m_error_string;
+ TQString m_error_string;
};
diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.cpp b/libk3b/projects/videodvd/k3bvideodvddoc.cpp
index 2f02ac6..f86830d 100644
--- a/libk3b/projects/videodvd/k3bvideodvddoc.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvddoc.cpp
@@ -24,8 +24,8 @@
#include <kconfig.h>
-K3bVideoDvdDoc::K3bVideoDvdDoc( QObject* parent )
- : K3bDvdDoc( parent )
+K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* tqparent )
+ : K3bDvdDoc( tqparent )
{
}
@@ -63,9 +63,9 @@ bool K3bVideoDvdDoc::newDocument()
}
-K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent )
+K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent )
{
- return new K3bVideoDvdJob( this, hdl, parent );
+ return new K3bVideoDvdJob( this, hdl, tqparent );
}
//#include "k3bdvddoc.moc"
diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.h b/libk3b/projects/videodvd/k3bvideodvddoc.h
index 034ae4d..cdfdfa7 100644
--- a/libk3b/projects/videodvd/k3bvideodvddoc.h
+++ b/libk3b/projects/videodvd/k3bvideodvddoc.h
@@ -23,12 +23,12 @@ class KConfig;
class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc
{
public:
- K3bVideoDvdDoc( QObject* parent = 0 );
+ K3bVideoDvdDoc( TQObject* tqparent = 0 );
virtual ~K3bVideoDvdDoc();
virtual int type() const { return VIDEODVD; }
- virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent );
+ virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent );
virtual bool newDocument();
@@ -37,7 +37,7 @@ class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc
// TODO: implement load- and saveDocumentData since we do not need all those options
protected:
- virtual QString typeString() const { return "video_dvd"; }
+ virtual TQString typeString() const { return "video_dvd"; }
private:
K3bDirItem* m_videoTsDir;
diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
index 7362aa0..ab7c17a 100644
--- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
@@ -26,10 +26,10 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qtextstream.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qptrlist.h>
+#include <tqtextstream.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqptrlist.h>
@@ -38,12 +38,12 @@ class K3bVideoDvdImager::Private
public:
K3bVideoDvdDoc* doc;
- QString tempPath;
+ TQString tempPath;
};
-K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bIsoImager( doc, jh, parent, name )
+K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bIsoImager( doc, jh, tqparent, name )
{
d = new Private;
d->doc = doc;
@@ -104,30 +104,30 @@ int K3bVideoDvdImager::writePathSpec()
//
// We do this here since K3bIsoImager::start calls cleanup which deletes the temp files
//
- QDir dir( KGlobal::dirs()->resourceDirs( "tmp" ).first() );
+ TQDir dir( KGlobal::dirs()->resourceDirs( "tmp" ).first() );
d->tempPath = K3b::findUniqueFilePrefix( "k3bVideoDvd", dir.path() );
kdDebug() << "(K3bVideoDvdImager) creating temp dir: " << d->tempPath << endl;
if( !dir.mkdir( d->tempPath, true ) ) {
- emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath), ERROR );
return -1;
}
dir.cd( d->tempPath );
if( !dir.mkdir( "VIDEO_TS" ) ) {
- emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath + "/VIDEO_TS"), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath + "/VIDEO_TS"), ERROR );
return -1;
}
- for( QPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) {
if( (*it)->isDir() ) {
- emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").arg((*it)->k3bName()), ERROR );
+ emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").tqarg((*it)->k3bName()), ERROR );
return -1;
}
// convert to upper case names
- if( ::symlink( QFile::encodeName( (*it)->localPath() ),
- QFile::encodeName( d->tempPath + "/VIDEO_TS/" + (*it)->k3bName().upper() ) ) == -1 ) {
- emit infoMessage( i18n("Unable to link temporary file in folder %1.").arg( d->tempPath ), ERROR );
+ if( ::symlink( TQFile::encodeName( (*it)->localPath() ),
+ TQFile::encodeName( d->tempPath + "/VIDEO_TS/" + (*it)->k3bName().upper() ) ) == -1 ) {
+ emit infoMessage( i18n("Unable to link temporary file in folder %1.").tqarg( d->tempPath ), ERROR );
return -1;
}
}
@@ -137,7 +137,7 @@ int K3bVideoDvdImager::writePathSpec()
}
-int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream )
+int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream )
{
//
// We handle the VIDEO_TS dir differently since otherwise mkisofs is not able to
@@ -148,7 +148,7 @@ int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& st
}
int num = 0;
- for( QPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); it.current(); ++it ) {
K3bDataItem* item = it.current();
num++;
@@ -192,25 +192,25 @@ bool K3bVideoDvdImager::addMkisofsParameters( bool printSize )
void K3bVideoDvdImager::cleanup()
{
- if( QFile::exists( d->tempPath ) ) {
- QDir dir( d->tempPath );
+ if( TQFile::exists( d->tempPath ) ) {
+ TQDir dir( d->tempPath );
dir.cd( "VIDEO_TS" );
- for( QPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it )
+ for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it )
dir.remove( (*it)->k3bName().upper() );
dir.cdUp();
dir.rmdir( "VIDEO_TS" );
dir.cdUp();
dir.rmdir( d->tempPath );
}
- d->tempPath = QString::null;
+ d->tempPath = TQString();
K3bIsoImager::cleanup();
}
-void K3bVideoDvdImager::slotReceivedStderr( const QString& line )
+void K3bVideoDvdImager::slotReceivedStderr( const TQString& line )
{
- if( line.contains( "Unable to make a DVD-Video image" ) ) {
+ if( line.tqcontains( "Unable to make a DVD-Video image" ) ) {
emit infoMessage( i18n("The project does not contain all necessary VideoDVD files."), WARNING );
emit infoMessage( i18n("The resulting DVD will most likely not be playable on a Hifi DVD player."), WARNING );
}
diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.h b/libk3b/projects/videodvd/k3bvideodvdimager.h
index 0062d55..b1a9678 100644
--- a/libk3b/projects/videodvd/k3bvideodvdimager.h
+++ b/libk3b/projects/videodvd/k3bvideodvdimager.h
@@ -32,9 +32,10 @@ class K3bVideoDvdDoc;
class K3bVideoDvdImager : public K3bIsoImager
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 );
+ K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 );
virtual ~K3bVideoDvdImager();
public slots:
@@ -46,10 +47,10 @@ class K3bVideoDvdImager : public K3bIsoImager
bool addMkisofsParameters( bool printSize = false );
int writePathSpec();
void cleanup();
- int writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream );
+ int writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream );
protected slots:
- virtual void slotReceivedStderr( const QString& );
+ virtual void slotReceivedStderr( const TQString& );
private:
void fixVideoDVDSettings();
diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
index f4e6129..b550379 100644
--- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
@@ -30,8 +30,8 @@
-K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, QObject* parent )
- : K3bDvdJob( doc, jh, parent ),
+K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent )
+ : K3bDvdJob( doc, jh, tqparent ),
m_doc(doc)
{
}
@@ -64,7 +64,7 @@ bool K3bVideoDvdJob::prepareWriterJob()
writer->setCloseDvd( true );
if( m_doc->onTheFly() ) {
- writer->setImageToWrite( QString::null ); // read from stdin
+ writer->setImageToWrite( TQString() ); // read from stdin
writer->setTrackSize( m_isoImager->size() );
}
else
@@ -76,7 +76,7 @@ bool K3bVideoDvdJob::prepareWriterJob()
}
-QString K3bVideoDvdJob::jobDescription() const
+TQString K3bVideoDvdJob::jobDescription() const
{
if( m_doc->onlyCreateImages() ) {
return i18n("Creating Video DVD Image File");
@@ -84,18 +84,18 @@ QString K3bVideoDvdJob::jobDescription() const
else {
return i18n("Writing Video DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty()
- ? QString::null
- : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
+ ? TQString()
+ : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) );
}
}
-QString K3bVideoDvdJob::jobDetails() const
+TQString K3bVideoDvdJob::jobDetails() const
{
- return ( i18n("ISO9660/Udf Filesystem (Size: %1)").arg(KIO::convertSize( doc()->size() ))
+ return ( i18n("ISO9660/Udf Filesystem (Size: %1)").tqarg(KIO::convertSize( doc()->size() ))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
- : QString::null ) );
+ : TQString() ) );
}
#include "k3bvideodvdjob.moc"
diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.h b/libk3b/projects/videodvd/k3bvideodvdjob.h
index 3f03cea..a1d079e 100644
--- a/libk3b/projects/videodvd/k3bvideodvdjob.h
+++ b/libk3b/projects/videodvd/k3bvideodvdjob.h
@@ -28,13 +28,14 @@ class K3bVideoDvdDoc;
class K3bVideoDvdJob : public K3bDvdJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, QObject* parent = 0 );
+ K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, TQObject* tqparent = 0 );
virtual ~K3bVideoDvdJob();
- virtual QString jobDescription() const;
- virtual QString jobDetails() const;
+ virtual TQString jobDescription() const;
+ virtual TQString jobDetails() const;
private:
bool prepareWriterJob();
diff --git a/libk3b/tools/k3bactivepipe.cpp b/libk3b/tools/k3bactivepipe.cpp
index 5a1e575..3761579 100644
--- a/libk3b/tools/k3bactivepipe.cpp
+++ b/libk3b/tools/k3bactivepipe.cpp
@@ -19,13 +19,13 @@
#include <kdebug.h>
-#include <qthread.h>
-#include <qiodevice.h>
+#include <tqthread.h>
+#include <tqiodevice.h>
#include <unistd.h>
-class K3bActivePipe::Private : public QThread
+class K3bActivePipe::Private : public TQThread
{
public:
Private( K3bActivePipe* pipe ) :
@@ -108,17 +108,17 @@ public:
K3bPipe pipeIn;
K3bPipe pipeOut;
- QIODevice* sourceIODevice;
- QIODevice* sinkIODevice;
+ TQIODevice* sourceIODevice;
+ TQIODevice* sinkIODevice;
bool closeWhenDone;
bool closeFdToReadFrom;
bool closeFdToWriteTo;
- QByteArray buffer;
+ TQByteArray buffer;
- Q_UINT64 bytesRead;
- Q_UINT64 bytesWritten;
+ TQ_UINT64 bytesRead;
+ TQ_UINT64 bytesWritten;
};
@@ -189,14 +189,14 @@ void K3bActivePipe::writeToFd( int fd, bool close )
}
-void K3bActivePipe::readFromIODevice( QIODevice* dev )
+void K3bActivePipe::readFromIODevice( TQIODevice* dev )
{
d->fdToReadFrom = -1;
d->sourceIODevice = dev;
}
-void K3bActivePipe::writeToIODevice( QIODevice* dev )
+void K3bActivePipe::writeToIODevice( TQIODevice* dev )
{
d->fdToWriteTo = -1;
d->sinkIODevice = dev;
@@ -243,13 +243,13 @@ bool K3bActivePipe::pumpSync()
}
-Q_UINT64 K3bActivePipe::bytesRead() const
+TQ_UINT64 K3bActivePipe::bytesRead() const
{
return d->bytesRead;
}
-Q_UINT64 K3bActivePipe::bytesWritten() const
+TQ_UINT64 K3bActivePipe::bytesWritten() const
{
return d->bytesWritten;
}
diff --git a/libk3b/tools/k3bactivepipe.h b/libk3b/tools/k3bactivepipe.h
index 367646d..fc2a32d 100644
--- a/libk3b/tools/k3bactivepipe.h
+++ b/libk3b/tools/k3bactivepipe.h
@@ -16,12 +16,12 @@
#ifndef _K3B_ACTIVE_PIPE_H_
#define _K3B_ACTIVE_PIPE_H_
-#include <qcstring.h>
+#include <tqcstring.h>
#include <k3b_export.h>
-class QIODevice;
+class TQIODevice;
/**
@@ -74,18 +74,18 @@ class LIBK3B_EXPORT K3bActivePipe
void writeToFd( int fd, bool close = false );
/**
- * Read from a QIODevice instead of a file descriptor.
+ * Read from a TQIODevice instead of a file descriptor.
* The device will be opened IO_ReadOnly and closed
* afterwards.
*/
- void readFromIODevice( QIODevice* dev );
+ void readFromIODevice( TQIODevice* dev );
/**
- * Write to a QIODevice instead of a file descriptor.
+ * Write to a TQIODevice instead of a file descriptor.
* The device will be opened IO_WriteOnly and closed
* afterwards.
*/
- void writeToIODevice( QIODevice* dev );
+ void writeToIODevice( TQIODevice* dev );
/**
* The file descriptor to write into
@@ -102,12 +102,12 @@ class LIBK3B_EXPORT K3bActivePipe
/**
* The number of bytes that have been read.
*/
- Q_UINT64 bytesRead() const;
+ TQ_UINT64 bytesRead() const;
/**
* The number of bytes that have been written.
*/
- Q_UINT64 bytesWritten() const;
+ TQ_UINT64 bytesWritten() const;
protected:
/**
diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp
index d222107..2f53629 100644
--- a/libk3b/tools/k3bbusywidget.cpp
+++ b/libk3b/tools/k3bbusywidget.cpp
@@ -15,19 +15,19 @@
#include "k3bbusywidget.h"
-#include <qtimer.h>
-#include <qpainter.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
#include <kglobalsettings.h>
-K3bBusyWidget::K3bBusyWidget( QWidget* parent, const char* name )
- : QFrame( parent, name )
+K3bBusyWidget::K3bBusyWidget( TQWidget* tqparent, const char* name )
+ : TQFrame( tqparent, name )
{
- m_busyTimer = new QTimer( this );
+ m_busyTimer = new TQTimer( this );
m_iBusyPosition = 0;
- connect( m_busyTimer, SIGNAL(timeout()), this, SLOT(animateBusy()) );
+ connect( m_busyTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animateBusy()) );
m_bBusy = false;
}
@@ -68,21 +68,21 @@ void K3bBusyWidget::animateBusy()
}
-QSize K3bBusyWidget::sizeHint() const
+TQSize K3bBusyWidget::tqsizeHint() const
{
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
-QSize K3bBusyWidget::minimumSizeHint() const
+TQSize K3bBusyWidget::tqminimumSizeHint() const
{
- return QSize( 2*frameWidth() + 62, 10 );
+ return TQSize( 2*frameWidth() + 62, 10 );
}
-void K3bBusyWidget::drawContents( QPainter* p )
+void K3bBusyWidget::drawContents( TQPainter* p )
{
- QRect rect = contentsRect();
+ TQRect rect = contentsRect();
int squareSize = 8;
diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h
index 2a6934c..bc83c5e 100644
--- a/libk3b/tools/k3bbusywidget.h
+++ b/libk3b/tools/k3bbusywidget.h
@@ -17,28 +17,29 @@
#define K3B_BUSY_WIDGET_H
-#include <qframe.h>
+#include <tqframe.h>
#include "k3b_export.h"
-class QPainter;
-class QTimer;
+class TQPainter;
+class TQTimer;
-class LIBK3B_EXPORT K3bBusyWidget : public QFrame
+class LIBK3B_EXPORT K3bBusyWidget : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bBusyWidget( QWidget* parent = 0, const char* name = 0 );
+ K3bBusyWidget( TQWidget* tqparent = 0, const char* name = 0 );
~K3bBusyWidget();
void showBusy( bool b );
- QSize sizeHint() const;
- QSize minimumSizeHint() const;
+ TQSize tqsizeHint() const;
+ TQSize tqminimumSizeHint() const;
protected:
- void drawContents( QPainter* p );
+ void drawContents( TQPainter* p );
private slots:
void animateBusy();
@@ -47,7 +48,7 @@ class LIBK3B_EXPORT K3bBusyWidget : public QFrame
bool m_bBusy;
int m_iBusyPosition;
- QTimer* m_busyTimer;
+ TQTimer* m_busyTimer;
};
diff --git a/libk3b/tools/k3bcdparanoialib.cpp b/libk3b/tools/k3bcdparanoialib.cpp
index 5976941..c9339d1 100644
--- a/libk3b/tools/k3bcdparanoialib.cpp
+++ b/libk3b/tools/k3bcdparanoialib.cpp
@@ -25,8 +25,8 @@
#include <dlfcn.h>
-#include <qfile.h>
-#include <qmutex.h>
+#include <tqfile.h>
+#include <tqmutex.h>
static bool s_haveLibCdio = false;
@@ -189,7 +189,7 @@ class K3bCdparanoiaLibData
long sector() const { return m_currentSector; }
static K3bCdparanoiaLibData* data( K3bDevice::Device* dev ) {
- QMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::const_iterator it = s_dataMap.find( dev );
+ TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::const_iterator it = s_dataMap.tqfind( dev );
if( it == s_dataMap.constEnd() )
return new K3bCdparanoiaLibData( dev );
else
@@ -198,7 +198,7 @@ class K3bCdparanoiaLibData
static void freeAll() {
// clean up all K3bCdparanoiaLibData instances
- for( QMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::iterator it = s_dataMap.begin();
+ for( TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::iterator it = s_dataMap.begin();
it != s_dataMap.end(); ++it )
delete it.data();
}
@@ -207,7 +207,7 @@ class K3bCdparanoiaLibData
//
// We have exactly one instance of K3bCdparanoiaLibData per device
//
- static QMap<K3bDevice::Device*, K3bCdparanoiaLibData*> s_dataMap;
+ static TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*> s_dataMap;
K3bDevice::Device* m_device;
@@ -216,11 +216,11 @@ class K3bCdparanoiaLibData
long m_currentSector;
- QMutex mutex;
+ TQMutex mutex;
};
-QMap<K3bDevice::Device*, K3bCdparanoiaLibData*> K3bCdparanoiaLibData::s_dataMap;
+TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*> K3bCdparanoiaLibData::s_dataMap;
bool K3bCdparanoiaLibData::paranoiaInit()
{
@@ -233,7 +233,7 @@ bool K3bCdparanoiaLibData::paranoiaInit()
// the device here
m_device->close();
- m_drive = cdda_cdda_identify( QFile::encodeName(m_device->blockDeviceName()), 0, 0 );
+ m_drive = cdda_cdda_identify( TQFile::encodeName(m_device->blockDeviceName()), 0, 0 );
if( m_drive == 0 ) {
mutex.unlock();
return false;
@@ -710,7 +710,7 @@ char* K3bCdparanoiaLib::read( int* statusCode, unsigned int* track, bool littleE
//
d->updateParanoiaMode();
- Q_INT16* data = d->data->paranoiaRead( paranoiaCallback, d->maxRetries );
+ TQ_INT16* data = d->data->paranoiaRead( paranoiaCallback, d->maxRetries );
char* charData = reinterpret_cast<char*>(data);
diff --git a/libk3b/tools/k3bcdparanoialib.h b/libk3b/tools/k3bcdparanoialib.h
index 70504de..bbeb19e 100644
--- a/libk3b/tools/k3bcdparanoialib.h
+++ b/libk3b/tools/k3bcdparanoialib.h
@@ -21,7 +21,7 @@
#define CD_FRAMESIZE_RAW 2352
-#include <qstring.h>
+#include <tqstring.h>
#include <sys/types.h>
#include "k3b_export.h"
@@ -76,7 +76,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib
/**
* This will read the Toc and initialize some stuff.
- * It will also call paranoiaInit( const QString& )
+ * It will also call paranoiaInit( const TQString& )
*/
bool initParanoia( K3bDevice::Device* dev );
@@ -122,7 +122,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib
*/
int status() const;
- enum Status {
+ enum tqStatus {
S_OK,
S_ERROR
// to be extended with Jitter and stuff...
diff --git a/libk3b/tools/k3bcdtextvalidator.cpp b/libk3b/tools/k3bcdtextvalidator.cpp
index 8b3c97a..19e20d7 100644
--- a/libk3b/tools/k3bcdtextvalidator.cpp
+++ b/libk3b/tools/k3bcdtextvalidator.cpp
@@ -16,8 +16,8 @@
#include "k3bcdtextvalidator.h"
-K3bCdTextValidator::K3bCdTextValidator(QObject *parent, const char *name)
- : K3bLatin1Validator(parent, name)
+K3bCdTextValidator::K3bCdTextValidator(TQObject *tqparent, const char *name)
+ : K3bLatin1Validator(tqparent, name)
{
}
@@ -27,7 +27,7 @@ K3bCdTextValidator::~K3bCdTextValidator()
}
-QValidator::State K3bCdTextValidator::validate( QString& input, int& pos ) const
+TQValidator::State K3bCdTextValidator::validate( TQString& input, int& pos ) const
{
if( input.length() > 160 )
return Invalid;
diff --git a/libk3b/tools/k3bcdtextvalidator.h b/libk3b/tools/k3bcdtextvalidator.h
index 48ada05..e2d3983 100644
--- a/libk3b/tools/k3bcdtextvalidator.h
+++ b/libk3b/tools/k3bcdtextvalidator.h
@@ -24,10 +24,10 @@
class LIBK3B_EXPORT K3bCdTextValidator : public K3bLatin1Validator
{
public:
- K3bCdTextValidator(QObject *parent = 0, const char *name = 0);
+ K3bCdTextValidator(TQObject *tqparent = 0, const char *name = 0);
~K3bCdTextValidator();
- State validate( QString& input, int& pos ) const;
+ State validate( TQString& input, int& pos ) const;
};
#endif
diff --git a/libk3b/tools/k3bchecksumpipe.cpp b/libk3b/tools/k3bchecksumpipe.cpp
index 21d308a..2e71e97 100644
--- a/libk3b/tools/k3bchecksumpipe.cpp
+++ b/libk3b/tools/k3bchecksumpipe.cpp
@@ -81,14 +81,14 @@ bool K3bChecksumPipe::open( Type type, bool closeWhenDone )
}
-QCString K3bChecksumPipe::checksum() const
+TQCString K3bChecksumPipe::checksum() const
{
switch( d->checksumType ) {
case MD5:
return d->md5.hexDigest();
}
- return QCString();
+ return TQCString();
}
diff --git a/libk3b/tools/k3bchecksumpipe.h b/libk3b/tools/k3bchecksumpipe.h
index 88adc74..f92d60f 100644
--- a/libk3b/tools/k3bchecksumpipe.h
+++ b/libk3b/tools/k3bchecksumpipe.h
@@ -53,7 +53,7 @@ class LIBK3B_EXPORT K3bChecksumPipe : public K3bActivePipe
/**
* Get the calculated checksum
*/
- QCString checksum() const;
+ TQCString checksum() const;
protected:
int write( char* data, int max );
diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp
index d4f516b..c4b1d20 100644
--- a/libk3b/tools/k3bcutcombobox.cpp
+++ b/libk3b/tools/k3bcutcombobox.cpp
@@ -17,14 +17,14 @@
#include <k3bstringutils.h>
-#include <qfontmetrics.h>
-#include <qevent.h>
-#include <qstringlist.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qpixmap.h>
-#include <qstyle.h>
-#include <qsizepolicy.h>
+#include <tqfontmetrics.h>
+#include <tqevent.h>
+#include <tqstringlist.h>
+#include <tqrect.h>
+#include <tqsize.h>
+#include <tqpixmap.h>
+#include <tqstyle.h>
+#include <tqsizepolicy.h>
class K3bCutComboBox::Private
@@ -34,23 +34,23 @@ public:
method = CUT;
}
- QStringList originalItems;
+ TQStringList originalItems;
int method;
int width;
};
-K3bCutComboBox::K3bCutComboBox( QWidget* parent, const char* name )
- : KComboBox( parent, name )
+K3bCutComboBox::K3bCutComboBox( TQWidget* tqparent, const char* name )
+ : KComboBox( tqparent, name )
{
d = new Private();
- // setSizePolicy( QSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() );
+ // tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() );
}
-K3bCutComboBox::K3bCutComboBox( int method, QWidget* parent, const char* name )
- : KComboBox( parent, name )
+K3bCutComboBox::K3bCutComboBox( int method, TQWidget* tqparent, const char* name )
+ : KComboBox( tqparent, name )
{
d = new Private();
d->method = method;
@@ -70,9 +70,9 @@ void K3bCutComboBox::setMethod( int m )
}
-QSize K3bCutComboBox::sizeHint() const
+TQSize K3bCutComboBox::tqsizeHint() const
{
-// QSize s(KComboBox::sizeHint());
+// TQSize s(KComboBox::tqsizeHint());
// for( int i = 0; i < count(); i++ ) {
// int w = fontMetrics().width(d->originalItems[i]) +
@@ -81,16 +81,16 @@ QSize K3bCutComboBox::sizeHint() const
// s.setWidth( w );
// }
- return KComboBox::sizeHint();
+ return KComboBox::tqsizeHint();
}
-QSize K3bCutComboBox::minimumSizeHint() const
+TQSize K3bCutComboBox::tqminimumSizeHint() const
{
- return KComboBox::minimumSizeHint();
+ return KComboBox::tqminimumSizeHint();
}
-void K3bCutComboBox::setCurrentText( const QString& s )
+void K3bCutComboBox::setCurrentText( const TQString& s )
{
int i;
for( i = 0; i < count(); i++ )
@@ -106,18 +106,18 @@ void K3bCutComboBox::setCurrentText( const QString& s )
}
-void K3bCutComboBox::insertStringList( const QStringList&, int )
+void K3bCutComboBox::insertStringList( const TQStringList&, int )
{
// FIXME
}
-void K3bCutComboBox::insertStrList( const QStrList&, int )
+void K3bCutComboBox::insertStrList( const TQStrList&, int )
{
// FIXME
}
-void K3bCutComboBox::insertStrList( const QStrList*, int )
+void K3bCutComboBox::insertStrList( const TQStrList*, int )
{
// FIXME
}
@@ -127,17 +127,17 @@ void K3bCutComboBox::insertStrList( const char**, int, int)
// FIXME
}
-void K3bCutComboBox::insertItem( const QString& text, int index )
+void K3bCutComboBox::insertItem( const TQString& text, int index )
{
- insertItem( QPixmap(), text, index );
+ insertItem( TQPixmap(), text, index );
}
-void K3bCutComboBox::insertItem( const QPixmap& pix, int i )
+void K3bCutComboBox::insertItem( const TQPixmap& pix, int i )
{
insertItem( pix, "", i );
}
-void K3bCutComboBox::insertItem( const QPixmap& pixmap, const QString& text, int index )
+void K3bCutComboBox::insertItem( const TQPixmap& pixmap, const TQString& text, int index )
{
if( index != -1 )
d->originalItems.insert( d->originalItems.at(index), text );
@@ -158,34 +158,34 @@ void K3bCutComboBox::removeItem( int i )
KComboBox::removeItem( i );
}
-void K3bCutComboBox::changeItem( const QString& s, int i )
+void K3bCutComboBox::changeItem( const TQString& s, int i )
{
d->originalItems[i] = s;
cutText();
}
-void K3bCutComboBox::changeItem( const QPixmap& pix, const QString& s, int i )
+void K3bCutComboBox::changeItem( const TQPixmap& pix, const TQString& s, int i )
{
KComboBox::changeItem( pix, i );
changeItem( s, i );
}
-QString K3bCutComboBox::text( int i ) const
+TQString K3bCutComboBox::text( int i ) const
{
if( i < (int)d->originalItems.count() )
return d->originalItems[i];
else
- return QString::null;
+ return TQString();
}
-QString K3bCutComboBox::currentText() const
+TQString K3bCutComboBox::currentText() const
{
if( currentItem() < (int)d->originalItems.count() )
return d->originalItems[currentItem()];
else
- return QString::null;
+ return TQString();
}
@@ -195,7 +195,7 @@ void K3bCutComboBox::clear()
d->originalItems.clear();
}
-void K3bCutComboBox::resizeEvent( QResizeEvent* e )
+void K3bCutComboBox::resizeEvent( TQResizeEvent* e )
{
cutText();
@@ -205,16 +205,16 @@ void K3bCutComboBox::resizeEvent( QResizeEvent* e )
void K3bCutComboBox::cutText()
{
- d->width = QStyle::visualRect( style().querySubControlMetrics(QStyle::CC_ComboBox, this,
- QStyle::SC_ComboBoxEditField), this ).width();
+ d->width = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this,
+ TQStyle::SC_ComboBoxEditField), this ).width();
for( int i = 0; i < (int)d->originalItems.count(); ++i ) {
int w = d->width;
if ( pixmap(i) && !pixmap(i)->isNull() )
w -= ( pixmap(i)->width() + 4 );
- QString text;
- if( d->method == SQUEEZE )
+ TQString text;
+ if( d->method == STQUEEZE )
text = K3b::squeezeTextToWidth( fontMetrics(), d->originalItems[i], w );
else
text = K3b::cutToWidth( fontMetrics(), d->originalItems[i], w );
diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h
index 1c35e78..19e4ef7 100644
--- a/libk3b/tools/k3bcutcombobox.h
+++ b/libk3b/tools/k3bcutcombobox.h
@@ -19,7 +19,7 @@
#include <kcombobox.h>
#include "k3b_export.h"
-class QResizeEvent;
+class TQResizeEvent;
/**
@@ -35,15 +35,16 @@ class QResizeEvent;
class LIBK3B_EXPORT K3bCutComboBox : public KComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bCutComboBox( QWidget* parent = 0, const char* name = 0 );
- K3bCutComboBox( int method, QWidget* parent = 0, const char* name = 0 );
+ K3bCutComboBox( TQWidget* tqparent = 0, const char* name = 0 );
+ K3bCutComboBox( int method, TQWidget* tqparent = 0, const char* name = 0 );
virtual ~K3bCutComboBox();
enum Method {
CUT,
- SQUEEZE
+ STQUEEZE
};
/**
@@ -53,35 +54,35 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox
void setMethod( int );
/** reimplemeted */
- QSize sizeHint() const;
+ TQSize tqsizeHint() const;
/** reimplemeted */
- QSize minimumSizeHint() const;
+ TQSize tqminimumSizeHint() const;
/** reimplemeted */
- virtual void setCurrentText( const QString& );
+ virtual void setCurrentText( const TQString& );
- void insertStringList( const QStringList &, int index=-1 );
- void insertStrList( const QStrList &, int index=-1 );
- void insertStrList( const QStrList *, int index=-1 );
+ void insertStringList( const TQStringList &, int index=-1 );
+ void insertStrList( const TQStrList &, int index=-1 );
+ void insertStrList( const TQStrList *, int index=-1 );
void insertStrList( const char **, int numStrings=-1, int index=-1);
- void insertItem( const QString &text, int index=-1 );
- void insertItem( const QPixmap &pixmap, int index=-1 );
- void insertItem( const QPixmap &pixmap, const QString &text, int index=-1 );
+ void insertItem( const TQString &text, int index=-1 );
+ void insertItem( const TQPixmap &pixmap, int index=-1 );
+ void insertItem( const TQPixmap &pixmap, const TQString &text, int index=-1 );
void removeItem( int index );
- void changeItem( const QString &text, int index );
- void changeItem( const QPixmap &pixmap, const QString &text, int index );
+ void changeItem( const TQString &text, int index );
+ void changeItem( const TQPixmap &pixmap, const TQString &text, int index );
- QString text( int ) const;
- QString currentText() const;
+ TQString text( int ) const;
+ TQString currentText() const;
void clear();
protected:
- void resizeEvent( QResizeEvent* e );
+ void resizeEvent( TQResizeEvent* e );
void cutText();
private:
diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp
index 165b59d..e6ce8ce 100644
--- a/libk3b/tools/k3bdevicecombobox.cpp
+++ b/libk3b/tools/k3bdevicecombobox.cpp
@@ -20,26 +20,26 @@
#include <klocale.h>
-#include <qmap.h>
-#include <qptrvector.h>
+#include <tqmap.h>
+#include <tqptrvector.h>
class K3bDeviceComboBox::Private
{
public:
- QMap<QString, int> deviceIndexMap;
- QPtrVector<K3bDevice::Device> devices;
+ TQMap<TQString, int> deviceIndexMap;
+ TQPtrVector<K3bDevice::Device> devices;
};
-K3bDeviceComboBox::K3bDeviceComboBox( QWidget* parent, const char* name )
- : KComboBox( parent, name )
+K3bDeviceComboBox::K3bDeviceComboBox( TQWidget* tqparent, const char* name )
+ : KComboBox( tqparent, name )
{
d = new Private();
- connect( this, SIGNAL(activated(int)),
- this, SLOT(slotActivated(int)) );
- connect( k3bcore->deviceManager(), SIGNAL(changed(K3bDevice::DeviceManager*)),
- this, SLOT(slotDeviceManagerChanged(K3bDevice::DeviceManager*)) );
+ connect( this, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotActivated(int)) );
+ connect( k3bcore->deviceManager(), TQT_SIGNAL(changed(K3bDevice::DeviceManager*)),
+ this, TQT_SLOT(slotDeviceManagerChanged(K3bDevice::DeviceManager*)) );
}
@@ -96,10 +96,10 @@ void K3bDeviceComboBox::addDevice( K3bDevice::Device* dev )
void K3bDeviceComboBox::removeDevice( K3bDevice::Device* dev )
{
if( dev ) {
- if( d->deviceIndexMap.contains(dev->devicename()) ) {
+ if( d->deviceIndexMap.tqcontains(dev->devicename()) ) {
// let's make it easy and recreate the whole list
K3bDevice::Device* selDev = selectedDevice();
- QPtrList<K3bDevice::Device> devices;
+ TQPtrList<K3bDevice::Device> devices;
for( unsigned int i = 0; i < d->devices.size(); ++i )
devices.append( d->devices[i] );
@@ -114,19 +114,19 @@ void K3bDeviceComboBox::removeDevice( K3bDevice::Device* dev )
}
-void K3bDeviceComboBox::addDevices( const QPtrList<K3bDevice::Device>& list )
+void K3bDeviceComboBox::addDevices( const TQPtrList<K3bDevice::Device>& list )
{
- for( QPtrListIterator<K3bDevice::Device> it( list );
+ for( TQPtrListIterator<K3bDevice::Device> it( list );
it.current(); ++it )
addDevice( it.current() );
}
-void K3bDeviceComboBox::refreshDevices( const QPtrList<K3bDevice::Device>& list )
+void K3bDeviceComboBox::refreshDevices( const TQPtrList<K3bDevice::Device>& list )
{
K3bDevice::Device* selDev = selectedDevice();
clear();
- if( !list.containsRef( selDev ) )
+ if( !list.tqcontainsRef( selDev ) )
selDev = 0;
addDevices( list );
setSelectedDevice( selDev );
@@ -136,7 +136,7 @@ void K3bDeviceComboBox::refreshDevices( const QPtrList<K3bDevice::Device>& list
void K3bDeviceComboBox::setSelectedDevice( K3bDevice::Device* dev )
{
if( dev ) {
- if( d->deviceIndexMap.contains(dev->devicename()) ) {
+ if( d->deviceIndexMap.tqcontains(dev->devicename()) ) {
setCurrentItem( d->deviceIndexMap[dev->devicename()] );
emit selectionChanged( dev );
}
@@ -162,7 +162,7 @@ void K3bDeviceComboBox::slotDeviceManagerChanged( K3bDevice::DeviceManager* dm )
{
unsigned int i = 0;
while( i < d->devices.size() ) {
- if( !dm->allDevices().containsRef( d->devices[i] ) ) {
+ if( !dm->allDevices().tqcontainsRef( d->devices[i] ) ) {
removeDevice( d->devices[i] );
i = 0;
}
diff --git a/libk3b/tools/k3bdevicecombobox.h b/libk3b/tools/k3bdevicecombobox.h
index 5a9cb85..51b93ce 100644
--- a/libk3b/tools/k3bdevicecombobox.h
+++ b/libk3b/tools/k3bdevicecombobox.h
@@ -34,9 +34,10 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bDeviceComboBox : public KComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDeviceComboBox( QWidget* parent = 0, const char* name = 0 );
+ K3bDeviceComboBox( TQWidget* tqparent = 0, const char* name = 0 );
~K3bDeviceComboBox();
K3bDevice::Device* selectedDevice() const;
@@ -46,11 +47,11 @@ class LIBK3B_EXPORT K3bDeviceComboBox : public KComboBox
public slots:
void addDevice( K3bDevice::Device* );
- void addDevices( const QPtrList<K3bDevice::Device>& );
+ void addDevices( const TQPtrList<K3bDevice::Device>& );
/**
* Clears the device combo and tries to keep the current selection
*/
- void refreshDevices( const QPtrList<K3bDevice::Device>& );
+ void refreshDevices( const TQPtrList<K3bDevice::Device>& );
void removeDevice( K3bDevice::Device* );
void setSelectedDevice( K3bDevice::Device* );
void clear();
diff --git a/libk3b/tools/k3bdevicehandler.cpp b/libk3b/tools/k3bdevicehandler.cpp
index c77f1e6..92fd2ff 100644
--- a/libk3b/tools/k3bdevicehandler.cpp
+++ b/libk3b/tools/k3bdevicehandler.cpp
@@ -129,7 +129,7 @@ public:
DiskInfo ngInfo;
Toc toc;
CdText cdText;
- QByteArray cdTextRaw;
+ TQByteArray cdTextRaw;
long long bufferCapacity;
long long availableBufferCapacity;
Device* dev;
@@ -139,8 +139,8 @@ private:
};
-K3bDevice::DeviceHandler::DeviceHandler( Device* dev, QObject* parent, const char* name )
- : K3bThreadJob( 0, parent, name ),
+K3bDevice::DeviceHandler::DeviceHandler( Device* dev, TQObject* tqparent, const char* name )
+ : K3bThreadJob( 0, tqparent, name ),
m_selfDelete(false)
{
m_thread = new DeviceHandlerThread();
@@ -149,8 +149,8 @@ K3bDevice::DeviceHandler::DeviceHandler( Device* dev, QObject* parent, const cha
}
-K3bDevice::DeviceHandler::DeviceHandler( QObject* parent, const char* name )
- : K3bThreadJob( 0, parent, name ),
+K3bDevice::DeviceHandler::DeviceHandler( TQObject* tqparent, const char* name )
+ : K3bThreadJob( 0, tqparent, name ),
m_selfDelete(false)
{
m_thread = new DeviceHandlerThread();
@@ -202,7 +202,7 @@ const K3bDevice::CdText& K3bDevice::DeviceHandler::cdText() const
}
-const QByteArray& K3bDevice::DeviceHandler::cdTextRaw() const
+const TQByteArray& K3bDevice::DeviceHandler::cdTextRaw() const
{
return m_thread->cdTextRaw;
}
@@ -311,7 +311,7 @@ K3bDevice::DeviceHandler* K3bDevice::sendCommand( int command, Device* dev )
return new DeviceHandler( command, dev, "DeviceHandler" );
}
-void K3bDevice::DeviceHandler::customEvent( QCustomEvent* e )
+void K3bDevice::DeviceHandler::customEvent( TQCustomEvent* e )
{
K3bThreadJob::customEvent(e);
diff --git a/libk3b/tools/k3bdevicehandler.h b/libk3b/tools/k3bdevicehandler.h
index d5159a0..da26629 100644
--- a/libk3b/tools/k3bdevicehandler.h
+++ b/libk3b/tools/k3bdevicehandler.h
@@ -23,9 +23,9 @@
#include "k3bmsf.h"
#include "k3bcdtext.h"
#include "k3b_export.h"
-#include <qcstring.h>
+#include <tqcstring.h>
-class QCustomEvent;
+class TQCustomEvent;
namespace K3bDevice
@@ -47,10 +47,11 @@ namespace K3bDevice
class LIBK3B_EXPORT DeviceHandler : public K3bThreadJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- DeviceHandler( Device*, QObject* parent = 0, const char* name = 0 );
- DeviceHandler( QObject* parent = 0, const char* name = 0 );
+ DeviceHandler( Device*, TQObject* tqparent = 0, const char* name = 0 );
+ DeviceHandler( TQObject* tqparent = 0, const char* name = 0 );
/**
* This constructor is used by the global "quick" methods and should not be used
@@ -63,7 +64,7 @@ namespace K3bDevice
const DiskInfo& diskInfo() const;
const Toc& toc() const;
const CdText& cdText() const;
- const QByteArray& cdTextRaw() const;
+ const TQByteArray& cdTextRaw() const;
K3b::Msf diskSize() const;
K3b::Msf remainingSize() const;
int tocType() const;
@@ -164,7 +165,7 @@ namespace K3bDevice
/**
* reimplemented from K3bThreadJob for internal reasons
*/
- virtual void customEvent( QCustomEvent* );
+ virtual void customEvent( TQCustomEvent* );
private:
class DeviceHandlerThread;
@@ -177,8 +178,8 @@ namespace K3bDevice
* Usage:
* \code
* connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::MOUNT, dev ),
- * SIGNAL(finished(DeviceHandler*)),
- * this, SLOT(someSlot(DeviceHandler*)) );
+ * TQT_SIGNAL(finished(DeviceHandler*)),
+ * this, TQT_SLOT(someSlot(DeviceHandler*)) );
*
* void someSlot( DeviceHandler* dh ) {
* if( dh->success() ) {
diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp
index d622457..c4e03ee 100644
--- a/libk3b/tools/k3bdeviceselectiondialog.cpp
+++ b/libk3b/tools/k3bdeviceselectiondialog.cpp
@@ -21,11 +21,11 @@
#include <k3bcore.h>
#include <k3bdevicemanager.h>
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qframe.h>
+#include <tqcombobox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqstring.h>
+#include <tqframe.h>
#include <klocale.h>
@@ -37,23 +37,23 @@ public:
};
-K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( QWidget* parent,
+K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( TQWidget* tqparent,
const char* name,
- const QString& text,
+ const TQString& text,
bool modal )
: KDialogBase( KDialogBase::Plain,
i18n("Device Selection"),
Ok|Cancel,
Ok,
- parent,
+ tqparent,
name,
modal )
{
d = new Private();
- QGridLayout* lay = new QGridLayout( plainPage() );
+ TQGridLayout* lay = new TQGridLayout( plainPage() );
- QLabel* label = new QLabel( text.isEmpty() ? i18n("Please select a device:") : text, plainPage() );
+ TQLabel* label = new TQLabel( text.isEmpty() ? i18n("Please select a device:") : text, plainPage() );
d->comboDevices = new K3bDeviceComboBox( plainPage() );
// lay->setMargin( marginHint() );
@@ -76,7 +76,7 @@ void K3bDeviceSelectionDialog::addDevice( K3bDevice::Device* dev )
}
-void K3bDeviceSelectionDialog::addDevices( const QPtrList<K3bDevice::Device>& list )
+void K3bDeviceSelectionDialog::addDevices( const TQPtrList<K3bDevice::Device>& list )
{
d->comboDevices->addDevices( list );
}
@@ -94,16 +94,16 @@ void K3bDeviceSelectionDialog::setSelectedDevice( K3bDevice::Device* dev )
}
-K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( QWidget* parent,
- const QPtrList<K3bDevice::Device>& devices,
- const QString& text )
+K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent,
+ const TQPtrList<K3bDevice::Device>& devices,
+ const TQString& text )
{
if( devices.isEmpty() )
return 0;
if( devices.count() == 1 )
return devices.getFirst();
- K3bDeviceSelectionDialog dlg( parent, 0, text );
+ K3bDeviceSelectionDialog dlg( tqparent, 0, text );
dlg.addDevices( devices );
if( dlg.exec() == Accepted )
@@ -112,18 +112,18 @@ K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( QWidget* parent,
return 0;
}
-K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( QWidget* parent,
- const QString& text )
+K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent,
+ const TQString& text )
{
- return selectDevice( parent, k3bcore->deviceManager()->allDevices(), text );
+ return selectDevice( tqparent, k3bcore->deviceManager()->allDevices(), text );
}
-K3bDevice::Device* K3bDeviceSelectionDialog::selectWriter( QWidget* parent, const QString& text )
+K3bDevice::Device* K3bDeviceSelectionDialog::selectWriter( TQWidget* tqparent, const TQString& text )
{
- return selectDevice( parent, k3bcore->deviceManager()->burningDevices(), text );
+ return selectDevice( tqparent, k3bcore->deviceManager()->burningDevices(), text );
}
diff --git a/libk3b/tools/k3bdeviceselectiondialog.h b/libk3b/tools/k3bdeviceselectiondialog.h
index b61ce1e..5295408 100644
--- a/libk3b/tools/k3bdeviceselectiondialog.h
+++ b/libk3b/tools/k3bdeviceselectiondialog.h
@@ -21,7 +21,7 @@
#include <kdialogbase.h>
#include "k3b_export.h"
-#include <qptrlist.h>
+#include <tqptrlist.h>
namespace K3bDevice {
class Device;
@@ -31,28 +31,29 @@ namespace K3bDevice {
class LIBK3B_EXPORT K3bDeviceSelectionDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDeviceSelectionDialog( QWidget* parent = 0,
+ K3bDeviceSelectionDialog( TQWidget* tqparent = 0,
const char* name = 0,
- const QString& text = QString::null,
+ const TQString& text = TQString(),
bool modal = false );
~K3bDeviceSelectionDialog();
void addDevice( K3bDevice::Device* );
- void addDevices( const QPtrList<K3bDevice::Device>& );
+ void addDevices( const TQPtrList<K3bDevice::Device>& );
void setSelectedDevice( K3bDevice::Device* );
K3bDevice::Device* selectedDevice() const;
- static K3bDevice::Device* selectWriter( QWidget* parent,
- const QString& text = QString::null );
- static K3bDevice::Device* selectDevice( QWidget* parent,
- const QString& text = QString::null );
- static K3bDevice::Device* selectDevice( QWidget* parent,
- const QPtrList<K3bDevice::Device>& devices,
- const QString& text = QString::null );
+ static K3bDevice::Device* selectWriter( TQWidget* tqparent,
+ const TQString& text = TQString() );
+ static K3bDevice::Device* selectDevice( TQWidget* tqparent,
+ const TQString& text = TQString() );
+ static K3bDevice::Device* selectDevice( TQWidget* tqparent,
+ const TQPtrList<K3bDevice::Device>& devices,
+ const TQString& text = TQString() );
private:
class Private;
diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp
index ab9cb8a..51b28e8 100644
--- a/libk3b/tools/k3bdirsizejob.cpp
+++ b/libk3b/tools/k3bdirsizejob.cpp
@@ -23,8 +23,8 @@
#include <kdebug.h>
#include <kglobal.h>
-#include <qfileinfo.h>
-#include <qdir.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
class K3bDirSizeJob::WorkThread : public K3bThread
@@ -51,7 +51,7 @@ public:
void run() {
emitStarted();
- QStringList l;
+ TQStringList l;
for( KURL::List::const_iterator it = urls.begin();
it != urls.end(); ++it ) {
const KURL& url = *it;
@@ -65,13 +65,13 @@ public:
l.append( url.path() );
}
- emitFinished( countFiles( l, QString() ) );
+ emitFinished( countFiles( l, TQString() ) );
}
- bool countDir( const QString& dir ) {
- const QString& dot = KGlobal::staticQString( "." );
- const QString& dotdot = KGlobal::staticQString( ".." );
- QStringList l = QDir(dir).entryList( QDir::All|QDir::Hidden|QDir::System );
+ bool countDir( const TQString& dir ) {
+ const TQString& dot = KGlobal::staticQString( "." );
+ const TQString& dotdot = KGlobal::staticQString( ".." );
+ TQStringList l = TQDir(dir).entryList( TQDir::All|TQDir::Hidden|TQDir::System );
l.remove( dot );
l.remove( dotdot );
@@ -79,21 +79,21 @@ public:
}
- bool countFiles( const QStringList& l, const QString& dir ) {
- for( QStringList::const_iterator it = l.begin();
+ bool countFiles( const TQStringList& l, const TQString& dir ) {
+ for( TQStringList::const_iterator it = l.begin();
it != l.end(); ++it ) {
if( m_canceled )
return false;
k3b_struct_stat s;
- if( k3b_lstat( QFile::encodeName( dir + *it ), &s ) )
+ if( k3b_lstat( TQFile::encodeName( dir + *it ), &s ) )
return false;
if( S_ISLNK( s.st_mode ) ) {
++totalSymlinks;
if( followSymlinks ) {
- if( k3b_stat( QFile::encodeName( dir + *it ), &s ) )
+ if( k3b_stat( TQFile::encodeName( dir + *it ), &s ) )
return false;
}
}
@@ -131,8 +131,8 @@ private:
};
-K3bDirSizeJob::K3bDirSizeJob( QObject* parent )
- : K3bThreadJob( new K3bSimpleJobHandler(), parent )
+K3bDirSizeJob::K3bDirSizeJob( TQObject* tqparent )
+ : K3bThreadJob( new K3bSimpleJobHandler(), tqparent )
{
d = new WorkThread;
setThread( d );
diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h
index d6a3e5a..82c54d5 100644
--- a/libk3b/tools/k3bdirsizejob.h
+++ b/libk3b/tools/k3bdirsizejob.h
@@ -31,9 +31,10 @@
class LIBK3B_EXPORT K3bDirSizeJob : public K3bThreadJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bDirSizeJob( QObject* parent = 0 );
+ K3bDirSizeJob( TQObject* tqparent = 0 );
~K3bDirSizeJob();
KIO::filesize_t totalSize() const;
diff --git a/libk3b/tools/k3bexceptions.cpp b/libk3b/tools/k3bexceptions.cpp
index 1d8806f..70c11e5 100644
--- a/libk3b/tools/k3bexceptions.cpp
+++ b/libk3b/tools/k3bexceptions.cpp
@@ -25,7 +25,7 @@ bool K3bExceptions::brokenDaoAudio( K3bDevice::Device* dev )
if( dev->vendor().upper().startsWith("HL-DT-ST") )
if( dev->description().upper().startsWith("RW/DVD GCC-4320B") ||
- dev->description().upper().contains("GCE-8520B") )
+ dev->description().upper().tqcontains("GCE-8520B") )
return true;
if( dev->vendor().upper().startsWith("PHILIPS") &&
@@ -35,7 +35,7 @@ bool K3bExceptions::brokenDaoAudio( K3bDevice::Device* dev )
if( dev->vendor().upper().startsWith("LITE-ON") )
if( dev->description().upper().startsWith("LTR-32123S") ||
dev->description().upper().startsWith("LTR-40125S") ||
- dev->description().upper().contains("LTC-48161H") ||
+ dev->description().upper().tqcontains("LTC-48161H") ||
dev->description().upper().startsWith("DVDRW LDW-811S") )
return true;
diff --git a/libk3b/tools/k3bfilesplitter.cpp b/libk3b/tools/k3bfilesplitter.cpp
index af5b83f..7833f86 100644
--- a/libk3b/tools/k3bfilesplitter.cpp
+++ b/libk3b/tools/k3bfilesplitter.cpp
@@ -18,7 +18,7 @@
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
class K3bFileSplitter::Private
@@ -28,11 +28,11 @@ public:
: m_splitter( splitter ) {
}
- QString filename;
- QFile file;
+ TQString filename;
+ TQFile file;
int counter;
- // QIODevice::Offset is too small on most compilations
+ // TQIODevice::Offset is too small on most compilations
KIO::filesize_t maxFileSize;
KIO::filesize_t currentOverallPos;
@@ -47,14 +47,14 @@ public:
}
}
- QString buildFileName( int counter ) {
+ TQString buildFileName( int counter ) {
if( counter > 0 )
- return filename + '.' + QString::number(counter).rightJustify( 3, '0' );
+ return filename + '.' + TQString::number(counter).rightJustify( 3, '0' );
else
return filename;
}
- QString currentFileName() {
+ TQString currentFileName() {
return buildFileName( counter );
}
@@ -91,7 +91,7 @@ K3bFileSplitter::K3bFileSplitter()
}
-K3bFileSplitter::K3bFileSplitter( const QString& filename )
+K3bFileSplitter::K3bFileSplitter( const TQString& filename )
{
d = new Private( this );
setName( filename );
@@ -104,13 +104,13 @@ K3bFileSplitter::~K3bFileSplitter()
}
-const QString& K3bFileSplitter::name() const
+const TQString& K3bFileSplitter::name() const
{
return d->filename;
}
-void K3bFileSplitter::setName( const QString& filename )
+void K3bFileSplitter::setName( const TQString& filename )
{
close();
d->maxFileSize = 0;
@@ -155,21 +155,24 @@ void K3bFileSplitter::flush()
d->file.flush();
}
-
-QIODevice::Offset K3bFileSplitter::size() const
+#ifdef USE_QT4
+qint64 K3bFileSplitter::size() const
+#else // USE_QT4
+TQIODevice::Offset K3bFileSplitter::size() const
+#endif // USE_QT4
{
// not implemented due to Offset size limitations
return 0;
}
-QIODevice::Offset K3bFileSplitter::at() const
+TQIODevice::Offset K3bFileSplitter::at() const
{
return d->currentOverallPos;
}
-bool K3bFileSplitter::at( QIODevice::Offset pos )
+bool K3bFileSplitter::at( TQIODevice::Offset pos )
{
Q_UNUSED( pos );
// not implemented due to Offset size limitations
@@ -179,13 +182,13 @@ bool K3bFileSplitter::at( QIODevice::Offset pos )
bool K3bFileSplitter::atEnd() const
{
- return d->file.atEnd() && !QFile::exists( d->buildFileName( d->counter+1 ) );
+ return d->file.atEnd() && !TQFile::exists( d->buildFileName( d->counter+1 ) );
}
-Q_LONG K3bFileSplitter::readBlock( char *data, Q_ULONG maxlen )
+TQ_LONG K3bFileSplitter::readBlock( char *data, TQ_ULONG maxlen )
{
- Q_LONG r = d->file.readBlock( data, maxlen );
+ TQ_LONG r = d->file.readBlock( data, maxlen );
if( r == 0 ) {
if( atEnd() ) {
return r;
@@ -204,12 +207,12 @@ Q_LONG K3bFileSplitter::readBlock( char *data, Q_ULONG maxlen )
}
-Q_LONG K3bFileSplitter::writeBlock( const char *data, Q_ULONG len )
+TQ_LONG K3bFileSplitter::writeBlock( const char *data, TQ_ULONG len )
{
- // We cannot rely on QFile::at since it uses long on most copmpilations
- Q_ULONG max = (Q_ULONG)QMIN( (KIO::filesize_t)len, d->maxFileSize - d->currentFilePos );
+ // We cannot rely on TQFile::at since it uses long on most copmpilations
+ TQ_ULONG max = (TQ_ULONG)TQMIN( (KIO::filesize_t)len, d->maxFileSize - d->currentFilePos );
- Q_LONG r = d->file.writeBlock( data, max );
+ TQ_LONG r = d->file.writeBlock( data, max );
if( r < 0 )
return r;
@@ -218,7 +221,7 @@ Q_LONG K3bFileSplitter::writeBlock( const char *data, Q_ULONG len )
d->currentFilePos += r;
// recursively call us
- if( (Q_ULONG)r < len ) {
+ if( (TQ_ULONG)r < len ) {
if( d->openNextFile() )
return r + writeBlock( data+r, len-r );
else
@@ -296,8 +299,8 @@ int K3bFileSplitter::ungetch( int c )
void K3bFileSplitter::remove()
{
close();
- while( QFile::exists( d->buildFileName( d->counter ) ) )
- QFile::remove( d->buildFileName( d->counter++ ) );
+ while( TQFile::exists( d->buildFileName( d->counter ) ) )
+ TQFile::remove( d->buildFileName( d->counter++ ) );
}
diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h
index 22dcad9..40af5ab 100644
--- a/libk3b/tools/k3bfilesplitter.h
+++ b/libk3b/tools/k3bfilesplitter.h
@@ -16,8 +16,8 @@
#ifndef _K3B_FILE_SPLITTER_H_
#define _K3B_FILE_SPLITTER_H_
-#include <qiodevice.h>
-#include <qstring.h>
+#include <tqiodevice.h>
+#include <tqstring.h>
#include <kio/global.h>
@@ -25,7 +25,7 @@
/**
- * QFile replacement which splits
+ * TQFile replacement which splits
* big files according to the underlying file system's
* maximum file size.
*
@@ -39,11 +39,11 @@
* ...
* </pre>
*/
-class LIBK3B_EXPORT K3bFileSplitter : public QIODevice
+class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice
{
public:
K3bFileSplitter();
- K3bFileSplitter( const QString& filename );
+ K3bFileSplitter( const TQString& filename );
~K3bFileSplitter();
/**
@@ -55,14 +55,19 @@ class LIBK3B_EXPORT K3bFileSplitter : public QIODevice
*/
void setMaxFileSize( KIO::filesize_t size );
- const QString& name() const;
+ const TQString& name() const;
- void setName( const QString& filename );
+ void setName( const TQString& filename );
virtual bool open( int mode );
virtual void close();
+#ifdef USE_QT4
+ inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); }
+ inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); }
+#endif // USE_QT4
+
/**
* File descriptor to read from and write to.
* Not implemented yet!
@@ -74,7 +79,11 @@ class LIBK3B_EXPORT K3bFileSplitter : public QIODevice
/**
* Not implemented
*/
+#ifdef USE_QT4
+ virtual qint64 size() const;
+#else // USE_QT4
virtual Offset size() const;
+#endif // USE_QT4
/**
* Not implemented
@@ -87,8 +96,8 @@ class LIBK3B_EXPORT K3bFileSplitter : public QIODevice
virtual bool at( Offset );
virtual bool atEnd() const;
- virtual Q_LONG readBlock( char *data, Q_ULONG maxlen );
- virtual Q_LONG writeBlock( const char *data, Q_ULONG len );
+ virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
+ virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len );
virtual int getch();
virtual int putch( int );
virtual int ungetch( int );
diff --git a/libk3b/tools/k3bfilesysteminfo.cpp b/libk3b/tools/k3bfilesysteminfo.cpp
index fe1eaf8..026643f 100644
--- a/libk3b/tools/k3bfilesysteminfo.cpp
+++ b/libk3b/tools/k3bfilesysteminfo.cpp
@@ -19,9 +19,9 @@
#include <k3bglobals.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqregexp.h>
#include <kdebug.h>
@@ -57,13 +57,13 @@ public:
}
FileSystemType type;
- QString path;
+ TQString path;
bool statDone;
void stat() {
struct statfs fs;
- if( !::statfs( QFile::encodeName( QFileInfo(path).dirPath( true ) ), &fs ) ) {
+ if( !::statfs( TQFile::encodeName( TQFileInfo(path).dirPath( true ) ), &fs ) ) {
switch( fs.f_type ) {
case 0x4d44: // MS-DOS
type = FS_FAT;
@@ -86,7 +86,7 @@ K3bFileSystemInfo::K3bFileSystemInfo()
}
-K3bFileSystemInfo::K3bFileSystemInfo( const QString& path )
+K3bFileSystemInfo::K3bFileSystemInfo( const TQString& path )
{
d = new Private;
d->path = path;
@@ -108,13 +108,13 @@ K3bFileSystemInfo::~K3bFileSystemInfo()
}
-QString K3bFileSystemInfo::path() const
+TQString K3bFileSystemInfo::path() const
{
return d->path;
}
-void K3bFileSystemInfo::setPath( const QString& path )
+void K3bFileSystemInfo::setPath( const TQString& path )
{
if( d->path != path ) {
d->path = path;
@@ -131,11 +131,11 @@ K3bFileSystemInfo::FileSystemType K3bFileSystemInfo::type() const
}
-QString K3bFileSystemInfo::fixupPath( const QString& path )
+TQString K3bFileSystemInfo::fixupPath( const TQString& path )
{
- QString s = K3b::fixupPath( path );
+ TQString s = K3b::fixupPath( path );
if( type() == K3bFileSystemInfo::FS_FAT )
- return s.replace( QRegExp("[\"\\?\\*/\\\\[\\]\\|\\=\\:;]"), "_" );
+ return s.tqreplace( TQRegExp("[\"\\?\\*/\\\\[\\]\\|\\=\\:;]"), "_" );
else
return s;
}
diff --git a/libk3b/tools/k3bfilesysteminfo.h b/libk3b/tools/k3bfilesysteminfo.h
index be9995c..7a19115 100644
--- a/libk3b/tools/k3bfilesysteminfo.h
+++ b/libk3b/tools/k3bfilesysteminfo.h
@@ -18,18 +18,18 @@
#include <k3b_export.h>
-#include <qstring.h>
+#include <tqstring.h>
class LIBK3B_EXPORT K3bFileSystemInfo
{
public:
K3bFileSystemInfo();
- K3bFileSystemInfo( const QString& path );
+ K3bFileSystemInfo( const TQString& path );
K3bFileSystemInfo( const K3bFileSystemInfo& );
~K3bFileSystemInfo();
- QString path() const;
- void setPath( const QString& path );
+ TQString path() const;
+ void setPath( const TQString& path );
enum FileSystemType {
FS_UNKNOWN,
@@ -46,7 +46,7 @@ class LIBK3B_EXPORT K3bFileSystemInfo
* For now it only replaces characters like * or [
* on FAT file systems.
*/
- QString fixupPath( const QString& );
+ TQString fixupPath( const TQString& );
private:
class Private;
diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp
index 19ac649..cb5b2b3 100644
--- a/libk3b/tools/k3bintmapcombobox.cpp
+++ b/libk3b/tools/k3bintmapcombobox.cpp
@@ -15,30 +15,30 @@
#include "k3bintmapcombobox.h"
-#include <qwhatsthis.h>
-#include <qmap.h>
-#include <qvaluevector.h>
+#include <tqwhatsthis.h>
+#include <tqmap.h>
+#include <tqvaluevector.h>
class K3bIntMapComboBox::Private
{
public:
- QMap<int, int> valueIndexMap;
- QMap<int, QPair<int, QString> > indexValueDescriptionMap;
+ TQMap<int, int> valueIndexMap;
+ TQMap<int, TQPair<int, TQString> > indexValueDescriptionMap;
- QString topWhatsThis;
- QString bottomWhatsThis;
+ TQString topWhatsThis;
+ TQString bottomWhatsThis;
};
-K3bIntMapComboBox::K3bIntMapComboBox( QWidget* parent, const char* name )
- : KComboBox( parent, name )
+K3bIntMapComboBox::K3bIntMapComboBox( TQWidget* tqparent, const char* name )
+ : KComboBox( tqparent, name )
{
d = new Private;
- connect( this, SIGNAL(highlighted(int)),
- this, SLOT(slotItemHighlighted(int)) );
- connect( this, SIGNAL(activated(int)),
- this, SLOT(slotItemActivated(int)) );
+ connect( this, TQT_SIGNAL(highlighted(int)),
+ this, TQT_SLOT(slotItemHighlighted(int)) );
+ connect( this, TQT_SIGNAL(activated(int)),
+ this, TQT_SLOT(slotItemActivated(int)) );
}
@@ -59,7 +59,7 @@ int K3bIntMapComboBox::selectedValue() const
void K3bIntMapComboBox::setSelectedValue( int value )
{
- if( d->valueIndexMap.contains( value ) )
+ if( d->valueIndexMap.tqcontains( value ) )
KComboBox::setCurrentItem( d->valueIndexMap[value] );
}
@@ -73,16 +73,16 @@ void K3bIntMapComboBox::clear()
}
-bool K3bIntMapComboBox::insertItem( int value, const QString& text, const QString& description, int index )
+bool K3bIntMapComboBox::insertItem( int value, const TQString& text, const TQString& description, int index )
{
- if( d->valueIndexMap.contains( value ) )
+ if( d->valueIndexMap.tqcontains( value ) )
return false;
// FIXME: allow inserition at any index
index = KComboBox::count();
d->valueIndexMap[value] = index;
- d->indexValueDescriptionMap[index] = qMakePair<int, QString>( value, description );
+ d->indexValueDescriptionMap[index] = tqMakePair<int, TQString>( value, description );
KComboBox::insertItem( text );
@@ -94,14 +94,14 @@ bool K3bIntMapComboBox::insertItem( int value, const QString& text, const QStrin
void K3bIntMapComboBox::updateWhatsThis()
{
- QString ws( d->topWhatsThis );
+ TQString ws( d->topWhatsThis );
for( unsigned int i = 0; i < d->indexValueDescriptionMap.count(); ++i ) {
ws += "<p><b>" + KComboBox::text( i ) + "</b><br>";
ws += d->indexValueDescriptionMap[i].second;
}
ws += "<p>" + d->bottomWhatsThis;
- QWhatsThis::add( this, ws );
+ TQWhatsThis::add( this, ws );
}
@@ -117,7 +117,7 @@ void K3bIntMapComboBox::slotItemActivated( int index )
}
-void K3bIntMapComboBox::addGlobalWhatsThisText( const QString& top, const QString& bottom )
+void K3bIntMapComboBox::addGlobalWhatsThisText( const TQString& top, const TQString& bottom )
{
d->topWhatsThis = top;
d->bottomWhatsThis = bottom;
diff --git a/libk3b/tools/k3bintmapcombobox.h b/libk3b/tools/k3bintmapcombobox.h
index b0ae717..622c202 100644
--- a/libk3b/tools/k3bintmapcombobox.h
+++ b/libk3b/tools/k3bintmapcombobox.h
@@ -30,9 +30,10 @@
class LIBK3B_EXPORT K3bIntMapComboBox : public KComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bIntMapComboBox( QWidget* parent = 0, const char* name = 0 );
+ K3bIntMapComboBox( TQWidget* tqparent = 0, const char* name = 0 );
~K3bIntMapComboBox();
int selectedValue() const;
@@ -65,9 +66,9 @@ class LIBK3B_EXPORT K3bIntMapComboBox : public KComboBox
*
* \return true if the item could be inserted. False if the value had already been inserted.
*/
- bool insertItem( int value, const QString& text, const QString& description, int index = -1 );
+ bool insertItem( int value, const TQString& text, const TQString& description, int index = -1 );
- void addGlobalWhatsThisText( const QString& top, const QString& bottom );
+ void addGlobalWhatsThisText( const TQString& top, const TQString& bottom );
private slots:
void slotItemActivated( int );
diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp
index dabf719..ed38088 100644
--- a/libk3b/tools/k3bintvalidator.cpp
+++ b/libk3b/tools/k3bintvalidator.cpp
@@ -14,8 +14,8 @@
*/
-#include <qwidget.h>
-#include <qstring.h>
+#include <tqwidget.h>
+#include <tqstring.h>
#include "k3bintvalidator.h"
@@ -24,15 +24,15 @@
#include <kdebug.h>
-K3bIntValidator::K3bIntValidator ( QWidget * parent, const char * name )
- : QValidator(parent, name)
+K3bIntValidator::K3bIntValidator ( TQWidget * tqparent, const char * name )
+ : TQValidator(TQT_TQOBJECT(tqparent), name)
{
m_min = m_max = 0;
}
-K3bIntValidator::K3bIntValidator ( int bottom, int top, QWidget * parent, const char * name )
- : QValidator(parent, name)
+K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * tqparent, const char * name )
+ : TQValidator(TQT_TQOBJECT(tqparent), name)
{
m_min = bottom;
m_max = top;
@@ -44,11 +44,11 @@ K3bIntValidator::~K3bIntValidator ()
}
-QValidator::State K3bIntValidator::validate ( QString &str, int & ) const
+TQValidator::State K3bIntValidator::validate ( TQString &str, int & ) const
{
bool ok;
int val = 0;
- QString newStr;
+ TQString newStr;
newStr = str.stripWhiteSpace();
newStr = newStr.upper();
@@ -70,7 +70,7 @@ QValidator::State K3bIntValidator::validate ( QString &str, int & ) const
if( minus && m_min && m_min >= 0)
ok = false;
else
- return QValidator::Acceptable;
+ return TQValidator::Acceptable;
}
val = newStr.toInt( &ok, hex ? 16 : 10 );
@@ -83,22 +83,22 @@ QValidator::State K3bIntValidator::validate ( QString &str, int & ) const
}
if( !ok )
- return QValidator::Invalid;
+ return TQValidator::Invalid;
if( m_min && val > 0 && val < m_min )
- return QValidator::Acceptable;
+ return TQValidator::Acceptable;
if( m_max && val < 0 && val > m_max )
- return QValidator::Acceptable;
+ return TQValidator::Acceptable;
if( (m_max && val > m_max) || (m_min && val < m_min) )
- return QValidator::Invalid;
+ return TQValidator::Invalid;
- return QValidator::Valid;
+ return TQValidator::Valid;
}
-void K3bIntValidator::fixup ( QString& ) const
+void K3bIntValidator::fixup ( TQString& ) const
{
// TODO: remove preceding zeros
}
@@ -126,7 +126,7 @@ int K3bIntValidator::top () const
}
-int K3bIntValidator::toInt( const QString& s, bool* ok )
+int K3bIntValidator::toInt( const TQString& s, bool* ok )
{
if( s.lower().startsWith( "0x" ) )
return s.right( s.length()-2 ).toInt( ok, 16 );
diff --git a/libk3b/tools/k3bintvalidator.h b/libk3b/tools/k3bintvalidator.h
index 551d56a..0945f89 100644
--- a/libk3b/tools/k3bintvalidator.h
+++ b/libk3b/tools/k3bintvalidator.h
@@ -17,29 +17,29 @@
#ifndef _K3B_INT_VALIDATOR_H_
#define _K3B_INT_VALIDATOR_H_
-#include <qvalidator.h>
+#include <tqvalidator.h>
#include "k3b_export.h"
-class QWidget;
-class QString;
+class TQWidget;
+class TQString;
/**
- * QValidator for integers.
+ * TQValidator for integers.
*
- * It differs from QIntValidator and KIntValidator in the fact that
+ * It differs from TQIntValidator and KIntValidator in the fact that
* it also accepts hex numbers prefixed with 0x.
*/
-class LIBK3B_EXPORT K3bIntValidator : public QValidator
+class LIBK3B_EXPORT K3bIntValidator : public TQValidator
{
public:
/**
* Constuctor. Also sets the base value.
*/
- K3bIntValidator ( QWidget * parent, const char * name = 0 );
+ K3bIntValidator ( TQWidget * tqparent, const char * name = 0 );
/**
* Constructor. Also sets the minimum, maximum, and numeric base values.
*/
- K3bIntValidator ( int bottom, int top, QWidget * parent, const char * name = 0 );
+ K3bIntValidator ( int bottom, int top, TQWidget * tqparent, const char * name = 0 );
/**
* Destructs the validator.
@@ -49,12 +49,12 @@ class LIBK3B_EXPORT K3bIntValidator : public QValidator
/**
* Validates the text, and return the result. Does not modify the parameters.
*/
- virtual State validate ( QString &, int & ) const;
+ virtual State validate ( TQString &, int & ) const;
/**
* Fixes the text if possible, providing a valid string. The parameter may be modified.
*/
- virtual void fixup ( QString & ) const;
+ virtual void fixup ( TQString & ) const;
/**
* Sets the minimum and maximum values allowed.
@@ -74,7 +74,7 @@ class LIBK3B_EXPORT K3bIntValidator : public QValidator
/**
* If the string starts with 0x it's assumed to be a hex number.
*/
- static int toInt( const QString&, bool* ok = 0 );
+ static int toInt( const TQString&, bool* ok = 0 );
private:
int m_min;
diff --git a/libk3b/tools/k3biso9660.cpp b/libk3b/tools/k3biso9660.cpp
index 84edc4b..ded2ce9 100644
--- a/libk3b/tools/k3biso9660.cpp
+++ b/libk3b/tools/k3biso9660.cpp
@@ -23,10 +23,10 @@
#include "libisofs/isofs.h"
-#include <qcstring.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qptrlist.h>
+#include <tqcstring.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqptrlist.h>
#include <kdebug.h>
@@ -43,7 +43,7 @@ int K3bIso9660::read_callback( char* buf, sector_t start, int len, void* udata )
int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata )
{
K3bIso9660 *iso = static_cast<K3bIso9660*> (udata);
- QString path, isoPath,user,group,symlink;
+ TQString path, isoPath,user,group,symlink;
int i;
int access;
int time,cdate,adate;
@@ -84,7 +84,7 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata )
if( !iso->plainIso9660() && ParseRR(idr,&rr) > 0 ) {
iso->m_rr = true;
if (!special)
- path = QString::fromLocal8Bit( rr.name );
+ path = TQString::fromLocal8Bit( rr.name );
symlink=rr.sl;
access=rr.mode;
time=0;//rr.st_mtime;
@@ -105,7 +105,7 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata )
if (!special) {
if( !iso->plainIso9660() && iso->jolietLevel() ) {
for (i=0;i<(isonum_711(idr->name_len)-1);i+=2) {
- QChar ch( be2me_16(*((ushort*)&(idr->name[i]))) );
+ TQChar ch( be2me_16(*((ushort*)&(idr->name[i]))) );
if (ch==';') break;
path+=ch;
}
@@ -115,7 +115,7 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata )
path = isoPath;
// remove the version field
- int pos = path.find( ';' );
+ int pos = path.tqfind( ';' );
if( pos > 0 )
path.truncate( pos );
}
@@ -146,15 +146,15 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata )
K3bIso9660Entry::K3bIso9660Entry( K3bIso9660* archive,
- const QString& isoName,
- const QString& name,
+ const TQString& isoName,
+ const TQString& name,
int access,
int date,
int adate,
int cdate,
- const QString& user,
- const QString& group,
- const QString& symlink )
+ const TQString& user,
+ const TQString& group,
+ const TQString& symlink )
: m_adate( adate ),
m_cdate( cdate ),
m_name( name ),
@@ -179,15 +179,15 @@ K3bIso9660Entry::~K3bIso9660Entry()
K3bIso9660File::K3bIso9660File( K3bIso9660* archive,
- const QString& isoName,
- const QString& name,
+ const TQString& isoName,
+ const TQString& name,
int access,
int date,
int adate,
int cdate,
- const QString& user,
- const QString& group,
- const QString& symlink,
+ const TQString& user,
+ const TQString& group,
+ const TQString& symlink,
unsigned int pos,
unsigned int size )
: K3bIso9660Entry( archive, isoName, name, access, date, adate, cdate, user, group, symlink ),
@@ -265,9 +265,9 @@ int K3bIso9660File::read( unsigned int pos, char* data, int maxlen ) const
}
-bool K3bIso9660File::copyTo( const QString& url ) const
+bool K3bIso9660File::copyTo( const TQString& url ) const
{
- QFile of( url );
+ TQFile of( url );
if( of.open( IO_WriteOnly ) ) {
char buffer[2048*10];
unsigned int pos = 0;
@@ -287,15 +287,15 @@ bool K3bIso9660File::copyTo( const QString& url ) const
K3bIso9660Directory::K3bIso9660Directory( K3bIso9660* archive,
- const QString& isoName,
- const QString& name,
+ const TQString& isoName,
+ const TQString& name,
int access,
int date,
int adate,
int cdate,
- const QString& user,
- const QString& group,
- const QString& symlink,
+ const TQString& user,
+ const TQString& group,
+ const TQString& symlink,
unsigned int pos,
unsigned int size )
: K3bIso9660Entry( archive, isoName, name, access, date, adate, cdate, user, group, symlink ),
@@ -323,14 +323,14 @@ void K3bIso9660Directory::expand()
}
-QStringList K3bIso9660Directory::entries() const
+TQStringList K3bIso9660Directory::entries() const
{
// create a fake const method to fool the user ;)
const_cast<K3bIso9660Directory*>(this)->expand();
- QStringList l;
+ TQStringList l;
- QDictIterator<K3bIso9660Entry> it( m_entries );
+ TQDictIterator<K3bIso9660Entry> it( m_entries );
for( ; it.current(); ++it )
l.append( it.currentKey() );
@@ -338,14 +338,14 @@ QStringList K3bIso9660Directory::entries() const
}
-QStringList K3bIso9660Directory::iso9660Entries() const
+TQStringList K3bIso9660Directory::iso9660Entries() const
{
// create a fake const method to fool the user ;)
const_cast<K3bIso9660Directory*>(this)->expand();
- QStringList l;
+ TQStringList l;
- QDictIterator<K3bIso9660Entry> it( m_iso9660Entries );
+ TQDictIterator<K3bIso9660Entry> it( m_iso9660Entries );
for( ; it.current(); ++it )
l.append( it.currentKey() );
@@ -353,33 +353,33 @@ QStringList K3bIso9660Directory::iso9660Entries() const
}
-K3bIso9660Entry* K3bIso9660Directory::entry( const QString& n )
+K3bIso9660Entry* K3bIso9660Directory::entry( const TQString& n )
{
if( n.isEmpty() )
return 0;
expand();
- QString name(n);
+ TQString name(n);
// trailing slash ? -> remove
if( name.length() > 1 && name[name.length()-1] == '/' ) {
name.truncate( name.length()-1 );
}
- int pos = name.find( '/' );
+ int pos = name.tqfind( '/' );
while( pos == 0 ) {
if( name.length() > 1 ) {
name = name.mid( 1 ); // remove leading slash
- pos = name.find( '/' ); // look again
+ pos = name.tqfind( '/' ); // look again
}
else // "/"
return this;
}
if ( pos != -1 ) {
- QString left = name.left( pos );
- QString right = name.mid( pos + 1 );
+ TQString left = name.left( pos );
+ TQString right = name.mid( pos + 1 );
K3bIso9660Entry* e = m_entries[ left ];
if ( !e || !e->isDirectory() )
@@ -391,33 +391,33 @@ K3bIso9660Entry* K3bIso9660Directory::entry( const QString& n )
}
-K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const QString& n )
+K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const TQString& n )
{
if( n.isEmpty() )
return 0;
expand();
- QString name(n);
+ TQString name(n);
// trailing slash ? -> remove
if( name.length() > 1 && name[name.length()-1] == '/' ) {
name.truncate( name.length()-1 );
}
- int pos = name.find( '/' );
+ int pos = name.tqfind( '/' );
while( pos == 0 ) {
if( name.length() > 1 ) {
name = name.mid( 1 ); // remove leading slash
- pos = name.find( '/' ); // look again
+ pos = name.tqfind( '/' ); // look again
}
else // "/"
return this;
}
if ( pos != -1 ) {
- QString left = name.left( pos );
- QString right = name.mid( pos + 1 );
+ TQString left = name.left( pos );
+ TQString right = name.mid( pos + 1 );
K3bIso9660Entry* e = m_iso9660Entries[ left ];
if ( !e || !e->isDirectory() )
@@ -429,13 +429,13 @@ K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const QString& n )
}
-const K3bIso9660Entry* K3bIso9660Directory::entry( const QString& name ) const
+const K3bIso9660Entry* K3bIso9660Directory::entry( const TQString& name ) const
{
return const_cast<K3bIso9660Directory*>(this)->entry( name );
}
-const K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const QString& name ) const
+const K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const TQString& name ) const
{
return const_cast<K3bIso9660Directory*>(this)->iso9660Entry( name );
}
@@ -463,10 +463,10 @@ public:
backend(0) {
}
- QPtrList<K3bIso9660Directory> elToritoDirs;
- QPtrList<K3bIso9660Directory> jolietDirs;
- QPtrList<K3bIso9660Directory> isoDirs;
- QPtrList<K3bIso9660Directory> rrDirs; // RockRidge
+ TQPtrList<K3bIso9660Directory> elToritoDirs;
+ TQPtrList<K3bIso9660Directory> jolietDirs;
+ TQPtrList<K3bIso9660Directory> isoDirs;
+ TQPtrList<K3bIso9660Directory> rrDirs; // RockRidge
K3bIso9660SimplePrimaryDescriptor primaryDesc;
@@ -484,7 +484,7 @@ public:
};
-K3bIso9660::K3bIso9660( const QString& filename )
+K3bIso9660::K3bIso9660( const TQString& filename )
: m_filename( filename )
{
d = new Private();
@@ -553,12 +553,12 @@ void K3bIso9660::addBoot(struct el_torito_boot_descriptor* bootdesc)
int i,size;
boot_head boot;
boot_entry *be;
- QString path;
+ TQString path;
K3bIso9660File *entry;
entry=new K3bIso9660File( this, "Catalog", "Catalog", dirent->permissions() & ~S_IFDIR,
dirent->date(), dirent->adate(), dirent->cdate(),
- dirent->user(), dirent->group(), QString::null,
+ dirent->user(), dirent->group(), TQString(),
isonum_731(bootdesc->boot_catalog), 2048 );
dirent->addEntry(entry);
if (!ReadBootTable(&K3bIso9660::read_callback,isonum_731(bootdesc->boot_catalog),&boot,this)) {
@@ -571,10 +571,10 @@ void K3bIso9660::addBoot(struct el_torito_boot_descriptor* bootdesc)
isonum_721(((struct default_entry*) be->data)->seccount),
this);
path="Default Image";
- if (i>1) path += " (" + QString::number(i) + ")";
+ if (i>1) path += " (" + TQString::number(i) + ")";
entry=new K3bIso9660File( this, path, path, dirent->permissions() & ~S_IFDIR,
dirent->date(), dirent->adate(), dirent->cdate(),
- dirent->user(), dirent->group(), QString::null,
+ dirent->user(), dirent->group(), TQString(),
isonum_731(((struct default_entry*) be->data)->start), size<<9 );
dirent->addEntry(entry);
be=be->next;
@@ -624,7 +624,7 @@ bool K3bIso9660::open()
return false;
iso_vol_desc *desc;
- QString path,tmp,uid,gid;
+ TQString path,tmp,uid,gid;
k3b_struct_stat buf;
int access,c_i,c_j;
struct el_torito_boot_descriptor* bootdesc;
@@ -633,7 +633,7 @@ bool K3bIso9660::open()
/* We'll use the permission and user/group of the 'host' file except
* in Rock Ridge, where the permissions are stored on the file system
*/
- if ( k3b_stat( QFile::encodeName(m_filename), &buf ) < 0 ) {
+ if ( k3b_stat( TQFile::encodeName(m_filename), &buf ) < 0 ) {
/* defaults, if stat fails */
memset(&buf,0,sizeof(k3b_struct_stat));
buf.st_mode=0777;
@@ -665,10 +665,10 @@ bool K3bIso9660::open()
if( !memcmp( EL_TORITO_ID, bootdesc->system_id, ISODCL(8,39) ) ) {
path="El Torito Boot";
if( c_b > 1 )
- path += " (" + QString::number(c_b) + ")";
+ path += " (" + TQString::number(c_b) + ")";
dirent = new K3bIso9660Directory( this, path, path, access | S_IFDIR,
- buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, QString::null );
+ buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString() );
d->elToritoDirs.append( dirent );
addBoot(bootdesc);
@@ -691,18 +691,18 @@ bool K3bIso9660::open()
break;
if (m_joliet) {
- path = "Joliet level " + QString::number(m_joliet);
+ path = "Joliet level " + TQString::number(m_joliet);
if( c_j > 1 )
- path += " (" + QString::number(c_j) + ")";
+ path += " (" + TQString::number(c_j) + ")";
}
else {
- path = QString::fromLocal8Bit( primaryDesc->volume_id, 32 );
+ path = TQString::fromLocal8Bit( primaryDesc->volume_id, 32 );
if( c_i > 1 )
- path += " (" + QString::number(c_i) + ")";
+ path += " (" + TQString::number(c_i) + ")";
}
dirent = new K3bIso9660Directory( this, path, path, access | S_IFDIR,
- buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, QString::null );
+ buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString() );
// expand the root entry
ProcessDir( &K3bIso9660::read_callback, isonum_733(idr->extent),isonum_733(idr->size),&K3bIso9660::isofs_callback,this);
@@ -740,12 +740,12 @@ bool K3bIso9660::isOpen() const
void K3bIso9660::createSimplePrimaryDesc( struct iso_primary_descriptor* desc )
{
- d->primaryDesc.volumeId = QString::fromLocal8Bit( desc->volume_id, 32 ).stripWhiteSpace();
- d->primaryDesc.systemId = QString::fromLocal8Bit( desc->system_id, 32 ).stripWhiteSpace();
- d->primaryDesc.volumeSetId = QString::fromLocal8Bit( desc->volume_set_id, 128 ).stripWhiteSpace();
- d->primaryDesc.publisherId = QString::fromLocal8Bit( desc->publisher_id, 128 ).stripWhiteSpace();
- d->primaryDesc.preparerId = QString::fromLocal8Bit( desc->preparer_id, 128 ).stripWhiteSpace();
- d->primaryDesc.applicationId = QString::fromLocal8Bit( desc->application_id, 128 ).stripWhiteSpace();
+ d->primaryDesc.volumeId = TQString(TQString::fromLocal8Bit( desc->volume_id, 32 )).stripWhiteSpace();
+ d->primaryDesc.systemId = TQString(TQString::fromLocal8Bit( desc->system_id, 32 )).stripWhiteSpace();
+ d->primaryDesc.volumeSetId = TQString(TQString::fromLocal8Bit( desc->volume_set_id, 128 )).stripWhiteSpace();
+ d->primaryDesc.publisherId = TQString(TQString::fromLocal8Bit( desc->publisher_id, 128 )).stripWhiteSpace();
+ d->primaryDesc.preparerId = TQString(TQString::fromLocal8Bit( desc->preparer_id, 128 )).stripWhiteSpace();
+ d->primaryDesc.applicationId = TQString(TQString::fromLocal8Bit( desc->application_id, 128 )).stripWhiteSpace();
d->primaryDesc.volumeSetSize = isonum_723(desc->volume_set_size);
d->primaryDesc.volumeSetNumber = isonum_723(desc->volume_set_size);
d->primaryDesc.logicalBlockSize = isonum_723(desc->logical_block_size);
@@ -845,13 +845,13 @@ void K3bIso9660::debugEntry( const K3bIso9660Entry* entry, int depth ) const
return;
}
- QString spacer;
+ TQString spacer;
spacer.fill( ' ', depth*3 );
kdDebug() << spacer << "- " << entry->name() << " (" << entry->isoName() << ")" << endl;
if( entry->isDirectory() ) {
const K3bIso9660Directory* dir = dynamic_cast<const K3bIso9660Directory*>(entry);
- QStringList entries = dir->entries();
- for( QStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) {
+ TQStringList entries = dir->entries();
+ for( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) {
debugEntry( dir->entry( *it ), depth+1 );
}
}
diff --git a/libk3b/tools/k3biso9660.h b/libk3b/tools/k3biso9660.h
index 7fc52d9..246fb67 100644
--- a/libk3b/tools/k3biso9660.h
+++ b/libk3b/tools/k3biso9660.h
@@ -20,10 +20,10 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdict.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
#include "k3b_export.h"
@@ -54,12 +54,12 @@ class LIBK3B_EXPORT K3bIso9660SimplePrimaryDescriptor
*/
K3bIso9660SimplePrimaryDescriptor();
- QString volumeId;
- QString systemId;
- QString volumeSetId;
- QString publisherId;
- QString preparerId;
- QString applicationId;
+ TQString volumeId;
+ TQString systemId;
+ TQString volumeSetId;
+ TQString publisherId;
+ TQString preparerId;
+ TQString applicationId;
int volumeSetSize;
int volumeSetNumber;
long logicalBlockSize;
@@ -81,15 +81,15 @@ class LIBK3B_EXPORT K3bIso9660Entry
{
public:
K3bIso9660Entry( K3bIso9660* archive,
- const QString& isoName,
- const QString& name,
+ const TQString& isoName,
+ const TQString& name,
int access,
int date,
int adate,
int cdate,
- const QString& user,
- const QString& group,
- const QString& symlink );
+ const TQString& user,
+ const TQString& group,
+ const TQString& symlink );
virtual ~K3bIso9660Entry();
int adate() const { return m_adate; }
@@ -99,7 +99,7 @@ class LIBK3B_EXPORT K3bIso9660Entry
* Creation date of the file.
* @return the creation date
*/
- QDateTime datetime() const;
+ TQDateTime datetime() const;
/**
* Creation date of the file.
@@ -111,12 +111,12 @@ class LIBK3B_EXPORT K3bIso9660Entry
* Name of the file without path.
* @return The file name without path.
*/
- const QString& name() const { return m_name; }
+ const TQString& name() const { return m_name; }
/**
* \return The raw name as saved in the ISO9660 tree
*/
- const QString& isoName() const { return m_isoName; }
+ const TQString& isoName() const { return m_isoName; }
/**
* The permissions and mode flags as returned by the stat() function
@@ -129,19 +129,19 @@ class LIBK3B_EXPORT K3bIso9660Entry
* User who created the file.
* @return the owner of the file
*/
- const QString& user() const { return m_user; }
+ const TQString& user() const { return m_user; }
/**
* Group of the user who created the file.
* @return the group of the file
*/
- const QString& group() const { return m_group; }
+ const TQString& group() const { return m_group; }
/**
* Symlink if there is one.
- * @return the symlink, or QString::null
+ * @return the symlink, or TQString()
*/
- const QString& symlink() const { return m_symlink; }
+ const TQString& symlink() const { return m_symlink; }
/**
* Checks whether the entry is a file.
@@ -160,13 +160,13 @@ class LIBK3B_EXPORT K3bIso9660Entry
private:
int m_adate;
int m_cdate;
- QString m_name;
- QString m_isoName;
+ TQString m_name;
+ TQString m_isoName;
int m_date;
mode_t m_access;
- QString m_user;
- QString m_group;
- QString m_symlink;
+ TQString m_user;
+ TQString m_group;
+ TQString m_symlink;
K3bIso9660* m_archive;
};
@@ -175,15 +175,15 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry
{
public:
K3bIso9660Directory( K3bIso9660* archive,
- const QString& isoName,
- const QString& name,
+ const TQString& isoName,
+ const TQString& name,
int access,
int date,
int adate,
int cdate,
- const QString& user,
- const QString& group,
- const QString& symlink,
+ const TQString& user,
+ const TQString& group,
+ const TQString& symlink,
unsigned int pos = 0,
unsigned int size = 0 );
~K3bIso9660Directory();
@@ -192,28 +192,28 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry
* Returns a list of sub-entries.
* @return the names of all entries in this directory (filenames, no path).
*/
- QStringList entries() const;
+ TQStringList entries() const;
/**
* Returns the entry with the given name.
* @param name may be "test1", "mydir/test3", "mydir/mysubdir/test3", etc.
* @return a pointer to the entry in the directory.
*/
- K3bIso9660Entry* entry( const QString& name );
+ K3bIso9660Entry* entry( const TQString& name );
/**
* Returns the entry with the given name.
* @param name may be "test1", "mydir/test3", "mydir/mysubdir/test3", etc.
* @return a pointer to the entry in the directory.
*/
- const K3bIso9660Entry* entry( const QString& name ) const;
+ const K3bIso9660Entry* entry( const TQString& name ) const;
/**
* Returns a list of sub-entries.
* Searches for Iso9660 names.
* @return the names of all entries in this directory (filenames, no path).
*/
- QStringList iso9660Entries() const;
+ TQStringList iso9660Entries() const;
/**
* Returns the entry with the given name.
@@ -221,7 +221,7 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry
* @param name may be "test1", "mydir/test3", "mydir/mysubdir/test3", etc.
* @return a pointer to the entry in the directory.
*/
- K3bIso9660Entry* iso9660Entry( const QString& name );
+ K3bIso9660Entry* iso9660Entry( const TQString& name );
/**
* Returns the entry with the given name.
@@ -229,7 +229,7 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry
* @param name may be "test1", "mydir/test3", "mydir/mysubdir/test3", etc.
* @return a pointer to the entry in the directory.
*/
- const K3bIso9660Entry* iso9660Entry( const QString& name ) const;
+ const K3bIso9660Entry* iso9660Entry( const TQString& name ) const;
/**
* @internal
@@ -246,8 +246,8 @@ class LIBK3B_EXPORT K3bIso9660Directory : public K3bIso9660Entry
private:
void expand();
- QDict<K3bIso9660Entry> m_entries;
- QDict<K3bIso9660Entry> m_iso9660Entries;
+ TQDict<K3bIso9660Entry> m_entries;
+ TQDict<K3bIso9660Entry> m_iso9660Entries;
bool m_bExpanded;
unsigned int m_startSector;
@@ -262,15 +262,15 @@ class LIBK3B_EXPORT K3bIso9660File : public K3bIso9660Entry
* @param pos start sector
*/
K3bIso9660File( K3bIso9660* archive,
- const QString& isoName,
- const QString& name,
+ const TQString& isoName,
+ const TQString& name,
int access,
int date,
int adate,
int cdate,
- const QString& user,
- const QString& group,
- const QString& symlink,
+ const TQString& user,
+ const TQString& group,
+ const TQString& symlink,
unsigned int pos,
unsigned int size );
~K3bIso9660File();
@@ -304,7 +304,7 @@ class LIBK3B_EXPORT K3bIso9660File : public K3bIso9660Entry
/**
* Copy this file to a url.
*/
- bool copyTo( const QString& url ) const;
+ bool copyTo( const TQString& url ) const;
private:
char m_algo[2];
@@ -323,8 +323,8 @@ class LIBK3B_EXPORT K3bIso9660File : public K3bIso9660Entry
* A lot has been changed and bugfixed.
* The API has been improved to be useful.
*
- * Due to the stupid Qt which does not support large files as default
- * we cannot use QIODevice with DVDs! That's why we have our own
+ * Due to the stupid TQt which does not support large files as default
+ * we cannot use TQIODevice with DVDs! That's why we have our own
* reading code which is not allowed by KArchive (which is limited to int
* by the way... who the hell designed this?)
* I also removed the KArchive inheritance because of the named reasons.
@@ -344,7 +344,7 @@ class LIBK3B_EXPORT K3bIso9660
*
* @param filename is a local path (e.g. "/home/weis/myfile.tgz")
*/
- K3bIso9660( const QString& filename );
+ K3bIso9660( const TQString& filename );
/**
* Special case which always reads the TOC from the specified sector
@@ -406,9 +406,9 @@ class LIBK3B_EXPORT K3bIso9660
/**
* The name of the os file, as passed to the constructor
- * Null if you did not use the QString constructor.
+ * Null if you did not use the TQString constructor.
*/
- const QString& fileName() { return m_filename; }
+ const TQString& fileName() { return m_filename; }
const K3bIso9660Directory* firstJolietDirEntry() const;
const K3bIso9660Directory* firstRRDirEntry() const;
@@ -444,7 +444,7 @@ class LIBK3B_EXPORT K3bIso9660
friend class K3bIso9660Directory;
private:
- QString m_filename;
+ TQString m_filename;
class Private;
Private * d;
diff --git a/libk3b/tools/k3biso9660backend.cpp b/libk3b/tools/k3biso9660backend.cpp
index aacc079..e03d66d 100644
--- a/libk3b/tools/k3biso9660backend.cpp
+++ b/libk3b/tools/k3biso9660backend.cpp
@@ -21,7 +21,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <k3bdevice.h>
@@ -78,7 +78,7 @@ int K3bIso9660DeviceBackend::read( unsigned int sector, char* data, int len )
int sectorsRead = 0;
int retries = 10; // TODO: no fixed value
while( retries ) {
- int read = QMIN(len-sectorsRead, maxReadSectors);
+ int read = TQMIN(len-sectorsRead, maxReadSectors);
if( !m_device->read10( (unsigned char*)(data+sectorsRead*2048),
read*2048,
sector+sectorsRead,
@@ -102,7 +102,7 @@ int K3bIso9660DeviceBackend::read( unsigned int sector, char* data, int len )
// K3bIso9660FileBackend -----------------------------------
//
-K3bIso9660FileBackend::K3bIso9660FileBackend( const QString& filename )
+K3bIso9660FileBackend::K3bIso9660FileBackend( const TQString& filename )
: m_filename( filename ),
m_fd( -1 ),
m_closeFd( true )
@@ -132,7 +132,7 @@ bool K3bIso9660FileBackend::open()
if( m_fd > 0 )
return true;
else {
- m_fd = ::open( QFile::encodeName( m_filename ), O_RDONLY|O_LARGEFILE );
+ m_fd = ::open( TQFile::encodeName( m_filename ), O_RDONLY|O_LARGEFILE );
return ( m_fd > 0 );
}
}
diff --git a/libk3b/tools/k3biso9660backend.h b/libk3b/tools/k3biso9660backend.h
index 78937e5..82a6ac1 100644
--- a/libk3b/tools/k3biso9660backend.h
+++ b/libk3b/tools/k3biso9660backend.h
@@ -16,7 +16,7 @@
#ifndef _K3B_ISO9660_BACKEND_H_
#define _K3B_ISO9660_BACKEND_H_
-#include <qstring.h>
+#include <tqstring.h>
#include "k3b_export.h"
@@ -60,7 +60,7 @@ class K3bIso9660DeviceBackend : public K3bIso9660Backend
class K3bIso9660FileBackend : public K3bIso9660Backend
{
public:
- LIBK3B_EXPORT K3bIso9660FileBackend( const QString& filename );
+ LIBK3B_EXPORT K3bIso9660FileBackend( const TQString& filename );
K3bIso9660FileBackend( int fd );
~K3bIso9660FileBackend();
@@ -70,7 +70,7 @@ class K3bIso9660FileBackend : public K3bIso9660Backend
int read( unsigned int sector, char* data, int len );
private:
- QString m_filename;
+ TQString m_filename;
int m_fd;
bool m_closeFd;
};
diff --git a/libk3b/tools/k3blibdvdcss.cpp b/libk3b/tools/k3blibdvdcss.cpp
index 0a8d1f0..5baf8b4 100644
--- a/libk3b/tools/k3blibdvdcss.cpp
+++ b/libk3b/tools/k3blibdvdcss.cpp
@@ -21,10 +21,10 @@
#include <k3biso9660.h>
#include <k3biso9660backend.h>
-#include <qfile.h>
-#include <qcstring.h>
-#include <qvaluevector.h>
-#include <qpair.h>
+#include <tqfile.h>
+#include <tqcstring.h>
+#include <tqvaluevector.h>
+#include <tqpair.h>
#include <dlfcn.h>
@@ -54,7 +54,7 @@ public:
dvdcss_t dvd;
K3bDevice::Device* device;
- QValueVector< QPair<int,int> > titleOffsets;
+ TQValueVector< TQPair<int,int> > titleOffsets;
int currentSector;
bool currentSectorInTitle;
};
@@ -82,7 +82,7 @@ bool K3bLibDvdCss::open( K3bDevice::Device* dev )
{
d->device = dev;
dev->close();
- d->dvd = k3b_dvdcss_open( const_cast<char*>( QFile::encodeName(dev->blockDeviceName()).data() ) );
+ d->dvd = k3b_dvdcss_open( const_cast<char*>( TQFile::encodeName(dev->blockDeviceName()).data() ) );
d->currentSector = 0;
d->currentSectorInTitle = false;
return ( d->dvd != 0 );
@@ -216,7 +216,7 @@ bool K3bLibDvdCss::crackAllKeys()
int title = 0;
for( ; title < 100; ++title ) {
- QString filename;
+ TQString filename;
// first we get the menu vob
if( title == 0 )
@@ -226,7 +226,7 @@ bool K3bLibDvdCss::crackAllKeys()
const K3bIso9660File* file = dynamic_cast<const K3bIso9660File*>( dir->entry( filename ) );
if( file && file->size() > 0 ) {
- d->titleOffsets.append( qMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) );
+ d->titleOffsets.append( tqMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) );
kdDebug() << "(K3bLibDvdCss) Get key for /" << filename << " at " << file->startSector() << endl;
if( seek( (int)file->startSector(), DVDCSS_SEEK_KEY ) < 0 ) {
kdDebug() << "(K3bLibDvdCss) unable to seek to " << file->startSector() << endl;
@@ -235,7 +235,7 @@ bool K3bLibDvdCss::crackAllKeys()
}
if( title > 0 ) {
- QPair<int,int> p;
+ TQPair<int,int> p;
int vob = 1;
for( ; vob < 100; ++vob ) {
filename.sprintf( "VIDEO_TS/VTS_%02d_%d.VOB", title, vob );
diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp
index 34a3aa0..72ccd73 100644
--- a/libk3b/tools/k3blistview.cpp
+++ b/libk3b/tools/k3blistview.cpp
@@ -19,25 +19,25 @@
#include "k3bmsfedit.h"
-#include <qstringlist.h>
-#include <qfontmetrics.h>
-#include <qpainter.h>
-#include <qheader.h>
-#include <qrect.h>
-#include <qpushbutton.h>
-#include <qiconset.h>
-#include <qcombobox.h>
-#include <qspinbox.h>
-#include <qlineedit.h>
-#include <qlistbox.h>
-#include <qevent.h>
-#include <qvalidator.h>
-#include <qfont.h>
-#include <qpalette.h>
-#include <qstyle.h>
-#include <qapplication.h>
-#include <qprogressbar.h>
-#include <qimage.h>
+#include <tqstringlist.h>
+#include <tqfontmetrics.h>
+#include <tqpainter.h>
+#include <tqheader.h>
+#include <tqrect.h>
+#include <tqpushbutton.h>
+#include <tqiconset.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
+#include <tqlineedit.h>
+#include <tqlistbox.h>
+#include <tqevent.h>
+#include <tqvalidator.h>
+#include <tqfont.h>
+#include <tqpalette.h>
+#include <tqstyle.h>
+#include <tqapplication.h>
+#include <tqprogressbar.h>
+#include <tqimage.h>
#include <kpixmapeffect.h>
@@ -77,14 +77,14 @@ public:
bool button;
int editorType;
- QStringList comboItems;
+ TQStringList comboItems;
bool comboEditable;
bool fontSet;
bool backgroundColorSet;
bool foregroundColorSet;
- QFont font;
- QColor backgroundColor;
- QColor foregroundColor;
+ TQFont font;
+ TQColor backgroundColor;
+ TQColor foregroundColor;
ColumnInfo* next;
bool showProgress;
@@ -92,75 +92,75 @@ public:
int totalProgressSteps;
int margin;
- QValidator* validator;
+ TQValidator* validator;
};
-K3bListViewItem::K3bListViewItem(QListView *parent)
- : KListViewItem( parent )
+K3bListViewItem::K3bListViewItem(TQListView *tqparent)
+ : KListViewItem( tqparent )
{
init();
}
-K3bListViewItem::K3bListViewItem(QListViewItem *parent)
- : KListViewItem( parent )
+K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent)
+ : KListViewItem( tqparent )
{
init();
}
-K3bListViewItem::K3bListViewItem(QListView *parent, QListViewItem *after)
- : KListViewItem( parent, after )
+K3bListViewItem::K3bListViewItem(TQListView *tqparent, TQListViewItem *after)
+ : KListViewItem( tqparent, after )
{
init();
}
-K3bListViewItem::K3bListViewItem(QListViewItem *parent, QListViewItem *after)
- : KListViewItem( parent, after )
+K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after)
+ : KListViewItem( tqparent, after )
{
init();
}
-K3bListViewItem::K3bListViewItem(QListView *parent,
- const QString& s1, const QString& s2,
- const QString& s3, const QString& s4,
- const QString& s5, const QString& s6,
- const QString& s7, const QString& s8)
- : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 )
+K3bListViewItem::K3bListViewItem(TQListView *tqparent,
+ const TQString& s1, const TQString& s2,
+ const TQString& s3, const TQString& s4,
+ const TQString& s5, const TQString& s6,
+ const TQString& s7, const TQString& s8)
+ : KListViewItem( tqparent, s1, s2, s3, s4, s5, s6, s7, s8 )
{
init();
}
-K3bListViewItem::K3bListViewItem(QListViewItem *parent,
- const QString& s1, const QString& s2,
- const QString& s3, const QString& s4,
- const QString& s5, const QString& s6,
- const QString& s7, const QString& s8)
- : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 )
+K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent,
+ const TQString& s1, const TQString& s2,
+ const TQString& s3, const TQString& s4,
+ const TQString& s5, const TQString& s6,
+ const TQString& s7, const TQString& s8)
+ : KListViewItem( tqparent, s1, s2, s3, s4, s5, s6, s7, s8 )
{
init();
}
-K3bListViewItem::K3bListViewItem(QListView *parent, QListViewItem *after,
- const QString& s1, const QString& s2,
- const QString& s3, const QString& s4,
- const QString& s5, const QString& s6,
- const QString& s7, const QString& s8)
- : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
+K3bListViewItem::K3bListViewItem(TQListView *tqparent, TQListViewItem *after,
+ const TQString& s1, const TQString& s2,
+ const TQString& s3, const TQString& s4,
+ const TQString& s5, const TQString& s6,
+ const TQString& s7, const TQString& s8)
+ : KListViewItem( tqparent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
{
init();
}
-K3bListViewItem::K3bListViewItem(QListViewItem *parent, QListViewItem *after,
- const QString& s1, const QString& s2,
- const QString& s3, const QString& s4,
- const QString& s5, const QString& s6,
- const QString& s7, const QString& s8)
- : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
+K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after,
+ const TQString& s1, const TQString& s2,
+ const TQString& s3, const TQString& s4,
+ const TQString& s5, const TQString& s6,
+ const TQString& s7, const TQString& s8)
+ : KListViewItem( tqparent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
{
init();
}
@@ -184,13 +184,13 @@ void K3bListViewItem::init()
}
-int K3bListViewItem::width( const QFontMetrics& fm, const QListView* lv, int c ) const
+int K3bListViewItem::width( const TQFontMetrics& fm, const TQListView* lv, int c ) const
{
return KListViewItem::width( fm, lv, c ) + getColumnInfo(c)->margin*2;
}
-void K3bListViewItem::setEditor( int column, int editor, const QStringList& cs )
+void K3bListViewItem::setEditor( int column, int editor, const TQStringList& cs )
{
ColumnInfo* colInfo = getColumnInfo(column);
@@ -200,13 +200,13 @@ void K3bListViewItem::setEditor( int column, int editor, const QStringList& cs )
}
-void K3bListViewItem::setValidator( int column, QValidator* v )
+void K3bListViewItem::setValidator( int column, TQValidator* v )
{
getColumnInfo(column)->validator = v;
}
-QValidator* K3bListViewItem::validator( int col ) const
+TQValidator* K3bListViewItem::validator( int col ) const
{
return getColumnInfo(col)->validator;
}
@@ -252,14 +252,14 @@ bool K3bListViewItem::needButton( int col ) const
}
-const QStringList& K3bListViewItem::comboStrings( int col ) const
+const TQStringList& K3bListViewItem::comboStrings( int col ) const
{
ColumnInfo* info = getColumnInfo( col );
return info->comboItems;
}
-void K3bListViewItem::setFont( int col, const QFont& f )
+void K3bListViewItem::setFont( int col, const TQFont& f )
{
ColumnInfo* info = getColumnInfo( col );
info->fontSet = true;
@@ -267,21 +267,21 @@ void K3bListViewItem::setFont( int col, const QFont& f )
}
-void K3bListViewItem::setBackgroundColor( int col, const QColor& c )
+void K3bListViewItem::setBackgroundColor( int col, const TQColor& c )
{
ColumnInfo* info = getColumnInfo( col );
info->backgroundColorSet = true;
info->backgroundColor = c;
- repaint();
+ tqrepaint();
}
-void K3bListViewItem::setForegroundColor( int col, const QColor& c )
+void K3bListViewItem::setForegroundColor( int col, const TQColor& c )
{
ColumnInfo* info = getColumnInfo( col );
info->foregroundColorSet = true;
info->foregroundColor = c;
- repaint();
+ tqrepaint();
}
@@ -299,7 +299,7 @@ void K3bListViewItem::setProgress( int col, int p )
setDisplayProgressBar( col, true );
if( info->progressValue != p ) {
info->progressValue = p;
- repaint();
+ tqrepaint();
}
}
@@ -309,7 +309,7 @@ void K3bListViewItem::setTotalSteps( int col, int steps )
ColumnInfo* info = getColumnInfo( col );
info->totalProgressSteps = steps;
- repaint();
+ tqrepaint();
}
@@ -318,14 +318,14 @@ void K3bListViewItem::setMarginHorizontal( int col, int margin )
ColumnInfo* info = getColumnInfo( col );
info->margin = margin;
- repaint();
+ tqrepaint();
}
void K3bListViewItem::setMarginVertical( int margin )
{
m_vMargin = margin;
- repaint();
+ tqrepaint();
}
@@ -349,36 +349,36 @@ void K3bListViewItem::setup()
}
-void K3bListViewItem::paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align )
+void K3bListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align )
{
ColumnInfo* info = getColumnInfo( col );
p->save();
- QFont oldFont( p->font() );
- QFont newFont = info->fontSet ? info->font : oldFont;
+ TQFont oldFont( p->font() );
+ TQFont newFont = info->fontSet ? info->font : oldFont;
p->setFont( newFont );
- QColorGroup cgh(cg);
+ TQColorGroup cgh(cg);
if( info->foregroundColorSet )
- cgh.setColor( QColorGroup::Text, info->foregroundColor );
+ cgh.setColor( TQColorGroup::Text, info->foregroundColor );
if( info->backgroundColorSet )
- cgh.setColor( QColorGroup::Base, info->backgroundColor );
+ cgh.setColor( TQColorGroup::Base, info->backgroundColor );
- // in case this is the selected row has a margin we need to repaint the selection bar
+ // in case this is the selected row has a margin we need to tqrepaint the selection bar
if( isSelected() &&
(col == 0 || listView()->allColumnsShowFocus()) &&
info->margin > 0 ) {
p->fillRect( 0, 0, info->margin, height(),
- cgh.brush( QColorGroup::Highlight ) );
+ cgh.brush( TQColorGroup::Highlight ) );
p->fillRect( width-info->margin, 0, info->margin, height(),
- cgh.brush( QColorGroup::Highlight ) );
+ cgh.brush( TQColorGroup::Highlight ) );
}
else { // in case we use the KListView alternate color stuff
p->fillRect( 0, 0, info->margin, height(),
- cgh.brush( QColorGroup::Base ) );
+ cgh.brush( TQColorGroup::Base ) );
p->fillRect( width-info->margin, 0, info->margin, height(),
- cgh.brush( QColorGroup::Base ) );
+ cgh.brush( TQColorGroup::Base ) );
}
// FIXME: the margin (we can only translate horizontally since height() is used for painting)
@@ -395,39 +395,39 @@ void K3bListViewItem::paintCell( QPainter* p, const QColorGroup& cg, int col, in
}
-void K3bListViewItem::paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int width, int align )
+void K3bListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align )
{
- QListViewItem::paintCell( p, cg, col, width, align );
+ TQListViewItem::paintCell( p, cg, col, width, align );
}
-void K3bListViewItem::paintProgressBar( QPainter* p, const QColorGroup& cgh, int col, int width )
+void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, int col, int width )
{
ColumnInfo* info = getColumnInfo( col );
- QStyle::SFlags flags = QStyle::Style_Default;
+ TQStyle::SFlags flags = TQStyle::Style_Default;
if( listView()->isEnabled() )
- flags |= QStyle::Style_Enabled;
+ flags |= TQStyle::Style_Enabled;
if( listView()->hasFocus() )
- flags |= QStyle::Style_HasFocus;
+ flags |= TQStyle::Style_HasFocus;
- // FIXME: the QPainter is translated so 0, m_vMargin is the upper left of our paint rect
- QRect r( 0, m_vMargin, width, height()-2*m_vMargin );
+ // FIXME: the TQPainter is translated so 0, m_vMargin is the upper left of our paint rect
+ TQRect r( 0, m_vMargin, width, height()-2*m_vMargin );
// create the double buffer pixmap
- static QPixmap *doubleBuffer = 0;
+ static TQPixmap *doubleBuffer = 0;
if( !doubleBuffer )
- doubleBuffer = new QPixmap;
+ doubleBuffer = new TQPixmap;
doubleBuffer->resize( width, height() );
- QPainter dbPainter( doubleBuffer );
+ TQPainter dbPainter( doubleBuffer );
- // clear the background (we cannot use paintEmptyArea since it's protected in QListView)
+ // clear the background (we cannot use paintEmptyArea since it's protected in TQListView)
if( K3bListView* lv = dynamic_cast<K3bListView*>(listView()) )
lv->paintEmptyArea( &dbPainter, r );
else
dbPainter.fillRect( 0, 0, width, height(),
- cgh.brush( QPalette::backgroundRoleFromMode(listView()->viewport()->backgroundMode()) ) );
+ cgh.brush( TQPalette::backgroundRoleFromMode(listView()->viewport()->backgroundMode()) ) );
// we want a little additional margin
r.setLeft( r.left()+1 );
@@ -437,19 +437,19 @@ void K3bListViewItem::paintProgressBar( QPainter* p, const QColorGroup& cgh, int
// this might be a stupid hack but most styles do not reimplement drawPrimitive PE_ProgressBarChunk
// so this way the user is happy....
- static QProgressBar* s_dummyProgressBar = 0;
+ static TQProgressBar* s_dummyProgressBar = 0;
if( !s_dummyProgressBar ) {
- s_dummyProgressBar = new QProgressBar();
+ s_dummyProgressBar = new TQProgressBar();
}
s_dummyProgressBar->setTotalSteps( info->totalProgressSteps );
s_dummyProgressBar->setProgress( info->progressValue );
- // some styles use the widget's geometry
+ // some styles use the widget's tqgeometry
s_dummyProgressBar->setGeometry( r );
- listView()->style().drawControl(QStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
- listView()->style().drawControl(QStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
+ listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
+ listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
// now we really paint the progress in the listview
p->drawPixmap( 0, 0, *doubleBuffer );
@@ -461,29 +461,29 @@ void K3bListViewItem::paintProgressBar( QPainter* p, const QColorGroup& cgh, int
-K3bCheckListViewItem::K3bCheckListViewItem(QListView *parent)
- : K3bListViewItem( parent ),
+K3bCheckListViewItem::K3bCheckListViewItem(TQListView *tqparent)
+ : K3bListViewItem( tqparent ),
m_checked(false)
{
}
-K3bCheckListViewItem::K3bCheckListViewItem(QListViewItem *parent)
- : K3bListViewItem( parent ),
+K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *tqparent)
+ : K3bListViewItem( tqparent ),
m_checked(false)
{
}
-K3bCheckListViewItem::K3bCheckListViewItem(QListView *parent, QListViewItem *after)
- : K3bListViewItem( parent, after ),
+K3bCheckListViewItem::K3bCheckListViewItem(TQListView *tqparent, TQListViewItem *after)
+ : K3bListViewItem( tqparent, after ),
m_checked(false)
{
}
-K3bCheckListViewItem::K3bCheckListViewItem(QListViewItem *parent, QListViewItem *after)
- : K3bListViewItem( parent, after ),
+K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *tqparent, TQListViewItem *after)
+ : K3bListViewItem( tqparent, after ),
m_checked(false)
{
}
@@ -498,29 +498,29 @@ bool K3bCheckListViewItem::isChecked() const
void K3bCheckListViewItem::setChecked( bool checked )
{
m_checked = checked;
- repaint();
+ tqrepaint();
}
-void K3bCheckListViewItem::paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int width, int align )
+void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align )
{
K3bListViewItem::paintK3bCell( p, cg, col, width, align );
if( col == 0 ) {
if( m_checked ) {
- QRect r( 0, marginVertical(), width, /*listView()->style().pixelMetric( QStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
+ TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
- QStyle::SFlags flags = QStyle::Style_Default;
+ TQStyle::SFlags flags = TQStyle::Style_Default;
if( listView()->isEnabled() )
- flags |= QStyle::Style_Enabled;
+ flags |= TQStyle::Style_Enabled;
if( listView()->hasFocus() )
- flags |= QStyle::Style_HasFocus;
+ flags |= TQStyle::Style_HasFocus;
if( isChecked() )
- flags |= QStyle::Style_On;
+ flags |= TQStyle::Style_On;
else
- flags |= QStyle::Style_Off;
+ flags |= TQStyle::Style_Off;
- listView()->style().drawPrimitive( QStyle::PE_CheckMark, p, r, cg, flags );
+ listView()->tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags );
}
}
}
@@ -540,20 +540,20 @@ void K3bCheckListViewItem::paintK3bCell( QPainter* p, const QColorGroup& cg, int
class K3bListView::Private
{
public:
- QLineEdit* spinBoxLineEdit;
- QLineEdit* msfEditLineEdit;
+ TQLineEdit* spinBoxLineEdit;
+ TQLineEdit* msfEditLineEdit;
};
-K3bListView::K3bListView( QWidget* parent, const char* name )
- : KListView( parent, name ),
+K3bListView::K3bListView( TQWidget* tqparent, const char* name )
+ : KListView( tqparent, name ),
m_noItemVMargin( 20 ),
m_noItemHMargin( 20 )
{
d = new Private;
- connect( header(), SIGNAL( sizeChange( int, int, int ) ),
- this, SLOT( updateEditorSize() ) );
+ connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ),
+ this, TQT_SLOT( updateEditorSize() ) );
m_editorButton = 0;
m_editorComboBox = 0;
@@ -572,7 +572,7 @@ K3bListView::~K3bListView()
}
-QWidget* K3bListView::editor( K3bListViewItem::EditorType t ) const
+TQWidget* K3bListView::editor( K3bListViewItem::EditorType t ) const
{
switch( t ) {
case K3bListViewItem::COMBO:
@@ -666,16 +666,16 @@ void K3bListView::showEditor( K3bListViewItem* item, int col )
void K3bListView::placeEditor( K3bListViewItem* item, int col )
{
ensureItemVisible( item );
- QRect r = itemRect( item );
+ TQRect r = tqitemRect( item );
- r.setX( contentsToViewport( QPoint(header()->sectionPos( col ), 0) ).x() );
+ r.setX( contentsToViewport( TQPoint(header()->sectionPos( col ), 0) ).x() );
r.setWidth( header()->sectionSize( col ) - 1 );
// check if the column is fully visible
if( visibleWidth() < r.right() )
r.setRight(visibleWidth());
- r = QRect( viewportToContents( r.topLeft() ), r.size() );
+ r = TQRect( viewportToContents( r.topLeft() ), r.size() );
if( item->pixmap( col ) ) {
r.setX( r.x() + item->pixmap(col)->width() );
@@ -697,9 +697,9 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col )
moveChild( m_editorButton, r.right(), r.y() );
}
- if( QWidget* editor = prepareEditor( item, col ) ) {
+ if( TQWidget* editor = prepareEditor( item, col ) ) {
editor->resize( r.size() );
- // editor->resize( QSize( r.width(), editor->minimumSizeHint().height() ) );
+ // editor->resize( TQSize( r.width(), editor->tqminimumSizeHint().height() ) );
moveChild( editor, r.x(), r.y() );
}
}
@@ -708,9 +708,9 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col )
void K3bListView::prepareButton( K3bListViewItem*, int )
{
if( !m_editorButton ) {
- m_editorButton = new QPushButton( viewport() );
- connect( m_editorButton, SIGNAL(clicked()),
- this, SLOT(slotEditorButtonClicked()) );
+ m_editorButton = new TQPushButton( viewport() );
+ connect( m_editorButton, TQT_SIGNAL(clicked()),
+ this, TQT_SLOT(slotEditorButtonClicked()) );
}
// TODO: do some useful things
@@ -718,14 +718,14 @@ void K3bListView::prepareButton( K3bListViewItem*, int )
}
-QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
+TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
{
switch( item->editorType(col) ) {
case K3bListViewItem::COMBO:
if( !m_editorComboBox ) {
- m_editorComboBox = new QComboBox( viewport() );
- connect( m_editorComboBox, SIGNAL(activated(const QString&)),
- this, SLOT(slotEditorComboBoxActivated(const QString&)) );
+ m_editorComboBox = new TQComboBox( viewport() );
+ connect( m_editorComboBox, TQT_SIGNAL(activated(const TQString&)),
+ this, TQT_SLOT(slotEditorComboBoxActivated(const TQString&)) );
m_editorComboBox->installEventFilter( this );
}
m_editorComboBox->clear();
@@ -734,7 +734,7 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
}
else {
m_editorComboBox->insertStringList( item->comboStrings(col) );
- int current = item->comboStrings(col).findIndex( item->text(col) );
+ int current = item->comboStrings(col).tqfindIndex( item->text(col) );
if( current != -1 )
m_editorComboBox->setCurrentItem( current );
}
@@ -742,17 +742,17 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
case K3bListViewItem::LINE: {
if( !m_editorLineEdit ) {
- m_editorLineEdit = new QLineEdit( viewport() );
- m_editorLineEdit->setFrameStyle( QFrame::Box | QFrame::Plain );
+ m_editorLineEdit = new TQLineEdit( viewport() );
+ m_editorLineEdit->setFrameStyle( TQFrame::Box | TQFrame::Plain );
m_editorLineEdit->setLineWidth(1);
m_editorLineEdit->installEventFilter( this );
}
- QString txt = item->text( col );
+ TQString txt = item->text( col );
m_editorLineEdit->setText( txt );
// select the edit text (handle extensions while doing so)
- int pos = txt.findRev( '.' );
+ int pos = txt.tqfindRev( '.' );
if( pos > 0 )
m_editorLineEdit->setSelection( 0, pos );
else
@@ -762,16 +762,16 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
}
//
- // A QSpinBox (and thus also a K3bMsfEdit) uses a QLineEdit), thus
- // we have to use this QLineEdit as the actual object to dead with
+ // A TQSpinBox (and thus also a K3bMsfEdit) uses a TQLineEdit), thus
+ // we have to use this TQLineEdit as the actual object to dead with
//
case K3bListViewItem::SPIN:
if( !m_editorSpinBox ) {
- m_editorSpinBox = new QSpinBox( viewport() );
- d->spinBoxLineEdit = static_cast<QLineEdit*>( m_editorSpinBox->child( 0, "QLineEdit" ) );
- connect( m_editorSpinBox, SIGNAL(valueChanged(int)),
- this, SLOT(slotEditorSpinBoxValueChanged(int)) );
+ m_editorSpinBox = new TQSpinBox( viewport() );
+ d->spinBoxLineEdit = static_cast<TQLineEdit*>(TQT_TQWIDGET( m_editorSpinBox->child( 0, TQLINEEDIT_OBJECT_NAME_STRING ) ));
+ connect( m_editorSpinBox, TQT_SIGNAL(valueChanged(int)),
+ this, TQT_SLOT(slotEditorSpinBoxValueChanged(int)) );
// m_editorSpinBox->installEventFilter( this );
d->spinBoxLineEdit->installEventFilter( this );
}
@@ -782,9 +782,9 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
case K3bListViewItem::MSF:
if( !m_editorMsfEdit ) {
m_editorMsfEdit = new K3bMsfEdit( viewport() );
- d->msfEditLineEdit = static_cast<QLineEdit*>( m_editorMsfEdit->child( 0, "QLineEdit" ) );
- connect( m_editorMsfEdit, SIGNAL(valueChanged(int)),
- this, SLOT(slotEditorMsfEditValueChanged(int)) );
+ d->msfEditLineEdit = static_cast<TQLineEdit*>(TQT_TQWIDGET( m_editorMsfEdit->child( 0, TQLINEEDIT_OBJECT_NAME_STRING ) ));
+ connect( m_editorMsfEdit, TQT_SIGNAL(valueChanged(int)),
+ this, TQT_SLOT(slotEditorMsfEditValueChanged(int)) );
// m_editorMsfEdit->installEventFilter( this );
d->msfEditLineEdit->installEventFilter( this );
}
@@ -796,13 +796,13 @@ QWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
}
}
-void K3bListView::setCurrentItem( QListViewItem* i )
+void K3bListView::setCurrentItem( TQListViewItem* i )
{
if( !i || i == currentItem() )
return;
// I cannot remember why I did this here exactly. However, it resets the
- // m_lastClickedItem and thus invalidates the editing.
+ // m_lastClickedItem and thus tqinvalidates the editing.
// doRename();
// hideEditor();
// m_currentEditItem = 0;
@@ -810,64 +810,64 @@ void K3bListView::setCurrentItem( QListViewItem* i )
}
-void K3bListView::setNoItemText( const QString& text )
+void K3bListView::setNoItemText( const TQString& text )
{
m_noItemText = text;
triggerUpdate();
}
-void K3bListView::viewportPaintEvent( QPaintEvent* e )
+void K3bListView::viewportPaintEvent( TQPaintEvent* e )
{
KListView::viewportPaintEvent( e );
}
// FIXME: move this to viewportPaintEvent
-void K3bListView::drawContentsOffset( QPainter * p, int ox, int oy, int cx, int cy, int cw, int ch )
+void K3bListView::drawContentsOffset( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch )
{
KListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
if( childCount() == 0 && !m_noItemText.isEmpty()) {
- p->setPen( Qt::darkGray );
+ p->setPen( TQt::darkGray );
- QStringList lines = QStringList::split( "\n", m_noItemText );
+ TQStringList lines = TQStringList::split( "\n", m_noItemText );
int xpos = m_noItemHMargin;
int ypos = m_noItemVMargin + p->fontMetrics().height();
- QStringList::Iterator end ( lines.end() );
- for( QStringList::Iterator str = lines.begin(); str != end; ++str ) {
+ TQStringList::Iterator end ( lines.end() );
+ for( TQStringList::Iterator str = lines.begin(); str != end; ++str ) {
p->drawText( xpos, ypos, *str );
ypos += p->fontMetrics().lineSpacing();
}
}
}
-void K3bListView::paintEmptyArea( QPainter* p, const QRect& rect )
+void K3bListView::paintEmptyArea( TQPainter* p, const TQRect& rect )
{
KListView::paintEmptyArea( p, rect );
// if( childCount() == 0 && !m_noItemText.isEmpty()) {
-// QPainter pp( viewport() );
+// TQPainter pp( viewport() );
// pp.fillRect( viewport()->rect(), viewport()->paletteBackgroundColor() );
// pp.end();
-// p->setPen( Qt::darkGray );
+// p->setPen( TQt::darkGray );
-// QStringList lines = QStringList::split( "\n", m_noItemText );
+// TQStringList lines = TQStringList::split( "\n", m_noItemText );
// int xpos = m_noItemHMargin;
// int ypos = m_noItemVMargin + p->fontMetrics().height();
-// for( QStringList::Iterator str = lines.begin(); str != lines.end(); str++ ) {
+// for( TQStringList::Iterator str = lines.begin(); str != lines.end(); str++ ) {
// p->drawText( xpos, ypos, *str );
// ypos += p->fontMetrics().lineSpacing();
// }
// }
}
-void K3bListView::resizeEvent( QResizeEvent* e )
+void K3bListView::resizeEvent( TQResizeEvent* e )
{
KListView::resizeEvent( e );
updateEditorSize();
@@ -898,7 +898,7 @@ void K3bListView::slotEditorLineEditReturnPressed()
}
-void K3bListView::slotEditorComboBoxActivated( const QString& )
+void K3bListView::slotEditorComboBoxActivated( const TQString& )
{
doRename();
// if( renameItem( m_currentEditItem, m_currentEditColumn, str ) ) {
@@ -918,9 +918,9 @@ void K3bListView::slotEditorComboBoxActivated( const QString& )
void K3bListView::slotEditorSpinBoxValueChanged( int )
{
-// if( renameItem( m_currentEditItem, m_currentEditColumn, QString::number(value) ) ) {
-// m_currentEditItem->setText( m_currentEditColumn, QString::number(value) );
-// emit itemRenamed( m_currentEditItem, QString::number(value), m_currentEditColumn );
+// if( renameItem( m_currentEditItem, m_currentEditColumn, TQString::number(value) ) ) {
+// m_currentEditItem->setText( m_currentEditColumn, TQString::number(value) );
+// emit itemRenamed( m_currentEditItem, TQString::number(value), m_currentEditColumn );
// }
// else
// m_editorSpinBox->setValue( m_currentEditItem->text( m_currentEditColumn ).toInt() );
@@ -930,9 +930,9 @@ void K3bListView::slotEditorSpinBoxValueChanged( int )
void K3bListView::slotEditorMsfEditValueChanged( int )
{
// FIXME: do we always need to update the value. Isn't it enough to do it at the end?
-// if( renameItem( m_currentEditItem, m_currentEditColumn, QString::number(value) ) ) {
-// m_currentEditItem->setText( m_currentEditColumn, QString::number(value) );
-// emit itemRenamed( m_currentEditItem, QString::number(value), m_currentEditColumn );
+// if( renameItem( m_currentEditItem, m_currentEditColumn, TQString::number(value) ) ) {
+// m_currentEditItem->setText( m_currentEditColumn, TQString::number(value) );
+// emit itemRenamed( m_currentEditItem, TQString::number(value), m_currentEditColumn );
// }
// else
// m_editorMsfEdit->setText( m_currentEditItem->text( m_currentEditColumn ) );
@@ -942,7 +942,7 @@ void K3bListView::slotEditorMsfEditValueChanged( int )
bool K3bListView::doRename()
{
if( m_currentEditItem ) {
- QString newValue;
+ TQString newValue;
switch( m_currentEditItem->editorType( m_currentEditColumn ) ) {
case K3bListViewItem::COMBO:
newValue = m_editorComboBox->currentText();
@@ -951,10 +951,10 @@ bool K3bListView::doRename()
newValue = m_editorLineEdit->text();
break;
case K3bListViewItem::SPIN:
- newValue = QString::number(m_editorSpinBox->value());
+ newValue = TQString::number(m_editorSpinBox->value());
break;
case K3bListViewItem::MSF:
- newValue = QString::number(m_editorMsfEdit->value());
+ newValue = TQString::number(m_editorMsfEdit->value());
break;
}
@@ -997,7 +997,7 @@ void K3bListView::slotEditorButtonClicked()
}
-bool K3bListView::renameItem( K3bListViewItem* item, int col, const QString& text )
+bool K3bListView::renameItem( K3bListViewItem* item, int col, const TQString& text )
{
Q_UNUSED(item);
Q_UNUSED(col);
@@ -1012,14 +1012,14 @@ void K3bListView::slotEditorButtonClicked( K3bListViewItem* item, int col )
}
-bool K3bListView::eventFilter( QObject* o, QEvent* e )
+bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
{
- if( e->type() == QEvent::KeyPress ) {
- QKeyEvent* ke = static_cast<QKeyEvent*>(e);
+ if( e->type() == TQEvent::KeyPress ) {
+ TQKeyEvent* ke = TQT_TQKEYEVENT(e);
if( ke->key() == Key_Tab ) {
- if( o == m_editorLineEdit ||
- o == d->msfEditLineEdit ||
- o == d->spinBoxLineEdit ) {
+ if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) {
K3bListViewItem* lastEditItem = m_currentEditItem;
doRename();
@@ -1059,9 +1059,9 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e )
}
if( ke->key() == Key_Return ||
ke->key() == Key_Enter ) {
- if( o == m_editorLineEdit ||
- o == d->msfEditLineEdit ||
- o == d->spinBoxLineEdit ) {
+ if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) {
K3bListViewItem* lastEditItem = m_currentEditItem;
doRename();
@@ -1079,9 +1079,9 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e )
}
}
else if( ke->key() == Key_Escape ) {
- if( o == m_editorLineEdit ||
- o == d->msfEditLineEdit ||
- o == d->spinBoxLineEdit ) {
+ if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) {
hideEditor();
// keep the focus here
@@ -1092,13 +1092,13 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e )
}
}
- else if( e->type() == QEvent::MouseButtonPress && o == viewport() ) {
+ else if( e->type() == TQEvent::MouseButtonPress && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) {
// first let's grab the focus
viewport()->setFocus();
- QMouseEvent* me = static_cast<QMouseEvent*>( e );
- QListViewItem* item = itemAt( me->pos() );
+ TQMouseEvent* me = TQT_TQMOUSEEVENT( e );
+ TQListViewItem* item = itemAt( me->pos() );
int col = header()->sectionAt( me->pos().x() );
if( K3bCheckListViewItem* ci = dynamic_cast<K3bCheckListViewItem*>( item ) ) {
if( col == 0 ) {
@@ -1108,7 +1108,7 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e )
}
}
- if( me->button() == QMouseEvent::LeftButton ) {
+ if( me->button() == Qt::LeftButton ) {
if( item != m_currentEditItem || m_currentEditColumn != col ) {
doRename();
if( K3bListViewItem* k3bItem = dynamic_cast<K3bListViewItem*>(item) ) {
@@ -1137,13 +1137,13 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e )
}
}
- else if( e->type() == QEvent::FocusOut ) {
- if( o == m_editorLineEdit ||
- o == d->msfEditLineEdit ||
- o == d->spinBoxLineEdit ||
- o == m_editorComboBox ) {
- // make sure we did not lose the focus to one of the edit widgets' children
- if( !qApp->focusWidget() || qApp->focusWidget()->parentWidget() != o ) {
+ else if( e->type() == TQEvent::FocusOut ) {
+ if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ||
+ TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) {
+ // make sure we did not lose the focus to one of the edit widgets' tqchildren
+ if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->tqparentWidget()) != TQT_BASE_OBJECT(o) ) {
doRename();
hideEditor();
}
@@ -1154,27 +1154,27 @@ bool K3bListView::eventFilter( QObject* o, QEvent* e )
}
-void K3bListView::setK3bBackgroundPixmap( const QPixmap& pix, int pos )
+void K3bListView::setK3bBackgroundPixmap( const TQPixmap& pix, int pos )
{
m_backgroundPixmap = pix;
m_backgroundPixmapPosition = pos;
}
-void K3bListView::viewportResizeEvent( QResizeEvent* e )
+void K3bListView::viewportResizeEvent( TQResizeEvent* e )
{
if( !m_backgroundPixmap.isNull() ) {
- QSize size = viewport()->size().expandedTo( QSize( contentsWidth(), contentsHeight() ) );
+ TQSize size = viewport()->size().expandedTo( TQSize( contentsWidth(), contentsHeight() ) );
- QPixmap bgPix( size );
+ TQPixmap bgPix( size );
// FIXME: let the user specify the color
- bgPix.fill( colorGroup().base() );
+ bgPix.fill( tqcolorGroup().base() );
if( bgPix.width() < m_backgroundPixmap.width() ||
bgPix.height() < m_backgroundPixmap.height() ) {
- QPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), QImage::ScaleMin ) );
+ TQPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), TQ_ScaleMin ) );
if( m_backgroundPixmapPosition == TOP_LEFT )
bitBlt( &bgPix, 0, 0,
&newBgPix, 0, 0,
@@ -1206,28 +1206,28 @@ void K3bListView::viewportResizeEvent( QResizeEvent* e )
}
-QListViewItem* K3bListView::parentItem( QListViewItem* item )
+TQListViewItem* K3bListView::tqparentItem( TQListViewItem* item )
{
if( !item )
return 0;
- if( item->parent() )
- return item->parent();
+ if( item->tqparent() )
+ return item->tqparent();
else
- return K3bListView::parentItem( item->itemAbove() );
+ return K3bListView::tqparentItem( item->itemAbove() );
}
-KPixmap K3bListView::createDragPixmap( const QPtrList<QListViewItem>& items )
+KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
{
//
// Create drag pixmap.
- // If there are too many items fade the pixmap using the mask
+ // If there are too many items fade the pixmap using the tqmask
// always fade invisible items
//
int width = header()->width();
int height = 0;
- for( QPtrListIterator<QListViewItem> it( items ); *it; ++it ) {
- QRect r = itemRect( *it );
+ for( TQPtrListIterator<TQListViewItem> it( items ); *it; ++it ) {
+ TQRect r = tqitemRect( *it );
if( r.isValid() ) {
height += ( *it )->height();
@@ -1244,25 +1244,25 @@ KPixmap K3bListView::createDragPixmap( const QPtrList<QListViewItem>& items )
KPixmap pix;
pix.resize( width, height );
- pix.fill( Qt::white );
- // QBitmap mask( width, bottom-top );
+ pix.fill( TQt::white );
+ // TQBitmap tqmask( width, bottom-top );
// now paint all the visible items into the pixmap
// FIXME: only paint the visible items
- QPainter p( &pix );
- for( QListViewItemIterator it( this ); *it; ++it ) {
- QListViewItem* item = *it;
+ TQPainter p( &pix );
+ for( TQListViewItemIterator it( this ); *it; ++it ) {
+ TQListViewItem* item = *it;
// FIXME: items on other than the top level have a smaller first column
// the same goes for all items if root is decorated
bool alreadyDrawing = false;
- QRect r = itemRect( item );
+ TQRect r = tqitemRect( item );
if( r.isValid() ) {
- if( items.containsRef( item ) ) {
+ if( items.tqcontainsRef( item ) ) {
// paint all columns
int x = 0;
for( int i = 0; i < columns(); ++i ) {
- item->paintCell( &p, colorGroup(), i, columnWidth( i ), columnAlignment( i ) );
+ item->paintCell( &p, tqcolorGroup(), i, columnWidth( i ), columnAlignment( i ) );
p.translate( columnWidth( i ), 0 );
x += columnWidth( i );
}
@@ -1274,13 +1274,13 @@ KPixmap K3bListView::createDragPixmap( const QPtrList<QListViewItem>& items )
else if( alreadyDrawing )
p.translate( 0, item->height() );
- if( p.worldMatrix().dy() >= pix.height() )
+ if( p.tqworldMatrix().dy() >= pix.height() )
break;
}
}
// make it a little lighter
- KPixmapEffect::fade( pix, 0.3, Qt::white );
+ KPixmapEffect::fade( pix, 0.3, TQt::white );
// FIXME: fade the pixmap at the right side if the items are longer than width
diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h
index f8eb2ad..9f470ed 100644
--- a/libk3b/tools/k3blistview.h
+++ b/libk3b/tools/k3blistview.h
@@ -20,20 +20,20 @@
#include <klistview.h>
#include "k3b_export.h"
-#include <qptrvector.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
+#include <tqptrvector.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
#include <kpixmap.h>
-class QPainter;
-class QPushButton;
-class QIconSet;
-class QResizeEvent;
-class QComboBox;
-class QSpinBox;
-class QLineEdit;
-class QEvent;
-class QValidator;
+class TQPainter;
+class TQPushButton;
+class TQIconSet;
+class TQResizeEvent;
+class TQComboBox;
+class TQSpinBox;
+class TQLineEdit;
+class TQEvent;
+class TQValidator;
class K3bMsfEdit;
class K3bListView;
@@ -42,34 +42,34 @@ class K3bListView;
class LIBK3B_EXPORT K3bListViewItem : public KListViewItem
{
public:
- K3bListViewItem(QListView *parent);
- K3bListViewItem(QListViewItem *parent);
- K3bListViewItem(QListView *parent, QListViewItem *after);
- K3bListViewItem(QListViewItem *parent, QListViewItem *after);
-
- K3bListViewItem(QListView *parent,
- const QString&, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null);
-
- K3bListViewItem(QListViewItem *parent,
- const QString&, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null);
-
- K3bListViewItem(QListView *parent, QListViewItem *after,
- const QString&, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null);
-
- K3bListViewItem(QListViewItem *parent, QListViewItem *after,
- const QString&, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null,
- const QString& = QString::null, const QString& = QString::null);
+ K3bListViewItem(TQListView *tqparent);
+ K3bListViewItem(TQListViewItem *tqparent);
+ K3bListViewItem(TQListView *tqparent, TQListViewItem *after);
+ K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after);
+
+ K3bListViewItem(TQListView *tqparent,
+ const TQString&, const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString());
+
+ K3bListViewItem(TQListViewItem *tqparent,
+ const TQString&, const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString());
+
+ K3bListViewItem(TQListView *tqparent, TQListViewItem *after,
+ const TQString&, const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString());
+
+ K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after,
+ const TQString&, const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString(),
+ const TQString& = TQString(), const TQString& = TQString());
virtual ~K3bListViewItem();
@@ -78,23 +78,23 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem
*/
void setup();
- virtual int width( const QFontMetrics& fm, const QListView* lv, int c ) const;
+ virtual int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const;
- void setEditor( int col, int type, const QStringList& = QStringList() );
+ void setEditor( int col, int type, const TQStringList& = TQStringList() );
void setButton( int col, bool );
- void setValidator( int col, QValidator* v );
- QValidator* validator( int col ) const;
+ void setValidator( int col, TQValidator* v );
+ TQValidator* validator( int col ) const;
int editorType( int col ) const;
bool needButton( int col ) const;
- const QStringList& comboStrings( int col ) const;
+ const TQStringList& comboStrings( int col ) const;
enum EditorType { NONE, COMBO, LINE, SPIN, MSF };
- void setFont( int col, const QFont& f );
- void setBackgroundColor( int col, const QColor& );
- void setForegroundColor( int col, const QColor& );
+ void setFont( int col, const TQFont& f );
+ void setBackgroundColor( int col, const TQColor& );
+ void setForegroundColor( int col, const TQColor& );
void setDisplayProgressBar( int col, bool );
void setProgress( int, int );
@@ -116,12 +116,12 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem
/**
* Do not reimplement this but paintK3bCell to use the margin and background stuff.
*/
- virtual void paintCell( QPainter* p, const QColorGroup& cg, int col, int width, int align );
+ virtual void paintCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align );
- virtual void paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int width, int align );
+ virtual void paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align );
private:
- void paintProgressBar( QPainter* p, const QColorGroup& cgh, int col, int width );
+ void paintProgressBar( TQPainter* p, const TQColorGroup& cgh, int col, int width );
class ColumnInfo;
mutable ColumnInfo* m_columns;
@@ -136,16 +136,16 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem
class LIBK3B_EXPORT K3bCheckListViewItem : public K3bListViewItem
{
public:
- K3bCheckListViewItem(QListView *parent);
- K3bCheckListViewItem(QListViewItem *parent);
- K3bCheckListViewItem(QListView *parent, QListViewItem *after);
- K3bCheckListViewItem(QListViewItem *parent, QListViewItem *after);
+ K3bCheckListViewItem(TQListView *tqparent);
+ K3bCheckListViewItem(TQListViewItem *tqparent);
+ K3bCheckListViewItem(TQListView *tqparent, TQListViewItem *after);
+ K3bCheckListViewItem(TQListViewItem *tqparent, TQListViewItem *after);
virtual bool isChecked() const;
virtual void setChecked( bool checked );
protected:
- virtual void paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int width, int align );
+ virtual void paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int width, int align );
private:
bool m_checked;
@@ -158,16 +158,17 @@ class LIBK3B_EXPORT K3bListView : public KListView
friend class K3bListViewItem;
Q_OBJECT
+ TQ_OBJECT
public:
- K3bListView (QWidget *parent = 0, const char *name = 0);
+ K3bListView (TQWidget *tqparent = 0, const char *name = 0);
virtual ~K3bListView();
- virtual void setCurrentItem( QListViewItem* );
+ virtual void setCurrentItem( TQListViewItem* );
K3bListViewItem* currentlyEditedItem() const { return m_currentEditItem; }
- QWidget* editor( K3bListViewItem::EditorType ) const;
+ TQWidget* editor( K3bListViewItem::EditorType ) const;
enum BgPixPosition {
TOP_LEFT,
@@ -178,25 +179,25 @@ class LIBK3B_EXPORT K3bListView : public KListView
* This will set a background pixmap which is not tiled.
* @param pos position on the viewport.
*/
- void setK3bBackgroundPixmap( const QPixmap&, int pos = CENTER );
+ void setK3bBackgroundPixmap( const TQPixmap&, int pos = CENTER );
/**
* Create a faded pixmap showing the items.
*/
- KPixmap createDragPixmap( const QPtrList<QListViewItem>& items );
+ KPixmap createDragPixmap( const TQPtrList<TQListViewItem>& items );
/**
* Searches for the first item above @p i which is one level higher.
* For 1st level items this will always be the listview's root item.
*/
- static QListViewItem* parentItem( QListViewItem* i );
+ static TQListViewItem* tqparentItem( TQListViewItem* i );
signals:
void editorButtonClicked( K3bListViewItem*, int );
public slots:
- void setNoItemText( const QString& );
- // void setNoItemPixmap( const QPixmap& );
+ void setNoItemText( const TQString& );
+ // void setNoItemPixmap( const TQPixmap& );
void setNoItemVerticalMargin( int i ) { m_noItemVMargin = i; }
void setNoItemHorizontalMargin( int i ) { m_noItemHMargin = i; }
void setDoubleClickForEdit( bool b ) { m_doubleClickForEdit = b; }
@@ -208,7 +209,7 @@ class LIBK3B_EXPORT K3bListView : public KListView
private slots:
void updateEditorSize();
virtual void slotEditorLineEditReturnPressed();
- virtual void slotEditorComboBoxActivated( const QString& );
+ virtual void slotEditorComboBoxActivated( const TQString& );
virtual void slotEditorSpinBoxValueChanged( int );
virtual void slotEditorMsfEditValueChanged( int );
virtual void slotEditorButtonClicked();
@@ -223,7 +224,7 @@ class LIBK3B_EXPORT K3bListView : public KListView
*
* FIXME: should be called something like mayRename
*/
- virtual bool renameItem( K3bListViewItem*, int, const QString& );
+ virtual bool renameItem( K3bListViewItem*, int, const TQString& );
/**
* default impl just emits signal
@@ -236,9 +237,9 @@ class LIBK3B_EXPORT K3bListView : public KListView
* calls KListView::drawContentsOffset
* and paints a the noItemText if no item is in the list
*/
- virtual void drawContentsOffset ( QPainter * p, int ox, int oy, int cx, int cy, int cw, int ch );
- virtual void resizeEvent( QResizeEvent* );
- virtual void paintEmptyArea( QPainter*, const QRect& rect );
+ virtual void drawContentsOffset ( TQPainter * p, int ox, int oy, int cx, int cy, int cw, int ch );
+ virtual void resizeEvent( TQResizeEvent* );
+ virtual void paintEmptyArea( TQPainter*, const TQRect& rect );
/**
* Reimplemented for internal reasons.
@@ -247,7 +248,7 @@ class LIBK3B_EXPORT K3bListView : public KListView
*
* The API is unaffected.
*/
- virtual void viewportResizeEvent( QResizeEvent* );
+ virtual void viewportResizeEvent( TQResizeEvent* );
/**
* Reimplemented for internal reasons.
@@ -256,20 +257,20 @@ class LIBK3B_EXPORT K3bListView : public KListView
*
* The API is unaffected.
*/
- virtual void viewportPaintEvent(QPaintEvent*);
+ virtual void viewportPaintEvent(TQPaintEvent*);
- virtual bool eventFilter( QObject*, QEvent* );
+ virtual bool eventFilter( TQObject*, TQEvent* );
K3bListViewItem* currentEditItem() const { return m_currentEditItem; }
int currentEditColumn() const { return m_currentEditColumn; }
private:
- QWidget* prepareEditor( K3bListViewItem* item, int col );
+ TQWidget* prepareEditor( K3bListViewItem* item, int col );
void prepareButton( K3bListViewItem* item, int col );
bool doRename();
- QString m_noItemText;
- // QPixmap m_noItemPixmap;
+ TQString m_noItemText;
+ // TQPixmap m_noItemPixmap;
int m_noItemVMargin;
int m_noItemHMargin;
@@ -277,15 +278,15 @@ class LIBK3B_EXPORT K3bListView : public KListView
int m_currentEditColumn;
bool m_doubleClickForEdit;
- QListViewItem* m_lastClickedItem;
+ TQListViewItem* m_lastClickedItem;
- QPushButton* m_editorButton;
- QComboBox* m_editorComboBox;
- QSpinBox* m_editorSpinBox;
- QLineEdit* m_editorLineEdit;
+ TQPushButton* m_editorButton;
+ TQComboBox* m_editorComboBox;
+ TQSpinBox* m_editorSpinBox;
+ TQLineEdit* m_editorLineEdit;
K3bMsfEdit* m_editorMsfEdit;
- QPixmap m_backgroundPixmap;
+ TQPixmap m_backgroundPixmap;
int m_backgroundPixmapPosition;
class Private;
diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp
index 1c729b6..b1bcf71 100644
--- a/libk3b/tools/k3blistviewitemanimator.cpp
+++ b/libk3b/tools/k3blistviewitemanimator.cpp
@@ -15,22 +15,22 @@
#include "k3blistviewitemanimator.h"
-#include <qtimer.h>
-#include <qlistview.h>
+#include <tqtimer.h>
+#include <tqlistview.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
-K3bListViewItemAnimator::K3bListViewItemAnimator( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bListViewItemAnimator::K3bListViewItemAnimator( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
init();
}
-K3bListViewItemAnimator::K3bListViewItemAnimator( QListViewItem* item, int col, QObject* parent, const char* name )
- : QObject( parent, name )
+K3bListViewItemAnimator::K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
init();
setItem( item, col );
@@ -42,7 +42,7 @@ K3bListViewItemAnimator::~K3bListViewItemAnimator()
}
-QListViewItem* K3bListViewItemAnimator::item() const
+TQListViewItem* K3bListViewItemAnimator::item() const
{
return m_item;
}
@@ -52,8 +52,8 @@ void K3bListViewItemAnimator::init()
{
m_item = 0;
m_column = 0;
- m_timer = new QTimer( this );
- connect( m_timer, SIGNAL(timeout()), this, SLOT(slotAnimate()) );
+ m_timer = new TQTimer( this );
+ connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimate()) );
}
@@ -75,17 +75,17 @@ void K3bListViewItemAnimator::stop()
}
-void K3bListViewItemAnimator::setItem( QListViewItem* item, int col )
+void K3bListViewItemAnimator::setItem( TQListViewItem* item, int col )
{
m_item = item;
m_column = col;
m_pixmap = *item->pixmap(col);
- m_fadeColor = item->listView()->colorGroup().base();
+ m_fadeColor = item->listView()->tqcolorGroup().base();
start();
}
-void K3bListViewItemAnimator::setPixmap( const QPixmap& p )
+void K3bListViewItemAnimator::setPixmap( const TQPixmap& p )
{
m_pixmap = p;
start();
@@ -99,7 +99,7 @@ void K3bListViewItemAnimator::setColumn( int col )
}
-void K3bListViewItemAnimator::setFadeColor( const QColor& c )
+void K3bListViewItemAnimator::setFadeColor( const TQColor& c )
{
m_fadeColor = c;
start();
diff --git a/libk3b/tools/k3blistviewitemanimator.h b/libk3b/tools/k3blistviewitemanimator.h
index 200079a..660ee98 100644
--- a/libk3b/tools/k3blistviewitemanimator.h
+++ b/libk3b/tools/k3blistviewitemanimator.h
@@ -16,48 +16,49 @@
#ifndef _K3B_LISTVIEWITEM_ANIMATOR_H_
#define _K3B_LISTVIEWITEM_ANIMATOR_H_
-#include <qobject.h>
-#include <qpixmap.h>
+#include <tqobject.h>
+#include <tqpixmap.h>
#include "k3b_export.h"
-class QListViewItem;
-class QTimer;
+class TQListViewItem;
+class TQTimer;
/**
* Fades an icon on a listview item in and out.
*/
-class LIBK3B_EXPORT K3bListViewItemAnimator : public QObject
+class LIBK3B_EXPORT K3bListViewItemAnimator : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bListViewItemAnimator( QObject* parent = 0, const char* name = 0 );
+ K3bListViewItemAnimator( TQObject* tqparent = 0, const char* name = 0 );
/**
* Will use the items pixmap.
*/
- K3bListViewItemAnimator( QListViewItem* item, int col, QObject* parent = 0, const char* name = 0 );
+ K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* tqparent = 0, const char* name = 0 );
~K3bListViewItemAnimator();
- QListViewItem* item() const;
+ TQListViewItem* item() const;
public slots:
void start();
void stop();
- void setItem( QListViewItem*, int col );
+ void setItem( TQListViewItem*, int col );
/**
* Default is the pixmap from the item.
*/
- void setPixmap( const QPixmap& );
+ void setPixmap( const TQPixmap& );
void setColumn( int col );
/**
* Default is the base color of the listview.
*/
- void setFadeColor( const QColor& );
+ void setFadeColor( const TQColor& );
private slots:
void slotAnimate();
@@ -67,12 +68,12 @@ class LIBK3B_EXPORT K3bListViewItemAnimator : public QObject
int m_animationStep;
bool m_animationBack;
- QPixmap m_pixmap;
- QColor m_fadeColor;
- QListViewItem* m_item;
+ TQPixmap m_pixmap;
+ TQColor m_fadeColor;
+ TQListViewItem* m_item;
int m_column;
- QTimer* m_timer;
+ TQTimer* m_timer;
};
#endif
diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp
index 2679f33..7c46eea 100644
--- a/libk3b/tools/k3bmd5job.cpp
+++ b/libk3b/tools/k3bmd5job.cpp
@@ -25,9 +25,9 @@
#include <kdebug.h>
#include <kio/netaccess.h>
-#include <qtimer.h>
-#include <qcstring.h>
-#include <qsocketnotifier.h>
+#include <tqtimer.h>
+#include <tqcstring.h>
+#include <tqsocketnotifier.h>
#include <unistd.h>
@@ -47,11 +47,11 @@ public:
KMD5 md5;
K3bFileSplitter file;
- QTimer timer;
- QString filename;
+ TQTimer timer;
+ TQString filename;
int fileDes;
K3bDevice::Device* device;
- QSocketNotifier* fdNotifier;
+ TQSocketNotifier* fdNotifier;
bool finished;
char* data;
@@ -68,13 +68,13 @@ public:
};
-K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, QObject* parent, const char* name )
- : K3bJob( jh, parent, name )
+K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, TQObject* tqparent, const char* name )
+ : K3bJob( jh, tqparent, name )
{
d = new K3bMd5JobPrivate;
d->data = new char[K3bMd5JobPrivate::BUFFERSIZE];
- connect( &d->timer, SIGNAL(timeout()),
- this, SLOT(slotUpdate()) );
+ connect( &d->timer, TQT_SIGNAL(timeout()),
+ this, TQT_SLOT(slotUpdate()) );
}
@@ -96,15 +96,15 @@ void K3bMd5Job::start()
d->imageSize = d->isoFile->size();
}
else if( !d->filename.isEmpty() ) {
- if( !QFile::exists( d->filename ) ) {
- emit infoMessage( i18n("Could not find file %1").arg(d->filename), ERROR );
+ if( !TQFile::exists( d->filename ) ) {
+ emit infoMessage( i18n("Could not find file %1").tqarg(d->filename), ERROR );
jobFinished(false);
return;
}
d->file.setName( d->filename );
if( !d->file.open( IO_ReadOnly ) ) {
- emit infoMessage( i18n("Could not open file %1").arg(d->filename), ERROR );
+ emit infoMessage( i18n("Could not open file %1").tqarg(d->filename), ERROR );
jobFinished(false);
return;
}
@@ -132,10 +132,10 @@ void K3bMd5Job::start()
void K3bMd5Job::setupFdNotifier()
{
- // the QSocketNotifier will fire once the fd is closed
+ // the TQSocketNotifier will fire once the fd is closed
delete d->fdNotifier;
- d->fdNotifier = new QSocketNotifier( d->fileDes, QSocketNotifier::Read, this );
- connect( d->fdNotifier, SIGNAL(activated(int)), this, SLOT(slotUpdate()) );
+ d->fdNotifier = new TQSocketNotifier( d->fileDes, TQSocketNotifier::Read, this );
+ connect( d->fdNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdate()) );
d->fdNotifier->setEnabled( true );
}
@@ -151,7 +151,7 @@ void K3bMd5Job::cancel()
}
-void K3bMd5Job::setFile( const QString& filename )
+void K3bMd5Job::setFile( const TQString& filename )
{
d->filename = filename;
d->isoFile = 0;
@@ -200,11 +200,11 @@ void K3bMd5Job::slotUpdate()
// determine bytes to read
unsigned int readSize = K3bMd5JobPrivate::BUFFERSIZE;
if( d->maxSize > 0 )
- readSize = QMIN( readSize, d->maxSize - d->readData );
+ readSize = TQMIN( readSize, d->maxSize - d->readData );
if( readSize <= 0 ) {
// kdDebug() << "(K3bMd5Job) reached max size of " << d->maxSize << ". Stopping." << endl;
- emit debuggingOutput( "K3bMd5Job", QString("Reached max read of %1. Stopping after %2 bytes.").arg(d->maxSize).arg(d->readData) );
+ emit debuggingOutput( "K3bMd5Job", TQString("Reached max read of %1. Stopping after %2 bytes.").tqarg(d->maxSize).tqarg(d->readData) );
stopAll();
emit percent( 100 );
jobFinished(true);
@@ -228,13 +228,13 @@ void K3bMd5Job::slotUpdate()
// Only the last sector may not be used completely.
//
unsigned long sector = d->readData/2048;
- unsigned int sectorCnt = QMAX( readSize/2048, 1 );
+ unsigned int sectorCnt = TQMAX( readSize/2048, 1 );
read = -1;
if( d->device->read10( reinterpret_cast<unsigned char*>(d->data),
sectorCnt*2048,
sector,
sectorCnt ) )
- read = QMIN( readSize, sectorCnt*2048 );
+ read = TQMIN( readSize, sectorCnt*2048 );
}
//
@@ -252,13 +252,13 @@ void K3bMd5Job::slotUpdate()
}
if( read < 0 ) {
- emit infoMessage( i18n("Error while reading from file %1").arg(d->filename), ERROR );
+ emit infoMessage( i18n("Error while reading from file %1").tqarg(d->filename), ERROR );
stopAll();
jobFinished(false);
}
else if( read == 0 ) {
// kdDebug() << "(K3bMd5Job) read all data. Total size: " << d->readData << ". Stopping." << endl;
- emit debuggingOutput( "K3bMd5Job", QString("All data read. Stopping after %1 bytes.").arg(d->readData) );
+ emit debuggingOutput( "K3bMd5Job", TQString("All data read. Stopping after %1 bytes.").tqarg(d->readData) );
stopAll();
emit percent( 100 );
jobFinished(true);
@@ -282,7 +282,7 @@ void K3bMd5Job::slotUpdate()
}
-QCString K3bMd5Job::hexDigest()
+TQCString K3bMd5Job::hexDigest()
{
if( d->finished )
return d->md5.hexDigest();
@@ -291,7 +291,7 @@ QCString K3bMd5Job::hexDigest()
}
-QCString K3bMd5Job::base64Digest()
+TQCString K3bMd5Job::base64Digest()
{
if( d->finished )
return d->md5.base64Digest();
@@ -303,7 +303,7 @@ QCString K3bMd5Job::base64Digest()
void K3bMd5Job::stop()
{
- emit debuggingOutput( "K3bMd5Job", QString("Stopped manually after %1 bytes.").arg(d->readData) );
+ emit debuggingOutput( "K3bMd5Job", TQString("Stopped manually after %1 bytes.").tqarg(d->readData) );
stopAll();
jobFinished( true );
}
diff --git a/libk3b/tools/k3bmd5job.h b/libk3b/tools/k3bmd5job.h
index cd64795..8c487a2 100644
--- a/libk3b/tools/k3bmd5job.h
+++ b/libk3b/tools/k3bmd5job.h
@@ -18,7 +18,7 @@
#define _K3B_MD5_JOB_H_
#include <k3bjob.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include "k3b_export.h"
namespace K3bDevice {
@@ -31,20 +31,21 @@ class K3bIso9660File;
class LIBK3B_EXPORT K3bMd5Job : public K3bJob
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMd5Job( K3bJobHandler* jh , QObject* parent = 0, const char* name = 0 );
+ K3bMd5Job( K3bJobHandler* jh , TQObject* tqparent = 0, const char* name = 0 );
~K3bMd5Job();
- QCString hexDigest();
- QCString base64Digest();
+ TQCString hexDigest();
+ TQCString base64Digest();
public slots:
void start();
void stop();
void cancel();
- // FIXME: read from QIODevice and thus add K3bFileSplitter support
+ // FIXME: read from TQIODevice and thus add K3bFileSplitter support
/**
* read from a file.
@@ -53,7 +54,7 @@ class LIBK3B_EXPORT K3bMd5Job : public K3bJob
* images. In the future this will be changed with the introduction
* of a setIODevice method.
*/
- void setFile( const QString& filename );
+ void setFile( const TQString& filename );
/**
* read from an iso9660 file
diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp
index 13ad0a3..47ecbfd 100644
--- a/libk3b/tools/k3bmsfedit.cpp
+++ b/libk3b/tools/k3bmsfedit.cpp
@@ -18,31 +18,31 @@
#include "k3bmsfedit.h"
#include "k3bglobals.h"
-#include <qstringlist.h>
-#include <qlineedit.h>
-#include <qstyle.h>
-#include <qfontmetrics.h>
-#include <qapplication.h>
+#include <tqstringlist.h>
+#include <tqlineedit.h>
+#include <tqstyle.h>
+#include <tqfontmetrics.h>
+#include <tqapplication.h>
-K3bMsfValidator::K3bMsfValidator( QObject* parent, const char* name )
- : QRegExpValidator( K3b::Msf::regExp(), parent, name )
+K3bMsfValidator::K3bMsfValidator( TQObject* tqparent, const char* name )
+ : TQRegExpValidator( K3b::Msf::regExp(), tqparent, name )
{
}
-K3bMsfEdit::K3bMsfEdit( QWidget* parent, const char* name )
- : QSpinBox( parent, name )
+K3bMsfEdit::K3bMsfEdit( TQWidget* tqparent, const char* name )
+ : TQSpinBox( tqparent, name )
{
- setValidator( new K3bMsfValidator( this ) );
+ setValidator( new K3bMsfValidator( TQT_TQOBJECT(this) ) );
setMinValue( 0 );
// some very high value (10000 minutes)
setMaxValue( 10000*60*75 );
- connect( this, SIGNAL(valueChanged(int)),
- this, SLOT(slotValueChanged(int)) );
+ connect( this, TQT_SIGNAL(valueChanged(int)),
+ this, TQT_SLOT(slotValueChanged(int)) );
}
@@ -50,24 +50,24 @@ K3bMsfEdit::~K3bMsfEdit()
{}
-QSize K3bMsfEdit::sizeHint() const
+TQSize K3bMsfEdit::tqsizeHint() const
{
- // more or less copied from QSpinBox
+ // more or less copied from TQSpinBox
constPolish();
- QSize sz = editor()->sizeHint();
+ TQSize sz = editor()->tqsizeHint();
int h = sz.height();
- QFontMetrics fm( font() );
+ TQFontMetrics fm( font() );
int w = fm.width( "00:00:00" );
int wx = fm.width( ' ' )*2;
- int frame = style().pixelMetric( QStyle::PM_SpinBoxFrameWidth );
- return style().sizeFromContents(QStyle::CT_SpinBox, this,
- QSize( w + wx + downRect().width() + frame*2,
+ int frame = tqstyle().tqpixelMetric( TQStyle::PM_SpinBoxFrameWidth );
+ return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this,
+ TQSize( w + wx + downRect().width() + frame*2,
h + frame*2).
- expandedTo( QApplication::globalStrut() ));
+ expandedTo( TQApplication::globalStrut() ));
}
-QString K3bMsfEdit::mapValueToText( int value )
+TQString K3bMsfEdit::mapValueToText( int value )
{
return K3b::framesToString( value, true );
}
@@ -91,7 +91,7 @@ int K3bMsfEdit::mapTextToValue( bool* ok )
}
-void K3bMsfEdit::setText( const QString& str )
+void K3bMsfEdit::setText( const TQString& str )
{
bool ok;
editor()->setText( str );
@@ -112,7 +112,7 @@ void K3bMsfEdit::setLineWidth( int v )
void K3bMsfEdit::setValue( int v )
{
int i = editor()->cursorPosition();
- QSpinBox::setValue( v );
+ TQSpinBox::setValue( v );
editor()->setCursorPosition( i );
}
@@ -131,10 +131,10 @@ int K3bMsfEdit::currentStepValue() const
int val = 1;
// look if we are currently editing minutes or seconds
- QString text = editor()->text();
+ TQString text = editor()->text();
if( text.length() == 8 ) {
text = text.mid( editor()->cursorPosition() );
- int num = text.contains( ':' );
+ int num = text.tqcontains( ':' );
if( num == 1 )
val = 75;
else if( num == 2 )
diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h
index c573910..984c674 100644
--- a/libk3b/tools/k3bmsfedit.h
+++ b/libk3b/tools/k3bmsfedit.h
@@ -18,29 +18,30 @@
#define K3B_MSF_EDIT_H
-#include <qspinbox.h>
-#include <qstring.h>
-#include <qvalidator.h>
+#include <tqspinbox.h>
+#include <tqstring.h>
+#include <tqvalidator.h>
#include <k3bmsf.h>
#include "k3b_export.h"
-class K3bMsfValidator : public QRegExpValidator
+class K3bMsfValidator : public TQRegExpValidator
{
public:
- K3bMsfValidator( QObject* parent = 0, const char* name = 0 );
+ K3bMsfValidator( TQObject* tqparent = 0, const char* name = 0 );
};
-class LIBK3B_EXPORT K3bMsfEdit : public QSpinBox
+class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMsfEdit( QWidget* parent = 0, const char* name = 0 );
+ K3bMsfEdit( TQWidget* tqparent = 0, const char* name = 0 );
~K3bMsfEdit();
- QSize sizeHint() const;
+ TQSize tqsizeHint() const;
void setFrameStyle( int style );
void setLineWidth(int);
@@ -52,13 +53,13 @@ class LIBK3B_EXPORT K3bMsfEdit : public QSpinBox
public slots:
void setValue( int v );
- void setText( const QString& );
+ void setText( const TQString& );
void setMsfValue( const K3b::Msf& );
void stepUp();
void stepDown();
protected:
- QString mapValueToText( int );
+ TQString mapValueToText( int );
int mapTextToValue( bool* ok );
int currentStepValue() const;
diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp
index 4c12554..e4cc364 100644
--- a/libk3b/tools/k3bmultichoicedialog.cpp
+++ b/libk3b/tools/k3bmultichoicedialog.cpp
@@ -21,12 +21,12 @@
#include <kapplication.h>
#include <kiconloader.h>
-#include <qlayout.h>
-#include <qsignalmapper.h>
-#include <qptrlist.h>
-#include <qlabel.h>
-#include <qhbox.h>
-#include <qmessagebox.h>
+#include <tqlayout.h>
+#include <tqsignalmapper.h>
+#include <tqptrlist.h>
+#include <tqlabel.h>
+#include <tqhbox.h>
+#include <tqmessagebox.h>
class K3bMultiChoiceDialog::Private
@@ -37,71 +37,71 @@ public:
buttonLayout(0) {
}
- QSignalMapper* mapper;
- QPtrList<KPushButton> buttons;
- QHBoxLayout* buttonLayout;
+ TQSignalMapper* mapper;
+ TQPtrList<KPushButton> buttons;
+ TQHBoxLayout* buttonLayout;
bool buttonClicked;
};
// from kmessagebox.cpp
-static QPixmap themedMessageBoxIcon(QMessageBox::Icon icon)
+static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon)
{
- QString icon_name;
+ TQString icon_name;
switch(icon) {
- case QMessageBox::NoIcon:
- return QPixmap();
+ case TQMessageBox::NoIcon:
+ return TQPixmap();
break;
- case QMessageBox::Information:
+ case TQMessageBox::Information:
icon_name = "messagebox_info";
break;
- case QMessageBox::Warning:
+ case TQMessageBox::Warning:
icon_name = "messagebox_warning";
break;
- case QMessageBox::Critical:
+ case TQMessageBox::Critical:
icon_name = "messagebox_critical";
break;
default:
break;
}
- QPixmap ret = KApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+ TQPixmap ret = KApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
if (ret.isNull())
- return QMessageBox::standardIcon(icon);
+ return TQMessageBox::standardIcon(icon);
else
return ret;
}
-K3bMultiChoiceDialog::K3bMultiChoiceDialog( const QString& caption,
- const QString& text,
- QMessageBox::Icon icon,
- QWidget* parent, const char* name )
- : KDialog( parent, name )
+K3bMultiChoiceDialog::K3bMultiChoiceDialog( const TQString& caption,
+ const TQString& text,
+ TQMessageBox::Icon icon,
+ TQWidget* tqparent, const char* name )
+ : KDialog( tqparent, name )
{
d = new Private();
- d->mapper = new QSignalMapper( this );
- connect( d->mapper, SIGNAL(mapped(int)), this, SLOT(done(int)) );
+ d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ connect( d->mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(done(int)) );
setCaption( caption );
- QGridLayout* mainGrid = new QGridLayout( this );
+ TQGridLayout* mainGrid = new TQGridLayout( this );
mainGrid->setSpacing( spacingHint() );
mainGrid->setMargin( marginHint() );
- QHBox* contents = new QHBox( this );
+ TQHBox* contents = new TQHBox( this );
contents->setSpacing( KDialog::spacingHint()*2 );
contents->setMargin( 0 );
- QLabel* pixLabel = new QLabel( contents );
+ TQLabel* pixLabel = new TQLabel( contents );
pixLabel->setPixmap( themedMessageBoxIcon( icon ) );
pixLabel->setScaledContents( false );
- QLabel* label = new K3bRichTextLabel( text, contents );
+ TQLabel* label = new K3bRichTextLabel( text, contents );
contents->setStretchFactor( label, 1 );
- d->buttonLayout = new QHBoxLayout;
+ d->buttonLayout = new TQHBoxLayout;
d->buttonLayout->setSpacing( spacingHint() );
d->buttonLayout->setMargin( 0 );
@@ -126,8 +126,8 @@ int K3bMultiChoiceDialog::addButton( const KGuiItem& b )
KPushButton* button = new KPushButton( b, this );
d->buttonLayout->add( button );
d->buttons.append(button);
- d->mapper->setMapping( button, d->buttons.count() );
- connect( button, SIGNAL(clicked()), d->mapper, SLOT(map()) );
+ d->mapper->setMapping( TQT_TQOBJECT(button), d->buttons.count() );
+ connect( button, TQT_SIGNAL(clicked()), d->mapper, TQT_SLOT(map()) );
return d->buttons.count();
}
@@ -146,7 +146,7 @@ int K3bMultiChoiceDialog::exec()
}
-void K3bMultiChoiceDialog::closeEvent( QCloseEvent* e )
+void K3bMultiChoiceDialog::closeEvent( TQCloseEvent* e )
{
// make sure the dialog can only be closed by the buttons
// otherwise we may get an undefined return value in exec
@@ -158,10 +158,10 @@ void K3bMultiChoiceDialog::closeEvent( QCloseEvent* e )
}
-int K3bMultiChoiceDialog::choose( const QString& caption,
- const QString& text,
- QMessageBox::Icon icon,
- QWidget* parent,
+int K3bMultiChoiceDialog::choose( const TQString& caption,
+ const TQString& text,
+ TQMessageBox::Icon icon,
+ TQWidget* tqparent,
const char* name,
int buttonCount,
const KGuiItem& b1,
@@ -171,7 +171,7 @@ int K3bMultiChoiceDialog::choose( const QString& caption,
const KGuiItem& b5,
const KGuiItem& b6 )
{
- K3bMultiChoiceDialog dlg( caption, text, icon, parent, name );
+ K3bMultiChoiceDialog dlg( caption, text, icon, tqparent, name );
dlg.addButton( b1 );
if( buttonCount > 1 )
dlg.addButton( b2 );
diff --git a/libk3b/tools/k3bmultichoicedialog.h b/libk3b/tools/k3bmultichoicedialog.h
index f293fef..be0748a 100644
--- a/libk3b/tools/k3bmultichoicedialog.h
+++ b/libk3b/tools/k3bmultichoicedialog.h
@@ -20,20 +20,21 @@
#include <kstdguiitem.h>
#include "k3b_export.h"
-#include <qmessagebox.h>
+#include <tqmessagebox.h>
-class QCloseEvent;
+class TQCloseEvent;
class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bMultiChoiceDialog( const QString& caption,
- const QString& text,
- QMessageBox::Icon = QMessageBox::Information,
- QWidget* parent = 0, const char* name = 0 );
+ K3bMultiChoiceDialog( const TQString& caption,
+ const TQString& text,
+ TQMessageBox::Icon = TQMessageBox::Information,
+ TQWidget* tqparent = 0, const char* name = 0 );
~K3bMultiChoiceDialog();
/**
@@ -41,10 +42,10 @@ class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog
*/
int addButton( const KGuiItem& );
- static int choose( const QString& caption,
- const QString& text,
- QMessageBox::Icon = QMessageBox::Information,
- QWidget* parent = 0,
+ static int choose( const TQString& caption,
+ const TQString& text,
+ TQMessageBox::Icon = TQMessageBox::Information,
+ TQWidget* tqparent = 0,
const char* name = 0,
int buttonCount = 2,
const KGuiItem& b1 = KStdGuiItem::yes(),
@@ -64,7 +65,7 @@ class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog
void slotButtonClicked( int );
private:
- void closeEvent( QCloseEvent* );
+ void closeEvent( TQCloseEvent* );
class Private;
Private* d;
diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp
index 69a81f5..e0e5a05 100644
--- a/libk3b/tools/k3bprogressdialog.cpp
+++ b/libk3b/tools/k3bprogressdialog.cpp
@@ -17,29 +17,29 @@
#include <k3bbusywidget.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qframe.h>
-#include <qwidgetstack.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
+#include <tqframe.h>
+#include <tqwidgetstack.h>
#include <klocale.h>
#include <kprogress.h>
-K3bProgressDialog::K3bProgressDialog( const QString& text,
- QWidget* parent,
- const QString& caption,
+K3bProgressDialog::K3bProgressDialog( const TQString& text,
+ TQWidget* tqparent,
+ const TQString& caption,
const char* name )
- : KDialogBase( parent, name, true, caption, Cancel|Ok, Ok, true )
+ : KDialogBase( tqparent, name, true, caption, Cancel|Ok, Ok, true )
{
- QFrame* main = makeMainWidget();
- QGridLayout* mainLayout = new QGridLayout( main );
+ TQFrame* main = makeMainWidget();
+ TQGridLayout* mainLayout = new TQGridLayout( main );
mainLayout->setMargin( marginHint() );
mainLayout->setSpacing( spacingHint() );
- m_label = new QLabel( text, main );
- m_stack = new QWidgetStack( main );
+ m_label = new TQLabel( text, main );
+ m_stack = new TQWidgetStack( main );
m_progressBar = new KProgress( m_stack );
m_busyWidget = new K3bBusyWidget( m_stack );
m_stack->addWidget( m_progressBar );
@@ -71,7 +71,7 @@ int K3bProgressDialog::exec( bool progress )
}
-void K3bProgressDialog::setText( const QString& text )
+void K3bProgressDialog::setText( const TQString& text )
{
m_label->setText( text );
}
diff --git a/libk3b/tools/k3bprogressdialog.h b/libk3b/tools/k3bprogressdialog.h
index 32a0544..5ff9ad8 100644
--- a/libk3b/tools/k3bprogressdialog.h
+++ b/libk3b/tools/k3bprogressdialog.h
@@ -21,9 +21,9 @@
#include "k3b_export.h"
class K3bBusyWidget;
-class QLabel;
+class TQLabel;
class KProgress;
-class QWidgetStack;
+class TQWidgetStack;
/**
@@ -34,18 +34,19 @@ class QWidgetStack;
class LIBK3B_EXPORT K3bProgressDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bProgressDialog( const QString& text = QString::null,
- QWidget* parent = 0,
- const QString& caption = QString::null,
+ K3bProgressDialog( const TQString& text = TQString(),
+ TQWidget* tqparent = 0,
+ const TQString& caption = TQString(),
const char* name = 0 );
~K3bProgressDialog();
int exec( bool showProgress );
public slots:
- void setText( const QString& );
+ void setText( const TQString& );
void slotFinished( bool success );
void setProgress( int p );
@@ -53,8 +54,8 @@ class LIBK3B_EXPORT K3bProgressDialog : public KDialogBase
void slotCancel();
private:
- QLabel* m_label;
- QWidgetStack* m_stack;
+ TQLabel* m_label;
+ TQWidgetStack* m_stack;
K3bBusyWidget* m_busyWidget;
KProgress* m_progressBar;
};
diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp
index 11425ad..43ac0a3 100644
--- a/libk3b/tools/k3bpushbutton.cpp
+++ b/libk3b/tools/k3bpushbutton.cpp
@@ -15,9 +15,9 @@
#include "k3bpushbutton.h"
-#include <qtimer.h>
-#include <qpopupmenu.h>
-#include <qevent.h>
+#include <tqtimer.h>
+#include <tqpopupmenu.h>
+#include <tqevent.h>
#include <kglobalsettings.h>
#include <kapplication.h>
@@ -31,39 +31,39 @@ public:
: popupTimer(0) {
}
- QTimer* popupTimer;
- QPoint mousePressPos;
+ TQTimer* popupTimer;
+ TQPoint mousePressPos;
};
-K3bPushButton::K3bPushButton( QWidget* parent, const char* name )
- : KPushButton( parent, name )
+K3bPushButton::K3bPushButton( TQWidget* tqparent, const char* name )
+ : KPushButton( tqparent, name )
{
d = new Private();
installEventFilter(this);
}
-K3bPushButton::K3bPushButton( const QString& text, QWidget* parent, const char* name )
- : KPushButton( text, parent, name )
+K3bPushButton::K3bPushButton( const TQString& text, TQWidget* tqparent, const char* name )
+ : KPushButton( text, tqparent, name )
{
d = new Private();
installEventFilter(this);
}
-K3bPushButton::K3bPushButton( const QIconSet& icon, const QString& text,
- QWidget* parent, const char* name )
- : KPushButton( icon, text, parent, name )
+K3bPushButton::K3bPushButton( const TQIconSet& icon, const TQString& text,
+ TQWidget* tqparent, const char* name )
+ : KPushButton( icon, text, tqparent, name )
{
d = new Private();
installEventFilter(this);
}
-K3bPushButton::K3bPushButton( const KGuiItem& item, QWidget* parent, const char* name )
- : KPushButton( item, parent, name )
+K3bPushButton::K3bPushButton( const KGuiItem& item, TQWidget* tqparent, const char* name )
+ : KPushButton( item, tqparent, name )
{
d = new Private();
installEventFilter(this);
@@ -76,35 +76,35 @@ K3bPushButton::~K3bPushButton()
}
-void K3bPushButton::setDelayedPopupMenu( QPopupMenu* popup )
+void K3bPushButton::setDelayedPopupMenu( TQPopupMenu* popup )
{
if( !d->popupTimer ) {
- d->popupTimer = new QTimer( this );
- connect( d->popupTimer, SIGNAL(timeout()), this, SLOT(slotDelayedPopup()) );
+ d->popupTimer = new TQTimer( this );
+ connect( d->popupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedPopup()) );
}
setPopup( popup );
// we need to do the popup handling ourselves so we cheat a little
- // QPushButton connects a popup slot to the pressed signal which we disconnect here
+ // TQPushButton connects a popup slot to the pressed signal which we disconnect here
disconnect( this );
}
-bool K3bPushButton::eventFilter( QObject* o, QEvent* ev )
+bool K3bPushButton::eventFilter( TQObject* o, TQEvent* ev )
{
if( dynamic_cast<K3bPushButton*>(o) == this ) {
// Popup the menu when the left mousebutton is pressed and the mouse
// is moved by a small distance.
if( popup() ) {
- if( ev->type() == QEvent::MouseButtonPress ) {
- QMouseEvent* mev = static_cast<QMouseEvent*>(ev);
+ if( ev->type() == TQEvent::MouseButtonPress ) {
+ TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
d->mousePressPos = mev->pos();
- d->popupTimer->start( QApplication::startDragTime() );
+ d->popupTimer->start( TQApplication::startDragTime() );
}
- else if( ev->type() == QEvent::MouseMove ) {
- QMouseEvent* mev = static_cast<QMouseEvent*>(ev);
+ else if( ev->type() == TQEvent::MouseMove ) {
+ TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
if( ( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) {
d->popupTimer->stop();
slotDelayedPopup();
@@ -124,11 +124,11 @@ void K3bPushButton::slotDelayedPopup()
if( isDown() ) {
// popup the menu.
- // this has been taken from the QPushButton code
- if( mapToGlobal( QPoint( 0, rect().bottom() ) ).y() + popup()->sizeHint().height() <= qApp->desktop()->height() )
+ // this has been taken from the TQPushButton code
+ if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->tqsizeHint().height() <= tqApp->desktop()->height() )
popup()->exec( mapToGlobal( rect().bottomLeft() ) );
else
- popup()->exec( mapToGlobal( rect().topLeft() - QPoint( 0, popup()->sizeHint().height() ) ) );
+ popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->tqsizeHint().height() ) ) );
setDown( false );
}
}
diff --git a/libk3b/tools/k3bpushbutton.h b/libk3b/tools/k3bpushbutton.h
index 1369af3..523cefe 100644
--- a/libk3b/tools/k3bpushbutton.h
+++ b/libk3b/tools/k3bpushbutton.h
@@ -26,29 +26,30 @@
class LIBK3B_EXPORT K3bPushButton : public KPushButton
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor.
*/
- K3bPushButton( QWidget* parent = 0, const char* name = 0 );
+ K3bPushButton( TQWidget* tqparent = 0, const char* name = 0 );
/**
* Constructor, that sets the button-text to @p text
*/
- K3bPushButton( const QString& text, QWidget* parent = 0, const char* name = 0 );
+ K3bPushButton( const TQString& text, TQWidget* tqparent = 0, const char* name = 0 );
/**
* Constructor, that sets an icon and the button-text to @p text
*/
- K3bPushButton( const QIconSet& icon, const QString& text,
- QWidget* parent = 0, const char* name = 0 );
+ K3bPushButton( const TQIconSet& icon, const TQString& text,
+ TQWidget* tqparent = 0, const char* name = 0 );
/**
* Constructor that takes a KGuiItem for the text, the icon, the tooltip
* and the what's this help
*/
- K3bPushButton( const KGuiItem& item, QWidget* parent = 0, const char* name = 0 );
+ K3bPushButton( const KGuiItem& item, TQWidget* tqparent = 0, const char* name = 0 );
/**
* Destructs the button.
@@ -59,10 +60,10 @@ class LIBK3B_EXPORT K3bPushButton : public KPushButton
* The popup menu will show if the button is pressed down for about half a second
* or if the mouse is moved while pressed just like the KToolBarButton.
*/
- void setDelayedPopupMenu( QPopupMenu* );
+ void setDelayedPopupMenu( TQPopupMenu* );
protected:
- virtual bool eventFilter( QObject*, QEvent* );
+ virtual bool eventFilter( TQObject*, TQEvent* );
private slots:
void slotDelayedPopup();
diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp
index 08fbece..5315dcd 100644
--- a/libk3b/tools/k3bradioaction.cpp
+++ b/libk3b/tools/k3bradioaction.cpp
@@ -17,57 +17,57 @@
#include <ktoolbarbutton.h>
-K3bRadioAction::K3bRadioAction( const QString& text, const KShortcut& cut,
- QObject* parent, const char* name )
- : KToggleAction( text, cut, parent, name ),
+K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut,
+ TQObject* tqparent, const char* name )
+ : KToggleAction( text, cut, tqparent, name ),
m_alwaysEmit(false)
{
}
-K3bRadioAction::K3bRadioAction( const QString& text, const KShortcut& cut,
- const QObject* receiver, const char* slot,
- QObject* parent, const char* name )
- : KToggleAction( text, cut, receiver, slot, parent, name ),
+K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut,
+ const TQObject* receiver, const char* slot,
+ TQObject* tqparent, const char* name )
+ : KToggleAction( text, cut, receiver, slot, tqparent, name ),
m_alwaysEmit(false)
{
}
-K3bRadioAction::K3bRadioAction( const QString& text, const QIconSet& pix,
+K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix,
const KShortcut& cut,
- QObject* parent, const char* name )
- : KToggleAction( text, pix, cut, parent, name ),
+ TQObject* tqparent, const char* name )
+ : KToggleAction( text, pix, cut, tqparent, name ),
m_alwaysEmit(false)
{
}
-K3bRadioAction::K3bRadioAction( const QString& text, const QString& pix,
+K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix,
const KShortcut& cut,
- QObject* parent, const char* name )
- : KToggleAction( text, pix, cut, parent, name ),
+ TQObject* tqparent, const char* name )
+ : KToggleAction( text, pix, cut, tqparent, name ),
m_alwaysEmit(false)
{
}
-K3bRadioAction::K3bRadioAction( const QString& text, const QIconSet& pix,
+K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix,
const KShortcut& cut,
- const QObject* receiver, const char* slot,
- QObject* parent, const char* name )
- : KToggleAction( text, pix, cut, receiver, slot, parent, name ),
+ const TQObject* receiver, const char* slot,
+ TQObject* tqparent, const char* name )
+ : KToggleAction( text, pix, cut, receiver, slot, tqparent, name ),
m_alwaysEmit(false)
{
}
-K3bRadioAction::K3bRadioAction( const QString& text, const QString& pix,
+K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix,
const KShortcut& cut,
- const QObject* receiver, const char* slot,
- QObject* parent, const char* name )
- : KToggleAction( text, pix, cut, receiver, slot, parent, name ),
+ const TQObject* receiver, const char* slot,
+ TQObject* tqparent, const char* name )
+ : KToggleAction( text, pix, cut, receiver, slot, tqparent, name ),
m_alwaysEmit(false)
{
}
-K3bRadioAction::K3bRadioAction( QObject* parent, const char* name )
- : KToggleAction( parent, name ),
+K3bRadioAction::K3bRadioAction( TQObject* tqparent, const char* name )
+ : KToggleAction( tqparent, name ),
m_alwaysEmit(false)
{
}
@@ -78,12 +78,12 @@ void K3bRadioAction::slotActivated()
if( m_alwaysEmit )
emit activated();
- const QObject *senderObj = sender();
+ const TQObject *senderObj = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
- if ( !senderObj || !::qt_cast<const KToolBarButton *>( senderObj ) )
+ if ( !senderObj || !::tqqt_cast<const KToolBarButton *>( senderObj ) )
return;
- const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( senderObj ) )->on( true );
+ const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true );
return;
}
diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h
index 104b598..d65b3f5 100644
--- a/libk3b/tools/k3bradioaction.h
+++ b/libk3b/tools/k3bradioaction.h
@@ -29,6 +29,7 @@
class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -38,72 +39,72 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
*
* @param text The text that will be displayed.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param parent This action's parent.
+ * @param tqparent This action's tqparent.
* @param name An internal name for this action.
*/
- K3bRadioAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0, const char* name = 0 );
+ K3bRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 );
/**
* @param text The text that will be displayed.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param receiver The SLOT's parent.
- * @param slot The SLOT to invoke to execute this action.
- * @param parent This action's parent.
+ * @param receiver The SLOT's tqparent.
+ * @param slot The TQT_SLOT to invoke to execute this action.
+ * @param tqparent This action's tqparent.
* @param name An internal name for this action.
*/
- K3bRadioAction( const QString& text, const KShortcut& cut,
- const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
+ K3bRadioAction( const TQString& text, const KShortcut& cut,
+ const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
/**
* @param text The text that will be displayed.
* @param pix The icons that go with this action.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param parent This action's parent.
+ * @param tqparent This action's tqparent.
* @param name An internal name for this action.
*/
- K3bRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
- QObject* parent = 0, const char* name = 0 );
+ K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+ TQObject* tqparent = 0, const char* name = 0 );
/**
* @param text The text that will be displayed.
* @param pix The dynamically loaded icon that goes with this action.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param parent This action's parent.
+ * @param tqparent This action's tqparent.
* @param name An internal name for this action.
*/
- K3bRadioAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
- QObject* parent = 0, const char* name = 0 );
+ K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+ TQObject* tqparent = 0, const char* name = 0 );
/**
* @param text The text that will be displayed.
* @param pix The icons that go with this action.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param receiver The SLOT's parent.
- * @param slot The SLOT to invoke to execute this action.
- * @param parent This action's parent.
+ * @param receiver The SLOT's tqparent.
+ * @param slot The TQT_SLOT to invoke to execute this action.
+ * @param tqparent This action's tqparent.
* @param name An internal name for this action.
*/
- K3bRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
- const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
+ K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+ const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
/**
* @param text The text that will be displayed.
* @param pix The dynamically loaded icon that goes with this action.
* @param cut The corresponding keyboard accelerator (shortcut).
- * @param receiver The SLOT's parent.
- * @param slot The SLOT to invoke to execute this action.
- * @param parent This action's parent.
+ * @param receiver The SLOT's tqparent.
+ * @param slot The TQT_SLOT to invoke to execute this action.
+ * @param tqparent This action's tqparent.
* @param name An internal name for this action.
*/
- K3bRadioAction( const QString& text, const QString& pix, const KShortcut& cut,
- const QObject* receiver, const char* slot,
- QObject* parent, const char* name = 0 );
+ K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+ const TQObject* receiver, const char* slot,
+ TQObject* tqparent, const char* name = 0 );
/**
- * @param parent This action's parent.
+ * @param tqparent This action's tqparent.
* @param name An internal name for this action.
*/
- K3bRadioAction( QObject* parent = 0, const char* name = 0 );
+ K3bRadioAction( TQObject* tqparent = 0, const char* name = 0 );
/**
* @param b if true the action will always emit the activated signal
diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp
index 747bba1..af6c471 100644
--- a/libk3b/tools/k3brichtextlabel.cpp
+++ b/libk3b/tools/k3brichtextlabel.cpp
@@ -15,37 +15,37 @@
#include "k3brichtextlabel.h"
-#include <qtooltip.h>
-#include <qstylesheet.h>
-#include <qsimplerichtext.h>
+#include <tqtooltip.h>
+#include <tqstylesheet.h>
+#include <tqsimplerichtext.h>
#include <kglobalsettings.h>
-static QString qrichtextify( const QString& text )
+static TQString qrichtextify( const TQString& text )
{
if ( text.isEmpty() || text[0] == '<' )
return text;
- QStringList lines = QStringList::split('\n', text);
- for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it)
+ TQStringList lines = TQStringList::split('\n', text);
+ for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it)
{
- *it = QStyleSheet::convertFromPlainText( *it, QStyleSheetItem::WhiteSpaceNormal );
+ *it = TQStyleSheet::convertFromPlainText( *it, TQStyleSheetItem::WhiteSpaceNormal );
}
- return lines.join(QString::null);
+ return lines.join(TQString());
}
-K3bRichTextLabel::K3bRichTextLabel( const QString &text , QWidget *parent, const char *name )
- : QLabel ( parent, name ) {
- m_defaultWidth = QMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- setAlignment( Qt::WordBreak );
+K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ) {
+ m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ tqsetAlignment( TQt::WordBreak );
setText(text);
}
-K3bRichTextLabel::K3bRichTextLabel( QWidget *parent, const char *name )
- : QLabel ( parent, name ) {
- m_defaultWidth = QMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- setAlignment( Qt::WordBreak );
+K3bRichTextLabel::K3bRichTextLabel( TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ) {
+ m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ tqsetAlignment( TQt::WordBreak );
}
void K3bRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -54,17 +54,17 @@ void K3bRichTextLabel::setDefaultWidth(int defaultWidth)
updateGeometry();
}
-QSizePolicy K3bRichTextLabel::sizePolicy() const
+TQSizePolicy K3bRichTextLabel::sizePolicy() const
{
- return QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum, false);
+ return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
}
-QSize K3bRichTextLabel::minimumSizeHint() const
+TQSize K3bRichTextLabel::tqminimumSizeHint() const
{
- QString qt_text = qrichtextify( text() );
+ TQString qt_text = qrichtextify( text() );
int pref_width = 0;
int pref_height = 0;
- QSimpleRichText rt(qt_text, font());
+ TQSimpleRichText rt(qt_text, font());
pref_width = m_defaultWidth;
rt.setWidth(pref_width);
int used_width = rt.widthUsed();
@@ -91,16 +91,16 @@ QSize K3bRichTextLabel::minimumSizeHint() const
pref_width = used_width;
}
- return QSize(pref_width, rt.height());
+ return TQSize(pref_width, rt.height());
}
-QSize K3bRichTextLabel::sizeHint() const
+TQSize K3bRichTextLabel::tqsizeHint() const
{
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
-void K3bRichTextLabel::setText( const QString &text ) {
- QLabel::setText(text);
+void K3bRichTextLabel::setText( const TQString &text ) {
+ TQLabel::setText(text);
}
void K3bRichTextLabel::virtual_hook( int, void* )
diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h
index 0a25395..3f1c407 100644
--- a/libk3b/tools/k3brichtextlabel.h
+++ b/libk3b/tools/k3brichtextlabel.h
@@ -16,38 +16,39 @@
#ifndef K3BRICHTEXTLABEL_H
#define K3BRICHTEXTLABEL_H
-#include <qlabel.h>
+#include <tqlabel.h>
#include <k3b_export.h>
/**
- * @short A replacement for QLabel that supports richtext and proper layout management
+ * @short A replacement for TQLabel that supports richtext and proper tqlayout management
*
* @author Waldo Bastian <bastian@kde.org>
*/
/*
- * QLabel
+ * TQLabel
*/
-class LIBK3B_EXPORT K3bRichTextLabel : public QLabel {
+class LIBK3B_EXPORT K3bRichTextLabel : public TQLabel {
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor.
*/
- K3bRichTextLabel( QWidget *parent, const char *name = 0 );
- K3bRichTextLabel( const QString &text, QWidget *parent, const char *name = 0 );
+ K3bRichTextLabel( TQWidget *tqparent, const char *name = 0 );
+ K3bRichTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 );
int defaultWidth() const { return m_defaultWidth; }
void setDefaultWidth(int defaultWidth);
- virtual QSize minimumSizeHint() const;
- virtual QSize sizeHint() const;
- QSizePolicy sizePolicy() const;
+ virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize tqsizeHint() const;
+ TQSizePolicy sizePolicy() const;
public slots:
- void setText( const QString & );
+ void setText( const TQString & );
protected:
int m_defaultWidth;
diff --git a/libk3b/tools/k3bsignalwaiter.cpp b/libk3b/tools/k3bsignalwaiter.cpp
index fcee2e0..50284c4 100644
--- a/libk3b/tools/k3bsignalwaiter.cpp
+++ b/libk3b/tools/k3bsignalwaiter.cpp
@@ -16,12 +16,12 @@
#include "k3bsignalwaiter.h"
#include "k3bjob.h"
-#include <qeventloop.h>
-#include <qapplication.h>
+#include <tqeventloop.h>
+#include <tqapplication.h>
K3bSignalWaiter::K3bSignalWaiter()
- : QObject(),
+ : TQObject(),
m_inLoop(true)
{
}
@@ -32,13 +32,13 @@ K3bSignalWaiter::~K3bSignalWaiter()
}
-void K3bSignalWaiter::waitForSignal( QObject* o, const char* signal )
+void K3bSignalWaiter::waitForSignal( TQObject* o, const char* signal )
{
K3bSignalWaiter w;
connect( o, signal,
- &w, SLOT(slotSignal()) );
+ &w, TQT_SLOT(slotSignal()) );
- QApplication::eventLoop()->enterLoop();
+ TQApplication::eventLoop()->enterLoop();
}
@@ -47,7 +47,7 @@ void K3bSignalWaiter::waitForJob( K3bJob* job )
if( !job->active() )
return;
- waitForSignal( job, SIGNAL(finished(bool)) );
+ waitForSignal( job, TQT_SIGNAL(finished(bool)) );
}
@@ -55,7 +55,7 @@ void K3bSignalWaiter::slotSignal()
{
if( m_inLoop ) {
m_inLoop = false;
- QApplication::eventLoop()->exitLoop();
+ TQApplication::eventLoop()->exitLoop();
}
}
diff --git a/libk3b/tools/k3bsignalwaiter.h b/libk3b/tools/k3bsignalwaiter.h
index 19876b4..f85e296 100644
--- a/libk3b/tools/k3bsignalwaiter.h
+++ b/libk3b/tools/k3bsignalwaiter.h
@@ -16,21 +16,22 @@
#ifndef _K3B_SIGNAL_WAITER_H_
#define _K3B_SIGNAL_WAITER_H_
-#include <qobject.h>
+#include <tqobject.h>
#include <k3b_export.h>
class K3bJob;
-class K3bSignalWaiter : public QObject
+class K3bSignalWaiter : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Use this to syncroneously wait for a signal.
*/
- LIBK3B_EXPORT static void waitForSignal( QObject* o, const char* signal );
+ LIBK3B_EXPORT static void waitForSignal( TQObject* o, const char* signal );
/**
* Use this to syncroneously wait for a job to finish.
diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp
index 8a6ab00..ebc9666 100644
--- a/libk3b/tools/k3bstdguiitems.cpp
+++ b/libk3b/tools/k3bstdguiitems.cpp
@@ -15,45 +15,45 @@
#include "k3bstdguiitems.h"
-#include <qcheckbox.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qcombobox.h>
-#include <qframe.h>
-#include <qpalette.h>
+#include <tqcheckbox.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqcombobox.h>
+#include <tqframe.h>
+#include <tqpalette.h>
#include <klocale.h>
-QCheckBox* K3bStdGuiItems::simulateCheckbox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Simulate"), parent, name );
- QWhatsThis::add( c, i18n("<p>If this option is checked K3b will perform all writing steps with the "
+ TQCheckBox* c = new TQCheckBox( i18n("Simulate"), tqparent, name );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked K3b will perform all writing steps with the "
"laser turned off."
"<p>This is useful, for example, to test a higher writing speed "
"or whether your system is able to write on-the-fly."
"<p><b>Caution:</b> DVD+R(W) does not support simulated writing.") );
- QToolTip::add( c, i18n("Only simulate the writing process") );
+ TQToolTip::add( c, i18n("Only simulate the writing process") );
return c;
}
-QCheckBox* K3bStdGuiItems::daoCheckbox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::daoCheckbox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Disk at once"), parent, name );
- QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will write the CD in 'disk at once' mode as "
+ TQCheckBox* c = new TQCheckBox( i18n("Disk at once"), tqparent, name );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will write the CD in 'disk at once' mode as "
"compared to 'track at once' (TAO)."
"<p>It is always recommended to use DAO where possible."
"<p><b>Caution:</b> Track pregaps with a length other than 2 seconds are only supported "
"in DAO mode.") );
- QToolTip::add( c, i18n("Write in disk at once mode") );
+ TQToolTip::add( c, i18n("Write in disk at once mode") );
return c;
}
-QCheckBox* K3bStdGuiItems::burnproofCheckbox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::burnproofCheckbox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Use Burnfree"), parent, name );
- QToolTip::add( c, i18n("Enable Burnfree (or Just Link) to avoid buffer underruns") );
- QWhatsThis::add( c, i18n("<p>If this option is checked, K3b enables <em>Burnfree</em> "
+ TQCheckBox* c = new TQCheckBox( i18n("Use Burnfree"), tqparent, name );
+ TQToolTip::add( c, i18n("Enable Burnfree (or Just Link) to avoid buffer underruns") );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b enables <em>Burnfree</em> "
"(or <em>Just Link</em>). This is "
"a feature of the CD writer which avoids buffer underruns."
"<p>Without <em>burnfree</em>, if the writer cannot get any more "
@@ -70,57 +70,57 @@ QCheckBox* K3bStdGuiItems::burnproofCheckbox( QWidget* parent, const char* name
return c;
}
-QCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Only create image"), parent, name );
- QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will only create an "
+ TQCheckBox* c = new TQCheckBox( i18n("Only create image"), tqparent, name );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will only create an "
"image and not do any actual writing."
"<p>The image can later be written to a CD/DVD with most current writing "
"programs (including K3b of course).") );
- QToolTip::add( c, i18n("Only create an image") );
+ TQToolTip::add( c, i18n("Only create an image") );
return c;
}
-QCheckBox* K3bStdGuiItems::createCacheImageCheckbox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::createCacheImageCheckbox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Create image"), parent, name );
- QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will create an image before writing "
+ TQCheckBox* c = new TQCheckBox( i18n("Create image"), tqparent, name );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will create an image before writing "
"the files to the CD/DVD. Otherwise the data will be written <em>on-the-fly</em>, "
"i.e. no intermediate image will be created."
"<p><b>Caution:</b> Although writing on-the-fly should work on most systems, make sure "
"the data is sent to the writer fast enough.")
+ i18n("<p>It is recommended to try a simulation first.") );
- QToolTip::add( c, i18n("Cache the data to be written on the harddisk") );
+ TQToolTip::add( c, i18n("Cache the data to be written on the harddisk") );
return c;
}
-QCheckBox* K3bStdGuiItems::removeImagesCheckbox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::removeImagesCheckbox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Remove image"), parent, name );
- QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will remove any created images after the "
+ TQCheckBox* c = new TQCheckBox( i18n("Remove image"), tqparent, name );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will remove any created images after the "
"writing has finished."
"<p>Uncheck this if you want to keep the images.") );
- QToolTip::add( c, i18n("Remove images from disk when finished") );
+ TQToolTip::add( c, i18n("Remove images from disk when finished") );
return c;
}
-QCheckBox* K3bStdGuiItems::onTheFlyCheckbox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::onTheFlyCheckbox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("On the fly"), parent, name );
- QWhatsThis::add( c, i18n("<p>If this option is checked, K3b will not create an image first but write "
+ TQCheckBox* c = new TQCheckBox( i18n("On the fly"), tqparent, name );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked, K3b will not create an image first but write "
"the files directly to the CD/DVD."
"<p><b>Caution:</b> Although this should work on most systems, make sure "
"the data is sent to the writer fast enough.")
+ i18n("<p>It is recommended to try a simulation first.") );
- QToolTip::add( c, i18n("Write files directly to CD/DVD without creating an image") );
+ TQToolTip::add( c, i18n("Write files directly to CD/DVD without creating an image") );
return c;
}
-QCheckBox* K3bStdGuiItems::cdTextCheckbox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::cdTextCheckbox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Write CD-TEXT"), parent, name );
- QToolTip::add( c, i18n("Create CD-TEXT entries") );
- QWhatsThis::add( c, i18n("<p>If this option is checked K3b uses some otherwise-unused space on the audio "
+ TQCheckBox* c = new TQCheckBox( i18n("Write CD-TEXT"), tqparent, name );
+ TQToolTip::add( c, i18n("Create CD-TEXT entries") );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked K3b uses some otherwise-unused space on the audio "
"CD to store additional information, like the artist or the CD title."
"<p>CD-TEXT is an extension to the audio CD standard introduced by Sony."
"<p>CD-TEXT will only be usable on CD players that support this extension "
@@ -131,16 +131,16 @@ QCheckBox* K3bStdGuiItems::cdTextCheckbox( QWidget* parent, const char* name )
}
-QComboBox* K3bStdGuiItems::paranoiaModeComboBox( QWidget* parent, const char* name )
+TQComboBox* K3bStdGuiItems::paranoiaModeComboBox( TQWidget* tqparent, const char* name )
{
- QComboBox* c = new QComboBox( parent, name );
+ TQComboBox* c = new TQComboBox( tqparent, name );
c->insertItem( "0" );
c->insertItem( "1" );
c->insertItem( "2" );
c->insertItem( "3" );
c->setCurrentItem( 3 );
- QToolTip::add( c, i18n("Set the paranoia level for reading audio CDs") );
- QWhatsThis::add( c, i18n("<p>Sets the correction mode for digital audio extraction."
+ TQToolTip::add( c, i18n("Set the paranoia level for reading audio CDs") );
+ TQWhatsThis::add( c, i18n("<p>Sets the correction mode for digital audio extraction."
"<ul><li>0: No checking, data is copied directly from the drive. "
"<li>1: Perform overlapped reading to avoid jitter.</li>"
"<li>2: Like 1 but with additional checks of the read audio data.</li>"
@@ -150,22 +150,22 @@ QComboBox* K3bStdGuiItems::paranoiaModeComboBox( QWidget* parent, const char* na
}
-QCheckBox* K3bStdGuiItems::startMultisessionCheckBox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::startMultisessionCheckBox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Start multisession CD"), parent, name );
- QToolTip::add( c, i18n("Do not close the disk to allow additional sessions to be added later") );
- QWhatsThis::add( c, i18n("<p>If this option is checked K3b will not close the CD, and will write "
+ TQCheckBox* c = new TQCheckBox( i18n("Start multisession CD"), tqparent, name );
+ TQToolTip::add( c, i18n("Do not close the disk to allow additional sessions to be added later") );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked K3b will not close the CD, and will write "
"a temporary table of contents.</p>"
"<p>This allows further sessions to be appended to the CD later.</p>") );
return c;
}
-QCheckBox* K3bStdGuiItems::normalizeCheckBox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::normalizeCheckBox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Normalize volume levels"), parent, name );
- QToolTip::add( c, i18n("Adjust the volume levels of all tracks") );
- QWhatsThis::add( c, i18n("<p>If this option is checked K3b will adjust the volume of all tracks "
+ TQCheckBox* c = new TQCheckBox( i18n("Normalize volume levels"), tqparent, name );
+ TQToolTip::add( c, i18n("Adjust the volume levels of all tracks") );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked K3b will adjust the volume of all tracks "
"to a standard level. This is useful for things like creating mixes, "
"where different recording levels on different albums can cause the volume "
"to vary greatly from song to song."
@@ -175,11 +175,11 @@ QCheckBox* K3bStdGuiItems::normalizeCheckBox( QWidget* parent, const char* name
}
-QCheckBox* K3bStdGuiItems::verifyCheckBox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::verifyCheckBox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Verify written data"), parent, name );
- QToolTip::add( c, i18n("Compare original with written data") );
- QWhatsThis::add( c, i18n("<p>If this option is checked, then after successfully "
+ TQCheckBox* c = new TQCheckBox( i18n("Verify written data"), tqparent, name );
+ TQToolTip::add( c, i18n("Compare original with written data") );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked, then after successfully "
"writing the disk K3b will compare the original source data "
"with the written data to verify that the disk has been written "
"correctly.") );
@@ -187,11 +187,11 @@ QCheckBox* K3bStdGuiItems::verifyCheckBox( QWidget* parent, const char* name )
}
-QCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( QWidget* parent, const char* name )
+TQCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( TQWidget* tqparent, const char* name )
{
- QCheckBox* c = new QCheckBox( i18n("Ignore read errors"), parent, name );
- QToolTip::add( c, i18n("Skip unreadable audio sectors") );
- QWhatsThis::add( c, i18n("<p>If this option is checked and K3b is not able to read an "
+ TQCheckBox* c = new TQCheckBox( i18n("Ignore read errors"), tqparent, name );
+ TQToolTip::add( c, i18n("Skip unreadable audio sectors") );
+ TQWhatsThis::add( c, i18n("<p>If this option is checked and K3b is not able to read an "
"audio sector from the source CD it will be replaced with zeros "
"on the resulting copy."
"<p>Since audio CD Player are able to interpolate small errors "
@@ -200,16 +200,16 @@ QCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( QWidget* parent, const
}
-QFrame* K3bStdGuiItems::horizontalLine( QWidget* parent, const char* name )
+TQFrame* K3bStdGuiItems::horizontalLine( TQWidget* tqparent, const char* name )
{
- QFrame* line = new QFrame( parent, name );
- line->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+ TQFrame* line = new TQFrame( tqparent, name );
+ line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
return line;
}
-QFrame* K3bStdGuiItems::verticalLine( QWidget* parent, const char* name )
+TQFrame* K3bStdGuiItems::verticalLine( TQWidget* tqparent, const char* name )
{
- QFrame* line = new QFrame( parent, name );
- line->setFrameStyle( QFrame::VLine | QFrame::Sunken );
+ TQFrame* line = new TQFrame( tqparent, name );
+ line->setFrameStyle( TQFrame::VLine | TQFrame::Sunken );
return line;
}
diff --git a/libk3b/tools/k3bstdguiitems.h b/libk3b/tools/k3bstdguiitems.h
index e118b6a..c90aaf8 100644
--- a/libk3b/tools/k3bstdguiitems.h
+++ b/libk3b/tools/k3bstdguiitems.h
@@ -17,29 +17,29 @@
#define K3B_STD_GUIITEMS_H
#include "k3b_export.h"
-class QWidget;
-class QCheckBox;
-class QComboBox;
-class QFrame;
+class TQWidget;
+class TQCheckBox;
+class TQComboBox;
+class TQFrame;
namespace K3bStdGuiItems
{
- LIBK3B_EXPORT QCheckBox* simulateCheckbox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* daoCheckbox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* burnproofCheckbox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* onlyCreateImagesCheckbox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* createCacheImageCheckbox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* removeImagesCheckbox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* onTheFlyCheckbox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* cdTextCheckbox( QWidget* parent = 0, const char* name = 0);
- LIBK3B_EXPORT QComboBox* paranoiaModeComboBox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* startMultisessionCheckBox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* normalizeCheckBox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* verifyCheckBox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QCheckBox* ignoreAudioReadErrorsCheckBox( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QFrame* horizontalLine( QWidget* parent = 0, const char* name = 0 );
- LIBK3B_EXPORT QFrame* verticalLine( QWidget* parent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* simulateCheckbox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* daoCheckbox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* burnproofCheckbox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* onlyCreateImagesCheckbox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* createCacheImageCheckbox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* removeImagesCheckbox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* onTheFlyCheckbox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* cdTextCheckbox( TQWidget* tqparent = 0, const char* name = 0);
+ LIBK3B_EXPORT TQComboBox* paranoiaModeComboBox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* startMultisessionCheckBox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* normalizeCheckBox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* verifyCheckBox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQCheckBox* ignoreAudioReadErrorsCheckBox( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQFrame* horizontalLine( TQWidget* tqparent = 0, const char* name = 0 );
+ LIBK3B_EXPORT TQFrame* verticalLine( TQWidget* tqparent = 0, const char* name = 0 );
}
#endif
diff --git a/libk3b/tools/k3bstringutils.cpp b/libk3b/tools/k3bstringutils.cpp
index 198bb9e..f0212b7 100644
--- a/libk3b/tools/k3bstringutils.cpp
+++ b/libk3b/tools/k3bstringutils.cpp
@@ -15,14 +15,14 @@
#include "k3bstringutils.h"
-#include <qfontmetrics.h>
+#include <tqfontmetrics.h>
#include <kdebug.h>
-QString K3b::cutToWidth( const QFontMetrics& fm, const QString& fullText, int cutWidth )
+TQString K3b::cutToWidth( const TQFontMetrics& fm, const TQString& fullText, int cutWidth )
{
- QString squeezedText = "...";
+ TQString squeezedText = "...";
int squeezedWidth = fm.width(squeezedText);
int textWidth = fm.width(fullText);
@@ -65,12 +65,12 @@ QString K3b::cutToWidth( const QFontMetrics& fm, const QString& fullText, int cu
// from KSqueezedTextLabel
-QString K3b::squeezeTextToWidth( const QFontMetrics& fm, const QString& fullText, int cutWidth )
+TQString K3b::squeezeTextToWidth( const TQFontMetrics& fm, const TQString& fullText, int cutWidth )
{
int textWidth = fm.width(fullText);
if (textWidth > cutWidth) {
// start with the dots only
- QString squeezedText = "...";
+ TQString squeezedText = "...";
int squeezedWidth = fm.width(squeezedText);
// estimate how many letters we can add to the dots on both sides
diff --git a/libk3b/tools/k3bstringutils.h b/libk3b/tools/k3bstringutils.h
index 05cfd32..94c8f6f 100644
--- a/libk3b/tools/k3bstringutils.h
+++ b/libk3b/tools/k3bstringutils.h
@@ -17,9 +17,9 @@
#ifndef _K3B_STRING_UTILS_H_
#define _K3B_STRING_UTILS_H_
-#include <qstring.h>
+#include <tqstring.h>
-class QFontMetrics;
+class TQFontMetrics;
namespace K3b
{
@@ -27,13 +27,13 @@ namespace K3b
* Cuts the text at the end.
* Example: "some long text" -> "some lo..."
*/
- QString cutToWidth( const QFontMetrics&, const QString&, int );
+ TQString cutToWidth( const TQFontMetrics&, const TQString&, int );
/**
* squeezes the text.
* Example: "some long text" -> "some...ext"
*/
- QString squeezeTextToWidth( const QFontMetrics& fm, const QString& fullText, int cutWidth );
+ TQString squeezeTextToWidth( const TQFontMetrics& fm, const TQString& fullText, int cutWidth );
}
#endif
diff --git a/libk3b/tools/k3btempfile.cpp b/libk3b/tools/k3btempfile.cpp
index 635be40..18ad803 100644
--- a/libk3b/tools/k3btempfile.cpp
+++ b/libk3b/tools/k3btempfile.cpp
@@ -19,15 +19,15 @@
#include <kstandarddirs.h>
-static inline QString defaultTempDir()
+static inline TQString defaultTempDir()
{
// we need a world-readable temp dir
// FIXME: check if the default is world-readable
-// QStringList dirs = KGlobal::dirs()->resourceDirs( "tmp" );
-// for( QStringList::const_iterator it = dirs.begin();
+// TQStringList dirs = KGlobal::dirs()->resourceDirs( "tmp" );
+// for( TQStringList::const_iterator it = dirs.begin();
// it != dirs.end(); ++it ) {
-// const QString& dir = *it;
+// const TQString& dir = *it;
// }
@@ -36,8 +36,8 @@ static inline QString defaultTempDir()
}
-K3bTempFile::K3bTempFile( const QString& filePrefix,
- const QString& fileExtension,
+K3bTempFile::K3bTempFile( const TQString& filePrefix,
+ const TQString& fileExtension,
int mode )
: KTempFile( filePrefix.isEmpty() ? defaultTempDir() : filePrefix,
fileExtension,
diff --git a/libk3b/tools/k3btempfile.h b/libk3b/tools/k3btempfile.h
index 41a8756..4b18164 100644
--- a/libk3b/tools/k3btempfile.h
+++ b/libk3b/tools/k3btempfile.h
@@ -34,8 +34,8 @@
class LIBK3B_EXPORT K3bTempFile : public KTempFile
{
public:
- K3bTempFile( const QString& filePrefix = QString::null,
- const QString& fileExtension = QString::null,
+ K3bTempFile( const TQString& filePrefix = TQString(),
+ const TQString& fileExtension = TQString(),
int mode = 0600 );
~K3bTempFile();
};
diff --git a/libk3b/tools/k3bthreadwidget.cpp b/libk3b/tools/k3bthreadwidget.cpp
index ea82101..efbe2fa 100644
--- a/libk3b/tools/k3bthreadwidget.cpp
+++ b/libk3b/tools/k3bthreadwidget.cpp
@@ -17,9 +17,9 @@
#include "k3bdeviceselectiondialog.h"
#include <k3bdevice.h>
-#include <qevent.h>
-#include <qapplication.h>
-#include <qwaitcondition.h>
+#include <tqevent.h>
+#include <tqapplication.h>
+#include <tqwaitcondition.h>
class K3bThreadWidget::Data
@@ -27,27 +27,27 @@ class K3bThreadWidget::Data
public:
int id;
void* data;
- QWaitCondition con;
+ TQWaitCondition con;
};
-class K3bThreadWidget::DeviceSelectionEvent : public QCustomEvent
+class K3bThreadWidget::DeviceSelectionEvent : public TQCustomEvent
{
public:
- DeviceSelectionEvent( QWidget* parent, const QString& text, int id )
- : QCustomEvent( QEvent::User + 22 ),
- m_parent(parent),
+ DeviceSelectionEvent( TQWidget* tqparent, const TQString& text, int id )
+ : TQCustomEvent( TQEvent::User + 22 ),
+ m_parent(tqparent),
m_text(text),
m_id(id) {
}
- QWidget* parent() const { return m_parent; }
- const QString& text() const { return m_text; }
+ TQWidget* tqparent() const { return m_parent; }
+ const TQString& text() const { return m_text; }
int id() const { return m_id; }
private:
- QWidget* m_parent;
- QString m_text;
+ TQWidget* m_parent;
+ TQString m_text;
int m_id;
};
@@ -56,7 +56,7 @@ K3bThreadWidget* K3bThreadWidget::s_instance = 0;
K3bThreadWidget::K3bThreadWidget()
- : QObject(),
+ : TQObject(),
m_idCounter(1)
{
m_dataMap.setAutoDelete(true);
@@ -102,15 +102,15 @@ K3bThreadWidget* K3bThreadWidget::instance()
// static
-K3bDevice::Device* K3bThreadWidget::selectDevice( QWidget* parent,
- const QString& text )
+K3bDevice::Device* K3bThreadWidget::selectDevice( TQWidget* tqparent,
+ const TQString& text )
{
// request a new data set
Data* data = K3bThreadWidget::instance()->data( K3bThreadWidget::instance()->getNewId() );
// inform the instance about the request
- QApplication::postEvent( K3bThreadWidget::instance(),
- new K3bThreadWidget::DeviceSelectionEvent( parent, text, data->id ) );
+ TQApplication::postEvent( K3bThreadWidget::instance(),
+ new K3bThreadWidget::DeviceSelectionEvent( tqparent, text, data->id ) );
// wait for the result to be ready
data->con.wait();
@@ -124,11 +124,11 @@ K3bDevice::Device* K3bThreadWidget::selectDevice( QWidget* parent,
}
-void K3bThreadWidget::customEvent( QCustomEvent* e )
+void K3bThreadWidget::customEvent( TQCustomEvent* e )
{
if( DeviceSelectionEvent* dse = dynamic_cast<DeviceSelectionEvent*>(e) ) {
// create dialog
- K3bDevice::Device* dev = K3bDeviceSelectionDialog::selectDevice( dse->parent(), dse->text() );
+ K3bDevice::Device* dev = K3bDeviceSelectionDialog::selectDevice( dse->tqparent(), dse->text() );
// return it to the thread
Data* dat = data( dse->id() );
diff --git a/libk3b/tools/k3bthreadwidget.h b/libk3b/tools/k3bthreadwidget.h
index b3fedb2..1b514c2 100644
--- a/libk3b/tools/k3bthreadwidget.h
+++ b/libk3b/tools/k3bthreadwidget.h
@@ -16,11 +16,11 @@
#ifndef _K3B_THREAD_WIDGET_H_
#define _K3B_THREAD_WIDGET_H_
-#include <qobject.h>
-#include <qintdict.h>
+#include <tqobject.h>
+#include <tqintdict.h>
-class QCustomEvent;
+class TQCustomEvent;
namespace K3bDevice {
class Device;
}
@@ -32,9 +32,10 @@ namespace K3bDevice {
* Since the calling thread cannot create the K3bThreadWidget by himself there exists
* exactly one instance created by K3bCore which is used by all threads.
*/
-class K3bThreadWidget : public QObject
+class K3bThreadWidget : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
~K3bThreadWidget();
@@ -44,14 +45,14 @@ class K3bThreadWidget : public QObject
/**
* Call this from a thread to show a device selection dialog.
*/
- static K3bDevice::Device* selectDevice( QWidget* parent,
- const QString& text = QString::null );
+ static K3bDevice::Device* selectDevice( TQWidget* tqparent,
+ const TQString& text = TQString() );
protected:
/**
* communication between the threads
*/
- void customEvent( QCustomEvent* );
+ void customEvent( TQCustomEvent* );
private:
/**
@@ -70,7 +71,7 @@ class K3bThreadWidget : public QObject
Data* data( int id );
int m_idCounter;
- QIntDict<Data> m_dataMap;
+ TQIntDict<Data> m_dataMap;
static K3bThreadWidget* s_instance;
};
diff --git a/libk3b/tools/k3bthroughputestimator.cpp b/libk3b/tools/k3bthroughputestimator.cpp
index aa52478..d6183b3 100644
--- a/libk3b/tools/k3bthroughputestimator.cpp
+++ b/libk3b/tools/k3bthroughputestimator.cpp
@@ -16,7 +16,7 @@
#include "k3bthroughputestimator.h"
-#include <qdatetime.h>
+#include <tqdatetime.h>
#include <kdebug.h>
@@ -27,9 +27,9 @@ public:
: started(false) {
}
- QTime firstDataTime;
+ TQTime firstDataTime;
unsigned long firstData;
- QTime lastDataTime;
+ TQTime lastDataTime;
unsigned long lastData;
int lastThroughput;
@@ -38,8 +38,8 @@ public:
};
-K3bThroughputEstimator::K3bThroughputEstimator( QObject* parent, const char* name )
- : QObject( parent, name )
+K3bThroughputEstimator::K3bThroughputEstimator( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name )
{
d = new Private();
}
diff --git a/libk3b/tools/k3bthroughputestimator.h b/libk3b/tools/k3bthroughputestimator.h
index aed71e0..52d3272 100644
--- a/libk3b/tools/k3bthroughputestimator.h
+++ b/libk3b/tools/k3bthroughputestimator.h
@@ -16,7 +16,7 @@
#ifndef _K3B_THROUGHPUT_ESTIMATOR_H_
#define _K3B_THROUGHPUT_ESTIMATOR_H_
-#include <qobject.h>
+#include <tqobject.h>
/**
@@ -25,12 +25,13 @@
* the already written data in KB. The class will emit throughput signals
* whenever the throughput changes.
*/
-class K3bThroughputEstimator : public QObject
+class K3bThroughputEstimator : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bThroughputEstimator( QObject* parent = 0, const char* name = 0 );
+ K3bThroughputEstimator( TQObject* tqparent = 0, const char* name = 0 );
~K3bThroughputEstimator();
int average() const;
diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp
index 9e1f18b..ef21e17 100644
--- a/libk3b/tools/k3btitlelabel.cpp
+++ b/libk3b/tools/k3btitlelabel.cpp
@@ -17,11 +17,11 @@
#include <k3bstringutils.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qfontmetrics.h>
-#include <qfont.h>
-#include <qtooltip.h>
+#include <tqpainter.h>
+#include <tqevent.h>
+#include <tqfontmetrics.h>
+#include <tqfont.h>
+#include <tqtooltip.h>
class K3bTitleLabel::Private
@@ -30,18 +30,18 @@ public:
Private() {
titleLength = subTitleLength = 0;
margin = 2;
- alignment = Qt::AlignLeft;
+ tqalignment = TQt::AlignLeft;
cachedMinimumWidth = 0;
titleBaseLine = 0;
}
- QString title;
- QString subTitle;
+ TQString title;
+ TQString subTitle;
- QString displayTitle;
- QString displaySubTitle;
+ TQString displayTitle;
+ TQString displaySubTitle;
- int alignment;
+ int tqalignment;
int titleLength;
int subTitleLength;
@@ -55,36 +55,36 @@ public:
};
-class K3bTitleLabel::ToolTip : public QToolTip
+class K3bTitleLabel::ToolTip : public TQToolTip
{
public:
ToolTip( K3bTitleLabel* label )
- : QToolTip( label ),
+ : TQToolTip( label ),
m_label(label) {
}
- void maybeTip( const QPoint &pos ) {
- QRect r = m_label->contentsRect();
+ void maybeTip( const TQPoint &pos ) {
+ TQRect r = m_label->contentsRect();
int neededWidth = m_label->d->displayTitleLength;
if( !m_label->d->displaySubTitle.isEmpty() )
neededWidth += m_label->d->displaySubTitleLength + 5;
int startPos = 0;
- if( m_label->d->alignment & Qt::AlignHCenter )
+ if( m_label->d->tqalignment & TQt::AlignHCenter )
startPos = r.left() + ( r.width() - 2*m_label->d->margin - neededWidth ) / 2;
- else if( m_label->d->alignment & Qt::AlignRight )
+ else if( m_label->d->tqalignment & TQt::AlignRight )
startPos = r.right() - m_label->d->margin - neededWidth;
else
startPos = r.left() + m_label->d->margin;
- QRect titleTipRect( startPos, 0, m_label->d->displayTitleLength, m_label->height() );
- QRect subTitleTipRect( startPos + m_label->d->displayTitleLength, 0, m_label->d->displaySubTitleLength, m_label->height() );
+ TQRect titleTipRect( startPos, 0, m_label->d->displayTitleLength, m_label->height() );
+ TQRect subTitleTipRect( startPos + m_label->d->displayTitleLength, 0, m_label->d->displaySubTitleLength, m_label->height() );
- if( titleTipRect.contains( pos ) &&
+ if( titleTipRect.tqcontains( pos ) &&
m_label->d->displayTitle != m_label->d->title )
tip( titleTipRect, m_label->d->title );
- else if( subTitleTipRect.contains( pos ) &&
+ else if( subTitleTipRect.tqcontains( pos ) &&
m_label->d->displaySubTitle != m_label->d->subTitle )
tip( subTitleTipRect, m_label->d->subTitle );
}
@@ -94,8 +94,8 @@ public:
-K3bTitleLabel::K3bTitleLabel( QWidget* parent, const char* name )
- : QFrame( parent, name )
+K3bTitleLabel::K3bTitleLabel( TQWidget* tqparent, const char* name )
+ : TQFrame( tqparent, name )
{
d = new Private();
m_toolTip = new ToolTip( this );
@@ -109,7 +109,7 @@ K3bTitleLabel::~K3bTitleLabel()
}
-void K3bTitleLabel::setTitle( const QString& title, const QString& subTitle )
+void K3bTitleLabel::setTitle( const TQString& title, const TQString& subTitle )
{
d->title = title;
d->subTitle = subTitle;
@@ -118,7 +118,7 @@ void K3bTitleLabel::setTitle( const QString& title, const QString& subTitle )
}
-void K3bTitleLabel::setSubTitle( const QString& subTitle )
+void K3bTitleLabel::setSubTitle( const TQString& subTitle )
{
d->subTitle = subTitle;
updatePositioning();
@@ -126,38 +126,38 @@ void K3bTitleLabel::setSubTitle( const QString& subTitle )
}
-void K3bTitleLabel::setAlignment( int align )
+void K3bTitleLabel::tqsetAlignment( int align )
{
- d->alignment = align;
+ d->tqalignment = align;
update();
}
-QSize K3bTitleLabel::sizeHint() const
+TQSize K3bTitleLabel::tqsizeHint() const
{
- return QSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine );
+ return TQSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine );
}
-QSize K3bTitleLabel::minimumSizeHint() const
+TQSize K3bTitleLabel::tqminimumSizeHint() const
{
- return QSize( d->cachedMinimumWidth, d->titleBaseLine );
+ return TQSize( d->cachedMinimumWidth, d->titleBaseLine );
}
-void K3bTitleLabel::resizeEvent( QResizeEvent* e )
+void K3bTitleLabel::resizeEvent( TQResizeEvent* e )
{
- QFrame::resizeEvent( e );
+ TQFrame::resizeEvent( e );
updatePositioning();
update();
}
-void K3bTitleLabel::drawContents( QPainter* p )
+void K3bTitleLabel::drawContents( TQPainter* p )
{
p->save();
- QRect r = contentsRect();
+ TQRect r = contentsRect();
p->eraseRect( r );
- QFont f(font());
+ TQFont f(font());
f.setBold(true);
f.setPointSize( f.pointSize() + 2 );
@@ -168,9 +168,9 @@ void K3bTitleLabel::drawContents( QPainter* p )
neededWidth += d->displaySubTitleLength + 5;
int startPos = 0;
- if( d->alignment & Qt::AlignHCenter )
+ if( d->tqalignment & TQt::AlignHCenter )
startPos = r.left() + ( r.width() - 2*d->margin - neededWidth ) / 2;
- else if( d->alignment & Qt::AlignRight )
+ else if( d->tqalignment & TQt::AlignRight )
startPos = r.right() - d->margin - neededWidth;
else
startPos = r.left() + d->margin;
@@ -199,14 +199,14 @@ void K3bTitleLabel::setMargin( int m )
void K3bTitleLabel::updatePositioning()
{
- QFont f(font());
+ TQFont f(font());
f.setBold(true);
f.setPointSize( f.pointSize() + 2 );
- QFontMetrics titleFm(f);
+ TQFontMetrics titleFm(f);
f.setBold(false);
f.setPointSize( f.pointSize() - 4 );
- QFontMetrics subTitleFm(f);
+ TQFontMetrics subTitleFm(f);
d->titleBaseLine = contentsRect().height()/2 + titleFm.height()/2 - titleFm.descent();
d->titleLength = titleFm.width( d->title );
@@ -246,12 +246,12 @@ void K3bTitleLabel::updatePositioning()
//
d->cachedMinimumWidth = 2*d->margin;
- QString cutTitle = d->title;
+ TQString cutTitle = d->title;
if( cutTitle.length() > 2 ) {
cutTitle.truncate( 2 );
cutTitle += "...";
}
- QString cutSubTitle = d->subTitle;
+ TQString cutSubTitle = d->subTitle;
if( cutSubTitle.length() > 2 ) {
cutSubTitle.truncate( 2 );
cutSubTitle += "...";
diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h
index ba1044d..d725592 100644
--- a/libk3b/tools/k3btitlelabel.h
+++ b/libk3b/tools/k3btitlelabel.h
@@ -17,22 +17,23 @@
#ifndef _K3B_TITLE_LABEL_H_
#define _K3B_TITLE_LABEL_H_
-#include <qframe.h>
+#include <tqframe.h>
#include "k3b_export.h"
-class QPainter;
-class QResizeEvent;
+class TQPainter;
+class TQResizeEvent;
-class LIBK3B_EXPORT K3bTitleLabel : public QFrame
+class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bTitleLabel( QWidget* parent = 0, const char* name = 0 );
+ K3bTitleLabel( TQWidget* tqparent = 0, const char* name = 0 );
~K3bTitleLabel();
- QSize sizeHint() const;
- QSize minimumSizeHint() const;
+ TQSize tqsizeHint() const;
+ TQSize tqminimumSizeHint() const;
public slots:
/**
@@ -40,20 +41,20 @@ class LIBK3B_EXPORT K3bTitleLabel : public QFrame
*/
void setMargin( int );
- void setTitle( const QString& title, const QString& subTitle = QString::null );
- void setSubTitle( const QString& subTitle );
+ void setTitle( const TQString& title, const TQString& subTitle = TQString() );
+ void setSubTitle( const TQString& subTitle );
/**
- * The title label only supports alignments left, hcenter, and right
+ * The title label only supports tqalignments left, hcenter, and right
*
- * Default alignment is left.
+ * Default tqalignment is left.
*/
// FIXME: honor right-to-left languages
- void setAlignment( int align );
+ void tqsetAlignment( int align );
protected:
- void resizeEvent( QResizeEvent* );
- void drawContents( QPainter* p );
+ void resizeEvent( TQResizeEvent* );
+ void drawContents( TQPainter* p );
private:
void updatePositioning();
diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp
index b08dfc8..2adf274 100644
--- a/libk3b/tools/k3btoolbox.cpp
+++ b/libk3b/tools/k3btoolbox.cpp
@@ -20,78 +20,79 @@
#include <ktoolbarbutton.h>
#include <kiconloader.h>
-#include <qtoolbutton.h>
-#include <qsizepolicy.h>
-#include <qlayout.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qlabel.h>
-#include <qvbox.h>
-#include <qstyle.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qobjectlist.h>
+#include <tqtoolbutton.h>
+#include <tqsizepolicy.h>
+#include <tqlayout.h>
+#include <tqwhatsthis.h>
+#include <tqtooltip.h>
+#include <tqlabel.h>
+#include <tqvbox.h>
+#include <tqstyle.h>
+#include <tqpainter.h>
+#include <tqevent.h>
+#include <tqobjectlist.h>
/**
* internal class. Do not use!
*/
-class K3bToolBoxSeparator : public QWidget
+class K3bToolBoxSeparator : public TQWidget
{
// Q_OBJECT
+ TQ_OBJECT
public:
- K3bToolBoxSeparator( K3bToolBox* parent );
+ K3bToolBoxSeparator( K3bToolBox* tqparent );
- QSize sizeHint() const;
+ TQSize tqsizeHint() const;
protected:
- void paintEvent( QPaintEvent * );
+ void paintEvent( TQPaintEvent * );
};
-K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent )
- : QWidget( parent )
+K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* tqparent )
+ : TQWidget( tqparent )
{
- setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ) );
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
}
-QSize K3bToolBoxSeparator::sizeHint() const
+TQSize K3bToolBoxSeparator::tqsizeHint() const
{
- int extent = style().pixelMetric( QStyle::PM_DockWindowSeparatorExtent,
+ int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
- return QSize( extent, 0 );
+ return TQSize( extent, 0 );
}
-void K3bToolBoxSeparator::paintEvent( QPaintEvent* )
+void K3bToolBoxSeparator::paintEvent( TQPaintEvent* )
{
- QPainter p( this );
- QStyle::SFlags flags = QStyle::Style_Default|QStyle::Style_Horizontal;
+ TQPainter p( this );
+ TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal;
- style().drawPrimitive( QStyle::PE_DockWindowSeparator, &p, rect(),
- colorGroup(), flags );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
+ tqcolorGroup(), flags );
}
-K3bToolBoxButton::K3bToolBoxButton( KAction* action, QWidget* parent )
- : QToolButton( parent ),
+K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* tqparent )
+ : TQToolButton( tqparent ),
m_popupMenu(0)
{
- setSizePolicy( QSizePolicy(QSizePolicy::Fixed, sizePolicy().verData()) );
+ tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) );
setAutoRaise( true );
setIconSet( action->iconSet() );
setTextLabel( action->text() );
setEnabled( action->isEnabled() );
- QWhatsThis::add( this, action->whatsThis() );
+ TQWhatsThis::add( this, action->whatsThis() );
if( action->toolTip().isEmpty() )
- QToolTip::add( this, action->text() );
+ TQToolTip::add( this, action->text() );
else
- QToolTip::add( this, action->toolTip() );
+ TQToolTip::add( this, action->toolTip() );
// if( KToggleAction* ta = dynamic_cast<KToggleAction*>( action ) ) {
// setToggleButton( true );
@@ -100,33 +101,33 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, QWidget* parent )
// if( ta->isChecked() )
// toggle();
-// connect( ta, SIGNAL(toggled(bool)), this, SLOT(toggle()) );
-// connect( this, SIGNAL(toggled(bool)), ta, SLOT(setChecked(bool)) );
+// connect( ta, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggle()) );
+// connect( this, TQT_SIGNAL(toggled(bool)), ta, TQT_SLOT(setChecked(bool)) );
// }
// else
if( KActionMenu* am = dynamic_cast<KActionMenu*>( action ) ) {
m_popupMenu = am->popupMenu();
- connect( this, SIGNAL(pressed()), this, SLOT(slotPopupActivated()) );
+ connect( this, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotPopupActivated()) );
setPopup( m_popupMenu );
}
else {
- connect( this, SIGNAL(clicked()), action, SLOT(activate()) );
+ connect( this, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) );
}
- connect( action, SIGNAL(enabled(bool)), this, SLOT(setEnabled(bool)) );
+ connect( action, TQT_SIGNAL(enabled(bool)), this, TQT_SLOT(setEnabled(bool)) );
}
-K3bToolBoxButton::K3bToolBoxButton( const QString& text, const QString& icon,
- const QString& tooltip, const QString& whatsthis,
- QObject* receiver, const char* slot,
- QWidget* parent )
- : QToolButton( parent ),
+K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon,
+ const TQString& tooltip, const TQString& whatsthis,
+ TQObject* receiver, const char* slot,
+ TQWidget* tqparent )
+ : TQToolButton( tqparent ),
m_popupMenu(0)
{
- setSizePolicy( QSizePolicy(QSizePolicy::Fixed, sizePolicy().verData()) );
+ tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) );
setAutoRaise( true );
setTextLabel( text );
@@ -136,11 +137,11 @@ K3bToolBoxButton::K3bToolBoxButton( const QString& text, const QString& icon,
else
setIconSet( SmallIconSet( icon ) );
- QWhatsThis::add( this, whatsthis );
- QToolTip::add( this, tooltip );
+ TQWhatsThis::add( this, whatsthis );
+ TQToolTip::add( this, tooltip );
if( receiver && slot )
- connect( this, SIGNAL(clicked()), receiver, slot );
+ connect( this, TQT_SIGNAL(clicked()), receiver, slot );
}
@@ -151,9 +152,9 @@ void K3bToolBoxButton::slotPopupActivated()
}
-void K3bToolBoxButton::resizeEvent( QResizeEvent* e )
+void K3bToolBoxButton::resizeEvent( TQResizeEvent* e )
{
- QToolButton::resizeEvent( e );
+ TQToolButton::resizeEvent( e );
// force icon-only buttons to be square
if( e->oldSize().height() != e->size().height() &&
@@ -167,12 +168,12 @@ void K3bToolBoxButton::resizeEvent( QResizeEvent* e )
-K3bToolBox::K3bToolBox( QWidget* parent, const char* name )
- : QFrame( parent, name )
+K3bToolBox::K3bToolBox( TQWidget* tqparent, const char* name )
+ : TQFrame( tqparent, name )
{
- setSizePolicy( QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed) );
+ tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) );
- m_mainLayout = new QGridLayout( this );
+ m_mainLayout = new TQGridLayout( this );
m_mainLayout->setMargin( 1 );
m_mainLayout->setSpacing( 0 );
}
@@ -190,7 +191,7 @@ K3bToolBoxButton* K3bToolBox::addButton( KAction* action, bool forceText )
K3bToolBoxButton* b = new K3bToolBoxButton( action, this );
if( forceText ) {
b->setUsesTextLabel( true );
- b->setTextPosition( QToolButton::BesideIcon );
+ b->setTextPosition( TQToolButton::BesideIcon );
}
addWidget( b );
return b;
@@ -200,15 +201,15 @@ K3bToolBoxButton* K3bToolBox::addButton( KAction* action, bool forceText )
}
-K3bToolBoxButton* K3bToolBox::addButton( const QString& text, const QString& icon,
- const QString& tooltip, const QString& whatsthis,
- QObject* receiver, const char* slot,
+K3bToolBoxButton* K3bToolBox::addButton( const TQString& text, const TQString& icon,
+ const TQString& tooltip, const TQString& whatsthis,
+ TQObject* receiver, const char* slot,
bool forceText )
{
K3bToolBoxButton* b = new K3bToolBoxButton( text, icon, tooltip, whatsthis, receiver, slot, this );
if( forceText ) {
b->setUsesTextLabel( true );
- b->setTextPosition( QToolButton::BesideIcon );
+ b->setTextPosition( TQToolButton::BesideIcon );
}
addWidget( b );
return b;
@@ -234,29 +235,29 @@ void K3bToolBox::addSeparator()
void K3bToolBox::addStretch()
{
// add an empty widget
- addWidget( new QWidget( this ) );
+ addWidget( new TQWidget( this ) );
m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 );
}
-void K3bToolBox::addLabel( const QString& text )
+void K3bToolBox::addLabel( const TQString& text )
{
- QLabel* label = new QLabel( text, this );
- label->setSizePolicy( QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed) );
+ TQLabel* label = new TQLabel( text, this );
+ label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
addWidget( label );
}
-void K3bToolBox::addWidget( QWidget* w )
+void K3bToolBox::addWidget( TQWidget* w )
{
- w->reparent( this, QPoint() );
+ w->reparent( this, TQPoint() );
m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 0 );
m_mainLayout->addWidget( w, 0, m_mainLayout->numCols()-1 );
- if( w->sizePolicy().horData() == QSizePolicy::Fixed || w->sizePolicy().horData() == QSizePolicy::Maximum )
+ if( w->tqsizePolicy().horData() == TQSizePolicy::Fixed || w->tqsizePolicy().horData() == TQSizePolicy::Maximum )
m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 );
else {
m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 1 );
@@ -282,10 +283,10 @@ void K3bToolBox::clear()
{
// we do not want to delete the widgets from the widgetactions becasue they
// might be used afterwards
- for( QPtrListIterator<QWidget> it( m_doNotDeleteWidgets ); it.current(); ++it )
- it.current()->reparent( 0L, QPoint() );
+ for( TQPtrListIterator<TQWidget> it( m_doNotDeleteWidgets ); it.current(); ++it )
+ it.current()->reparent( 0L, TQPoint() );
- for( QObjectListIterator it2( *children() ); it2.current(); ++it2 )
+ for( TQObjectListIterator it2( childrenListObject() ); it2.current(); ++it2 )
if( it2.current()->isWidgetType() )
delete it2.current();
}
diff --git a/libk3b/tools/k3btoolbox.h b/libk3b/tools/k3btoolbox.h
index 828fca1..b93346b 100644
--- a/libk3b/tools/k3btoolbox.h
+++ b/libk3b/tools/k3btoolbox.h
@@ -16,56 +16,58 @@
#ifndef K3B_TOOLBOX_H
#define K3B_TOOLBOX_H
-#include <qframe.h>
-#include <qstring.h>
-#include <qtoolbutton.h>
-#include <qptrlist.h>
+#include <tqframe.h>
+#include <tqstring.h>
+#include <tqtoolbutton.h>
+#include <tqptrlist.h>
#include "k3b_export.h"
class KAction;
class KToggleAction;
class KWidgetAction;
-class QGridLayout;
-class QPopupMenu;
-class QResizeEvent;
+class TQGridLayout;
+class TQPopupMenu;
+class TQResizeEvent;
/**
* internal class. Do not use!
*/
-class LIBK3B_EXPORT K3bToolBoxButton : public QToolButton
+class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bToolBoxButton( KAction*, QWidget* parent );
- K3bToolBoxButton( const QString& text, const QString& icon,
- const QString& tooltip, const QString& whatsthis,
- QObject* receiver, const char* slot,
- QWidget* parent );
+ K3bToolBoxButton( KAction*, TQWidget* tqparent );
+ K3bToolBoxButton( const TQString& text, const TQString& icon,
+ const TQString& tooltip, const TQString& whatsthis,
+ TQObject* receiver, const char* slot,
+ TQWidget* tqparent );
private slots:
void slotPopupActivated();
protected:
- void resizeEvent( QResizeEvent* );
+ void resizeEvent( TQResizeEvent* );
private:
- QPopupMenu* m_popupMenu;
+ TQPopupMenu* m_popupMenu;
};
-class LIBK3B_EXPORT K3bToolBox : public QFrame
+class LIBK3B_EXPORT K3bToolBox : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
- K3bToolBox( QWidget* parent = 0, const char* name = 0 );
+ K3bToolBox( TQWidget* tqparent = 0, const char* name = 0 );
~K3bToolBox();
- K3bToolBoxButton* addButton( const QString& text, const QString& icon,
- const QString& tooltip = QString::null, const QString& whatsthis = QString::null,
- QObject* receiver = 0, const char* slot = 0,
+ K3bToolBoxButton* addButton( const TQString& text, const TQString& icon,
+ const TQString& tooltip = TQString(), const TQString& whatsthis = TQString(),
+ TQObject* receiver = 0, const char* slot = 0,
bool forceTextLabel = false );
K3bToolBoxButton* addButton( KAction*, bool forceTextLabel = false );
K3bToolBoxButton* addToggleButton( KToggleAction* );
@@ -76,8 +78,8 @@ class LIBK3B_EXPORT K3bToolBox : public QFrame
* and destroy it on destruction. Becasue of this it is not fitted
* for WidgetActions.
*/
- void addWidget( QWidget* );
- void addLabel( const QString& );
+ void addWidget( TQWidget* );
+ void addLabel( const TQString& );
void addSpacing();
void addSeparator();
void addStretch();
@@ -85,8 +87,8 @@ class LIBK3B_EXPORT K3bToolBox : public QFrame
void clear();
protected:
- QGridLayout* m_mainLayout;
- QPtrList<QWidget> m_doNotDeleteWidgets;
+ TQGridLayout* m_mainLayout;
+ TQPtrList<TQWidget> m_doNotDeleteWidgets;
};
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index 2e3e468..6f63c63 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -15,9 +15,9 @@
#include "k3btoolbutton.h"
-#include <qstyle.h>
-#include <qpainter.h>
-#include <qevent.h>
+#include <tqstyle.h>
+#include <tqpainter.h>
+#include <tqevent.h>
#include <kglobalsettings.h>
#include <kapplication.h>
@@ -26,13 +26,13 @@
class K3bToolButton::Private
{
public:
- QPoint mousePressPos;
+ TQPoint mousePressPos;
bool instantMenu;
};
-K3bToolButton::K3bToolButton( QWidget* parent )
- : QToolButton( parent )
+K3bToolButton::K3bToolButton( TQWidget* tqparent )
+ : TQToolButton( tqparent )
{
d = new Private;
d->instantMenu = false;
@@ -52,38 +52,38 @@ void K3bToolButton::setInstantMenu( bool b )
}
-void K3bToolButton::drawButton( QPainter* p )
+void K3bToolButton::drawButton( TQPainter* p )
{
- QToolButton::drawButton( p );
+ TQToolButton::drawButton( p );
//
// code below comes from ktoolbarbutton.cpp from the kdelibs sources
// see the file for copyright information
//
- if( QToolButton::popup() ) {
- QStyle::SFlags arrowFlags = QStyle::Style_Default;
+ if( TQToolButton::popup() ) {
+ TQStyle::SFlags arrowFlags = TQStyle::Style_Default;
if( isDown() )
- arrowFlags |= QStyle::Style_Down;
+ arrowFlags |= TQStyle::Style_Down;
if( isEnabled() )
- arrowFlags |= QStyle::Style_Enabled;
+ arrowFlags |= TQStyle::Style_Enabled;
- style().drawPrimitive(QStyle::PE_ArrowDown, p,
- QRect(width()-7, height()-7, 7, 7), colorGroup(),
- arrowFlags, QStyleOption() );
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
+ TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(),
+ arrowFlags, TQStyleOption() );
}
}
-bool K3bToolButton::eventFilter( QObject* o, QEvent* ev )
+bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev )
{
if( dynamic_cast<K3bToolButton*>(o) == this ) {
// Popup the menu when the left mousebutton is pressed and the mouse
// is moved by a small distance.
- if( QToolButton::popup() ) {
- if( ev->type() == QEvent::MouseButtonPress ) {
- QMouseEvent* mev = static_cast<QMouseEvent*>(ev);
+ if( TQToolButton::popup() ) {
+ if( ev->type() == TQEvent::MouseButtonPress ) {
+ TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
if( d->instantMenu ) {
setDown(true);
@@ -94,8 +94,8 @@ bool K3bToolButton::eventFilter( QObject* o, QEvent* ev )
d->mousePressPos = mev->pos();
}
}
- else if( ev->type() == QEvent::MouseMove ) {
- QMouseEvent* mev = static_cast<QMouseEvent*>(ev);
+ else if( ev->type() == TQEvent::MouseMove ) {
+ TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
if( !d->instantMenu &&
( mev->pos() - d->mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) {
openPopup();
@@ -105,5 +105,5 @@ bool K3bToolButton::eventFilter( QObject* o, QEvent* ev )
}
}
- return QToolButton::eventFilter( o, ev );
+ return TQToolButton::eventFilter( o, ev );
}
diff --git a/libk3b/tools/k3btoolbutton.h b/libk3b/tools/k3btoolbutton.h
index fe96e4c..707801f 100644
--- a/libk3b/tools/k3btoolbutton.h
+++ b/libk3b/tools/k3btoolbutton.h
@@ -18,29 +18,29 @@
#include "k3b_export.h"
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
-class QPainter;
-class QEvent;
+class TQPainter;
+class TQEvent;
/**
- * the K3bToolButton is an enhanced QToolButton which adds two functionalities:
+ * the K3bToolButton is an enhanced TQToolButton which adds two functionalities:
* <li>A delayed popup menu is shown immiadetely once the mouse is dragged downwards
* much like the KToolBarButton
* <li>If a popup menu is set a little arrow indicates this.
*/
-class LIBK3B_EXPORT K3bToolButton : public QToolButton
+class LIBK3B_EXPORT K3bToolButton : public TQToolButton
{
public:
- K3bToolButton( QWidget* parent = 0 );
+ K3bToolButton( TQWidget* tqparent = 0 );
~K3bToolButton();
void setInstantMenu( bool );
protected:
- virtual void drawButton( QPainter* );
- virtual bool eventFilter( QObject*, QEvent* );
+ virtual void drawButton( TQPainter* );
+ virtual bool eventFilter( TQObject*, TQEvent* );
private:
class Private;
diff --git a/libk3b/tools/k3bvalidators.cpp b/libk3b/tools/k3bvalidators.cpp
index 9252fdd..b8a6e65 100644
--- a/libk3b/tools/k3bvalidators.cpp
+++ b/libk3b/tools/k3bvalidators.cpp
@@ -19,14 +19,14 @@
#include <ctype.h>
-K3bCharValidator::K3bCharValidator( QObject* parent, const char* name )
- : QValidator( parent, name ),
+K3bCharValidator::K3bCharValidator( TQObject* tqparent, const char* name )
+ : TQValidator( tqparent, name ),
m_replaceChar( '_' )
{
}
-QValidator::State K3bCharValidator::validate( QString& s, int& pos ) const
+TQValidator::State K3bCharValidator::validate( TQString& s, int& pos ) const
{
Q_UNUSED(pos);
@@ -40,7 +40,7 @@ QValidator::State K3bCharValidator::validate( QString& s, int& pos ) const
}
-void K3bCharValidator::fixup( QString& s ) const
+void K3bCharValidator::fixup( TQString& s ) const
{
for( unsigned int i = 0; i < s.length(); ++i ) {
if( validateChar( s[i] ) != Acceptable )
@@ -49,13 +49,13 @@ void K3bCharValidator::fixup( QString& s ) const
}
-K3bLatin1Validator::K3bLatin1Validator( QObject* parent, const char* name )
- : K3bCharValidator( parent, name )
+K3bLatin1Validator::K3bLatin1Validator( TQObject* tqparent, const char* name )
+ : K3bCharValidator( tqparent, name )
{
}
-QValidator::State K3bLatin1Validator::validateChar( const QChar& c ) const
+TQValidator::State K3bLatin1Validator::validateChar( const TQChar& c ) const
{
if( !c.latin1() )
return Invalid;
@@ -64,13 +64,13 @@ QValidator::State K3bLatin1Validator::validateChar( const QChar& c ) const
}
-K3bAsciiValidator::K3bAsciiValidator( QObject* parent, const char* name )
- : K3bLatin1Validator( parent, name )
+K3bAsciiValidator::K3bAsciiValidator( TQObject* tqparent, const char* name )
+ : K3bLatin1Validator( tqparent, name )
{
}
-QValidator::State K3bAsciiValidator::validateChar( const QChar& c ) const
+TQValidator::State K3bAsciiValidator::validateChar( const TQChar& c ) const
{
if( K3bLatin1Validator::validateChar( c ) == Invalid )
return Invalid;
@@ -82,21 +82,21 @@ QValidator::State K3bAsciiValidator::validateChar( const QChar& c ) const
-K3bValidator::K3bValidator( QObject* parent, const char* name )
- : QRegExpValidator( parent, name ),
+K3bValidator::K3bValidator( TQObject* tqparent, const char* name )
+ : TQRegExpValidator( tqparent, name ),
m_replaceChar('_')
{
}
-K3bValidator::K3bValidator( const QRegExp& rx, QObject* parent, const char* name )
- : QRegExpValidator( rx, parent, name ),
+K3bValidator::K3bValidator( const TQRegExp& rx, TQObject* tqparent, const char* name )
+ : TQRegExpValidator( rx, tqparent, name ),
m_replaceChar('_')
{
}
-void K3bValidator::fixup( QString& input ) const
+void K3bValidator::fixup( TQString& input ) const
{
for( unsigned int i = 0; i < input.length(); ++i )
if( !regExp().exactMatch( input.mid(i, 1) ) )
@@ -104,9 +104,9 @@ void K3bValidator::fixup( QString& input ) const
}
-QString K3bValidators::fixup( const QString& input, const QRegExp& rx, const QChar& replaceChar )
+TQString K3bValidators::fixup( const TQString& input, const TQRegExp& rx, const TQChar& replaceChar )
{
- QString s;
+ TQString s;
for( unsigned int i = 0; i < input.length(); ++i )
if( rx.exactMatch( input.mid(i, 1) ) )
s += input[i];
@@ -116,39 +116,39 @@ QString K3bValidators::fixup( const QString& input, const QRegExp& rx, const QCh
}
-K3bValidator* K3bValidators::isrcValidator( QObject* parent, const char* name )
+K3bValidator* K3bValidators::isrcValidator( TQObject* tqparent, const char* name )
{
- return new K3bValidator( QRegExp("^[A-Z\\d]{2,2}-[A-Z\\d]{3,3}-\\d{2,2}-\\d{5,5}$"), parent, name );
+ return new K3bValidator( TQRegExp("^[A-Z\\d]{2,2}-[A-Z\\d]{3,3}-\\d{2,2}-\\d{5,5}$"), tqparent, name );
}
-K3bValidator* K3bValidators::iso9660Validator( bool allowEmpty, QObject* parent, const char* name )
+K3bValidator* K3bValidators::iso9660Validator( bool allowEmpty, TQObject* tqparent, const char* name )
{
if( allowEmpty )
- return new K3bValidator( QRegExp( "[^/]*" ), parent, name );
+ return new K3bValidator( TQRegExp( "[^/]*" ), tqparent, name );
else
- return new K3bValidator( QRegExp( "[^/]+" ), parent, name );
+ return new K3bValidator( TQRegExp( "[^/]+" ), tqparent, name );
}
-K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, QObject* parent, const char* name )
+K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, TQObject* tqparent, const char* name )
{
- QRegExp rx;
+ TQRegExp rx;
switch ( type ) {
case Iso646_d:
if ( AllowLowerCase )
- rx = QRegExp( "[a-zA-Z0-9_]*" );
+ rx = TQRegExp( "[a-zA-Z0-9_]*" );
else
- rx = QRegExp( "[A-Z0-9_]*" );
+ rx = TQRegExp( "[A-Z0-9_]*" );
break;
case Iso646_a:
default:
if ( AllowLowerCase )
- rx = QRegExp( "[a-zA-Z0-9!\"\\s%&'\\(\\)\\*\\+,\\-\\./:;<=>\\?_]*" );
+ rx = TQRegExp( "[a-zA-Z0-9!\"\\s%&'\\(\\)\\*\\+,\\-\\./:;<=>\\?_]*" );
else
- rx = QRegExp( "[A-Z0-9!\"\\s%&'\\(\\)\\*\\+,\\-\\./:;<=>\\?_]*" );
+ rx = TQRegExp( "[A-Z0-9!\"\\s%&'\\(\\)\\*\\+,\\-\\./:;<=>\\?_]*" );
break;
}
- return new K3bValidator( rx, parent, name );
+ return new K3bValidator( rx, tqparent, name );
}
diff --git a/libk3b/tools/k3bvalidators.h b/libk3b/tools/k3bvalidators.h
index 89c6397..d391cb9 100644
--- a/libk3b/tools/k3bvalidators.h
+++ b/libk3b/tools/k3bvalidators.h
@@ -16,74 +16,74 @@
#ifndef _K3B_VALIDATORS_H_
#define _K3B_VALIDATORS_H_
-#include <qvalidator.h>
+#include <tqvalidator.h>
#include "k3b_export.h"
/**
* Simple validator that validates a string char by char
*/
-class LIBK3B_EXPORT K3bCharValidator : public QValidator
+class LIBK3B_EXPORT K3bCharValidator : public TQValidator
{
public:
- K3bCharValidator( QObject* parent = 0, const char* name = 0 );
+ K3bCharValidator( TQObject* tqparent = 0, const char* name = 0 );
- virtual State validateChar( const QChar& ) const = 0;
+ virtual State validateChar( const TQChar& ) const = 0;
- virtual State validate( QString& s, int& pos ) const;
+ virtual State validate( TQString& s, int& pos ) const;
/**
* Replaces all invalid chars with the repplace char
*/
- virtual void fixup( QString& ) const;
+ virtual void fixup( TQString& ) const;
/**
* Default to '_'
*/
- void setReplaceChar( const QChar& c ) { m_replaceChar = c; }
+ void setReplaceChar( const TQChar& c ) { m_replaceChar = c; }
private:
- QChar m_replaceChar;
+ TQChar m_replaceChar;
};
class LIBK3B_EXPORT K3bLatin1Validator : public K3bCharValidator
{
public:
- K3bLatin1Validator( QObject* parent = 0, const char* name = 0 );
+ K3bLatin1Validator( TQObject* tqparent = 0, const char* name = 0 );
- virtual State validateChar( const QChar& ) const;
+ virtual State validateChar( const TQChar& ) const;
};
class LIBK3B_EXPORT K3bAsciiValidator : public K3bLatin1Validator
{
public:
- K3bAsciiValidator( QObject* parent = 0, const char* name = 0 );
+ K3bAsciiValidator( TQObject* tqparent = 0, const char* name = 0 );
- virtual State validateChar( const QChar& ) const;
+ virtual State validateChar( const TQChar& ) const;
};
/**
- * The K3bValidator extends QRegExpValidator with a fixup method
+ * The K3bValidator extends TQRegExpValidator with a fixup method
* that just replaces all characters that are not allowed with the
- * replace character. It only makes sense for QRegExps that simply
+ * replace character. It only makes sense for TQRegExps that simply
* allow or forbid some characters.
*/
-class LIBK3B_EXPORT K3bValidator : public QRegExpValidator
+class LIBK3B_EXPORT K3bValidator : public TQRegExpValidator
{
public:
- K3bValidator( QObject* parent, const char * name = 0 );
- K3bValidator( const QRegExp& rx, QObject* parent, const char* name = 0 );
+ K3bValidator( TQObject* tqparent, const char * name = 0 );
+ K3bValidator( const TQRegExp& rx, TQObject* tqparent, const char* name = 0 );
- void setReplaceChar( const QChar& s ) { m_replaceChar = s; }
- const QChar& replaceChar() const { return m_replaceChar; }
+ void setReplaceChar( const TQChar& s ) { m_replaceChar = s; }
+ const TQChar& replaceChar() const { return m_replaceChar; }
- virtual void fixup( QString& ) const;
+ virtual void fixup( TQString& ) const;
private:
- QChar m_replaceChar;
+ TQChar m_replaceChar;
};
@@ -91,10 +91,10 @@ namespace K3bValidators
{
/**
* just replaces all characters that are not allowed with the
- * replace character. It only makes sense for QRegExps that simply
+ * replace character. It only makes sense for TQRegExps that simply
* allow or forbid some characters.
*/
- LIBK3B_EXPORT QString fixup( const QString&, const QRegExp&, const QChar& replaceChar = '_' );
+ LIBK3B_EXPORT TQString fixup( const TQString&, const TQRegExp&, const TQChar& replaceChar = '_' );
/**
* Validates an ISRC code of the form "CCOOOYYSSSSS" where:
@@ -105,13 +105,13 @@ namespace K3bValidators
* <li>S: serial number (digits)</li>
* </ul>
*/
- LIBK3B_EXPORT K3bValidator* isrcValidator( QObject* parent = 0, const char* name = 0 );
+ LIBK3B_EXPORT K3bValidator* isrcValidator( TQObject* tqparent = 0, const char* name = 0 );
/**
* This needs to be replaced by something better in the future...
* Even the name sucks!
*/
- LIBK3B_EXPORT K3bValidator* iso9660Validator( bool allowEmpty = true, QObject* parent = 0, const char* name = 0 );
+ LIBK3B_EXPORT K3bValidator* iso9660Validator( bool allowEmpty = true, TQObject* tqparent = 0, const char* name = 0 );
/**
* (1) d-characters are: A-Z, 0-9, _ (see ISO-9660:1988, Annex A, Table 15)
@@ -125,7 +125,7 @@ namespace K3bValidators
LIBK3B_EXPORT K3bValidator* iso646Validator( int type = Iso646_a,
bool AllowLowerCase = false,
- QObject* parent = 0, const char* name = 0 );
+ TQObject* tqparent = 0, const char* name = 0 );
}
#endif
diff --git a/libk3b/tools/k3bwavefilewriter.cpp b/libk3b/tools/k3bwavefilewriter.cpp
index 36267c2..31ad6e0 100644
--- a/libk3b/tools/k3bwavefilewriter.cpp
+++ b/libk3b/tools/k3bwavefilewriter.cpp
@@ -29,7 +29,7 @@ K3bWaveFileWriter::~K3bWaveFileWriter()
}
-bool K3bWaveFileWriter::open( const QString& filename )
+bool K3bWaveFileWriter::open( const TQString& filename )
{
close();
@@ -65,7 +65,7 @@ void K3bWaveFileWriter::close()
}
}
- m_filename = QString::null;
+ m_filename = TQString();
}
@@ -75,7 +75,7 @@ bool K3bWaveFileWriter::isOpen()
}
-const QString& K3bWaveFileWriter::filename() const
+const TQString& K3bWaveFileWriter::filename() const
{
return m_filename;
}
@@ -135,8 +135,8 @@ void K3bWaveFileWriter::updateHeader()
m_outputFile.flush();
- Q_INT32 dataSize( m_outputFile.at() - 44 );
- Q_INT32 wavSize(dataSize + 44 - 8);
+ TQ_INT32 dataSize( m_outputFile.at() - 44 );
+ TQ_INT32 wavSize(dataSize + 44 - 8);
char c[4];
// jump to the wavSize position in the header
diff --git a/libk3b/tools/k3bwavefilewriter.h b/libk3b/tools/k3bwavefilewriter.h
index e5394a5..a6fc97a 100644
--- a/libk3b/tools/k3bwavefilewriter.h
+++ b/libk3b/tools/k3bwavefilewriter.h
@@ -17,9 +17,9 @@
#ifndef K3BWAVEFILEWRITER_H
#define K3BWAVEFILEWRITER_H
-#include <qstring.h>
-#include <qfile.h>
-#include <qdatastream.h>
+#include <tqstring.h>
+#include <tqfile.h>
+#include <tqdatastream.h>
#include "k3b_export.h"
/**
* @author Sebastian Trueg
@@ -39,10 +39,10 @@ class LIBK3B_EXPORT K3bWaveFileWriter
* open a new wave file.
* closes any opened file.
*/
- bool open( const QString& filename );
+ bool open( const TQString& filename );
bool isOpen();
- const QString& filename() const;
+ const TQString& filename() const;
/**
* closes the file.
@@ -70,9 +70,9 @@ class LIBK3B_EXPORT K3bWaveFileWriter
void updateHeader();
void padTo2352();
- QFile m_outputFile;
- QDataStream m_outputStream;
- QString m_filename;
+ TQFile m_outputFile;
+ TQDataStream m_outputStream;
+ TQString m_filename;
};
#endif
diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp
index accbe17..d06c887 100644
--- a/libk3b/tools/kcutlabel.cpp
+++ b/libk3b/tools/kcutlabel.cpp
@@ -18,34 +18,34 @@
#include <k3bstringutils.h>
-#include <qtooltip.h>
-#include <qstringlist.h>
+#include <tqtooltip.h>
+#include <tqstringlist.h>
#include <kdebug.h>
-KCutLabel::KCutLabel( const QString &text , QWidget *parent, const char *name )
- : QLabel ( parent, name ),
+KCutLabel::KCutLabel( const TQString &text , TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ),
m_minChars(1) {
- QSizePolicy myLabelSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
- setSizePolicy(myLabelSizePolicy);
+ TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ tqsetSizePolicy(myLabelSizePolicy);
m_fullText = text;
cutTextToLabel();
}
-KCutLabel::KCutLabel( QWidget *parent, const char *name )
- : QLabel ( parent, name ),
+KCutLabel::KCutLabel( TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ),
m_minChars(1) {
- QSizePolicy myLabelSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
- setSizePolicy(myLabelSizePolicy);
+ TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ tqsetSizePolicy(myLabelSizePolicy);
}
-QSize KCutLabel::minimumSizeHint() const
+TQSize KCutLabel::tqminimumSizeHint() const
{
- QSize sh = QLabel::minimumSizeHint();
+ TQSize sh = TQLabel::tqminimumSizeHint();
if( m_minChars == 0 )
sh.setWidth(-1);
else if( m_minChars < (int)m_fullText.length() )
- sh.setWidth( QMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ),
+ sh.setWidth( TQMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ),
fontMetrics().width( m_fullText ) ) );
return sh;
@@ -59,19 +59,19 @@ void KCutLabel::setMinimumVisibleText( int i )
}
-void KCutLabel::resizeEvent( QResizeEvent * )
+void KCutLabel::resizeEvent( TQResizeEvent * )
{
cutTextToLabel();
}
-void KCutLabel::setText( const QString &text )
+void KCutLabel::setText( const TQString &text )
{
m_fullText = text;
cutTextToLabel();
}
-const QString& KCutLabel::fullText() const
+const TQString& KCutLabel::fullText() const
{
return m_fullText;
}
@@ -79,36 +79,36 @@ const QString& KCutLabel::fullText() const
void KCutLabel::cutTextToLabel()
{
- QToolTip::remove( this );
- QToolTip::hide();
-
- if( m_fullText.contains( "\n" ) ) {
- QString newText;
- QStringList lines = QStringList::split( "\n", m_fullText );
- for( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
- QString squeezedText = K3b::cutToWidth( fontMetrics(),
+ TQToolTip::remove( this );
+ TQToolTip::hide();
+
+ if( m_fullText.tqcontains( "\n" ) ) {
+ TQString newText;
+ TQStringList lines = TQStringList::split( "\n", m_fullText );
+ for( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
+ TQString squeezedText = K3b::cutToWidth( fontMetrics(),
*it,
- QMAX( size().width(),
- QMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ),
+ TQMAX( size().width(),
+ TQMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ),
fontMetrics().width( m_fullText ) ) ) );
newText += squeezedText;
newText += "\n";
if( squeezedText != *it )
- QToolTip::add( this, m_fullText );
+ TQToolTip::add( this, m_fullText );
}
newText.truncate( newText.length() - 1 ); // get rid of the last newline
- QLabel::setText( newText );
+ TQLabel::setText( newText );
}
else {
- QString squeezedText = K3b::cutToWidth( fontMetrics(),
+ TQString squeezedText = K3b::cutToWidth( fontMetrics(),
m_fullText,
- QMAX( size().width(),
- QMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ),
+ TQMAX( size().width(),
+ TQMIN( fontMetrics().width( m_fullText.left(m_minChars) + "..." ),
fontMetrics().width( m_fullText ) ) ) );
- QLabel::setText( squeezedText );
+ TQLabel::setText( squeezedText );
if( squeezedText != m_fullText )
- QToolTip::add( this, m_fullText );
+ TQToolTip::add( this, m_fullText );
}
}
diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h
index 6cf459c..5df44b3 100644
--- a/libk3b/tools/kcutlabel.h
+++ b/libk3b/tools/kcutlabel.h
@@ -17,33 +17,34 @@
#ifndef KCUTLABEL_H
#define KCUTLABEL_H
-#include <qlabel.h>
+#include <tqlabel.h>
#include "k3b_export.h"
/*
- * @ref QLabel
+ * @ref TQLabel
*/
-class LIBK3B_EXPORT KCutLabel : public QLabel
+class LIBK3B_EXPORT KCutLabel : public TQLabel
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor.
*/
- KCutLabel( QWidget *parent = 0, const char *name = 0);
- KCutLabel( const QString &text, QWidget *parent = 0, const char *name = 0 );
+ KCutLabel( TQWidget *tqparent = 0, const char *name = 0);
+ KCutLabel( const TQString &text, TQWidget *tqparent = 0, const char *name = 0 );
- virtual QSize minimumSizeHint() const;
+ virtual TQSize tqminimumSizeHint() const;
/**
* \return the full text while text() returns the cut text
*/
- const QString& fullText() const;
+ const TQString& fullText() const;
public slots:
- void setText( const QString & );
+ void setText( const TQString & );
/**
* \param i the number of characters that have to be visible. Default is 1.
@@ -54,14 +55,14 @@ class LIBK3B_EXPORT KCutLabel : public QLabel
/**
* used when widget is resized
*/
- void resizeEvent( QResizeEvent * );
+ void resizeEvent( TQResizeEvent * );
/**
* does the dirty work
*/
void cutTextToLabel();
private:
- QString m_fullText;
+ TQString m_fullText;
int m_minChars;
};
diff --git a/libk3b/tools/libisofs/COPYING b/libk3b/tools/libisofs/COPYING
index 9fe1a71..3f277a2 100644
--- a/libk3b/tools/libisofs/COPYING
+++ b/libk3b/tools/libisofs/COPYING
@@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which contains
+ 0. This License applies to any program or other work which tqcontains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
diff --git a/libk3b/tools/libisofs/iso_fs.h b/libk3b/tools/libisofs/iso_fs.h
index 43353b0..b726b9f 100644
--- a/libk3b/tools/libisofs/iso_fs.h
+++ b/libk3b/tools/libisofs/iso_fs.h
@@ -131,13 +131,13 @@ struct hs_primary_descriptor {
char root_directory_record [ISODCL (181, 214)]; /* 9.1 */
};
-/* We use this to help us look up the parent inode numbers. */
+/* We use this to help us look up the tqparent inode numbers. */
struct iso_path_table{
char name_len[1]; /* 711 */
char ext_attr_length[1]; /* 711 */
char extent[4]; /* 731 */
- char parent[2]; /* 721 */
+ char tqparent[2]; /* 721 */
char name[1];
};
diff --git a/libk3b/tools/libisofs/isofs.h b/libk3b/tools/libisofs/isofs.h
index f284903..6f2fe2d 100644
--- a/libk3b/tools/libisofs/isofs.h
+++ b/libk3b/tools/libisofs/isofs.h
@@ -43,7 +43,7 @@ typedef struct _rr_entry {
int serno;
int dev_major;
int dev_minor;
- int pl; /* parent location */
+ int pl; /* tqparent location */
int cl; /* child location */
int re; /* relocated */
char z_algo[2]; /* zizofs algorithm */
@@ -60,7 +60,7 @@ typedef struct _iso_vol_desc {
typedef struct _boot_entry {
struct _boot_entry *next;
struct _boot_entry *prev;
- struct _boot_entry *parent;
+ struct _boot_entry *tqparent;
struct _boot_entry *child;
char data[32];
} boot_entry;
diff --git a/libk3b/videodvd/k3bvideodvd.cpp b/libk3b/videodvd/k3bvideodvd.cpp
index 8692c04..47de0d0 100644
--- a/libk3b/videodvd/k3bvideodvd.cpp
+++ b/libk3b/videodvd/k3bvideodvd.cpp
@@ -22,7 +22,7 @@
#include <k3bdevice.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <klocale.h>
@@ -61,7 +61,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
//
// Initialize libdvdread
//
- dvd_reader_t* dvdReaderT = DVDOpen( QFile::encodeName(dev->blockDeviceName()) );
+ dvd_reader_t* dvdReaderT = DVDOpen( TQFile::encodeName(dev->blockDeviceName()) );
if( !dvdReaderT ) {
kdDebug() << "(K3bVideoDVD) Could not open device " << dev->blockDeviceName() << endl;
return false;
@@ -77,7 +77,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
DVDClose( dvdReaderT );
return false;
}
- m_volumeIdentifier = QString::fromLatin1( v, 32 );
+ m_volumeIdentifier = TQString::tqfromLatin1( v, 32 );
//
// Open the VMG info
@@ -160,7 +160,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
titleIfo->vtsi_mat->vts_audio_attr[j].lang_code>>8,
titleIfo->vtsi_mat->vts_audio_attr[j].lang_code & 0xff );
else
- m_titles[i].m_audioStreams[j].m_langCode = QString::null;
+ m_titles[i].m_audioStreams[j].m_langCode = TQString();
}
//
@@ -175,7 +175,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
titleIfo->vtsi_mat->vts_subp_attr[j].lang_code>>8,
titleIfo->vtsi_mat->vts_subp_attr[j].lang_code & 0xff );
else
- m_titles[i].m_subPictureStreams[j].m_langCode = QString::null;
+ m_titles[i].m_subPictureStreams[j].m_langCode = TQString();
}
//
@@ -244,7 +244,7 @@ void K3bVideoDVD::VideoDVD::debug() const
}
-QString K3bVideoDVD::audioFormatString( int format )
+TQString K3bVideoDVD::audioFormatString( int format )
{
switch( format ) {
case AUDIO_FORMAT_AC3:
@@ -263,7 +263,7 @@ QString K3bVideoDVD::audioFormatString( int format )
}
-QString K3bVideoDVD::audioCodeExtensionString( int ext )
+TQString K3bVideoDVD::audioCodeExtensionString( int ext )
{
switch( ext ) {
case AUDIO_CODE_EXT_UNSPECIFIED:
@@ -282,7 +282,7 @@ QString K3bVideoDVD::audioCodeExtensionString( int ext )
}
-QString K3bVideoDVD::subPictureCodeModeString( int mode )
+TQString K3bVideoDVD::subPictureCodeModeString( int mode )
{
switch( mode ) {
case SUBPIC_CODE_MODE_RLE:
@@ -295,7 +295,7 @@ QString K3bVideoDVD::subPictureCodeModeString( int mode )
}
-QString K3bVideoDVD::subPictureCodeExtensionString( int ext )
+TQString K3bVideoDVD::subPictureCodeExtensionString( int ext )
{
switch( ext ) {
case SUBPIC_CODE_EXT_UNSPECIFIED:
@@ -305,13 +305,13 @@ QString K3bVideoDVD::subPictureCodeExtensionString( int ext )
case SUBPIC_CODE_EXT_CAPTION_BIGGER_SIZE:
return i18n("Caption with bigger size character");
case SUBPIC_CODE_EXT_CAPTION_FOR_CHILDREN:
- return i18n("Caption for children");
+ return i18n("Caption for tqchildren");
case SUBPIC_CODE_EXT_CLOSED_CAPTION_NORMAL_SIZE:
return i18n("Closed caption with normal size character");
case SUBPIC_CODE_EXT_CLOSED_CAPTION_BIGGER_SIZE:
return i18n("Closed caption with bigger size character");
case SUBPIC_CODE_EXT_CLOSED_CAPTION_FOR_CHILDREN:
- return i18n("Closed caption for children");
+ return i18n("Closed caption for tqchildren");
case SUBPIC_CODE_EXT_FORCED_CAPTION:
return i18n("Forced caption");
case SUBPIC_CODE_EXT_DIR_COMMENTS_NORMAL_SIZE:
@@ -319,7 +319,7 @@ QString K3bVideoDVD::subPictureCodeExtensionString( int ext )
case SUBPIC_CODE_EXT_DIR_COMMENTS_BIGGER_SIZE:
return i18n("Director's comments with bigger size characters");
case SUBPIC_CODE_EXT_DIR_COMMENTS_FOR_CHILDREN:
- return i18n("Director's comments for children");
+ return i18n("Director's comments for tqchildren");
default:
return i18n("unknown code extension");
}
diff --git a/libk3b/videodvd/k3bvideodvd.h b/libk3b/videodvd/k3bvideodvd.h
index 180a6f5..a3ee19d 100644
--- a/libk3b/videodvd/k3bvideodvd.h
+++ b/libk3b/videodvd/k3bvideodvd.h
@@ -20,8 +20,8 @@
#include <k3b_export.h>
-#include <qstring.h>
-#include <qvaluevector.h>
+#include <tqstring.h>
+#include <tqvaluevector.h>
namespace K3bDevice {
@@ -65,7 +65,7 @@ namespace K3bVideoDVD
bool open( K3bDevice::Device* dev );
K3bDevice::Device* device() const { return m_device; }
- const QString& volumeIdentifier() const { return m_volumeIdentifier; }
+ const TQString& volumeIdentifier() const { return m_volumeIdentifier; }
unsigned int numTitles() const { return m_titles.count(); }
/**
@@ -78,14 +78,14 @@ namespace K3bVideoDVD
private:
K3bDevice::Device* m_device;
- QValueVector<Title> m_titles;
- QString m_volumeIdentifier;
+ TQValueVector<Title> m_titles;
+ TQString m_volumeIdentifier;
};
- LIBK3B_EXPORT QString audioFormatString( int format );
- LIBK3B_EXPORT QString audioCodeExtensionString( int ext );
- LIBK3B_EXPORT QString subPictureCodeModeString( int mode );
- LIBK3B_EXPORT QString subPictureCodeExtensionString( int ext );
+ LIBK3B_EXPORT TQString audioFormatString( int format );
+ LIBK3B_EXPORT TQString audioCodeExtensionString( int ext );
+ LIBK3B_EXPORT TQString subPictureCodeModeString( int mode );
+ LIBK3B_EXPORT TQString subPictureCodeExtensionString( int ext );
}
#endif
diff --git a/libk3b/videodvd/k3bvideodvdaudiostream.h b/libk3b/videodvd/k3bvideodvdaudiostream.h
index 78068f0..b5719f9 100644
--- a/libk3b/videodvd/k3bvideodvdaudiostream.h
+++ b/libk3b/videodvd/k3bvideodvdaudiostream.h
@@ -18,7 +18,7 @@
#include <k3b_export.h>
-#include <qstring.h>
+#include <tqstring.h>
namespace K3bVideoDVD
@@ -37,14 +37,14 @@ namespace K3bVideoDVD
};
enum AudioQuantization {
- AUDIO_QUANTIZATION_16BIT = 0,
- AUDIO_QUANTIZATION_20BIT = 1,
- AUDIO_QUANTIZATION_24BIT = 2
+ AUDIO_TQUANTIZATION_16BIT = 0,
+ AUDIO_TQUANTIZATION_20BIT = 1,
+ AUDIO_TQUANTIZATION_24BIT = 2
};
enum AudioSampleFrequency {
- AUDIO_SAMPLE_FREQ_48HZ = 0,
- AUDIO_SAMPLE_FREQ_96HZ = 1
+ AUDIO_SAMPLE_FRETQ_48HZ = 0,
+ AUDIO_SAMPLE_FRETQ_96HZ = 1
};
enum AudioCodeExtension {
@@ -64,7 +64,7 @@ namespace K3bVideoDVD
* \return A two chars language code or the empty string
* if the language is undefined.
*/
- const QString& langCode() const { return m_langCode; }
+ const TQString& langCode() const { return m_langCode; }
/**
* \see AudioFormat
@@ -103,7 +103,7 @@ namespace K3bVideoDVD
unsigned short m_codeExtension;
bool m_multiChannelExt;
unsigned short m_channels:3;
- QString m_langCode;
+ TQString m_langCode;
friend class VideoDVD;
};
diff --git a/libk3b/videodvd/k3bvideodvdsubpicturestream.h b/libk3b/videodvd/k3bvideodvdsubpicturestream.h
index b32407d..c9b6126 100644
--- a/libk3b/videodvd/k3bvideodvdsubpicturestream.h
+++ b/libk3b/videodvd/k3bvideodvdsubpicturestream.h
@@ -18,7 +18,7 @@
#include <k3b_export.h>
-#include <qstring.h>
+#include <tqstring.h>
namespace K3bVideoDVD
@@ -54,11 +54,11 @@ namespace K3bVideoDVD
* \return A two chars language code or the empty string
* if the language is undefined.
*/
- const QString& langCode() const { return m_langCode; }
+ const TQString& langCode() const { return m_langCode; }
private:
unsigned int m_codeMode:3;
- QString m_langCode;
+ TQString m_langCode;
unsigned int m_codeExtension;
friend class VideoDVD;
diff --git a/libk3b/videodvd/k3bvideodvdtime.cpp b/libk3b/videodvd/k3bvideodvdtime.cpp
index acc6aec..93840c5 100644
--- a/libk3b/videodvd/k3bvideodvdtime.cpp
+++ b/libk3b/videodvd/k3bvideodvdtime.cpp
@@ -76,19 +76,19 @@ double K3bVideoDVD::Time::frameRate() const
}
-QString K3bVideoDVD::Time::toString( bool includeFrames ) const
+TQString K3bVideoDVD::Time::toString( bool includeFrames ) const
{
// FIXME: use a d-pointer
const_cast<K3bVideoDVD::Time*>(this)->makeValid();
if( includeFrames )
- return QString().sprintf( "%02d:%02d:%02d.%02d",
+ return TQString().sprintf( "%02d:%02d:%02d.%02d",
m_hour,
m_minute,
m_second,
m_frame & 0x3f );
else
- return QString().sprintf( "%02d:%02d:%02d",
+ return TQString().sprintf( "%02d:%02d:%02d",
m_hour,
m_minute,
m_second + ( m_frame > 0 ? 1 : 0 ) );
diff --git a/libk3b/videodvd/k3bvideodvdtime.h b/libk3b/videodvd/k3bvideodvdtime.h
index f486741..5af771c 100644
--- a/libk3b/videodvd/k3bvideodvdtime.h
+++ b/libk3b/videodvd/k3bvideodvdtime.h
@@ -18,7 +18,7 @@
#include <k3b_export.h>
-#include <qstring.h>
+#include <tqstring.h>
/**
* This should not be confused with K3b::Msf
@@ -45,7 +45,7 @@ namespace K3bVideoDVD
// FIXME: is this useful?
double frameRate() const;
- QString toString( bool includeFrames = true ) const;
+ TQString toString( bool includeFrames = true ) const;
private:
void makeValid();
diff --git a/libk3b/videodvd/k3bvideodvdtitle.h b/libk3b/videodvd/k3bvideodvdtitle.h
index 17f31a3..4872c7b 100644
--- a/libk3b/videodvd/k3bvideodvdtitle.h
+++ b/libk3b/videodvd/k3bvideodvdtitle.h
@@ -24,7 +24,7 @@
#include <k3bvideodvdsubpicturestream.h>
#include <k3bvideodvdptt.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
namespace K3bVideoDVD
@@ -85,7 +85,7 @@ namespace K3bVideoDVD
/**
* \return A video capture
*/
- // QBitmap videoCapture( const Time& ) const;
+ // TQBitmap videoCapture( const Time& ) const;
private:
unsigned int m_titleNum;
@@ -98,10 +98,10 @@ namespace K3bVideoDVD
Time m_playbackTime;
VideoStream m_videoStream;
- QValueVector<AudioStream> m_audioStreams;
- QValueVector<SubPictureStream> m_subPictureStreams;
+ TQValueVector<AudioStream> m_audioStreams;
+ TQValueVector<SubPictureStream> m_subPictureStreams;
- QValueVector<PTT> m_ptts;
+ TQValueVector<PTT> m_ptts;
// VideoDVD* m_videoDVD;