summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:29:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:29:52 -0600
commitef5831dd5c8811c94c9b1bc1377a90174d17c82c (patch)
tree32b4c7307b74026be725950a33d6ec56d0561b3f
parentdb733144770616f45d2d6e89bd3c424538a9fd92 (diff)
downloadk3b-ef5831dd5c8811c94c9b1bc1377a90174d17c82c.tar.gz
k3b-ef5831dd5c8811c94c9b1bc1377a90174d17c82c.zip
Rename a number of old tq methods that are no longer tq specific
-rw-r--r--k3bsetup/base_k3bsetup2.ui12
-rw-r--r--k3bsetup/k3bsetup2.cpp8
-rw-r--r--kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp2
-rw-r--r--libk3b/cddb/k3bcddb.cpp2
-rw-r--r--libk3b/cddb/k3bcddbhttpquery.cpp6
-rw-r--r--libk3b/cddb/k3bcddblocalquery.cpp4
-rw-r--r--libk3b/cddb/k3bcddblocalsubmit.cpp4
-rw-r--r--libk3b/cddb/k3bcddbmultientriesdialog.cpp12
-rw-r--r--libk3b/cddb/k3bcddbpquery.cpp18
-rw-r--r--libk3b/cddb/k3bcddbpquery.h2
-rw-r--r--libk3b/cddb/k3bcddbquery.cpp8
-rw-r--r--libk3b/cddb/k3bcddbquery.h2
-rw-r--r--libk3b/core/k3bdefaultexternalprograms.cpp4
-rw-r--r--libk3b/core/k3bglobals.cpp4
-rw-r--r--libk3b/core/k3bjob.h2
-rw-r--r--libk3b/core/k3bprocess.cpp2
-rw-r--r--libk3b/core/k3bprogressinfoevent.h2
-rw-r--r--libk3b/core/k3bversion.cpp4
-rw-r--r--libk3b/jobs/k3baudiocuefilewritingjob.cpp8
-rw-r--r--libk3b/jobs/k3baudiosessionreadingjob.cpp6
-rw-r--r--libk3b/jobs/k3bbinimagewritingjob.cpp6
-rw-r--r--libk3b/jobs/k3bblankingjob.cpp6
-rw-r--r--libk3b/jobs/k3bcdcopyjob.cpp54
-rw-r--r--libk3b/jobs/k3bcdda2wavreader.cpp10
-rw-r--r--libk3b/jobs/k3bclonejob.cpp16
-rw-r--r--libk3b/jobs/k3bclonetocreader.cpp2
-rw-r--r--libk3b/jobs/k3bdatatrackreader.cpp42
-rw-r--r--libk3b/jobs/k3bdvdcopyjob.cpp34
-rw-r--r--libk3b/jobs/k3bdvdformattingjob.cpp24
-rw-r--r--libk3b/jobs/k3biso9660imagewritingjob.cpp14
-rw-r--r--libk3b/jobs/k3breadcdreader.cpp24
-rw-r--r--libk3b/jobs/k3bverificationjob.cpp6
-rw-r--r--libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp26
-rw-r--r--libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp54
-rw-r--r--libk3b/k3bimage.xsd6
-rw-r--r--libk3b/plugin/k3baudioserver.cpp4
-rw-r--r--libk3b/plugin/k3bpluginmanager.cpp4
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtracksource.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.cpp4
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.h2
-rw-r--r--libk3b/projects/audiocd/k3baudioimager.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudiojob.cpp24
-rw-r--r--libk3b/projects/audiocd/k3baudiojobtempdata.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.cpp14
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.cpp22
-rw-r--r--libk3b/projects/datacd/k3bdatajob.cpp24
-rw-r--r--libk3b/projects/datacd/k3bdatapreparationjob.cpp8
-rw-r--r--libk3b/projects/datacd/k3bdiritem.cpp36
-rw-r--r--libk3b/projects/datacd/k3bdiritem.h8
-rw-r--r--libk3b/projects/datacd/k3bisoimager.cpp34
-rw-r--r--libk3b/projects/datacd/k3bmkisofshandler.cpp6
-rw-r--r--libk3b/projects/datacd/k3bmsinfofetcher.cpp10
-rw-r--r--libk3b/projects/datadvd/k3bdvdbooktypejob.cpp10
-rw-r--r--libk3b/projects/datadvd/k3bdvdjob.cpp24
-rw-r--r--libk3b/projects/k3bcdrdaowriter.cpp58
-rw-r--r--libk3b/projects/k3bcdrecordwriter.cpp48
-rw-r--r--libk3b/projects/k3bcuefileparser.cpp2
-rw-r--r--libk3b/projects/k3bdvdrecordwriter.cpp8
-rw-r--r--libk3b/projects/k3bgrowisofshandler.cpp14
-rw-r--r--libk3b/projects/k3bgrowisofshandler.h2
-rw-r--r--libk3b/projects/k3bgrowisofswriter.cpp18
-rw-r--r--libk3b/projects/k3bimagefilereader.cpp2
-rw-r--r--libk3b/projects/k3binffilewriter.cpp6
-rw-r--r--libk3b/projects/k3binffilewriter.h2
-rw-r--r--libk3b/projects/k3btocfilewriter.cpp6
-rw-r--r--libk3b/projects/k3btocfilewriter.h2
-rw-r--r--libk3b/projects/mixedcd/k3bmixedjob.cpp48
-rw-r--r--libk3b/projects/movixcd/k3bmovixdoc.cpp2
-rw-r--r--libk3b/projects/movixcd/k3bmovixdocpreparer.cpp8
-rw-r--r--libk3b/projects/movixcd/k3bmovixjob.cpp6
-rw-r--r--libk3b/projects/movixcd/k3bmovixprogram.cpp2
-rw-r--r--libk3b/projects/movixdvd/k3bmovixdvdjob.cpp6
-rw-r--r--libk3b/projects/videocd/cdi/cdi_vcd.appbin102402 -> 102400 bytes
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.cpp14
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.h2
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.cpp58
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.cpp2
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.cpp20
-rw-r--r--libk3b/projects/videocd/k3bvcdxmlview.cpp48
-rw-r--r--libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp38
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdimager.cpp16
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdjob.cpp4
-rw-r--r--libk3b/tools/k3bbusywidget.cpp6
-rw-r--r--libk3b/tools/k3bbusywidget.h4
-rw-r--r--libk3b/tools/k3bcdparanoialib.h2
-rw-r--r--libk3b/tools/k3bcutcombobox.cpp14
-rw-r--r--libk3b/tools/k3bcutcombobox.h4
-rw-r--r--libk3b/tools/k3bdeviceselectiondialog.cpp2
-rw-r--r--libk3b/tools/k3blistview.cpp44
-rw-r--r--libk3b/tools/k3blistviewitemanimator.cpp2
-rw-r--r--libk3b/tools/k3bmd5job.cpp12
-rw-r--r--libk3b/tools/k3bmsfedit.cpp6
-rw-r--r--libk3b/tools/k3bmsfedit.h2
-rw-r--r--libk3b/tools/k3bmultichoicedialog.cpp2
-rw-r--r--libk3b/tools/k3bprogressdialog.cpp2
-rw-r--r--libk3b/tools/k3bpushbutton.cpp4
-rw-r--r--libk3b/tools/k3brichtextlabel.cpp12
-rw-r--r--libk3b/tools/k3brichtextlabel.h6
-rw-r--r--libk3b/tools/k3bstdguiitems.cpp2
-rw-r--r--libk3b/tools/k3btitlelabel.cpp20
-rw-r--r--libk3b/tools/k3btitlelabel.h8
-rw-r--r--libk3b/tools/k3btoolbox.cpp22
-rw-r--r--libk3b/tools/k3btoolbutton.cpp2
-rw-r--r--libk3b/tools/kcutlabel.cpp8
-rw-r--r--libk3b/tools/kcutlabel.h2
-rw-r--r--libk3b/videodvd/k3bvideodvd.cpp8
-rw-r--r--libk3bdevice/k3bcdtext.cpp24
-rw-r--r--libk3bdevice/k3bdevice.cpp32
-rw-r--r--libk3bdevice/k3bdevice.h2
-rw-r--r--libk3bdevice/k3bdevice_mmc.cpp2
-rw-r--r--libk3bdevice/k3bdevicemanager.cpp8
-rw-r--r--libk3bdevice/k3bmmc.h2
-rw-r--r--libk3bdevice/k3bscsicommand.cpp4
-rw-r--r--plugins/audiooutput/alsa/k3balsaoutputplugin.cpp22
-rw-r--r--plugins/decoder/flac/k3bflacdecoder.cpp4
-rw-r--r--plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp2
-rw-r--r--plugins/decoder/mp3/k3bmaddecoder.cpp4
-rw-r--r--plugins/decoder/ogg/k3boggvorbisdecoder.cpp8
-rw-r--r--plugins/decoder/wave/k3bwavedecoder.cpp4
-rw-r--r--plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui4
-rw-r--r--plugins/encoder/external/k3bexternalencoder.cpp4
-rw-r--r--plugins/encoder/external/k3bexternalencoderconfigwidget.cpp2
-rw-r--r--plugins/encoder/lame/base_k3blameencodersettingswidget.ui24
-rw-r--r--plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui6
-rw-r--r--plugins/encoder/lame/k3blameencoder.cpp22
-rw-r--r--plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui16
-rw-r--r--plugins/encoder/ogg/k3boggvorbisencoder.cpp4
-rw-r--r--plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui8
-rw-r--r--plugins/encoder/sox/k3bsoxencoder.cpp2
-rw-r--r--plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp10
-rw-r--r--src/fastscale/scale.cpp2
-rw-r--r--src/k3b.cpp44
-rw-r--r--src/k3b.h4
-rw-r--r--src/k3bappdevicemanager.cpp2
-rw-r--r--src/k3bapplication.cpp2
-rw-r--r--src/k3baudioplayer.cpp16
-rw-r--r--src/k3bburnprogressdialog.cpp12
-rw-r--r--src/k3bburnprogressdialog.h2
-rw-r--r--src/k3bcontentsview.cpp4
-rw-r--r--src/k3bdataprojectinterface.cpp4
-rw-r--r--src/k3bdataprojectinterface.h2
-rw-r--r--src/k3bdebuggingoutputdialog.cpp22
-rw-r--r--src/k3bdebuggingoutputfile.cpp14
-rw-r--r--src/k3bdirview.cpp18
-rw-r--r--src/k3bdiskinfoview.cpp36
-rw-r--r--src/k3bemptydiscwaiter.cpp84
-rw-r--r--src/k3bfiletreecombobox.cpp22
-rw-r--r--src/k3bfiletreeview.cpp24
-rw-r--r--src/k3bfileview.cpp12
-rw-r--r--src/k3bfirstrun.cpp2
-rw-r--r--src/k3bflatbutton.cpp4
-rw-r--r--src/k3bflatbutton.h2
-rw-r--r--src/k3binteractiondialog.cpp36
-rw-r--r--src/k3binteractiondialog.h2
-rw-r--r--src/k3bjobinterface.cpp2
-rw-r--r--src/k3bjobprogressdialog.cpp62
-rw-r--r--src/k3bjobprogressdialog.h2
-rw-r--r--src/k3blsofwrapperdialog.cpp6
-rw-r--r--src/k3bmediacontentsview.cpp2
-rw-r--r--src/k3bmediaselectioncombobox.cpp14
-rw-r--r--src/k3bmediaselectiondialog.cpp2
-rw-r--r--src/k3bmedium.cpp40
-rw-r--r--src/k3bminibutton.cpp10
-rw-r--r--src/k3bpassivepopup.cpp6
-rw-r--r--src/k3bprojectmanager.cpp18
-rw-r--r--src/k3bsidepanel.cpp8
-rw-r--r--src/k3bsplash.cpp10
-rw-r--r--src/k3bstatusbarmanager.cpp16
-rw-r--r--src/k3bsystemproblemdialog.cpp78
-rw-r--r--src/k3btempdirselectionwidget.cpp10
-rw-r--r--src/k3bthemedheader.cpp20
-rw-r--r--src/k3bthemedheader.h2
-rw-r--r--src/k3btimeoutwidget.cpp8
-rw-r--r--src/k3btimeoutwidget.h4
-rw-r--r--src/k3bwelcomewidget.cpp14
-rw-r--r--src/k3bwelcomewidget.h2
-rw-r--r--src/k3bwidgetshoweffect.cpp2
-rw-r--r--src/k3bwriterselectionwidget.cpp14
-rw-r--r--src/misc/k3bblankingdialog.cpp10
-rw-r--r--src/misc/k3bcdcopydialog.cpp6
-rw-r--r--src/misc/k3bcdimagewritingdialog.cpp64
-rw-r--r--src/misc/k3bdvdcopydialog.cpp4
-rw-r--r--src/misc/k3bdvdformattingdialog.cpp12
-rw-r--r--src/misc/k3bisoimagewritingdialog.cpp30
-rw-r--r--src/option/base_k3bcddboptiontab.ui6
-rw-r--r--src/option/base_k3bmiscoptiontab.ui8
-rw-r--r--src/option/base_k3bpluginoptiontab.ui2
-rw-r--r--src/option/base_k3bthemeoptiontab.ui8
-rw-r--r--src/option/k3bburningoptiontab.cpp10
-rw-r--r--src/option/k3bcddboptiontab.cpp16
-rw-r--r--src/option/k3bdeviceoptiontab.cpp4
-rw-r--r--src/option/k3bdevicewidget.cpp40
-rw-r--r--src/option/k3bexternalbinoptiontab.cpp4
-rw-r--r--src/option/k3bexternalbinwidget.cpp2
-rw-r--r--src/option/k3bmiscoptiontab.cpp6
-rw-r--r--src/option/k3bnotifyoptiontab.cpp2
-rw-r--r--src/option/k3boptiondialog.cpp2
-rw-r--r--src/option/k3bthemeoptiontab.cpp2
-rw-r--r--src/projects/base_k3badvanceddataimagesettings.ui2
-rw-r--r--src/projects/base_k3baudiocdtextallfieldswidget.ui10
-rw-r--r--src/projects/base_k3baudiocdtextwidget.ui10
-rw-r--r--src/projects/base_k3baudiotrackwidget.ui10
-rw-r--r--src/projects/base_k3bbootimageview.ui10
-rw-r--r--src/projects/base_k3bdataimagesettings.ui4
-rw-r--r--src/projects/base_k3bdatavolumedescwidget.ui12
-rw-r--r--src/projects/base_k3bmovixoptionswidget.ui6
-rw-r--r--src/projects/k3baudioburndialog.cpp4
-rw-r--r--src/projects/k3baudiocdtextwidget.cpp2
-rw-r--r--src/projects/k3baudiodatasourceeditwidget.cpp6
-rw-r--r--src/projects/k3baudiodatasourceviewitem.cpp4
-rw-r--r--src/projects/k3baudioeditorwidget.cpp44
-rw-r--r--src/projects/k3baudioeditorwidget.h4
-rw-r--r--src/projects/k3baudiotrackaddingdialog.cpp24
-rw-r--r--src/projects/k3baudiotrackdialog.cpp4
-rw-r--r--src/projects/k3baudiotrackplayer.cpp6
-rw-r--r--src/projects/k3baudiotracksplitdialog.cpp22
-rw-r--r--src/projects/k3baudiotracktrmlookupdialog.cpp4
-rw-r--r--src/projects/k3baudiotrackview.cpp4
-rw-r--r--src/projects/k3baudiotrackviewitem.cpp4
-rw-r--r--src/projects/k3baudioview.cpp2
-rw-r--r--src/projects/k3bbootimageview.cpp2
-rw-r--r--src/projects/k3bdataadvancedimagesettingswidget.cpp10
-rw-r--r--src/projects/k3bdataburndialog.cpp6
-rw-r--r--src/projects/k3bdatadirtreeview.cpp8
-rw-r--r--src/projects/k3bdatafileview.cpp2
-rw-r--r--src/projects/k3bdataimagesettingswidget.cpp8
-rw-r--r--src/projects/k3bdatapropertiesdialog.cpp10
-rw-r--r--src/projects/k3bdataurladdingdialog.cpp56
-rw-r--r--src/projects/k3bdataview.cpp2
-rw-r--r--src/projects/k3bdataviewitem.cpp8
-rw-r--r--src/projects/k3bdvdburndialog.cpp6
-rw-r--r--src/projects/k3bencodingconverter.cpp2
-rw-r--r--src/projects/k3bfillstatusdisplay.cpp54
-rw-r--r--src/projects/k3bfillstatusdisplay.h4
-rw-r--r--src/projects/k3bmixedburndialog.cpp4
-rw-r--r--src/projects/k3bmixeddirtreeview.cpp4
-rw-r--r--src/projects/k3bmixedview.cpp2
-rw-r--r--src/projects/k3bmovixburndialog.cpp6
-rw-r--r--src/projects/k3bmovixdvdburndialog.cpp6
-rw-r--r--src/projects/k3bmovixlistview.cpp4
-rw-r--r--src/projects/k3bmovixview.cpp2
-rw-r--r--src/projects/k3bmusicbrainzjob.cpp10
-rw-r--r--src/projects/k3bprojectburndialog.cpp12
-rw-r--r--src/projects/k3bvcdburndialog.cpp36
-rw-r--r--src/projects/k3bvcdlistview.cpp2
-rw-r--r--src/projects/k3bvcdtrackdialog.cpp60
-rw-r--r--src/projects/k3bvcdview.cpp2
-rw-r--r--src/projects/k3bvideodvdburndialog.cpp6
-rw-r--r--src/projects/k3bview.cpp4
-rw-r--r--src/rip/base_k3baudiorippingoptionwidget.ui12
-rw-r--r--src/rip/base_k3bcddbpatternwidget.ui10
-rw-r--r--src/rip/k3baudiocdview.cpp20
-rw-r--r--src/rip/k3baudioprojectconvertingdialog.cpp4
-rw-r--r--src/rip/k3baudioprojectconvertingthread.cpp38
-rw-r--r--src/rip/k3baudiorippingdialog.cpp6
-rw-r--r--src/rip/k3baudioripthread.cpp44
-rw-r--r--src/rip/k3bcddbpatternwidget.cpp6
-rw-r--r--src/rip/k3bcuefilewriter.cpp4
-rw-r--r--src/rip/k3bcuefilewriter.h2
-rw-r--r--src/rip/k3bpatternparser.cpp8
-rw-r--r--src/rip/k3bvideocdinfo.cpp2
-rw-r--r--src/rip/k3bvideocdrip.cpp34
-rw-r--r--src/rip/k3bvideocdrippingdialog.cpp22
-rw-r--r--src/rip/k3bvideocdview.cpp14
-rw-r--r--src/rip/videodvd/base_k3bvideodvdrippingwidget.ui28
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp34
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingjob.cpp16
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingpreview.cpp4
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp34
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingview.cpp6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.cpp14
272 files changed, 1702 insertions, 1702 deletions
diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui
index 6fe902c..25df4e2 100644
--- a/k3bsetup/base_k3bsetup2.ui
+++ b/k3bsetup/base_k3bsetup2.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -73,7 +73,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -186,7 +186,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -202,7 +202,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp
index b88a9db..5414d2e 100644
--- a/k3bsetup/k3bsetup2.cpp
+++ b/k3bsetup/k3bsetup2.cpp
@@ -15,7 +15,7 @@
#include <config.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmap.h>
#include <tqfile.h>
#include <tqfileinfo.h>
@@ -260,7 +260,7 @@ void K3bSetup2::updatePrograms()
if( perm != wantedPerm ||
fi.owner() != "root" ||
fi.group() != wantedGroup ) {
- bi->setText( 4, TQString("%1 root.%2").tqarg(wantedPerm,0,8).tqarg(wantedGroup) );
+ bi->setText( 4, TQString("%1 root.%2").arg(wantedPerm,0,8).arg(wantedGroup) );
if( bi->isOn() )
d->changesNeeded = true;
}
@@ -405,7 +405,7 @@ void K3bSetup2::save()
// TODO: create the group if it's not there
g = getgrnam( burningGroup().local8Bit() );
if( !g ) {
- KMessageBox::error( this, i18n("There is no group %1.").tqarg(burningGroup()) );
+ KMessageBox::error( this, i18n("There is no group %1.").arg(burningGroup()) );
return;
}
}
@@ -536,7 +536,7 @@ void K3bSetup2::slotAddDevice()
emit changed( d->changesNeeded );
}
else
- KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename),
+ KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename),
i18n("Error"), false );
}
}
diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp
index 953f0e7..68a5027 100644
--- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp
+++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp
@@ -24,7 +24,7 @@
#include <kgenericfactory.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdom.h>
#include <tqfile.h>
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index 416ab10..78767c2 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -187,7 +187,7 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s )
}
m_httpQuery->setServer( server, port );
- m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::tqfromLatin1("/~cddb/cddb.cgi") );
+ m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::fromLatin1("/~cddb/cddb.cgi") );
return m_httpQuery;
}
diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp
index f3b9152..45af445 100644
--- a/libk3b/cddb/k3bcddbhttpquery.cpp
+++ b/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -21,7 +21,7 @@
#include <tqstringlist.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klocale.h>
#include <kdebug.h>
@@ -58,7 +58,7 @@ void K3bCddbHttpQuery::doMatchQuery()
m_state = READ;
m_parsingBuffer.truncate(0);
- performCommand( TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ) );
+ performCommand( TQString( "cddb read %1 %2").arg( header().category ).arg( header().discid ) );
}
@@ -82,7 +82,7 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd )
if( !job ) {
setError( CONNECTION_ERROR );
- emit infoMessage( i18n("Could not connect to host %1").tqarg(m_server) );
+ emit infoMessage( i18n("Could not connect to host %1").arg(m_server) );
emitQueryFinished();
return;
}
diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp
index 1c247dd..96ce176 100644
--- a/libk3b/cddb/k3bcddblocalquery.cpp
+++ b/libk3b/cddb/k3bcddblocalquery.cpp
@@ -18,7 +18,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kapplication.h>
#include <klocale.h>
@@ -38,7 +38,7 @@ K3bCddbLocalQuery::~K3bCddbLocalQuery()
void K3bCddbLocalQuery::doQuery()
{
- emit infoMessage( i18n("Searching entry in %1").tqarg( m_cddbDir ) );
+ emit infoMessage( i18n("Searching entry in %1").arg( m_cddbDir ) );
kapp->processEvents(); //BAD!
TQString path = preparePath( m_cddbDir );
diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp
index 3c401b1..294e413 100644
--- a/libk3b/cddb/k3bcddblocalsubmit.cpp
+++ b/libk3b/cddb/k3bcddblocalsubmit.cpp
@@ -19,7 +19,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
#include <klocale.h>
@@ -94,7 +94,7 @@ void K3bCddbLocalSubmit::doSubmit()
else {
kdDebug() << "(K3bCddbLocalSubmit) could not find directory: " << path << endl;
setError( IO_ERROR );
- emit infoMessage( i18n("Could not find directory: %1").tqarg(path) );
+ emit infoMessage( i18n("Could not find directory: %1").arg(path) );
emit submitFinished( this );
}
}
diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
index f8746b7..0e7a5bc 100644
--- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp
+++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
@@ -16,7 +16,7 @@
#include "k3bcddbmultientriesdialog.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
#include <tqlabel.h>
@@ -29,13 +29,13 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const ch
: KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name )
{
TQFrame* frame = plainPage();
- TQVBoxLayout* tqlayout = new TQVBoxLayout( frame );
- tqlayout->setAutoAdd( true );
- tqlayout->setSpacing( spacingHint() );
- tqlayout->setMargin( 0 );
+ TQVBoxLayout* layout = new TQVBoxLayout( frame );
+ layout->setAutoAdd( true );
+ layout->setSpacing( spacingHint() );
+ layout->setMargin( 0 );
TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame );
- infoLabel->tqsetAlignment( WordBreak );
+ infoLabel->setAlignment( WordBreak );
m_listBox = new KListBox( frame, "list_box");
diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp
index bcd75be..74d318c 100644
--- a/libk3b/cddb/k3bcddbpquery.cpp
+++ b/libk3b/cddb/k3bcddbpquery.cpp
@@ -17,7 +17,7 @@
#include <tqstringlist.h>
#include <tqsocket.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klocale.h>
#include <kdebug.h>
@@ -54,7 +54,7 @@ void K3bCddbpQuery::doQuery()
// connect to the server
m_socket->connectToHost( m_server, m_port );
- emit infoMessage( i18n("Searching %1 on port %2").tqarg(m_server).tqarg(m_port) );
+ emit infoMessage( i18n("Searching %1 on port %2").arg(m_server).arg(m_port) );
}
@@ -63,7 +63,7 @@ void K3bCddbpQuery::doMatchQuery()
// we should still be connected
// TODO: check this
- TQString read = TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid );
+ TQString read = TQString( "cddb read %1 %2").arg( header().category ).arg( header().discid );
m_state = READ;
m_parsingBuffer = "";
@@ -258,16 +258,16 @@ void K3bCddbpQuery::slotError( int e )
{
switch(e) {
case TQSocket::ErrConnectionRefused:
- kdDebug() << i18n("Connection to %1 refused").tqarg( m_server ) << endl;
- emit infoMessage( i18n("Connection to %1 refused").tqarg( m_server ) );
+ kdDebug() << i18n("Connection to %1 refused").arg( m_server ) << endl;
+ emit infoMessage( i18n("Connection to %1 refused").arg( m_server ) );
break;
case TQSocket::ErrHostNotFound:
- kdDebug() << i18n("Could not find host %1").tqarg( m_server ) << endl;
- emit infoMessage( i18n("Could not find host %1").tqarg( m_server ) );
+ kdDebug() << i18n("Could not find host %1").arg( m_server ) << endl;
+ emit infoMessage( i18n("Could not find host %1").arg( m_server ) );
break;
case TQSocket::ErrSocketRead:
- kdDebug() << i18n("Error while reading from %1").tqarg( m_server ) << endl;
- emit infoMessage( i18n("Error while reading from %1").tqarg( m_server ) );
+ kdDebug() << i18n("Error while reading from %1").arg( m_server ) << endl;
+ emit infoMessage( i18n("Error while reading from %1").arg( m_server ) );
break;
}
diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h
index d0a12bc..2a9b87b 100644
--- a/libk3b/cddb/k3bcddbpquery.h
+++ b/libk3b/cddb/k3bcddbpquery.h
@@ -21,7 +21,7 @@
#include <tqstring.h>
#include <tqvaluelist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
class TQSocket;
diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp
index e4ccc75..ffd4e20 100644
--- a/libk3b/cddb/k3bcddbquery.cpp
+++ b/libk3b/cddb/k3bcddbquery.cpp
@@ -25,7 +25,7 @@
#include <klocale.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstringlist.h>
#include <tqregexp.h>
#include <tqtimer.h>
@@ -226,7 +226,7 @@ TQString K3bCddbQuery::handshakeString() const
if( host.isEmpty() )
host = "kde-host";
- return TQString("%1 %2 K3b %3").tqarg(user).tqarg(host).tqarg(kapp->aboutData()->version());
+ return TQString("%1 %2 K3b %3").arg(user).arg(host).arg(kapp->aboutData()->version());
}
@@ -238,10 +238,10 @@ TQString K3bCddbQuery::queryString() const
+ TQString::number( (unsigned int)m_toc.count() );
for( K3bDevice::Toc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) {
- query.append( TQString( " %1" ).tqarg( (*it).firstSector().lba() ) );
+ query.append( TQString( " %1" ).arg( (*it).firstSector().lba() ) );
}
- query.append( TQString( " %1" ).tqarg( m_toc.length().lba() / 75 ) );
+ query.append( TQString( " %1" ).arg( m_toc.length().lba() / 75 ) );
return query;
}
diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h
index 6d75262..3d81383 100644
--- a/libk3b/cddb/k3bcddbquery.h
+++ b/libk3b/cddb/k3bcddbquery.h
@@ -19,7 +19,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "k3bcddbresult.h"
diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp
index 12e149d..33a256c 100644
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
@@ -23,7 +23,7 @@
#include <tqfileinfo.h>
#include <tqobject.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <k3bprocess.h>
#include <kdebug.h>
@@ -186,7 +186,7 @@ bool K3bCdrecordProgram::scan( const TQString& p )
endPos = out.output().find( "\n", pos );
// cdrecord does not use local encoding for the copyright statement but plain latin1
- bin->copyright = TQString::tqfromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace();
+ bin->copyright = TQString::fromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace();
}
else {
kdDebug() << "(K3bCdrecordProgram) could not start " << path << endl;
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index be9a7a1..c01e289 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -169,7 +169,7 @@ TQString K3b::findUniqueFilePrefix( const TQString& _prefix, const TQString& pat
TQString K3b::findTempFile( const TQString& ending, const TQString& d )
{
- return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::tqfromLatin1(".") + ending) );
+ return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::fromLatin1(".") + ending) );
}
@@ -387,7 +387,7 @@ TQString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExter
else if( (plainAtapiSupport() && bin->hasFeature("plain-atapi") ) )
return dev->blockDeviceName();
else
- return TQString("ATAPI:%1").tqarg(dev->blockDeviceName());
+ return TQString("ATAPI:%1").arg(dev->blockDeviceName());
}
diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h
index cbb4758..a5a738f 100644
--- a/libk3b/core/k3bjob.h
+++ b/libk3b/core/k3bjob.h
@@ -285,7 +285,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob
void setWritingApp( int w ) { m_writeMethod = w; }
signals:
- void buffertqStatus( int );
+ void bufferStatus( int );
void deviceBuffer( int );
diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp
index ca8d2e0..c46fd0a 100644
--- a/libk3b/core/k3bprocess.cpp
+++ b/libk3b/core/k3bprocess.cpp
@@ -192,7 +192,7 @@ TQStringList K3bProcess::splitOutput( char* data, int len,
// check if line ends with a newline
// if not save the last line because it is not finished
TQChar c = buffer.right(1).at(0);
- bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is tqunicode 46?? It is printed as a point
+ bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is unicode 46?? It is printed as a point
if( hasUnfinishedLine ) {
kdDebug() << "(K3bProcess) found unfinished line: '" << lines.last() << "'" << endl;
kdDebug() << "(K3bProcess) last char: '" << buffer.right(1) << "'" << endl;
diff --git a/libk3b/core/k3bprogressinfoevent.h b/libk3b/core/k3bprogressinfoevent.h
index 78e17a2..3e0b67e 100644
--- a/libk3b/core/k3bprogressinfoevent.h
+++ b/libk3b/core/k3bprogressinfoevent.h
@@ -69,7 +69,7 @@ class K3bProgressInfoEvent : public TQCustomEvent
NewTask,
NewSubTask,
DebuggingOutput,
- BuffertqStatus,
+ BufferStatus,
WriteSpeed,
NextTrack
};
diff --git a/libk3b/core/k3bversion.cpp b/libk3b/core/k3bversion.cpp
index 0eb6f19..cc91dd5 100644
--- a/libk3b/core/k3bversion.cpp
+++ b/libk3b/core/k3bversion.cpp
@@ -157,9 +157,9 @@ TQString K3bVersion::createVersionString( int majorVersion,
TQString s = TQString::number(majorVersion);
if( minorVersion > -1 ) {
- s.append( TQString(".%1").tqarg(minorVersion) );
+ s.append( TQString(".%1").arg(minorVersion) );
if( patchlevel > -1 )
- s.append( TQString(".%1").tqarg(patchlevel) );
+ s.append( TQString(".%1").arg(patchlevel) );
}
if( !suffix.isNull() )
diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
index d66b529..c0c07d5 100644
--- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp
+++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
@@ -76,7 +76,7 @@ K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObjec
connect( m_audioJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_audioJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_audioJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) );
- connect( m_audioJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_audioJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_audioJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
@@ -252,19 +252,19 @@ void K3bAudioCueFileWritingJob::importCueInProject()
// now analyze the source
emit newTask( i18n("Analysing the audio file") );
- emit newSubTask( i18n("Analysing %1").tqarg( parser.imageFilename() ) );
+ emit newSubTask( i18n("Analysing %1").arg( parser.imageFilename() ) );
// start the analyser thread
m_analyserThread->setDecoder( m_decoder );
m_analyserJob->start();
}
else {
- emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").tqarg( m_cueFile ), ERROR );
+ emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").arg( m_cueFile ), ERROR );
jobFinished(false);
}
}
else {
- emit infoMessage( i18n("No valid audio cue file: '%1'").tqarg( m_cueFile ), ERROR );
+ emit infoMessage( i18n("No valid audio cue file: '%1'").arg( m_cueFile ), ERROR );
jobFinished(false);
}
}
diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp
index 1946415..f85e138 100644
--- a/libk3b/jobs/k3baudiosessionreadingjob.cpp
+++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp
@@ -93,7 +93,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
toc = device->readToc();
if( !paranoia->initParanoia( device, toc ) ) {
- emitInfoMessage( i18n("Could not open device %1").tqarg(device->blockDeviceName()),
+ emitInfoMessage( i18n("Could not open device %1").arg(device->blockDeviceName()),
K3bJob::ERROR );
emitFinished(false);
return;
@@ -154,7 +154,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
}
if( !waveFileWriter->open( filenames[currentTrack-1] ) ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filenames[currentTrack-1]), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filenames[currentTrack-1]), K3bJob::ERROR );
writeError = true;
break;
}
@@ -188,7 +188,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
device->block( false );
if( status != K3bCdparanoiaLib::S_OK ) {
- emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(trackNum), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(trackNum), K3bJob::ERROR );
emitFinished(false);
return;
}
diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp
index 2fd0b60..50bac83 100644
--- a/libk3b/jobs/k3bbinimagewritingjob.cpp
+++ b/libk3b/jobs/k3bbinimagewritingjob.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
@@ -148,7 +148,7 @@ bool K3bBinImageWritingJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(copyPercent(int)) );
connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(copySubPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
- connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(writerFinished(bool)) );
@@ -207,7 +207,7 @@ void K3bBinImageWritingJob::writerFinished(bool ok)
void K3bBinImageWritingJob::slotNextTrack( int t, int tt )
{
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) );
}
diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp
index 5781b2b..aeab621 100644
--- a/libk3b/jobs/k3bblankingjob.cpp
+++ b/libk3b/jobs/k3bblankingjob.cpp
@@ -131,9 +131,9 @@ void K3bBlankingJob::slotStartErasing()
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
K3bDevice::MEDIA_CD_RW,
i18n("Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(m_device->vendor())
- .tqarg(m_device->description())
- .tqarg(m_device->devicename()) ) < 0 ) {
+ .arg(m_device->vendor())
+ .arg(m_device->description())
+ .arg(m_device->devicename()) ) < 0 ) {
emit canceled();
jobFinished(false);
return;
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index 9a266bf..308da22 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -46,7 +46,7 @@
#include <tqstringlist.h>
#include <tqfile.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcstring.h>
#include <tqfileinfo.h>
#include <tqdir.h>
@@ -313,7 +313,7 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
unsigned long avail, size;
TQString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR );
+ emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
d->error = true;
canCopy = false;
}
@@ -379,7 +379,7 @@ void K3bCdCopyJob::slotCdTextReady( K3bDevice::DeviceHandler* dh )
if( dh->success() ) {
if( K3bDevice::CdText::checkCrc( dh->cdTextRaw() ) ) {
K3bDevice::CdText cdt( dh->cdTextRaw() );
- emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").tqarg(cdt.performer()).tqarg(cdt.title()), SUCCESS );
+ emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").arg(cdt.performer()).arg(cdt.title()), SUCCESS );
d->haveCdText = true;
d->cdTextRaw = dh->cdTextRaw();
}
@@ -429,7 +429,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error )
d->cddbInfo = d->cddb->result();
d->haveCddb = true;
- emit infoMessage( i18n("Found Cddb entry (%1 - %2).").tqarg(d->cddbInfo.cdArtist).tqarg(d->cddbInfo.cdTitle), SUCCESS );
+ emit infoMessage( i18n("Found Cddb entry (%1 - %2).").arg(d->cddbInfo.cdArtist).arg(d->cddbInfo.cdTitle), SUCCESS );
// save the entry locally
KConfig* c = k3bcore->config();
@@ -441,7 +441,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error )
emit infoMessage( i18n("No Cddb entry found."), WARNING );
}
else {
- emit infoMessage( i18n("Cddb error (%1).").tqarg(d->cddb->errorString()), ERROR );
+ emit infoMessage( i18n("Cddb error (%1).").arg(d->cddb->errorString()), ERROR );
}
startCopy();
@@ -524,24 +524,24 @@ bool K3bCdCopyJob::prepareImageFiles()
m_tempPath = K3b::findUniqueFilePrefix( "k3bCdCopy", m_tempPath );
kdDebug() << "(K3bCdCopyJob) creating temp dir: " << m_tempPath << endl;
if( !dir.mkdir( m_tempPath, true ) ) {
- emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(m_tempPath), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(m_tempPath), ERROR );
return false;
}
d->deleteTempDir = true;
}
m_tempPath = K3b::prepareDir( m_tempPath );
- emit infoMessage( i18n("Using temporary directory %1.").tqarg(m_tempPath), INFO );
+ emit infoMessage( i18n("Using temporary directory %1.").arg(m_tempPath), INFO );
// create temp filenames
int i = 1;
for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) {
if( (*it).type() == K3bDevice::Track::AUDIO ) {
- d->imageNames.append( m_tempPath + TQString("Track%1.wav").tqarg(TQString::number(i).rightJustify(2, '0')) );
- d->infNames.append( m_tempPath + TQString("Track%1.inf").tqarg(TQString::number(i).rightJustify(2, '0')) );
+ d->imageNames.append( m_tempPath + TQString("Track%1.wav").arg(TQString::number(i).rightJustify(2, '0')) );
+ d->infNames.append( m_tempPath + TQString("Track%1.inf").arg(TQString::number(i).rightJustify(2, '0')) );
}
else
- d->imageNames.append( m_tempPath + TQString("Track%1.iso").tqarg(TQString::number(i).rightJustify(2, '0')) );
+ d->imageNames.append( m_tempPath + TQString("Track%1.iso").arg(TQString::number(i).rightJustify(2, '0')) );
++i;
}
@@ -554,7 +554,7 @@ bool K3bCdCopyJob::prepareImageFiles()
else {
// we only need a single image file
if( !fi.isFile() ||
- questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_tempPath),
+ questionYesNo( i18n("Do you want to overwrite %1?").arg(m_tempPath),
i18n("File Exists") ) ) {
if( fi.isDir() )
m_tempPath = K3b::findTempFile( "iso", m_tempPath );
@@ -564,7 +564,7 @@ bool K3bCdCopyJob::prepareImageFiles()
}
// else the user specified a file in an existing dir
- emit infoMessage( i18n("Writing image file to %1.").tqarg(m_tempPath), INFO );
+ emit infoMessage( i18n("Writing image file to %1.").arg(m_tempPath), INFO );
}
else
return false;
@@ -580,12 +580,12 @@ void K3bCdCopyJob::readNextSession()
{
if( !m_onTheFly || m_onlyCreateImages ) {
if( d->numSessions > 1 )
- emit newTask( i18n("Reading Session %1").tqarg(d->currentReadSession) );
+ emit newTask( i18n("Reading Session %1").arg(d->currentReadSession) );
else
emit newTask( i18n("Reading Source Medium") );
if( d->currentReadSession == 1 )
- emit newSubTask( i18n("Reading track %1 of %2").tqarg(1).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Reading track %1 of %2").arg(1).arg(d->toc.count()) );
}
// there is only one situation where we need the audiosessionreader:
@@ -677,17 +677,17 @@ bool K3bCdCopyJob::writeNextSession()
// we emit our own task since the cdrecord task is way too simple
if( d->numSessions > 1 ) {
if( m_simulate )
- emit newTask( i18n("Simulating Session %1").tqarg(d->currentWrittenSession) );
+ emit newTask( i18n("Simulating Session %1").arg(d->currentWrittenSession) );
else if( m_copies > 1 )
- emit newTask( i18n("Writing Copy %1 (Session %2)").tqarg(d->doneCopies+1).tqarg(d->currentWrittenSession) );
+ emit newTask( i18n("Writing Copy %1 (Session %2)").arg(d->doneCopies+1).arg(d->currentWrittenSession) );
else
- emit newTask( i18n("Writing Copy (Session %2)").tqarg(d->currentWrittenSession) );
+ emit newTask( i18n("Writing Copy (Session %2)").arg(d->currentWrittenSession) );
}
else {
if( m_simulate )
emit newTask( i18n("Simulating") );
else if( m_copies > 1 )
- emit newTask( i18n("Writing Copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing Copy %1").arg(d->doneCopies+1) );
else
emit newTask( i18n("Writing Copy") );
}
@@ -713,7 +713,7 @@ bool K3bCdCopyJob::writeNextSession()
connect( d->cdrecordWriter, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWritingNextTrack(int, int)) );
- connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -923,7 +923,7 @@ bool K3bCdCopyJob::writeNextSession()
trackLen = trackLen * 2056; // see k3bdatatrackreader.h
else
trackLen = trackLen * 2332; // see k3bdatatrackreader.h
- d->cdrecordWriter->addArgument( TQString("-tsize=%1").tqarg(trackLen) )->addArgument("-");
+ d->cdrecordWriter->addArgument( TQString("-tsize=%1").arg(trackLen) )->addArgument("-");
}
else if( d->toc.contentType() == K3bDevice::MIXED )
d->cdrecordWriter->addArgument( d->imageNames[d->toc.count()-1] );
@@ -953,7 +953,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success )
if( success ) {
if( d->numSessions > 1 )
- emit infoMessage( i18n("Successfully read session %1.").tqarg(d->currentReadSession), SUCCESS );
+ emit infoMessage( i18n("Successfully read session %1.").arg(d->currentReadSession), SUCCESS );
else
emit infoMessage( i18n("Successfully read source disk."), SUCCESS );
@@ -987,7 +987,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success )
}
else {
if( !d->canceled ) {
- emit infoMessage( i18n("Error while reading session %1.").tqarg(d->currentReadSession), ERROR );
+ emit infoMessage( i18n("Error while reading session %1.").arg(d->currentReadSession), ERROR );
if( m_onTheFly )
d->cdrecordWriter->setSourceUnreadable(true);
}
@@ -1137,14 +1137,14 @@ void K3bCdCopyJob::slotWritingNextTrack( int t, int tt )
{
if( d->toc.contentType() == K3bDevice::MIXED ) {
if( d->currentWrittenSession == 1 )
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(d->toc.count()) );
else
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->toc.count()).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(d->toc.count()).arg(d->toc.count()) );
}
else if( d->numSessions > 1 )
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->currentWrittenSession).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(d->currentWrittenSession).arg(d->toc.count()) );
else
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) );
}
@@ -1159,7 +1159,7 @@ void K3bCdCopyJob::slotReadingNextTrack( int t, int )
else
track = d->currentReadSession;
- emit newSubTask( i18n("Reading track %1 of %2").tqarg(track).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Reading track %1 of %2").arg(track).arg(d->toc.count()) );
}
}
diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp
index 5202fc4..cab71b9 100644
--- a/libk3b/jobs/k3bcdda2wavreader.cpp
+++ b/libk3b/jobs/k3bcdda2wavreader.cpp
@@ -95,7 +95,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
d->cdda2wavBin = k3bcore->externalBinManager()->binObject( "cdda2wav" );
if( !d->cdda2wavBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdda2wav"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("cdda2wav"), ERROR );
jobFinished(false);
d->running = false;
return;
@@ -115,7 +115,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
*d->process << d->cdda2wavBin->path;
*d->process << "-vall" << ( d->cdda2wavBin->hasFeature( "gui" ) ? "-gui" : "-g" );
if( d->cdda2wavBin->hasFeature( "dev" ) )
- *d->process << TQString("dev=%1").tqarg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin));
+ *d->process << TQString("dev=%1").arg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin));
else
*d->process << "-D" << K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin);
*d->process << ( d->cdda2wavBin->hasFeature( "bulk" ) ? "-bulk" : "-B" );
@@ -134,7 +134,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bCdda2wavReader) could not start cdda2wav" << endl;
- emit infoMessage( i18n("Could not start %1.").tqarg("cdda2wav"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg("cdda2wav"), K3bJob::ERROR );
d->running = false;
jobFinished(false);
}
@@ -240,12 +240,12 @@ void K3bCdda2wavReader::slotProcessExited( KProcess* p )
}
else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .tqarg("Cdda2wav").tqarg(p->exitStatus()), ERROR );
+ .arg("Cdda2wav").arg(p->exitStatus()), ERROR );
jobFinished( false );
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Cdda2wav"),
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg("Cdda2wav"),
ERROR );
jobFinished( false );
}
diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp
index f8ce4f7..d11ebaa 100644
--- a/libk3b/jobs/k3bclonejob.cpp
+++ b/libk3b/jobs/k3bclonejob.cpp
@@ -85,13 +85,13 @@ void K3bCloneJob::start()
//
const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" );
if( !cdrecordBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR );
jobFinished(false);
m_running = false;
return;
}
else if( !cdrecordBin->hasFeature( "clone" ) ) {
- emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").tqarg(cdrecordBin->version), ERROR );
+ emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").arg(cdrecordBin->version), ERROR );
jobFinished(false);
m_running = false;
return;
@@ -109,8 +109,8 @@ void K3bCloneJob::start()
if( !writer()->supportsWritingMode( K3bDevice::RAW_R96R ) &&
!writer()->supportsWritingMode( K3bDevice::RAW_R16 ) ) {
emit infoMessage( i18n("CD writer %1 does not support cloning.")
- .tqarg(writer()->vendor())
- .tqarg(writer()->description()), ERROR );
+ .arg(writer()->vendor())
+ .arg(writer()->description()), ERROR );
m_running = false;
jobFinished(false);
return;
@@ -180,7 +180,7 @@ void K3bCloneJob::prepareWriter()
connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
- connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -222,7 +222,7 @@ void K3bCloneJob::slotWriterPercent( int p )
void K3bCloneJob::slotWriterNextTrack( int t, int tt )
{
- emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(tt) );
+ emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) );
}
@@ -239,7 +239,7 @@ void K3bCloneJob::slotWriterFinished( bool success )
if( success ) {
d->doneCopies++;
- emit infoMessage( i18n("Successfully written clone copy %1.").tqarg(d->doneCopies), INFO );
+ emit infoMessage( i18n("Successfully written clone copy %1.").arg(d->doneCopies), INFO );
if( d->doneCopies < m_copies ) {
K3bDevice::eject( writer() );
@@ -330,7 +330,7 @@ void K3bCloneJob::startWriting()
if( m_simulate )
emit newTask( i18n("Simulating clone copy") );
else
- emit newTask( i18n("Writing clone copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing clone copy %1").arg(d->doneCopies+1) );
m_writerJob->start();
}
diff --git a/libk3b/jobs/k3bclonetocreader.cpp b/libk3b/jobs/k3bclonetocreader.cpp
index 2122937..529e49f 100644
--- a/libk3b/jobs/k3bclonetocreader.cpp
+++ b/libk3b/jobs/k3bclonetocreader.cpp
@@ -22,7 +22,7 @@
#include <k3bglobals.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp
index 9ff5dd5..873a1b8 100644
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@ -109,7 +109,7 @@ void K3bDataTrackReader::WorkThread::run()
emitStarted();
if( !m_device->open() ) {
- emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -142,7 +142,7 @@ void K3bDataTrackReader::WorkThread::run()
}
if( !m_libcss->open(m_device) ) {
- emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -183,14 +183,14 @@ void K3bDataTrackReader::WorkThread::run()
}
}
- emitInfoMessage( i18n("Reading with sector size %1.").tqarg(m_usedSectorSize), K3bJob::INFO );
+ emitInfoMessage( i18n("Reading with sector size %1.").arg(m_usedSectorSize), K3bJob::INFO );
emitDebuggingOutput( "K3bDataTrackReader",
TQString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.")
- .tqarg( m_firstSector.lba() )
- .tqarg( m_lastSector.lba() )
- .tqarg( m_usedSectorSize )
- .tqarg( m_lastSector.lba() - m_firstSector.lba() + 1 )
- .tqarg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) );
+ .arg( m_firstSector.lba() )
+ .arg( m_lastSector.lba() )
+ .arg( m_usedSectorSize )
+ .arg( m_lastSector.lba() - m_firstSector.lba() + 1 )
+ .arg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) );
TQFile file;
if( m_fd == -1 ) {
@@ -199,7 +199,7 @@ void K3bDataTrackReader::WorkThread::run()
m_device->close();
if( m_useLibdvdcss )
m_libcss->close();
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), K3bJob::ERROR );
emitFinished( false );
return;
}
@@ -231,7 +231,7 @@ void K3bDataTrackReader::WorkThread::run()
// s_bufferSizeSectors = K3bDevice::determineMaxReadingBufferSize( m_device, m_firstSector );
if( s_bufferSizeSectors <= 0 ) {
- emitInfoMessage( i18n("Error while reading sector %1.").tqarg(m_firstSector.lba()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while reading sector %1.").arg(m_firstSector.lba()), K3bJob::ERROR );
emitFinished(false);
m_device->block( false );
k3bcore->unblockDevice( m_device );
@@ -239,7 +239,7 @@ void K3bDataTrackReader::WorkThread::run()
}
kdDebug() << "(K3bDataTrackReader) using buffer size of " << s_bufferSizeSectors << " blocks." << endl;
- emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").tqarg( s_bufferSizeSectors ) );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").arg( s_bufferSizeSectors ) );
// 2. get it on
K3b::Msf currentSector = m_firstSector;
@@ -279,7 +279,7 @@ void K3bDataTrackReader::WorkThread::run()
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Error while writing to fd %1. Current sector is %2.")
- .tqarg(m_fd).tqarg(currentSector.lba()-m_firstSector.lba()) );
+ .arg(m_fd).arg(currentSector.lba()-m_firstSector.lba()) );
writeError = true;
break;
}
@@ -290,7 +290,7 @@ void K3bDataTrackReader::WorkThread::run()
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Error while writing to file %1. Current sector is %2.")
- .tqarg(m_imagePath).tqarg(currentSector.lba()-m_firstSector.lba()) );
+ .arg(m_imagePath).arg(currentSector.lba()-m_firstSector.lba()) );
writeError = true;
break;
}
@@ -331,8 +331,8 @@ void K3bDataTrackReader::WorkThread::run()
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Read a total of %1 sectors (%2 bytes)")
- .tqarg(totalReadSectors.lba())
- .tqarg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) );
+ .arg(totalReadSectors.lba())
+ .arg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) );
if( m_canceled )
emitCanceled();
@@ -386,8 +386,8 @@ int K3bDataTrackReader::WorkThread::read( unsigned char* buffer, unsigned long s
// here we read every single sector for itself to find the troubleing ones
bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned long startSector, unsigned int len )
{
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").tqarg(startSector) );
- emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").tqarg(startSector), K3bJob::WARNING );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").arg(startSector) );
+ emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").arg(startSector), K3bJob::WARNING );
int sectorsRead = -1;
bool success = true;
@@ -403,16 +403,16 @@ bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned
if( !success ) {
if( m_ignoreReadErrors ) {
- emitInfoMessage( i18n("Ignoring read error in sector %1.").tqarg(sector), K3bJob::ERROR );
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").tqarg(sector) );
+ emitInfoMessage( i18n("Ignoring read error in sector %1.").arg(sector), K3bJob::ERROR );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").arg(sector) );
++m_errorSectorCount;
// ::memset( &buffer[i], 0, 1 );
success = true;
}
else {
- emitInfoMessage( i18n("Error while reading sector %1.").tqarg(sector), K3bJob::ERROR );
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").tqarg(sector) );
+ emitInfoMessage( i18n("Error while reading sector %1.").arg(sector), K3bJob::ERROR );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").arg(sector) );
break;
}
}
diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp
index b123e24..d5382a3 100644
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
@@ -122,7 +122,7 @@ void K3bDvdCopyJob::start()
k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) {
m_onTheFly = false;
emit infoMessage( i18n("K3b does not support writing on-the-fly with growisofs %1.")
- .tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR );
+ .arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR );
emit infoMessage( i18n("Disabling on-the-fly writing."), INFO );
}
@@ -295,7 +295,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
//
TQFileInfo fi( m_imagePath );
if( !fi.isFile() ||
- questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_imagePath),
+ questionYesNo( i18n("Do you want to overwrite %1?").arg(m_imagePath),
i18n("File Exists") ) ) {
if( fi.isDir() )
m_imagePath = K3b::findTempFile( "iso", m_imagePath );
@@ -305,7 +305,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
}
// else the user specified a file in an existing dir
- emit infoMessage( i18n("Writing image file to %1.").tqarg(m_imagePath), INFO );
+ emit infoMessage( i18n("Writing image file to %1.").arg(m_imagePath), INFO );
emit newSubTask( i18n("Reading source medium.") );
}
@@ -316,7 +316,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
unsigned long avail, size;
TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR );
+ emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
jobFinished(false);
d->running = false;
return;
@@ -332,7 +332,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
d->imageFile.setName( m_imagePath );
if( !d->imageFile.open( IO_WriteOnly ) ) {
- emit infoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), ERROR );
+ emit infoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), ERROR );
jobFinished( false );
d->running = false;
return;
@@ -353,7 +353,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
if( m_simulate )
emit newTask( i18n("Simulating DVD copy") );
else if( m_copies > 1 )
- emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
else
emit newTask( i18n("Writing DVD copy") );
@@ -434,7 +434,7 @@ void K3bDvdCopyJob::prepareWriter()
connect( d->writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) );
connect( d->writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
connect( d->writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
- connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( d->writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( d->writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( d->writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -548,7 +548,7 @@ void K3bDvdCopyJob::slotReaderFinished( bool success )
if( waitForDvd() ) {
prepareWriter();
if( m_copies > 1 )
- emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
else
emit newTask( i18n("Writing DVD copy") );
@@ -597,7 +597,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
}
if( success ) {
- emit infoMessage( i18n("Successfully written DVD copy %1.").tqarg(d->doneCopies+1), INFO );
+ emit infoMessage( i18n("Successfully written DVD copy %1.").arg(d->doneCopies+1), INFO );
if( d->verifyData && !m_simulate ) {
if( !d->verificationJob ) {
@@ -620,7 +620,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
d->verificationJob->addTrack( 1, d->inPipe.checksum(), d->lastSector+1 );
if( m_copies > 1 )
- emit newTask( i18n("Verifying DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Verifying DVD copy %1").arg(d->doneCopies+1) );
else
emit newTask( i18n("Verifying DVD copy") );
@@ -637,7 +637,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
if( waitForDvd() ) {
prepareWriter();
- emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
emit burning(true);
@@ -686,7 +686,7 @@ void K3bDvdCopyJob::slotVerificationFinished( bool success )
if( waitForDvd() ) {
prepareWriter();
- emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
emit burning(true);
@@ -790,8 +790,8 @@ bool K3bDvdCopyJob::waitForDvd()
if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. "
"Do you really want to continue? The media will be written "
"for real.")
- .tqarg(m_writerDevice->vendor())
- .tqarg(m_writerDevice->description()),
+ .arg(m_writerDevice->vendor())
+ .arg(m_writerDevice->description()),
i18n("No Simulation with DVD-R(W)") ) ) {
cancel();
return false;
@@ -839,11 +839,11 @@ bool K3bDvdCopyJob::waitForDvd()
if( m_writingMode == K3b::DAO ) {
// ( m_writingMode == K3b::WRITING_MODE_AUTO &&
// ( sizeWithDao || !m_onTheFly ) ) ) {
- emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO );
d->usedWritingMode = K3b::DAO;
}
else {
- emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO );
d->usedWritingMode = K3b::WRITING_MODE_INCR_SEQ;
}
}
@@ -859,7 +859,7 @@ void K3bDvdCopyJob::removeImageFiles()
{
if( TQFile::exists( m_imagePath ) ) {
d->imageFile.remove();
- emit infoMessage( i18n("Removed image file %1").tqarg(m_imagePath), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Removed image file %1").arg(m_imagePath), K3bJob::SUCCESS );
}
}
diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp
index 46c8563..21858e4 100644
--- a/libk3b/jobs/k3bdvdformattingjob.cpp
+++ b/libk3b/jobs/k3bdvdformattingjob.cpp
@@ -142,7 +142,7 @@ void K3bDvdFormattingJob::start()
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY,
K3bDevice::MEDIA_WRITABLE_DVD,
i18n("Please insert a rewritable DVD medium into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) {
+ .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) {
emit canceled();
d->running = false;
jobFinished(false);
@@ -267,7 +267,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
d->success = true;
}
else {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdFormatBin->name()).tqarg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdFormatBin->name()).arg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
@@ -275,7 +275,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdFormatBin->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdFormatBin->name()),
ERROR );
d->success = false;
}
@@ -362,7 +362,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
if( diskInfo.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) {
- emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)),
+ emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)),
INFO );
// mode is ignored
@@ -375,7 +375,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
}
else {
emit infoMessage( i18n("No need to format %1 media more than once.")
- .tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO );
+ .arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO );
emit infoMessage( i18n("It may simply be overwritten."), INFO );
if( d->force ) {
@@ -401,11 +401,11 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
//
else { // MEDIA_DVD_RW
- emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)),
+ emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)),
INFO );
if( diskInfo.currentProfile() != K3bDevice::MEDIA_UNKNOWN ) {
- emit infoMessage( i18n("Formatted in %1 mode.").tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
+ emit infoMessage( i18n("Formatted in %1 mode.").arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
//
@@ -428,7 +428,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
else if( diskInfo.currentProfile() == K3bDevice::MEDIA_DVD_RW_OVWR &&
d->mode != K3b::WRITING_MODE_INCR_SEQ ) {
emit infoMessage( i18n("No need to format %1 media more than once.")
- .tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
+ .arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
emit infoMessage( i18n("It may simply be overwritten."), INFO );
if( d->force )
@@ -448,7 +448,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
}
emit newSubTask( i18n("Formatting"
- " DVD-RW in %1 mode.").tqarg(K3bDevice::mediaTypeString( blank ?
+ " DVD-RW in %1 mode.").arg(K3bDevice::mediaTypeString( blank ?
K3bDevice::MEDIA_DVD_RW_SEQ :
K3bDevice::MEDIA_DVD_RW_OVWR )) );
}
@@ -472,14 +472,14 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" );
if( !d->dvdFormatBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("dvd+rw-format"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-format"), ERROR );
d->running = false;
jobFinished(false);
return;
}
if( !d->dvdFormatBin->copyright.isEmpty() )
- emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(d->dvdFormatBin->name()).tqarg(d->dvdFormatBin->version).tqarg(d->dvdFormatBin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(d->dvdFormatBin->name()).arg(d->dvdFormatBin->version).arg(d->dvdFormatBin->copyright), INFO );
*d->process << d->dvdFormatBin;
@@ -517,7 +517,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bDvdFormattingJob) could not start " << d->dvdFormatBin->path << endl;
- emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdFormatBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(d->dvdFormatBin->name()), K3bJob::ERROR );
d->running = false;
jobFinished(false);
}
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp
index cf63da4..bc24d81 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.cpp
+++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp
@@ -37,7 +37,7 @@
#include <kio/global.h>
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <tqapplication.h>
@@ -86,7 +86,7 @@ void K3bIso9660ImageWritingJob::start()
emit newTask( i18n("Preparing data") );
if( !TQFile::exists( m_imagePath ) ) {
- emit infoMessage( i18n("Could not find image %1").tqarg(m_imagePath), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not find image %1").arg(m_imagePath), K3bJob::ERROR );
jobFinished( false );
return;
}
@@ -133,7 +133,7 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success )
if( m_copies == 1 )
emit newTask( i18n("Verifying written data") );
else
- emit newTask( i18n("Verifying written copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) );
+ emit newTask( i18n("Verifying written copy %1 of %2").arg(m_currentCopy).arg(m_copies) );
m_verifyJob->start();
}
@@ -200,7 +200,7 @@ void K3bIso9660ImageWritingJob::slotNextTrack( int, int )
if( m_copies == 1 )
emit newSubTask( i18n("Writing image") );
else
- emit newSubTask( i18n("Writing copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) );
+ emit newSubTask( i18n("Writing copy %1 of %2").arg(m_currentCopy).arg(m_copies) );
}
@@ -350,7 +350,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
writer->addArgument("-data");
// read from stdin
- writer->addArgument( TQString("-tsize=%1s").tqarg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" );
+ writer->addArgument( TQString("-tsize=%1s").arg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" );
m_writer = writer;
}
@@ -424,7 +424,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) );
connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
- connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) );
@@ -451,7 +451,7 @@ TQString K3bIso9660ImageWritingJob::jobDescription() const
TQString K3bIso9660ImageWritingJob::jobDetails() const
{
- return m_imagePath.section("/", -1) + TQString( " (%1)" ).tqarg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
+ return m_imagePath.section("/", -1) + TQString( " (%1)" ).arg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
}
diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp
index fb2a7bd..b8b2b0a 100644
--- a/libk3b/jobs/k3breadcdreader.cpp
+++ b/libk3b/jobs/k3breadcdreader.cpp
@@ -104,7 +104,7 @@ void K3bReadcdReader::start()
// the first thing to do is to check for readcd
d->readcdBinObject = k3bcore->externalBinManager()->binObject( "readcd" );
if( !d->readcdBinObject ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("readcd"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("readcd"), ERROR );
jobFinished(false);
return;
}
@@ -120,7 +120,7 @@ void K3bReadcdReader::start()
for( TQPtrListIterator<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.").tqarg(d->readcdBinObject->version), INFO );
+ emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").arg(d->readcdBinObject->version), INFO );
foundCloneSupport = true;
break;
}
@@ -148,10 +148,10 @@ void K3bReadcdReader::start()
*d->process << "-v";
// Again we assume the device to be set!
- *d->process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(m_readDevice,
+ *d->process << TQString("dev=%1").arg(K3b::externalBinDeviceParameter(m_readDevice,
d->readcdBinObject));
if( m_speed > 0 )
- *d->process << TQString("speed=%1").tqarg(m_speed);
+ *d->process << TQString("speed=%1").arg(m_speed);
// output
@@ -160,8 +160,8 @@ void K3bReadcdReader::start()
d->process->dupStdout( d->fdToWriteTo );
}
else {
- emit newTask( i18n("Writing image to %1.").tqarg(m_imagePath) );
- emit infoMessage( i18n("Writing image to %1.").tqarg(m_imagePath), INFO );
+ emit newTask( i18n("Writing image to %1.").arg(m_imagePath) );
+ emit infoMessage( i18n("Writing image to %1.").arg(m_imagePath), INFO );
*d->process << "f=" + m_imagePath;
}
@@ -177,11 +177,11 @@ void K3bReadcdReader::start()
if( m_c2Scan )
*d->process << "-c2scan";
- *d->process << TQString("retries=%1").tqarg(m_retries);
+ *d->process << TQString("retries=%1").arg(m_retries);
// readcd does not read the last sector specified
if( d->firstSector < d->lastSector )
- *d->process << TQString("sectors=%1-%2").tqarg(d->firstSector.lba()).tqarg(d->lastSector.lba()+1);
+ *d->process << TQString("sectors=%1-%2").arg(d->firstSector.lba()).arg(d->lastSector.lba()+1);
// Joerg sais it is a Linux kernel bug, anyway, with the default value it does not work
*d->process << "ts=128k";
@@ -276,7 +276,7 @@ void K3bReadcdReader::slotStdLine( const TQString& line )
kdError() << "(K3bReadcdReader) problemSector parsing error in line: "
<< line.mid( pos, line.find( TQRegExp("\\D"), pos )-pos ) << endl;
}
- emit infoMessage( i18n("Retrying from sector %1.").tqarg(problemSector), INFO );
+ emit infoMessage( i18n("Retrying from sector %1.").arg(problemSector), INFO );
}
else if( (pos = line.find("Error on sector")) >= 0 ) {
@@ -291,10 +291,10 @@ void K3bReadcdReader::slotStdLine( const TQString& line )
}
if( line.contains( "not corrected") ) {
- emit infoMessage( i18n("Uncorrected error in sector %1").tqarg(problemSector), ERROR );
+ emit infoMessage( i18n("Uncorrected error in sector %1").arg(problemSector), ERROR );
}
else {
- emit infoMessage( i18n("Corrected error in sector %1").tqarg(problemSector), ERROR );
+ emit infoMessage( i18n("Corrected error in sector %1").arg(problemSector), ERROR );
}
}
@@ -314,7 +314,7 @@ void K3bReadcdReader::slotProcessExited( KProcess* p )
jobFinished( true );
}
else {
- emit infoMessage( i18n("%1 returned error: %2").tqarg("Readcd").tqarg(p->exitStatus()), ERROR );
+ emit infoMessage( i18n("%1 returned error: %2").arg("Readcd").arg(p->exitStatus()), ERROR );
jobFinished( false );
}
}
diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp
index 5b8cc62..e5333fe 100644
--- a/libk3b/jobs/k3bverificationjob.cpp
+++ b/libk3b/jobs/k3bverificationjob.cpp
@@ -203,7 +203,7 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
if( (int)d->toc.count() < (*it).trackNumber ) {
if ( d->mediumHasBeenReloaded ) {
emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)")
- .tqarg( "Specified track number not found on medium" ), ERROR );
+ .arg( "Specified track number not found on medium" ), ERROR );
jobFinished( false );
return;
}
@@ -236,7 +236,7 @@ void K3bVerificationJob::readTrack( int trackIndex )
return;
}
- emit newTask( i18n("Verifying track %1").tqarg( d->tracks[trackIndex].trackNumber ) );
+ emit newTask( i18n("Verifying track %1").arg( d->tracks[trackIndex].trackNumber ) );
d->pipe.open();
@@ -304,7 +304,7 @@ void K3bVerificationJob::slotMd5JobFinished( bool success )
if( success && !d->canceled && d->readSuccessful ) {
// compare the two sums
if( d->tracks[d->currentTrackIndex].checksum != d->md5Job->hexDigest() ) {
- emit infoMessage( i18n("Written data in track %1 differs from original.").tqarg(d->tracks[d->currentTrackIndex].trackNumber), ERROR );
+ emit infoMessage( i18n("Written data in track %1 differs from original.").arg(d->tracks[d->currentTrackIndex].trackNumber), ERROR );
jobFinished(false);
}
else {
diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
index cf30eed..96d9619 100644
--- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
@@ -88,15 +88,15 @@ void K3bVideoDVDTitleDetectClippingJob::start()
d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode");
if( !d->usedTranscodeBin ) {
- emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR );
+ emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR );
jobFinished( false );
return;
}
if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){
emit infoMessage( i18n("%1 version %2 is too old.")
- .tqarg("transcode")
- .tqarg(d->usedTranscodeBin->version), ERROR );
+ .arg("transcode")
+ .arg(d->usedTranscodeBin->version), ERROR );
jobFinished( false );
return;
}
@@ -105,11 +105,11 @@ void K3bVideoDVDTitleDetectClippingJob::start()
if( !d->usedTranscodeBin->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
- .tqarg(d->usedTranscodeBin->name())
- .tqarg(d->usedTranscodeBin->version)
- .tqarg(d->usedTranscodeBin->copyright), INFO );
+ .arg(d->usedTranscodeBin->name())
+ .arg(d->usedTranscodeBin->version)
+ .arg(d->usedTranscodeBin->copyright), INFO );
- emit newTask( i18n("Analysing Title %1 of Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) );
+ emit newTask( i18n("Analysing Title %1 of Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) );
startTranscode( 1 );
}
@@ -151,16 +151,16 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
*d->process << "-i" << m_dvd.device()->blockDeviceName();
// select the title number and chapter
- *d->process << "-T" << TQString("%1,%2").tqarg(m_titleNumber).tqarg(chapter);
+ *d->process << "-T" << TQString("%1,%2").arg(m_titleNumber).arg(chapter);
// null output
*d->process << "-y" << "null,null" << "-o" << "/dev/null";
// analyze the first 200 frames
- *d->process << "-J" << TQString("detectclipping=range=0-%1/5").tqarg(d->currentFrames);
+ *d->process << "-J" << TQString("detectclipping=range=0-%1/5").arg(d->currentFrames);
// also only decode the first 200 frames
- *d->process << "-c" << TQString("0-%1").tqarg(d->currentFrames+1);
+ *d->process << "-c" << TQString("0-%1").arg(d->currentFrames+1);
// additional user parameters from config
const TQStringList& params = d->usedTranscodeBin->userParameters();
@@ -181,11 +181,11 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
- emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
- emit newSubTask( i18n("Analysing Chapter %1 of %2").tqarg(chapter).tqarg(m_dvd[m_titleNumber-1].numPTTs()) );
+ emit newSubTask( i18n("Analysing Chapter %1 of %2").arg(chapter).arg(m_dvd[m_titleNumber-1].numPTTs()) );
emit subPercent( 0 );
}
}
@@ -279,7 +279,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p )
}
else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()),
+ .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
}
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
index 96d670b..fd115ff 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -87,15 +87,15 @@ void K3bVideoDVDTitleTranscodingJob::start()
d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode");
if( !d->usedTranscodeBin ) {
- emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR );
+ emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR );
jobFinished( false );
return;
}
if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){
emit infoMessage( i18n("%1 version %2 is too old.")
- .tqarg("transcode")
- .tqarg(d->usedTranscodeBin->version), ERROR );
+ .arg("transcode")
+ .arg(d->usedTranscodeBin->version), ERROR );
jobFinished( false );
return;
}
@@ -104,9 +104,9 @@ void K3bVideoDVDTitleTranscodingJob::start()
if( !d->usedTranscodeBin->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
- .tqarg(d->usedTranscodeBin->name())
- .tqarg(d->usedTranscodeBin->version)
- .tqarg(d->usedTranscodeBin->copyright), INFO );
+ .arg(d->usedTranscodeBin->name())
+ .arg(d->usedTranscodeBin->version)
+ .arg(d->usedTranscodeBin->copyright), INFO );
//
// Let's take a look at the filename
@@ -119,11 +119,11 @@ void K3bVideoDVDTitleTranscodingJob::start()
TQFileInfo fileInfo( m_filename );
TQFileInfo dirInfo( fileInfo.dirPath() );
if( !dirInfo.exists() && !KStandardDirs::makeDir( dirInfo.absFilePath() ) ) {
- emit infoMessage( i18n("Unable to create folder '%1'").tqarg(dirInfo.filePath()), ERROR );
+ emit infoMessage( i18n("Unable to create folder '%1'").arg(dirInfo.filePath()), ERROR );
return;
}
else if( !dirInfo.isDir() || !dirInfo.isWritable() ) {
- emit infoMessage( i18n("Invalid filename: '%1'").tqarg(m_filename), ERROR );
+ emit infoMessage( i18n("Invalid filename: '%1'").arg(m_filename), ERROR );
jobFinished( false );
return;
}
@@ -134,7 +134,7 @@ void K3bVideoDVDTitleTranscodingJob::start()
//
d->twoPassEncodingLogFile = K3b::findTempFile( "log" );
- emit newTask( i18n("Transcoding title %1 from Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) );
+ emit newTask( i18n("Transcoding title %1 from Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) );
//
// Ok then, let's begin
@@ -159,7 +159,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
break;
default:
- emit infoMessage( i18n("Invalid Video codec set: %1").tqarg(m_videoCodec), ERROR );
+ emit infoMessage( i18n("Invalid Video codec set: %1").arg(m_videoCodec), ERROR );
jobFinished( false );
return;
}
@@ -182,7 +182,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
break;
default:
- emit infoMessage( i18n("Invalid Audio codec set: %1").tqarg(m_audioCodec), ERROR );
+ emit infoMessage( i18n("Invalid Audio codec set: %1").arg(m_audioCodec), ERROR );
jobFinished( false );
return;
}
@@ -218,7 +218,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
*d->process << "-x" << "dvd";
// select the title number
- *d->process << "-T" << TQString("%1,-1,1").tqarg( m_titleNumber );
+ *d->process << "-T" << TQString("%1,-1,1").arg( m_titleNumber );
// select the audio stream to extract
if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 )
@@ -226,14 +226,14 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
// clipping
*d->process << "-j" << TQString("%1,%2,%3,%4")
- .tqarg(m_clippingTop)
- .tqarg(m_clippingLeft)
- .tqarg(m_clippingBottom)
- .tqarg(m_clippingRight);
+ .arg(m_clippingTop)
+ .arg(m_clippingLeft)
+ .arg(m_clippingBottom)
+ .arg(m_clippingRight);
// select the encoding type (single pass or two-pass) and the log file for two-pass encoding
// the latter is unused for pass = 0
- *d->process << "-R" << TQString("%1,%2").tqarg( pass ).tqarg( d->twoPassEncodingLogFile );
+ *d->process << "-R" << TQString("%1,%2").arg( pass ).arg( d->twoPassEncodingLogFile );
// depending on the pass we use different options
if( pass != 1 ) {
@@ -249,7 +249,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
}
else {
// audio quality settings
- *d->process << "-b" << TQString("%1,%2").tqarg(m_audioBitrate).tqarg(m_audioVBR ? 1 : 0);
+ *d->process << "-b" << TQString("%1,%2").arg(m_audioBitrate).arg(m_audioVBR ? 1 : 0);
// resample audio stream to 44.1 khz
if( m_resampleAudio )
@@ -261,7 +261,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
}
else {
// gather information about the video stream, ignore audio
- *d->process << "-y" << TQString("%1,null").tqarg( videoCodecString );
+ *d->process << "-y" << TQString("%1,null").arg( videoCodecString );
// we ignore the output from the first pass
*d->process << "-o" << "/dev/null";
@@ -317,8 +317,8 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
// we only give information about the resizing of the video once
if( pass < 2 )
- emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").tqarg(m_titleNumber).tqarg(usedWidth).tqarg(usedHeight), INFO );
- *d->process << "-Z" << TQString("%1x%2").tqarg(usedWidth).tqarg(usedHeight);
+ emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").arg(m_titleNumber).arg(usedWidth).arg(usedHeight), INFO );
+ *d->process << "-Z" << TQString("%1x%2").arg(usedWidth).arg(usedHeight);
// additional user parameters from config
const TQStringList& params = d->usedTranscodeBin->userParameters();
@@ -339,7 +339,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
- emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
@@ -372,7 +372,7 @@ void K3bVideoDVDTitleTranscodingJob::cleanup( bool success )
}
if( !success && TQFile::exists( m_filename ) ) {
- emit infoMessage( i18n("Removing incomplete video file '%1'").tqarg(m_filename), INFO );
+ emit infoMessage( i18n("Removing incomplete video file '%1'").arg(m_filename), INFO );
TQFile::remove( m_filename );
}
}
@@ -440,7 +440,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p )
// FIXME: error handling
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()),
+ .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
@@ -450,7 +450,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p )
}
else {
cleanup( false );
- emit infoMessage( i18n("Execution of %1 failed.").tqarg("transcode"), ERROR );
+ emit infoMessage( i18n("Execution of %1 failed.").arg("transcode"), ERROR );
emit infoMessage( i18n("Please consult the debugging output for details."), ERROR );
jobFinished( false );
}
@@ -566,7 +566,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
return false;
- return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) );
+ return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) );
}
@@ -577,7 +577,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
return false;
- return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) );
+ return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) );
}
#include "k3bvideodvdtitletranscodingjob.moc"
diff --git a/libk3b/k3bimage.xsd b/libk3b/k3bimage.xsd
index 607bd95..ab7f36c 100644
--- a/libk3b/k3bimage.xsd
+++ b/libk3b/k3bimage.xsd
@@ -1,9 +1,9 @@
<!--
- 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.
+ 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.
Every K3b image archive contains the toc.xml file as described in this document
- which describes the tqlayout of the CD or DVD saved in the K3b image archive.
+ which describes the layout 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/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp
index 197a042..4bda25b 100644
--- a/libk3b/plugin/k3baudioserver.cpp
+++ b/libk3b/plugin/k3baudioserver.cpp
@@ -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)")
- .tqarg(m_usedOutputPlugin->pluginInfo().name())
- .tqarg(m_usedOutputPlugin->lastErrorMessage()) );
+ .arg(m_usedOutputPlugin->pluginInfo().name())
+ .arg(m_usedOutputPlugin->lastErrorMessage()) );
}
else
m_pluginInitialized = true;
diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp
index 3274ef6..bf6d914 100644
--- a/libk3b/plugin/k3bpluginmanager.cpp
+++ b/libk3b/plugin/k3bpluginmanager.cpp
@@ -168,7 +168,7 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, con
KDialogBase dlg( parent,
name,
true,
- i18n("Configure plugin %1").tqarg( plugin->pluginInfo().name() ) );
+ i18n("Configure plugin %1").arg( plugin->pluginInfo().name() ) );
K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg );
if( configWidget ) {
@@ -181,7 +181,7 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, con
return r;
}
else {
- KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) );
+ KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").arg( plugin->pluginInfo().name() ) );
return 0;
}
}
diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
index f8a5b71..610f9b7 100644
--- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
+++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
@@ -70,7 +70,7 @@ bool K3bAudioCdTrackDrag::decode( const TQMimeSource* e,
K3bDevice::Toc& toc, TQValueList<int>& trackNumbers,
K3bCddbResultEntry& cddb, K3bDevice::Device** dev )
{
- TQByteArray data = e->tqencodedData( "k3b/audio_track_drag" );
+ TQByteArray data = e->encodedData( "k3b/audio_track_drag" );
TQDataStream s( data, IO_ReadOnly );
diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
index 6319086..6ca0cd5 100644
--- a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
+++ b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
@@ -99,8 +99,8 @@ bool K3bAudioCdTrackSource::initParanoia()
if( !m_lastUsedDevice ) {
// could not find the CD, so ask for it
TQString s = i18n("Please insert Audio CD %1%2")
- .tqarg(m_discId, 0, 16)
- .tqarg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty()
+ .arg(m_discId, 0, 16)
+ .arg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty()
? TQString()
: " (" + m_cddbEntry.cdArtist + " - " + m_cddbEntry.cdTitle + ")");
@@ -252,7 +252,7 @@ TQString K3bAudioCdTrackSource::type() const
TQString K3bAudioCdTrackSource::sourceComment() const
{
- return i18n("Track %1 from Audio CD %2").tqarg(m_cdTrackNumber).tqarg(m_discId,0,16);
+ return i18n("Track %1 from Audio CD %2").arg(m_cdTrackNumber).arg(m_discId,0,16);
}
diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp
index 625f5bf..b4b3489 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
@@ -37,7 +37,7 @@
#include <tqdir.h>
#include <tqdom.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqsemaphore.h>
// KDE-includes
@@ -263,7 +263,7 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist )
TQTextStream t( &f );
char buf[7];
t.readRawBytes( buf, 7 );
- if( TQString::tqfromLatin1( buf, 7 ) != "#EXTM3U" )
+ if( TQString::fromLatin1( buf, 7 ) != "#EXTM3U" )
return false;
// skip the first line
diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h
index 70f8826..71e5e69 100644
--- a/libk3b/projects/audiocd/k3baudiodoc.h
+++ b/libk3b/projects/audiocd/k3baudiodoc.h
@@ -27,7 +27,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "k3b_export.h"
#include <kurl.h>
diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp
index ba0692f..6917fe6 100644
--- a/libk3b/projects/audiocd/k3baudioimager.cpp
+++ b/libk3b/projects/audiocd/k3baudioimager.cpp
@@ -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.").tqarg(trackNumber), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to seek in track %1.").arg(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").tqarg(*imageFileIt), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open %1 for writing").arg(*imageFileIt), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -142,7 +142,7 @@ void K3bAudioImager::WorkThread::run()
}
if( read < 0 ) {
- emitInfoMessage( i18n("Error while decoding track %1.").tqarg(trackNumber), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while decoding track %1.").arg(trackNumber), K3bJob::ERROR );
kdDebug() << "(K3bAudioImager::WorkThread) read error on track " << trackNumber
<< " at pos " << K3b::Msf(trackRead/2352) << endl;
lastError = K3bAudioImager::ERROR_DECODING_TRACK;
diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp
index a03a218..2415962 100644
--- a/libk3b/projects/audiocd/k3baudiojob.cpp
+++ b/libk3b/projects/audiocd/k3baudiojob.cpp
@@ -297,7 +297,7 @@ void K3bAudioJob::start()
d->useCdText ) {
if( !cdrecordCdText ) {
emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.")
- .tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
+ .arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
d->useCdText = false;
}
else if( m_usedWritingMode == K3b::TAO ) {
@@ -346,7 +346,7 @@ void K3bAudioJob::start()
}
else {
emit burning(false);
- emit infoMessage( i18n("Creating image files in %1").tqarg(m_doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating image files in %1").arg(m_doc->tempDir()), INFO );
emit newTask( i18n("Creating image files") );
m_tempData->prepareTempFileNames( doc()->tempDir() );
TQStringList filenames;
@@ -480,9 +480,9 @@ 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")
- .tqarg(t)
- .tqarg(tt)
- .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ .arg(t)
+ .arg(tt)
+ .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
}
@@ -568,7 +568,7 @@ bool K3bAudioJob::prepareWriter()
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(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -588,9 +588,9 @@ 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")
- .tqarg(t)
- .tqarg(tt)
- .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ .arg(t)
+ .arg(tt)
+ .arg( 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").tqarg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) );
else
emit newTask( i18n("Writing") );
@@ -847,7 +847,7 @@ TQString K3bAudioJob::jobDescription() const
return i18n("Writing Audio CD")
+ ( m_doc->title().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(m_doc->title()) );
+ : TQString( " (%1)" ).arg(m_doc->title()) );
}
@@ -855,7 +855,7 @@ TQString K3bAudioJob::jobDetails() const
{
return ( i18n( "1 track (%1 minutes)",
"%n tracks (%1 minutes)",
- m_doc->numOfTracks() ).tqarg(m_doc->length().toString())
+ m_doc->numOfTracks() ).arg(m_doc->length().toString())
+ ( m_doc->copies() > 1 && !m_doc->dummy()
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
index abbf753..697a9f5 100644
--- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
+++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
@@ -22,7 +22,7 @@
#include <k3bcore.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqvaluevector.h>
#include <kdebug.h>
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
index 52afb5e..d78862e 100644
--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
@@ -61,7 +61,7 @@ void K3bAudioNormalizeJob::start()
}
if( !bin->copyright.isEmpty() )
- emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(bin->name()).tqarg(bin->version).tqarg(bin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(bin->name()).arg(bin->version).arg(bin->copyright), INFO );
// create the commandline
*m_process << bin;
@@ -104,7 +104,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
{
// percent, subPercent, newTask (compute level and adjust)
- // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").tqarg(t).tqarg(tt).tqarg(m_files.at(t-1)) );
+ // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) );
emit debuggingOutput( "normalize-audio", line );
@@ -123,13 +123,13 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
else if( line.contains( "already normalized" ) ) {
// no normalization necessary for the current track
- emit infoMessage( i18n("Track %1 is already normalized.").tqarg(m_currentTrack), INFO );
+ emit infoMessage( i18n("Track %1 is already normalized.").arg(m_currentTrack), INFO );
m_currentTrack++;
}
else if( line.contains( "--% done") ) {
if( m_currentAction == ADJUSTING_LEVELS ) {
- emit newTask( i18n("Adjusting volume level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) );
+ emit newTask( i18n("Adjusting volume level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track "
<< m_currentTrack
<< " "
@@ -137,7 +137,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
<< endl;
}
else {
- emit newTask( i18n("Computing level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) );
+ emit newTask( i18n("Computing level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) computing level for track "
<< m_currentTrack
<< " "
@@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p )
break;
default:
if( !m_canceled ) {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("normalize-audio").tqarg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(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.").tqarg("Normalize"), K3bJob::ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg("Normalize"), K3bJob::ERROR );
jobFinished( false );
}
}
diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index 2c4fa51..b4e4ec8 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -38,7 +38,7 @@
#include <tqstring.h>
#include <tqfileinfo.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqtimer.h>
#include <tqdom.h>
#include <tqptrlist.h>
@@ -92,8 +92,8 @@ bool K3bDataDoc::newDocument()
m_bExistingItemsReplaceAll = m_bExistingItemsIgnoreAll = false;
if( m_root ) {
- while( m_root->tqchildren().getFirst() )
- removeItem( m_root->tqchildren().getFirst() );
+ while( m_root->children().getFirst() )
+ removeItem( m_root->children().getFirst() );
}
else
m_root = new K3bRootItem( this );
@@ -164,7 +164,7 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
ok = true;
TQString name( k3bname );
if( cnt > 0 )
- name += TQString("_%1").tqarg(cnt);
+ name += TQString("_%1").arg(cnt);
if( K3bDataItem* oldItem = dir->find( name ) ) {
if( f.isDir() && oldItem->isDir() ) {
// ok, just reuse the dir
@@ -182,7 +182,7 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
}
}
if( cnt > 0 )
- k3bname += TQString("_%1").tqarg(cnt);
+ k3bname += TQString("_%1").arg(cnt);
// TQFileInfo::exists and TQFileInfo::isReadable return false for broken symlinks :(
if( f.isDir() && !f.isSymLink() ) {
@@ -263,7 +263,7 @@ K3b::Msf K3bDataDoc::burningLength() const
TQString K3bDataDoc::typeString() const
{
- return TQString::tqfromLatin1("data");
+ return TQString::fromLatin1("data");
}
@@ -624,7 +624,7 @@ bool K3bDataDoc::saveDocumentData( TQDomElement* docElem )
// ----------------------------------------------------------------------
TQDomElement topElem = doc.createElement( "files" );
- TQPtrListIterator<K3bDataItem> it( root()->tqchildren() );
+ TQPtrListIterator<K3bDataItem> it( root()->children() );
for( ; it.current(); ++it ) {
saveDataItem( it.current(), &doc, &topElem );
}
@@ -883,7 +883,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme
if( item->sortWeight() != 0 )
topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) );
- TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() );
+ TQPtrListIterator<K3bDataItem> it( dirItem->children() );
for( ; it.current(); ++it ) {
saveDataItem( it.current(), doc, &topElem );
}
@@ -1065,7 +1065,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir )
return;
TQPtrList<K3bDataItem> sortedChildren;
- TQPtrListIterator<K3bDataItem> it( dir->tqchildren() );
+ TQPtrListIterator<K3bDataItem> it( dir->children() );
for( it.toLast(); it.current(); --it ) {
K3bDataItem* item = it.current();
@@ -1277,7 +1277,7 @@ void K3bDataDoc::clearImportedSession()
delete dir;
}
else {
- for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dir->children() ); it.current(); ++it ) {
if( !m_oldSession.contains(it.current()) ) {
m_oldSession.remove();
// now the dir becomes a totally normal dir
@@ -1343,7 +1343,7 @@ K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir )
int i = 0;
while( dir->alreadyInDirectory( "boot.catalog" ) ) {
++i;
- newName = TQString( "boot%1.catalog" ).tqarg(i);
+ newName = TQString( "boot%1.catalog" ).arg(i);
}
K3bSpecialDataItem* b = new K3bSpecialDataItem( this, 0, dir, newName );
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index 0295e27..442b035 100644
--- a/libk3b/projects/datacd/k3bdatajob.cpp
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
@@ -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( TQString("%1,%2").tqarg(m_msInfoFetcher->lastSessionStart()).tqarg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() );
+ m_isoImager->setMultiSessionInfo( TQString("%1,%2").arg(m_msInfoFetcher->lastSessionStart()).arg(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").tqarg(d->doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating image file in %1").arg(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").tqarg(d->doc->tempDir()), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Image successfully created in %1").arg(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").tqarg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").arg(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").tqarg(t).tqarg(tt) );
+ emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) );
}
@@ -547,7 +547,7 @@ void K3bDataJob::setWriterJob( K3bAbstractWriter* writer )
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(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) );
@@ -632,7 +632,7 @@ bool K3bDataJob::prepareWriterJob()
writer->addArgument( "-xa1" );
}
- writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-");
+ writer->addArgument( TQString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-");
setWriterJob( writer );
}
@@ -915,13 +915,13 @@ TQString K3bDataJob::jobDescription() const
return i18n("Writing Data CD")
+ ( d->doc->isoOptions().volumeID().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) );
}
else {
return i18n("Writing Multisession CD")
+ ( d->doc->isoOptions().volumeID().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) );
}
}
@@ -935,10 +935,10 @@ TQString K3bDataJob::jobDetails() const
return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
"ISO9660 Filesystem (Size: %1) - %n copies",
d->doc->copies() )
- .tqarg(KIO::convertSize( d->doc->size() ));
+ .arg(KIO::convertSize( d->doc->size() ));
else
return i18n("ISO9660 Filesystem (Size: %1)")
- .tqarg(KIO::convertSize( d->doc->size() ));
+ .arg(KIO::convertSize( d->doc->size() ));
}
@@ -953,7 +953,7 @@ void K3bDataJob::cleanup()
if( !d->doc->onTheFly() && d->doc->removeImages() ) {
if( TQFile::exists( d->doc->tempDir() ) ) {
d->imageFile.remove();
- emit infoMessage( i18n("Removed image file %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Removed image file %1").arg(d->doc->tempDir()), K3bJob::SUCCESS );
}
}
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
index e562541..26a2b5b 100644
--- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp
+++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
@@ -77,8 +77,8 @@ void K3bDataPreparationJob::Private::run()
++it, --maxlines ) {
K3bDataItem* item = *it;
listOfRenamedItems += i18n("<em>%1</em> renamed to <em>%2</em>")
- .tqarg( KStringHandler::csqueeze( item->k3bName(), 30 ) )
- .tqarg( KStringHandler::csqueeze( item->writtenName(), 30 ) );
+ .arg( KStringHandler::csqueeze( item->k3bName(), 30 ) )
+ .arg( KStringHandler::csqueeze( item->writtenName(), 30 ) );
listOfRenamedItems += "<br>";
}
if( it != doc->needToCutFilenameItems().end() )
@@ -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.")
- .tqarg( d->doc->isoOptions().jolietLong() ? 103 : 64 )
+ .arg( 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?")
- .tqarg( 16 ).tqarg( d->doc->isoOptions().volumeID() ),
+ .arg( 16 ).arg( d->doc->isoOptions().volumeID() ),
i18n("Warning"),
i18n("Cut volume descriptor in the Joliet tree"),
i18n("Cancel and go back") ) ) {
diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp
index 72af70b..f43f1d5 100644
--- a/libk3b/projects/datacd/k3bdiritem.cpp
+++ b/libk3b/projects/datacd/k3bdiritem.cpp
@@ -52,26 +52,26 @@ K3bDirItem::K3bDirItem( const K3bDirItem& item )
m_dirs(0),
m_localPath( item.m_localPath )
{
- for( TQPtrListIterator<K3bDataItem> it( item.tqchildren() ); *it; ++it )
+ for( TQPtrListIterator<K3bDataItem> it( item.children() ); *it; ++it )
addDataItem( (*it)->copy() );
}
K3bDirItem::~K3bDirItem()
{
- // delete all tqchildren
+ // delete all children
// 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_tqchildren.first();
+ K3bDataItem* i = m_children.first();
while( i ) {
// it is important to use takeDataItem here to be sure
// the size gets updated properly
takeDataItem(i);
delete i;
- i = m_tqchildren.first();
+ i = m_children.first();
}
- // this has to be done after deleting the tqchildren
+ // this has to be done after deleting the children
// because the directory itself has a size of 0 in K3b
// and all it's files' sizes have already been substracted
take();
@@ -99,7 +99,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
}
}
- if( m_tqchildren.findRef( item ) == -1 ) {
+ if( m_children.findRef( item ) == -1 ) {
if( item->isFile() ) {
// do we replace an old item?
TQString name = item->k3bName();
@@ -126,7 +126,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
item->setK3bName( name );
}
- m_tqchildren.append( item->take() );
+ m_children.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_tqchildren.findRef( item );
+ int x = m_children.findRef( item );
if( x > -1 ) {
- K3bDataItem* item = m_tqchildren.take();
+ K3bDataItem* item = m_children.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_tqchildren.isEmpty() )
- return m_tqchildren.getFirst();
+ if( !m_children.isEmpty() )
+ return m_children.getFirst();
else
return K3bDataItem::nextSibling();
}
@@ -185,12 +185,12 @@ K3bDataItem* K3bDirItem::nextSibling() const
K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const
{
- // search for prev in tqchildren
- if( m_tqchildren.findRef( prev ) < 0 ) {
+ // search for prev in children
+ if( m_children.findRef( prev ) < 0 ) {
return 0;
}
else
- return m_tqchildren.next();
+ return m_children.next();
}
@@ -202,7 +202,7 @@ bool K3bDirItem::alreadyInDirectory( const TQString& filename ) const
K3bDataItem* K3bDirItem::find( const TQString& filename ) const
{
- for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
if( it.current()->k3bName() == filename )
return it.current();
}
@@ -323,7 +323,7 @@ bool K3bDirItem::isRemoveable() const
if( !K3bDataItem::isRemoveable() )
return false;
- for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
if( !it.current()->isRemoveable() )
return false;
}
@@ -364,7 +364,7 @@ void K3bDirItem::updateFiles( long files, long dirs )
bool K3bDirItem::isFromOldSession() const
{
- for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_children ); 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( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
if( (*it)->writeToCd() )
return true;
}
diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h
index 304cf1a..a624529 100644
--- a/libk3b/projects/datacd/k3bdiritem.h
+++ b/libk3b/projects/datacd/k3bdiritem.h
@@ -37,8 +37,8 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 );
/**
- * 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 parent dir.
+ * 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.
*/
K3bDirItem( const K3bDirItem& );
@@ -48,7 +48,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
K3bDirItem* getDirItem() const;
- const TQPtrList<K3bDataItem>& tqchildren() const { return m_tqchildren; }
+ const TQPtrList<K3bDataItem>& children() const { return m_children; }
K3bDirItem* addDataItem( K3bDataItem* item );
K3bDataItem* takeDataItem( K3bDataItem* item );
@@ -121,7 +121,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
*/
void updateFiles( long files, long dirs );
- mutable TQPtrList<K3bDataItem> m_tqchildren;
+ mutable TQPtrList<K3bDataItem> m_children;
// size of the items simply added
KIO::filesize_t m_size;
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index 1db1997..d83581c 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -165,14 +165,14 @@ void K3bIsoImager::slotProcessExited( KProcess* p )
emit debuggingOutput( "K3bIsoImager",
TQString("Pipe throughput: %1 bytes read, %2 bytes written.")
- .tqarg(d->pipe->bytesRead()).tqarg(d->pipe->bytesWritten()) );
+ .arg(d->pipe->bytesRead()).arg(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.").tqarg(d->imageFile.name()), WARNING );
+ emit infoMessage( i18n("Removed incomplete image file %1.").arg(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).").tqarg("mkisofs").tqarg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("mkisofs").arg(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.").tqarg("mkisofs"), ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg("mkisofs"), ERROR );
jobFinished( false );
}
}
@@ -356,7 +356,7 @@ void K3bIsoImager::startSizeCalculation()
m_mkisofsPrintSizeResult = 0;
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
- emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR );
cleanup();
jobFinished( false );
@@ -410,8 +410,8 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished()
emit debuggingOutput( "K3bIsoImager",
TQString("mkisofs print size result: %1 (%2 bytes)")
- .tqarg(m_mkisofsPrintSizeResult)
- .tqarg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) );
+ .arg(m_mkisofsPrintSizeResult)
+ .arg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) );
cleanup();
@@ -496,7 +496,7 @@ void K3bIsoImager::start()
if( m_fdToWriteTo == -1 ) {
d->imageFile.setName( d->imagePath );
if( !d->imageFile.open( IO_WriteOnly ) ) {
- emit infoMessage( i18n("Could not open %1 for writing").tqarg(d->imagePath), ERROR );
+ emit infoMessage( i18n("Could not open %1 for writing").arg(d->imagePath), ERROR );
cleanup();
jobFinished(false);
return;
@@ -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.").tqarg("mkisofs"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR );
jobFinished( false );
cleanup();
}
@@ -814,7 +814,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream
// now create the graft points
int num = 0;
- for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) {
K3bDataItem* item = it.current();
bool writeItem = item->writeToCd();
@@ -828,14 +828,14 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream
TQFileInfo f( K3b::resolveLink( item->localPath() ) );
if( !f.exists() ) {
emit infoMessage( i18n("Could not follow link %1 to non-existing file %2. Skipping...")
- .tqarg(item->k3bName())
- .tqarg(f.filePath()), WARNING );
+ .arg(item->k3bName())
+ .arg(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.")
- .tqarg(item->k3bName())
- .tqarg(f.filePath()), WARNING );
+ .arg(item->k3bName())
+ .arg(f.filePath()), WARNING );
writeItem = false;
}
}
@@ -843,11 +843,11 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream
else if( item->isFile() ) {
TQFileInfo f( item->localPath() );
if( !f.exists() ) {
- emit infoMessage( i18n("Could not find file %1. Skipping...").tqarg(item->localPath()), WARNING );
+ emit infoMessage( i18n("Could not find file %1. Skipping...").arg(item->localPath()), WARNING );
writeItem = false;
}
else if( !f.isReadable() ) {
- emit infoMessage( i18n("Could not read file %1. Skipping...").tqarg(item->localPath()), WARNING );
+ emit infoMessage( i18n("Could not read file %1. Skipping...").arg(item->localPath()), WARNING );
writeItem = false;
}
}
@@ -895,7 +895,7 @@ void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream
temp.unlink();
if( !KIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) {
- emit infoMessage( i18n("Failed to backup boot image file %1").tqarg(item->localPath()), ERROR );
+ emit infoMessage( i18n("Failed to backup boot image file %1").arg(item->localPath()), ERROR );
return;
}
diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp
index 99c76bb..7b3270c 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")
- .tqarg("mkisofs").tqarg(d->mkisofsBin->version).tqarg(d->mkisofsBin->copyright),
+ .arg("mkisofs").arg(d->mkisofsBin->version).arg(d->mkisofsBin->copyright),
K3bJob::INFO );
d->firstProgressValue = -1;
@@ -83,7 +83,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line )
// error or warning
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'").tqarg( errorLine.mid( 38, errorLine.length()-40 ) ),
+ handleMkisofsInfoMessage( i18n("Read error from file '%1'").arg( errorLine.mid( 38, errorLine.length()-40 ) ),
K3bJob::ERROR );
d->readError = true;
}
@@ -103,7 +103,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line )
}
else if( line.startsWith( "Incorrectly encoded string" ) ) {
handleMkisofsInfoMessage( i18n("Encountered an incorrectly encoded filename '%1'")
- .tqarg(line.section( TQRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR );
+ .arg(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;
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
index e6d07e8..3aa90b3 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -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.").tqarg("cdrecord"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), K3bJob::ERROR );
jobFinished(false);
return;
}
@@ -89,7 +89,7 @@ void K3bMsInfoFetcher::getMsInfo()
bin = k3bcore->externalBinManager()->binObject( "cdrecord" );
if( !bin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR );
jobFinished(false);
return;
}
@@ -97,7 +97,7 @@ void K3bMsInfoFetcher::getMsInfo()
*m_process << bin->path;
// add the device (e.g. /dev/sg1)
- *m_process << TQString("dev=%1").tqarg( K3b::externalBinDeviceParameter(m_device, bin) );
+ *m_process << TQString("dev=%1").arg( K3b::externalBinDeviceParameter(m_device, bin) );
*m_process << "-msinfo";
@@ -128,7 +128,7 @@ void K3bMsInfoFetcher::getMsInfo()
m_canceled = false;
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
- emit infoMessage( i18n("Could not start %1.").tqarg(bin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(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.")
- .tqarg( m_device->vendor() + " " + m_device->description() ), ERROR );
+ .arg( m_device->vendor() + " " + m_device->description() ), ERROR );
jobFinished( false );
}
}
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
index 2526b28..358bfde 100644
--- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
@@ -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>.")
- .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) {
+ .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) {
emit canceled();
jobFinished(false);
d->running = false;
@@ -189,7 +189,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p )
d->success = true;
}
else {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdBooktypeBin->name()).tqarg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdBooktypeBin->name()).arg(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.").tqarg(d->dvdBooktypeBin->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdBooktypeBin->name()),
ERROR );
d->success = false;
}
@@ -285,7 +285,7 @@ void K3bDvdBooktypeJob::startBooktypeChange()
d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" );
if( !d->dvdBooktypeBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("dvd+rw-booktype"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-booktype"), ERROR );
d->running = false;
jobFinished(false);
return;
@@ -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.").tqarg(d->dvdBooktypeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(d->dvdBooktypeBin->name()), K3bJob::ERROR );
d->running = false;
jobFinished(false);
}
diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp
index 4a4adcb..dda717d 100644
--- a/libk3b/projects/datadvd/k3bdvdjob.cpp
+++ b/libk3b/projects/datadvd/k3bdvdjob.cpp
@@ -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.")
- .tqarg(m_doc->burner()->vendor())
- .tqarg(m_doc->burner()->description()),
+ .arg(m_doc->burner()->vendor())
+ .arg(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.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").arg( 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?")
- .tqarg(m_doc->burner()->vendor())
- .tqarg(m_doc->burner()->description())
- .tqarg( K3bDevice::mediaTypeString(foundMedium, true) ),
+ .arg(m_doc->burner()->vendor())
+ .arg(m_doc->burner()->description())
+ .arg( K3bDevice::mediaTypeString(foundMedium, true) ),
i18n("No Incremental Streaming") ) ) {
return false;
}
else {
- emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").arg( 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.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
}
}
}
@@ -315,13 +315,13 @@ TQString K3bDvdJob::jobDescription() const
return i18n("Writing Data DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
}
else {
return i18n("Writing Multisession DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
}
}
@@ -335,10 +335,10 @@ TQString K3bDvdJob::jobDetails() const
return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
"ISO9660 Filesystem (Size: %1) - %n copies",
m_doc->copies())
- .tqarg(KIO::convertSize( m_doc->size() ));
+ .arg(KIO::convertSize( m_doc->size() ));
else
return i18n("ISO9660 Filesystem (Size: %1)")
- .tqarg(KIO::convertSize( m_doc->size() ));
+ .arg(KIO::convertSize( m_doc->size() ));
}
#include "k3bdvdjob.moc"
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index 4494859..2ac9559 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -253,7 +253,7 @@ void K3bCdrdaoWriter::setWriteArguments()
{
*m_process << "--driver";
if( burnDevice()->cdTextCapable() == 1 )
- *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() );
+ *m_process << TQString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() );
else
*m_process << burnDevice()->cdrdaoDriver();
}
@@ -264,7 +264,7 @@ void K3bCdrdaoWriter::setWriteArguments()
// burn speed
if( d->usedSpeed != 0 )
- *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed);
+ *m_process << "--speed" << TQString("%1").arg(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.").tqarg(m_cdrdaoBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").arg(m_cdrdaoBinObject->version), WARNING );
}
if( k3bcore->globalSettings()->force() ) {
@@ -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.").tqarg(m_cdrdaoBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrdao %1 does not support overburning.").arg(m_cdrdaoBinObject->version), WARNING );
}
}
@@ -342,17 +342,17 @@ void K3bCdrdaoWriter::setReadArguments()
// TAO Source Adjust
if ( m_taoSourceAdjust != -1 )
*m_process << "--tao-source-adjust"
- << TQString("%1").tqarg(m_taoSourceAdjust);
+ << TQString("%1").arg(m_taoSourceAdjust);
// paranoia Mode
if ( m_paranoiaMode != -1 )
*m_process << "--paranoia-mode"
- << TQString("%1").tqarg(m_paranoiaMode);
+ << TQString("%1").arg(m_paranoiaMode);
// session
if ( m_session != -1 )
*m_process << "--session"
- << TQString("%1").tqarg(m_session);
+ << TQString("%1").arg(m_session);
// fast TOC
if ( m_fastToc )
@@ -386,7 +386,7 @@ void K3bCdrdaoWriter::setBlankArguments()
{
*m_process << "--driver";
if( burnDevice()->cdTextCapable() == 1 )
- *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() );
+ *m_process << TQString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() );
else
*m_process << burnDevice()->cdrdaoDriver();
}
@@ -397,7 +397,7 @@ void K3bCdrdaoWriter::setBlankArguments()
// burn speed
if( d->usedSpeed != 0 )
- *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed);
+ *m_process << "--speed" << TQString("%1").arg(d->usedSpeed);
// blank-mode
*m_process << "--blank-mode";
@@ -432,7 +432,7 @@ void K3bCdrdaoWriter::setCommonArguments()
*m_process << "--eject";
// remote
- *m_process << "--remote" << TQString("%1").tqarg(m_cdrdaoComm[0]);
+ *m_process << "--remote" << TQString("%1").arg(m_cdrdaoComm[0]);
// data File
if ( ! m_dataFile.isEmpty() )
@@ -475,7 +475,7 @@ void K3bCdrdaoWriter::start()
m_cdrdaoBinObject = k3bcore->externalBinManager()->binObject("cdrdao");
if( !m_cdrdaoBinObject ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrdao"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("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").tqarg(m_cdrdaoBinObject->name()).tqarg(m_cdrdaoBinObject->version).tqarg(m_cdrdaoBinObject->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(m_cdrdaoBinObject->name()).arg(m_cdrdaoBinObject->version).arg(m_cdrdaoBinObject->copyright), INFO );
// the message size changed in cdrdao 1.1.8)
@@ -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.").tqarg("cdrdao"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg("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...").tqarg(d->usedSpeed),
+ emit infoMessage(i18n("Starting DAO simulation at %1x speed...").arg(d->usedSpeed),
K3bJob::INFO );
emit newTask( i18n("Simulating") );
}
else
{
- emit infoMessage( i18n("Starting DAO writing at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage( i18n("Starting DAO writing at %1x speed...").arg(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...").tqarg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage(i18n("Starting simulation copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Simulating") );
}
else
{
- emit infoMessage( i18n("Starting copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage( i18n("Starting copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Copying") );
}
break;
@@ -676,8 +676,8 @@ bool K3bCdrdaoWriter::cueSheet()
line = line.mid( pos, endPos-pos );
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;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").arg( line ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").arg( binpath ) << endl;
if ( !fi.exists() )
return false;
@@ -691,8 +691,8 @@ bool K3bCdrdaoWriter::cueSheet()
if ( symlink(TQFile::encodeName( m_tocFile ), TQFile::encodeName( tempFile + ".cue") ) == -1 )
return false;
- kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").tqarg( tempFile ) << endl;
- kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").tqarg( tempFile ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").arg( tempFile ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").arg( tempFile ) << endl;
m_binFileLnk = tempFile + ".bin";
m_cueFileLnk = tempFile + ".cue";
return true;
@@ -733,7 +733,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
{
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.").tqarg(m_tocFile).tqarg(m_backupTocFile), ERROR );
+ "K3b was unable to restore it from the backup %2.").arg(m_tocFile).arg(m_backupTocFile), ERROR );
}
else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (TQWidget*) 0) )
{
@@ -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)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
+ emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(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).").tqarg(m_cdrdaoBinObject->name()).tqarg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(m_cdrdaoBinObject->name()).arg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please include the debugging output in your problem report."), K3bJob::ERROR );
}
@@ -794,7 +794,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
}
else
{
- emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("cdrdao"), K3bJob::ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg("cdrdao"), K3bJob::ERROR );
jobFinished( false );
}
}
@@ -810,8 +810,8 @@ void K3bCdrdaoWriter::unknownCdrdaoLine( const TQString& line )
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").tqarg(d->usedSpeed), K3bJob::WARNING );
- emit infoMessage( i18n("Switching down burn speed to %1x").tqarg(speed), K3bJob::WARNING );
+ 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 );
}
}
}
@@ -870,7 +870,7 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const TQString& str )
}
else if( str.startsWith( "Found pre-gap" ) )
{
- emit infoMessage( i18n("Found pregap: %1").tqarg( str.mid(str.find(":")+1) ), K3bJob::INFO );
+ emit infoMessage( i18n("Found pregap: %1").arg( str.mid(str.find(":")+1) ), K3bJob::INFO );
}
else
unknownCdrdaoLine(str);
@@ -903,7 +903,7 @@ void K3bCdrdaoWriter::parseCdrdaoError( const TQString& line )
}
else if( (pos = line.find( "Illegal option" )) > 0 ) {
// ERROR: Illegal option: -wurst
- emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrdaoBinObject->name()).tqarg(line.mid(pos+16)),
+ emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrdaoBinObject->name()).arg(line.mid(pos+16)),
ERROR );
m_knownError = true;
}
diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp
index 53fed8b..78ffb6a 100644
--- a/libk3b/projects/k3bcdrecordwriter.cpp
+++ b/libk3b/projects/k3bcdrecordwriter.cpp
@@ -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 << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
+ *m_process << TQString("dev=%1").arg(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 << TQString("speed=%1").tqarg(d->usedSpeed);
+ *m_process << TQString("speed=%1").arg(d->usedSpeed);
if( m_writingMode == K3b::DAO || m_cue ) {
if( burnDevice()->dao() )
@@ -227,7 +227,7 @@ void K3bCdrecordWriter::prepareProcess()
if( m_cue ) {
m_process->setWorkingDirectory(TQUrl(m_cueFile).dirPath());
- *m_process << TQString("cuefile=%1").tqarg( m_cueFile );
+ *m_process << TQString("cuefile=%1").arg( m_cueFile );
}
if( m_clone )
@@ -249,7 +249,7 @@ void K3bCdrecordWriter::prepareProcess()
bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
if( manualBufferSize ) {
- *m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->bufferSize() );
+ *m_process << TQString("fs=%1m").arg( k3bcore->globalSettings()->bufferSize() );
}
bool overburn = k3bcore->globalSettings()->overburn();
@@ -257,7 +257,7 @@ void K3bCdrecordWriter::prepareProcess()
if( m_cdrecordBinObject->hasFeature("overburn") )
*m_process << "-overburn";
else
- emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), WARNING );
// additional user parameters from config
const TQStringList& params = m_cdrecordBinObject->userParameters();
@@ -293,7 +293,7 @@ void K3bCdrecordWriter::start()
prepareProcess();
if( !m_cdrecordBinObject ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR );
jobFinished(false);
return;
}
@@ -302,9 +302,9 @@ void K3bCdrecordWriter::start()
if( !m_cdrecordBinObject->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
- .tqarg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" )
- .tqarg(m_cdrecordBinObject->version)
- .tqarg(m_cdrecordBinObject->copyright), INFO );
+ .arg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" )
+ .arg(m_cdrecordBinObject->version)
+ .arg(m_cdrecordBinObject->copyright), INFO );
kdDebug() << "***** " << m_cdrecordBinObject->name() << " parameters:\n";
@@ -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.").tqarg(m_cdrecordBinObject->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(m_cdrecordBinObject->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
if( simulate() ) {
emit newTask( i18n("Simulating") );
emit infoMessage( i18n("Starting %1 simulation at %2x speed...")
- .tqarg(K3b::writingModeString(m_writingMode))
- .tqarg(d->usedSpeed),
+ .arg(K3b::writingModeString(m_writingMode))
+ .arg(d->usedSpeed),
K3bJob::INFO );
}
else {
emit newTask( i18n("Writing") );
emit infoMessage( i18n("Starting %1 writing at %2x speed...")
- .tqarg(K3b::writingModeString(m_writingMode))
- .tqarg(d->usedSpeed),
+ .arg(K3b::writingModeString(m_writingMode))
+ .arg(d->usedSpeed),
K3bJob::INFO );
}
}
@@ -510,7 +510,7 @@ void K3bCdrecordWriter::slotStdLine( const TQString& line )
// parse option
int pos = line.find( "Bad Option" ) + 13;
int len = line.length() - pos - 1;
- emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrecordBinObject->name()).tqarg(line.mid(pos, len)),
+ emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrecordBinObject->name()).arg(line.mid(pos, len)),
ERROR );
}
else if( errStr.startsWith("Cannot set speed/dummy") ) {
@@ -562,11 +562,11 @@ void K3bCdrecordWriter::slotStdLine( const TQString& line )
int pos2 = line.find( "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").tqarg(d->usedSpeed), K3bJob::WARNING );
+ emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING );
if( speed > d->usedSpeed )
- emit infoMessage( i18n("Switching burn speed up to %1x").tqarg(speed), K3bJob::WARNING );
+ emit infoMessage( i18n("Switching burn speed up to %1x").arg(speed), K3bJob::WARNING );
else
- emit infoMessage( i18n("Switching burn speed down to %1x").tqarg(speed), K3bJob::WARNING );
+ emit infoMessage( i18n("Switching burn speed down to %1x").arg(speed), K3bJob::WARNING );
}
}
else if( line.startsWith( "Starting new" ) ) {
@@ -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)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
+ emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(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.").tqarg(m_cdrecordBinObject->name()), ERROR );
+ emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").arg(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.").tqarg(d->usedSpeed), ERROR );
+ emit infoMessage( i18n("Unable to set write speed to %1.").arg(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.").tqarg("Cdrecord"), ERROR );
+ emit infoMessage( i18n("%1 has no permission to open the device.").arg("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).")
- .tqarg(m_cdrecordBinObject->name()).tqarg(p->exitStatus()),
+ .arg(m_cdrecordBinObject->name()).arg(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.").tqarg(m_cdrecordBinObject->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg(m_cdrecordBinObject->name()),
ERROR );
jobFinished( false );
}
diff --git a/libk3b/projects/k3bcuefileparser.cpp b/libk3b/projects/k3bcuefileparser.cpp
index 6c54c57..ad666b6 100644
--- a/libk3b/projects/k3bcuefileparser.cpp
+++ b/libk3b/projects/k3bcuefileparser.cpp
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqregexp.h>
#include <tqdir.h>
diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp
index 5e0f996..052315b 100644
--- a/libk3b/projects/k3bdvdrecordwriter.cpp
+++ b/libk3b/projects/k3bdvdrecordwriter.cpp
@@ -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 << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
- *m_process << TQString("speed=%1").tqarg(burnSpeed());
+ *m_process << TQString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
+ *m_process << TQString("speed=%1").arg(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 << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->writingBuffer() );
+ *m_process << TQString("fs=%1m").arg( k3bcore->globalSettings()->writingBuffer() );
}
bool overburn = k3bcore->globalSettings()->overburn();
@@ -103,7 +103,7 @@ void K3bDvdrecordWriter::prepareProcess()
if( m_cdrecordBinObject->hasFeature("overburn") )
*m_process << "-overburn";
else
- emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), INFO );
+ emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), INFO );
// additional user parameters from config
const TQStringList& params = m_cdrecordBinObject->userParameters();
diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp
index fabaaed..d38e0d2 100644
--- a/libk3b/projects/k3bgrowisofshandler.cpp
+++ b/libk3b/projects/k3bgrowisofshandler.cpp
@@ -65,7 +65,7 @@ void K3bGrowisofsHandler::reset( K3bDevice::Device* dev, bool dao )
void K3bGrowisofsHandler::handleStart()
{
-// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBuffertqStatus()) );
+// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBufferStatus()) );
}
@@ -177,8 +177,8 @@ void K3bGrowisofsHandler::handleLine( const TQString& line )
double speed = line.mid( pos, endPos-pos ).toDouble(&ok);
if( ok )
emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)")
- .tqarg((int)(speed*1385.0))
- .tqarg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO );
+ .arg((int)(speed*1385.0))
+ .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO );
else
kdDebug() << "(K3bGrowisofsHandler) parsing error: '" << line.mid( pos, endPos-pos ) << "'" << endl;
}
@@ -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").tqarg(strerror(exitCode-128)),
+ emit infoMessage( i18n("Fatal error at startup: %1").arg(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").tqarg(strerror(exitCode)),
+ emit infoMessage( i18n("Fatal error during recording: %1").arg(strerror(exitCode)),
K3bJob::ERROR );
}
}
@@ -295,7 +295,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode )
}
-void K3bGrowisofsHandler::slotCheckBuffertqStatus()
+void K3bGrowisofsHandler::slotCheckBufferStatus()
{
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::BUFFER_CAPACITY, m_device ),
TQT_SIGNAL(finished(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() );
- TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBuffertqStatus()) );
+ TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBufferStatus()) );
}
else {
kdDebug() << "(K3bGrowisofsHandler) stopping buffer check." << endl;
diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h
index 7150fce..e07548b 100644
--- a/libk3b/projects/k3bgrowisofshandler.h
+++ b/libk3b/projects/k3bgrowisofshandler.h
@@ -73,7 +73,7 @@ class K3bGrowisofsHandler : public TQObject
void flushingCache();
private slots:
- void slotCheckBuffertqStatus();
+ void slotCheckBufferStatus();
void slotCheckBufferStatusDone( K3bDevice::DeviceHandler* );
private:
diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp
index 2881036..b17f9b8 100644
--- a/libk3b/projects/k3bgrowisofswriter.cpp
+++ b/libk3b/projects/k3bgrowisofswriter.cpp
@@ -155,13 +155,13 @@ bool K3bGrowisofsWriter::prepareProcess()
{
d->growisofsBin = k3bcore->externalBinManager()->binObject( "growisofs" );
if( !d->growisofsBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("growisofs"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("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.").tqarg(d->growisofsBin->version),
+ "K3b needs at least version 5.10.").arg(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").tqarg("growisofs")
- .tqarg(d->growisofsBin->version).tqarg(d->growisofsBin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg("growisofs")
+ .arg(d->growisofsBin->version).arg(d->growisofsBin->copyright), INFO );
//
@@ -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.").tqarg(d->image), ERROR );
+ emit infoMessage( i18n("Could not open file %1.").arg(d->image), ERROR );
return false;
}
}
@@ -299,7 +299,7 @@ bool K3bGrowisofsWriter::prepareProcess()
// speed may be a float number. example: DVD+R(W): 2.4x
if( speed != 0 )
- *d->process << TQString("-speed=%1").tqarg( speed%1385 > 0
+ *d->process << TQString("-speed=%1").arg( speed%1385 > 0
? TQString::number( (float)speed/1385.0, 'f', 1 )
: TQString::number( speed/1385 ) );
}
@@ -310,7 +310,7 @@ 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 << TQString("-use-the-force-luke=bufsize:%1m").tqarg(bufSize);
+ *d->process << TQString("-use-the-force-luke=bufsize:%1m").arg(bufSize);
}
// additional user parameters from config
@@ -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.").tqarg(d->growisofsBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(d->growisofsBin->name()), K3bJob::ERROR );
jobFinished(false);
}
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)")
- .tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO );
+ .arg(s).arg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO );
if( simulate() )
emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS );
diff --git a/libk3b/projects/k3bimagefilereader.cpp b/libk3b/projects/k3bimagefilereader.cpp
index 76d8e92..bb2ee95 100644
--- a/libk3b/projects/k3bimagefilereader.cpp
+++ b/libk3b/projects/k3bimagefilereader.cpp
@@ -16,7 +16,7 @@
#include "k3bimagefilereader.h"
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
diff --git a/libk3b/projects/k3binffilewriter.cpp b/libk3b/projects/k3binffilewriter.cpp
index ecfb912..a652179 100644
--- a/libk3b/projects/k3binffilewriter.cpp
+++ b/libk3b/projects/k3binffilewriter.cpp
@@ -22,7 +22,7 @@
#include <k3bversion.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdatetime.h>
@@ -60,7 +60,7 @@ bool K3bInfFileWriter::save( TQTextStream& s )
// ----------------------
// header
s << "# Cdrecord-Inf-File written by K3b " << k3bcore->version()
- << ", " << TQDateTime::tqcurrentDateTime().toString() << endl
+ << ", " << TQDateTime::currentDateTime().toString() << endl
<< "#" << endl;
s << "ISRC=\t\t" << m_isrc << endl;
@@ -130,7 +130,7 @@ bool K3bInfFileWriter::save( TQTextStream& s )
s << "Index0=\t\t" << m_index0 << endl;
- return ( s.tqdevice()->status() == IO_Ok );
+ return ( s.device()->status() == IO_Ok );
}
diff --git a/libk3b/projects/k3binffilewriter.h b/libk3b/projects/k3binffilewriter.h
index 93164ed..1ad3c48 100644
--- a/libk3b/projects/k3binffilewriter.h
+++ b/libk3b/projects/k3binffilewriter.h
@@ -17,7 +17,7 @@
#define _K3B_INF_FILE_WRITER_H_
#include <tqvaluevector.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <k3bmsf.h>
diff --git a/libk3b/projects/k3btocfilewriter.cpp b/libk3b/projects/k3btocfilewriter.cpp
index 249ef84..d7f00c5 100644
--- a/libk3b/projects/k3btocfilewriter.cpp
+++ b/libk3b/projects/k3btocfilewriter.cpp
@@ -21,7 +21,7 @@
#include <k3bversion.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdatetime.h>
@@ -149,7 +149,7 @@ bool K3bTocFileWriter::save( TQTextStream& t )
trackIndex++;
}
- return ( t.tqdevice()->status() == IO_Ok );
+ return ( t.device()->status() == IO_Ok );
}
@@ -157,7 +157,7 @@ void K3bTocFileWriter::writeHeader( TQTextStream& t )
{
// little comment
t << "// TOC-file to use with cdrdao created by K3b " << k3bcore->version()
- << ", " << TQDateTime::tqcurrentDateTime().toString() << endl << endl;
+ << ", " << TQDateTime::currentDateTime().toString() << endl << endl;
t << "// " << m_toc.count() << " tracks" << endl;
if( m_toc.back().session() > 0 ) {
diff --git a/libk3b/projects/k3btocfilewriter.h b/libk3b/projects/k3btocfilewriter.h
index 3127fca..8f2dabb 100644
--- a/libk3b/projects/k3btocfilewriter.h
+++ b/libk3b/projects/k3btocfilewriter.h
@@ -16,7 +16,7 @@
#ifndef _K3B_TOC_FILE_WRITER_H_
#define _K3B_TOC_FILE_WRITER_H_
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstringlist.h>
#include <k3btoc.h>
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp
index e99a1f9..556e606 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.cpp
+++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp
@@ -271,7 +271,7 @@ void K3bMixedJob::startFirstCopy()
else {
emit burning(false);
- emit infoMessage( i18n("Creating audio image files in %1").tqarg(m_doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating audio image files in %1").arg(m_doc->tempDir()), INFO );
m_tempFilePrefix = K3b::findUniqueFilePrefix( ( !m_doc->audioDoc()->title().isEmpty()
? m_doc->audioDoc()->title()
@@ -375,8 +375,8 @@ void K3bMixedJob::slotMsInfoFetched( bool success )
m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo() );
else // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord
m_isoImager->setMultiSessionInfo( TQString("%1,%2")
- .tqarg(m_msInfoFetcher->lastSessionStart())
- .tqarg(m_msInfoFetcher->nextSessionStart()+150) );
+ .arg(m_msInfoFetcher->lastSessionStart())
+ .arg(m_msInfoFetcher->nextSessionStart()+150) );
if( m_doc->onTheFly() ) {
m_currentAction = PREPARING_DATA;
@@ -611,9 +611,9 @@ 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")
- .tqarg(t)
- .tqarg(tt)
- .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ .arg(t)
+ .arg(tt)
+ .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
}
@@ -696,7 +696,7 @@ bool K3bMixedJob::prepareWriter()
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(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -850,7 +850,7 @@ void K3bMixedJob::addDataTrack( K3bCdrecordWriter* writer )
writer->addArgument( "-data" );
if( m_doc->onTheFly() )
- writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-");
+ writer->addArgument( TQString("-tsize=%1s").arg(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")
- .tqarg(t)
- .tqarg(m_doc->numOfTracks())
- .tqarg( track->title().isEmpty() || track->artist().isEmpty()
+ .arg(t)
+ .arg(m_doc->numOfTracks())
+ .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
else
- emit newSubTask( i18n("Writing track %1 of %2 (%3)").tqarg(t).tqarg(m_doc->numOfTracks()).tqarg(i18n("ISO9660 data")) );
+ emit newSubTask( i18n("Writing track %1 of %2 (%3)").arg(t).arg(m_doc->numOfTracks()).arg(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").tqarg(d->copiesDone+1) );
+ emit newTask( i18n("Writing second session of copy %1").arg(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").tqarg(d->copiesDone+1) );
+ emit newTask( i18n("Writing first session of copy %1").arg(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").tqarg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").arg(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").tqarg(m_isoImageFilePath) );
- emit infoMessage( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath), INFO );
+ emit newSubTask( i18n("Creating ISO image in %1").arg(m_isoImageFilePath) );
+ emit infoMessage( i18n("Creating ISO image in %1").arg(m_isoImageFilePath), INFO );
m_isoImager->writeToImageFile( m_isoImageFilePath );
m_isoImager->start();
@@ -1102,7 +1102,7 @@ void K3bMixedJob::removeBufferFiles()
if( TQFile::exists( m_isoImageFilePath ) )
if( !TQFile::remove( m_isoImageFilePath ) )
- emit infoMessage( i18n("Could not delete file %1.").tqarg(m_isoImageFilePath), ERROR );
+ emit infoMessage( i18n("Could not delete file %1.").arg(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.").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
+ emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").arg(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 );
@@ -1316,21 +1316,21 @@ TQString K3bMixedJob::jobDescription() const
return i18n("Writing Enhanced Audio CD")
+ ( m_doc->audioDoc()->title().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) );
+ : TQString( " (%1)" ).arg(m_doc->audioDoc()->title()) );
else
return i18n("Writing Mixed Mode CD")
+ ( m_doc->audioDoc()->title().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) );
+ : TQString( " (%1)" ).arg(m_doc->audioDoc()->title()) );
}
TQString K3bMixedJob::jobDetails() const
{
return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)")
- .tqarg(m_doc->numOfTracks())
- .tqarg(m_doc->audioDoc()->length().toString())
- .tqarg(KIO::convertSize(m_doc->dataDoc()->size()))
+ .arg(m_doc->numOfTracks())
+ .arg(m_doc->audioDoc()->length().toString())
+ .arg(KIO::convertSize(m_doc->dataDoc()->size()))
+ ( m_doc->copies() > 1 && !m_doc->dummy()
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp
index cedf255..06b1d31 100644
--- a/libk3b/projects/movixcd/k3bmovixdoc.cpp
+++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp
@@ -417,7 +417,7 @@ void K3bMovixDoc::addSubTitleItem( K3bMovixFileItem* item, const KURL& url )
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.").tqarg(name) );
+ KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").arg(name) );
return;
}
diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
index 79c70b3..b09f55d 100644
--- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
+++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
@@ -31,7 +31,7 @@
#include <ktempfile.h>
#include <kio/global.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
@@ -190,7 +190,7 @@ bool K3bMovixDocPreparer::writePlaylistFile()
return true;
}
else {
- emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->playlistFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").arg(d->playlistFile->name()), ERROR );
return false;
}
}
@@ -229,7 +229,7 @@ bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const TQString& originalPath
return false;
}
else {
- emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->isolinuxConfigFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").arg(d->isolinuxConfigFile->name()), ERROR );
return false;
}
}
@@ -263,7 +263,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile()
return true;
}
else {
- emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->movixRcFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").arg(d->movixRcFile->name()), ERROR );
return false;
}
}
diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp
index 8edcaae..eb8b276 100644
--- a/libk3b/projects/movixcd/k3bmovixjob.cpp
+++ b/libk3b/projects/movixcd/k3bmovixjob.cpp
@@ -39,7 +39,7 @@ K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* parent
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(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(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&)) );
@@ -115,7 +115,7 @@ TQString K3bMovixJob::jobDescription() const
if( m_doc->isoOptions().volumeID().isEmpty() )
return i18n("Writing eMovix CD");
else
- return i18n("Writing eMovix CD (%1)").tqarg(m_doc->isoOptions().volumeID());
+ return i18n("Writing eMovix CD (%1)").arg(m_doc->isoOptions().volumeID());
}
@@ -123,7 +123,7 @@ 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()).tqarg(KIO::convertSize(m_doc->size()))
+ m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size()))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp
index 4c609db..6f01d69 100644
--- a/libk3b/projects/movixcd/k3bmovixprogram.cpp
+++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp
@@ -23,7 +23,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
K3bMovixProgram::K3bMovixProgram()
diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
index 362511f..097d004 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
+++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
@@ -39,7 +39,7 @@ K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject
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(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(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&)) );
@@ -114,7 +114,7 @@ TQString K3bMovixDvdJob::jobDescription() const
if( m_doc->isoOptions().volumeID().isEmpty() )
return i18n("Writing eMovix DVD");
else
- return i18n("Writing eMovix DVD (%1)").tqarg(m_doc->isoOptions().volumeID());
+ return i18n("Writing eMovix DVD (%1)").arg(m_doc->isoOptions().volumeID());
}
@@ -122,7 +122,7 @@ 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()).tqarg(KIO::convertSize(m_doc->size()))
+ m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size()))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/projects/videocd/cdi/cdi_vcd.app b/libk3b/projects/videocd/cdi/cdi_vcd.app
index 31a7527..ceb31fc 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/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index a361d5d..272591a 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -21,7 +21,7 @@
#include <tqdom.h>
#include <tqdatetime.h>
#include <tqtimer.h>
-#include <tqtextstream.h>
+#include <textstream.h>
// KDE-includes
#include <kprocess.h>
@@ -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." )
- .tqarg( i18n( "VCD" ) )
- .tqarg( i18n( "VCD" ) ),
+ .arg( i18n( "VCD" ) )
+ .arg( 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." )
- .tqarg( i18n( "SVCD" ) )
- .tqarg( i18n( "SVCD" ) )
+ .arg( i18n( "SVCD" ) )
+ .arg( i18n( "SVCD" ) )
+ "\n\n"
+ i18n( "Note: Forcing MPEG2 as VCD is not supported by "
"some standalone DVD players." ),
@@ -448,7 +448,7 @@ void K3bVcdDoc::setPbcTracks()
if ( m_tracks ) {
int count = m_tracks->count();
- kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).tqarg( count ) << endl;
+ kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).arg( count ) << endl;
TQPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks );
K3bVcdTrack* track;
@@ -574,7 +574,7 @@ bool K3bVcdDoc::loadDocumentData( TQDomElement* root )
TQDomNode item = vcdNodes.item( i );
TQString name = item.nodeName();
- kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).tqarg( name ) << endl;
+ kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).arg( name ) << endl;
if ( name == "volumeId" )
vcdOptions() ->setVolumeId( item.toElement().text() );
diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h
index 1878c31..1e92fc9 100644
--- a/libk3b/projects/videocd/k3bvcddoc.h
+++ b/libk3b/projects/videocd/k3bvcddoc.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqimage.h>
// Kde Includes
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index 662145c..18c5678 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -106,7 +106,7 @@ void K3bVcdJob::cancelAll()
// remove bin-file if it is unfinished or the user selected to remove image
if ( TQFile::exists( m_doc->vcdImage() ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) {
- emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS );
+ emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS );
TQFile::remove
( m_doc->vcdImage() );
m_doc->setVcdImage( "" );
@@ -116,7 +116,7 @@ void K3bVcdJob::cancelAll()
// remove cue-file if it is unfinished or the user selected to remove image
if ( TQFile::exists( m_cueFile ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) {
- emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS );
+ emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS );
TQFile::remove
( m_cueFile );
m_cueFile = "";
@@ -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." ).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( "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( "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." ).tqarg( "Vcdxbuild" ).tqarg( "0.7.12" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).arg( "Vcdxbuild" ).arg( "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,7 +202,7 @@ void K3bVcdJob::vcdxBuild()
}
if ( !bin->copyright.isEmpty() )
- emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO );
+ emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO );
*m_process << bin;
@@ -219,11 +219,11 @@ void K3bVcdJob::vcdxBuild()
*m_process << "--progress" << "--gui";
- *m_process << TQString( "--cue-file=%1" ).tqarg( m_cueFile );
+ *m_process << TQString( "--cue-file=%1" ).arg( m_cueFile );
- *m_process << TQString( "--bin-file=%1" ).tqarg( m_doc->vcdImage() );
+ *m_process << TQString( "--bin-file=%1" ).arg( m_doc->vcdImage() );
- *m_process << TQString( "%1" ).tqarg( TQFile::encodeName( m_xmlFile ).data() );
+ *m_process << TQString( "%1" ).arg( TQFile::encodeName( m_xmlFile ).data() );
connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) );
@@ -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." ).tqarg( "vcdxbuild" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxbuild" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
}
@@ -290,7 +290,7 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len )
const uint index = el.attribute( "id" ).replace( TQRegExp( "sequence-" ), "" ).toUInt();
m_currentWrittenTrack = m_doc->at( m_currentWrittenTrackNumber );
- emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).tqarg( index + 1 ).tqarg( doc() ->numOfTracks() ).tqarg( m_currentWrittenTrack->fileName() ) );
+ emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).arg( index + 1 ).arg( doc() ->numOfTracks() ).arg( m_currentWrittenTrack->fileName() ) );
m_bytesFinished = 0;
if ( !firstTrack ) {
@@ -324,15 +324,15 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len )
if ( tel.isText() ) {
const TQString text = tel.data();
if ( m_stage == stageWrite && level == "information" )
- kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).arg( text ) << endl;
if ( ( text ).startsWith( "writing track" ) )
- emit newSubTask( i18n( "Creating Image for track %1" ).tqarg( ( text ).mid( 14 ) ) );
+ emit newSubTask( i18n( "Creating Image for track %1" ).arg( ( text ).mid( 14 ) ) );
else {
if ( level != "error" ) {
- kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).arg( text ) << endl;
parseInformation( text );
} else {
- kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).arg( 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)." ).tqarg( "vcdxbuild" ).tqarg( m_process->exitStatus() ),
+ emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxbuild" ).arg( m_process->exitStatus() ),
K3bJob::ERROR );
emit infoMessage( i18n( "Please send me an email with the last output." ), K3bJob::ERROR );
cancelAll();
@@ -361,7 +361,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
return ;
}
} else {
- emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxbuild" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxbuild" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
return ;
@@ -372,7 +372,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
TQFile::remove
( m_xmlFile );
- kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).tqarg( vcdDoc() ->onlyCreateImages() ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).arg( vcdDoc() ->onlyCreateImages() ) << endl;
if ( !vcdDoc() ->onlyCreateImages() )
startWriterjob();
else
@@ -381,7 +381,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
void K3bVcdJob::startWriterjob()
{
- kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).arg( m_currentcopy ).arg( 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" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) );
+ emit newTask( i18n( "Writing Copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) );
emit burning( true );
m_writerJob->start();
@@ -438,7 +438,7 @@ bool K3bVcdJob::prepareWriterJob()
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( buffer( int ) ), this, TQT_SIGNAL( bufferStatus( int ) ) );
connect( m_writerJob, TQT_SIGNAL( deviceBuffer( int ) ), this, TQT_SIGNAL( deviceBuffer( int ) ) );
connect( m_writerJob, TQT_SIGNAL( writeSpeed( int, int ) ), this, TQT_SIGNAL( writeSpeed( int, int ) ) );
connect( m_writerJob, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotWriterJobFinished( bool ) ) );
@@ -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" ).tqarg( t ).tqarg( tt ) );
+ emit newSubTask( i18n( "Writing Track %1 of %2" ).arg( t ).arg( tt ) );
}
void K3bVcdJob::slotWriterJobFinished( bool success )
@@ -473,7 +473,7 @@ void K3bVcdJob::slotWriterJobFinished( bool success )
// remove bin-file if it is unfinished or the user selected to remove image
if ( TQFile::exists( m_doc->vcdImage() ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) {
- emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS );
+ emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS );
TQFile::remove
( m_doc->vcdImage() );
m_doc->setVcdImage( "" );
@@ -483,7 +483,7 @@ void K3bVcdJob::slotWriterJobFinished( bool success )
// remove cue-file if it is unfinished or the user selected to remove image
if ( TQFile::exists( m_cueFile ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) {
- emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS );
+ emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS );
TQFile::remove
( m_cueFile );
m_cueFile = "";
@@ -512,7 +512,7 @@ void K3bVcdJob::parseInformation( const TQString &text )
if ( text.contains( "mpeg user scan data: one or more BCD fields out of range for" ) ) {
int index = text.find( " for" );
- emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).tqarg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING );
+ emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).arg( 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" ) ) {
emit infoMessage( i18n( "From now on, scan information data errors will not be reported anymore" ), K3bJob::INFO );
@@ -523,7 +523,7 @@ void K3bVcdJob::parseInformation( const TQString &text )
int index2 = text.find( ", last seen pts" );
int index3 = text.find( ") -- ignoring this aps" );
- 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( "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( "Ignoring this aps" ), K3bJob::INFO );
} else if ( text.contains( "bad packet at packet" ) ) {
@@ -532,8 +532,8 @@ void K3bVcdJob::parseInformation( const TQString &text )
int index3 = text.find( ") -- remaining " );
int index4 = text.find( "bytes of stream will be ignored" );
- 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 );
+ 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 );
}
}
@@ -558,7 +558,7 @@ TQString K3bVcdJob::jobDetails() const
{
return ( i18n( "1 MPEG (%1)",
"%n MPEGs (%1)",
- m_doc->tracks() ->count() ).tqarg( KIO::convertSize( m_doc->size() ) )
+ m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) )
+ ( m_doc->copies() > 1
? i18n( " - %n copy", " - %n copies", m_doc->copies() )
: TQString() ) );
diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp
index 854919f..9b80a8d 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.cpp
+++ b/libk3b/projects/videocd/k3bvcdoptions.cpp
@@ -37,7 +37,7 @@ K3bVcdOptions::K3bVcdOptions()
m_volumeID( "VIDEOCD" ),
m_albumID( "" ),
m_volumeSetId( "" ),
- m_publisher( TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ) ),
+ m_publisher( TQString( "K3b - Version %1" ).arg( k3bcore->version() ) ),
m_applicationId( "CDI/CDI_VCD.APP;1" ),
m_systemId( "CD-RTOS CD-BRIDGE" ),
m_vcdclass( "vcd" ),
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index b008476..3ed27f9 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -159,7 +159,7 @@ const TQString K3bVcdTrack::resolution()
if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) {
- return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ i ].hsize ).tqarg( mpeg_info->video[ i ].vsize );
+ return TQString( "%1 x %2" ).arg( mpeg_info->video[ i ].hsize ).arg( mpeg_info->video[ i ].vsize );
}
}
}
@@ -171,7 +171,7 @@ const TQString K3bVcdTrack::highresolution()
{
if ( mpeg_info->has_video ) {
if ( mpeg_info->video[ 2 ].seen ) {
- return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ 2 ].hsize ).tqarg( mpeg_info->video[ 2 ].vsize );
+ return TQString( "%1 x %2" ).arg( mpeg_info->video[ 2 ].hsize ).arg( mpeg_info->video[ 2 ].vsize );
}
}
return i18n( "n/a" );
@@ -195,7 +195,7 @@ 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" ).tqarg( mpeg_info->video[ i ].bitrate ) ;
+ return i18n( "%1 bit/s" ).arg( mpeg_info->video[ i ].bitrate ) ;
}
}
}
@@ -284,7 +284,7 @@ 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" ).tqarg( mpeg_info->audio[ i ].bitrate ) ;
+ return i18n( "%1 bit/s" ).arg( mpeg_info->audio[ i ].bitrate ) ;
}
}
}
@@ -297,7 +297,7 @@ 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" ).tqarg( mpeg_info->audio[ i ].sampfreq ) ;
+ return i18n( "%1 Hz" ).arg( mpeg_info->audio[ i ].sampfreq ) ;
}
}
}
@@ -337,16 +337,16 @@ const TQString K3bVcdTrack::mpegTypeS( bool audio )
for ( int i = 0; i < 3; i++ )
if ( mpeg_info->video[ i ].seen ) {
if ( i == 0 ) {
- return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Motion Picture" );
+ return TQString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Motion Picture" );
} else {
- return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Still Picture" );
+ return TQString( "MPEG%1 " ).arg( 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 TQString( "MPEG%1 " ).tqarg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).tqarg( mpeg_info->audio[ i ].layer );
+ return TQString( "MPEG%1 " ).arg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).arg( mpeg_info->audio[ i ].layer );
}
}
@@ -423,10 +423,10 @@ TQString K3bVcdTrack::SecsToHMS( double duration )
byte mins = ( byte ) ( ( duration / 60 ) - ( hours * 60 ) );
float secs = duration - 60 * mins - 3600 * hours;
if ( hours != 0 ) {
- return TQString( "%1:" ).tqarg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
+ return TQString( "%1:" ).arg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
}
if ( mins != 0 ) {
- return TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
+ return TQString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
}
return TQString::number( secs, 'f', 2 );
}
diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp
index 203f54f..6881946 100644
--- a/libk3b/projects/videocd/k3bvcdxmlview.cpp
+++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp
@@ -131,7 +131,7 @@ bool K3bVcdXmlView::write( const TQString& fname )
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", TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ).upper() );
+ addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).arg( k3bcore->version() ).upper() );
addSubElement( xmlDoc, elemPvd, "publisher-id", m_doc->vcdOptions() ->publisher().upper() );
@@ -180,7 +180,7 @@ bool K3bVcdXmlView::write( const TQString& fname )
filename = locate( "data", "k3b/extra/k3bphotosvcd.mpg" );
elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" );
- elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( filename ).data() ) );
+ elemsequenceItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( filename ).data() ) );
elemsequenceItem.setAttribute( "id", "sequence-000" );
// default entry
TQDomElement elemdefaultEntry;
@@ -199,19 +199,19 @@ bool K3bVcdXmlView::write( const TQString& fname )
TQString seqId = TQString::number( it.current() ->index() ).rightJustify( 3, '0' );
elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" );
- elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
- elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).tqarg( seqId ) );
+ elemsequenceItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
+ elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).arg( seqId ) );
// default entry
TQDomElement elemdefaultEntry;
elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" );
- elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).tqarg( seqId ) );
+ elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).arg( seqId ) );
} else {
// sequence-items element needs at least one segment to fit the XML
elemsegmentItem = addSubElement( xmlDoc, elemsegmentItems, "segment-item" );
- 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' ) ) );
+ elemsegmentItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
+ elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).arg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) );
}
}
@@ -232,7 +232,7 @@ bool K3bVcdXmlView::write( const TQString& fname )
}
m_xmlstring = xmlDoc.toString();
- kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).tqarg( fname ) << endl;
+ kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).arg( fname ) << endl;
TQFile xmlFile( fname );
if ( xmlFile.open( IO_WriteOnly ) ) {
@@ -267,7 +267,7 @@ TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& par
TQDomElement element = doc.createElement( name );
parent.appendChild( element );
if ( value >= -1 ) {
- TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) );
+ TQDomText t = doc.createTextNode( TQString( "%1" ).arg( value ) );
element.appendChild( t );
}
return element;
@@ -284,7 +284,7 @@ TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement&
void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& parent, const TQString& src, const TQString& name, bool mixed )
{
TQDomElement elemFile = addSubElement( doc, parent, "file" );
- elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) );
+ elemFile.setAttribute( "src", TQString( "%1" ).arg( src ) );
if ( mixed )
elemFile.setAttribute( "format", "mixed" );
@@ -296,7 +296,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
TQString ref = ( track->isSegment() ) ? "segment" : "sequence";
TQDomElement elemSelection = addSubElement( doc, parent, "selection" );
- elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
setNumkeyBSN( doc, elemSelection, track );
@@ -310,24 +310,24 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
switch ( i ) {
case K3bVcdTrack::PREVIOUS:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "prev" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::NEXT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "next" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::RETURN:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "return" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::DEFAULT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "default" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::AFTERTIMEOUT:
if ( track->getWaitTime() >= 0 ) {
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "timeout" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
}
break;
}
@@ -369,7 +369,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
else
loop.setAttribute( "jump-timing", "immediate" );
- addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
setNumkeySEL( doc, elemSelection, track );
}
@@ -410,30 +410,30 @@ void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& parent, K3bV
for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) {
- kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl;
+ kdDebug() << TQString( "trackIt key: %1 none: %2" ).arg( trackIt.key() ).arg( none ) << endl;
while ( none < trackIt.key() ) {
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
- addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).arg( none ).arg( TQFile::encodeName( track->absPath() ).data() ) );
none++;
}
if ( trackIt.data() ) {
TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence";
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) );
- addComment( doc, parent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) );
+ addComment( doc, parent, TQString( "key %1 -> %2" ).arg( trackIt.key() ).arg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) );
} else {
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" );
- addComment( doc, parent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) );
+ addComment( doc, parent, TQString( "key %1 -> end" ).arg( trackIt.key() ) );
}
none++;
}
} else {
// default reference to itSelf
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
}
}
}
diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
index 089f22d..6192024 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() << TQString( "Unable to open %1" ).tqarg( m_filename ) << endl;
+ kdDebug() << TQString( "Unable to open %1" ).arg( m_filename ) << endl;
return ;
}
if ( fseeko( m_mpegfile, 0, SEEK_END ) ) {
- kdDebug() << TQString( "Unable to seek in file %1" ).tqarg( m_filename ) << endl;
+ kdDebug() << TQString( "Unable to seek in file %1" ).arg( m_filename ) << endl;
return ;
}
llong lof = ftello( m_mpegfile );
if ( lof == -1 ) {
- kdDebug() << TQString( "Seeking to end of input file %1 failed." ).tqarg( m_filename ) << endl;
+ kdDebug() << TQString( "Seeking to end of input file %1 failed." ).arg( 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() << TQString( "File %1 is empty." ).tqarg( m_filename ) << endl;
- m_error_string = i18n( "File %1 is empty." ).tqarg( m_filename );
+ kdDebug() << TQString( "File %1 is empty." ).arg( m_filename ) << endl;
+ m_error_string = i18n( "File %1 is empty." ).arg( m_filename );
return ;
}
@@ -90,7 +90,7 @@ bool K3bMpegInfo::MpegParsePacket ()
if ( !EnsureMPEG( 0, MPEG_PACK_HEADER_CODE ) ) {
llong code = GetNBytes( 0, 4 );
- 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;
+ kdDebug() << TQString( "(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;
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() << TQString( "Skipped %1 zeroes at start of file" ).tqarg( offset ) << endl;
+ kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).arg( offset ) << endl;
}
// here while schleife
@@ -190,7 +190,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
int bits;
case MPEG_PACK_HEADER_CODE:
- // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).tqarg( offset ) << endl;
+ // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).arg( 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() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl;
+ kdDebug() << TQString( "Initial TS = %1" ).arg( 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() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl;
+ kdDebug() << TQString( "Initial TS = %1" ).arg( m_initial_TS ) << endl;
}
} else {
- kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).tqarg( bits ) << endl;
+ kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).arg( 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() << TQString( "offset = %1, size = %2" ).tqarg( offset ).tqarg( size ) << endl;
+ // kdDebug() << TQString( "offset = %1, size = %2" ).arg( offset ).arg( size ) << endl;
switch ( mark ) {
case MPEG_SYSTEM_HEADER_CODE:
- // kdDebug() << TQString( "Systemheader: %1" ).tqarg( m_code, 0, 16 ) << endl;
+ // kdDebug() << TQString( "Systemheader: %1" ).arg( 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() << TQString( "PrivateCode: %1" ).tqarg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "PrivateCode: %1" ).arg( mark, 0, 16 ) << endl;
break;
}
break;
case MPEG_PROGRAM_END_CODE:
- kdDebug() << TQString( "ProgramEndCode: %1" ).tqarg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "ProgramEndCode: %1" ).arg( mark, 0, 16 ) << endl;
offset += 4;
break;
case MPEG_PICTURE_CODE:
- kdDebug() << TQString( "PictureCode: %1" ).tqarg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "PictureCode: %1" ).arg( 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() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).arg( offset ).arg( m_filename ).arg( 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() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( 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() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
return 0x11;
}
diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
index f175779..859ed89 100644
--- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
#include <tqfile.h>
#include <tqptrlist.h>
@@ -108,26 +108,26 @@ int K3bVideoDvdImager::writePathSpec()
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'.").tqarg(d->tempPath), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath), ERROR );
return -1;
}
dir.cd( d->tempPath );
if( !dir.mkdir( "VIDEO_TS" ) ) {
- emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath + "/VIDEO_TS"), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath + "/VIDEO_TS"), ERROR );
return -1;
}
- for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it ) {
if( (*it)->isDir() ) {
- emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").tqarg((*it)->k3bName()), ERROR );
+ emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").arg((*it)->k3bName()), ERROR );
return -1;
}
// convert to upper case names
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 );
+ emit infoMessage( i18n("Unable to link temporary file in folder %1.").arg( d->tempPath ), ERROR );
return -1;
}
}
@@ -148,7 +148,7 @@ int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& s
}
int num = 0;
- for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) {
K3bDataItem* item = it.current();
num++;
@@ -195,7 +195,7 @@ void K3bVideoDvdImager::cleanup()
if( TQFile::exists( d->tempPath ) ) {
TQDir dir( d->tempPath );
dir.cd( "VIDEO_TS" );
- for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it )
+ for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it )
dir.remove( (*it)->k3bName().upper() );
dir.cdUp();
dir.rmdir( "VIDEO_TS" );
diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
index 194dff7..9b6a178 100644
--- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp
@@ -85,14 +85,14 @@ TQString K3bVideoDvdJob::jobDescription() const
return i18n("Writing Video DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty()
? TQString()
- : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
}
}
TQString K3bVideoDvdJob::jobDetails() const
{
- return ( i18n("ISO9660/Udf Filesystem (Size: %1)").tqarg(KIO::convertSize( doc()->size() ))
+ return ( i18n("ISO9660/Udf Filesystem (Size: %1)").arg(KIO::convertSize( doc()->size() ))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );
diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp
index a5f81e3..34615e3 100644
--- a/libk3b/tools/k3bbusywidget.cpp
+++ b/libk3b/tools/k3bbusywidget.cpp
@@ -68,13 +68,13 @@ void K3bBusyWidget::animateBusy()
}
-TQSize K3bBusyWidget::tqsizeHint() const
+TQSize K3bBusyWidget::sizeHint() const
{
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
-TQSize K3bBusyWidget::tqminimumSizeHint() const
+TQSize K3bBusyWidget::minimumSizeHint() const
{
return TQSize( 2*frameWidth() + 62, 10 );
}
diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h
index 7eb927e..bbaddc0 100644
--- a/libk3b/tools/k3bbusywidget.h
+++ b/libk3b/tools/k3bbusywidget.h
@@ -35,8 +35,8 @@ class LIBK3B_EXPORT K3bBusyWidget : public TQFrame
void showBusy( bool b );
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
protected:
void drawContents( TQPainter* p );
diff --git a/libk3b/tools/k3bcdparanoialib.h b/libk3b/tools/k3bcdparanoialib.h
index bbeb19e..ff4a09a 100644
--- a/libk3b/tools/k3bcdparanoialib.h
+++ b/libk3b/tools/k3bcdparanoialib.h
@@ -122,7 +122,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib
*/
int status() const;
- enum tqStatus {
+ enum Status {
S_OK,
S_ERROR
// to be extended with Jitter and stuff...
diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp
index 3536c24..089e27e 100644
--- a/libk3b/tools/k3bcutcombobox.cpp
+++ b/libk3b/tools/k3bcutcombobox.cpp
@@ -45,7 +45,7 @@ K3bCutComboBox::K3bCutComboBox( TQWidget* parent, const char* name )
: KComboBox( parent, name )
{
d = new Private();
- // tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() );
+ // setSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() );
}
@@ -70,9 +70,9 @@ void K3bCutComboBox::setMethod( int m )
}
-TQSize K3bCutComboBox::tqsizeHint() const
+TQSize K3bCutComboBox::sizeHint() const
{
-// TQSize s(KComboBox::tqsizeHint());
+// TQSize s(KComboBox::sizeHint());
// for( int i = 0; i < count(); i++ ) {
// int w = fontMetrics().width(d->originalItems[i]) +
@@ -81,12 +81,12 @@ TQSize K3bCutComboBox::tqsizeHint() const
// s.setWidth( w );
// }
- return KComboBox::tqsizeHint();
+ return KComboBox::sizeHint();
}
-TQSize K3bCutComboBox::tqminimumSizeHint() const
+TQSize K3bCutComboBox::minimumSizeHint() const
{
- return KComboBox::tqminimumSizeHint();
+ return KComboBox::minimumSizeHint();
}
@@ -205,7 +205,7 @@ void K3bCutComboBox::resizeEvent( TQResizeEvent* e )
void K3bCutComboBox::cutText()
{
- d->width = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this,
+ d->width = TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField), this ).width();
for( int i = 0; i < (int)d->originalItems.count(); ++i ) {
diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h
index 7bc8f70..6fdf18e 100644
--- a/libk3b/tools/k3bcutcombobox.h
+++ b/libk3b/tools/k3bcutcombobox.h
@@ -54,10 +54,10 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox
void setMethod( int );
/** reimplemeted */
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
/** reimplemeted */
- TQSize tqminimumSizeHint() const;
+ TQSize minimumSizeHint() const;
/** reimplemeted */
virtual void setCurrentText( const TQString& );
diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp
index 0c6c3f4..0c8a3b3 100644
--- a/libk3b/tools/k3bdeviceselectiondialog.cpp
+++ b/libk3b/tools/k3bdeviceselectiondialog.cpp
@@ -22,7 +22,7 @@
#include <k3bdevicemanager.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqstring.h>
#include <tqframe.h>
diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp
index fb3be4b..f59ca38 100644
--- a/libk3b/tools/k3blistview.cpp
+++ b/libk3b/tools/k3blistview.cpp
@@ -33,7 +33,7 @@
#include <tqevent.h>
#include <tqvalidator.h>
#include <tqfont.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqstyle.h>
#include <tqapplication.h>
#include <tqprogressbar.h>
@@ -272,7 +272,7 @@ void K3bListViewItem::setBackgroundColor( int col, const TQColor& c )
ColumnInfo* info = getColumnInfo( col );
info->backgroundColorSet = true;
info->backgroundColor = c;
- tqrepaint();
+ repaint();
}
@@ -281,7 +281,7 @@ void K3bListViewItem::setForegroundColor( int col, const TQColor& c )
ColumnInfo* info = getColumnInfo( col );
info->foregroundColorSet = true;
info->foregroundColor = c;
- tqrepaint();
+ repaint();
}
@@ -299,7 +299,7 @@ void K3bListViewItem::setProgress( int col, int p )
setDisplayProgressBar( col, true );
if( info->progressValue != p ) {
info->progressValue = p;
- tqrepaint();
+ repaint();
}
}
@@ -309,7 +309,7 @@ void K3bListViewItem::setTotalSteps( int col, int steps )
ColumnInfo* info = getColumnInfo( col );
info->totalProgressSteps = steps;
- tqrepaint();
+ repaint();
}
@@ -318,14 +318,14 @@ void K3bListViewItem::setMarginHorizontal( int col, int margin )
ColumnInfo* info = getColumnInfo( col );
info->margin = margin;
- tqrepaint();
+ repaint();
}
void K3bListViewItem::setMarginVertical( int margin )
{
m_vMargin = margin;
- tqrepaint();
+ repaint();
}
@@ -364,7 +364,7 @@ void K3bListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col,
if( info->backgroundColorSet )
cgh.setColor( TQColorGroup::Base, info->backgroundColor );
- // in case this is the selected row has a margin we need to tqrepaint the selection bar
+ // in case this is the selected row has a margin we need to repaint the selection bar
if( isSelected() &&
(col == 0 || listView()->allColumnsShowFocus()) &&
info->margin > 0 ) {
@@ -445,11 +445,11 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i
s_dummyProgressBar->setTotalSteps( info->totalProgressSteps );
s_dummyProgressBar->setProgress( info->progressValue );
- // some styles use the widget's tqgeometry
+ // some styles use the widget's geometry
s_dummyProgressBar->setGeometry( r );
- listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
- listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
+ listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
+ listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags );
// now we really paint the progress in the listview
p->drawPixmap( 0, 0, *doubleBuffer );
@@ -498,7 +498,7 @@ bool K3bCheckListViewItem::isChecked() const
void K3bCheckListViewItem::setChecked( bool checked )
{
m_checked = checked;
- tqrepaint();
+ repaint();
}
@@ -508,7 +508,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i
if( col == 0 ) {
if( m_checked ) {
- TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
+ TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() );
TQStyle::SFlags flags = TQStyle::Style_Default;
if( listView()->isEnabled() )
@@ -666,7 +666,7 @@ void K3bListView::showEditor( K3bListViewItem* item, int col )
void K3bListView::placeEditor( K3bListViewItem* item, int col )
{
ensureItemVisible( item );
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
r.setX( contentsToViewport( TQPoint(header()->sectionPos( col ), 0) ).x() );
r.setWidth( header()->sectionSize( col ) - 1 );
@@ -699,7 +699,7 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col )
if( TQWidget* editor = prepareEditor( item, col ) ) {
editor->resize( r.size() );
- // editor->resize( TQSize( r.width(), editor->tqminimumSizeHint().height() ) );
+ // editor->resize( TQSize( r.width(), editor->minimumSizeHint().height() ) );
moveChild( editor, r.x(), r.y() );
}
}
@@ -1142,8 +1142,8 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
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()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
+ // make sure we did not lose the focus to one of the edit widgets' children
+ if( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
doRename();
hideEditor();
}
@@ -1170,7 +1170,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e )
TQPixmap bgPix( size );
// FIXME: let the user specify the color
- bgPix.fill( tqcolorGroup().base() );
+ bgPix.fill( colorGroup().base() );
if( bgPix.width() < m_backgroundPixmap.width() ||
bgPix.height() < m_backgroundPixmap.height() ) {
@@ -1227,7 +1227,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
int width = header()->width();
int height = 0;
for( TQPtrListIterator<TQListViewItem> it( items ); *it; ++it ) {
- TQRect r = tqitemRect( *it );
+ TQRect r = itemRect( *it );
if( r.isValid() ) {
height += ( *it )->height();
@@ -1256,13 +1256,13 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
// 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;
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if( r.isValid() ) {
if( items.containsRef( item ) ) {
// paint all columns
int x = 0;
for( int i = 0; i < columns(); ++i ) {
- item->paintCell( &p, tqcolorGroup(), i, columnWidth( i ), columnAlignment( i ) );
+ item->paintCell( &p, colorGroup(), i, columnWidth( i ), columnAlignment( i ) );
p.translate( columnWidth( i ), 0 );
x += columnWidth( i );
}
@@ -1274,7 +1274,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
else if( alreadyDrawing )
p.translate( 0, item->height() );
- if( p.tqworldMatrix().dy() >= pix.height() )
+ if( p.worldMatrix().dy() >= pix.height() )
break;
}
}
diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp
index eef276e..8bb5f69 100644
--- a/libk3b/tools/k3blistviewitemanimator.cpp
+++ b/libk3b/tools/k3blistviewitemanimator.cpp
@@ -80,7 +80,7 @@ void K3bListViewItemAnimator::setItem( TQListViewItem* item, int col )
m_item = item;
m_column = col;
m_pixmap = *item->pixmap(col);
- m_fadeColor = item->listView()->tqcolorGroup().base();
+ m_fadeColor = item->listView()->colorGroup().base();
start();
}
diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp
index a04c9a0..7c20a05 100644
--- a/libk3b/tools/k3bmd5job.cpp
+++ b/libk3b/tools/k3bmd5job.cpp
@@ -97,14 +97,14 @@ void K3bMd5Job::start()
}
else if( !d->filename.isEmpty() ) {
if( !TQFile::exists( d->filename ) ) {
- emit infoMessage( i18n("Could not find file %1").tqarg(d->filename), ERROR );
+ emit infoMessage( i18n("Could not find file %1").arg(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").tqarg(d->filename), ERROR );
+ emit infoMessage( i18n("Could not open file %1").arg(d->filename), ERROR );
jobFinished(false);
return;
}
@@ -204,7 +204,7 @@ void K3bMd5Job::slotUpdate()
if( readSize <= 0 ) {
// kdDebug() << "(K3bMd5Job) reached max size of " << d->maxSize << ". Stopping." << endl;
- emit debuggingOutput( "K3bMd5Job", TQString("Reached max read of %1. Stopping after %2 bytes.").tqarg(d->maxSize).tqarg(d->readData) );
+ emit debuggingOutput( "K3bMd5Job", TQString("Reached max read of %1. Stopping after %2 bytes.").arg(d->maxSize).arg(d->readData) );
stopAll();
emit percent( 100 );
jobFinished(true);
@@ -252,13 +252,13 @@ void K3bMd5Job::slotUpdate()
}
if( read < 0 ) {
- emit infoMessage( i18n("Error while reading from file %1").tqarg(d->filename), ERROR );
+ emit infoMessage( i18n("Error while reading from file %1").arg(d->filename), ERROR );
stopAll();
jobFinished(false);
}
else if( read == 0 ) {
// kdDebug() << "(K3bMd5Job) read all data. Total size: " << d->readData << ". Stopping." << endl;
- emit debuggingOutput( "K3bMd5Job", TQString("All data read. Stopping after %1 bytes.").tqarg(d->readData) );
+ emit debuggingOutput( "K3bMd5Job", TQString("All data read. Stopping after %1 bytes.").arg(d->readData) );
stopAll();
emit percent( 100 );
jobFinished(true);
@@ -303,7 +303,7 @@ TQCString K3bMd5Job::base64Digest()
void K3bMd5Job::stop()
{
- emit debuggingOutput( "K3bMd5Job", TQString("Stopped manually after %1 bytes.").tqarg(d->readData) );
+ emit debuggingOutput( "K3bMd5Job", TQString("Stopped manually after %1 bytes.").arg(d->readData) );
stopAll();
jobFinished( true );
}
diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp
index 2266be8..e3d3a70 100644
--- a/libk3b/tools/k3bmsfedit.cpp
+++ b/libk3b/tools/k3bmsfedit.cpp
@@ -50,16 +50,16 @@ K3bMsfEdit::~K3bMsfEdit()
{}
-TQSize K3bMsfEdit::tqsizeHint() const
+TQSize K3bMsfEdit::sizeHint() const
{
// more or less copied from TQSpinBox
constPolish();
- TQSize sz = editor()->tqsizeHint();
+ TQSize sz = editor()->sizeHint();
int h = sz.height();
TQFontMetrics fm( font() );
int w = fm.width( "00:00:00" );
int wx = fm.width( ' ' )*2;
- int frame = tqstyle().tqpixelMetric( TQStyle::PM_SpinBoxFrameWidth );
+ int frame = tqstyle().pixelMetric( TQStyle::PM_SpinBoxFrameWidth );
return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this,
TQSize( w + wx + downRect().width() + frame*2,
h + frame*2).
diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h
index d3e75ec..347b6ad 100644
--- a/libk3b/tools/k3bmsfedit.h
+++ b/libk3b/tools/k3bmsfedit.h
@@ -41,7 +41,7 @@ class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox
K3bMsfEdit( TQWidget* parent = 0, const char* name = 0 );
~K3bMsfEdit();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void setFrameStyle( int style );
void setLineWidth(int);
diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp
index 01f64cd..af73154 100644
--- a/libk3b/tools/k3bmultichoicedialog.cpp
+++ b/libk3b/tools/k3bmultichoicedialog.cpp
@@ -21,7 +21,7 @@
#include <kapplication.h>
#include <kiconloader.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqsignalmapper.h>
#include <tqptrlist.h>
#include <tqlabel.h>
diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp
index fe7b2af..b0e39a8 100644
--- a/libk3b/tools/k3bprogressdialog.cpp
+++ b/libk3b/tools/k3bprogressdialog.cpp
@@ -19,7 +19,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
#include <tqwidgetstack.h>
diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp
index a4c58bd..69c6ed5 100644
--- a/libk3b/tools/k3bpushbutton.cpp
+++ b/libk3b/tools/k3bpushbutton.cpp
@@ -125,10 +125,10 @@ void K3bPushButton::slotDelayedPopup()
if( isDown() ) {
// popup the menu.
// this has been taken from the TQPushButton code
- if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->tqsizeHint().height() <= tqApp->desktop()->height() )
+ if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->sizeHint().height() <= tqApp->desktop()->height() )
popup()->exec( mapToGlobal( rect().bottomLeft() ) );
else
- popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->tqsizeHint().height() ) ) );
+ popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->sizeHint().height() ) ) );
setDown( false );
}
}
diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp
index 02878c2..92d5877 100644
--- a/libk3b/tools/k3brichtextlabel.cpp
+++ b/libk3b/tools/k3brichtextlabel.cpp
@@ -16,7 +16,7 @@
#include "k3brichtextlabel.h"
#include <tqtooltip.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqsimplerichtext.h>
#include <kglobalsettings.h>
@@ -38,14 +38,14 @@ static TQString qrichtextify( const TQString& text )
K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- tqsetAlignment( TQt::WordBreak );
+ setAlignment( TQt::WordBreak );
setText(text);
}
K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- tqsetAlignment( TQt::WordBreak );
+ setAlignment( TQt::WordBreak );
}
void K3bRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -59,7 +59,7 @@ TQSizePolicy K3bRichTextLabel::sizePolicy() const
return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
}
-TQSize K3bRichTextLabel::tqminimumSizeHint() const
+TQSize K3bRichTextLabel::minimumSizeHint() const
{
TQString qt_text = qrichtextify( text() );
int pref_width = 0;
@@ -94,9 +94,9 @@ TQSize K3bRichTextLabel::tqminimumSizeHint() const
return TQSize(pref_width, rt.height());
}
-TQSize K3bRichTextLabel::tqsizeHint() const
+TQSize K3bRichTextLabel::sizeHint() const
{
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
void K3bRichTextLabel::setText( const TQString &text ) {
diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h
index cf1bc79..d2c7250 100644
--- a/libk3b/tools/k3brichtextlabel.h
+++ b/libk3b/tools/k3brichtextlabel.h
@@ -21,7 +21,7 @@
#include <k3b_export.h>
/**
- * @short A replacement for TQLabel that supports richtext and proper tqlayout management
+ * @short A replacement for TQLabel that supports richtext and proper layout management
*
* @author Waldo Bastian <bastian@kde.org>
*/
@@ -43,8 +43,8 @@ public:
int defaultWidth() const { return m_defaultWidth; }
void setDefaultWidth(int defaultWidth);
- virtual TQSize tqminimumSizeHint() const;
- virtual TQSize tqsizeHint() const;
+ virtual TQSize minimumSizeHint() const;
+ virtual TQSize sizeHint() const;
TQSizePolicy sizePolicy() const;
public slots:
diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp
index c8fee1b..3b33a18 100644
--- a/libk3b/tools/k3bstdguiitems.cpp
+++ b/libk3b/tools/k3bstdguiitems.cpp
@@ -20,7 +20,7 @@
#include <tqwhatsthis.h>
#include <tqcombobox.h>
#include <tqframe.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <klocale.h>
diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp
index 21476b0..0d4f37b 100644
--- a/libk3b/tools/k3btitlelabel.cpp
+++ b/libk3b/tools/k3btitlelabel.cpp
@@ -30,7 +30,7 @@ public:
Private() {
titleLength = subTitleLength = 0;
margin = 2;
- tqalignment = TQt::AlignLeft;
+ alignment = TQt::AlignLeft;
cachedMinimumWidth = 0;
titleBaseLine = 0;
}
@@ -41,7 +41,7 @@ public:
TQString displayTitle;
TQString displaySubTitle;
- int tqalignment;
+ int alignment;
int titleLength;
int subTitleLength;
@@ -71,9 +71,9 @@ public:
neededWidth += m_label->d->displaySubTitleLength + 5;
int startPos = 0;
- if( m_label->d->tqalignment & TQt::AlignHCenter )
+ if( m_label->d->alignment & TQt::AlignHCenter )
startPos = r.left() + ( r.width() - 2*m_label->d->margin - neededWidth ) / 2;
- else if( m_label->d->tqalignment & TQt::AlignRight )
+ else if( m_label->d->alignment & TQt::AlignRight )
startPos = r.right() - m_label->d->margin - neededWidth;
else
startPos = r.left() + m_label->d->margin;
@@ -126,19 +126,19 @@ void K3bTitleLabel::setSubTitle( const TQString& subTitle )
}
-void K3bTitleLabel::tqsetAlignment( int align )
+void K3bTitleLabel::setAlignment( int align )
{
- d->tqalignment = align;
+ d->alignment = align;
update();
}
-TQSize K3bTitleLabel::tqsizeHint() const
+TQSize K3bTitleLabel::sizeHint() const
{
return TQSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine );
}
-TQSize K3bTitleLabel::tqminimumSizeHint() const
+TQSize K3bTitleLabel::minimumSizeHint() const
{
return TQSize( d->cachedMinimumWidth, d->titleBaseLine );
}
@@ -168,9 +168,9 @@ void K3bTitleLabel::drawContents( TQPainter* p )
neededWidth += d->displaySubTitleLength + 5;
int startPos = 0;
- if( d->tqalignment & TQt::AlignHCenter )
+ if( d->alignment & TQt::AlignHCenter )
startPos = r.left() + ( r.width() - 2*d->margin - neededWidth ) / 2;
- else if( d->tqalignment & TQt::AlignRight )
+ else if( d->alignment & TQt::AlignRight )
startPos = r.right() - d->margin - neededWidth;
else
startPos = r.left() + d->margin;
diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h
index b850b12..5e99e59 100644
--- a/libk3b/tools/k3btitlelabel.h
+++ b/libk3b/tools/k3btitlelabel.h
@@ -32,8 +32,8 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
K3bTitleLabel( TQWidget* parent = 0, const char* name = 0 );
~K3bTitleLabel();
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
public slots:
/**
@@ -47,10 +47,10 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
/**
* The title label only supports alignments left, hcenter, and right
*
- * Default tqalignment is left.
+ * Default alignment is left.
*/
// FIXME: honor right-to-left languages
- void tqsetAlignment( int align );
+ void setAlignment( int align );
protected:
void resizeEvent( TQResizeEvent* );
diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp
index cf72a3b..216e681 100644
--- a/libk3b/tools/k3btoolbox.cpp
+++ b/libk3b/tools/k3btoolbox.cpp
@@ -22,7 +22,7 @@
#include <tqtoolbutton.h>
#include <tqsizepolicy.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqlabel.h>
@@ -44,7 +44,7 @@ class K3bToolBoxSeparator : public TQWidget
public:
K3bToolBoxSeparator( K3bToolBox* parent );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
protected:
void paintEvent( TQPaintEvent * );
@@ -54,13 +54,13 @@ class K3bToolBoxSeparator : public TQWidget
K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent )
: TQWidget( parent )
{
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
}
-TQSize K3bToolBoxSeparator::tqsizeHint() const
+TQSize K3bToolBoxSeparator::sizeHint() const
{
- int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+ int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
return TQSize( extent, 0 );
}
@@ -72,7 +72,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* )
TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
- tqcolorGroup(), flags );
+ colorGroup(), flags );
}
@@ -81,7 +81,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent )
: TQToolButton( parent ),
m_popupMenu(0)
{
- tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) );
+ setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) );
setAutoRaise( true );
setIconSet( action->iconSet() );
@@ -127,7 +127,7 @@ K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon,
: TQToolButton( parent ),
m_popupMenu(0)
{
- tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) );
+ setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) );
setAutoRaise( true );
setTextLabel( text );
@@ -171,7 +171,7 @@ void K3bToolBoxButton::resizeEvent( TQResizeEvent* e )
K3bToolBox::K3bToolBox( TQWidget* parent, const char* name )
: TQFrame( parent, name )
{
- tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) );
+ setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) );
m_mainLayout = new TQGridLayout( this );
m_mainLayout->setMargin( 1 );
@@ -243,7 +243,7 @@ void K3bToolBox::addStretch()
void K3bToolBox::addLabel( const TQString& text )
{
TQLabel* label = new TQLabel( text, this );
- label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
+ label->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
addWidget( label );
}
@@ -257,7 +257,7 @@ void K3bToolBox::addWidget( TQWidget* w )
m_mainLayout->addWidget( w, 0, m_mainLayout->numCols()-1 );
- if( w->tqsizePolicy().horData() == TQSizePolicy::Fixed || w->tqsizePolicy().horData() == TQSizePolicy::Maximum )
+ if( w->sizePolicy().horData() == TQSizePolicy::Fixed || w->sizePolicy().horData() == TQSizePolicy::Maximum )
m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 );
else {
m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 1 );
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index 8f2a20e..5b80907 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -69,7 +69,7 @@ void K3bToolButton::drawButton( TQPainter* p )
arrowFlags |= TQStyle::Style_Enabled;
tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
- TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(),
+ TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
}
diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp
index fd806ba..1ef08ad 100644
--- a/libk3b/tools/kcutlabel.cpp
+++ b/libk3b/tools/kcutlabel.cpp
@@ -27,7 +27,7 @@ KCutLabel::KCutLabel( const TQString &text , TQWidget *parent, const char *name
: TQLabel ( parent, name ),
m_minChars(1) {
TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- tqsetSizePolicy(myLabelSizePolicy);
+ setSizePolicy(myLabelSizePolicy);
m_fullText = text;
cutTextToLabel();
}
@@ -36,12 +36,12 @@ KCutLabel::KCutLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ),
m_minChars(1) {
TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- tqsetSizePolicy(myLabelSizePolicy);
+ setSizePolicy(myLabelSizePolicy);
}
-TQSize KCutLabel::tqminimumSizeHint() const
+TQSize KCutLabel::minimumSizeHint() const
{
- TQSize sh = TQLabel::tqminimumSizeHint();
+ TQSize sh = TQLabel::minimumSizeHint();
if( m_minChars == 0 )
sh.setWidth(-1);
else if( m_minChars < (int)m_fullText.length() )
diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h
index 7b96fe2..86c226e 100644
--- a/libk3b/tools/kcutlabel.h
+++ b/libk3b/tools/kcutlabel.h
@@ -36,7 +36,7 @@ class LIBK3B_EXPORT KCutLabel : public TQLabel
KCutLabel( TQWidget *parent = 0, const char *name = 0);
KCutLabel( const TQString &text, TQWidget *parent = 0, const char *name = 0 );
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize minimumSizeHint() const;
/**
* \return the full text while text() returns the cut text
diff --git a/libk3b/videodvd/k3bvideodvd.cpp b/libk3b/videodvd/k3bvideodvd.cpp
index 47de0d0..f435393 100644
--- a/libk3b/videodvd/k3bvideodvd.cpp
+++ b/libk3b/videodvd/k3bvideodvd.cpp
@@ -77,7 +77,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
DVDClose( dvdReaderT );
return false;
}
- m_volumeIdentifier = TQString::tqfromLatin1( v, 32 );
+ m_volumeIdentifier = TQString::fromLatin1( v, 32 );
//
// Open the VMG info
@@ -305,13 +305,13 @@ TQString 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 tqchildren");
+ return i18n("Caption for children");
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 tqchildren");
+ return i18n("Closed caption for children");
case SUBPIC_CODE_EXT_FORCED_CAPTION:
return i18n("Forced caption");
case SUBPIC_CODE_EXT_DIR_COMMENTS_NORMAL_SIZE:
@@ -319,7 +319,7 @@ TQString 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 tqchildren");
+ return i18n("Director's comments for children");
default:
return i18n("unknown code extension");
}
diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp
index 774c59e..7892406 100644
--- a/libk3bdevice/k3bcdtext.cpp
+++ b/libk3bdevice/k3bcdtext.cpp
@@ -20,7 +20,7 @@
#include <k3bdebug.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <string.h>
@@ -65,12 +65,12 @@ namespace K3bDevice {
for( int i = 0; i < dataLen/18; ++i ) {
TQString s;
- s += TQString( " %1 |" ).tqarg( pack[i].id1, 6, 16 );
- s += TQString( " %1 |" ).tqarg( pack[i].id2, 6 );
- s += TQString( " %1 |" ).tqarg( pack[i].id3, 6 );
- s += TQString( " %1 |" ).tqarg( pack[i].charpos, 6 );
- s += TQString( " %1 |" ).tqarg( pack[i].blocknum, 6 );
- s += TQString( " %1 |" ).tqarg( pack[i].dbcc, 4 );
+ s += TQString( " %1 |" ).arg( pack[i].id1, 6, 16 );
+ s += TQString( " %1 |" ).arg( pack[i].id2, 6 );
+ s += TQString( " %1 |" ).arg( pack[i].id3, 6 );
+ s += TQString( " %1 |" ).arg( pack[i].charpos, 6 );
+ s += TQString( " %1 |" ).arg( pack[i].blocknum, 6 );
+ s += TQString( " %1 |" ).arg( pack[i].dbcc, 4 );
// char str[12];
// sprintf( str, "%c%c%c%c%c%c%c%c%c%c%c%c",
// pack[i].data[0] == '\0' ? '�' : pack[i].data[0],
@@ -85,9 +85,9 @@ namespace K3bDevice {
// pack[i].data[9] == '\0' ? '�' : pack[i].data[9],
// pack[i].data[10] == '\0' ? '�' : pack[i].data[10],
// pack[i].data[11] == '\0' ? '�' : pack[i].data[11] );
-// s += TQString( " %1 |" ).tqarg( "'" + TQCString(str,13) + "'", 14 );
+// s += TQString( " %1 |" ).arg( "'" + TQCString(str,13) + "'", 14 );
// TQ_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1];
-// s += TQString( " %1 |" ).tqarg( crc );
+// s += TQString( " %1 |" ).arg( crc );
k3bDebug() << s << endl;
}
}
@@ -202,9 +202,9 @@ void K3bDevice::CdText::setRawPackData( const unsigned char* data, int len )
char* nextNullPos = (char*)::memchr( nullPos+1, '\0', 11 - (nullPos - (char*)pack[i].data) );
TQString txtstr;
if( nextNullPos ) // take all chars up to the next null
- txtstr = TQString::tqfromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 );
+ txtstr = TQString::fromLatin1( (char*)nullPos+1, nextNullPos - nullPos - 1 );
else // take all chars to the end of the pack data (12 bytes)
- txtstr = TQString::tqfromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) );
+ txtstr = TQString::fromLatin1( (char*)nullPos+1, 11 - (nullPos - (char*)pack[i].data) );
//
// a tab character means to use the same as for the previous track
@@ -471,7 +471,7 @@ void K3bDevice::CdText::savePack( cdtext_pack* pack, TQByteArray& data, unsigned
// append the pack to data
if( data.size() < dataFill + sizeof(cdtext_pack) )
- data.tqresize( dataFill + sizeof(cdtext_pack), TQGArray::SpeedOptim );
+ data.resize( dataFill + sizeof(cdtext_pack), TQGArray::SpeedOptim );
::memcpy( &data.data()[dataFill], reinterpret_cast<char*>( pack ), sizeof(cdtext_pack) );
diff --git a/libk3bdevice/k3bdevice.cpp b/libk3bdevice/k3bdevice.cpp
index c20c1c0..df6dcb0 100644
--- a/libk3bdevice/k3bdevice.cpp
+++ b/libk3bdevice/k3bdevice.cpp
@@ -240,9 +240,9 @@ bool K3bDevice::Device::init( bool bCheckWritingModes )
return false;
}
else {
- m_vendor = TQString::tqfromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace();
- m_description = TQString::tqfromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace();
- m_version = TQString::tqfromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace();
+ m_vendor = TQString::fromLatin1( (char*)(inq->vendor), 8 ).stripWhiteSpace();
+ m_description = TQString::fromLatin1( (char*)(inq->product), 16 ).stripWhiteSpace();
+ m_version = TQString::fromLatin1( (char*)(inq->revision), 4 ).stripWhiteSpace();
}
if( m_vendor.isEmpty() )
@@ -563,7 +563,7 @@ const TQString& K3bDevice::Device::devicename() const
TQString K3bDevice::Device::busTargetLun() const
{
- return TQString("%1,%2,%3").tqarg(m_bus).tqarg(m_target).tqarg(m_lun);
+ return TQString("%1,%2,%3").arg(m_bus).arg(m_target).arg(m_lun);
}
@@ -1056,18 +1056,18 @@ bool K3bDevice::Device::readRawToc( K3bDevice::Toc& toc ) const
k3bDebug() << "Session | ADR | CONTROL| TNO | POINT | Min | Sec | Frame | Zero | PMIN | PSEC | PFRAME |" << endl;
for( unsigned int i = 0; i < (dataLen-4)/(int)sizeof(toc_raw_track_descriptor); ++i ) {
TQString s;
- s += TQString( " %1 |" ).tqarg( (int)tr[i].session_number, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].adr, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].control, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].tno, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].point, 6, 16 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].min, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].sec, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].frame, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].zero, 6, 16 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].p_min, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].p_sec, 6 );
- s += TQString( " %1 |" ).tqarg( (int)tr[i].p_frame, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].session_number, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].adr, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].control, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].tno, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].point, 6, 16 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].min, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].sec, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].frame, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].zero, 6, 16 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].p_min, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].p_sec, 6 );
+ s += TQString( " %1 |" ).arg( (int)tr[i].p_frame, 6 );
k3bDebug() << s << endl;
}
diff --git a/libk3bdevice/k3bdevice.h b/libk3bdevice/k3bdevice.h
index 9f564ee..6d77e98 100644
--- a/libk3bdevice/k3bdevice.h
+++ b/libk3bdevice/k3bdevice.h
@@ -558,7 +558,7 @@ namespace K3bDevice
* if true is returned dataLen specifies the actual length of *data which needs to be
* deleted after using.
*/
- bool mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const;
+ bool mechanismStatus( unsigned char** data, unsigned int& dataLen ) const;
/**
* Read a single feature.
diff --git a/libk3bdevice/k3bdevice_mmc.cpp b/libk3bdevice/k3bdevice_mmc.cpp
index f4258ae..88e2174 100644
--- a/libk3bdevice/k3bdevice_mmc.cpp
+++ b/libk3bdevice/k3bdevice_mmc.cpp
@@ -626,7 +626,7 @@ bool K3bDevice::Device::readTocPmaAtip( unsigned char** data, unsigned int& data
}
-bool K3bDevice::Device::mechanismtqStatus( unsigned char** data, unsigned int& dataLen ) const
+bool K3bDevice::Device::mechanismStatus( unsigned char** data, unsigned int& dataLen ) const
{
unsigned char header[2048];
::memset( header, 0, 2048 );
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index b319312..925539d 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -275,7 +275,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
int i = 1;
TQString dev;
while( !(dev = line.section(re, i, i)).isEmpty() ) {
- if( addDevice( TQString("/dev/%1").tqarg(dev) ) ) {
+ if( addDevice( TQString("/dev/%1").arg(dev) ) ) {
devstring += dev + "|";
}
// according to the LINUX ALLOCATED DEVICES document (http://www.lanana.org/docs/device-list/),
@@ -285,7 +285,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
// each physical device the next line should be better
// else if ( dev.startsWith("sr") )
if ( dev.startsWith("sr") ) {
- if( addDevice(TQString("/dev/%1").tqarg(dev.replace(TQRegExp("r"),"cd"))) )
+ if( addDevice(TQString("/dev/%1").arg(dev.replace(TQRegExp("r"),"cd"))) )
devstring += dev + "|";
}
++i;
@@ -304,7 +304,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
//
k3bDebug() << "(K3bDevice::DeviceManager) SCANNING FOR GENERIC DEVICES." << endl;
for( int i = 0; i < 16; i++ ) {
- TQString sgDev = resolveSymLink( TQString("/dev/sg%1").tqarg(i) );
+ TQString sgDev = resolveSymLink( TQString("/dev/sg%1").arg(i) );
int bus = -1, id = -1, lun = -1;
if( determineBusIdLun( sgDev, bus, id, lun ) ) {
if( Device* dev = findDevice( bus, id, lun ) ) {
@@ -896,7 +896,7 @@ TQString K3bDevice::DeviceManager::resolveSymLink( const TQString& path )
return path;
}
- return TQString::tqfromLatin1( resolved );
+ return TQString::fromLatin1( resolved );
}
diff --git a/libk3bdevice/k3bmmc.h b/libk3bdevice/k3bmmc.h
index 76c9927..bcb317e 100644
--- a/libk3bdevice/k3bmmc.h
+++ b/libk3bdevice/k3bmmc.h
@@ -214,7 +214,7 @@ namespace K3bDevice
/**
* Based on the cdrecord struct cd_mode_page_2A
- * MM Capabilities and Mechanical tqStatus Page
+ * MM Capabilities and Mechanical Status Page
*/
#ifdef WORDS_BIGENDIAN // __BYTE_ORDER == __BIG_ENDIAN
diff --git a/libk3bdevice/k3bscsicommand.cpp b/libk3bdevice/k3bscsicommand.cpp
index 710b8a3..988fe7b 100644
--- a/libk3bdevice/k3bscsicommand.cpp
+++ b/libk3bdevice/k3bscsicommand.cpp
@@ -169,8 +169,8 @@ void K3bDevice::ScsiCommand::debugError( int command, int errorCode, int senseKe
if( m_printErrors ) {
k3bDebug() << "(K3bDevice::ScsiCommand) failed: " << endl
<< " command: " << TQString("%1 (%2)")
- .tqarg( K3bDevice::commandString( command ) )
- .tqarg( TQString::number(command, 16) ) << endl
+ .arg( K3bDevice::commandString( command ) )
+ .arg( TQString::number(command, 16) ) << endl
<< " errorcode: " << TQString::number(errorCode, 16) << endl
<< " sense key: " << senseKeyToString(senseKey) << endl
<< " asc: " << TQString::number(asc, 16) << endl
diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
index 3e97cda..64ef721 100644
--- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
+++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
@@ -25,7 +25,7 @@
#include <kconfig.h>
#include <kdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <alsa/asoundlib.h>
@@ -109,7 +109,7 @@ bool K3bAlsaOutputPlugin::recoverFromError( int err )
if( err == -EPIPE ) {
err = snd_pcm_prepare( d->pcm_playback );
if( err < 0 ) {
- d->lastErrorMessage = i18n("Internal Alsa problem: %1").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Internal Alsa problem: %1").arg(snd_strerror(err));
return false;
}
}
@@ -121,7 +121,7 @@ bool K3bAlsaOutputPlugin::recoverFromError( int err )
// unable to wake up pcm device, restart it
err = snd_pcm_prepare( d->pcm_playback );
if( err < 0 ) {
- d->lastErrorMessage = i18n("Internal Alsa problem: %1").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Internal Alsa problem: %1").arg(snd_strerror(err));
return false;
}
}
@@ -153,7 +153,7 @@ bool K3bAlsaOutputPlugin::init()
int err = snd_pcm_open( &d->pcm_playback, alsaDevice.local8Bit(), SND_PCM_STREAM_PLAYBACK, 0 );
if( err < 0 ) {
- d->lastErrorMessage = i18n("Could not open alsa audio device '%1' (%2).").tqarg(alsaDevice).tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Could not open alsa audio device '%1' (%2).").arg(alsaDevice).arg(snd_strerror(err));
d->error = true;
return false;
}
@@ -174,20 +174,20 @@ bool K3bAlsaOutputPlugin::setupHwParams()
int err = 0;
if( ( err = snd_pcm_hw_params_malloc( &hw_params ) ) < 0 ) {
- d->lastErrorMessage = i18n("Could not allocate hardware parameter structure (%1)").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Could not allocate hardware parameter structure (%1)").arg(snd_strerror(err));
d->error = true;
return false;
}
if( (err = snd_pcm_hw_params_any( d->pcm_playback, hw_params )) < 0) {
- d->lastErrorMessage = i18n("Could not initialize hardware parameter structure (%1).").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Could not initialize hardware parameter structure (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params );
d->error = true;
return false;
}
if( (err = snd_pcm_hw_params_set_access( d->pcm_playback, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
- d->lastErrorMessage = i18n("Could not set access type (%1).").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Could not set access type (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params );
d->error = true;
return false;
@@ -195,7 +195,7 @@ bool K3bAlsaOutputPlugin::setupHwParams()
if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_BE)) < 0) {
if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) {
- d->lastErrorMessage = i18n("Could not set sample format (%1).").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Could not set sample format (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params );
d->error = true;
return false;
@@ -208,7 +208,7 @@ bool K3bAlsaOutputPlugin::setupHwParams()
d->sampleRate = 44100;
if( (err = snd_pcm_hw_params_set_rate_near( d->pcm_playback, hw_params, &d->sampleRate, 0)) < 0) {
- d->lastErrorMessage = i18n("Could not set sample rate (%1).").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Could not set sample rate (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params );
d->error = true;
return false;
@@ -217,14 +217,14 @@ bool K3bAlsaOutputPlugin::setupHwParams()
kdDebug() << "(K3bAlsaOutputPlugin) samplerate set to " << d->sampleRate << endl;
if( (err = snd_pcm_hw_params_set_channels( d->pcm_playback, hw_params, 2)) < 0) {
- d->lastErrorMessage = i18n("Could not set channel count (%1).").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Could not set channel count (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params );
d->error = true;
return false;
}
if( (err = snd_pcm_hw_params( d->pcm_playback, hw_params )) < 0) {
- d->lastErrorMessage = i18n("Could not set parameters (%1).").tqarg(snd_strerror(err));
+ d->lastErrorMessage = i18n("Could not set parameters (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params );
d->error = true;
return false;
diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp
index 40a61c9..7177071 100644
--- a/plugins/decoder/flac/k3bflacdecoder.cpp
+++ b/plugins/decoder/flac/k3bflacdecoder.cpp
@@ -394,9 +394,9 @@ TQString K3bFLACDecoder::technicalInfo( const TQString& info ) const
else if( info == i18n("Channels") )
return TQString::number(d->channels);
else if( info == i18n("Sampling Rate") )
- return i18n("%1 Hz").tqarg(d->rate);
+ return i18n("%1 Hz").arg(d->rate);
else if( info == i18n("Sample Size") )
- return i18n("%1 bits").tqarg(d->bitsPerSample);
+ return i18n("%1 bits").arg(d->bitsPerSample);
}
return TQString();
diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
index 8532da9..8103b44 100644
--- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
+++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
@@ -125,7 +125,7 @@ bool K3bLibsndfileDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerat
addMetaInfo( META_COMMENT, sf_get_string(d->sndfile, SF_STR_COMMENT) );
addTechnicalInfo( i18n("Channels"), TQString::number(d->sndinfo.channels) );
- addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").tqarg(d->sndinfo.samplerate) );
+ addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").arg(d->sndinfo.samplerate) );
frames = (unsigned long)ceil(d->sndinfo.frames / d->sndinfo.samplerate * 75.0);
samplerate = d->sndinfo.samplerate;
diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp
index 9fe9b15..951caa2 100644
--- a/plugins/decoder/mp3/k3bmaddecoder.cpp
+++ b/plugins/decoder/mp3/k3bmaddecoder.cpp
@@ -415,12 +415,12 @@ TQString K3bMadDecoder::technicalInfo( const TQString& name ) const
}
}
else if( name == i18n("Sampling Rate") )
- return i18n("%1 Hz").tqarg(d->firstHeader.samplerate);
+ return i18n("%1 Hz").arg(d->firstHeader.samplerate);
else if( name == i18n("Bitrate") ) {
if( d->vbr )
return i18n("VBR");
else
- return i18n("%1 bps").tqarg(d->firstHeader.bitrate);
+ return i18n("%1 bps").arg(d->firstHeader.bitrate);
}
else if( name == i18n("Layer") ){
switch( d->firstHeader.layer ) {
diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp
index b48a85d..717c1a2 100644
--- a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp
+++ b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp
@@ -120,13 +120,13 @@ bool K3bOggVorbisDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate
// add technical infos
addTechnicalInfo( i18n("Version"), TQString::number(d->vInfo->version) );
addTechnicalInfo( i18n("Channels"), TQString::number(d->vInfo->channels) );
- addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").tqarg(d->vInfo->rate) );
+ addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").arg(d->vInfo->rate) );
if( d->vInfo->bitrate_upper > 0 )
- addTechnicalInfo( i18n("Bitrate Upper"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_upper) );
+ addTechnicalInfo( i18n("Bitrate Upper"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_upper) );
if( d->vInfo->bitrate_nominal > 0 )
- addTechnicalInfo( i18n("Bitrate Nominal"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_nominal) );
+ addTechnicalInfo( i18n("Bitrate Nominal"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_nominal) );
if( d->vInfo->bitrate_lower > 0 )
- addTechnicalInfo( i18n("Bitrate Lower"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_lower) );
+ addTechnicalInfo( i18n("Bitrate Lower"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_lower) );
frames = K3b::Msf::fromSeconds(seconds);
samplerate = d->vInfo->rate;
diff --git a/plugins/decoder/wave/k3bwavedecoder.cpp b/plugins/decoder/wave/k3bwavedecoder.cpp
index 1c0fd57..28f873a 100644
--- a/plugins/decoder/wave/k3bwavedecoder.cpp
+++ b/plugins/decoder/wave/k3bwavedecoder.cpp
@@ -350,9 +350,9 @@ TQString K3bWaveDecoder::technicalInfo( const TQString& name ) const
if( name == i18n("Channels") )
return TQString::number(d->channels);
else if( name == i18n("Sampling Rate") )
- return i18n("%1 Hz").tqarg(d->sampleRate);
+ return i18n("%1 Hz").arg(d->sampleRate);
else if( name == i18n("Sample Size") )
- return i18n("%1 bits").tqarg(d->sampleSize);
+ return i18n("%1 bits").arg(d->sampleSize);
else
return TQString();
}
diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
index 5c69fec..1f61071 100644
--- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
+++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
@@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index 7f54bf9..2290012 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -242,7 +242,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
kdDebug() << s << flush << endl;
// set one general error message
- setLastError( i18n("Command failed: %1").tqarg( s ) );
+ setLastError( i18n("Command failed: %1").arg( s ) );
if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if( d->cmd.writeWaveHeader )
@@ -253,7 +253,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
else {
TQString commandName = d->cmd.command.section( TQRegExp("\\s+"), 0 );
if( !KStandardDirs::findExe( commandName ).isEmpty() )
- setLastError( i18n("Could not find program '%1'").tqarg(commandName) );
+ setLastError( i18n("Could not find program '%1'").arg(commandName) );
return false;
}
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
index 7f2b289..1628d8c 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
@@ -18,7 +18,7 @@
#include <k3bcore.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
diff --git a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui
index d7ed073..a874760 100644
--- a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui
+++ b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui
@@ -48,7 +48,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -77,7 +77,7 @@
<property name="text">
<string>textLabel1</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -125,7 +125,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -143,7 +143,7 @@
<property name="text">
<string>high quality</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -200,7 +200,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -229,7 +229,7 @@
<property name="text">
<string>textLabel2</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -237,7 +237,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -259,7 +259,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@@ -326,7 +326,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -360,7 +360,7 @@
<property name="text">
<string>high quality</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
index f22ad76..9df1c17 100644
--- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
+++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
@@ -43,7 +43,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp
index 8946f19..9abfa37 100644
--- a/plugins/encoder/lame/k3blameencoder.cpp
+++ b/plugins/encoder/lame/k3blameencoder.cpp
@@ -28,14 +28,14 @@
#include <kcombobox.h>
#include <kdialogbase.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcstring.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqgroupbox.h>
#include <tqbuttongroup.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqfile.h>
#include <tqslider.h>
#include <tqlabel.h>
@@ -411,13 +411,13 @@ K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* parent, co
m_manualSettingsDlg->setMainWidget( m_brW );
for( int i = 0; s_lame_bitrates[i]; ++i )
- m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) );
+ m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
for( int i = 0; s_lame_bitrates[i]; ++i )
- m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) );
+ m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
for( int i = 0; s_lame_bitrates[i]; ++i )
- m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) );
+ m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
TQHBoxLayout* lay = new TQHBoxLayout( this );
@@ -469,11 +469,11 @@ void K3bLameEncoderSettingsWidget::updateManualSettingsLabel()
{
if( m_brW->m_radioConstantBitrate->isChecked() )
m_w->m_labelManualSettings->setText( i18n("Constant Bitrate: %1 kbps (%2)")
- .tqarg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()])
- .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
+ .arg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()])
+ .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
else
m_w->m_labelManualSettings->setText( i18n("Variable Bitrate (%1)")
- .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
+ .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
}
@@ -507,9 +507,9 @@ void K3bLameEncoderSettingsWidget::loadConfig()
else
m_brW->m_radioConstantBitrate->setChecked( true );
- m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Constant Bitrate", 128 )) );
- m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Maximum Bitrate", 224 )) );
- m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Minimum Bitrate", 32 )) );
+ m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Constant Bitrate", 128 )) );
+ m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Maximum Bitrate", 224 )) );
+ m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Minimum Bitrate", 32 )) );
m_brW->m_spinAverageBitrate->setValue( c->readNumEntry( "Average Bitrate", 128) );
m_brW->m_checkBitrateMaximum->setChecked( c->readBoolEntry( "Use Maximum Bitrate", false ) );
diff --git a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
index d0a6f2d..a76c3c5 100644
--- a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
+++ b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
@@ -33,7 +33,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -68,7 +68,7 @@
<property name="text">
<string>textLabel1</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -110,7 +110,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -148,7 +148,7 @@
<property name="text">
<string>high quality</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -196,7 +196,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
index 7878497..685d9e0 100644
--- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp
+++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <knuminput.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqslider.h>
#include <tqlcdnumber.h>
@@ -470,7 +470,7 @@ K3bOggVorbisEncoderSettingsWidget::~K3bOggVorbisEncoderSettingsWidget()
void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val )
{
w->m_labelQualityLevel->setText( TQString::number(val) + " "
- + i18n("(targetted VBR of %1)").tqarg(s_rough_average_quality_level_bitrates[val+1]) );
+ + i18n("(targetted VBR of %1)").arg(s_rough_average_quality_level_bitrates[val+1]) );
}
diff --git a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui
index 332dce0..ce874d3 100644
--- a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui
+++ b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui
@@ -30,7 +30,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -55,7 +55,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<grid>
<property name="name">
@@ -219,7 +219,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>250</width>
<height>16</height>
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index ee69541..674091b 100644
--- a/plugins/encoder/sox/k3bsoxencoder.cpp
+++ b/plugins/encoder/sox/k3bsoxencoder.cpp
@@ -33,7 +33,7 @@
#include <tqlineedit.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
index 5211b36..bc210a6 100644
--- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
+++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
@@ -46,7 +46,7 @@
#include <tqwhatsthis.h>
#include <tqpair.h>
#include <tqvaluelist.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqptrdict.h>
@@ -104,7 +104,7 @@ K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc
d->viewFiles->addColumn( i18n("Old Name") );
d->viewFiles->setNoItemText( i18n("Please click the Scan button to search for renameable files.") );
- // tqlayout
+ // layout
TQVBoxLayout* box = new TQVBoxLayout( this );
box->setMargin( 0 );
box->setSpacing( KDialog::spacingHint() );
@@ -203,7 +203,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewIt
d->dirItemDict.insert( dir, viewRoot );
- for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dir->children() ); it.current(); ++it ) {
K3bDataItem* item = it.current();
if( item->isFile() ) {
@@ -334,9 +334,9 @@ TQString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item )
kdDebug() << "(K3bAudioMetainfoRenamerPluginWidget) file with name "
<< newName << extension << " already exists" << endl;
int i = 1;
- while( existsOtherItemWithSameName( item, newName + TQString( " (%1)").tqarg(i) + extension ) )
+ while( existsOtherItemWithSameName( item, newName + TQString( " (%1)").arg(i) + extension ) )
i++;
- newName.append( TQString( " (%1)").tqarg(i) );
+ newName.append( TQString( " (%1)").arg(i) );
}
// append extension
diff --git a/src/fastscale/scale.cpp b/src/fastscale/scale.cpp
index d87717f..62e0661 100644
--- a/src/fastscale/scale.cpp
+++ b/src/fastscale/scale.cpp
@@ -1925,7 +1925,7 @@ TQImage scale(const TQImage& image, int width, int height,
if( image.isNull()) return image.copy();
TQSize newSize( image.size() );
- newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
+ newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null
if ( newSize == image.size() ) return image.copy();
diff --git a/src/k3b.cpp b/src/k3b.cpp
index 40ea871..0dc38e8 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -20,7 +20,7 @@
#include <tqdir.h>
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwhatsthis.h>
#include <tqtooltip.h>
#include <tqtoolbutton.h>
@@ -29,7 +29,7 @@
#include <tqevent.h>
#include <tqvaluelist.h>
#include <tqfont.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqwidgetstack.h>
#include <tqtimer.h>
@@ -181,8 +181,8 @@ K3bMainWindow::K3bMainWindow()
// FIXME: now make sure the welcome screen is displayed completely
resize( 780, 550 );
-// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->tqsizeHint() ) );
-// m_dirTreeDock->resize( TQSize( m_dirTreeDock->tqsizeHint().width(), m_dirTreeDock->height() ) );
+// getMainDockWidget()->resize( getMainDockWidget()->size().expandedTo( d->welcomeWidget->sizeHint() ) );
+// m_dirTreeDock->resize( TQSize( m_dirTreeDock->sizeHint().width(), m_dirTreeDock->height() ) );
readOptions();
}
@@ -198,7 +198,7 @@ K3bMainWindow::~K3bMainWindow()
void K3bMainWindow::showEvent( TQShowEvent* e )
{
- slotCheckDockWidgettqStatus();
+ slotCheckDockWidgetStatus();
KDockMainWindow::showEvent( e );
}
@@ -288,7 +288,7 @@ void K3bMainWindow::initActions()
actionToolsBlankCdrw = new KAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()),
actionCollection(), "tools_blank_cdrw" );
- KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").tqarg("�"), "formatdvd", 0, TQT_TQOBJECT(this),
+ KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").arg("�"), "formatdvd", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" );
actionToolsWriteCdImage = new KAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()),
actionCollection(), "tools_write_cd_image" );
@@ -330,7 +330,7 @@ void K3bMainWindow::initActions()
actionFileNewMovix->setToolTip( i18n("Creates a new eMovix CD project") );
actionFileNewVcd->setToolTip( i18n("Creates a new Video CD project") );
actionToolsBlankCdrw->setToolTip( i18n("Open the CD-RW erasing dialog") );
- actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").tqarg("�") );
+ actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").arg("�") );
actionCdCopy->setToolTip( i18n("Open the CD copy dialog") );
actionToolsWriteCdImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to CD") );
actionToolsWriteDvdImage->setToolTip( i18n("Write an Iso9660 image to DVD") );
@@ -398,7 +398,7 @@ void K3bMainWindow::initView()
m_documentHeader = new K3bThemedHeader( d->documentHull );
m_documentHeader->setTitle( i18n("Current Projects") );
- m_documentHeader->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+ m_documentHeader->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_documentHeader->setLeftPixmap( K3bTheme::PROJECT_LEFT );
m_documentHeader->setRightPixmap( K3bTheme::PROJECT_RIGHT );
@@ -609,7 +609,7 @@ void K3bMainWindow::readOptions()
m_dirView->readConfig( config() );
slotViewDocumentHeader();
- slotCheckDockWidgettqStatus();
+ slotCheckDockWidgetStatus();
}
@@ -635,20 +635,20 @@ void K3bMainWindow::saveProperties( KConfig* c )
int cnt = 1;
for( TQPtrListIterator<K3bDoc> it( docs ); *it; ++it ) {
// the "name" of the project (or the original url if isSaved())
- c->writePathEntry( TQString("%1 url").tqarg(cnt), (*it)->URL().url() );
+ c->writePathEntry( TQString("%1 url").arg(cnt), (*it)->URL().url() );
// is the doc modified
- c->writeEntry( TQString("%1 modified").tqarg(cnt), (*it)->isModified() );
+ c->writeEntry( TQString("%1 modified").arg(cnt), (*it)->isModified() );
// has the doc already been saved?
- c->writeEntry( TQString("%1 saved").tqarg(cnt), (*it)->isSaved() );
+ c->writeEntry( TQString("%1 saved").arg(cnt), (*it)->isSaved() );
// where does the session management save it? If it's not modified and saved this is
// the same as the url
KURL saveUrl = (*it)->URL();
if( !(*it)->isSaved() || (*it)->isModified() )
saveUrl = KURL::fromPathOrURL( saveDir + TQString::number(cnt) );
- c->writePathEntry( TQString("%1 saveurl").tqarg(cnt), saveUrl.url() );
+ c->writePathEntry( TQString("%1 saveurl").arg(cnt), saveUrl.url() );
// finally save it
k3bappcore->projectManager()->saveProject( *it, saveUrl );
@@ -690,13 +690,13 @@ void K3bMainWindow::readProperties( KConfig* c )
for( int i = 1; i <= cnt; ++i ) {
// in this case the constructor works since we saved as url()
- KURL url = c->readPathEntry( TQString("%1 url").tqarg(i) );
+ KURL url = c->readPathEntry( TQString("%1 url").arg(i) );
- bool modified = c->readBoolEntry( TQString("%1 modified").tqarg(i) );
+ bool modified = c->readBoolEntry( TQString("%1 modified").arg(i) );
- bool saved = c->readBoolEntry( TQString("%1 saved").tqarg(i) );
+ bool saved = c->readBoolEntry( TQString("%1 saved").arg(i) );
- KURL saveUrl = c->readPathEntry( TQString("%1 saveurl").tqarg(i) );
+ KURL saveUrl = c->readPathEntry( TQString("%1 saveurl").arg(i) );
// now load the project
if( K3bDoc* doc = k3bappcore->projectManager()->openProject( saveUrl ) ) {
@@ -826,7 +826,7 @@ bool K3bMainWindow::canCloseDocument( K3bDoc* doc )
return true;
switch ( KMessageBox::warningYesNoCancel( this,
- i18n("%1 has unsaved data.").tqarg( doc->URL().fileName() ),
+ i18n("%1 has unsaved data.").arg( doc->URL().fileName() ),
i18n("Closing Project"),
KStdGuiItem::save(),
KGuiItem( i18n("&Discard"), "editshred" ) ) )
@@ -940,7 +940,7 @@ void K3bMainWindow::fileSaveAs( K3bDoc* doc )
bool exists = KIO::NetAccess::exists( url, false, 0 );
if( !exists ||
( exists &&
- KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").tqarg( url.prettyURL() ),
+ KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").arg( url.prettyURL() ),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) ) {
@@ -1364,14 +1364,14 @@ void K3bMainWindow::slotDvdCopy()
void K3bMainWindow::slotShowDirTreeView()
{
m_dirTreeDock->changeHideShowState();
- slotCheckDockWidgettqStatus();
+ slotCheckDockWidgetStatus();
}
void K3bMainWindow::slotShowContentsView()
{
m_contentsDock->changeHideShowState();
- slotCheckDockWidgettqStatus();
+ slotCheckDockWidgetStatus();
}
@@ -1402,7 +1402,7 @@ void K3bMainWindow::slotContentsDockHidden()
}
-void K3bMainWindow::slotCheckDockWidgettqStatus()
+void K3bMainWindow::slotCheckDockWidgetStatus()
{
actionViewContentsView->setChecked( m_contentsDock->isVisible() );
actionViewDirTreeView->setChecked( m_dirTreeDock->isVisible() );
diff --git a/src/k3b.h b/src/k3b.h
index 1562e57..d6d5d7c 100644
--- a/src/k3b.h
+++ b/src/k3b.h
@@ -215,7 +215,7 @@ class K3bMainWindow : public KParts::DockMainWindow
void slotViewDocumentHeader();
- void slotCheckDockWidgettqStatus();
+ void slotCheckDockWidgetStatus();
/** changes the statusbar contents for the standard label permanently, used to indicate current actions.
* @param text the text that is displayed in the statusbar
@@ -249,7 +249,7 @@ class K3bMainWindow : public KParts::DockMainWindow
void fileSaveAs( K3bDoc* doc = 0 );
void closeProject( K3bDoc* );
- /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+ /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index 776df75..9498a71 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -230,7 +230,7 @@ void K3bAppDeviceManager::setReadSpeed()
"and the spinning noise is intrusive."
"<p>Be aware that this has no influence on K3b since it will "
"change the reading speed again when copying CDs or DVDs.")
- .tqarg(currentDevice()->vendor() + " " + currentDevice()->description()),
+ .arg(currentDevice()->vendor() + " " + currentDevice()->description()),
12,
1,
currentDevice()->maxReadSpeed(),
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp
index b9640bc..3e119af 100644
--- a/src/k3bapplication.cpp
+++ b/src/k3bapplication.cpp
@@ -297,7 +297,7 @@ bool K3bApplication::processCmdLineArgs()
// FIXME: seems not like the right place...
if( args->isSet( "ao" ) )
if( !m_audioServer->setOutputMethod( args->getOption( "ao" ) ) )
- K3bPassivePopup::showPopup( i18n("Could not find Audio Output plugin '%1'").tqarg( args->getOption("ao").data() ),
+ K3bPassivePopup::showPopup( i18n("Could not find Audio Output plugin '%1'").arg( args->getOption("ao").data() ),
i18n("Initialization Problem"),
K3bPassivePopup::Warning );
diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp
index 5832940..3d39d33 100644
--- a/src/k3baudioplayer.cpp
+++ b/src/k3baudioplayer.cpp
@@ -20,14 +20,14 @@
#include <tqlabel.h>
#include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <tqdatetime.h>
#include <tqfont.h>
#include <tqslider.h>
#include <tqlistview.h>
#include <tqfile.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqheader.h>
#include <tqevent.h>
#include <tqdragobject.h>
@@ -169,8 +169,8 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
m_viewPlayList = new K3bPlayListView( this );
- m_labelOverallTime->tqsetAlignment( AlignHCenter | AlignVCenter );
- m_labelCurrentTime->tqsetAlignment( AlignHCenter | AlignVCenter );
+ m_labelOverallTime->setAlignment( AlignHCenter | AlignVCenter );
+ m_labelCurrentTime->setAlignment( AlignHCenter | AlignVCenter );
m_labelOverallTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );
m_labelCurrentTime->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );
m_labelFilename->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain );
@@ -194,7 +194,7 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
m_updateTimer = new TQTimer( this );
// ------------------------------------------------------------------------
- // tqlayout
+ // layout
// ------------------------------------------------------------------------
TQGridLayout* grid = new TQGridLayout( this );
grid->setSpacing( 2 );
@@ -586,13 +586,13 @@ void K3bAudioPlayer::slotUpdateFilename()
switch( state() ) {
case PLAYING:
- display.prepend( TQString("(%1) ").tqarg(i18n("playing")) );
+ display.prepend( TQString("(%1) ").arg(i18n("playing")) );
break;
case PAUSED:
- display.prepend( TQString("(%1) ").tqarg(i18n("paused")) );
+ display.prepend( TQString("(%1) ").arg(i18n("paused")) );
break;
case STOPPED:
- display.prepend( TQString("(%1) ").tqarg(i18n("stopped")) );
+ display.prepend( TQString("(%1) ").arg(i18n("stopped")) );
break;
default:
break;
diff --git a/src/k3bburnprogressdialog.cpp b/src/k3bburnprogressdialog.cpp
index e6dcc55..2767229 100644
--- a/src/k3bburnprogressdialog.cpp
+++ b/src/k3bburnprogressdialog.cpp
@@ -29,7 +29,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
@@ -38,7 +38,7 @@ K3bBurnProgressDialog::K3bBurnProgressDialog( TQWidget *parent, const char *name
: K3bJobProgressDialog(parent,name, showSubProgress, modal, wf)
{
m_labelWritingSpeed = new TQLabel( m_frameExtraInfo, "m_labelWritingSpeed" );
- // m_labelWritingSpeed->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ // m_labelWritingSpeed->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_frameExtraInfoLayout->addWidget( m_labelWritingSpeed, 2, 0 );
m_frameExtraInfoLayout->addWidget( new TQLabel( i18n("Estimated writing speed:"), m_frameExtraInfo ), 1, 0 );
@@ -83,7 +83,7 @@ void K3bBurnProgressDialog::setBurnJob( K3bBurnJob* burnJob )
K3bJobProgressDialog::setJob(burnJob);
if( burnJob ) {
- connect( burnJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SLOT(slotBuffertqStatus(int)) );
+ connect( burnJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SLOT(slotBufferStatus(int)) );
connect( burnJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) );
connect( burnJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SLOT(slotWriteSpeed(int, int)) );
connect( burnJob, TQT_SIGNAL(burning(bool)), m_progressWritingBuffer, TQT_SLOT(setEnabled(bool)) );
@@ -91,7 +91,7 @@ void K3bBurnProgressDialog::setBurnJob( K3bBurnJob* burnJob )
connect( burnJob, TQT_SIGNAL(burning(bool)), m_labelWritingSpeed, TQT_SLOT(setEnabled(bool)) );
if( burnJob->writer() )
- m_labelWriter->setText( i18n("Writer: %1 %2").tqarg(burnJob->writer()->vendor()).
+ m_labelWriter->setText( i18n("Writer: %1 %2").arg(burnJob->writer()->vendor()).
arg(burnJob->writer()->description()) );
m_labelWritingSpeed->setText( i18n("no info") );
@@ -112,7 +112,7 @@ void K3bBurnProgressDialog::slotFinished( bool success )
}
-void K3bBurnProgressDialog::slotBuffertqStatus( int b )
+void K3bBurnProgressDialog::slotBufferStatus( int b )
{
m_progressWritingBuffer->setFormat( "%p%" );
m_progressWritingBuffer->setValue( b );
@@ -128,7 +128,7 @@ void K3bBurnProgressDialog::slotDeviceBuffer( int b )
void K3bBurnProgressDialog::slotWriteSpeed( int s, int multiplicator )
{
- m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) );
+ m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) );
}
#include "k3bburnprogressdialog.moc"
diff --git a/src/k3bburnprogressdialog.h b/src/k3bburnprogressdialog.h
index 2b7efb0..44088e7 100644
--- a/src/k3bburnprogressdialog.h
+++ b/src/k3bburnprogressdialog.h
@@ -42,7 +42,7 @@ class K3bBurnProgressDialog : public K3bJobProgressDialog {
protected slots:
void slotWriteSpeed( int, int );
- void slotBuffertqStatus( int );
+ void slotBufferStatus( int );
void slotDeviceBuffer( int );
void slotFinished(bool);
diff --git a/src/k3bcontentsview.cpp b/src/k3bcontentsview.cpp
index 2cafbf2..56da3fe 100644
--- a/src/k3bcontentsview.cpp
+++ b/src/k3bcontentsview.cpp
@@ -18,7 +18,7 @@
#include <k3bthemedheader.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
@@ -51,7 +51,7 @@ K3bContentsView::~K3bContentsView()
void K3bContentsView::setMainWidget( TQWidget* w )
{
m_centerWidget = w;
- ((TQVBoxLayout*)tqlayout())->addWidget( w );
+ ((TQVBoxLayout*)layout())->addWidget( w );
}
diff --git a/src/k3bdataprojectinterface.cpp b/src/k3bdataprojectinterface.cpp
index 3a115e5..ccb6c19 100644
--- a/src/k3bdataprojectinterface.cpp
+++ b/src/k3bdataprojectinterface.cpp
@@ -102,12 +102,12 @@ bool K3bDataProjectInterface::isFolder( const TQString& path ) const
}
-TQStringList K3bDataProjectInterface::tqchildren( const TQString& path ) const
+TQStringList K3bDataProjectInterface::children( const TQString& path ) const
{
TQStringList l;
K3bDataItem* item = m_dataDoc->root()->findByPath( path );
if( item && item->isDir() ) {
- const TQPtrList<K3bDataItem>& cl = static_cast<K3bDirItem*>(item)->tqchildren();
+ const TQPtrList<K3bDataItem>& cl = static_cast<K3bDirItem*>(item)->children();
for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it )
l.append( it.current()->k3bName() );
}
diff --git a/src/k3bdataprojectinterface.h b/src/k3bdataprojectinterface.h
index 0cc9229..a69bac7 100644
--- a/src/k3bdataprojectinterface.h
+++ b/src/k3bdataprojectinterface.h
@@ -90,7 +90,7 @@ class K3bDataProjectInterface : public K3bProjectInterface
/**
* \return the names of the child elements of the item determined by path.
*/
- TQStringList tqchildren( const TQString& path ) const;
+ TQStringList children( const TQString& path ) const;
/**
* Set the sort weight of an item
diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp
index 956f927..b0bc50b 100644
--- a/src/k3bdebuggingoutputdialog.cpp
+++ b/src/k3bdebuggingoutputdialog.cpp
@@ -22,10 +22,10 @@
#include <k3bversion.h>
#include <k3bglobals.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqcursor.h>
#include <tqfile.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <klocale.h>
#include <kstdguiitem.h>
@@ -122,12 +122,12 @@ void K3bDebuggingOutputDialog::clear()
K3bDevice::Device* dev = *it;
addOutput( "Devices",
TQString( "%1 (%2, %3) [%5] [%6] [%7]" )
- .tqarg( dev->vendor() + " " + dev->description() + " " + dev->version() )
- .tqarg( dev->blockDeviceName() )
- .tqarg( dev->genericDevice() )
- .tqarg( K3bDevice::deviceTypeString( dev->type() ) )
- .tqarg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
- .tqarg( K3bDevice::writingModeString( dev->writingModes() ) ) );
+ .arg( dev->vendor() + " " + dev->description() + " " + dev->version() )
+ .arg( dev->blockDeviceName() )
+ .arg( dev->genericDevice() )
+ .arg( K3bDevice::deviceTypeString( dev->type() ) )
+ .arg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
+ .arg( K3bDevice::writingModeString( dev->writingModes() ) ) );
}
}
@@ -138,7 +138,7 @@ void K3bDebuggingOutputDialog::slotUser1()
if( !filename.isEmpty() ) {
TQFile f( filename );
if( !f.exists() || KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").tqarg(filename),
+ i18n("Do you want to overwrite %1?").arg(filename),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) {
@@ -147,7 +147,7 @@ void K3bDebuggingOutputDialog::slotUser1()
t << debugView->text();
}
else {
- KMessageBox::error( this, i18n("Could not open file %1").tqarg(filename) );
+ KMessageBox::error( this, i18n("Could not open file %1").arg(filename) );
}
}
}
@@ -156,7 +156,7 @@ void K3bDebuggingOutputDialog::slotUser1()
void K3bDebuggingOutputDialog::slotUser2()
{
- TQApplication::tqclipboard()->setText( debugView->text(), TQClipboard::Clipboard );
+ TQApplication::clipboard()->setText( debugView->text(), TQClipboard::Clipboard );
}
#include "k3bdebuggingoutputdialog.moc"
diff --git a/src/k3bdebuggingoutputfile.cpp b/src/k3bdebuggingoutputfile.cpp
index f1ce1dc..3e29ef0 100644
--- a/src/k3bdebuggingoutputfile.cpp
+++ b/src/k3bdebuggingoutputfile.cpp
@@ -26,7 +26,7 @@
#include <kglobalsettings.h>
#include <kapplication.h>
-#include <tqtextstream.h>
+#include <textstream.h>
K3bDebuggingOutputFile::K3bDebuggingOutputFile()
@@ -50,12 +50,12 @@ bool K3bDebuggingOutputFile::open()
K3bDevice::Device* dev = *it;
addOutput( "Devices",
TQString( "%1 (%2, %3) [%5] [%6] [%7]" )
- .tqarg( dev->vendor() + " " + dev->description() + " " + dev->version() )
- .tqarg( dev->blockDeviceName() )
- .tqarg( dev->genericDevice() )
- .tqarg( K3bDevice::deviceTypeString( dev->type() ) )
- .tqarg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
- .tqarg( K3bDevice::writingModeString( dev->writingModes() ) ) );
+ .arg( dev->vendor() + " " + dev->description() + " " + dev->version() )
+ .arg( dev->blockDeviceName() )
+ .arg( dev->genericDevice() )
+ .arg( K3bDevice::deviceTypeString( dev->type() ) )
+ .arg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
+ .arg( K3bDevice::writingModeString( dev->writingModes() ) ) );
}
return true;
diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp
index 50c69b0..d40b775 100644
--- a/src/k3bdirview.cpp
+++ b/src/k3bdirview.cpp
@@ -48,7 +48,7 @@
#include <tqheader.h>
#include <tqsplitter.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqiconset.h>
#include <tqvaluelist.h>
#include <tqlabel.h>
@@ -247,7 +247,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium )
else {
if( KMessageBox::questionYesNo( this,
i18n("Found %1. Do you want K3b to mount the data part "
- "or show all the tracks?").tqarg( i18n("Video CD") ),
+ "or show all the tracks?").arg( i18n("Video CD") ),
i18n("Video CD"),
i18n("Mount CD"),
i18n("Show Video Tracks") ) == KMessageBox::No ) {
@@ -260,7 +260,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium )
else if( medium.content() & K3bMedium::CONTENT_AUDIO ) {
if( KMessageBox::questionYesNo( this,
i18n("Found %1. Do you want K3b to mount the data part "
- "or show all the tracks?").tqarg( i18n("Audio CD") ),
+ "or show all the tracks?").arg( i18n("Audio CD") ),
i18n("Audio CD"),
i18n("Mount CD"),
i18n("Show Audio Tracks") ) == KMessageBox::No ) {
@@ -298,9 +298,9 @@ void K3bDirView::slotMountFinished( const TQString& mp )
else {
m_viewStack->raiseWidget( m_fileView );
K3bPassivePopup::showPopup( i18n("<p>K3b was unable to mount medium <b>%1</b> in device <em>%2 - %3</em>")
- .tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
- .tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
- .tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
+ .arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
+ .arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
+ .arg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
i18n("Mount Failed"),
K3bPassivePopup::Warning );
}
@@ -314,9 +314,9 @@ void K3bDirView::slotUnmountFinished( bool success )
}
else {
K3bPassivePopup::showPopup( i18n("<p>K3b was unable to unmount medium <b>%1</b> in device <em>%2 - %3</em>")
- .tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
- .tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
- .tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
+ .arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
+ .arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
+ .arg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
i18n("Unmount Failed"),
K3bPassivePopup::Warning );
}
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index 028e020..45dafba 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -27,13 +27,13 @@
#include <k3biso9660.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfont.h>
#include <tqcolor.h>
#include <tqheader.h>
#include <tqstring.h>
#include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqpixmap.h>
#include <tqregion.h>
#include <tqframe.h>
@@ -231,7 +231,7 @@ void K3bDiskInfoView::reloadMedium()
// if we have multiple sessions we create a header item for every session
KListViewItem* trackItem = 0;
if( medium().diskInfo().numSessions() > 1 && medium().toc()[0].session() > 0 ) {
- trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").tqarg(1) );
+ trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").arg(1) );
lastSession = 1;
}
else
@@ -248,7 +248,7 @@ void K3bDiskInfoView::reloadMedium()
trackItem->setOpen(true);
trackItem = new HeaderViewItem( trackHeaderItem,
m_infoView->lastItem()->parent(),
- i18n("Session %1").tqarg(lastSession) );
+ i18n("Session %1").arg(lastSession) );
}
item = new KListViewItem( trackItem, item );
@@ -269,21 +269,21 @@ void K3bDiskInfoView::reloadMedium()
else
text = i18n("Data");
}
- item->setText( 0, i18n("%1 (%2)").tqarg( TQString::number(index).rightJustify( 2, ' ' )).tqarg(text) );
+ item->setText( 0, i18n("%1 (%2)").arg( TQString::number(index).rightJustify( 2, ' ' )).arg(text) );
item->setText( 1, TQString( "%1/%2" )
- .tqarg( track.copyPermitted() ? i18n("copy") : i18n("no copy") )
- .tqarg( track.type() == K3bTrack::AUDIO
+ .arg( track.copyPermitted() ? i18n("copy") : i18n("no copy") )
+ .arg( track.type() == K3bTrack::AUDIO
? ( track.preEmphasis() ? i18n("preemp") : i18n("no preemp") )
: ( track.recordedIncremental() ? i18n("incremental") : i18n("uninterrupted") ) ) );
item->setText( 2,
TQString("%1 - %2")
- .tqarg(track.firstSector().lba())
- .tqarg(track.lastSector().lba()) );
+ .arg(track.firstSector().lba())
+ .arg(track.lastSector().lba()) );
item->setText( 3, TQString::number( track.length().lba() ) + " (" + track.length().toString() + ")" );
#ifdef K3B_DEBUG
if( track.type() == K3bTrack::AUDIO )
- item->setText( 4, TQString( "%1 (%2)" ).tqarg(track.index0().toString()).tqarg(track.index0().lba()) );
+ item->setText( 4, TQString( "%1 (%2)" ).arg(track.index0().toString()).arg(track.index0().lba()) );
#endif
++index;
}
@@ -350,24 +350,24 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
if( info.isDvdMedia() )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Media ID:"),
- !info.mediaId().isEmpty() ? TQString::tqfromLatin1( info.mediaId() ) : i18n("unknown") );
+ !info.mediaId().isEmpty() ? TQString::fromLatin1( info.mediaId() ) : i18n("unknown") );
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Capacity:"),
- i18n("%1 min").tqarg(info.capacity().toString()),
+ i18n("%1 min").arg(info.capacity().toString()),
KIO::convertSize(info.capacity().mode1Bytes()) );
if( !info.empty() )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Used Capacity:"),
- i18n("%1 min").tqarg(info.size().toString()),
+ i18n("%1 min").arg(info.size().toString()),
KIO::convertSize(info.size().mode1Bytes()) );
if( info.appendable() )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Remaining:"),
- i18n("%1 min").tqarg( info.remainingSize().toString() ),
+ i18n("%1 min").arg( info.remainingSize().toString() ),
KIO::convertSize(info.remainingSize().mode1Bytes()) );
atipChild = new KListViewItem( atipItem, atipChild,
@@ -427,7 +427,7 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
if( info.isDvdMedia() )
s.append( TQString().sprintf( "%.1fx (%d KB/s)", (double)*it / 1385.0, *it ) );
else
- s.append( TQString( "%1x (%2 KB/s)" ).tqarg( *it/175 ).tqarg( *it ) );
+ s.append( TQString( "%1x (%2 KB/s)" ).arg( *it/175 ).arg( *it ) );
}
atipChild->setText( 1, s );
@@ -476,10 +476,10 @@ void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescr
// iso9660Child = new KListViewItem( iso9660Item, iso9660Child,
// i18n("Volume Size:"),
// TQString( "%1 (%2*%3)" )
-// .tqarg(iso.logicalBlockSize
+// .arg(iso.logicalBlockSize
// *iso.volumeSpaceSize)
-// .tqarg(iso.logicalBlockSize)
-// .tqarg(iso.volumeSpaceSize),
+// .arg(iso.logicalBlockSize)
+// .arg(iso.volumeSpaceSize),
// KIO::convertSize(iso.logicalBlockSize
// *iso.volumeSpaceSize) );
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index 619db8c..ba0e53f 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -30,7 +30,7 @@
#include <tqtimer.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqpushbutton.h>
#include <tqapplication.h>
@@ -95,10 +95,10 @@ K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* par
// setup the gui
// -----------------------------
d->labelRequest = new TQLabel( plainPage() );
- d->labelRequest->tqsetAlignment( TQt::AlignLeft | TQt::AlignVCenter );
+ d->labelRequest->setAlignment( TQt::AlignLeft | TQt::AlignVCenter );
d->labelFoundMedia = new TQLabel( plainPage() );
d->pixLabel = new TQLabel( plainPage() );
- d->pixLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop );
+ d->pixLabel->setAlignment( TQt::AlignHCenter | TQt::AlignTop );
TQFont f( d->labelFoundMedia->font() );
f.setBold(true);
@@ -152,11 +152,11 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
//
if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) &&
(d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) )
- d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").tqarg("�");
+ d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("�");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL )
- d->wantedMediaTypeString = i18n("DVD%1R(W)").tqarg("�");
+ d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("�");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL )
- d->wantedMediaTypeString = i18n("Double Layer DVD%1R").tqarg("�");
+ d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("�");
else
d->wantedMediaTypeString = i18n("CD-R(W)");
@@ -164,44 +164,44 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
if( (d->wantedMediaState & K3bDevice::STATE_COMPLETE) && (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) )
d->labelRequest->setText( i18n("Please insert a complete or appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(d->device->vendor())
- .tqarg(d->device->description())
- .tqarg(d->device->devicename())
- .tqarg( d->wantedMediaTypeString ) );
+ .arg(d->device->vendor())
+ .arg(d->device->description())
+ .arg(d->device->devicename())
+ .arg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_COMPLETE )
d->labelRequest->setText( i18n("Please insert a complete %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(d->device->vendor())
- .tqarg(d->device->description())
- .tqarg(d->device->devicename())
- .tqarg( d->wantedMediaTypeString ) );
+ .arg(d->device->vendor())
+ .arg(d->device->description())
+ .arg(d->device->devicename())
+ .arg( d->wantedMediaTypeString ) );
else if( (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) && (d->wantedMediaState & K3bDevice::STATE_EMPTY) )
d->labelRequest->setText( i18n("Please insert an empty or appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(d->device->vendor())
- .tqarg(d->device->description())
- .tqarg(d->device->devicename())
- .tqarg( d->wantedMediaTypeString ) );
+ .arg(d->device->vendor())
+ .arg(d->device->description())
+ .arg(d->device->devicename())
+ .arg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_INCOMPLETE )
d->labelRequest->setText( i18n("Please insert an appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(d->device->vendor())
- .tqarg(d->device->description())
- .tqarg(d->device->devicename())
- .tqarg( d->wantedMediaTypeString ) );
+ .arg(d->device->vendor())
+ .arg(d->device->description())
+ .arg(d->device->devicename())
+ .arg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_EMPTY )
d->labelRequest->setText( i18n("Please insert an empty %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(d->device->vendor())
- .tqarg(d->device->description())
- .tqarg(d->device->devicename())
- .tqarg( d->wantedMediaTypeString ) );
+ .arg(d->device->vendor())
+ .arg(d->device->description())
+ .arg(d->device->devicename())
+ .arg( d->wantedMediaTypeString ) );
else // fallback case (this should not happen in K3b)
d->labelRequest->setText( i18n("Please insert a suitable medium "
"into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(d->device->vendor())
- .tqarg(d->device->description())
- .tqarg(d->device->devicename()) );
+ .arg(d->device->vendor())
+ .arg(d->device->description())
+ .arg(d->device->devicename()) );
}
else
@@ -340,10 +340,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. "
"Should it be overwritten?")
- .tqarg("DVD+RW")
- .tqarg(d->device->vendor())
- .tqarg(d->device->description()),
- i18n("Found %1").tqarg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
+ .arg("DVD+RW")
+ .arg(d->device->vendor())
+ .arg(d->device->description()),
+ i18n("Found %1").arg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
finishWaiting( K3bDevice::MEDIA_DVD_PLUS_RW );
}
else {
@@ -410,10 +410,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. "
"Should it be overwritten?")
- .tqarg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType()))
- .tqarg(d->device->vendor())
- .tqarg(d->device->description()),
- i18n("Found %1").tqarg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
+ .arg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType()))
+ .arg(d->device->vendor())
+ .arg(d->device->description()),
+ i18n("Found %1").arg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
finishWaiting( K3bDevice::MEDIA_DVD_RW_OVWR );
}
else {
@@ -467,10 +467,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. "
"Should it be formatted?")
- .tqarg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) )
- .tqarg(d->device->vendor())
- .tqarg(d->device->description()),
- i18n("Found %1").tqarg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) {
+ .arg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) )
+ .arg(d->device->vendor())
+ .arg(d->device->description()),
+ i18n("Found %1").arg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) {
kdDebug() << "(K3bEmptyDiscWaiter) ------ formatting DVD-RW." << endl;
@@ -542,7 +542,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
if( formatWithoutAsking ||
KMessageBox::questionYesNo( parentWidgetToUse(),
i18n("Found rewritable media in %1 - %2. "
- "Should it be erased?").tqarg(d->device->vendor()).tqarg(d->device->description()),
+ "Should it be erased?").arg(d->device->vendor()).arg(d->device->description()),
i18n("Found Rewritable Disk"),
KGuiItem(i18n("&Erase"), "cdrwblank"),
KGuiItem(i18n("E&ject")) ) == KMessageBox::Yes ) {
diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp
index a4b3d3a..62e4936 100644
--- a/src/k3bfiletreecombobox.cpp
+++ b/src/k3bfiletreecombobox.cpp
@@ -29,7 +29,7 @@
#include <tqheader.h>
#include <tqevent.h>
#include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqdrawutil.h>
#include <tqdir.h>
@@ -154,8 +154,8 @@ void K3bFileTreeComboBox::popup()
// code mainly from qcombobox.cpp
m_fileTreeView->triggerUpdate();
- int w = TQMAX( m_fileTreeView->tqsizeHint().width(), width() );
- int h = m_fileTreeView->tqsizeHint().height();
+ int w = TQMAX( m_fileTreeView->sizeHint().width(), width() );
+ int h = m_fileTreeView->sizeHint().height();
TQRect screen = TQApplication::desktop()->availableGeometry( this );
int sx = screen.x(); // screen pos
int sy = screen.y();
@@ -198,7 +198,7 @@ void K3bFileTreeComboBox::popdown()
{
m_fileTreeView->hide();
d->poppedUp = false;
- tqrepaint(); // tqrepaint the arrow
+ repaint(); // repaint the arrow
}
@@ -276,7 +276,7 @@ bool K3bFileTreeComboBox::eventFilter( TQObject* o, TQEvent* e )
if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).contains( me->pos() ) ) {
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
- arrowRect = TQStyle::tqvisualRect(arrowRect, this);
+ arrowRect = TQStyle::visualRect(arrowRect, this);
// Correction for motif style, where arrow is smaller
// and thus has a rect that doesn't fit the button.
@@ -310,7 +310,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e )
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
- arrowRect = TQStyle::tqvisualRect(arrowRect, this);
+ arrowRect = TQStyle::visualRect(arrowRect, this);
// Correction for motif style, where arrow is smaller
// and thus has a rect that doesn't fit the button.
@@ -318,7 +318,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e )
if ( arrowRect.contains( e->pos() ) ) {
popup();
- tqrepaint( FALSE );
+ repaint( FALSE );
}
}
@@ -339,7 +339,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
// we only need this since there is no way to change the status of the arrow-button
TQPainter p( this );
- const TQColorGroup & g = tqcolorGroup();
+ const TQColorGroup & g = colorGroup();
p.setPen(g.text());
TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -356,7 +356,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
// bool reverse = TQApplication::reverseLayout();
- tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+ tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All,
(d->poppedUp ?
TQStyle::SC_ComboBoxArrow :
@@ -364,7 +364,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField );
- re = TQStyle::tqvisualRect(re, this);
+ re = TQStyle::visualRect(re, this);
p.setClipRect( re );
// TQListBoxItem * item = listBox()->item( 0 );
@@ -380,7 +380,7 @@ void K3bFileTreeComboBox::paintEvent( TQPaintEvent* )
const TQPixmap *pix = item->pixmap();
if ( pix ) {
p.fillRect( re.x(), re.y(), pix->width() + 4, re.height(),
- tqcolorGroup().brush( TQColorGroup::Base ) );
+ colorGroup().brush( TQColorGroup::Base ) );
p.drawPixmap( re.x() + 2, re.y() +
( re.height() - pix->height() ) / 2, *pix );
}
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index c56d1e5..1f5df70 100644
--- a/src/k3bfiletreeview.cpp
+++ b/src/k3bfiletreeview.cpp
@@ -46,13 +46,13 @@
#include <tqfont.h>
#include <tqstyle.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
K3bDeviceBranch::K3bDeviceBranch( KFileTreeView* view, K3bDevice::Device* dev, KFileTreeViewItem* item )
: KFileTreeBranch( view,
KURL( "media:/" + dev->blockDeviceName() ),
- TQString("%1 - %2").tqarg(dev->vendor()).tqarg(dev->description()),
+ TQString("%1 - %2").arg(dev->vendor()).arg(dev->description()),
( dev->burner()
? SmallIcon("cdwriter_unmount")
: SmallIcon("cdrom_unmount") ),
@@ -99,13 +99,13 @@ void K3bDeviceBranch::updateLabel()
{
if( m_showBlockDeviceName )
setName( TQString("%1 %2 (%3)")
- .tqarg(m_device->vendor())
- .tqarg(m_device->description())
- .tqarg(m_device->blockDeviceName()) );
+ .arg(m_device->vendor())
+ .arg(m_device->description())
+ .arg(m_device->blockDeviceName()) );
else
setName( TQString("%1 %2")
- .tqarg(m_device->vendor())
- .tqarg(m_device->description()) );
+ .arg(m_device->vendor())
+ .arg(m_device->description()) );
if( k3bappcore->mediaCache() ) {
root()->setMultiLinesEnabled( true );
@@ -182,7 +182,7 @@ K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeView* parent,
void K3bDeviceBranchViewItem::setCurrent( bool c )
{
m_bCurrent = c;
- tqrepaint();
+ repaint();
}
@@ -238,7 +238,7 @@ void K3bDeviceBranchViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, i
textheight++;
if ( textheight < height() ) {
int w = listView()->treeStepSize() / 2;
- listView()->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, listView(),
+ listView()->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, listView(),
TQRect( 0, textheight, w + 1, height() - textheight + 1 ), cg,
TQStyle::Style_Enabled,
TQStyle::SC_ListViewExpand,
@@ -343,7 +343,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
lay->addMultiCellWidget( label, 0, 0, 0, 1 );
label = new TQLabel( details, tooltip );
label->setMargin( 9 );
- label->tqsetAlignment( Qt::Vertical );
+ label->setAlignment( Qt::Vertical );
lay->addMultiCellWidget( label, 1, 2, 0, 0 );
label = new TQLabel( tooltip );
lay->addWidget( label, 2, 1 );
@@ -374,7 +374,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos )
}
// the tooltip will take care of deleting the widget
- tip( m_view->tqitemRect( item ), tooltip );
+ tip( m_view->itemRect( item ), tooltip );
}
@@ -722,7 +722,7 @@ void K3bFileTreeView::updateMinimumWidth()
}
// width of the items + scrollbar width + the frame + a little eyecandy spacing
- setMinimumWidth( w + verticalScrollBar()->tqsizeHint().width() + 2*frameWidth() + 2 );
+ setMinimumWidth( w + verticalScrollBar()->sizeHint().width() + 2*frameWidth() + 2 );
}
#include "k3bfiletreeview.moc"
diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp
index 556bab3..73ae31d 100644
--- a/src/k3bfileview.cpp
+++ b/src/k3bfileview.cpp
@@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdir.h>
#include <tqvbox.h>
#include <tqlabel.h>
@@ -63,15 +63,15 @@ KActionCollection* K3bFileView::actionCollection() const
void K3bFileView::setupGUI()
{
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
- // tqlayout->setAutoAdd( true );
+ TQVBoxLayout* layout = new TQVBoxLayout( this );
+ // layout->setAutoAdd( true );
m_dirOp = new K3bDirOperator( KURL::fromPathOrURL(TQDir::home().absPath()), this );
m_toolBox = new K3bToolBox( this );
- tqlayout->addWidget( m_toolBox );
- tqlayout->addWidget( m_dirOp );
- tqlayout->setStretchFactor( m_dirOp, 1 );
+ layout->addWidget( m_toolBox );
+ layout->addWidget( m_dirOp );
+ layout->setStretchFactor( m_dirOp, 1 );
// setup actions
KAction* actionHome = m_dirOp->actionCollection()->action("home");
diff --git a/src/k3bfirstrun.cpp b/src/k3bfirstrun.cpp
index f27d927..7825356 100644
--- a/src/k3bfirstrun.cpp
+++ b/src/k3bfirstrun.cpp
@@ -22,7 +22,7 @@
#include <kiconloader.h>
#include <kconfig.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp
index 8d68f6f..4300c8c 100644
--- a/src/k3bflatbutton.cpp
+++ b/src/k3bflatbutton.cpp
@@ -139,7 +139,7 @@ void K3bFlatButton::setHover( bool b )
}
-TQSize K3bFlatButton::tqsizeHint() const
+TQSize K3bFlatButton::sizeHint() const
{
// height: pixmap + 5 spacing + font height + frame width
// width: max( pixmap, text) + frame width
@@ -158,7 +158,7 @@ void K3bFlatButton::drawContents( TQPainter* p )
// TQRect r( mapToParent( TQPoint(lineWidth(), lineWidth()) ),
// mapToParent( TQPoint(width()-2*lineWidth(), height()-2*lineWidth() )) );
-// parentWidget()->tqrepaint( r );
+// parentWidget()->repaint( r );
// }
p->save();
diff --git a/src/k3bflatbutton.h b/src/k3bflatbutton.h
index 171476d..83ebd55 100644
--- a/src/k3bflatbutton.h
+++ b/src/k3bflatbutton.h
@@ -41,7 +41,7 @@ class K3bFlatButton : public TQFrame
~K3bFlatButton();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
public slots:
void setColors( const TQColor& fore, const TQColor& back );
diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp
index 738661c..e7cf633 100644
--- a/src/k3binteractiondialog.cpp
+++ b/src/k3binteractiondialog.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqstring.h>
@@ -82,7 +82,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
// settings buttons
// ---------------------------------------------------------------------------------------------------
if( !m_configGroup.isEmpty() ) {
- TQHBoxLayout* tqlayout2 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout2");
+ TQHBoxLayout* layout2 = new TQHBoxLayout( 0, 0, spacingHint(), "layout2");
m_buttonLoadSettings = new K3bToolButton( /*i18n("User Defaults"), */this );
((K3bToolButton*)m_buttonLoadSettings)->setIconSet( SmallIconSet( "revert" ) );
TQPopupMenu* userDefaultsPopup = new TQPopupMenu( m_buttonLoadSettings );
@@ -91,13 +91,13 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
userDefaultsPopup->insertItem( i18n("Load last used settings"), this, TQT_SLOT(slotLoadLastSettings()) );
((TQToolButton*)m_buttonLoadSettings)->setPopup( userDefaultsPopup );
((K3bToolButton*)m_buttonLoadSettings)->setInstantMenu( true );
- tqlayout2->addWidget( m_buttonLoadSettings );
+ layout2->addWidget( m_buttonLoadSettings );
m_buttonSaveSettings = new TQToolButton( /*i18n("Save User Defaults"), */this, "m_buttonSaveSettings" );
((TQToolButton*)m_buttonSaveSettings)->setIconSet( SmallIconSet( "filesave" ) );
- tqlayout2->addWidget( m_buttonSaveSettings );
+ layout2->addWidget( m_buttonSaveSettings );
- mainGrid->addLayout( tqlayout2, 2, 0 );
+ mainGrid->addLayout( layout2, 2, 0 );
}
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -106,7 +106,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
// action buttons
// ---------------------------------------------------------------------------------------------------
- TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, spacingHint(), "tqlayout5");
+ TQHBoxLayout* layout5 = new TQHBoxLayout( 0, 0, spacingHint(), "layout5");
if( buttonMask & START_BUTTON ) {
KGuiItem startItem = KStdGuiItem::ok();
@@ -149,33 +149,33 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
case 0: // KDE default
default:
if ( m_buttonStart )
- tqlayout5->addWidget( m_buttonStart );
+ layout5->addWidget( m_buttonStart );
if ( m_buttonSave )
- tqlayout5->addWidget( m_buttonSave );
+ layout5->addWidget( m_buttonSave );
if ( m_buttonCancel )
- tqlayout5->addWidget( m_buttonCancel );
+ layout5->addWidget( m_buttonCancel );
break;
case 1: // something different
if ( m_buttonCancel )
- tqlayout5->addWidget( m_buttonCancel );
+ layout5->addWidget( m_buttonCancel );
if ( m_buttonSave )
- tqlayout5->addWidget( m_buttonSave );
+ layout5->addWidget( m_buttonSave );
if ( m_buttonStart )
- tqlayout5->addWidget( m_buttonStart );
+ layout5->addWidget( m_buttonStart );
break;
case 2: // GTK-Style
if ( m_buttonSave )
- tqlayout5->addWidget( m_buttonSave );
+ layout5->addWidget( m_buttonSave );
if ( m_buttonCancel )
- tqlayout5->addWidget( m_buttonCancel );
+ layout5->addWidget( m_buttonCancel );
if ( m_buttonStart )
- tqlayout5->addWidget( m_buttonStart );
+ layout5->addWidget( m_buttonStart );
break;
}
- mainGrid->addLayout( tqlayout5, 2, 2 );
+ mainGrid->addLayout( layout5, 2, 2 );
mainGrid->setRowStretch( 1, 1 );
@@ -200,9 +200,9 @@ void K3bInteractionDialog::show()
}
-TQSize K3bInteractionDialog::tqsizeHint() const
+TQSize K3bInteractionDialog::sizeHint() const
{
- TQSize s = KDialog::tqsizeHint();
+ TQSize s = KDialog::sizeHint();
// I want the dialogs to look good.
// That means their height should never outgrow their width
if( s.height() > s.width() )
diff --git a/src/k3binteractiondialog.h b/src/k3binteractiondialog.h
index f6978ed..cb0c0ba 100644
--- a/src/k3binteractiondialog.h
+++ b/src/k3binteractiondialog.h
@@ -105,7 +105,7 @@ class K3bInteractionDialog : public KDialog
CANCEL_BUTTON = 4
};
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
const TQString& configGroup() const { return m_configGroup; }
diff --git a/src/k3bjobinterface.cpp b/src/k3bjobinterface.cpp
index 1037968..4eb1dd5 100644
--- a/src/k3bjobinterface.cpp
+++ b/src/k3bjobinterface.cpp
@@ -49,7 +49,7 @@ void K3bJobInterface::setJob( K3bJob* job )
connect( m_job, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) );
if( m_job->inherits( "K3bBurnJob" ) ) {
- connect( m_job, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SLOT(slotBuffer(int)) );
+ connect( m_job, TQT_SIGNAL(bufferStatus(int)), this, TQT_SLOT(slotBuffer(int)) );
connect( m_job, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) );
}
diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp
index c179fd9..593e087 100644
--- a/src/k3bjobprogressdialog.cpp
+++ b/src/k3bjobprogressdialog.cpp
@@ -35,7 +35,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -131,7 +131,7 @@ void K3bJobProgressDialog::setupGUI()
headerLayout->addWidget( m_pixLabel );
TQFrame* frame4 = new TQFrame( headerFrame, "frame4" );
- frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame4->sizePolicy().hasHeightForWidth() ) );
+ frame4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame4->sizePolicy().hasHeightForWidth() ) );
frame4->setFrameShape( TQFrame::NoFrame );
frame4->setFrameShadow( TQFrame::Raised );
TQVBoxLayout* frame4Layout = new TQVBoxLayout( frame4, 6, 3, "frame4Layout");
@@ -142,12 +142,12 @@ void K3bJobProgressDialog::setupGUI()
m_labelJob_font.setPointSize( m_labelJob_font.pointSize() + 2 );
m_labelJob_font.setBold( true );
m_labelJob->setFont( m_labelJob_font );
- m_labelJob->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelJob->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
frame4Layout->addWidget( m_labelJob );
m_labelJobDetails = new K3bThemedLabel( frame4 );
- m_labelJobDetails->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelJobDetails->sizePolicy().hasHeightForWidth() ) );
- m_labelJobDetails->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelJobDetails->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelJobDetails->sizePolicy().hasHeightForWidth() ) );
+ m_labelJobDetails->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
frame4Layout->addWidget( m_labelJobDetails );
headerLayout->addWidget( frame4 );
@@ -177,7 +177,7 @@ void K3bJobProgressDialog::setupGUI()
progressHeaderLayout->setSpacing( 0 );
TQFrame* frame5 = new TQFrame( progressHeaderFrame, "frame5" );
- frame5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame5->sizePolicy().hasHeightForWidth() ) );
+ frame5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, frame5->sizePolicy().hasHeightForWidth() ) );
frame5->setFrameShape( TQFrame::NoFrame );
frame5->setFrameShadow( TQFrame::Raised );
TQVBoxLayout* frame5Layout = new TQVBoxLayout( frame5, 6, 3, "frame5Layout");
@@ -190,7 +190,7 @@ void K3bJobProgressDialog::setupGUI()
frame5Layout->addWidget( m_labelTask );
m_labelElapsedTime = new K3bThemedLabel( frame5 );
- m_labelElapsedTime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelElapsedTime->sizePolicy().hasHeightForWidth() ) );
+ m_labelElapsedTime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 1, m_labelElapsedTime->sizePolicy().hasHeightForWidth() ) );
frame5Layout->addWidget( m_labelElapsedTime );
progressHeaderLayout->addWidget( frame5 );
@@ -198,28 +198,28 @@ void K3bJobProgressDialog::setupGUI()
mainLayout->addWidget( progressHeaderFrame );
// ------------------------------------------------------------------------------------------
- TQHBoxLayout* tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
+ TQHBoxLayout* layout3 = new TQHBoxLayout( 0, 0, 6, "layout3");
m_labelSubTask = new KCutLabel( this, "m_labelSubTask" );
- tqlayout3->addWidget( m_labelSubTask );
+ layout3->addWidget( m_labelSubTask );
m_labelSubProcessedSize = new TQLabel( this, "m_labelSubProcessedSize" );
- m_labelSubProcessedSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
- tqlayout3->addWidget( m_labelSubProcessedSize );
- mainLayout->addLayout( tqlayout3 );
+ m_labelSubProcessedSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ layout3->addWidget( m_labelSubProcessedSize );
+ mainLayout->addLayout( layout3 );
m_progressSubPercent = new KProgress( this, "m_progressSubPercent" );
mainLayout->addWidget( m_progressSubPercent );
- TQHBoxLayout* tqlayout4 = new TQHBoxLayout( 0, 0, 6, "tqlayout4");
+ TQHBoxLayout* layout4 = new TQHBoxLayout( 0, 0, 6, "layout4");
TQLabel* textLabel5 = new TQLabel( i18n("Overall progress:"), this, "textLabel5" );
- tqlayout4->addWidget( textLabel5 );
+ layout4->addWidget( textLabel5 );
m_labelProcessedSize = new TQLabel( this, "m_labelProcessedSize" );
- m_labelProcessedSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
- tqlayout4->addWidget( m_labelProcessedSize );
- mainLayout->addLayout( tqlayout4 );
+ m_labelProcessedSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ layout4->addWidget( m_labelProcessedSize );
+ mainLayout->addLayout( layout4 );
m_progressPercent = new KProgress( this, "m_progressPercent" );
mainLayout->addWidget( m_progressPercent );
@@ -237,18 +237,18 @@ void K3bJobProgressDialog::setupGUI()
line2->setFrameShadow( TQFrame::Sunken );
mainLayout->addWidget( line2 );
- TQHBoxLayout* tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5");
+ TQHBoxLayout* layout5 = new TQHBoxLayout( 0, 0, 6, "layout5");
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- tqlayout5->addItem( spacer );
+ layout5->addItem( spacer );
m_buttonCancel = new KPushButton( KStdGuiItem::cancel(), this, "m_buttonCancel" );
- tqlayout5->addWidget( m_buttonCancel );
+ layout5->addWidget( m_buttonCancel );
m_buttonClose = new KPushButton( KStdGuiItem::close(), this );
- tqlayout5->addWidget( m_buttonClose );
+ layout5->addWidget( m_buttonClose );
m_buttonShowDebug = new TQPushButton( i18n("Show Debugging Output"), this );
- tqlayout5->addWidget( m_buttonShowDebug );
+ layout5->addWidget( m_buttonShowDebug );
- mainLayout->addLayout( tqlayout5 );
+ mainLayout->addLayout( layout5 );
m_pixLabel->setThemePixmap( K3bTheme::PROGRESS_WORKING );
@@ -314,13 +314,13 @@ void K3bJobProgressDialog::setupConnections()
void K3bJobProgressDialog::slotProcessedSize( int processed, int size )
{
- m_labelProcessedSize->setText( i18n("%1 of %2 MB").tqarg( processed ).tqarg( size ) );
+ m_labelProcessedSize->setText( i18n("%1 of %2 MB").arg( processed ).arg( size ) );
}
void K3bJobProgressDialog::slotProcessedSubSize( int processedTrackSize, int trackSize )
{
- m_labelSubProcessedSize->setText( i18n("%1 of %2 MB").tqarg(processedTrackSize).tqarg(trackSize) );
+ m_labelSubProcessedSize->setText( i18n("%1 of %2 MB").arg(processedTrackSize).arg(trackSize) );
}
@@ -515,10 +515,10 @@ void K3bJobProgressDialog::slotUpdateTime()
{
int elapsed = m_startTime.secsTo( TQTime::currentTime() );
- TQString s = i18n("Elapsed time: %1 h").tqarg( TQTime().addSecs(elapsed).toString() );
+ TQString s = i18n("Elapsed time: %1 h").arg( TQTime().addSecs(elapsed).toString() );
if( d->lastProgress > 0 && d->lastProgress < 100 ) {
int rem = m_startTime.secsTo( m_lastProgressUpdateTime ) * (100-d->lastProgress) / d->lastProgress;
- s += " / " + i18n("Remaining: %1 h").tqarg( TQTime().addSecs(rem).toString() );
+ s += " / " + i18n("Remaining: %1 h").arg( TQTime().addSecs(rem).toString() );
}
m_labelElapsedTime->setText( s );
@@ -546,10 +546,10 @@ void K3bJobProgressDialog::slotProgress( int percent )
d->lastProgress = percent;
m_lastProgressUpdateTime = TQTime::currentTime();
if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) {
- w->setPlainCaption( TQString( "(%1%) %2" ).tqarg(percent).tqarg(m_plainCaption) );
+ w->setPlainCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_plainCaption) );
}
- setCaption( TQString( "(%1%) %2" ).tqarg(percent).tqarg(m_job->jobDescription()) );
+ setCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_job->jobDescription()) );
}
}
@@ -579,9 +579,9 @@ void K3bJobProgressDialog::keyPressEvent( TQKeyEvent *e )
}
-TQSize K3bJobProgressDialog::tqsizeHint() const
+TQSize K3bJobProgressDialog::sizeHint() const
{
- TQSize s = tqlayout()->totalSizeHint();
+ TQSize s = layout()->totalSizeHint();
if( s.width() < s.height() )
s.setWidth( s.height() );
return s;
diff --git a/src/k3bjobprogressdialog.h b/src/k3bjobprogressdialog.h
index e0f33ea..18b605c 100644
--- a/src/k3bjobprogressdialog.h
+++ b/src/k3bjobprogressdialog.h
@@ -79,7 +79,7 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler
*/
int startJob( K3bJob* job = 0 );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
/**
* @reimplemented from K3bJobHandler
diff --git a/src/k3blsofwrapperdialog.cpp b/src/k3blsofwrapperdialog.cpp
index d7d1cb4..6ffc6f5 100644
--- a/src/k3blsofwrapperdialog.cpp
+++ b/src/k3blsofwrapperdialog.cpp
@@ -79,9 +79,9 @@ bool K3bLsofWrapperDialog::slotCheckDevice()
"<p><em>Hint: Sometimes shutting down an application does not "
"happen instantly. In that case you might have to use the '%3' "
"button.")
- .tqarg( m_device->vendor() + " - " + m_device->description() )
- .tqarg( joinProcessNames(apps) )
- .tqarg( actionButton( User2 )->text() ) );
+ .arg( m_device->vendor() + " - " + m_device->description() )
+ .arg( joinProcessNames(apps) )
+ .arg( actionButton( User2 )->text() ) );
return true;
}
}
diff --git a/src/k3bmediacontentsview.cpp b/src/k3bmediacontentsview.cpp
index 69c57fa..dd3a804 100644
--- a/src/k3bmediacontentsview.cpp
+++ b/src/k3bmediacontentsview.cpp
@@ -19,7 +19,7 @@
#include <k3bapplication.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <tqwidgetstack.h>
diff --git a/src/k3bmediaselectioncombobox.cpp b/src/k3bmediaselectioncombobox.cpp
index 666b268..738e44f 100644
--- a/src/k3bmediaselectioncombobox.cpp
+++ b/src/k3bmediaselectioncombobox.cpp
@@ -64,7 +64,7 @@ void K3bMediaSelectionComboBox::ToolTip::maybeTip( const TQPoint& pos )
int index = m_box->listBox()->index( item );
if( K3bDevice::Device* dev = m_box->deviceAt( index ) ) {
- tip( m_box->listBox()->tqitemRect( item ),
+ tip( m_box->listBox()->itemRect( item ),
m_box->mediumToolTip( k3bappcore->mediaCache()->medium( dev ) ) );
}
}
@@ -350,7 +350,7 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev )
//
// insert the modified string
//
- insertItem( s + TQString(" (%1 - %2)").tqarg(dev->vendor()).tqarg(dev->description()) );
+ insertItem( s + TQString(" (%1 - %2)").arg(dev->vendor()).arg(dev->description()) );
//
// change the already existing string if we did not already do so
@@ -358,7 +358,7 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev )
//
int prevIndex = d->mediaStringMap[s];
if( prevIndex >= 0 )
- changeItem( text(prevIndex) + TQString(" (%1 - %2)").tqarg(d->devices[prevIndex]->vendor()).tqarg(d->devices[prevIndex]->description()),
+ changeItem( text(prevIndex) + TQString(" (%1 - %2)").arg(d->devices[prevIndex]->vendor()).arg(d->devices[prevIndex]->description()),
prevIndex );
//
@@ -478,11 +478,11 @@ TQString K3bMediaSelectionComboBox::noMediumMessage() const
mediumString = i18n("DVD");
else if( (d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD) &&
(d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD) )
- mediumString = i18n("CD-R(W) or DVD%1R(W)").tqarg("");
+ mediumString = i18n("CD-R(W) or DVD%1R(W)").arg("");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_SL )
- mediumString = i18n("DVD%1R(W)").tqarg("");
+ mediumString = i18n("DVD%1R(W)").arg("");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_DL )
- mediumString = i18n("Double Layer DVD%1R").tqarg("");
+ mediumString = i18n("Double Layer DVD%1R").arg("");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD )
mediumString = i18n("CD-R(W)");
else if( d->wantedMediumType & K3bDevice::MEDIA_DVD_ROM )
@@ -490,7 +490,7 @@ TQString K3bMediaSelectionComboBox::noMediumMessage() const
else
mediumString = i18n("CD-ROM");
- return i18n("Please insert %1...").tqarg( stateString.tqarg( mediumString ) );
+ return i18n("Please insert %1...").arg( stateString.arg( mediumString ) );
}
diff --git a/src/k3bmediaselectiondialog.cpp b/src/k3bmediaselectiondialog.cpp
index 7e1bf63..b9856fb 100644
--- a/src/k3bmediaselectiondialog.cpp
+++ b/src/k3bmediaselectiondialog.cpp
@@ -20,7 +20,7 @@
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp
index 9795cfd..e3cf946 100644
--- a/src/k3bmedium.cpp
+++ b/src/k3bmedium.cpp
@@ -292,7 +292,7 @@ TQString K3bMedium::shortString( bool useContent ) const
}
else if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ) {
- return i18n("Empty %1 medium").tqarg( mediaTypeString );
+ return i18n("Empty %1 medium").arg( mediaTypeString );
}
else {
@@ -302,39 +302,39 @@ TQString K3bMedium::shortString( bool useContent ) const
toc().contentType() == K3bDevice::MIXED ) {
if( !cdText().performer().isEmpty() || !cdText().title().isEmpty() ) {
return TQString("%1 - %2 (%3)")
- .tqarg( cdText().performer() )
- .tqarg( cdText().title() )
- .tqarg( toc().contentType() == K3bDevice::AUDIO ? i18n("Audio CD") : i18n("Mixed CD") );
+ .arg( cdText().performer() )
+ .arg( cdText().title() )
+ .arg( toc().contentType() == K3bDevice::AUDIO ? i18n("Audio CD") : i18n("Mixed CD") );
}
else if( toc().contentType() == K3bDevice::AUDIO ) {
return i18n("Audio CD");
}
else {
- return i18n("%1 (Mixed CD)").tqarg( beautifiedVolumeId() );
+ return i18n("%1 (Mixed CD)").arg( beautifiedVolumeId() );
}
}
// DATA CD and DVD
else if( !volumeId().isEmpty() ) {
if( content() & CONTENT_VIDEO_DVD ) {
- return TQString("%1 (%2)").tqarg( beautifiedVolumeId() ).tqarg( i18n("Video DVD") );
+ return TQString("%1 (%2)").arg( beautifiedVolumeId() ).arg( i18n("Video DVD") );
}
else if( content() & CONTENT_VIDEO_CD ) {
- return TQString("%1 (%2)").tqarg( beautifiedVolumeId() ).tqarg( i18n("Video CD") );
+ return TQString("%1 (%2)").arg( beautifiedVolumeId() ).arg( i18n("Video CD") );
}
else if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
- return i18n("%1 (Appendable Data %2)").tqarg( beautifiedVolumeId(), mediaTypeString );
+ return i18n("%1 (Appendable Data %2)").arg( beautifiedVolumeId(), mediaTypeString );
}
else {
- return i18n("%1 (Complete Data %2)").tqarg( beautifiedVolumeId(), mediaTypeString );
+ return i18n("%1 (Complete Data %2)").arg( beautifiedVolumeId(), mediaTypeString );
}
}
else {
if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
- return i18n("Appendable Data %1").tqarg( mediaTypeString );
+ return i18n("Appendable Data %1").arg( mediaTypeString );
}
else {
- return i18n("Complete Data %1").tqarg( mediaTypeString );
+ return i18n("Complete Data %1").arg( mediaTypeString );
}
}
}
@@ -342,10 +342,10 @@ TQString K3bMedium::shortString( bool useContent ) const
// without content
else {
if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
- return i18n("Appendable %1 medium").tqarg( mediaTypeString );
+ return i18n("Appendable %1 medium").arg( mediaTypeString );
}
else {
- return i18n("Complete %1 medium").tqarg( mediaTypeString );
+ return i18n("Complete %1 medium").arg( mediaTypeString );
}
}
}
@@ -356,15 +356,15 @@ TQString K3bMedium::longString() const
{
TQString s = TQString("<p><nobr><b>%1 %2</b> (%3)</nobr>"
"<p>")
- .tqarg( d->device->vendor() )
- .tqarg( d->device->description() )
- .tqarg( d->device->blockDeviceName() )
+ .arg( d->device->vendor() )
+ .arg( d->device->description() )
+ .arg( d->device->blockDeviceName() )
+ shortString( true );
if( diskInfo().diskState() == K3bDevice::STATE_COMPLETE ||
diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
s += "<br>" + i18n("%1 in %n track", "%1 in %n tracks", toc().count() )
- .tqarg( KIO::convertSize(diskInfo().size().mode1Bytes() ) );
+ .arg( KIO::convertSize(diskInfo().size().mode1Bytes() ) );
if( diskInfo().numSessions() > 1 )
s += i18n(" and %n session", " and %n sessions", diskInfo().numSessions() );
}
@@ -372,11 +372,11 @@ TQString K3bMedium::longString() const
if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ||
diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE )
s += "<br>" + i18n("Free space: %1")
- .tqarg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) );
+ .arg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) );
if( !diskInfo().empty() && diskInfo().rewritable() )
s += "<br>" + i18n("Capacity: %1")
- .tqarg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) );
+ .arg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) );
return s;
}
@@ -411,7 +411,7 @@ TQString K3bMedium::beautifiedVolumeId() const
return oldId;
// replace underscore with space
- else if( c.tqunicode() == 95 ) {
+ else if( c.unicode() == 95 ) {
newId.append( ' ' );
newWord = true;
}
diff --git a/src/k3bminibutton.cpp b/src/k3bminibutton.cpp
index 7d425d5..b20399d 100644
--- a/src/k3bminibutton.cpp
+++ b/src/k3bminibutton.cpp
@@ -37,7 +37,7 @@ K3bMiniButton::~K3bMiniButton()
void K3bMiniButton::drawButton( TQPainter* p )
{
- p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+ p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
if( m_mouseOver && !isDown() ){
p->setPen( white );
@@ -45,12 +45,12 @@ void K3bMiniButton::drawButton( TQPainter* p )
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->lineTo( width() - 1, height() - 1 );
p->lineTo( 0, height() - 1 );
}
if( isOn() || isDown() ){
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->moveTo( 0, height() - 1 );
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
@@ -64,14 +64,14 @@ void K3bMiniButton::drawButton( TQPainter* p )
void K3bMiniButton::enterEvent( TQEvent * )
{
m_mouseOver = true;
- tqrepaint();
+ repaint();
}
void K3bMiniButton::leaveEvent( TQEvent * )
{
m_mouseOver = false;
- tqrepaint();
+ repaint();
}
#include "k3bminibutton.moc"
diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp
index 550e7b4..45a9201 100644
--- a/src/k3bpassivepopup.cpp
+++ b/src/k3bpassivepopup.cpp
@@ -29,7 +29,7 @@
#include <kactivelabel.h>
#include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqmainwindow.h>
#include <tqmessagebox.h>
@@ -116,7 +116,7 @@ K3bPassivePopup::K3bPassivePopup( TQWidget* parent )
d->titleLabel = new TQLabel( this );
d->titleLabel->setMargin( 5 );
- d->titleLabel->tqsetAlignment( TQt::AlignCenter );
+ d->titleLabel->setAlignment( TQt::AlignCenter );
TQFont fnt( d->titleLabel->font() );
fnt.setBold( true );
d->titleLabel->setFont( fnt );
@@ -124,7 +124,7 @@ K3bPassivePopup::K3bPassivePopup( TQWidget* parent )
d->messageLabel = new KActiveLabel( this );
d->pixmapLabel = new TQLabel( this );
- d->pixmapLabel->tqsetAlignment( TQt::AlignTop );
+ d->pixmapLabel->setAlignment( TQt::AlignTop );
d->timeoutWidget = new K3bTimeoutWidget( this );
connect( d->timeoutWidget, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClose()) );
diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp
index 93a51d4..7678713 100644
--- a/src/k3bprojectmanager.cpp
+++ b/src/k3bprojectmanager.cpp
@@ -40,7 +40,7 @@
#include <tqptrlist.h>
#include <tqmap.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdom.h>
#include <tqfile.h>
#include <tqapplication.h>
@@ -199,49 +199,49 @@ K3bDoc* K3bProjectManager::createEmptyProject( K3bDoc::DocType type )
switch( type ) {
case K3bDoc::AUDIO: {
doc = new K3bAudioDoc( this );
- fileName = i18n("AudioCD%1").tqarg(d->audioUntitledCount++);
+ fileName = i18n("AudioCD%1").arg(d->audioUntitledCount++);
break;
}
case K3bDoc::DATA: {
doc = new K3bDataDoc( this );
- fileName = i18n("DataCD%1").tqarg(d->dataUntitledCount++);
+ fileName = i18n("DataCD%1").arg(d->dataUntitledCount++);
break;
}
case K3bDoc::MIXED: {
doc = new K3bMixedDoc( this );
- fileName=i18n("MixedCD%1").tqarg(d->mixedUntitledCount++);
+ fileName=i18n("MixedCD%1").arg(d->mixedUntitledCount++);
break;
}
case K3bDoc::VCD: {
doc = new K3bVcdDoc( this );
- fileName=i18n("VideoCD%1").tqarg(d->vcdUntitledCount++);
+ fileName=i18n("VideoCD%1").arg(d->vcdUntitledCount++);
break;
}
case K3bDoc::MOVIX: {
doc = new K3bMovixDoc( this );
- fileName=i18n("eMovixCD%1").tqarg(d->movixUntitledCount++);
+ fileName=i18n("eMovixCD%1").arg(d->movixUntitledCount++);
break;
}
case K3bDoc::MOVIX_DVD: {
doc = new K3bMovixDvdDoc( this );
- fileName=i18n("eMovixDVD%1").tqarg(d->movixDvdUntitledCount++);
+ fileName=i18n("eMovixDVD%1").arg(d->movixDvdUntitledCount++);
break;
}
case K3bDoc::DVD: {
doc = new K3bDvdDoc( this );
- fileName = i18n("DataDVD%1").tqarg(d->dvdUntitledCount++);
+ fileName = i18n("DataDVD%1").arg(d->dvdUntitledCount++);
break;
}
case K3bDoc::VIDEODVD: {
doc = new K3bVideoDvdDoc( this );
- fileName = i18n("VideoDVD%1").tqarg(d->videoDvdUntitledCount++);
+ fileName = i18n("VideoDVD%1").arg(d->videoDvdUntitledCount++);
break;
}
}
diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp
index 3ef831d..a138d03 100644
--- a/src/k3bsidepanel.cpp
+++ b/src/k3bsidepanel.cpp
@@ -23,7 +23,7 @@
#include <tqtoolbutton.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
@@ -43,7 +43,7 @@ K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* parent, const char* name
addButton( cdProjectsFrame, m_mainWindow->action( "file_new_mixed" ) );
addButton( cdProjectsFrame, m_mainWindow->action( "file_new_vcd" ) );
addButton( cdProjectsFrame, m_mainWindow->action( "file_new_movix" ) );
- TQGridLayout* grid = (TQGridLayout*)cdProjectsFrame->tqlayout();
+ TQGridLayout* grid = (TQGridLayout*)cdProjectsFrame->layout();
grid->setRowSpacing( grid->numRows(), 15 );
addButton( cdProjectsFrame, m_mainWindow->action( "tools_copy_cd" ) );
addButton( cdProjectsFrame, m_mainWindow->action( "tools_write_cd_image" ) );
@@ -56,7 +56,7 @@ K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* parent, const char* name
addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_dvd" ) );
addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_video_dvd" ) );
addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_movix_dvd" ) );
- grid = (TQGridLayout*)dvdProjectsFrame->tqlayout();
+ grid = (TQGridLayout*)dvdProjectsFrame->layout();
grid->setRowSpacing( grid->numRows(), 15 );
addButton( dvdProjectsFrame, m_mainWindow->action( "tools_copy_dvd" ) );
addButton( dvdProjectsFrame, m_mainWindow->action( "tools_write_dvd_iso" ) );
@@ -98,7 +98,7 @@ void K3bSidePanel::addButton( TQFrame* frame, KAction* a )
connect( b, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) );
- TQGridLayout* grid = (TQGridLayout*)(frame->tqlayout());
+ TQGridLayout* grid = (TQGridLayout*)(frame->layout());
grid->addWidget( b, grid->numRows(), 0 );
}
else
diff --git a/src/k3bsplash.cpp b/src/k3bsplash.cpp
index 5966eed..bfe7b15 100644
--- a/src/k3bsplash.cpp
+++ b/src/k3bsplash.cpp
@@ -47,7 +47,7 @@ K3bSplash::K3bSplash( TQWidget* parent, const char* name )
copyrightLabel->setMargin( 5 );
copyrightLabel->setPaletteBackgroundColor( black );
copyrightLabel->setPaletteForegroundColor( white );
- copyrightLabel->tqsetAlignment( AlignRight );
+ copyrightLabel->setAlignment( AlignRight );
TQLabel* picLabel = new TQLabel( this );
if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
@@ -60,9 +60,9 @@ K3bSplash::K3bSplash( TQWidget* parent, const char* name )
m_infoBox->setPaletteBackgroundColor( black );
m_infoBox->setPaletteForegroundColor( white );
- // Set tqgeometry, with support for Xinerama systems
+ // Set geometry, with support for Xinerama systems
TQRect r;
- r.setSize(tqsizeHint());
+ r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen();
r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
setGeometry(r);
@@ -108,7 +108,7 @@ void K3bSplash::addInfo( const TQString& s )
// TQFontMetrics fm = p.fontMetrics();
-// TQString line1 = TQString( "K3b version %1" ).tqarg(VERSION);
+// TQString line1 = TQString( "K3b version %1" ).arg(VERSION);
// TQString line2( "(c) 2001 by Sebastian Trueg" );
// TQString line3( "licenced under the GPL" );
@@ -122,7 +122,7 @@ void K3bSplash::addInfo( const TQString& s )
// int startX = 10;
// int startY = height() - 10 - textH;
-// p.drawText( startX, startY, textW, textH, 0, TQString("%1\n%2\n%3").tqarg(line1).tqarg(line2).tqarg(line3) );
+// p.drawText( startX, startY, textW, textH, 0, TQString("%1\n%2\n%3").arg(line1).arg(line2).arg(line3) );
// }
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index 375a3d5..0d88798 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -66,7 +66,7 @@ K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent )
m_labelInfoMessage = new TQLabel( " ", m_mainWindow->statusBar() );
// setup version info
- m_versionBox = new TQLabel( TQString("K3b %1").tqarg(kapp->aboutData()->version()), m_mainWindow->statusBar() );
+ m_versionBox = new TQLabel( TQString("K3b %1").arg(kapp->aboutData()->version()), m_mainWindow->statusBar() );
m_versionBox->installEventFilter( this );
// setup the statusbar
@@ -167,7 +167,7 @@ bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
static TQString dataDocStats( K3bDataDoc* dataDoc )
{
return i18n("1 file in %1", "%n files in %1", dataDoc->root()->numFiles() )
- .tqarg( i18n("1 folder", "%n folders", dataDoc->root()->numDirs()+1 ) );
+ .arg( i18n("1 folder", "%n folders", dataDoc->root()->numDirs()+1 ) );
}
@@ -199,7 +199,7 @@ void K3bStatusBarManager::slotUpdateProjectStats()
case K3bDoc::DATA: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("Data CD (%1)").tqarg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("Data CD (%1)").arg(dataDocStats(dataDoc)) );
break;
}
@@ -207,7 +207,7 @@ void K3bStatusBarManager::slotUpdateProjectStats()
K3bAudioDoc* audioDoc = static_cast<K3bMixedDoc*>( doc )->audioDoc();
K3bDataDoc* dataDoc = static_cast<K3bMixedDoc*>( doc )->dataDoc();
m_labelProjectInfo->setText( i18n("Mixed CD (1 track and %1)", "Mixed CD (%n tracks and %1)", audioDoc->numOfTracks() )
- .tqarg( dataDocStats(dataDoc)) );
+ .arg( dataDocStats(dataDoc)) );
break;
}
@@ -219,25 +219,25 @@ void K3bStatusBarManager::slotUpdateProjectStats()
case K3bDoc::MOVIX: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("eMovix CD (%1)").tqarg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("eMovix CD (%1)").arg(dataDocStats(dataDoc)) );
break;
}
case K3bDoc::MOVIX_DVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("eMovix DVD (%1)").tqarg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("eMovix DVD (%1)").arg(dataDocStats(dataDoc)) );
break;
}
case K3bDoc::DVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("Data DVD (%1)").tqarg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("Data DVD (%1)").arg(dataDocStats(dataDoc)) );
break;
}
case K3bDoc::VIDEODVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
- m_labelProjectInfo->setText( i18n("Video DVD (%1)").tqarg(dataDocStats(dataDoc)) );
+ m_labelProjectInfo->setText( i18n("Video DVD (%1)").arg(dataDocStats(dataDoc)) );
break;
}
}
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index 1cd97a1..fd75186 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -36,7 +36,7 @@
#include <tqpushbutton.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqfileinfo.h>
@@ -108,7 +108,7 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const TQValueList<K3bSystemProbl
view->setTextFormat(RichText);
- // tqlayout everything
+ // layout everything
TQGridLayout* grid = new TQGridLayout( this );
grid->setMargin( marginHint() );
grid->setSpacing( spacingHint() );
@@ -186,7 +186,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
// 1. cdrecord, cdrdao
if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Unable to find %1 executable").tqarg("cdrecord"),
+ i18n("Unable to find %1 executable").arg("cdrecord"),
i18n("K3b uses cdrecord to actually write CDs."),
i18n("Install the cdrtools package which contains "
"cdrecord."),
@@ -195,7 +195,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else {
if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "outdated" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
- i18n("Used %1 version %2 is outdated").tqarg("cdrecord").tqarg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version),
+ i18n("Used %1 version %2 is outdated").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version),
i18n("Although K3b supports all cdrtools versions since "
"1.10 it is highly recommended to at least use "
"version 2.0."),
@@ -217,16 +217,16 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
!k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "wodim" ) ) {
if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("%1 will be run with root privileges on kernel >= 2.6.8").tqarg("cdrecord <= 2.01.01a05"),
+ i18n("%1 will be run with root privileges on kernel >= 2.6.8").arg("cdrecord <= 2.01.01a05"),
i18n("Since Linux kernel 2.6.8 %1 will not work when run suid "
- "root for security reasons anymore.").tqarg("cdrecord <= 2.01.01a05"),
+ "root for security reasons anymore.").arg("cdrecord <= 2.01.01a05"),
TQString(),
true ) );
}
#ifdef CDRECORD_SUID_ROOT_CHECK
else if( !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) && getuid() != 0 ) // not root
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("%1 will be run without root privileges").tqarg("cdrecord"),
+ i18n("%1 will be run without root privileges").arg("cdrecord"),
i18n("It is highly recommended to configure cdrecord "
"to run with root privileges. Only then cdrecord "
"runs with high priority which increases the overall "
@@ -242,7 +242,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
}
if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Unable to find %1 executable").tqarg("cdrdao"),
+ i18n("Unable to find %1 executable").arg("cdrdao"),
i18n("K3b uses cdrdao to actually write CDs."),
i18n("Install the cdrdao package."),
false ) );
@@ -253,7 +253,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
#ifdef CDRECORD_SUID_ROOT_CHECK
if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "suidroot" ) && getuid() != 0 )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("%1 will be run without root privileges").tqarg("cdrdao"),
+ i18n("%1 will be run without root privileges").arg("cdrdao"),
i18n("It is highly recommended to configure cdrdao "
"to run with root privileges to increase the "
"overall stability of the burning process."),
@@ -268,7 +268,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) {
if( !k3bcore->externalBinManager()->foundBin( "growisofs" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Unable to find %1 executable").tqarg("growisofs"),
+ i18n("Unable to find %1 executable").arg("growisofs"),
i18n("K3b uses growisofs to actually write dvds. "
"Without growisofs you will not be able to write dvds. "
"Make sure to install at least version 5.10."),
@@ -278,34 +278,34 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else {
if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 10 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
+ i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b needs at least growisofs version 5.10 to write dvds. "
"All older versions will not work and K3b will refuse to use them."),
- i18n("Install a more recent version of %1.").tqarg("growisofs"),
+ i18n("Install a more recent version of %1.").arg("growisofs"),
false ) );
}
else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
- i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
+ i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b will not be able to copy DVDs on-the-fly or write a DVD+RW in multiple "
"sessions using a growisofs "
"version older than 5.12."),
- i18n("Install a more recent version of %1.").tqarg("growisofs"),
+ i18n("Install a more recent version of %1.").arg("growisofs"),
false ) );
}
else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 7, 0 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
- i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
+ i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("It is highly recommended to use growisofs 7.0 or higher. "
"K3b won't be able to write a DVD+RW in multiple "
"sessions using a growisofs version older than 7.0." ),
- i18n("Install a more recent version of %1.").tqarg("growisofs"),
+ i18n("Install a more recent version of %1.").arg("growisofs"),
false ) );
}
// for now we ignore the suid root bit becasue of the memorylocked issue
// else if( !k3bcore->externalBinManager()->binObject( "growisofs" )->hasFeature( "suidroot" ) ) {
// problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
-// i18n("%1 will be run without root privileges").tqarg("growisofs"),
+// i18n("%1 will be run without root privileges").arg("growisofs"),
// i18n("It is highly recommended to configure growisofs "
// "to run with root privileges. Only then growisofs "
// "runs with high priority which increases the overall "
@@ -317,7 +317,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !k3bcore->externalBinManager()->foundBin( "dvd+rw-format" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("Unable to find %1 executable").tqarg("dvd+rw-format"),
+ i18n("Unable to find %1 executable").arg("dvd+rw-format"),
i18n("K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."),
i18n("Install the dvd+rw-tools package."),
false ) );
@@ -330,11 +330,11 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else if( k3bcore->externalBinManager()->binObject( "mkisofs" )->hasFeature( "outdated" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("Used %1 version %2 is outdated")
- .tqarg("mkisofs")
- .tqarg(k3bcore->externalBinManager()->binObject( "mkisofs" )->version),
+ .arg("mkisofs")
+ .arg(k3bcore->externalBinManager()->binObject( "mkisofs" )->version),
i18n("K3b needs at least mkisofs version 1.14. Older versions may introduce problems "
"when creating data projects."),
- i18n("Install a more recent version of %1.").tqarg("mkisofs"),
+ i18n("Install a more recent version of %1.").arg("mkisofs"),
false ) );
}
@@ -357,7 +357,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
it.current(); ++it ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
i18n("Device %1 - %2 is automounted.")
- .tqarg(it.current()->vendor()).tqarg(it.current()->description()),
+ .arg(it.current()->vendor()).arg(it.current()->description()),
i18n("K3b is not able to unmount automounted devices. Thus, especially "
"DVD+RW rewriting might fail. There is no need to report this as "
"a bug or feature wish; it is not possible to solve this problem "
@@ -394,16 +394,16 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
!( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "plain-atapi" ) &&
K3b::plainAtapiSupport() ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("%1 %2 does not support ATAPI").tqarg("cdrecord").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version),
+ i18n("%1 %2 does not support ATAPI").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version),
i18n("The configured version of %1 does not "
"support writing to ATAPI devices without "
"SCSI emulation and there is at least one writer "
"in your system not configured to use "
- "SCSI emulation.").tqarg("cdrecord"),
+ "SCSI emulation.").arg("cdrecord"),
i18n("The best and recommended solution is to enable "
"ide-scsi (SCSI emulation) for all devices. "
"This way you won't have any problems. Or you install "
- "(or select as the default) a more recent version of %1.").tqarg("cdrtools"),
+ "(or select as the default) a more recent version of %1.").arg("cdrtools"),
false ) );
}
}
@@ -415,19 +415,19 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
// FIXME: replace ">" with "&gt;"
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("%1 %2 does not support ATAPI")
- .tqarg("cdrdao").tqarg(k3bcore->externalBinManager()->binObject("cdrdao")->version),
+ .arg("cdrdao").arg(k3bcore->externalBinManager()->binObject("cdrdao")->version),
i18n("The configured version of %1 does not "
"support writing to ATAPI devices without "
"SCSI emulation and there is at least one writer "
"in your system not configured to use "
- "SCSI emulation.").tqarg("cdrdao"),
+ "SCSI emulation.").arg("cdrdao"),
K3b::simpleKernelVersion() > K3bVersion( 2, 5, 0 )
? i18n("Install cdrdao >= 1.1.8 which supports writing to "
"ATAPI devices directly.")
: i18n("The best, and recommended, solution is to use "
"ide-scsi (SCSI emulation) for all writer devices: "
"this way you will not have any problems; or, you can install "
- "(or select as the default) a more recent version of %1.").tqarg("cdrdao"),
+ "(or select as the default) a more recent version of %1.").arg("cdrdao"),
false ) );
}
}
@@ -437,7 +437,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( dvd_r_dl && k3bcore->externalBinManager()->foundBin( "growisofs" ) ) {
if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 6, 0 ) )
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
- i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
+ i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b won't be able to write DVD-R Dual Layer media using a growisofs "
"version older than 6.0."),
i18n("Install a more recent version of growisofs."),
@@ -450,31 +450,31 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !TQFileInfo( dev->blockDeviceName() ).isWritable() )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("No write access to device %1").tqarg(dev->blockDeviceName()),
+ i18n("No write access to device %1").arg(dev->blockDeviceName()),
i18n("K3b needs write access to all the devices to perform certain tasks. "
- "Without it you might encounter problems with %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()),
+ "Without it you might encounter problems with %1 - %2").arg(dev->vendor()).arg(dev->description()),
i18n("Make sure you have write access to %1. In case you are not using "
- "devfs or udev K3bSetup is able to do this for you.").tqarg(dev->blockDeviceName()),
+ "devfs or udev K3bSetup is able to do this for you.").arg(dev->blockDeviceName()),
false ) );
if( !dev->genericDevice().isEmpty() &&
!TQFileInfo( dev->genericDevice() ).isWritable() )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("No write access to generic SCSI device %1").tqarg(dev->genericDevice()),
+ i18n("No write access to generic SCSI device %1").arg(dev->genericDevice()),
i18n("Without write access to the generic device you might "
- "encounter problems with Audio CD ripping from %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()),
+ "encounter problems with Audio CD ripping from %1 - %2").arg(dev->vendor()).arg(dev->description()),
i18n("Make sure you have write access to %1. In case you are not using "
- "devfs or udev K3bSetup is able to do this for you.").tqarg(dev->genericDevice()),
+ "devfs or udev K3bSetup is able to do this for you.").arg(dev->genericDevice()),
false ) );
if( dev->interfaceType() == K3bDevice::IDE && !dmaActivated( dev ) )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- i18n("DMA disabled on device %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()),
+ i18n("DMA disabled on device %1 - %2").arg(dev->vendor()).arg(dev->description()),
i18n("With most modern CD/DVD devices enabling DMA highly increases "
"read/write performance. If you experience very low writing speeds "
"this is probably the cause."),
- i18n("Enable DMA temporarily as root with 'hdparm -d 1 %1'.").tqarg(dev->blockDeviceName()) ) );
+ i18n("Enable DMA temporarily as root with 'hdparm -d 1 %1'.").arg(dev->blockDeviceName()) ) );
}
@@ -487,13 +487,13 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
const K3bExternalProgram* p = it.data();
if( !p->userParameters().isEmpty() ) {
problems.append( K3bSystemProblem( K3bSystemProblem::WARNING,
- i18n("User parameters specified for external program %1").tqarg(p->name()),
+ i18n("User parameters specified for external program %1").arg(p->name()),
i18n("Sometimes it may be nessessary to specify user parameters in addition to "
"the parameters generated by K3b. This is simply a warning to make sure that "
"these parameters are really wanted and won't be part of some bug report."),
i18n("To remove the user parameters for the external program %1 open the "
"K3b settings page 'Programs' and choose the tab 'User Parameters'.")
- .tqarg(p->name()),
+ .arg(p->name()),
false ) );
}
}
diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp
index 375c870..2f64d23 100644
--- a/src/k3btempdirselectionwidget.cpp
+++ b/src/k3btempdirselectionwidget.cpp
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <tqhbox.h>
#include <tqtooltip.h>
@@ -44,8 +44,8 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const ch
m_labelCdSize(0),
m_defaultImageFileName( "k3b_image.iso" )
{
- tqlayout()->setSpacing( KDialog::spacingHint() );
- tqlayout()->setMargin( KDialog::marginHint() );
+ layout()->setSpacing( KDialog::spacingHint() );
+ layout()->setMargin( KDialog::marginHint() );
m_imageFileLabel = new TQLabel( this );
m_editDirectory = new KURLRequester( this, "m_editDirectory" );
@@ -56,7 +56,7 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const ch
freeTempSpaceBox->setSpacing( KDialog::spacingHint() );
(void)new TQLabel( i18n( "Free space in temporary directory:" ), freeTempSpaceBox, "TextLabel2" );
m_labelFreeSpace = new TQLabel( " ",freeTempSpaceBox, "m_labelFreeSpace" );
- m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
connect( m_editDirectory, TQT_SIGNAL(openFileDialog(KURLRequester*)),
@@ -212,7 +212,7 @@ void K3bTempDirSelectionWidget::setNeededSize( KIO::filesize_t bytes )
cdSizeBox->setSpacing( KDialog::spacingHint() );
(void)new TQLabel( i18n( "Size of project:" ), cdSizeBox, "TextLabel4" );
m_labelCdSize = new TQLabel( KIO::convertSize(bytes), cdSizeBox, "m_labelCdSize" );
- m_labelCdSize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelCdSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
}
m_labelCdSize->setText( KIO::convertSize(bytes) );
}
diff --git a/src/k3bthemedheader.cpp b/src/k3bthemedheader.cpp
index 45796db..0a0dc01 100644
--- a/src/k3bthemedheader.cpp
+++ b/src/k3bthemedheader.cpp
@@ -20,7 +20,7 @@
#include <k3btitlelabel.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
K3bThemedHeader::K3bThemedHeader( TQWidget* parent )
@@ -71,9 +71,9 @@ void K3bThemedHeader::setRightPixmap( K3bTheme::PixmapType p )
}
-void K3bThemedHeader::tqsetAlignment( int align )
+void K3bThemedHeader::setAlignment( int align )
{
- m_titleLabel->tqsetAlignment( align );
+ m_titleLabel->setAlignment( align );
}
@@ -84,9 +84,9 @@ void K3bThemedHeader::init()
setLineWidth( 1 );
setMargin( 1 );
- TQHBoxLayout* tqlayout = new TQHBoxLayout( this );
- tqlayout->setMargin( 2 ); // to make sure the frame gets displayed
- tqlayout->setSpacing( 0 );
+ TQHBoxLayout* layout = new TQHBoxLayout( this );
+ layout->setMargin( 2 ); // to make sure the frame gets displayed
+ layout->setSpacing( 0 );
m_leftLabel = new TQLabel( this );
m_leftLabel->setScaledContents( false );
@@ -94,10 +94,10 @@ void K3bThemedHeader::init()
m_rightLabel = new TQLabel( this );
m_rightLabel->setScaledContents( false );
- tqlayout->addWidget( m_leftLabel );
- tqlayout->addWidget( m_titleLabel );
- tqlayout->setStretchFactor( m_titleLabel, 1 );
- tqlayout->addWidget( m_rightLabel );
+ layout->addWidget( m_leftLabel );
+ layout->addWidget( m_titleLabel );
+ layout->setStretchFactor( m_titleLabel, 1 );
+ layout->addWidget( m_rightLabel );
m_leftPix = K3bTheme::DIALOG_LEFT;
m_rightPix = K3bTheme::DIALOG_RIGHT;
diff --git a/src/k3bthemedheader.h b/src/k3bthemedheader.h
index e5f319b..e714020 100644
--- a/src/k3bthemedheader.h
+++ b/src/k3bthemedheader.h
@@ -36,7 +36,7 @@ class K3bThemedHeader : public TQFrame
public slots:
void setTitle( const TQString& title, const TQString& subtitle = TQString() );
void setSubTitle( const TQString& subtitle );
- void tqsetAlignment( int );
+ void setAlignment( int );
void setLeftPixmap( K3bTheme::PixmapType );
void setRightPixmap( K3bTheme::PixmapType );
diff --git a/src/k3btimeoutwidget.cpp b/src/k3btimeoutwidget.cpp
index ea89f20..f0a5d4a 100644
--- a/src/k3btimeoutwidget.cpp
+++ b/src/k3btimeoutwidget.cpp
@@ -88,13 +88,13 @@ void K3bTimeoutWidget::timeStep()
}
-TQSize K3bTimeoutWidget::tqsizeHint() const
+TQSize K3bTimeoutWidget::sizeHint() const
{
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
-TQSize K3bTimeoutWidget::tqminimumSizeHint() const
+TQSize K3bTimeoutWidget::minimumSizeHint() const
{
int fw = fontMetrics().width( TQString::number( d->timeout/1000 ) );
int fh = fontMetrics().height();
@@ -128,7 +128,7 @@ void K3bTimeoutWidget::paintEvent( TQPaintEvent* )
}
TQRect r;
- r.setSize( tqminimumSizeHint() );
+ r.setSize( minimumSizeHint() );
r.moveCenter( rect().center() );
p.drawArc( r, 0, 360*16 );
diff --git a/src/k3btimeoutwidget.h b/src/k3btimeoutwidget.h
index b7c7dae..83c1f43 100644
--- a/src/k3btimeoutwidget.h
+++ b/src/k3btimeoutwidget.h
@@ -31,8 +31,8 @@ class K3bTimeoutWidget : public TQWidget
K3bTimeoutWidget( TQWidget* parent );
~K3bTimeoutWidget();
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
public slots:
void setTimeout( int msecs );
diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp
index 161a8b8..e0d39e0 100644
--- a/src/k3bwelcomewidget.cpp
+++ b/src/k3bwelcomewidget.cpp
@@ -86,7 +86,7 @@ K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* parent )
fnt.setPointSize( 16 );
m_header = new TQSimpleRichText( i18n("Welcome to K3b - The CD and DVD Kreator"), fnt );
m_infoText = new TQSimpleRichText( TQString::fromUtf8("<qt align=\"center\">K3b %1 (c) 1999 - 2007 Sebastian Trüg")
- .tqarg(kapp->aboutData()->version()), font() );
+ .arg(kapp->aboutData()->version()), font() );
// set a large width just to be sure no linebreak occurs
m_header->setWidth( 800 );
@@ -182,9 +182,9 @@ void K3bWelcomeWidget::Display::rebuildGui()
// determine the needed button size (since all buttons should be equal in size
// we use the max of all sizes)
- m_buttonSize = m_buttons.first()->tqsizeHint();
+ m_buttonSize = m_buttons.first()->sizeHint();
for( TQPtrListIterator<K3bFlatButton> it( m_buttons ); it.current(); ++it ) {
- m_buttonSize = m_buttonSize.expandedTo( it.current()->tqsizeHint() );
+ m_buttonSize = m_buttonSize.expandedTo( it.current()->sizeHint() );
}
repositionButtons();
@@ -249,7 +249,7 @@ int K3bWelcomeWidget::Display::heightForWidth( int w ) const
}
-TQSize K3bWelcomeWidget::Display::tqminimumSizeHint() const
+TQSize K3bWelcomeWidget::Display::minimumSizeHint() const
{
TQSize size( TQMAX(40+m_header->widthUsed(), 40+m_buttonSize.width()),
20 + m_header->height() + 20 + 10 + m_buttonSize.height() + 10 + m_infoText->height() + 20 );
@@ -309,7 +309,7 @@ void K3bWelcomeWidget::Display::paintEvent( TQPaintEvent* )
p.drawRect( 10, 10, width()-20, height()-20 );
// draw the header text
- TQColorGroup grp( tqcolorGroup() );
+ TQColorGroup grp( colorGroup() );
grp.setColor( TQColorGroup::Text, theme->foregroundColor() );
int pos = 20;
pos += TQMAX( (width()-40-m_header->widthUsed())/2, 0 );
@@ -415,7 +415,7 @@ void K3bWelcomeWidget::showEvent( TQShowEvent* e )
void K3bWelcomeWidget::fixSize()
{
TQSize s = contentsRect().size();
- s.setWidth( TQMAX( main->tqminimumSizeHint().width(), s.width() ) );
+ s.setWidth( TQMAX( main->minimumSizeHint().width(), s.width() ) );
s.setHeight( TQMAX( main->heightForWidth(s.width()), s.height() ) );
main->resize( s );
@@ -443,7 +443,7 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e )
int r = 0;
int removeAction = 0;
- TQWidget* widgetAtPos = viewport()->tqchildAt(e->pos());
+ TQWidget* widgetAtPos = viewport()->childAt(e->pos());
if( widgetAtPos && widgetAtPos->inherits( "K3bFlatButton" ) ) {
KPopupMenu pop;
removeAction = pop.insertItem( SmallIcon("remove"), i18n("Remove Button") );
diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h
index b40b3b3..330ab4e 100644
--- a/src/k3bwelcomewidget.h
+++ b/src/k3bwelcomewidget.h
@@ -76,7 +76,7 @@ class K3bWelcomeWidget::Display : public TQWidget
Display( K3bWelcomeWidget* parent );
~Display();
- TQSize tqminimumSizeHint() const;
+ TQSize minimumSizeHint() const;
TQSizePolicy sizePolicy () const;
int heightForWidth ( int w ) const;
diff --git a/src/k3bwidgetshoweffect.cpp b/src/k3bwidgetshoweffect.cpp
index 1da951e..e28aa39 100644
--- a/src/k3bwidgetshoweffect.cpp
+++ b/src/k3bwidgetshoweffect.cpp
@@ -96,7 +96,7 @@ void K3bWidgetShowEffect::timerEvent( TQTimerEvent* )
void K3bWidgetShowEffect::dissolveMask()
{
if( m_bShow ) {
- m_widget->tqrepaint( false );
+ m_widget->repaint( false );
TQPainter maskPainter(&m_mask);
m_mask.fill(TQt::black);
diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp
index a89593d..874db31 100644
--- a/src/k3bwriterselectionwidget.cpp
+++ b/src/k3bwriterselectionwidget.cpp
@@ -33,7 +33,7 @@
#include <kinputdialog.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqtooltip.h>
#include <tqtoolbutton.h>
@@ -121,11 +121,11 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char
TQGroupBox* groupWriter = new TQGroupBox( this );
groupWriter->setTitle( i18n( "Burn Medium" ) );
groupWriter->setColumnLayout(0, Qt::Vertical );
- groupWriter->tqlayout()->setSpacing( 0 );
- groupWriter->tqlayout()->setMargin( 0 );
+ groupWriter->layout()->setSpacing( 0 );
+ groupWriter->layout()->setMargin( 0 );
- TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->tqlayout() );
- groupWriterLayout->tqsetAlignment( TQt::AlignTop );
+ TQGridLayout* groupWriterLayout = new TQGridLayout( groupWriter->layout() );
+ groupWriterLayout->setAlignment( TQt::AlignTop );
groupWriterLayout->setSpacing( KDialog::spacingHint() );
groupWriterLayout->setMargin( KDialog::marginHint() );
@@ -150,7 +150,7 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char
TQGridLayout* mainLayout = new TQGridLayout( this );
- mainLayout->tqsetAlignment( TQt::AlignTop );
+ mainLayout->setAlignment( TQt::AlignTop );
mainLayout->setSpacing( KDialog::spacingHint() );
mainLayout->setMargin( 0 );
@@ -332,7 +332,7 @@ void K3bWriterSelectionWidget::insertSpeedItem( int speed )
: TQString::number( speed/1385 ) )
+ "x" );
else
- m_comboSpeed->insertItem( TQString("%1x").tqarg(speed/175) );
+ m_comboSpeed->insertItem( TQString("%1x").arg(speed/175) );
}
}
diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp
index 69bacb7..9dc3ffc 100644
--- a/src/misc/k3bblankingdialog.cpp
+++ b/src/misc/k3bblankingdialog.cpp
@@ -37,8 +37,8 @@
#include <tqgroupbox.h>
#include <tqpushbutton.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
-#include <tqtextview.h>
+#include <layout.h>
+#include <textview.h>
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqheader.h>
@@ -109,8 +109,8 @@ void K3bBlankingDialog::setupGui()
// --- setup the blanking type button group -----------------------------
TQGroupBox* groupBlankType = new TQGroupBox( 1, Qt::Vertical, i18n("&Erase Type"), frame );
- groupBlankType->tqlayout()->setSpacing( spacingHint() );
- groupBlankType->tqlayout()->setMargin( marginHint() );
+ groupBlankType->layout()->setSpacing( spacingHint() );
+ groupBlankType->layout()->setMargin( marginHint() );
m_comboEraseMode = new TQComboBox( groupBlankType );
// ----------------------------------------------------------------------
@@ -200,7 +200,7 @@ void K3bBlankingDialog::slotWriterChanged()
setButtonEnabled( START_BUTTON, true );
else {
setButtonEnabled( START_BUTTON, false );
- KMessageBox::sorry( this, i18n("%1 does not support CD-RW writing.").tqarg(dev->devicename()) );
+ KMessageBox::sorry( this, i18n("%1 does not support CD-RW writing.").arg(dev->devicename()) );
}
}
diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp
index 413e9ba..8b6209b 100644
--- a/src/misc/k3bcdcopydialog.cpp
+++ b/src/misc/k3bcdcopydialog.cpp
@@ -47,7 +47,7 @@
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqptrlist.h>
#include <tqlabel.h>
@@ -295,7 +295,7 @@ void K3bCdCopyDialog::slotStartClicked()
//
if( TQFileInfo( m_tempDirSelectionWidget->tempPath() ).isFile() ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue )
return;
@@ -303,7 +303,7 @@ void K3bCdCopyDialog::slotStartClicked()
if( TQFileInfo( m_tempDirSelectionWidget->tempPath() + ".toc" ).isFile() ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath() + ".toc"),
+ i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath() + ".toc"),
i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue )
return;
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index 99f3849..52c912a 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -60,7 +60,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqptrlist.h>
#include <tqfile.h>
#include <tqfileinfo.h>
@@ -74,7 +74,7 @@
#include <tqmap.h>
#include <tqptrqueue.h>
#include <tqpopupmenu.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
class K3bCdImageWritingDialog::Private
@@ -238,7 +238,7 @@ void K3bCdImageWritingDialog::setupGui()
TQWidget* optionTab = new TQWidget( d->optionTabbed );
TQGridLayout* optionTabLayout = new TQGridLayout( optionTab );
- optionTabLayout->tqsetAlignment( TQt::AlignTop );
+ optionTabLayout->setAlignment( TQt::AlignTop );
optionTabLayout->setSpacing( spacingHint() );
optionTabLayout->setMargin( marginHint() );
@@ -293,7 +293,7 @@ void K3bCdImageWritingDialog::setupGui()
// advanced ---------------------------------
d->advancedTab = new TQWidget( d->optionTabbed );
TQGridLayout* advancedTabLayout = new TQGridLayout( d->advancedTab );
- advancedTabLayout->tqsetAlignment( TQt::AlignTop );
+ advancedTabLayout->setAlignment( TQt::AlignTop );
advancedTabLayout->setSpacing( spacingHint() );
advancedTabLayout->setMargin( marginHint() );
@@ -588,14 +588,14 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Detected:"),
i18n("Iso9660 image") );
- isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
KIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"),
KIO::convertSize( size ) );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -603,7 +603,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().systemId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().systemId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -611,7 +611,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().volumeId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().volumeId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -619,7 +619,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().volumeSetId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().volumeSetId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -627,14 +627,14 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().publisherId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().publisherId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Preparer Id:"),
isoF->primaryDescriptor().preparerId.isEmpty()
? TQString("-") : isoF->primaryDescriptor().preparerId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -642,7 +642,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoF->primaryDescriptor().applicationId.isEmpty()
? TQString("-")
: isoF->primaryDescriptor().applicationId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setOpen( true );
}
@@ -653,24 +653,24 @@ void K3bCdImageWritingDialog::createCdrecordCloneItems( const TQString& tocFile,
K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Detected:"),
i18n("Cdrecord clone image") );
- isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Image file:"),
imageFile );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("TOC file:"),
tocFile );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setOpen( true );
}
@@ -681,24 +681,24 @@ void K3bCdImageWritingDialog::createCueBinItems( const TQString& cueFile, const
K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Detected:"),
i18n("Cue/bin image") );
- isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Image file:"),
imageFile );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Cue file:"),
cueFile );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setOpen( true );
}
@@ -709,7 +709,7 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp )
K3bListViewItem* rootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Detected:"),
i18n("Audio Cue Image") );
- rootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ rootItem->setForegroundColor( 0, palette().disabled().foreground() );
rootItem->setPixmap( 0, SmallIcon( "sound") );
K3bListViewItem* trackParent = new K3bListViewItem( rootItem,
@@ -718,9 +718,9 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp )
if( !cp.cdText().isEmpty() )
trackParent->setText( 1,
TQString("%1 (%2 - %3)")
- .tqarg(trackParent->text(1))
- .tqarg(cp.cdText().performer())
- .tqarg(cp.cdText().title()) );
+ .arg(trackParent->text(1))
+ .arg(cp.cdText().performer())
+ .arg(cp.cdText().title()) );
unsigned int i = 1;
for( K3bDevice::Toc::const_iterator it = cp.toc().begin();
@@ -736,9 +736,9 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp )
if( !cp.cdText().isEmpty() && !cp.cdText()[i-1].isEmpty() )
trackItem->setText( 1,
TQString("%1 (%2 - %3)")
- .tqarg(trackItem->text(1))
- .tqarg(cp.cdText()[i-1].performer())
- .tqarg(cp.cdText()[i-1].title()) );
+ .arg(trackItem->text(1))
+ .arg(cp.cdText()[i-1].performer())
+ .arg(cp.cdText()[i-1].title()) );
++i;
}
@@ -816,7 +816,7 @@ void K3bCdImageWritingDialog::toggleAll()
item->setForegroundColor( 1,
currentImageType() != d->foundImageType
? TQt::red
- : m_infoView->tqcolorGroup().foreground() );
+ : m_infoView->colorGroup().foreground() );
}
@@ -839,7 +839,7 @@ void K3bCdImageWritingDialog::calculateMd5Sum( const TQString& file )
d->md5SumItem = new K3bListViewItem( m_infoView, m_infoView->firstChild() );
d->md5SumItem->setText( 0, i18n("Md5 Sum:") );
- d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ d->md5SumItem->setForegroundColor( 0, palette().disabled().foreground() );
d->md5SumItem->setProgress( 1, 0 );
d->md5SumItem->setPixmap( 0, SmallIcon( "exec") );
@@ -899,15 +899,15 @@ void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, cons
this );
if( ok ) {
if( md5sumToCompare.lower().utf8() == d->md5Job->hexDigest().lower() )
- KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").tqarg(imagePath()),
+ KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").arg(imagePath()),
i18n("MD5 Sums Equal") );
else
- KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").tqarg(imagePath()),
+ KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").arg(imagePath()),
i18n("MD5 Sums Differ") );
}
}
else if( r == copyItem ) {
- TQApplication::tqclipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard );
+ TQApplication::clipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard );
}
}
diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp
index ff721b3..615e683 100644
--- a/src/misc/k3bdvdcopydialog.cpp
+++ b/src/misc/k3bdvdcopydialog.cpp
@@ -31,7 +31,7 @@
#include <k3bmediacache.h>
#include <k3biso9660.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
@@ -169,7 +169,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod
//
- // setup tqlayout
+ // setup layout
// //////////////////////////////////////////////////////////////////////////
TQGridLayout* grid = new TQGridLayout( w );
grid->setMargin( 0 );
diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp
index a232479..661a243 100644
--- a/src/misc/k3bdvdformattingdialog.cpp
+++ b/src/misc/k3bdvdformattingdialog.cpp
@@ -30,7 +30,7 @@
#include <kapplication.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqframe.h>
#include <tqpushbutton.h>
@@ -41,7 +41,7 @@
K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* name, bool modal )
: K3bInteractionDialog( parent, name,
i18n("DVD Formatting"),
- i18n("DVD%1RW").tqarg("�"),
+ i18n("DVD%1RW").arg("�"),
START_BUTTON|CANCEL_BUTTON,
START_BUTTON,
"DVD Formatting", // config group
@@ -59,15 +59,15 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* na
m_writerSelectionWidget->setForceAutoSpeed(true);
TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), frame );
- groupWritingMode->tqlayout()->setMargin( marginHint() );
- groupWritingMode->tqlayout()->setSpacing( spacingHint() );
+ groupWritingMode->layout()->setMargin( marginHint() );
+ groupWritingMode->layout()->setSpacing( spacingHint() );
m_writingModeWidget = new K3bWritingModeWidget( K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR,
groupWritingMode );
TQGroupBox* groupOptions = new TQGroupBox( 2, Qt::Vertical, i18n("Settings"), frame );
- groupOptions->tqlayout()->setMargin( marginHint() );
- groupOptions->tqlayout()->setSpacing( spacingHint() );
+ groupOptions->layout()->setMargin( marginHint() );
+ groupOptions->layout()->setSpacing( spacingHint() );
m_checkForce = new TQCheckBox( i18n("Force"), groupOptions );
m_checkQuickFormat = new TQCheckBox( i18n("Quick format"), groupOptions );
diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp
index 687fd1a..e59f192 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -52,7 +52,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqpushbutton.h>
@@ -62,7 +62,7 @@
#include <tqspinbox.h>
#include <tqevent.h>
#include <tqpopupmenu.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
class K3bIsoImageWritingDialog::Private
@@ -181,7 +181,7 @@ void K3bIsoImageWritingDialog::setupGui()
TQWidget* optionTab = new TQWidget( optionTabbed );
TQGridLayout* optionTabLayout = new TQGridLayout( optionTab );
- optionTabLayout->tqsetAlignment( TQt::AlignTop );
+ optionTabLayout->setAlignment( TQt::AlignTop );
optionTabLayout->setSpacing( spacingHint() );
optionTabLayout->setMargin( marginHint() );
@@ -319,12 +319,12 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(),
i18n("Iso9660 image") );
- isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"), KIO::convertSize( imageSize ) );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -332,7 +332,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().systemId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().systemId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -340,7 +340,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().volumeId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().volumeId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -348,7 +348,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().volumeSetId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().volumeSetId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -356,14 +356,14 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().publisherId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().publisherId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
i18n("Preparer Id:"),
isoF.primaryDescriptor().preparerId.isEmpty()
? TQString("-") : isoF.primaryDescriptor().preparerId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
m_infoView->lastItem(),
@@ -371,7 +371,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoF.primaryDescriptor().applicationId.isEmpty()
? TQString("-")
: isoF.primaryDescriptor().applicationId );
- item->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ item->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setOpen( true );
@@ -441,7 +441,7 @@ void K3bIsoImageWritingDialog::calculateMd5Sum( const TQString& file )
d->md5SumItem = new K3bListViewItem( m_infoView, m_infoView->firstChild() );
d->md5SumItem->setText( 0, i18n("Md5 Sum:") );
- d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() );
+ d->md5SumItem->setForegroundColor( 0, palette().disabled().foreground() );
d->md5SumItem->setProgress( 1, 0 );
d->md5SumItem->setPixmap( 0, SmallIcon( "exec") );
@@ -501,15 +501,15 @@ void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, con
this );
if( ok ) {
if( md5sumToCompare.lower().utf8() == m_md5Job->hexDigest().lower() )
- KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").tqarg(imagePath()),
+ KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").arg(imagePath()),
i18n("MD5 Sums Equal") );
else
- KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").tqarg(imagePath()),
+ KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").arg(imagePath()),
i18n("MD5 Sums Differ") );
}
}
else if( r == copyItem ) {
- TQApplication::tqclipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard );
+ TQApplication::clipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard );
}
}
diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui
index 6af30c6..09cb8a8 100644
--- a/src/option/base_k3bcddboptiontab.ui
+++ b/src/option/base_k3bcddboptiontab.ui
@@ -195,7 +195,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -394,7 +394,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -491,7 +491,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>151</height>
diff --git a/src/option/base_k3bmiscoptiontab.ui b/src/option/base_k3bmiscoptiontab.ui
index f6a7114..89a20cf 100644
--- a/src/option/base_k3bmiscoptiontab.ui
+++ b/src/option/base_k3bmiscoptiontab.ui
@@ -35,7 +35,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -202,7 +202,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -241,7 +241,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>0</height>
diff --git a/src/option/base_k3bpluginoptiontab.ui b/src/option/base_k3bpluginoptiontab.ui
index 3d34bad..1278f80 100644
--- a/src/option/base_k3bpluginoptiontab.ui
+++ b/src/option/base_k3bpluginoptiontab.ui
@@ -38,7 +38,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>411</width>
<height>21</height>
diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui
index 78d9333..cad57b1 100644
--- a/src/option/base_k3bthemeoptiontab.ui
+++ b/src/option/base_k3bthemeoptiontab.ui
@@ -98,7 +98,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -135,7 +135,7 @@
<property name="text">
<string>no Theme selected</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -153,7 +153,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>161</width>
<height>2</height>
diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp
index 18bc7be..4fa760d 100644
--- a/src/option/k3bburningoptiontab.cpp
+++ b/src/option/k3bburningoptiontab.cpp
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqtabwidget.h>
#include <tqradiobutton.h>
@@ -54,14 +54,14 @@ K3bBurningOptionTab::~K3bBurningOptionTab()
void K3bBurningOptionTab::setupGui()
{
TQGridLayout* groupAdvancedLayout = new TQGridLayout( this );
- groupAdvancedLayout->tqsetAlignment( TQt::AlignTop );
+ groupAdvancedLayout->setAlignment( TQt::AlignTop );
groupAdvancedLayout->setSpacing( KDialog::spacingHint() );
groupAdvancedLayout->setMargin( 0 );
TQGroupBox* groupWritingApp = new TQGroupBox( 0, Qt::Vertical, i18n("Burning"), this );
- groupWritingApp->tqlayout()->setMargin( 0 );
- TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->tqlayout() );
+ groupWritingApp->layout()->setMargin( 0 );
+ TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->layout() );
bufferLayout->setMargin( KDialog::marginHint() );
bufferLayout->setSpacing( KDialog::spacingHint() );
@@ -132,7 +132,7 @@ void K3bBurningOptionTab::setupGui()
"avoid gaps in the data stream due to high system load. The default "
"sizes used are %1 MB for CD and %2 MB for DVD burning."
"<p>If this option is checked the value specified will be used for both "
- "CD and DVD burning.").tqarg(4).tqarg(32) );
+ "CD and DVD burning.").arg(4).arg(32) );
TQWhatsThis::add( m_checkEject, i18n("<p>If this option is checked K3b will not eject the medium once the burn process "
"finishes. This can be helpful in case one leaves the computer after starting the "
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index 957f9fa..9493f8a 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -22,7 +22,7 @@
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqstringlist.h>
@@ -50,20 +50,20 @@ K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* parent, const char* name )
base_K3bCddbOptionTabLayout->setMargin( 0 );
base_K3bCddbOptionTabLayout->setSpacing( KDialog::spacingHint() );
- m_mainTabbed->page(0)->tqlayout()->setMargin( KDialog::marginHint() );
- m_mainTabbed->page(0)->tqlayout()->setSpacing( KDialog::spacingHint() );
- m_mainTabbed->page(1)->tqlayout()->setMargin( KDialog::marginHint() );
- m_mainTabbed->page(1)->tqlayout()->setSpacing( KDialog::spacingHint() );
+ m_mainTabbed->page(0)->layout()->setMargin( KDialog::marginHint() );
+ m_mainTabbed->page(0)->layout()->setSpacing( KDialog::spacingHint() );
+ m_mainTabbed->page(1)->layout()->setMargin( KDialog::marginHint() );
+ m_mainTabbed->page(1)->layout()->setSpacing( KDialog::spacingHint() );
-// m_groupLocalDir->tqlayout()->setMargin( 0 );
+// m_groupLocalDir->layout()->setMargin( 0 );
// m_groupLocalDirLayout->setMargin( KDialog::marginHint() );
// m_groupLocalDirLayout->setSpacing( KDialog::spacingHint() );
-// m_groupCddbServer->tqlayout()->setMargin( 0 );
+// m_groupCddbServer->layout()->setMargin( 0 );
// m_groupCddbServerLayout->setMargin( KDialog::marginHint() );
// m_groupCddbServerLayout->setSpacing( KDialog::spacingHint() );
- m_groupCgi->tqlayout()->setMargin( 0 );
+ m_groupCgi->layout()->setMargin( 0 );
m_groupCgiLayout->setMargin( KDialog::marginHint() );
m_groupCgiLayout->setSpacing( KDialog::spacingHint() );
diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp
index c8517a5..fede37c 100644
--- a/src/option/k3bdeviceoptiontab.cpp
+++ b/src/option/k3bdeviceoptiontab.cpp
@@ -21,7 +21,7 @@
#include <tqlabel.h>
#include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcursor.h>
#include <tqapplication.h>
@@ -43,7 +43,7 @@ K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* parent, const char* name )
// Info Label
// ------------------------------------------------
m_labelDevicesInfo = new TQLabel( this, "m_labelDevicesInfo" );
- m_labelDevicesInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
+ m_labelDevicesInfo->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
m_labelDevicesInfo->setText( i18n( "K3b tries to detect all your devices properly. "
"You can add devices that have not been detected and change "
"the black values by clicking in the list. If K3b is unable "
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index d19e42a..4dfd17e 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -33,7 +33,7 @@
#include <tqgroupbox.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -170,8 +170,8 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *p
// Devices Box
// ------------------------------------------------
TQGroupBox* groupDevices = new TQGroupBox( 1, Qt::Vertical, i18n( "CD/DVD Drives" ), this );
- groupDevices->tqlayout()->setSpacing( KDialog::spacingHint() );
- groupDevices->tqlayout()->setMargin( KDialog::marginHint() );
+ groupDevices->layout()->setSpacing( KDialog::spacingHint() );
+ groupDevices->layout()->setMargin( KDialog::marginHint() );
m_viewDevices = new K3bListView( groupDevices, "m_viewDevicesReader" );
m_viewDevices->addColumn( "V" );
@@ -254,30 +254,30 @@ void K3bDeviceWidget::updateDeviceListViews()
// create the read-only info items
K3bListViewItem* systemDeviceItem = new K3bListViewItem( devRoot, i18n("System device name:") );
if( dev->device->interfaceType() == K3bDevice::SCSI )
- systemDeviceItem->setText( 1, TQString("%1 (%2)").tqarg(dev->device->devicename()).tqarg(dev->device->busTargetLun()) );
+ systemDeviceItem->setText( 1, TQString("%1 (%2)").arg(dev->device->devicename()).arg(dev->device->busTargetLun()) );
else
systemDeviceItem->setText( 1, dev->device->devicename() );
- systemDeviceItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ systemDeviceItem->setForegroundColor( 1, palette().disabled().foreground() );
K3bListViewItem* interfaceItem = new K3bListViewItem( devRoot, systemDeviceItem,
i18n("Interface type:"),
( dev->device->interfaceType() == K3bDevice::SCSI ?
i18n("Generic SCSI") :
i18n("ATAPI") ) );
- interfaceItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ interfaceItem->setForegroundColor( 1, palette().disabled().foreground() );
K3bListViewItem* vendorItem = new K3bListViewItem( devRoot, interfaceItem,
i18n("Vendor:"),
dev->device->vendor() );
- vendorItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ vendorItem->setForegroundColor( 1, palette().disabled().foreground() );
K3bListViewItem* modelItem = new K3bListViewItem( devRoot, vendorItem,
i18n("Description:"),
dev->device->description() );
- modelItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ modelItem->setForegroundColor( 1, palette().disabled().foreground() );
K3bListViewItem* versionItem = new K3bListViewItem( devRoot, modelItem,
i18n("Firmware:"),
dev->device->version() );
- versionItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ versionItem->setForegroundColor( 1, palette().disabled().foreground() );
// drive type
@@ -285,33 +285,33 @@ void K3bDeviceWidget::updateDeviceListViews()
K3bListViewItem* typeItem = new K3bListViewItem( devRoot, versionItem,
i18n("Writes CD-R:"),
dev->device->writesCd() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Writes CD-RW:"),
dev->device->writesCdrw() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Reads DVD:"),
dev->device->readsDvd() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Writes DVD-R(W):"),
dev->device->writesDvdMinus() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Writes DVD-R Dual Layer:"),
(dev->device->type() & K3bDevice::DEVICE_DVD_R_DL)
? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Writes DVD+R(W):"),
dev->device->writesDvdPlus() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Writes DVD+R Double Layer:"),
(dev->device->type() & K3bDevice::DEVICE_DVD_PLUS_R_DL)
? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
// --------------------------------
@@ -320,7 +320,7 @@ void K3bDeviceWidget::updateDeviceListViews()
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Buffer Size:"),
KIO::convertSizeFromKB(dev->device->bufferSize()) );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
}
PrivateDeviceViewItem1* cdrdaoDriverItem = new PrivateDeviceViewItem1( PrivateDeviceViewItem1::t_cdrdaoDriver,
@@ -339,14 +339,14 @@ void K3bDeviceWidget::updateDeviceListViews()
typeItem = new K3bListViewItem( devRoot, cdTextItem,
i18n("Supports Burnfree:"),
dev->device->burnfree() ? i18n("yes") : i18n("no") );
- typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ typeItem->setForegroundColor( 1, palette().disabled().foreground() );
// and at last the write modes
(new K3bListViewItem( devRoot,
typeItem,
i18n("Write modes:"),
- K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, tqpalette().disabled().foreground() );
+ K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, palette().disabled().foreground() );
}
devRoot->setOpen(true);
@@ -383,7 +383,7 @@ void K3bDeviceWidget::slotNewDevice()
updateDeviceListViews();
}
else
- KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename), i18n("Error"), false );
+ KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename), i18n("Error"), false );
}
}
diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp
index 4d3e062..00b26b3 100644
--- a/src/option/k3bexternalbinoptiontab.cpp
+++ b/src/option/k3bexternalbinoptiontab.cpp
@@ -27,7 +27,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -52,7 +52,7 @@ K3bExternalBinOptionTab::K3bExternalBinOptionTab( K3bExternalBinManager* manager
m_labelInfo->setText( i18n( "Specify the paths to the external programs that K3b needs to work properly, "
"or press \"Search\" to let K3b search for the programs." ) );
m_labelInfo->setScaledContents( false );
- m_labelInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
+ m_labelInfo->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) );
frameLayout->addWidget( m_labelInfo, 0, 0 );
}
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 28c6375..59d6446 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -19,7 +19,7 @@
#include <tqpushbutton.h>
#include <kdebug.h>
#include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <tqstringlist.h>
diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp
index cf740eb..04e660d 100644
--- a/src/option/k3bmiscoptiontab.cpp
+++ b/src/option/k3bmiscoptiontab.cpp
@@ -124,10 +124,10 @@ bool K3bMiscOptionTab::saveSettings()
}
if( !fi.exists() ) {
- if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").tqarg(tempDir),
+ if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").arg(tempDir),
i18n("Create Directory"), i18n("Create"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( fi.absFilePath() ) ) {
- KMessageBox::error( this, i18n("Unable to create directory %1").tqarg(tempDir) );
+ KMessageBox::error( this, i18n("Unable to create directory %1").arg(tempDir) );
return false;
}
}
@@ -147,7 +147,7 @@ bool K3bMiscOptionTab::saveSettings()
// check for writing permission
if( !fi.isWritable() ) {
- KMessageBox::error( this, i18n("You do not have permission to write to %1.").tqarg(fi.absFilePath()) );
+ KMessageBox::error( this, i18n("You do not have permission to write to %1.").arg(fi.absFilePath()) );
return false;
}
diff --git a/src/option/k3bnotifyoptiontab.cpp b/src/option/k3bnotifyoptiontab.cpp
index 5c12ee6..f1acee4 100644
--- a/src/option/k3bnotifyoptiontab.cpp
+++ b/src/option/k3bnotifyoptiontab.cpp
@@ -21,7 +21,7 @@
#include <knotifydialog.h>
#include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index 2b2b6af..2cd8547 100644
--- a/src/option/k3boptiondialog.cpp
+++ b/src/option/k3boptiondialog.cpp
@@ -26,7 +26,7 @@
#include <k3bsystemproblemdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqtabwidget.h>
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index 0e037fc..ec4ca6c 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -147,7 +147,7 @@ void K3bThemeOptionTab::slotInstallTheme()
else
sorryText = i18n("Unable to download the icon theme archive.\n"
"Please check that address %1 is correct.");
- KMessageBox::sorry( this, sorryText.tqarg(themeURL.prettyURL()) );
+ KMessageBox::sorry( this, sorryText.arg(themeURL.prettyURL()) );
return;
}
diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui
index 5961ea3..17bb26f 100644
--- a/src/projects/base_k3badvanceddataimagesettings.ui
+++ b/src/projects/base_k3badvanceddataimagesettings.ui
@@ -129,7 +129,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui
index ba6cff3..c0e2556 100644
--- a/src/projects/base_k3baudiocdtextallfieldswidget.ui
+++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui
@@ -25,7 +25,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="1">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -62,7 +62,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="1">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -121,7 +121,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -184,7 +184,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -235,7 +235,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui
index 5c0cbaa..4010416 100644
--- a/src/projects/base_k3baudiocdtextwidget.ui
+++ b/src/projects/base_k3baudiocdtextwidget.ui
@@ -70,7 +70,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -96,7 +96,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -135,7 +135,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@@ -151,7 +151,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>0</height>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>0</height>
diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui
index 6c72962..ce969da 100644
--- a/src/projects/base_k3baudiotrackwidget.ui
+++ b/src/projects/base_k3baudiotrackwidget.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>350</width>
<height>50</height>
@@ -217,7 +217,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -257,7 +257,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>161</width>
<height>20</height>
@@ -276,7 +276,7 @@ This does not mean that K3b adds an additional gap of silence to the track. This
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>80</height>
diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui
index b78f7dc..3d5b488 100644
--- a/src/projects/base_k3bbootimageview.ui
+++ b/src/projects/base_k3bbootimageview.ui
@@ -14,7 +14,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -190,7 +190,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<grid>
<property name="name">
@@ -246,7 +246,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -270,7 +270,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>261</width>
<height>21</height>
@@ -281,7 +281,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/projects/base_k3bdataimagesettings.ui b/src/projects/base_k3bdataimagesettings.ui
index 2688f4f..d1444a9 100644
--- a/src/projects/base_k3bdataimagesettings.ui
+++ b/src/projects/base_k3bdataimagesettings.ui
@@ -89,7 +89,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -258,7 +258,7 @@ Example: 'my good file.ext' becomes 'my_good_file.ext'</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>0</height>
diff --git a/src/projects/base_k3bdatavolumedescwidget.ui b/src/projects/base_k3bdatavolumedescwidget.ui
index 000a552..75b5d0a 100644
--- a/src/projects/base_k3bdatavolumedescwidget.ui
+++ b/src/projects/base_k3bdatavolumedescwidget.ui
@@ -107,7 +107,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -134,7 +134,7 @@
<property name="text">
<string>Volume set &amp;number:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -231,7 +231,7 @@
</widget>
<widget class="TQLayoutWidget" row="11" column="1">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -260,7 +260,7 @@
</widget>
<widget class="TQLayoutWidget" row="9" column="1">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -289,7 +289,7 @@
</widget>
<widget class="TQLayoutWidget" row="10" column="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui
index c0bb2fe..293ca92 100644
--- a/src/projects/base_k3bmovixoptionswidget.ui
+++ b/src/projects/base_k3bmovixoptionswidget.ui
@@ -55,7 +55,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -239,10 +239,10 @@
<cstring>m_comboKeyboardLayout</cstring>
</property>
<property name="toolTip" stdset="0">
- <string>Select the tqlayout of the keyboard</string>
+ <string>Select the layout of the keyboard</string>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;p&gt;The keyboard tqlayout selected here will be used for the eMovix commands like controlling the media player.</string>
+ <string>&lt;p&gt;The keyboard layout selected here will be used for the eMovix commands like controlling the media player.</string>
</property>
</widget>
</grid>
diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp
index 0634caa..1d3fbd3 100644
--- a/src/projects/k3baudioburndialog.cpp
+++ b/src/projects/k3baudioburndialog.cpp
@@ -37,7 +37,7 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -63,7 +63,7 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, cons
setTitle( i18n("Audio Project"),
i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)",
- m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) );
+ m_doc->numOfTracks() ).arg(m_doc->length().toString()) );
TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
m_optionGroupLayout->addItem( spacer );
diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp
index a1dff26..5f5610c 100644
--- a/src/projects/k3baudiocdtextwidget.cpp
+++ b/src/projects/k3baudiocdtextwidget.cpp
@@ -24,7 +24,7 @@
#include <tqtoolbutton.h>
#include <tqpushbutton.h>
#include <tqptrlist.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <klineedit.h>
diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp
index 4a6e722..e32d24d 100644
--- a/src/projects/k3baudiodatasourceeditwidget.cpp
+++ b/src/projects/k3baudiodatasourceeditwidget.cpp
@@ -19,7 +19,7 @@
#include <k3baudiodatasource.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqtooltip.h>
@@ -37,7 +37,7 @@ K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* parent, co
TQLabel* startLabel = new TQLabel( i18n("Start Offset") + ":", this );
TQLabel* endLabel = new TQLabel( i18n("End Offset") + ":", this );
- endLabel->tqsetAlignment( TQt::AlignRight );
+ endLabel->setAlignment( TQt::AlignRight );
TQGridLayout* grid = new TQGridLayout( this );
grid->setMargin( 0 );
@@ -101,7 +101,7 @@ void K3bAudioDataSourceEditWidget::loadSource( K3bAudioDataSource* source )
false,
false,
i18n("Used part of the audio source"),
- tqcolorGroup().highlight() );
+ colorGroup().highlight() );
m_editStartOffset->setMaxValue( source->originalLength().lba() );
m_editEndOffset->setMaxValue( source->originalLength().lba() );
diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp
index 6609d00..2f0b7a5 100644
--- a/src/projects/k3baudiodatasourceviewitem.cpp
+++ b/src/projects/k3baudiodatasourceviewitem.cpp
@@ -39,7 +39,7 @@ K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* p
// setMarginVertical( 2 );
// gray out filename
- setForegroundColor( 5, listView()->tqpalette().disabled().foreground() );
+ setForegroundColor( 5, listView()->palette().disabled().foreground() );
// smaller filename
f = listView()->font();
@@ -89,7 +89,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const TQString& text )
bool K3bAudioDataSourceViewItem::animate()
{
if( source()->length() == 0 && source()->isValid() ) {
- TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter );
+ TQString icon = TQString( "kde%1" ).arg( m_animationCounter );
setPixmap( 4, SmallIcon( icon ) );
m_animationCounter++;
if ( m_animationCounter > 6 )
diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp
index fe0be91..ed17c01 100644
--- a/src/projects/k3baudioeditorwidget.cpp
+++ b/src/projects/k3baudioeditorwidget.cpp
@@ -125,7 +125,7 @@ protected:
if( m ) {
r.setLeft( p.x() - 1 );
r.setRight( p.x() + 1 );
- tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").tqarg(m->toolTip).tqarg(m->pos.toString()) );
+ tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").arg(m->toolTip).arg(m->pos.toString()) );
}
else {
Range* range = m_editorWidget->findRange( p );
@@ -134,8 +134,8 @@ protected:
r.setRight( m_editorWidget->msfToPos( range->end ) );
tip( r,
range->toolTip.isEmpty()
- ? TQString("%1 - %2").tqarg(range->start.toString()).tqarg(range->end.toString())
- : TQString("%1 (%2 - %3)").tqarg(range->toolTip).tqarg(range->start.toString()).tqarg(range->end.toString()) );
+ ? TQString("%1 - %2").arg(range->start.toString()).arg(range->end.toString())
+ : TQString("%1 (%2 - %3)").arg(range->toolTip).arg(range->start.toString()).arg(range->end.toString()) );
}
}
}
@@ -177,9 +177,9 @@ K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* parent, const char* name )
m_draggedMarker(0)
{
d = new Private;
- d->selectedRangeBrush = TQBrush(tqcolorGroup().highlight());
+ d->selectedRangeBrush = TQBrush(colorGroup().highlight());
- tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum );
+ setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum );
setFrameStyle( StyledPanel|Sunken );
setMouseTracking(true);
setCursor( TQt::PointingHandCursor );
@@ -201,7 +201,7 @@ K3bAudioEditorWidget::~K3bAudioEditorWidget()
}
-TQSize K3bAudioEditorWidget::tqminimumSizeHint() const
+TQSize K3bAudioEditorWidget::minimumSizeHint() const
{
constPolish();
// some fixed height minimum and enough space for a tickmark every minute
@@ -215,9 +215,9 @@ TQSize K3bAudioEditorWidget::tqminimumSizeHint() const
}
-TQSize K3bAudioEditorWidget::tqsizeHint() const
+TQSize K3bAudioEditorWidget::sizeHint() const
{
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
@@ -263,7 +263,7 @@ bool K3bAudioEditorWidget::allowOverlappingRanges() const
void K3bAudioEditorWidget::enableRangeSelection( bool b )
{
d->rangeSelectionEnabled = b;
- tqrepaint( false );
+ repaint( false );
}
@@ -283,7 +283,7 @@ void K3bAudioEditorWidget::setSelectedRange( K3bAudioEditorWidget::Range* r )
{
d->selectedRange = r;
if( rangeSelectedEnabled() ) {
- tqrepaint( false );
+ repaint( false );
emit selectedRangeChanged( d->selectedRange ? d->selectedRange->id : 0 );
}
}
@@ -307,7 +307,7 @@ int K3bAudioEditorWidget::addRange( const K3b::Msf& start, const K3b::Msf& end,
return -1;
Range* r = new Range( m_idCnt++, start, end, startFixed, endFixed, toolTip,
- brush.style() != TQBrush::NoBrush ? brush : TQBrush(tqcolorGroup().background()) );
+ brush.style() != TQBrush::NoBrush ? brush : TQBrush(colorGroup().background()) );
d->ranges.inSort( r );
// only update the changed range
@@ -356,7 +356,7 @@ bool K3bAudioEditorWidget::modifyRange( int identifier, const K3b::Msf& start, c
if( !d->allowOverlappingRanges )
fixupOverlappingRanges( range );
- tqrepaint( false );
+ repaint( false );
return true;
}
@@ -372,7 +372,7 @@ bool K3bAudioEditorWidget::removeRange( int identifier )
emit rangeRemoved( identifier );
- // tqrepaint only the part of the range
+ // repaint only the part of the range
TQRect rect = contentsRect();
rect.setLeft( msfToPos( range->start ) );
rect.setRight( msfToPos( range->end ) );
@@ -433,7 +433,7 @@ void K3bAudioEditorWidget::setMaxNumberOfMarkers( int i )
int K3bAudioEditorWidget::addMarker( const K3b::Msf& pos, bool fixed, const TQString& toolTip, const TQColor& color )
{
if( pos < m_length ) {
- Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : tqcolorGroup().foreground(), toolTip );
+ Marker* m = new Marker( m_idCnt++, pos, fixed, color.isValid() ? color : colorGroup().foreground(), toolTip );
m_markers.inSort( m );
return m->id;
}
@@ -488,16 +488,16 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p )
{
// double buffering
TQPixmap pix( contentsRect().size() );
- pix.fill( tqcolorGroup().base() );
+ pix.fill( colorGroup().base() );
TQPainter pixP;
- pixP.tqbegin( &pix, TQT_TQOBJECT(this) );
+ pixP.begin( &pix, TQT_TQOBJECT(this) );
TQRect drawRect( contentsRect() );
drawRect.setLeft( drawRect.left() + m_margin );
drawRect.setRight( drawRect.right() - m_margin );
- // from tqminimumSizeHint()
+ // from minimumSizeHint()
// int neededHeight = fontMetrics().height() + 12 + 6;
// drawRect.setTop( drawRect.top() + (drawRect.height() - neededHeight)/2 );
@@ -690,11 +690,11 @@ void K3bAudioEditorWidget::mouseReleaseEvent( TQMouseEvent* e )
//
if( m_draggedRange ) {
fixupOverlappingRanges( m_draggedRange );
- tqrepaint( false );
+ repaint( false );
}
else if( d->movedRange ) {
fixupOverlappingRanges( d->movedRange );
- tqrepaint( false );
+ repaint( false );
}
}
@@ -739,13 +739,13 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e )
emit rangeChanged( m_draggedRange->id, m_draggedRange->start, m_draggedRange->end );
- tqrepaint( false );
+ repaint( false );
}
else if( m_draggedMarker ) {
m_draggedMarker->pos = posToMsf( e->pos().x() );
emit markerMoved( m_draggedMarker->id, m_draggedMarker->pos );
- tqrepaint( false );
+ repaint( false );
}
else if( d->movedRange ) {
int diff = posToMsf( e->pos().x() ).lba() - d->lastMovePosition.lba();
@@ -763,7 +763,7 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e )
emit rangeChanged( d->movedRange->id, d->movedRange->start, d->movedRange->end );
- tqrepaint( false );
+ repaint( false );
}
}
else if( findRangeEdge( e->pos() ) || findMarker( e->pos() ) )
diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h
index b2edfa2..0638a25 100644
--- a/src/projects/k3baudioeditorwidget.h
+++ b/src/projects/k3baudioeditorwidget.h
@@ -34,8 +34,8 @@ class K3bAudioEditorWidget : public TQFrame
K3bAudioEditorWidget( TQWidget* parent = 0, const char* name = 0 );
~K3bAudioEditorWidget();
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
/**
* For now the Editor has only one parameter: the length data.
diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp
index 5e5ca7e..fe99b56 100644
--- a/src/projects/k3baudiotrackaddingdialog.cpp
+++ b/src/projects/k3baudiotrackaddingdialog.cpp
@@ -30,7 +30,7 @@
#include <kmessagebox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfileinfo.h>
#include <tqtimer.h>
#include <tqdir.h>
@@ -104,7 +104,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
dlg.m_trackAfter = afterTrack;
dlg.m_parentTrack = parentTrack;
dlg.m_sourceAfter = afterSource;
- dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) );
+ dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").arg(doc->URL().fileName()) );
dlg.m_busyWidget->showBusy(true);
TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) );
@@ -113,23 +113,23 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
TQString message;
if( !dlg.m_unreadableFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("Insufficient permissions to read the following files") )
- .tqarg( dlg.m_unreadableFiles.join( "<br>" ) );
+ .arg( i18n("Insufficient permissions to read the following files") )
+ .arg( dlg.m_unreadableFiles.join( "<br>" ) );
if( !dlg.m_notFoundFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("Unable to find the following files") )
- .tqarg( dlg.m_notFoundFiles.join( "<br>" ) );
+ .arg( i18n("Unable to find the following files") )
+ .arg( dlg.m_notFoundFiles.join( "<br>" ) );
if( !dlg.m_nonLocalFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("No non-local files supported") )
- .tqarg( dlg.m_unreadableFiles.join( "<br>" ) );
+ .arg( i18n("No non-local files supported") )
+ .arg( dlg.m_unreadableFiles.join( "<br>" ) );
if( !dlg.m_unsupportedFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br><i>%2</i><br>%3")
- .tqarg( i18n("Unable to handle the following files due to an unsupported format" ) )
- .tqarg( i18n("You may manually convert these audio files to wave using another "
+ .arg( i18n("Unable to handle the following files due to an unsupported format" ) )
+ .arg( i18n("You may manually convert these audio files to wave using another "
"application supporting the audio format and then add the wave files "
"to the K3b project.") )
- .tqarg( dlg.m_unsupportedFiles.join( "<br>" ) );
+ .arg( dlg.m_unsupportedFiles.join( "<br>" ) );
if( !message.isEmpty() )
KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message );
@@ -162,7 +162,7 @@ void K3bAudioTrackAddingDialog::slotAddUrls()
}
}
- m_infoLabel->setText( i18n("Analysing file '%1'...").tqarg( url.fileName() ) );
+ m_infoLabel->setText( i18n("Analysing file '%1'...").arg( url.fileName() ) );
if( !url.isLocalFile() ) {
valid = false;
diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp
index bdfb9f0..2572f30 100644
--- a/src/projects/k3baudiotrackdialog.cpp
+++ b/src/projects/k3baudiotrackdialog.cpp
@@ -14,9 +14,9 @@
*/
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqframe.h>
#include <tqcheckbox.h>
diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp
index adc1e41..c73342c 100644
--- a/src/projects/k3baudiotrackplayer.cpp
+++ b/src/projects/k3baudiotrackplayer.cpp
@@ -185,9 +185,9 @@ void K3bAudioTrackPlayer::playTrack( K3bAudioTrack* track )
// we show the currently playing track as a tooltip on the slider
TQToolTip::remove( d->seekSlider );
TQToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3")
- .tqarg(track->trackNumber())
- .tqarg(track->artist())
- .tqarg(track->title()) );
+ .arg(track->trackNumber())
+ .arg(track->artist())
+ .arg(track->title()) );
d->seekSlider->setMaxValue( track->length().totalFrames() );
m_currentTrack = track;
d->paused = true;
diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp
index 6a987e6..f75b8da 100644
--- a/src/projects/k3baudiotracksplitdialog.cpp
+++ b/src/projects/k3baudiotracksplitdialog.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* parent, const char* name )
@@ -42,19 +42,19 @@ K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidg
m_msfEditStart = new K3bMsfEdit( frame );
m_msfEditEnd = new K3bMsfEdit( frame );
- TQGridLayout* tqlayout = new TQGridLayout( frame );
- tqlayout->setMargin( 0 );
- tqlayout->setSpacing( spacingHint() );
+ TQGridLayout* layout = new TQGridLayout( frame );
+ layout->setMargin( 0 );
+ layout->setSpacing( spacingHint() );
// FIXME: After the string freeze replace the text with a better one explaning how to use this dialog
- tqlayout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."),
+ layout->addMultiCellWidget( new TQLabel( i18n("Please select the position where the track should be split."),
frame ), 0, 0, 0, 3 );
- tqlayout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 );
- tqlayout->addWidget( m_msfEditStart, 2, 1 );
- tqlayout->addWidget( new TQLabel( " - ", frame ), 2, 2 );
- tqlayout->addWidget( m_msfEditEnd, 2, 3 );
- tqlayout->addWidget( new TQLabel( i18n("Split track at:"), frame ), 2, 0 );
- tqlayout->setColStretch( 0, 1 );
+ layout->addMultiCellWidget( m_editorWidget, 1, 1, 0, 3 );
+ layout->addWidget( m_msfEditStart, 2, 1 );
+ layout->addWidget( new TQLabel( " - ", frame ), 2, 2 );
+ layout->addWidget( m_msfEditEnd, 2, 3 );
+ layout->addWidget( new TQLabel( i18n("Split track at:"), frame ), 2, 0 );
+ layout->setColStretch( 0, 1 );
m_editorWidget->setAllowOverlappingRanges( false );
m_editorWidget->enableRangeSelection( true );
diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp
index 0bf23ec..6c1b8a8 100644
--- a/src/projects/k3baudiotracktrmlookupdialog.cpp
+++ b/src/projects/k3baudiotracktrmlookupdialog.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <tqframe.h>
#include <tqeventloop.h>
@@ -122,7 +122,7 @@ void K3bAudioTrackTRMLookupDialog::slotTrackFinished( K3bAudioTrack* track, bool
{
if( !success )
K3bPassivePopup::showPopup( i18n("Track %1 was not found in the MusicBrainz database.")
- .tqarg( track->trackNumber()),
+ .arg( track->trackNumber()),
i18n("Audio Project") );
}
diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp
index 23f3478..4c21d0b 100644
--- a/src/projects/k3baudiotrackview.cpp
+++ b/src/projects/k3baudiotrackview.cpp
@@ -46,7 +46,7 @@
#include <tqevent.h>
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqvaluelist.h>
@@ -487,7 +487,7 @@ void K3bAudioTrackView::slotTrackChanged( K3bAudioTrack* track )
item->showSources(true);
// the length might have changed
- item->tqrepaint();
+ item->repaint();
// FIXME: only do this if the position really changed
// move the item if the position has changed
diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp
index 24d6f48..67483ad 100644
--- a/src/projects/k3baudiotrackviewitem.cpp
+++ b/src/projects/k3baudiotrackviewitem.cpp
@@ -57,7 +57,7 @@ K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent,
setFont( 3, f );
// gray out filename
- setForegroundColor( 5, listView()->tqpalette().disabled().foreground() );
+ setForegroundColor( 5, listView()->palette().disabled().foreground() );
// smaller filename
f = listView()->font();
@@ -194,7 +194,7 @@ bool K3bAudioTrackViewItem::animate()
item = item->nextSibling();
}
if( animate ) {
- TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter );
+ TQString icon = TQString( "kde%1" ).arg( m_animationCounter );
setPixmap( 4, SmallIcon( icon ) );
m_animationCounter++;
if ( m_animationCounter > 6 )
diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp
index c0019b9..187b542 100644
--- a/src/projects/k3baudioview.cpp
+++ b/src/projects/k3baudioview.cpp
@@ -38,7 +38,7 @@
#include <k3bprojectplugin.h>
// QT-includes
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstring.h>
// KDE-includes
diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp
index 92b4c87..cf2f086 100644
--- a/src/projects/k3bbootimageview.cpp
+++ b/src/projects/k3bbootimageview.cpp
@@ -61,7 +61,7 @@ public:
return i18n("None");
}
else if( col == 1 )
- return TQString( "%1 KB" ).tqarg( m_image->size()/1024 );
+ return TQString( "%1 KB" ).arg( m_image->size()/1024 );
else if( col == 2 )
return m_image->localPath();
else
diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp
index 782d898..1697523 100644
--- a/src/projects/k3bdataadvancedimagesettingswidget.cpp
+++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp
@@ -24,7 +24,7 @@
#include <tqwhatsthis.h>
#include <tqpoint.h>
#include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqvalidator.h>
#include <tqregexp.h>
@@ -130,7 +130,7 @@ public:
protected:
void stateChange( bool on ) {
- // enable or disable all tqchildren
+ // enable or disable all children
TQListViewItem* item = firstChild();
while( item ) {
if( PrivateCheckViewItem* pi = dynamic_cast<PrivateCheckViewItem*>(item) )
@@ -205,13 +205,13 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget
i18n("ISO Level") );
m_radioIsoLevel3 = new TQCheckListItem( m_isoLevelController,
- i18n("Level %1").tqarg(3),
+ i18n("Level %1").arg(3),
TQCheckListItem::RadioButton );
m_radioIsoLevel2 = new TQCheckListItem( m_isoLevelController,
- i18n("Level %1").tqarg(2),
+ i18n("Level %1").arg(2),
TQCheckListItem::RadioButton );
m_radioIsoLevel1 = new TQCheckListItem( m_isoLevelController,
- i18n("Level %1").tqarg(1),
+ i18n("Level %1").arg(1),
TQCheckListItem::RadioButton );
m_isoLevelController->setOpen(true);
diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp
index 2b4375f..0d3cc44 100644
--- a/src/projects/k3bdataburndialog.cpp
+++ b/src/projects/k3bdataburndialog.cpp
@@ -39,7 +39,7 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -69,7 +69,7 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c
{
prepareGui();
- setTitle( i18n("Data Project"), i18n("Size: %1").tqarg( KIO::convertSize(_doc->size()) ) );
+ setTitle( i18n("Data Project"), i18n("Size: %1").arg( KIO::convertSize(_doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -181,7 +181,7 @@ void K3bDataBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked
diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp
index 6164aa2..04c6cb9 100644
--- a/src/projects/k3bdatadirtreeview.cpp
+++ b/src/projects/k3bdatadirtreeview.cpp
@@ -249,7 +249,7 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item )
// we don't get removedInfo for the child items
// so we need to remove them here
- TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() );
+ TQPtrListIterator<K3bDataItem> it( dirItem->children() );
for( ; it.current(); ++it ) {
if( it.current()->isDir() )
slotDataItemRemoved( it.current() );
@@ -374,9 +374,9 @@ void K3bDataDirTreeView::slotProperties()
if( viewItem && currentItem() != root() ) {
K3bDataPropertiesDialog d( viewItem->dataItem(), this );
if( d.exec() ) {
- tqrepaint();
+ repaint();
if( m_fileView )
- m_fileView->tqrepaint();
+ m_fileView->repaint();
}
}
else
@@ -499,7 +499,7 @@ void K3bDataDirTreeView::slotDocChanged()
// avoid flicker
if( d->lastUpdateVolumeId != m_doc->isoOptions().volumeID() ) {
d->lastUpdateVolumeId = m_doc->isoOptions().volumeID();
- root()->tqrepaint();
+ root()->repaint();
}
}
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index b29f8ad..afe94a3 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -165,7 +165,7 @@ void K3bDataFileView::checkForNewItems()
hideEditor();
// add items that are not there yet
- for( TQPtrListIterator<K3bDataItem> it( m_currentDir->tqchildren() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_currentDir->children() ); it.current(); ++it ) {
if( !m_itemMap.contains( it.current() ) ) {
slotItemAdded( it.current() );
}
diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp
index 88decbc..837f9b5 100644
--- a/src/projects/k3bdataimagesettingswidget.cpp
+++ b/src/projects/k3bdataimagesettingswidget.cpp
@@ -26,7 +26,7 @@
#include <tqcombobox.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kmessagebox.h>
#include <klocale.h>
@@ -157,7 +157,7 @@ public:
setMainWidget( w );
// give ourselves a reasonable size
- TQSize s = tqsizeHint();
+ TQSize s = sizeHint();
s.setWidth( TQMAX(s.width(), 300) );
resize( s );
}
@@ -171,7 +171,7 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const
: base_K3bDataImageSettings( parent, name ),
m_fileSystemOptionsShown(true)
{
- tqlayout()->setMargin( KDialog::marginHint() );
+ layout()->setMargin( KDialog::marginHint() );
m_customFsDlg = new CustomFilesystemsDialog( this );
m_volDescDlg = new VolumeDescDialog( this );
@@ -268,7 +268,7 @@ void K3bDataImageSettingsWidget::slotFilesystemsChanged()
if( s.isEmpty() )
m_comboFilesystems->changeItem( i18n("Custom (ISO9660 only)"), FS_CUSTOM );
else
- m_comboFilesystems->changeItem( i18n("Custom (%1)").tqarg( s.join(", ") ), FS_CUSTOM );
+ m_comboFilesystems->changeItem( i18n("Custom (%1)").arg( s.join(", ") ), FS_CUSTOM );
// see if any of the presets is loaded
m_comboFilesystems->setCurrentItem( FS_CUSTOM );
diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp
index 6a3c057..05de7ee 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -22,7 +22,7 @@
#include <k3bvalidators.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqframe.h>
#include <tqcheckbox.h>
@@ -94,7 +94,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) );
labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) );
if( fileItem->isSymLink() )
- m_labelType->setText( i18n("Link to %1").tqarg(kFileItem.mimeComment()) );
+ m_labelType->setText( i18n("Link to %1").arg(kFileItem.mimeComment()) );
else
m_labelType->setText( kFileItem.mimeComment() );
m_labelLocalName->setText( kFileItem.name() );
@@ -136,7 +136,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
if( location.isEmpty() )
location = "/";
m_labelLocation->setText( location );
- extraInfoLabel->setText( TQString( "(%1)" ).tqarg(dataItem->extraInfo()) );
+ extraInfoLabel->setText( TQString( "(%1)" ).arg(dataItem->extraInfo()) );
if( dataItem->extraInfo().isEmpty() )
extraInfoLabel->hide();
@@ -168,7 +168,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
sortingBoxGrid->setMargin( marginHint() );
m_editSortWeight = new KLineEdit( sortingBox );
m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) );
- m_editSortWeight->tqsetAlignment( TQt::AlignRight );
+ m_editSortWeight->setAlignment( TQt::AlignRight );
sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 );
sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 );
sortingBoxGrid->setColStretch( 1, 1 );
@@ -215,7 +215,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
"in the ISO9660 filesystem. A higher weighting means that the "
"file will be located closer to the beginning of the image "
"(and the disk)."
- "<p>This option is useful in order to optimize the data tqlayout "
+ "<p>This option is useful in order to optimize the data layout "
"on a CD/DVD."
"<p><b>Caution:</b> This does not sort the order of the file "
"names that appear in the ISO9660 directory."
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 630d7f9..6e63076 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -20,7 +20,7 @@
#include <tqtimer.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdir.h>
#include <tqfileinfo.h>
@@ -57,7 +57,7 @@
K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent, const char* name )
: KDialogBase( Plain,
- i18n("Adding files to project '%1'").tqarg(doc->URL().fileName()),
+ i18n("Adding files to project '%1'").arg(doc->URL().fileName()),
Cancel,
Cancel,
parent,
@@ -84,7 +84,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren
m_counterLabel = new TQLabel( page );
m_infoLabel = new KSqueezedTextLabel( i18n("Adding files to project '%1'")
- .tqarg(doc->URL().fileName()) + "...", page );
+ .arg(doc->URL().fileName()) + "...", page );
m_progressWidget = new KProgress( 0, page );
grid->addWidget( m_counterLabel, 0, 1 );
@@ -96,7 +96,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren
this, TQT_SLOT(slotDirSizeDone(bool)) );
// try to start with a reasonable size
- resize( (int)( fontMetrics().width( caption() ) * 1.5 ), tqsizeHint().height() );
+ resize( (int)( fontMetrics().width( caption() ) * 1.5 ), sizeHint().height() );
}
@@ -169,29 +169,29 @@ TQString K3bDataUrlAddingDialog::resultMessage() const
TQString message;
if( !m_unreadableFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("Insufficient permissions to read the following files") )
- .tqarg( m_unreadableFiles.join( "<br>" ) );
+ .arg( i18n("Insufficient permissions to read the following files") )
+ .arg( m_unreadableFiles.join( "<br>" ) );
if( !m_notFoundFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("Unable to find the following files") )
- .tqarg( m_notFoundFiles.join( "<br>" ) );
+ .arg( i18n("Unable to find the following files") )
+ .arg( m_notFoundFiles.join( "<br>" ) );
if( !m_nonLocalFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("No non-local files supported") )
- .tqarg( m_unreadableFiles.join( "<br>" ) );
+ .arg( i18n("No non-local files supported") )
+ .arg( m_unreadableFiles.join( "<br>" ) );
if( !m_tooBigFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("It is not possible to add files bigger than %1").tqarg(KIO::convertSize(0xFFFFFFFF)) )
- .tqarg( m_tooBigFiles.join( "<br>" ) );
+ .arg( i18n("It is not possible to add files bigger than %1").arg(KIO::convertSize(0xFFFFFFFF)) )
+ .arg( m_tooBigFiles.join( "<br>" ) );
if( !m_mkisofsLimitationRenamedFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("Some filenames had to be modified due to limitations in mkisofs") )
- .tqarg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) );
+ .arg( i18n("Some filenames had to be modified due to limitations in mkisofs") )
+ .arg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) );
if( !m_invalidFilenameEncodingFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .tqarg( i18n("The following filenames have an invalid encoding. You may fix this "
+ .arg( i18n("The following filenames have an invalid encoding. You may fix this "
"with the convmv tool") )
- .tqarg( m_invalidFilenameEncodingFiles.join( "<br>" ) );
+ .arg( m_invalidFilenameEncodingFiles.join( "<br>" ) );
return message;
}
@@ -222,7 +222,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& item
return 0;
K3bDataUrlAddingDialog dlg( dir->doc(), parent );
- dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").tqarg(dir->doc()->URL().fileName()) );
+ dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").arg(dir->doc()->URL().fileName()) );
dlg.m_copyItems = copy;
for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) {
@@ -283,9 +283,9 @@ void K3bDataUrlAddingDialog::slotAddUrls()
#if 0
m_infoLabel->setText( url.path() );
if( m_totalFiles == 0 )
- m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) );
+ m_counterLabel->setText( TQString("(%1)").arg(m_filesHandled) );
else
- m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) );
+ m_counterLabel->setText( TQString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) );
#endif
//
@@ -425,8 +425,8 @@ void K3bDataUrlAddingDialog::slotAddUrls()
switch( K3bMultiChoiceDialog::choose( i18n("File already exists"),
i18n("<p>File <em>%1</em> already exists in "
"project folder <em>%2</em>.")
- .tqarg(newName)
- .tqarg('/' + dir->k3bPath()),
+ .arg(newName)
+ .arg('/' + dir->k3bPath()),
TQMessageBox::Warning,
this,
0,
@@ -493,8 +493,8 @@ void K3bDataUrlAddingDialog::slotAddUrls()
"K3b project cannot be resolved."
"<p><b>If you do not intend to enable the option <em>follow symbolic links</em> you may safely "
"ignore this warning and choose to add the link to the project.</b>")
- .tqarg(absFilePath)
- .tqarg(resolved ),
+ .arg(absFilePath)
+ .arg(resolved ),
TQMessageBox::Warning,
this,
0,
@@ -603,9 +603,9 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
++m_filesHandled;
m_infoLabel->setText( item->k3bPath() );
if( m_totalFiles == 0 )
- m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) );
+ m_counterLabel->setText( TQString("(%1)").arg(m_filesHandled) );
else
- m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) );
+ m_counterLabel->setText( TQString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) );
if( dir == item->parent() ) {
@@ -623,7 +623,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
// reuse an existing dir: move all child items into the old dir
//
if( oldItem->isDir() && item->isDir() ) {
- const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->tqchildren();
+ const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children();
for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it )
m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) );
@@ -661,8 +661,8 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
switch( K3bMultiChoiceDialog::choose( i18n("File already exists"),
i18n("<p>File <em>%1</em> already exists in "
"project folder <em>%2</em>.")
- .tqarg( item->k3bName() )
- .tqarg("/" + dir->k3bPath()),
+ .arg( item->k3bName() )
+ .arg("/" + dir->k3bPath()),
TQMessageBox::Warning,
this,
0,
diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp
index 1ac59f8..e7c0bf4 100644
--- a/src/projects/k3bdataview.cpp
+++ b/src/projects/k3bdataview.cpp
@@ -43,7 +43,7 @@
#include <tqpixmap.h>
#include <tqsplitter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdragobject.h>
#include <tqheader.h>
#include <tqptrlist.h>
diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp
index c60f5d7..49fe587 100644
--- a/src/projects/k3bdataviewitem.cpp
+++ b/src/projects/k3bdataviewitem.cpp
@@ -31,7 +31,7 @@
#include <kpixmap.h>
#include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqfileinfo.h>
@@ -65,7 +65,7 @@ void K3bDataViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int colum
TQColorGroup _cg = cg;
if( !dataItem()->isRemoveable() && dataItem()->doc()->root() != dataItem() ) {
- _cg.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().foreground() );
+ _cg.setColor( TQColorGroup::Text, listView()->palette().disabled().foreground() );
}
if( column == 0 ) {
@@ -182,7 +182,7 @@ void K3bDataDirViewItem::highlightIcon( bool b )
m_pixmap = *pixmap(0);
if( b )
- setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->tqcolorGroup().highlight() ) );
+ setPixmap( 0, KPixmapEffect::selectedPixmap( m_pixmap, listView()->colorGroup().highlight() ) );
else
setPixmap( 0, m_pixmap );
}
@@ -228,7 +228,7 @@ TQString K3bDataFileViewItem::text( int index ) const
comment = m_pMimeType->name();
if( m_fileItem->isSymLink() )
- return i18n("Link to %1").tqarg(comment);
+ return i18n("Link to %1").arg(comment);
else
return comment;
}
diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp
index 17ee516..4cff97e 100644
--- a/src/projects/k3bdvdburndialog.cpp
+++ b/src/projects/k3bdvdburndialog.cpp
@@ -33,7 +33,7 @@
#include <kio/global.h>
#include <kmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
@@ -50,7 +50,7 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char
{
prepareGui();
- setTitle( i18n("DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) );
+ setTitle( i18n("DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -283,7 +283,7 @@ void K3bDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked
diff --git a/src/projects/k3bencodingconverter.cpp b/src/projects/k3bencodingconverter.cpp
index 9fa2a79..273e664 100644
--- a/src/projects/k3bencodingconverter.cpp
+++ b/src/projects/k3bencodingconverter.cpp
@@ -18,7 +18,7 @@
#include "k3bencodingconverter.h"
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kdebug.h>
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index 30f10e6..bad58df 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -35,7 +35,7 @@
#include <tqvalidator.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwhatsthis.h>
#include <tqtimer.h>
@@ -72,7 +72,7 @@ K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* p
{
d = new Private();
d->doc = doc;
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ) );
}
@@ -102,13 +102,13 @@ void K3bFillStatusDisplayWidget::setCdSize( const K3b::Msf& size )
}
-TQSize K3bFillStatusDisplayWidget::tqsizeHint() const
+TQSize K3bFillStatusDisplayWidget::sizeHint() const
{
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
-TQSize K3bFillStatusDisplayWidget::tqminimumSizeHint() const
+TQSize K3bFillStatusDisplayWidget::minimumSizeHint() const
{
int margin = 2;
TQFontMetrics fm( font() );
@@ -127,9 +127,9 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
{
// double buffer
TQPixmap buffer( size() );
- buffer.fill( tqcolorGroup().base() );
+ buffer.fill( colorGroup().base() );
TQPainter p;
- p.tqbegin( &buffer, TQT_TQOBJECT(this) );
+ p.begin( &buffer, TQT_TQOBJECT(this) );
p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color)
long long docSize;
@@ -199,16 +199,16 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
TQString overSizeText;
if( d->cdSize.mode1Bytes() >= d->doc->size() )
overSizeText = i18n("Available: %1 of %2")
- .tqarg( d->showTime
- ? i18n("%1 min").tqarg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false))
+ .arg( d->showTime
+ ? i18n("%1 min").arg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false))
: KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) )
- .tqarg( d->showTime
- ? i18n("%1 min").tqarg(K3b::Msf( cdSize*60*75 ).toString(false))
+ .arg( d->showTime
+ ? i18n("%1 min").arg(K3b::Msf( cdSize*60*75 ).toString(false))
: KIO::convertSizeFromKB( cdSize * 1024 ) );
else
overSizeText = i18n("Capacity exceeded by %1")
- .tqarg( d->showTime
- ? i18n("%1 min").tqarg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false))
+ .arg( d->showTime
+ ? i18n("%1 min").arg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false))
: KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) );
// ====================================================================================
@@ -346,12 +346,12 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const
// TQToolTip::add( d->buttonMenu, i18n("Fill display properties") );
// connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) );
- TQGridLayout* tqlayout = new TQGridLayout( this );
- tqlayout->setSpacing(5);
- tqlayout->setMargin(frameWidth());
- tqlayout->addWidget( d->displayWidget, 0, 0 );
- // tqlayout->addWidget( d->buttonMenu, 0, 1 );
- tqlayout->setColStretch( 0, 1 );
+ TQGridLayout* layout = new TQGridLayout( this );
+ layout->setSpacing(5);
+ layout->setMargin(frameWidth());
+ layout->addWidget( d->displayWidget, 0, 0 );
+ // layout->addWidget( d->buttonMenu, 0, 1 );
+ layout->setColStretch( 0, 1 );
setupPopupMenu();
@@ -388,11 +388,11 @@ void K3bFillStatusDisplay::setupPopupMenu()
d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()),
d->actionCollection, "fillstatus_auto" );
- d->action74Min = new KRadioAction( i18n("%1 MB").tqarg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()),
+ d->action74Min = new KRadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()),
d->actionCollection, "fillstatus_74minutes" );
- d->action80Min = new KRadioAction( i18n("%1 MB").tqarg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()),
+ d->action80Min = new KRadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()),
d->actionCollection, "fillstatus_80minutes" );
- d->action100Min = new KRadioAction( i18n("%1 MB").tqarg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()),
+ d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()),
d->actionCollection, "fillstatus_100minutes" );
d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()),
d->actionCollection, "fillstatus_dvd_4_7gb" );
@@ -460,9 +460,9 @@ void K3bFillStatusDisplay::showSize()
{
d->actionShowMegs->setChecked( true );
- d->action74Min->setText( i18n("%1 MB").tqarg(650) );
- d->action80Min->setText( i18n("%1 MB").tqarg(700) );
- d->action100Min->setText( i18n("%1 MB").tqarg(880) );
+ d->action74Min->setText( i18n("%1 MB").arg(650) );
+ d->action80Min->setText( i18n("%1 MB").arg(700) );
+ d->action100Min->setText( i18n("%1 MB").arg(880) );
d->showTime = false;
d->displayWidget->setShowTime(false);
@@ -548,7 +548,7 @@ void K3bFillStatusDisplay::slotCustomSize()
i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, "
"and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>"
" respectively."),
- d->showDvdSizes ? TQString("4%14%2").tqarg(KGlobal::locale()->decimalSymbol()).tqarg(gbS) :
+ d->showDvdSizes ? TQString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) :
(d->showTime ? TQString("74")+minS : TQString("650")+mbS),
&ok, this, (const char*)0,
new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) );
@@ -577,7 +577,7 @@ void K3bFillStatusDisplay::slotCustomSize()
void K3bFillStatusDisplay::slotMenuButtonClicked()
{
- TQSize size = d->showDvdSizes ? d->dvdPopup->tqsizeHint() : d->popup->tqsizeHint();
+ TQSize size = d->showDvdSizes ? d->dvdPopup->sizeHint() : d->popup->sizeHint();
slotPopupMenu( d->buttonMenu->mapToGlobal(TQPoint(d->buttonMenu->width(), 0)) +
TQPoint(-1*size.width(), -1*size.height()) );
}
diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h
index c1cc810..f219ec8 100644
--- a/src/projects/k3bfillstatusdisplay.h
+++ b/src/projects/k3bfillstatusdisplay.h
@@ -51,8 +51,8 @@ class K3bFillStatusDisplayWidget : public TQWidget
K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent );
~K3bFillStatusDisplayWidget();
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
const K3b::Msf& cdSize() const;
diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp
index 2053e32..6584201 100644
--- a/src/projects/k3bmixedburndialog.cpp
+++ b/src/projects/k3bmixedburndialog.cpp
@@ -44,7 +44,7 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -66,7 +66,7 @@ K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, cons
setTitle( i18n("Mixed Project"), i18n("1 track (%1 minutes)",
"%n tracks (%1 minutes)",
- m_doc->numOfTracks()).tqarg(m_doc->length().toString()) );
+ m_doc->numOfTracks()).arg(m_doc->length().toString()) );
m_checkOnlyCreateImage->hide();
diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp
index c19bd28..dd644b5 100644
--- a/src/projects/k3bmixeddirtreeview.cpp
+++ b/src/projects/k3bmixeddirtreeview.cpp
@@ -42,7 +42,7 @@ public:
TQString text( int col ) const {
if( col == 0 )
- return i18n("Audio Tracks") + TQString(" (%1)").tqarg(m_doc->audioDoc()->numOfTracks());
+ return i18n("Audio Tracks") + TQString(" (%1)").arg(m_doc->audioDoc()->numOfTracks());
else
return TQString();
}
@@ -97,7 +97,7 @@ void K3bMixedDirTreeView::slotSelectionChanged( TQListViewItem* i )
void K3bMixedDirTreeView::slotNewAudioTracks()
{
// update the tracknumber
- m_audioRootItem->tqrepaint();
+ m_audioRootItem->repaint();
}
#include "k3bmixeddirtreeview.moc"
diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp
index 8d1b939..436c4c0 100644
--- a/src/projects/k3bmixedview.cpp
+++ b/src/projects/k3bmixedview.cpp
@@ -33,7 +33,7 @@
#include <tqwidgetstack.h>
#include <tqsplitter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvaluelist.h>
#include <kdialog.h>
diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp
index 4a49d4f..fd99cad 100644
--- a/src/projects/k3bmovixburndialog.cpp
+++ b/src/projects/k3bmovixburndialog.cpp
@@ -38,7 +38,7 @@
#include <kconfig.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqfileinfo.h>
@@ -52,7 +52,7 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, cons
m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE );
setTitle( i18n("eMovix CD Project"),
- i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) );
+ i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) );
m_movixOptionsWidget = new K3bMovixOptionsWidget( this );
addPage( m_movixOptionsWidget, i18n("eMovix") );
@@ -226,7 +226,7 @@ void K3bMovixBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue )
return;
diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp
index 9cc5617..0dbd3d9 100644
--- a/src/projects/k3bmovixdvdburndialog.cpp
+++ b/src/projects/k3bmovixdvdburndialog.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqfileinfo.h>
@@ -54,7 +54,7 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* par
m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE );
setTitle( i18n("eMovix DVD Project"),
- i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) );
+ i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) );
m_movixOptionsWidget = new K3bMovixOptionsWidget( this );
addPage( m_movixOptionsWidget, i18n("eMovix") );
@@ -193,7 +193,7 @@ void K3bMovixDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue )
return;
diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp
index e43dfd5..44136b5 100644
--- a/src/projects/k3bmovixlistview.cpp
+++ b/src/projects/k3bmovixlistview.cpp
@@ -84,7 +84,7 @@ TQString K3bMovixFileViewItem::text( int col ) const
case 2:
{
if( fileItem()->isSymLink() )
- return i18n("Link to %1").tqarg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " ";
+ return i18n("Link to %1").arg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " ";
else
return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " ";
}
@@ -139,7 +139,7 @@ TQString K3bMovixSubTitleViewItem::text( int c ) const
case 2:
{
if( fileItem()->subTitleItem()->isSymLink() )
- return i18n("Link to %1").tqarg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment());
+ return i18n("Link to %1").arg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment());
else
return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment();
}
diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp
index 58c6ba7..0733c70 100644
--- a/src/projects/k3bmovixview.cpp
+++ b/src/projects/k3bmovixview.cpp
@@ -33,7 +33,7 @@
#include <kmessagebox.h>
#include <kurl.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqlineedit.h>
diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp
index 2074cd2..d39b88c 100644
--- a/src/projects/k3bmusicbrainzjob.cpp
+++ b/src/projects/k3bmusicbrainzjob.cpp
@@ -188,7 +188,7 @@ void K3bMusicBrainzJob::start()
m_trmThread->track = m_tracks.first();
emit infoMessage( i18n("Generating fingerprint for track %1.")
- .tqarg(m_tracks.current()->trackNumber()), INFO );
+ .arg(m_tracks.current()->trackNumber()), INFO );
m_trmJob->start();
}
@@ -215,7 +215,7 @@ void K3bMusicBrainzJob::slotTrmJobFinished( bool success )
// now query musicbrainz
m_mbThread->setSignature( m_trmThread->signature() );
emit infoMessage( i18n("Querying MusicBrainz for track %1.")
- .tqarg(m_tracks.current()->trackNumber()), INFO );
+ .arg(m_tracks.current()->trackNumber()), INFO );
m_mbJob->start();
}
else {
@@ -253,8 +253,8 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success )
if( resultStringsUnique.count() > 1 )
s = KInputDialog::getItem( i18n("MusicBrainz Query"),
i18n("Found multiple matches for track %1 (%2). Please select one.")
- .tqarg(m_tracks.current()->trackNumber())
- .tqarg(m_tracks.current()->firstSource()->sourceComment()),
+ .arg(m_tracks.current()->trackNumber())
+ .arg(m_tracks.current()->firstSource()->sourceComment()),
resultStringsUnique,
0,
false,
@@ -273,7 +273,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success )
// query next track
if( m_tracks.next() ) {
emit infoMessage( i18n("Generating fingerprint for track %1.")
- .tqarg(m_tracks.current()->trackNumber()), INFO );
+ .arg(m_tracks.current()->trackNumber()), INFO );
m_trmThread->track = m_tracks.current();
m_trmJob->start();
}
diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp
index 66bd61a..e231ed7 100644
--- a/src/projects/k3bprojectburndialog.cpp
+++ b/src/projects/k3bprojectburndialog.cpp
@@ -31,7 +31,7 @@
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqcheckbox.h>
#include <tqtabwidget.h>
@@ -199,10 +199,10 @@ void K3bProjectBurnDialog::slotStartClicked()
//
TQString tempDir = m_tempDirSelectionWidget->tempDirectory();
if( !TQFile::exists( tempDir ) ) {
- if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( tempDir ) )
+ if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( tempDir ) )
== KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( tempDir ) ) {
- KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( tempDir ) );
+ KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( tempDir ) );
return;
}
}
@@ -269,9 +269,9 @@ void K3bProjectBurnDialog::prepareGui()
m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode );
m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w );
- m_optionGroup->tqlayout()->setMargin(0);
- m_optionGroup->tqlayout()->setSpacing(0);
- m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->tqlayout() );
+ m_optionGroup->layout()->setMargin(0);
+ m_optionGroup->layout()->setSpacing(0);
+ m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->layout() );
m_optionGroupLayout->setMargin( KDialog::marginHint() );
m_optionGroupLayout->setSpacing( KDialog::spacingHint() );
diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp
index 3f2434c..4c29b62 100644
--- a/src/projects/k3bvcdburndialog.cpp
+++ b/src/projects/k3bvcdburndialog.cpp
@@ -20,7 +20,7 @@
#include <tqradiobutton.h>
#include <tqlabel.h>
#include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqgrid.h>
@@ -69,7 +69,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
}
setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)",
- m_vcdDoc->tracks() ->count() ).tqarg( KIO::convertSize( m_vcdDoc->size() ) ) );
+ m_vcdDoc->tracks() ->count() ).arg( KIO::convertSize( m_vcdDoc->size() ) ) );
const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" );
if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) )
@@ -95,13 +95,13 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
// ToolTips
// -------------------------------------------------------------------------
TQToolTip::add
- ( m_radioVcd11, i18n( "Select Video CD type %1" ).tqarg( "(VCD 1.1)" ) );
+ ( m_radioVcd11, i18n( "Select Video CD type %1" ).arg( "(VCD 1.1)" ) );
TQToolTip::add
- ( m_radioVcd20, i18n( "Select Video CD type %1" ).tqarg( "(VCD 2.0)" ) );
+ ( m_radioVcd20, i18n( "Select Video CD type %1" ).arg( "(VCD 2.0)" ) );
TQToolTip::add
- ( m_radioSvcd10, i18n( "Select Video CD type %1" ).tqarg( "(SVCD 1.0)" ) );
+ ( m_radioSvcd10, i18n( "Select Video CD type %1" ).arg( "(SVCD 1.0)" ) );
TQToolTip::add
- ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).tqarg( "(HQ-VCD 1.0)" ) );
+ ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).arg( "(HQ-VCD 1.0)" ) );
TQToolTip::add
( m_checkAutoDetect, i18n( "Automatic video type recognition." ) );
TQToolTip::add
@@ -231,7 +231,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
( m_editCdiCfg, i18n( "<p>Configuration parameters only available for VideoCD 2.0"
"<p>The engine works perfectly well when used as-is."
"<p>You have the option to configure the VCD application."
- "<p>You can adapt the color and/or the tqshape of the cursor and lots more." ) );
+ "<p>You can adapt the color and/or the shape of the cursor and lots more." ) );
TQWhatsThis::add
@@ -307,11 +307,11 @@ void K3bVcdBurnDialog::setupAdvancedTab()
// -------------------------------------------- gaps & margins group ----
m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w );
- m_groupGaps->tqlayout() ->setSpacing( spacingHint() );
- m_groupGaps->tqlayout() ->setMargin( marginHint() );
+ m_groupGaps->layout() ->setSpacing( spacingHint() );
+ m_groupGaps->layout() ->setMargin( marginHint() );
- TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->tqlayout() );
- groupGapsLayout->tqsetAlignment( TQt::AlignTop );
+ TQGridLayout* groupGapsLayout = new TQGridLayout( m_groupGaps->layout() );
+ groupGapsLayout->setAlignment( TQt::AlignTop );
m_checkGaps = new TQCheckBox( i18n( "Customize gaps and margins" ), m_groupGaps );
@@ -403,11 +403,11 @@ void K3bVcdBurnDialog::setupAdvancedTab()
// ------------------------------------------------------- misc group ----
m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w );
- m_groupMisc->tqlayout() ->setSpacing( spacingHint() );
- m_groupMisc->tqlayout() ->setMargin( marginHint() );
+ m_groupMisc->layout() ->setSpacing( spacingHint() );
+ m_groupMisc->layout() ->setMargin( marginHint() );
- TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->tqlayout() );
- groupMiscLayout->tqsetAlignment( TQt::AlignTop );
+ TQGridLayout* groupMiscLayout = new TQGridLayout( m_groupMisc->layout() );
+ groupMiscLayout->setAlignment( TQt::AlignTop );
m_labelRestriction = new TQLabel( i18n( "Restriction category (0..3):" ), m_groupMisc, "m_labelRestriction" );
m_spinRestriction = new TQSpinBox( m_groupMisc, "m_spinRestriction" );
@@ -451,7 +451,7 @@ void K3bVcdBurnDialog::setupVideoCdTab()
m_checkNonCompliant->setEnabled( false );
m_checkNonCompliant->setChecked( false );
- m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).tqarg( "VCD 3.0" ), m_groupOptions );
+ m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).arg( "VCD 3.0" ), m_groupOptions );
// Only available on SVCD Type
m_checkVCD30interpretation->setEnabled( false );
m_checkVCD30interpretation->setChecked( false );
@@ -580,7 +580,7 @@ void K3bVcdBurnDialog::slotStartClicked()
{
if ( TQFile::exists( vcdDoc() ->vcdImage() ) ) {
- if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).tqarg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") )
+ if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).arg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") )
!= KMessageBox::Continue )
return ;
}
@@ -895,7 +895,7 @@ void K3bVcdBurnDialog::saveCdiConfig()
int i = m_editCdiCfg->numLines();
for ( int j = 0; j < i; j++ )
- s << TQString( "%1" ).tqarg( m_editCdiCfg->textLine( j ) ) << "\n";
+ s << TQString( "%1" ).arg( m_editCdiCfg->textLine( j ) ) << "\n";
cdi.close();
diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp
index 3232384..19f49fb 100644
--- a/src/projects/k3bvcdlistview.cpp
+++ b/src/projects/k3bvcdlistview.cpp
@@ -198,7 +198,7 @@ void K3bVcdListView::showPropertiesDialog()
TQPtrList<K3bVcdTrack> tracks = *m_doc->tracks();
K3bVcdTrackDialog d( m_doc, tracks, selected, this );
if ( d.exec() ) {
- tqrepaint();
+ repaint();
}
} else {
m_view->slotProperties();
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index be140f7..62f2137 100644
--- a/src/projects/k3bvcdtrackdialog.cpp
+++ b/src/projects/k3bvcdtrackdialog.cpp
@@ -22,7 +22,7 @@
#include <tqhbox.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmultilineedit.h>
#include <tqpixmap.h>
#include <tqradiobutton.h>
@@ -70,7 +70,7 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& t
m_displayFileName->setText( selectedTrack->fileName() );
m_displayLength->setText( selectedTrack->duration() );
m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) );
- m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( selectedTrack->muxrate() ) );
+ m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) );
if ( selectedTrack->isSegment() )
m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) );
@@ -93,7 +93,7 @@ void K3bVcdTrackDialog::slotOk()
void K3bVcdTrackDialog::setPbcTrack( K3bVcdTrack* selected, K3bCutComboBox* box, int which )
{
// TODO: Unset Userdefined on default settings
- kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).tqarg( box->currentItem() ).tqarg( m_tracks.count() ) << endl;
+ kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).arg( box->currentItem() ).arg( m_tracks.count() ) << endl;
int count = m_tracks.count();
@@ -375,11 +375,11 @@ void K3bVcdTrackDialog::prepareGui()
// FILE-INFO BOX
///////////////////////////////////////////////////
TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" );
- groupFileInfo->tqlayout() ->setSpacing( 0 );
- groupFileInfo->tqlayout() ->setMargin( 0 );
+ groupFileInfo->layout() ->setSpacing( 0 );
+ groupFileInfo->layout() ->setMargin( 0 );
- TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->tqlayout() );
- groupFileInfoLayout->tqsetAlignment( TQt::AlignTop );
+ TQGridLayout* groupFileInfoLayout = new TQGridLayout( groupFileInfo->layout() );
+ groupFileInfoLayout->setAlignment( TQt::AlignTop );
groupFileInfoLayout->setSpacing( spacingHint() );
groupFileInfoLayout->setMargin( marginHint() );
@@ -387,7 +387,7 @@ void K3bVcdTrackDialog::prepareGui()
m_displayFileName = new KCutLabel( groupFileInfo );
m_displayFileName->setText( i18n( "Filename" ) );
- m_displayFileName->tqsetAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) );
+ m_displayFileName->setAlignment( int( TQLabel::AlignTop | TQLabel::AlignLeft ) );
TQLabel* labelSize = new TQLabel( i18n( "Size:" ), groupFileInfo, "labelSize" );
TQLabel* labelLength = new TQLabel( i18n( "Length:" ), groupFileInfo, "labelLength" );
@@ -395,15 +395,15 @@ void K3bVcdTrackDialog::prepareGui()
m_displaySize = new TQLabel( groupFileInfo, "m_displaySize" );
m_displaySize->setText( "0.0 MB" );
- m_displaySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_displaySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_displayLength = new TQLabel( groupFileInfo, "m_displayLength" );
m_displayLength->setText( "0:0:0" );
- m_displayLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_displayLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" );
- m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) );
- m_muxrate->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_muxrate->setText( i18n( "%1 bit/s" ).arg( 0 ) );
+ m_muxrate->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
TQFrame* fileInfoLine = new TQFrame( groupFileInfo );
fileInfoLine->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
@@ -443,15 +443,15 @@ void K3bVcdTrackDialog::setupPbcTab()
TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w );
- grid->tqsetAlignment( TQt::AlignTop );
+ grid->setAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() );
//////////////////////////////////////////////////////////////////////////////////////////
TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w );
- groupOptions->tqlayout() ->setSpacing( spacingHint() );
- groupOptions->tqlayout() ->setMargin( marginHint() );
+ groupOptions->layout() ->setSpacing( spacingHint() );
+ groupOptions->layout() ->setMargin( marginHint() );
m_check_pbc = new TQCheckBox( i18n( "Enable playback control (for the whole CD)" ), groupOptions, "m_check_pbc" );
@@ -463,11 +463,11 @@ void K3bVcdTrackDialog::setupPbcTab()
//////////////////////////////////////////////////////////////////////////////////////////
m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w );
- m_groupPlay->tqlayout() ->setSpacing( spacingHint() );
- m_groupPlay->tqlayout() ->setMargin( marginHint() );
+ m_groupPlay->layout() ->setSpacing( spacingHint() );
+ m_groupPlay->layout() ->setMargin( marginHint() );
- TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->tqlayout() );
- groupPlayLayout->tqsetAlignment( TQt::AlignTop );
+ TQGridLayout* groupPlayLayout = new TQGridLayout( m_groupPlay->layout() );
+ groupPlayLayout->setAlignment( TQt::AlignTop );
TQLabel* labelPlaying = new TQLabel( i18n( "Playing track" ) , m_groupPlay, "labelPlaying" );
@@ -499,11 +499,11 @@ void K3bVcdTrackDialog::setupPbcTab()
//////////////////////////////////////////////////////////////////////////////////////////
m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w );
- m_groupPbc->tqlayout() ->setSpacing( spacingHint() );
- m_groupPbc->tqlayout() ->setMargin( marginHint() );
+ m_groupPbc->layout() ->setSpacing( spacingHint() );
+ m_groupPbc->layout() ->setMargin( marginHint() );
- TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->tqlayout() );
- groupPbcLayout->tqsetAlignment( TQt::AlignTop );
+ TQGridLayout* groupPbcLayout = new TQGridLayout( m_groupPbc->layout() );
+ groupPbcLayout->setAlignment( TQt::AlignTop );
TQLabel* labelPbc_previous = new TQLabel( i18n( "Previous:" ), m_groupPbc, "labelPbc_previous" );
TQLabel* labelPbc_next = new TQLabel( i18n( "Next:" ), m_groupPbc, "labelPbc_next" );
@@ -553,14 +553,14 @@ void K3bVcdTrackDialog::setupPbcKeyTab()
m_widgetnumkeys = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( m_widgetnumkeys );
- grid->tqsetAlignment( TQt::AlignTop );
+ grid->setAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() );
m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys );
m_groupKey->setEnabled( false );
- m_groupKey->tqlayout() ->setSpacing( spacingHint() );
- m_groupKey->tqlayout() ->setMargin( marginHint() );
+ m_groupKey->layout() ->setSpacing( spacingHint() );
+ m_groupKey->layout() ->setMargin( marginHint() );
m_list_keys = new K3bListView( m_groupKey, "m_list_keys" );
m_list_keys->setAllColumnsShowFocus( true );
@@ -590,7 +590,7 @@ void K3bVcdTrackDialog::setupAudioTab()
TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w );
- grid->tqsetAlignment( TQt::AlignTop );
+ grid->setAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() );
@@ -647,7 +647,7 @@ void K3bVcdTrackDialog::setupVideoTab()
TQWidget * w = new TQWidget( m_mainTabbed );
TQGridLayout* grid = new TQGridLayout( w );
- grid->tqsetAlignment( TQt::AlignTop );
+ grid->setAlignment( TQt::AlignTop );
grid->setSpacing( spacingHint() );
grid->setMargin( marginHint() );
@@ -744,9 +744,9 @@ TQString K3bVcdTrackDialog::displayName( K3bVcdTrack * track )
return i18n( "ItSelf" );
if ( track->isSegment() )
- return i18n( "Segment-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() );
+ return i18n( "Segment-%1 - %2" ).arg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() );
- return i18n( "Sequence-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() );
+ return i18n( "Sequence-%1 - %2" ).arg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() );
}
void K3bVcdTrackDialog::slotPlayTimeChanged( int value )
diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp
index 2a42495..da5ca89 100644
--- a/src/projects/k3bvcdview.cpp
+++ b/src/projects/k3bvcdview.cpp
@@ -14,7 +14,7 @@
*/
// QT-includes
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstring.h>
diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp
index c5adefb..e37fabd 100644
--- a/src/projects/k3bvideodvdburndialog.cpp
+++ b/src/projects/k3bvideodvdburndialog.cpp
@@ -32,7 +32,7 @@
#include <kio/global.h>
#include <kmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
@@ -46,7 +46,7 @@ K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *par
{
prepareGui();
- setTitle( i18n("Video DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) );
+ setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -181,7 +181,7 @@ void K3bVideoDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this,
- i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()),
+ i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked
diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp
index fbd3a91..46c71e5 100644
--- a/src/projects/k3bview.cpp
+++ b/src/projects/k3bview.cpp
@@ -15,7 +15,7 @@
// include files for TQt
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -87,7 +87,7 @@ K3bView::~K3bView()
void K3bView::setMainWidget( TQWidget* w )
{
- static_cast<TQGridLayout*>(tqlayout())->addMultiCellWidget( w, 1, 1, 0, 1 );
+ static_cast<TQGridLayout*>(layout())->addMultiCellWidget( w, 1, 1, 0, 1 );
}
diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui
index 5a7a15b..66d34ea 100644
--- a/src/rip/base_k3baudiorippingoptionwidget.ui
+++ b/src/rip/base_k3baudiorippingoptionwidget.ui
@@ -83,7 +83,7 @@ which can be used with programs like xmms or noatun.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -99,7 +99,7 @@ which can be used with programs like xmms or noatun.
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -148,7 +148,7 @@ file will contain all tracks one after the other.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6_2</cstring>
+ <cstring>layout6_2</cstring>
</property>
<hbox>
<property name="name">
@@ -164,7 +164,7 @@ file will contain all tracks one after the other.
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -231,7 +231,7 @@ file will contain all tracks one after the other.
<property name="text">
<string>-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -250,7 +250,7 @@ file will contain all tracks one after the other.
<property name="text">
<string>-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui
index feff67a..09d8062 100644
--- a/src/rip/base_k3bcddbpatternwidget.ui
+++ b/src/rip/base_k3bcddbpatternwidget.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -107,7 +107,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>2</height>
@@ -137,7 +137,7 @@
<property name="text">
<string>See special strings</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -148,7 +148,7 @@
<property name="text">
<string>About conditional inclusion</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 807e462..0652e01 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -46,7 +46,7 @@
#include <kstandarddirs.h>
#include <kdialogbase.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <tqframe.h>
@@ -67,7 +67,7 @@ public:
: K3bCheckListViewItem( parent, after ) {
setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) );
- setText( 3, i18n("Track %1").tqarg(_trackNumber) );
+ setText( 3, i18n("Track %1").arg(_trackNumber) );
setText( 4, " " + length.toString() + " " );
setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " );
@@ -111,7 +111,7 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name )
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
toolBoxLayout->addItem( spacer );
m_labelLength = new TQLabel( mainWidget() );
- m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
toolBoxLayout->addWidget( m_labelLength );
@@ -335,7 +335,7 @@ void K3bAudioCdView::slotEditTrackCddb()
if( !items.isEmpty() ) {
AudioTrackViewItem* a = static_cast<AudioTrackViewItem*>(items.first());
- KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").tqarg(a->trackNumber),
+ KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").arg(a->trackNumber),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
TQWidget* w = new TQWidget( &d );
@@ -359,7 +359,7 @@ void K3bAudioCdView::slotEditTrackCddb()
grid->setRowStretch( 4, 1 );
d.setMainWidget(w);
- d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() );
+ d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
if( d.exec() == TQDialog::Accepted ) {
m_cddbInfo.titles[a->trackNumber-1] = editTitle->text();
@@ -415,7 +415,7 @@ void K3bAudioCdView::slotEditAlbumCddb()
grid->setRowStretch( 7, 1 );
d.setMainWidget(w);
- d.resize( TQMAX( TQMAX(d.tqsizeHint().height(), d.tqsizeHint().width()), 300), d.tqsizeHint().height() );
+ d.resize( TQMAX( TQMAX(d.sizeHint().height(), d.sizeHint().width()), 300), d.sizeHint().height() );
if( d.exec() == TQDialog::Accepted ) {
m_cddbInfo.cdTitle = editTitle->text();
@@ -516,8 +516,8 @@ void K3bAudioCdView::slotSaveCddbLocally()
m_cddb->saveEntry( m_cddbInfo );
K3bPassivePopup::showPopup( i18n("Saved entry (%1) in category %2.")
- .tqarg(m_cddbInfo.discid)
- .tqarg(m_cddbInfo.category),
+ .arg(m_cddbInfo.discid)
+ .arg(m_cddbInfo.category),
i18n("CDDB") );
}
@@ -569,7 +569,7 @@ void K3bAudioCdView::updateDisplay()
m_labelLength->setText( i18n("1 track (%1)",
"%n tracks (%1)",
- m_toc.count()).tqarg(K3b::Msf(m_toc.length()).toString()) );
+ m_toc.count()).arg(K3b::Msf(m_toc.length()).toString()) );
}
@@ -584,7 +584,7 @@ void K3bAudioCdView::showBusyLabel( bool b )
// the themed label is a cut label, thus its size hint is
// based on the cut text, we force it to be full
m_busyInfoLabel->resize( width(), height() );
- m_busyInfoLabel->resize( m_busyInfoLabel->tqsizeHint() );
+ m_busyInfoLabel->resize( m_busyInfoLabel->sizeHint() );
int x = (width() - m_busyInfoLabel->width())/2;
int y = (height() - m_busyInfoLabel->height())/2;
TQRect r( TQPoint( x, y ), m_busyInfoLabel->size() );
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index 60200e3..4cff284 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -45,7 +45,7 @@
#include <tqheader.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdir.h>
#include <tqstringlist.h>
#include <tqtabwidget.h>
@@ -79,7 +79,7 @@ K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* d
setTitle( i18n("Audio Project Conversion"),
i18n("1 track (%1)", "%n tracks (%1)",
- m_doc->numOfTracks()).tqarg(m_doc->length().toString()) );
+ m_doc->numOfTracks()).arg(m_doc->length().toString()) );
refresh();
}
diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp
index d0051e5..fded45d 100644
--- a/src/rip/k3baudioprojectconvertingthread.cpp
+++ b/src/rip/k3baudioprojectconvertingthread.cpp
@@ -110,7 +110,7 @@ void K3bAudioProjectConvertingThread::run()
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -137,12 +137,12 @@ void K3bAudioProjectConvertingThread::run()
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
emitFinished(false);
return;
}
- emitInfoMessage( i18n("Converting to single file '%1'.").tqarg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Converting to single file '%1'.").arg(filename), K3bJob::INFO );
}
bool success = true;
@@ -155,7 +155,7 @@ void K3bAudioProjectConvertingThread::run()
break;
}
- emitInfoMessage( i18n("Successfully converted track %1.").tqarg(i+1), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully converted track %1.").arg(i+1), K3bJob::INFO );
track = track->next();
++i;
@@ -180,7 +180,7 @@ void K3bAudioProjectConvertingThread::run()
if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
TQFile::remove( m_tracks[d->currentTrackIndex].second );
- emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
+ emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
}
}
@@ -196,7 +196,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
{
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
return false;
}
@@ -226,7 +226,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
return false;
}
}
@@ -235,11 +235,11 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
if( !m_cddbEntry.artists[d->currentTrackIndex].isEmpty() &&
!m_cddbEntry.titles[d->currentTrackIndex].isEmpty() )
emitNewSubTask( i18n("Converting track %1 (%2 - %3)")
- .tqarg(d->currentTrackIndex+1)
- .tqarg(m_cddbEntry.artists[d->currentTrackIndex])
- .tqarg(m_cddbEntry.titles[d->currentTrackIndex]) );
+ .arg(d->currentTrackIndex+1)
+ .arg(m_cddbEntry.artists[d->currentTrackIndex])
+ .arg(m_cddbEntry.titles[d->currentTrackIndex]) );
else
- emitNewSubTask( i18n("Converting track %1").tqarg(d->currentTrackIndex+1) );
+ emitNewSubTask( i18n("Converting track %1").arg(d->currentTrackIndex+1) );
// do the conversion
@@ -265,7 +265,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
if( d->encoder->encode( buffer, readLength ) < 0 ) {
kdDebug() << "(K3bAudioProjectConvertingThread) error while encoding." << endl;
emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
- emitInfoMessage( i18n("Error while encoding track %1.").tqarg(d->currentTrackIndex+1), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while encoding track %1.").arg(d->currentTrackIndex+1), K3bJob::ERROR );
return false;
}
}
@@ -304,11 +304,11 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
return false;
}
- emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
TQFile f( m_playlistFilename );
if( f.open( IO_WriteOnly ) ) {
@@ -359,10 +359,10 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
}
}
- return ( t.tqdevice()->status() == IO_Ok );
+ return ( t.device()->status() == IO_Ok );
}
else {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
kdDebug() << "(K3bAudioProjectConvertingThread) could not open file " << m_playlistFilename << " for writing." << endl;
return false;
}
@@ -409,7 +409,7 @@ bool K3bAudioProjectConvertingThread::writeCueFile()
cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue";
- emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
return cueWriter.save( cueFile );
}
@@ -444,7 +444,7 @@ TQString K3bAudioProjectConvertingThread::jobDescription() const
if( m_cddbEntry.cdTitle.isEmpty() )
return i18n("Converting Audio Tracks");
else
- return i18n("Converting Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle);
+ return i18n("Converting Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
}
TQString K3bAudioProjectConvertingThread::jobDetails() const
@@ -452,7 +452,7 @@ TQString K3bAudioProjectConvertingThread::jobDetails() const
if( d->encoder )
return i18n("1 track (encoding to %1)",
"%n tracks (encoding to %1)",
- m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType));
+ m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
else
return i18n("1 track", "%n tracks", m_doc->numOfTracks() );
}
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index d1088ca..4b99dc8 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -48,7 +48,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -106,7 +106,7 @@ K3bAudioRippingDialog::K3bAudioRippingDialog(const K3bDevice::Toc& toc,
}
setTitle( i18n("CD Ripping"),
i18n("1 track (%1)", "%n tracks (%1)",
- m_trackNumbers.count()).tqarg(length.toString()) );
+ m_trackNumbers.count()).arg(length.toString()) );
}
@@ -383,7 +383,7 @@ void K3bAudioRippingDialog::refresh()
m_patternWidget->blankReplaceString() ) + "." + extension;
}
else {
- filename = i18n("Track%1").tqarg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
+ filename = i18n("Track%1").arg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
}
filename = d->fsInfo.fixupPath( filename );
diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp
index 9c410ad..c650755 100644
--- a/src/rip/k3baudioripthread.cpp
+++ b/src/rip/k3baudioripthread.cpp
@@ -150,7 +150,7 @@ void K3bAudioRipThread::run()
d->toc = m_device->readToc();
if( !d->paranoiaLib->initParanoia( m_device, d->toc ) ) {
- emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()),
+ emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()),
K3bJob::ERROR );
m_device->block(false);
@@ -158,7 +158,7 @@ void K3bAudioRipThread::run()
if( m_device->interfaceType() == K3bDevice::SCSI &&
!m_device->genericDevice().isEmpty() &&
!TQFileInfo( m_device->genericDevice() ).isWritable() )
- emitInfoMessage( i18n("You need write access to %1").tqarg( m_device->genericDevice() ), K3bJob::ERROR );
+ emitInfoMessage( i18n("You need write access to %1").arg( m_device->genericDevice() ), K3bJob::ERROR );
emitFinished(false);
return;
@@ -197,7 +197,7 @@ void K3bAudioRipThread::run()
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) {
d->paranoiaLib->close();
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
m_device->block(false);
emitFinished(false);
return;
@@ -226,13 +226,13 @@ void K3bAudioRipThread::run()
if( !isOpen ) {
d->paranoiaLib->close();
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
m_device->block(false);
emitFinished(false);
return;
}
- emitInfoMessage( i18n("Ripping to single file '%1'.").tqarg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Ripping to single file '%1'.").arg(filename), K3bJob::INFO );
}
emitInfoMessage( i18n("Starting digital audio extraction (ripping)."), K3bJob::INFO );
@@ -254,7 +254,7 @@ void K3bAudioRipThread::run()
if( success && !d->canceled ) {
TQString& filename = m_tracks[0].second;
- emitInfoMessage( i18n("Successfully ripped to %2.").tqarg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped to %2.").arg(filename), K3bJob::INFO );
}
}
@@ -300,7 +300,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
return false;
}
@@ -330,16 +330,16 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
}
if( !isOpen ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
return false;
}
}
if( !m_cddbEntry.artists[track-1].isEmpty() &&
!m_cddbEntry.titles[track-1].isEmpty() )
- emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").tqarg(track).tqarg(m_cddbEntry.artists[track-1]).tqarg(m_cddbEntry.titles[track-1]) );
+ emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").arg(track).arg(m_cddbEntry.artists[track-1]).arg(m_cddbEntry.titles[track-1]) );
else
- emitNewSubTask( i18n("Ripping track %1").tqarg(track) );
+ emitNewSubTask( i18n("Ripping track %1").arg(track) );
int status;
while( 1 ) {
@@ -352,9 +352,9 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
if( status == K3bCdparanoiaLib::S_OK ) {
if( buf == 0 ) {
if( m_singleFile )
- emitInfoMessage( i18n("Successfully ripped track %1.").tqarg(track), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped track %1.").arg(track), K3bJob::INFO );
else
- emitInfoMessage( i18n("Successfully ripped track %1 to %2.").tqarg(track).tqarg(filename), K3bJob::INFO );
+ emitInfoMessage( i18n("Successfully ripped track %1 to %2.").arg(track).arg(filename), K3bJob::INFO );
if( !m_singleFile ) {
if( d->encoder )
@@ -371,7 +371,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
CD_FRAMESIZE_RAW ) < 0 ) {
kdDebug() << "(K3bAudioRipThread) error while encoding." << endl;
emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
- emitInfoMessage( i18n("Error while encoding track %1.").tqarg(track), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while encoding track %1.").arg(track), K3bJob::ERROR );
return false;
}
}
@@ -387,7 +387,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
}
}
else {
- emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(track), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(track), K3bJob::ERROR );
return false;
}
}
@@ -435,7 +435,7 @@ void K3bAudioRipThread::cleanupAfterCancellation()
if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
TQFile::remove( m_tracks[d->currentTrackIndex].second );
- emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
+ emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
}
}
}
@@ -447,11 +447,11 @@ bool K3bAudioRipThread::writePlaylist()
TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) {
- emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
return false;
}
- emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
TQFile f( m_playlistFilename );
if( f.open( IO_WriteOnly ) ) {
@@ -502,10 +502,10 @@ bool K3bAudioRipThread::writePlaylist()
}
}
- return ( t.tqdevice()->status() == IO_Ok );
+ return ( t.device()->status() == IO_Ok );
}
else {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
kdDebug() << "(K3bAudioRipThread) could not open file " << m_playlistFilename << " for writing." << endl;
return false;
}
@@ -551,7 +551,7 @@ bool K3bAudioRipThread::writeCueFile()
cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue";
- emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
+ emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
return cueWriter.save( cueFile );
}
@@ -586,7 +586,7 @@ TQString K3bAudioRipThread::jobDescription() const
if( m_cddbEntry.cdTitle.isEmpty() )
return i18n("Ripping Audio Tracks");
else
- return i18n("Ripping Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle);
+ return i18n("Ripping Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
}
TQString K3bAudioRipThread::jobDetails() const
@@ -594,7 +594,7 @@ TQString K3bAudioRipThread::jobDetails() const
if( d->encoder )
return i18n("1 track (encoding to %1)",
"%n tracks (encoding to %1)",
- m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType));
+ m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
else
return i18n("1 track", "%n tracks", m_tracks.count() );
}
diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp
index 79e1375..89c9554 100644
--- a/src/rip/k3bcddbpatternwidget.cpp
+++ b/src/rip/k3bcddbpatternwidget.cpp
@@ -26,14 +26,14 @@
#include <tqvalidator.h>
#include <tqwhatsthis.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name )
: base_K3bCddbPatternWidget( parent, name )
{
- // fix the tqlayout
- ((TQGridLayout*)tqlayout())->setRowStretch( 4, 1 );
+ // fix the layout
+ ((TQGridLayout*)layout())->setRowStretch( 4, 1 );
// setup validators
// there can never be one of the following characters in both dir and filename:
diff --git a/src/rip/k3bcuefilewriter.cpp b/src/rip/k3bcuefilewriter.cpp
index 2303926..8c46e96 100644
--- a/src/rip/k3bcuefilewriter.cpp
+++ b/src/rip/k3bcuefilewriter.cpp
@@ -21,7 +21,7 @@
#include <k3bversion.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdatetime.h>
@@ -87,5 +87,5 @@ bool K3bCueFileWriter::save( TQTextStream& t )
i++;
}
- return ( t.tqdevice()->status() == IO_Ok );
+ return ( t.device()->status() == IO_Ok );
}
diff --git a/src/rip/k3bcuefilewriter.h b/src/rip/k3bcuefilewriter.h
index cee821d..998117e 100644
--- a/src/rip/k3bcuefilewriter.h
+++ b/src/rip/k3bcuefilewriter.h
@@ -16,7 +16,7 @@
#ifndef _K3B_CUE_FILE_WRITER_H_
#define _K3B_CUE_FILE_WRITER_H_
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstringlist.h>
#include <k3btoc.h>
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index d83fe49..0ab14d8 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -119,7 +119,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s.replace( '*', '_' );
s.replace( '}', '*' ); // for conditional inclusion
dir.append( s.isEmpty()
- ? i18n("unknown") + TQString(" %1").tqarg(trackNumber)
+ ? i18n("unknown") + TQString(" %1").arg(trackNumber)
: s );
break;
case TITLE:
@@ -128,7 +128,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s.replace( '*', '_' );
s.replace( '}', '*' );
dir.append( s.isEmpty()
- ? i18n("Track %1").tqarg(trackNumber)
+ ? i18n("Track %1").arg(trackNumber)
: s );
break;
case NUMBER:
@@ -171,7 +171,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
dir.append( s ); // I think it makes more sense to allow empty comments
break;
case DATE:
- dir.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) );
+ dir.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
break;
default:
dir.append( pattern.mid(i, len) );
@@ -247,7 +247,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s = entry.cdExtInfo;
break;
case DATE:
- s = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
+ s = KGlobal::locale()->formatDate( TQDate::currentDate() );
break;
default: // we must never get here,
break; // all choices should be covered
diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp
index 89cdc37..ace8fb2 100644
--- a/src/rip/k3bvideocdinfo.cpp
+++ b/src/rip/k3bvideocdinfo.cpp
@@ -177,7 +177,7 @@ void K3bVideoCdInfo::parseXmlData()
);
}
} else {
- kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).tqarg( tagName ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).arg( tagName ) << endl;
}
}
}
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index 1248138..be91fa9 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -97,8 +97,8 @@ void K3bVideoCdRip::vcdxRip()
if ( !bin ) {
kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl;
- emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
- emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO );
+ emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).arg( ">= 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 );
@@ -107,7 +107,7 @@ void K3bVideoCdRip::vcdxRip()
if( bin->version < K3bVersion("0.7.12") ) {
kdDebug() << "(K3bVideoCdRip) vcdxrip executable too old!" << endl;
- emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).tqarg( "Vcdxrip" ).tqarg( "0.7.12" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).arg( "Vcdxrip" ).arg( "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 );
@@ -115,7 +115,7 @@ void K3bVideoCdRip::vcdxRip()
}
if ( !bin->copyright.isEmpty() )
- emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO );
+ emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO );
*m_process << k3bcore ->externalBinManager() ->binPath( "vcdxrip" );
@@ -142,10 +142,10 @@ void K3bVideoCdRip::vcdxRip()
if ( m_videooptions ->getVideoCdSector2336() )
*m_process << "--sector-2336";
- *m_process << "-i" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
+ *m_process << "-i" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
if ( m_videooptions ->getVideoCdExtractXml() )
- *m_process << "-o" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
+ *m_process << "-o" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
else
*m_process << "-o" << "/dev/null";
@@ -172,11 +172,11 @@ void K3bVideoCdRip::vcdxRip()
emit newTask( i18n( "Extracting" ) );
emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO );
- emit infoMessage( i18n( "Extract files from %1 to %2." ).tqarg( m_videooptions ->getVideoCdSource() ).tqarg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
+ emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl;
- emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
}
@@ -241,15 +241,15 @@ void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len )
if ( tel.isText() ) {
const TQString text = tel.data();
if ( level == "information" ) {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).arg( text ) << endl;
parseInformation( text );
} else {
if ( level != "error" ) {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).arg( text ) << endl;
emit debuggingOutput( "vcdxrip", text );
parseInformation( text );
} else {
- kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).tqarg( text ) << endl;
+ kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).arg( text ) << endl;
emit infoMessage( text, K3bJob::ERROR );
}
}
@@ -269,14 +269,14 @@ void K3bVideoCdRip::slotVcdXRipFinished()
emit infoMessage( i18n( "Files successfully extracted." ), K3bJob::SUCCESS );
break;
default:
- emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxrip" ).tqarg( m_process->exitStatus() ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxrip" ).arg( m_process->exitStatus() ), K3bJob::ERROR );
emit infoMessage( i18n( "Please send me an email with the last output..." ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
return ;
}
} else {
- emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxrip" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
return ;
@@ -290,7 +290,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
// parse warning
if ( text.contains( "encountered non-form2 sector" ) ) {
// I think this is an error not a warning. Finish ripping with invalid mpegs.
- emit infoMessage( i18n( "%1 encountered non-form2 sector" ).tqarg("Vcdxrip"), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 encountered non-form2 sector" ).arg("Vcdxrip"), K3bJob::ERROR );
emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR );
cancelAll();
jobFinished( false );
@@ -326,7 +326,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = 11;
end = text.find( "(start lsn" );
- emit newSubTask( i18n( "Extracting %1" ).tqarg( text.mid( index, end - index ).stripWhiteSpace() ) );
+ emit newSubTask( i18n( "Extracting %1" ).arg( text.mid( index, end - index ).stripWhiteSpace() ) );
}
// parse extracting files info
// extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1)
@@ -337,14 +337,14 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = text.find( " to " );
end = text.find( " (lsn" );
TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace();
- emit newSubTask( i18n( "Extracting %1 to %2" ).tqarg( extractFileName ).tqarg( toFileName ) );
+ emit newSubTask( i18n( "Extracting %1 to %2" ).arg( extractFileName ).arg( toFileName ) );
}
}
}
TQString K3bVideoCdRip::jobDescription() const
{
- return i18n( "Extracting %1" ).tqarg( m_videooptions ->getVideoCdDescription() );
+ return i18n( "Extracting %1" ).arg( m_videooptions ->getVideoCdDescription() );
}
TQString K3bVideoCdRip::jobDetails() const
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index 9283f00..2143cd0 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -28,7 +28,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqdir.h>
@@ -73,11 +73,11 @@ void K3bVideoCdRippingDialog::setupGui()
// ---------------------------------------------------- Directory group ---
TQGroupBox* groupDirectory = new TQGroupBox( 0, Qt::Vertical, i18n( "Destination Directory" ), frame );
- groupDirectory->tqlayout() ->setSpacing( KDialog::spacingHint() );
- groupDirectory->tqlayout() ->setMargin( KDialog::marginHint() );
+ groupDirectory->layout() ->setSpacing( KDialog::spacingHint() );
+ groupDirectory->layout() ->setMargin( KDialog::marginHint() );
- TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->tqlayout() );
- groupDirectoryLayout->tqsetAlignment( TQt::AlignTop );
+ TQGridLayout* groupDirectoryLayout = new TQGridLayout( groupDirectory->layout() );
+ groupDirectoryLayout->setAlignment( TQt::AlignTop );
TQLabel* rippathLabel = new TQLabel( i18n( "Rip files to:" ), groupDirectory );
m_editDirectory = new KURLRequester( groupDirectory, "m_editDirectory" );
@@ -90,13 +90,13 @@ void K3bVideoCdRippingDialog::setupGui()
freeSpaceBox->setSpacing( KDialog::spacingHint() );
( void ) new TQLabel( i18n( "Free space in directory:" ), freeSpaceBox, "FreeSpaceLabel" );
m_labelFreeSpace = new TQLabel( " ", freeSpaceBox, "m_labelFreeSpace" );
- m_labelFreeSpace->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
TQHBox* necessarySizeBox = new TQHBox( groupDirectory );
necessarySizeBox->setSpacing( KDialog::spacingHint() );
( void ) new TQLabel( i18n( "Necessary storage size:" ), necessarySizeBox, "StorSize" );
m_labelNecessarySize = new TQLabel( " ", necessarySizeBox, "m_labelNecessarySize" );
- m_labelNecessarySize->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelNecessarySize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
groupDirectoryLayout->addWidget( rippathLabel, 0, 0 );
@@ -132,7 +132,7 @@ void K3bVideoCdRippingDialog::setupGui()
void K3bVideoCdRippingDialog::setupContextHelp()
{
- TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").tqarg( m_editDirectory ->url() ) );
+ TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").arg( m_editDirectory ->url() ) );
TQToolTip::add( m_labelNecessarySize, i18n("Necessary space for extracted files") );
@@ -157,10 +157,10 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQDir d;
d.setPath( m_editDirectory ->url() );
if( !d.exists() ) {
- if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( m_editDirectory->url() ) )
+ if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( m_editDirectory->url() ) )
== KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( m_editDirectory->url() ) ) {
- KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( m_editDirectory->url() ) );
+ KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( m_editDirectory->url() ) );
return;
}
}
@@ -170,7 +170,7 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQFileInfo* fi;
while ( ( fi = it.current() ) != 0 ) {
if ( fi ->fileName() != "." && fi ->fileName() != ".." )
- filesExists.append( TQString( "%1 (%2)" ).tqarg( TQFile::encodeName( fi ->fileName() ).data() ).tqarg( KIO::convertSize( fi ->size() ) ) );
+ filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( KIO::convertSize( fi ->size() ) ) );
++it;
}
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index 7fbe3b2..b44b9df 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -29,7 +29,7 @@
#include <tqframe.h>
#include <tqheader.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcursor.h>
#include <tqapplication.h>
@@ -68,7 +68,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
const K3b::Msf& length )
: TQListViewItem( parent )
{
- setText( 0, TQString( "%1. %2" ).tqarg( _trackNumber ).tqarg( id ) );
+ setText( 0, TQString( "%1. %2" ).arg( _trackNumber ).arg( id ) );
setText( 1, name );
if ( length > 0 ) {
setText( 2, length.toString() );
@@ -83,7 +83,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
void updateData( const K3bVideoCdInfoResultEntry& resultEntry )
{
- setText( 0, TQString( "%1. %2" ).tqarg( trackNumber ).tqarg( resultEntry.id ) );
+ setText( 0, TQString( "%1. %2" ).arg( trackNumber ).arg( resultEntry.id ) );
setText( 1, resultEntry.name );
}
@@ -153,7 +153,7 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name )
TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
toolBoxLayout->addItem( spacer );
m_labelLength = new TQLabel( mainWidget() );
- m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ m_labelLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
toolBoxLayout->addWidget( m_labelLength );
// the track view
@@ -232,7 +232,7 @@ void K3bVideoCdView::reloadMedium()
K3b::Msf length( ( *it ).length() );
sequenceSize += length;
m_videocdmpegsize += length.mode2Form2Bytes();
- ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).tqarg( index ), "", index, length );
+ ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).arg( index ), "", index, length );
} else {
K3b::Msf length( ( *it ).length() );
m_videocddatasize += length.mode2Form1Bytes();
@@ -314,7 +314,7 @@ void K3bVideoCdView::updateDisplay()
else
setTitle( i18n( "Video CD" ) );
- m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).tqarg( K3b::Msf( m_toc.length() ).toString() ) );
+ m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).arg( K3b::Msf( m_toc.length() ).toString() ) );
}
@@ -416,7 +416,7 @@ void K3bVideoCdView::startRip()
if ( m_videooptions ->getVideoCdRipSequences() )
videocdsize += m_videocdmpegsize;
- kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").tqarg( videocdsize ) << endl;
+ kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").arg( videocdsize ) << endl;
m_videooptions ->setVideoCdSize( videocdsize );
K3bVideoCdRippingDialog rip( m_videooptions, this );
rip.exec();
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 864b798..5c22e83 100644
--- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
+++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
@@ -67,7 +67,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -106,7 +106,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -188,7 +188,7 @@
<property name="text">
<string>-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -207,7 +207,7 @@
<property name="text">
<string>-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -252,7 +252,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ &