From df8e67b86696f691708af8592d86282b09bab011 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- k3bsetup/k3bsetup2.cpp | 4 +- k3bsetup/k3bsetup2.h | 2 +- .../k3bproject/kfile_k3bprojectfileplugin.cpp | 4 +- .../k3bproject/kfile_k3bprojectfileplugin.h | 2 +- libk3b/cddb/k3bcddb.cpp | 4 +- libk3b/cddb/k3bcddb.h | 2 +- libk3b/cddb/k3bcddbhttpquery.cpp | 4 +- libk3b/cddb/k3bcddbhttpquery.h | 2 +- libk3b/cddb/k3bcddblocalquery.cpp | 4 +- libk3b/cddb/k3bcddblocalquery.h | 2 +- libk3b/cddb/k3bcddblocalsubmit.cpp | 4 +- libk3b/cddb/k3bcddblocalsubmit.h | 2 +- libk3b/cddb/k3bcddbmultientriesdialog.cpp | 8 +-- libk3b/cddb/k3bcddbmultientriesdialog.h | 4 +- libk3b/cddb/k3bcddbpquery.cpp | 4 +- libk3b/cddb/k3bcddbpquery.h | 2 +- libk3b/cddb/k3bcddbquery.cpp | 4 +- libk3b/cddb/k3bcddbquery.h | 2 +- libk3b/cddb/k3bcddbsubmit.cpp | 4 +- libk3b/cddb/k3bcddbsubmit.h | 2 +- libk3b/core/k3bcore.cpp | 4 +- libk3b/core/k3bcore.h | 2 +- libk3b/core/k3bexternalbinmanager.cpp | 4 +- libk3b/core/k3bexternalbinmanager.h | 2 +- libk3b/core/k3bglobals.cpp | 12 ++-- libk3b/core/k3bglobals.h | 2 +- libk3b/core/k3bjob.cpp | 8 +-- libk3b/core/k3bjob.h | 6 +- libk3b/core/k3bsimplejobhandler.cpp | 4 +- libk3b/core/k3bsimplejobhandler.h | 2 +- libk3b/core/k3bthreadjob.cpp | 8 +-- libk3b/core/k3bthreadjob.h | 4 +- libk3b/jobs/k3baudiocuefilewritingjob.cpp | 4 +- libk3b/jobs/k3baudiocuefilewritingjob.h | 2 +- libk3b/jobs/k3baudiosessionreadingjob.cpp | 4 +- libk3b/jobs/k3baudiosessionreadingjob.h | 2 +- libk3b/jobs/k3bbinimagewritingjob.cpp | 4 +- libk3b/jobs/k3bbinimagewritingjob.h | 2 +- libk3b/jobs/k3bblankingjob.cpp | 4 +- libk3b/jobs/k3bblankingjob.h | 2 +- libk3b/jobs/k3bcdcopyjob.cpp | 4 +- libk3b/jobs/k3bcdcopyjob.h | 2 +- libk3b/jobs/k3bcdda2wavreader.cpp | 4 +- libk3b/jobs/k3bcdda2wavreader.h | 2 +- libk3b/jobs/k3bclonejob.cpp | 4 +- libk3b/jobs/k3bclonejob.h | 2 +- libk3b/jobs/k3bdatatrackreader.cpp | 4 +- libk3b/jobs/k3bdatatrackreader.h | 2 +- libk3b/jobs/k3bdvdcopyjob.cpp | 4 +- libk3b/jobs/k3bdvdcopyjob.h | 2 +- libk3b/jobs/k3bdvdformattingjob.cpp | 4 +- libk3b/jobs/k3bdvdformattingjob.h | 2 +- libk3b/jobs/k3breadcdreader.cpp | 4 +- libk3b/jobs/k3breadcdreader.h | 2 +- libk3b/jobs/k3bverificationjob.cpp | 4 +- libk3b/jobs/k3bverificationjob.h | 2 +- libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp | 4 +- libk3b/jobs/k3bvideodvdtitledetectclippingjob.h | 2 +- libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp | 4 +- libk3b/jobs/k3bvideodvdtitletranscodingjob.h | 2 +- libk3b/plugin/k3baudiodecoder.cpp | 4 +- libk3b/plugin/k3baudiodecoder.h | 8 +-- libk3b/plugin/k3baudioencoder.cpp | 4 +- libk3b/plugin/k3baudioencoder.h | 2 +- libk3b/plugin/k3baudiooutputplugin.h | 4 +- libk3b/plugin/k3baudioserver.cpp | 4 +- libk3b/plugin/k3baudioserver.h | 2 +- libk3b/plugin/k3bplugin.cpp | 4 +- libk3b/plugin/k3bplugin.h | 4 +- libk3b/plugin/k3bpluginconfigwidget.cpp | 4 +- libk3b/plugin/k3bpluginconfigwidget.h | 2 +- libk3b/plugin/k3bpluginfactory.h | 4 +- libk3b/plugin/k3bpluginmanager.cpp | 10 ++-- libk3b/plugin/k3bpluginmanager.h | 4 +- libk3b/plugin/k3bprojectplugin.h | 8 +-- libk3b/projects/audiocd/k3baudiodatasource.h | 2 +- libk3b/projects/audiocd/k3baudiodoc.cpp | 14 ++--- libk3b/projects/audiocd/k3baudiodoc.h | 4 +- libk3b/projects/audiocd/k3baudioimager.cpp | 4 +- libk3b/projects/audiocd/k3baudioimager.h | 2 +- libk3b/projects/audiocd/k3baudiojob.cpp | 4 +- libk3b/projects/audiocd/k3baudiojob.h | 2 +- libk3b/projects/audiocd/k3baudiojobtempdata.cpp | 4 +- libk3b/projects/audiocd/k3baudiojobtempdata.h | 2 +- libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp | 4 +- libk3b/projects/audiocd/k3baudiomaxspeedjob.h | 2 +- libk3b/projects/audiocd/k3baudionormalizejob.cpp | 4 +- libk3b/projects/audiocd/k3baudionormalizejob.h | 2 +- libk3b/projects/audiocd/k3baudiotrack.cpp | 14 ++--- libk3b/projects/audiocd/k3baudiotrack.h | 2 +- libk3b/projects/datacd/k3bdatadoc.cpp | 42 ++++++------- libk3b/projects/datacd/k3bdatadoc.h | 16 ++--- libk3b/projects/datacd/k3bdataitem.cpp | 24 ++++---- libk3b/projects/datacd/k3bdataitem.h | 12 ++-- libk3b/projects/datacd/k3bdatajob.cpp | 4 +- libk3b/projects/datacd/k3bdatajob.h | 2 +- libk3b/projects/datacd/k3bdatapreparationjob.cpp | 4 +- libk3b/projects/datacd/k3bdatapreparationjob.h | 2 +- libk3b/projects/datacd/k3bdiritem.cpp | 22 +++---- libk3b/projects/datacd/k3bdiritem.h | 4 +- libk3b/projects/datacd/k3bfileitem.cpp | 10 ++-- libk3b/projects/datacd/k3bfileitem.h | 2 +- libk3b/projects/datacd/k3bisoimager.cpp | 4 +- libk3b/projects/datacd/k3bisoimager.h | 2 +- libk3b/projects/datacd/k3bmsinfofetcher.cpp | 4 +- libk3b/projects/datacd/k3bmsinfofetcher.h | 2 +- libk3b/projects/datacd/k3bsessionimportitem.cpp | 8 +-- libk3b/projects/datacd/k3bspecialdataitem.h | 12 ++-- libk3b/projects/datadvd/k3bdvdbooktypejob.cpp | 4 +- libk3b/projects/datadvd/k3bdvdbooktypejob.h | 2 +- libk3b/projects/datadvd/k3bdvddoc.cpp | 8 +-- libk3b/projects/datadvd/k3bdvddoc.h | 4 +- libk3b/projects/datadvd/k3bdvdjob.cpp | 4 +- libk3b/projects/datadvd/k3bdvdjob.h | 2 +- libk3b/projects/datadvd/k3bdvdview.cpp | 8 +-- libk3b/projects/datadvd/k3bdvdview.h | 4 +- libk3b/projects/k3babstractwriter.cpp | 4 +- libk3b/projects/k3babstractwriter.h | 2 +- libk3b/projects/k3bcdrdaowriter.cpp | 4 +- libk3b/projects/k3bcdrdaowriter.h | 2 +- libk3b/projects/k3bcdrecordwriter.cpp | 4 +- libk3b/projects/k3bcdrecordwriter.h | 2 +- libk3b/projects/k3bdoc.cpp | 4 +- libk3b/projects/k3bdoc.h | 2 +- libk3b/projects/k3bdvdrecordwriter.cpp | 4 +- libk3b/projects/k3bdvdrecordwriter.h | 2 +- libk3b/projects/k3bgrowisofshandler.cpp | 4 +- libk3b/projects/k3bgrowisofshandler.h | 2 +- libk3b/projects/k3bgrowisofswriter.cpp | 4 +- libk3b/projects/k3bgrowisofswriter.h | 2 +- libk3b/projects/k3bpipebuffer.cpp | 4 +- libk3b/projects/k3bpipebuffer.h | 2 +- libk3b/projects/mixedcd/k3bmixeddoc.cpp | 8 +-- libk3b/projects/mixedcd/k3bmixeddoc.h | 4 +- libk3b/projects/mixedcd/k3bmixedjob.cpp | 4 +- libk3b/projects/mixedcd/k3bmixedjob.h | 2 +- libk3b/projects/movixcd/k3bmovixdoc.cpp | 8 +-- libk3b/projects/movixcd/k3bmovixdoc.h | 4 +- libk3b/projects/movixcd/k3bmovixdocpreparer.cpp | 10 ++-- libk3b/projects/movixcd/k3bmovixdocpreparer.h | 2 +- libk3b/projects/movixcd/k3bmovixfileitem.cpp | 4 +- libk3b/projects/movixcd/k3bmovixjob.cpp | 4 +- libk3b/projects/movixcd/k3bmovixjob.h | 2 +- libk3b/projects/movixdvd/k3bmovixdvddoc.cpp | 8 +-- libk3b/projects/movixdvd/k3bmovixdvddoc.h | 4 +- libk3b/projects/movixdvd/k3bmovixdvdjob.cpp | 4 +- libk3b/projects/movixdvd/k3bmovixdvdjob.h | 2 +- libk3b/projects/videocd/k3bvcddoc.cpp | 8 +-- libk3b/projects/videocd/k3bvcddoc.h | 2 +- libk3b/projects/videocd/k3bvcdjob.cpp | 4 +- libk3b/projects/videocd/k3bvcdjob.h | 2 +- libk3b/projects/videocd/k3bvcdtrack.cpp | 6 +- libk3b/projects/videocd/k3bvcdtrack.h | 2 +- libk3b/projects/videocd/k3bvcdxmlview.cpp | 46 +++++++------- libk3b/projects/videocd/k3bvcdxmlview.h | 2 +- libk3b/projects/videodvd/k3bvideodvddoc.cpp | 8 +-- libk3b/projects/videodvd/k3bvideodvddoc.h | 4 +- libk3b/projects/videodvd/k3bvideodvdimager.cpp | 4 +- libk3b/projects/videodvd/k3bvideodvdimager.h | 2 +- libk3b/projects/videodvd/k3bvideodvdjob.cpp | 4 +- libk3b/projects/videodvd/k3bvideodvdjob.h | 2 +- libk3b/tools/k3bbusywidget.cpp | 4 +- libk3b/tools/k3bbusywidget.h | 2 +- libk3b/tools/k3bcdtextvalidator.cpp | 4 +- libk3b/tools/k3bcdtextvalidator.h | 2 +- libk3b/tools/k3bcutcombobox.cpp | 8 +-- libk3b/tools/k3bcutcombobox.h | 4 +- libk3b/tools/k3bdevicecombobox.cpp | 4 +- libk3b/tools/k3bdevicecombobox.h | 2 +- libk3b/tools/k3bdevicehandler.cpp | 8 +-- libk3b/tools/k3bdevicehandler.h | 4 +- libk3b/tools/k3bdeviceselectiondialog.cpp | 16 ++--- libk3b/tools/k3bdeviceselectiondialog.h | 8 +-- libk3b/tools/k3bdirsizejob.cpp | 4 +- libk3b/tools/k3bdirsizejob.h | 2 +- libk3b/tools/k3bintmapcombobox.cpp | 4 +- libk3b/tools/k3bintmapcombobox.h | 2 +- libk3b/tools/k3bintvalidator.cpp | 8 +-- libk3b/tools/k3bintvalidator.h | 4 +- libk3b/tools/k3blistview.cpp | 60 +++++++++---------- libk3b/tools/k3blistview.h | 26 ++++---- libk3b/tools/k3blistviewitemanimator.cpp | 8 +-- libk3b/tools/k3blistviewitemanimator.h | 4 +- libk3b/tools/k3bmd5job.cpp | 4 +- libk3b/tools/k3bmd5job.h | 2 +- libk3b/tools/k3bmsfedit.cpp | 8 +-- libk3b/tools/k3bmsfedit.h | 4 +- libk3b/tools/k3bmultichoicedialog.cpp | 8 +-- libk3b/tools/k3bmultichoicedialog.h | 4 +- libk3b/tools/k3bprogressdialog.cpp | 4 +- libk3b/tools/k3bprogressdialog.h | 2 +- libk3b/tools/k3bpushbutton.cpp | 16 ++--- libk3b/tools/k3bpushbutton.h | 8 +-- libk3b/tools/k3bradioaction.cpp | 28 ++++----- libk3b/tools/k3bradioaction.h | 34 +++++------ libk3b/tools/k3brichtextlabel.cpp | 8 +-- libk3b/tools/k3brichtextlabel.h | 4 +- libk3b/tools/k3bstdguiitems.cpp | 60 +++++++++---------- libk3b/tools/k3bstdguiitems.h | 30 +++++----- libk3b/tools/k3bthreadwidget.cpp | 12 ++-- libk3b/tools/k3bthreadwidget.h | 2 +- libk3b/tools/k3bthroughputestimator.cpp | 4 +- libk3b/tools/k3bthroughputestimator.h | 2 +- libk3b/tools/k3btitlelabel.cpp | 4 +- libk3b/tools/k3btitlelabel.h | 2 +- libk3b/tools/k3btoolbox.cpp | 18 +++--- libk3b/tools/k3btoolbox.h | 6 +- libk3b/tools/k3btoolbutton.cpp | 4 +- libk3b/tools/k3btoolbutton.h | 2 +- libk3b/tools/k3bvalidators.cpp | 34 +++++------ libk3b/tools/k3bvalidators.h | 16 ++--- libk3b/tools/kcutlabel.cpp | 8 +-- libk3b/tools/kcutlabel.h | 4 +- libk3b/tools/libisofs/iso_fs.h | 4 +- libk3b/tools/libisofs/isofs.h | 4 +- libk3bdevice/k3bdevicemanager.cpp | 6 +- libk3bdevice/k3bdevicemanager.h | 2 +- libk3bdevice/k3bhalconnection.cpp | 4 +- libk3bdevice/k3bhalconnection.h | 2 +- plugins/audiooutput/alsa/k3balsaoutputplugin.cpp | 12 ++-- plugins/audiooutput/alsa/k3balsaoutputplugin.h | 6 +- plugins/audiooutput/arts/k3bartsoutputplugin.cpp | 4 +- plugins/audiooutput/arts/k3bartsoutputplugin.h | 2 +- plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp | 12 ++-- plugins/decoder/ffmpeg/k3bffmpegdecoder.h | 6 +- plugins/decoder/flac/k3bflacdecoder.cpp | 12 ++-- plugins/decoder/flac/k3bflacdecoder.h | 6 +- .../decoder/libsndfile/k3blibsndfiledecoder.cpp | 12 ++-- plugins/decoder/libsndfile/k3blibsndfiledecoder.h | 6 +- plugins/decoder/mp3/k3bmaddecoder.cpp | 12 ++-- plugins/decoder/mp3/k3bmaddecoder.h | 6 +- plugins/decoder/musepack/k3bmpcdecoder.cpp | 12 ++-- plugins/decoder/musepack/k3bmpcdecoder.h | 6 +- plugins/decoder/ogg/k3boggvorbisdecoder.cpp | 12 ++-- plugins/decoder/ogg/k3boggvorbisdecoder.h | 6 +- plugins/decoder/skeleton.cpp | 12 ++-- plugins/decoder/skeleton.h | 6 +- plugins/decoder/wave/k3bwavedecoder.cpp | 12 ++-- plugins/decoder/wave/k3bwavedecoder.h | 6 +- plugins/encoder/external/k3bexternalencoder.cpp | 8 +-- plugins/encoder/external/k3bexternalencoder.h | 4 +- .../external/k3bexternalencoderconfigwidget.cpp | 8 +-- .../external/k3bexternalencoderconfigwidget.h | 4 +- plugins/encoder/lame/k3blameencoder.cpp | 12 ++-- plugins/encoder/lame/k3blameencoder.h | 6 +- plugins/encoder/ogg/k3boggvorbisencoder.cpp | 12 ++-- plugins/encoder/ogg/k3boggvorbisencoder.h | 6 +- plugins/encoder/skeleton.cpp | 12 ++-- plugins/encoder/skeleton.h | 6 +- plugins/encoder/sox/k3bsoxencoder.cpp | 12 ++-- plugins/encoder/sox/k3bsoxencoder.h | 6 +- .../k3baudiometainforenamerplugin.cpp | 16 ++--- .../k3baudiometainforenamerplugin.h | 6 +- .../audioprojectcddb/k3baudioprojectcddbplugin.cpp | 14 ++--- .../audioprojectcddb/k3baudioprojectcddbplugin.h | 4 +- src/k3b.cpp | 4 +- src/k3bappdevicemanager.cpp | 4 +- src/k3bappdevicemanager.h | 2 +- src/k3bapplication.cpp | 6 +- src/k3bapplication.h | 2 +- src/k3baudioplayer.cpp | 16 ++--- src/k3baudioplayer.h | 8 +-- src/k3bburnprogressdialog.cpp | 4 +- src/k3bburnprogressdialog.h | 2 +- src/k3bcontentsview.cpp | 4 +- src/k3bcontentsview.h | 2 +- src/k3bdatamodewidget.cpp | 4 +- src/k3bdatamodewidget.h | 2 +- src/k3bdataprojectinterface.cpp | 12 ++-- src/k3bdataprojectinterface.h | 10 ++-- src/k3bdebuggingoutputdialog.cpp | 4 +- src/k3bdebuggingoutputdialog.h | 2 +- src/k3bdiroperator.cpp | 4 +- src/k3bdiroperator.h | 2 +- src/k3bdirview.cpp | 4 +- src/k3bdirview.h | 2 +- src/k3bdiskinfoview.cpp | 70 +++++++++++----------- src/k3bdiskinfoview.h | 2 +- src/k3bemptydiscwaiter.cpp | 14 ++--- src/k3bemptydiscwaiter.h | 6 +- src/k3bfiletreecombobox.cpp | 4 +- src/k3bfiletreecombobox.h | 2 +- src/k3bfiletreeview.cpp | 26 ++++---- src/k3bfiletreeview.h | 2 +- src/k3bfileview.cpp | 4 +- src/k3bfileview.h | 2 +- src/k3bfirstrun.cpp | 10 ++-- src/k3bfirstrun.h | 4 +- src/k3bflatbutton.cpp | 12 ++-- src/k3bflatbutton.h | 6 +- src/k3binteractiondialog.cpp | 4 +- src/k3binteractiondialog.h | 2 +- src/k3bjobinterface.cpp | 4 +- src/k3bjobinterface.h | 2 +- src/k3bjobprogressdialog.cpp | 4 +- src/k3bjobprogressdialog.h | 2 +- src/k3bjobprogressosd.cpp | 4 +- src/k3bjobprogressosd.h | 2 +- src/k3blsofwrapperdialog.cpp | 8 +-- src/k3blsofwrapperdialog.h | 4 +- src/k3bmediacache.cpp | 4 +- src/k3bmediacache.h | 2 +- src/k3bmediacontentsview.cpp | 4 +- src/k3bmediacontentsview.h | 2 +- src/k3bmediaselectioncombobox.cpp | 4 +- src/k3bmediaselectioncombobox.h | 2 +- src/k3bmediaselectiondialog.cpp | 12 ++-- src/k3bmediaselectiondialog.h | 6 +- src/k3bminibutton.cpp | 4 +- src/k3bminibutton.h | 2 +- src/k3bpassivepopup.cpp | 4 +- src/k3bpassivepopup.h | 2 +- src/k3bprojectmanager.cpp | 4 +- src/k3bprojectmanager.h | 2 +- src/k3bprojecttabwidget.cpp | 4 +- src/k3bprojecttabwidget.h | 2 +- src/k3bservicemenuinstaller.cpp | 18 +++--- src/k3bservicemenuinstaller.h | 8 +-- src/k3bsidepanel.cpp | 4 +- src/k3bsidepanel.h | 2 +- src/k3bsplash.cpp | 4 +- src/k3bsplash.h | 2 +- src/k3bstatusbarmanager.cpp | 6 +- src/k3bstatusbarmanager.h | 2 +- src/k3bsystemproblemdialog.cpp | 8 +-- src/k3bsystemproblemdialog.h | 4 +- src/k3btempdirselectionwidget.cpp | 4 +- src/k3btempdirselectionwidget.h | 2 +- src/k3bthemedheader.cpp | 8 +-- src/k3bthemedheader.h | 4 +- src/k3bthemedlabel.cpp | 12 ++-- src/k3bthemedlabel.h | 6 +- src/k3bthememanager.cpp | 4 +- src/k3bthememanager.h | 2 +- src/k3btimeoutwidget.cpp | 4 +- src/k3btimeoutwidget.h | 2 +- src/k3bwelcomewidget.cpp | 10 ++-- src/k3bwelcomewidget.h | 4 +- src/k3bwidgetshoweffect.cpp | 14 ++--- src/k3bwidgetshoweffect.h | 2 +- src/k3bwriterselectionwidget.cpp | 8 +-- src/k3bwriterselectionwidget.h | 2 +- src/k3bwritingmodewidget.cpp | 8 +-- src/k3bwritingmodewidget.h | 4 +- src/misc/k3bblankingdialog.cpp | 4 +- src/misc/k3bcdcopydialog.cpp | 4 +- src/misc/k3bcdcopydialog.h | 2 +- src/misc/k3bcdimagewritingdialog.cpp | 4 +- src/misc/k3bdvdcopydialog.cpp | 4 +- src/misc/k3bdvdcopydialog.h | 2 +- src/misc/k3bdvdformattingdialog.cpp | 4 +- src/misc/k3bisoimagewritingdialog.cpp | 4 +- src/option/k3bburningoptiontab.cpp | 4 +- src/option/k3bburningoptiontab.h | 2 +- src/option/k3bcddboptiontab.cpp | 4 +- src/option/k3bcddboptiontab.h | 2 +- src/option/k3bdeviceoptiontab.cpp | 4 +- src/option/k3bdevicewidget.cpp | 6 +- src/option/k3bdevicewidget.h | 2 +- src/option/k3bexternalbinoptiontab.cpp | 4 +- src/option/k3bexternalbinwidget.cpp | 14 ++--- src/option/k3bexternalbinwidget.h | 6 +- src/option/k3bmiscoptiontab.cpp | 4 +- src/option/k3bmiscoptiontab.h | 2 +- src/option/k3bnotifyoptiontab.cpp | 4 +- src/option/k3bnotifyoptiontab.h | 2 +- src/option/k3boptiondialog.cpp | 4 +- src/option/k3boptiondialog.h | 2 +- src/option/k3bpluginoptiontab.cpp | 8 +-- src/option/k3bpluginoptiontab.h | 2 +- src/option/k3bthemeoptiontab.cpp | 8 +-- src/option/k3bthemeoptiontab.h | 2 +- src/projects/k3baudioburndialog.cpp | 4 +- src/projects/k3baudioburndialog.h | 2 +- src/projects/k3baudiocdtextwidget.cpp | 8 +-- src/projects/k3baudiocdtextwidget.h | 2 +- src/projects/k3baudiodatasourceeditwidget.cpp | 4 +- src/projects/k3baudiodatasourceeditwidget.h | 2 +- src/projects/k3baudiodatasourceviewitem.cpp | 6 +- src/projects/k3baudiodatasourceviewitem.h | 2 +- src/projects/k3baudioeditorwidget.cpp | 4 +- src/projects/k3baudioeditorwidget.h | 2 +- src/projects/k3baudiotrackaddingdialog.cpp | 10 ++-- src/projects/k3baudiotrackaddingdialog.h | 4 +- src/projects/k3baudiotrackdialog.cpp | 4 +- src/projects/k3baudiotrackdialog.h | 2 +- src/projects/k3baudiotrackplayer.cpp | 4 +- src/projects/k3baudiotrackplayer.h | 2 +- src/projects/k3baudiotracksplitdialog.cpp | 8 +-- src/projects/k3baudiotracksplitdialog.h | 4 +- src/projects/k3baudiotracktrmlookupdialog.cpp | 4 +- src/projects/k3baudiotracktrmlookupdialog.h | 2 +- src/projects/k3baudiotrackview.cpp | 16 ++--- src/projects/k3baudiotrackview.h | 4 +- src/projects/k3baudiotrackviewitem.cpp | 4 +- src/projects/k3baudiotrackviewitem.h | 2 +- src/projects/k3baudiotrackwidget.cpp | 4 +- src/projects/k3baudiotrackwidget.h | 2 +- src/projects/k3baudioview.cpp | 8 +-- src/projects/k3baudioview.h | 4 +- src/projects/k3bbootimagedialog.cpp | 4 +- src/projects/k3bbootimagedialog.h | 2 +- src/projects/k3bbootimageview.cpp | 12 ++-- src/projects/k3bbootimageview.h | 2 +- .../k3bdataadvancedimagesettingswidget.cpp | 12 ++-- src/projects/k3bdataadvancedimagesettingswidget.h | 2 +- src/projects/k3bdataburndialog.cpp | 4 +- src/projects/k3bdataburndialog.h | 2 +- src/projects/k3bdatadirtreeview.cpp | 26 ++++---- src/projects/k3bdatadirtreeview.h | 6 +- src/projects/k3bdatafileview.cpp | 16 ++--- src/projects/k3bdatafileview.h | 4 +- src/projects/k3bdataimagesettingswidget.cpp | 12 ++-- src/projects/k3bdataimagesettingswidget.h | 2 +- src/projects/k3bdatamultisessioncombobox.cpp | 4 +- src/projects/k3bdatamultisessioncombobox.h | 2 +- src/projects/k3bdatapropertiesdialog.cpp | 12 ++-- src/projects/k3bdatapropertiesdialog.h | 2 +- src/projects/k3bdatasessionimportdialog.cpp | 8 +-- src/projects/k3bdatasessionimportdialog.h | 4 +- src/projects/k3bdataurladdingdialog.cpp | 28 ++++----- src/projects/k3bdataurladdingdialog.h | 10 ++-- src/projects/k3bdataview.cpp | 8 +-- src/projects/k3bdataview.h | 4 +- src/projects/k3bdataviewitem.cpp | 36 +++++------ src/projects/k3bdataviewitem.h | 14 ++--- src/projects/k3bdatavolumedescwidget.cpp | 4 +- src/projects/k3bdatavolumedescwidget.h | 2 +- src/projects/k3bdvdburndialog.cpp | 4 +- src/projects/k3bdvdburndialog.h | 2 +- src/projects/k3bdvdview.cpp | 8 +-- src/projects/k3bdvdview.h | 4 +- src/projects/k3bencodingconverter.cpp | 2 +- src/projects/k3bencodingconverter.h | 4 +- src/projects/k3bfillstatusdisplay.cpp | 12 ++-- src/projects/k3bfillstatusdisplay.h | 4 +- src/projects/k3bmixedburndialog.cpp | 4 +- src/projects/k3bmixedburndialog.h | 2 +- src/projects/k3bmixeddirtreeview.cpp | 12 ++-- src/projects/k3bmixeddirtreeview.h | 4 +- src/projects/k3bmixedview.cpp | 8 +-- src/projects/k3bmixedview.h | 4 +- src/projects/k3bmovixburndialog.cpp | 4 +- src/projects/k3bmovixburndialog.h | 2 +- src/projects/k3bmovixdvdburndialog.cpp | 4 +- src/projects/k3bmovixdvdburndialog.h | 2 +- src/projects/k3bmovixdvdview.cpp | 8 +-- src/projects/k3bmovixdvdview.h | 4 +- src/projects/k3bmovixlistview.cpp | 20 +++---- src/projects/k3bmovixlistview.h | 10 ++-- src/projects/k3bmovixoptionswidget.cpp | 4 +- src/projects/k3bmovixoptionswidget.h | 2 +- src/projects/k3bmovixview.cpp | 8 +-- src/projects/k3bmovixview.h | 4 +- src/projects/k3bmusicbrainzjob.cpp | 8 +-- src/projects/k3bmusicbrainzjob.h | 6 +- src/projects/k3bprojectburndialog.cpp | 4 +- src/projects/k3bprojectburndialog.h | 2 +- src/projects/k3bprojectplugindialog.cpp | 4 +- src/projects/k3bvcdburndialog.cpp | 4 +- src/projects/k3bvcdburndialog.h | 2 +- src/projects/k3bvcdlistview.cpp | 4 +- src/projects/k3bvcdlistview.h | 2 +- src/projects/k3bvcdlistviewitem.cpp | 8 +-- src/projects/k3bvcdlistviewitem.h | 4 +- src/projects/k3bvcdtrackdialog.cpp | 4 +- src/projects/k3bvcdtrackdialog.h | 2 +- src/projects/k3bvcdview.cpp | 8 +-- src/projects/k3bvcdview.h | 4 +- src/projects/k3bvideodvdburndialog.cpp | 4 +- src/projects/k3bvideodvdburndialog.h | 2 +- src/projects/k3bvideodvdview.cpp | 8 +-- src/projects/k3bvideodvdview.h | 4 +- src/projects/k3bview.cpp | 4 +- src/projects/k3bview.h | 2 +- src/rip/k3baudiocdlistview.cpp | 4 +- src/rip/k3baudiocdlistview.h | 2 +- src/rip/k3baudiocdview.cpp | 8 +-- src/rip/k3baudiocdview.h | 2 +- src/rip/k3baudioconvertingoptionwidget.cpp | 4 +- src/rip/k3baudioconvertingoptionwidget.h | 2 +- src/rip/k3baudioprojectconvertingdialog.cpp | 4 +- src/rip/k3baudioprojectconvertingdialog.h | 2 +- src/rip/k3baudioripjob.cpp | 4 +- src/rip/k3baudioripjob.h | 2 +- src/rip/k3baudiorippingdialog.cpp | 4 +- src/rip/k3baudiorippingdialog.h | 2 +- src/rip/k3bcddbpatternwidget.cpp | 4 +- src/rip/k3bcddbpatternwidget.h | 2 +- src/rip/k3bvideocdinfo.cpp | 4 +- src/rip/k3bvideocdinfo.h | 2 +- src/rip/k3bvideocdrip.cpp | 4 +- src/rip/k3bvideocdrip.h | 2 +- src/rip/k3bvideocdrippingdialog.cpp | 4 +- src/rip/k3bvideocdrippingdialog.h | 2 +- src/rip/k3bvideocdview.cpp | 28 ++++----- src/rip/k3bvideocdview.h | 2 +- src/rip/videodvd/k3bvideodvdrippingdialog.cpp | 10 ++-- src/rip/videodvd/k3bvideodvdrippingdialog.h | 2 +- src/rip/videodvd/k3bvideodvdrippingjob.cpp | 4 +- src/rip/videodvd/k3bvideodvdrippingjob.h | 2 +- src/rip/videodvd/k3bvideodvdrippingpreview.cpp | 4 +- src/rip/videodvd/k3bvideodvdrippingpreview.h | 2 +- .../videodvd/k3bvideodvdrippingtitlelistview.cpp | 8 +-- src/rip/videodvd/k3bvideodvdrippingtitlelistview.h | 2 +- src/rip/videodvd/k3bvideodvdrippingview.cpp | 4 +- src/rip/videodvd/k3bvideodvdrippingview.h | 2 +- src/rip/videodvd/k3bvideodvdrippingwidget.cpp | 4 +- src/rip/videodvd/k3bvideodvdrippingwidget.h | 2 +- 509 files changed, 1500 insertions(+), 1500 deletions(-) diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp index 3495ae3..986f080 100644 --- a/k3bsetup/k3bsetup2.cpp +++ b/k3bsetup/k3bsetup2.cpp @@ -106,8 +106,8 @@ public: -K3bSetup2::K3bSetup2( TQWidget *tqparent, const char *, const TQStringList& ) - : KCModule( tqparent, "k3bsetup" ) +K3bSetup2::K3bSetup2( TQWidget *parent, const char *, const TQStringList& ) + : KCModule( parent, "k3bsetup" ) { d = new Private(); d->config = new KConfig( "k3bsetup2rc" ); diff --git a/k3bsetup/k3bsetup2.h b/k3bsetup/k3bsetup2.h index 6576640..106f424 100644 --- a/k3bsetup/k3bsetup2.h +++ b/k3bsetup/k3bsetup2.h @@ -31,7 +31,7 @@ class K3bSetup2: public KCModule TQ_OBJECT public: - K3bSetup2( TQWidget* tqparent = 0, const char* name = 0, const TQStringList& args = TQStringList() ); + K3bSetup2( TQWidget* parent = 0, const char* name = 0, const TQStringList& args = TQStringList() ); ~K3bSetup2(); TQString quickHelp() const; diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp index 197d9e5..953f0e7 100644 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp +++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp @@ -33,9 +33,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_k3b, KGenericFactory("kfile_k3b")) -K3bProjectFilePlugin::K3bProjectFilePlugin( TQObject *tqparent, const char *name, +K3bProjectFilePlugin::K3bProjectFilePlugin( TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-k3b" ); diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h index a8b2b13..ed2f986 100644 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h +++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h @@ -29,7 +29,7 @@ class K3bProjectFilePlugin: public KFilePlugin TQ_OBJECT public: - K3bProjectFilePlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + K3bProjectFilePlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index 5cee3da..23da695 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -36,8 +36,8 @@ #include "k3bcddbmultientriesdialog.h" -K3bCddb::K3bCddb( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bCddb::K3bCddb( TQObject* parent, const char* name ) + : TQObject( parent, name ) { m_httpQuery = 0; m_cddbpQuery = 0; diff --git a/libk3b/cddb/k3bcddb.h b/libk3b/cddb/k3bcddb.h index b7e5a47..20929f9 100644 --- a/libk3b/cddb/k3bcddb.h +++ b/libk3b/cddb/k3bcddb.h @@ -41,7 +41,7 @@ class LIBK3B_EXPORT K3bCddb : public TQObject TQ_OBJECT public: - K3bCddb( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddb( TQObject* parent = 0, const char* name = 0 ); ~K3bCddb(); TQString errorString() const; diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index c21460f..f3b9152 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -29,8 +29,8 @@ #include -K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* tqparent, const char* name ) - : K3bCddbQuery( tqparent, name ) +K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* parent, const char* name ) + : K3bCddbQuery( parent, name ) { m_server = "freedb.org"; m_port = 80; diff --git a/libk3b/cddb/k3bcddbhttpquery.h b/libk3b/cddb/k3bcddbhttpquery.h index 12a275e..611dece 100644 --- a/libk3b/cddb/k3bcddbhttpquery.h +++ b/libk3b/cddb/k3bcddbhttpquery.h @@ -32,7 +32,7 @@ class K3bCddbHttpQuery : public K3bCddbQuery TQ_OBJECT public: - K3bCddbHttpQuery( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbHttpQuery( TQObject* parent = 0, const char* name = 0 ); ~K3bCddbHttpQuery(); public slots: diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp index 81f69e2..1c247dd 100644 --- a/libk3b/cddb/k3bcddblocalquery.cpp +++ b/libk3b/cddb/k3bcddblocalquery.cpp @@ -25,8 +25,8 @@ #include -K3bCddbLocalQuery::K3bCddbLocalQuery( TQObject* tqparent , const char* name ) - : K3bCddbQuery( tqparent, name ) +K3bCddbLocalQuery::K3bCddbLocalQuery( TQObject* parent , const char* name ) + : K3bCddbQuery( parent, name ) { } diff --git a/libk3b/cddb/k3bcddblocalquery.h b/libk3b/cddb/k3bcddblocalquery.h index f373698..e75d2fe 100644 --- a/libk3b/cddb/k3bcddblocalquery.h +++ b/libk3b/cddb/k3bcddblocalquery.h @@ -30,7 +30,7 @@ class K3bCddbLocalQuery : public K3bCddbQuery TQ_OBJECT public: - K3bCddbLocalQuery( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbLocalQuery( TQObject* parent = 0, const char* name = 0 ); ~K3bCddbLocalQuery(); public slots: diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp index f7dc730..3c401b1 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.cpp +++ b/libk3b/cddb/k3bcddblocalsubmit.cpp @@ -25,8 +25,8 @@ #include -K3bCddbLocalSubmit::K3bCddbLocalSubmit( TQObject* tqparent, const char* name ) - : K3bCddbSubmit( tqparent, name ) +K3bCddbLocalSubmit::K3bCddbLocalSubmit( TQObject* parent, const char* name ) + : K3bCddbSubmit( parent, name ) { } diff --git a/libk3b/cddb/k3bcddblocalsubmit.h b/libk3b/cddb/k3bcddblocalsubmit.h index 88f127c..265b469 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.h +++ b/libk3b/cddb/k3bcddblocalsubmit.h @@ -28,7 +28,7 @@ class K3bCddbLocalSubmit : public K3bCddbSubmit TQ_OBJECT public: - K3bCddbLocalSubmit( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbLocalSubmit( TQObject* parent = 0, const char* name = 0 ); ~K3bCddbLocalSubmit(); public slots: diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp index df5a938..f8746b7 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp +++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp @@ -25,8 +25,8 @@ -K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* tqparent, const char* name ) - : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, tqparent, name ) +K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const char* name ) + : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name ) { TQFrame* frame = plainPage(); TQVBoxLayout* tqlayout = new TQVBoxLayout( frame ); @@ -42,9 +42,9 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* tqparent, const setMinimumSize( 280, 200 ); } -K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* query, TQWidget* tqparent ) +K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* query, TQWidget* parent ) { - K3bCddbMultiEntriesDialog d( tqparent ); + K3bCddbMultiEntriesDialog d( parent ); const TQValueList headers = query->getInexactMatches(); diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.h b/libk3b/cddb/k3bcddbmultientriesdialog.h index 43c409e..2365587 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.h +++ b/libk3b/cddb/k3bcddbmultientriesdialog.h @@ -37,10 +37,10 @@ class K3bCddbMultiEntriesDialog : public KDialogBase public: ~K3bCddbMultiEntriesDialog(); - static K3bCddbResultHeader selectCddbEntry( K3bCddbQuery* query, TQWidget* tqparent = 0 ); + static K3bCddbResultHeader selectCddbEntry( K3bCddbQuery* query, TQWidget* parent = 0 ); protected: - K3bCddbMultiEntriesDialog( TQWidget* tqparent = 0, const char* name = 0); + K3bCddbMultiEntriesDialog( TQWidget* parent = 0, const char* name = 0); private: KListBox *m_listBox; diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp index 15f3e18..bcd75be 100644 --- a/libk3b/cddb/k3bcddbpquery.cpp +++ b/libk3b/cddb/k3bcddbpquery.cpp @@ -25,8 +25,8 @@ -K3bCddbpQuery::K3bCddbpQuery( TQObject* tqparent, const char* name ) - :K3bCddbQuery( tqparent, name ) +K3bCddbpQuery::K3bCddbpQuery( TQObject* parent, const char* name ) + :K3bCddbQuery( parent, name ) { m_socket = new TQSocket( this ); m_stream.setDevice( m_socket ); diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h index 423cad1..d0a12bc 100644 --- a/libk3b/cddb/k3bcddbpquery.h +++ b/libk3b/cddb/k3bcddbpquery.h @@ -31,7 +31,7 @@ class K3bCddbpQuery : public K3bCddbQuery TQ_OBJECT public: - K3bCddbpQuery( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbpQuery( TQObject* parent = 0, const char* name = 0 ); ~K3bCddbpQuery(); public slots: diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp index 1c6605b..e4ccc75 100644 --- a/libk3b/cddb/k3bcddbquery.cpp +++ b/libk3b/cddb/k3bcddbquery.cpp @@ -35,8 +35,8 @@ -K3bCddbQuery::K3bCddbQuery( TQObject* tqparent, const char* name ) - : TQObject(tqparent, name) +K3bCddbQuery::K3bCddbQuery( TQObject* parent, const char* name ) + : TQObject(parent, name) { m_bQueryFinishedEmited = false; } diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h index eebc4cb..6d75262 100644 --- a/libk3b/cddb/k3bcddbquery.h +++ b/libk3b/cddb/k3bcddbquery.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bCddbQuery : public TQObject TQ_OBJECT public: - K3bCddbQuery( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbQuery( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bCddbQuery(); void query( const K3bDevice::Toc& ); diff --git a/libk3b/cddb/k3bcddbsubmit.cpp b/libk3b/cddb/k3bcddbsubmit.cpp index 01aa7f8..06e123f 100644 --- a/libk3b/cddb/k3bcddbsubmit.cpp +++ b/libk3b/cddb/k3bcddbsubmit.cpp @@ -19,8 +19,8 @@ #include -K3bCddbSubmit::K3bCddbSubmit( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bCddbSubmit::K3bCddbSubmit( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } diff --git a/libk3b/cddb/k3bcddbsubmit.h b/libk3b/cddb/k3bcddbsubmit.h index cb9906f..58e7249 100644 --- a/libk3b/cddb/k3bcddbsubmit.h +++ b/libk3b/cddb/k3bcddbsubmit.h @@ -30,7 +30,7 @@ class K3bCddbSubmit : public TQObject TQ_OBJECT public: - K3bCddbSubmit( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbSubmit( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bCddbSubmit(); int error() const { return m_error; } diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index a32acae..29a60e3 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -121,8 +121,8 @@ K3bCore* K3bCore::s_k3bCore = 0; -K3bCore::K3bCore( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bCore::K3bCore( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h index f97430c..bc11521 100644 --- a/libk3b/core/k3bcore.h +++ b/libk3b/core/k3bcore.h @@ -62,7 +62,7 @@ class LIBK3B_EXPORT K3bCore : public TQObject * Although K3bCore is a singlelton it's constructor is not private to make inheritance * possible. Just make sure to only create one instance. */ - K3bCore( TQObject* tqparent = 0, const char* name = 0 ); + K3bCore( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bCore(); const TQValueList& runningJobs() const; diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp index eb7203f..ac9ffa4 100644 --- a/libk3b/core/k3bexternalbinmanager.cpp +++ b/libk3b/core/k3bexternalbinmanager.cpp @@ -161,8 +161,8 @@ void K3bExternalProgram::addUserParameter( const TQString& p ) // /////////////////////////////////////////////////////////// -K3bExternalBinManager::K3bExternalBinManager( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bExternalBinManager::K3bExternalBinManager( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h index 11a8dcb..e0e9d42 100644 --- a/libk3b/core/k3bexternalbinmanager.h +++ b/libk3b/core/k3bexternalbinmanager.h @@ -117,7 +117,7 @@ class LIBK3B_EXPORT K3bExternalBinManager : public TQObject TQ_OBJECT public: - K3bExternalBinManager( TQObject* tqparent = 0, const char* name = 0 ); + K3bExternalBinManager( TQObject* parent = 0, const char* name = 0 ); ~K3bExternalBinManager(); void search(); diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index 1d91cd3..09373be 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -191,17 +191,17 @@ TQString K3b::prepareDir( const TQString& dir ) TQString K3b::parentDir( const TQString& path ) { - TQString tqparent = path; + TQString parent = path; if( path[path.length()-1] == '/' ) - tqparent.truncate( tqparent.length()-1 ); + parent.truncate( parent.length()-1 ); - int pos = tqparent.findRev( '/' ); + int pos = parent.findRev( '/' ); if( pos >= 0 ) - tqparent.truncate( pos+1 ); + parent.truncate( pos+1 ); else // relative path, do anything... - tqparent = "/"; + parent = "/"; - return tqparent; + return parent; } diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h index 6554d7d..0b58f58 100644 --- a/libk3b/core/k3bglobals.h +++ b/libk3b/core/k3bglobals.h @@ -161,7 +161,7 @@ namespace K3b LIBK3B_EXPORT TQString prepareDir( const TQString& dir ); /** - * returns the tqparent dir of a path. + * returns the parent dir of a path. * CAUTION: this does only work well with absolut paths. * * Example: /usr/share/doc -> /usr/share/ diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp index 046de06..02697d6 100644 --- a/libk3b/core/k3bjob.cpp +++ b/libk3b/core/k3bjob.cpp @@ -34,8 +34,8 @@ public: const char* K3bJob::DEFAULT_SIGNAL_CONNECTION = "K3bJobDefault"; -K3bJob::K3bJob( K3bJobHandler* handler, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ), +K3bJob::K3bJob( K3bJobHandler* handler, TQObject* parent, const char* name ) + : TQObject( parent, name ), m_jobHandler( handler ), m_canceled(false), m_active(false) @@ -231,8 +231,8 @@ public: -K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* tqparent, const char* name ) - : K3bJob( handler, tqparent, name ), +K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* parent, const char* name ) + : K3bJob( handler, parent, name ), m_writeMethod( K3b::DEFAULT ) { d = new Private; diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h index b64b85b..cbb4758 100644 --- a/libk3b/core/k3bjob.h +++ b/libk3b/core/k3bjob.h @@ -30,7 +30,7 @@ namespace K3bDevice { /** * This is the baseclass for all the jobs in K3b which actually do the work like burning a cd! - * The K3bJob object takes care of registering with the k3bcore or with a tqparent K3bJob. + * The K3bJob object takes care of registering with the k3bcore or with a parent K3bJob. * * Every job has a jobhandler which can be another job (in which case the job is handled as * a subjob) or an arbitrary class implementing the K3bJobHandler interface. @@ -212,7 +212,7 @@ class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler * \see runningSubJobs() * \see numRunningSubJobs() */ - K3bJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); + K3bJob( K3bJobHandler* hdl, TQObject* parent = 0, const char* name = 0 ); /** * Call this in start() to properly register the job and emit the started() signal. @@ -260,7 +260,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob TQ_OBJECT public: - K3bBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); + K3bBurnJob( K3bJobHandler* hdl, TQObject* parent = 0, const char* name = 0 ); virtual ~K3bBurnJob(); /** diff --git a/libk3b/core/k3bsimplejobhandler.cpp b/libk3b/core/k3bsimplejobhandler.cpp index d48349e..554a621 100644 --- a/libk3b/core/k3bsimplejobhandler.cpp +++ b/libk3b/core/k3bsimplejobhandler.cpp @@ -16,8 +16,8 @@ #include "k3bsimplejobhandler.h" -K3bSimpleJobHandler::K3bSimpleJobHandler( TQObject* tqparent ) - : TQObject( tqparent ), +K3bSimpleJobHandler::K3bSimpleJobHandler( TQObject* parent ) + : TQObject( parent ), K3bJobHandler() { } diff --git a/libk3b/core/k3bsimplejobhandler.h b/libk3b/core/k3bsimplejobhandler.h index 60d4bf9..7657906 100644 --- a/libk3b/core/k3bsimplejobhandler.h +++ b/libk3b/core/k3bsimplejobhandler.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bSimpleJobHandler : public TQObject, public K3bJobHandler TQ_OBJECT public: - K3bSimpleJobHandler( TQObject* tqparent = 0 ); + K3bSimpleJobHandler( TQObject* parent = 0 ); ~K3bSimpleJobHandler(); /* diff --git a/libk3b/core/k3bthreadjob.cpp b/libk3b/core/k3bthreadjob.cpp index fcc192e..634aa91 100644 --- a/libk3b/core/k3bthreadjob.cpp +++ b/libk3b/core/k3bthreadjob.cpp @@ -23,15 +23,15 @@ -K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_running(false) { } -K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_running(false) { setThread(thread); diff --git a/libk3b/core/k3bthreadjob.h b/libk3b/core/k3bthreadjob.h index 34b43fd..319e69f 100644 --- a/libk3b/core/k3bthreadjob.h +++ b/libk3b/core/k3bthreadjob.h @@ -43,8 +43,8 @@ class LIBK3B_EXPORT K3bThreadJob : public K3bJob TQ_OBJECT public: - K3bThreadJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); - K3bThreadJob( K3bThread*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bThreadJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); + K3bThreadJob( K3bThread*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); virtual ~K3bThreadJob(); void setThread( K3bThread* t ); diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp index 9b88345..d66b529 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp +++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp @@ -50,8 +50,8 @@ private: }; -K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bBurnJob( jh, tqparent, name ), +K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bBurnJob( jh, parent, name ), m_decoder(0) { m_analyserThread = new AnalyserThread(); diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.h b/libk3b/jobs/k3baudiocuefilewritingjob.h index a59dcb0..ba85d0a 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.h +++ b/libk3b/jobs/k3baudiocuefilewritingjob.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bAudioCueFileWritingJob : public K3bBurnJob TQ_OBJECT public: - K3bAudioCueFileWritingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioCueFileWritingJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioCueFileWritingJob(); K3bDevice::Device* writer() const; diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp index acf7e9d..1946415 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.cpp +++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp @@ -206,8 +206,8 @@ void K3bAudioSessionReadingJob::WorkThread::cancel() -K3bAudioSessionReadingJob::K3bAudioSessionReadingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ) +K3bAudioSessionReadingJob::K3bAudioSessionReadingJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ) { m_thread = new WorkThread(); setThread( m_thread ); diff --git a/libk3b/jobs/k3baudiosessionreadingjob.h b/libk3b/jobs/k3baudiosessionreadingjob.h index 53ae7fa..358c569 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.h +++ b/libk3b/jobs/k3baudiosessionreadingjob.h @@ -33,7 +33,7 @@ class K3bAudioSessionReadingJob : public K3bThreadJob TQ_OBJECT public: - K3bAudioSessionReadingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioSessionReadingJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioSessionReadingJob(); /** diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp index 0f58f7c..2fd0b60 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.cpp +++ b/libk3b/jobs/k3bbinimagewritingjob.cpp @@ -30,8 +30,8 @@ -K3bBinImageWritingJob::K3bBinImageWritingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bBinImageWritingJob::K3bBinImageWritingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_device(0), m_simulate(false), m_force(false), diff --git a/libk3b/jobs/k3bbinimagewritingjob.h b/libk3b/jobs/k3bbinimagewritingjob.h index 9782985..13e4f88 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.h +++ b/libk3b/jobs/k3bbinimagewritingjob.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob TQ_OBJECT public: - K3bBinImageWritingJob( K3bJobHandler*, TQObject* tqparent = 0 ); + K3bBinImageWritingJob( K3bJobHandler*, TQObject* parent = 0 ); ~K3bBinImageWritingJob(); K3bDevice::Device* writer() const { return m_device; }; diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index 80eba84..5781b2b 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -31,8 +31,8 @@ -K3bBlankingJob::K3bBlankingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bBlankingJob::K3bBlankingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_writerJob(0), m_force(true), m_device(0), diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h index ab6becd..37e1b42 100644 --- a/libk3b/jobs/k3bblankingjob.h +++ b/libk3b/jobs/k3bblankingjob.h @@ -30,7 +30,7 @@ class LIBK3B_EXPORT K3bBlankingJob : public K3bBurnJob TQ_OBJECT public: - K3bBlankingJob( K3bJobHandler*, TQObject* tqparent = 0 ); + K3bBlankingJob( K3bJobHandler*, TQObject* parent = 0 ); ~K3bBlankingJob(); K3bDevice::Device* writer() const; diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index de93b4f..9a266bf 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -115,8 +115,8 @@ public: }; -K3bCdCopyJob::K3bCdCopyJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bCdCopyJob::K3bCdCopyJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_simulate(false), m_copies(1), m_onlyCreateImages(false), diff --git a/libk3b/jobs/k3bcdcopyjob.h b/libk3b/jobs/k3bcdcopyjob.h index 65c7e9f..1f41d48 100644 --- a/libk3b/jobs/k3bcdcopyjob.h +++ b/libk3b/jobs/k3bcdcopyjob.h @@ -35,7 +35,7 @@ class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob TQ_OBJECT public: - K3bCdCopyJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); + K3bCdCopyJob( K3bJobHandler* hdl, TQObject* parent = 0 ); ~K3bCdCopyJob(); K3bDevice::Device* writer() const { return m_onlyCreateImages ? 0 : m_writerDevice; } diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp index c583ec8..5202fc4 100644 --- a/libk3b/jobs/k3bcdda2wavreader.cpp +++ b/libk3b/jobs/k3bcdda2wavreader.cpp @@ -52,8 +52,8 @@ public: }; -K3bCdda2wavReader::K3bCdda2wavReader( TQObject* tqparent, const char* name ) - : K3bJob( tqparent, name ) +K3bCdda2wavReader::K3bCdda2wavReader( TQObject* parent, const char* name ) + : K3bJob( parent, name ) { d = new Private(); } diff --git a/libk3b/jobs/k3bcdda2wavreader.h b/libk3b/jobs/k3bcdda2wavreader.h index 938e1a5..6018614 100644 --- a/libk3b/jobs/k3bcdda2wavreader.h +++ b/libk3b/jobs/k3bcdda2wavreader.h @@ -35,7 +35,7 @@ class K3bCdda2wavReader : public K3bJob TQ_OBJECT public: - K3bCdda2wavReader( TQObject* tqparent = 0, const char* name = 0 ); + K3bCdda2wavReader( TQObject* parent = 0, const char* name = 0 ); ~K3bCdda2wavReader(); bool active() const; diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp index 8ed8cad..f8ce4f7 100644 --- a/libk3b/jobs/k3bclonejob.cpp +++ b/libk3b/jobs/k3bclonejob.cpp @@ -43,8 +43,8 @@ public: }; -K3bCloneJob::K3bCloneJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bBurnJob( hdl, tqparent, name ), +K3bCloneJob::K3bCloneJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bBurnJob( hdl, parent, name ), m_writerDevice(0), m_readerDevice(0), m_writerJob(0), diff --git a/libk3b/jobs/k3bclonejob.h b/libk3b/jobs/k3bclonejob.h index e928f3c..6306596 100644 --- a/libk3b/jobs/k3bclonejob.h +++ b/libk3b/jobs/k3bclonejob.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob TQ_OBJECT public: - K3bCloneJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bCloneJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bCloneJob(); K3bDevice::Device* writer() const { return m_writerDevice; } diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp index 85a14cd..9ff5dd5 100644 --- a/libk3b/jobs/k3bdatatrackreader.cpp +++ b/libk3b/jobs/k3bdatatrackreader.cpp @@ -71,8 +71,8 @@ private: }; -K3bDataTrackReader::K3bDataTrackReader( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ) +K3bDataTrackReader::K3bDataTrackReader( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ) { m_thread = new WorkThread(); setThread( m_thread ); diff --git a/libk3b/jobs/k3bdatatrackreader.h b/libk3b/jobs/k3bdatatrackreader.h index 0782079..e54a818 100644 --- a/libk3b/jobs/k3bdatatrackreader.h +++ b/libk3b/jobs/k3bdatatrackreader.h @@ -41,7 +41,7 @@ namespace K3bDevice { class K3bDataTrackReader : public K3bThreadJob { public: - K3bDataTrackReader( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bDataTrackReader( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bDataTrackReader(); enum SectorSize { diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index bcbba68..b123e24 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -83,8 +83,8 @@ public: }; -K3bDvdCopyJob::K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bBurnJob( hdl, tqparent, name ), +K3bDvdCopyJob::K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bBurnJob( hdl, parent, name ), m_writerDevice(0), m_readerDevice(0), m_onTheFly(false), diff --git a/libk3b/jobs/k3bdvdcopyjob.h b/libk3b/jobs/k3bdvdcopyjob.h index eb2e51c..1042adc 100644 --- a/libk3b/jobs/k3bdvdcopyjob.h +++ b/libk3b/jobs/k3bdvdcopyjob.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob TQ_OBJECT public: - K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); + K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* parent = 0, const char* name = 0 ); ~K3bDvdCopyJob(); K3bDevice::Device* writer() const { return m_onlyCreateImage ? 0 : m_writerDevice; } diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp index 9b6a58b..46c8563 100644 --- a/libk3b/jobs/k3bdvdformattingjob.cpp +++ b/libk3b/jobs/k3bdvdformattingjob.cpp @@ -71,8 +71,8 @@ public: }; -K3bDvdFormattingJob::K3bDvdFormattingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bBurnJob( jh, tqparent, name ) +K3bDvdFormattingJob::K3bDvdFormattingJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bBurnJob( jh, parent, name ) { d = new Private; } diff --git a/libk3b/jobs/k3bdvdformattingjob.h b/libk3b/jobs/k3bdvdformattingjob.h index cf8b7eb..2e3bbcd 100644 --- a/libk3b/jobs/k3bdvdformattingjob.h +++ b/libk3b/jobs/k3bdvdformattingjob.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob TQ_OBJECT public: - K3bDvdFormattingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bDvdFormattingJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bDvdFormattingJob(); TQString jobDescription() const; diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index 38adab1..fb2a7bd 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -60,8 +60,8 @@ public: -K3bReadcdReader::K3bReadcdReader( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bReadcdReader::K3bReadcdReader( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_noCorr(false), m_clone(false), m_noError(false), diff --git a/libk3b/jobs/k3breadcdreader.h b/libk3b/jobs/k3breadcdreader.h index de6f225..b59f890 100644 --- a/libk3b/jobs/k3breadcdreader.h +++ b/libk3b/jobs/k3breadcdreader.h @@ -37,7 +37,7 @@ class K3bReadcdReader : public K3bJob TQ_OBJECT public: - K3bReadcdReader( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bReadcdReader( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bReadcdReader(); bool active() const; diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index 963f1a2..5b8cc62 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -89,8 +89,8 @@ public: }; -K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bJob( hdl, tqparent, name ) +K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bJob( hdl, parent, name ) { d = new Private(); diff --git a/libk3b/jobs/k3bverificationjob.h b/libk3b/jobs/k3bverificationjob.h index 945198d..257520a 100644 --- a/libk3b/jobs/k3bverificationjob.h +++ b/libk3b/jobs/k3bverificationjob.h @@ -50,7 +50,7 @@ class K3bVerificationJob : public K3bJob TQ_OBJECT public: - K3bVerificationJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bVerificationJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bVerificationJob(); public slots: diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp index 2d7fd43..cf30eed 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp @@ -46,8 +46,8 @@ public: -K3bVideoDVDTitleDetectClippingJob::K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bJob( hdl, tqparent ), +K3bVideoDVDTitleDetectClippingJob::K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bJob( hdl, parent ), m_clippingTop( 0 ), m_clippingBottom( 0 ), m_clippingLeft( 0 ), diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h index a102810..cd27b6c 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h @@ -31,7 +31,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob TQ_OBJECT public: - K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* parent ); ~K3bVideoDVDTitleDetectClippingJob(); const K3bVideoDVD::VideoDVD& videoDVD() const { return m_dvd; } diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index 3af2278..96d670b 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -47,8 +47,8 @@ public: -K3bVideoDVDTitleTranscodingJob::K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bJob( hdl, tqparent ), +K3bVideoDVDTitleTranscodingJob::K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bJob( hdl, parent ), m_clippingTop( 0 ), m_clippingBottom( 0 ), m_clippingLeft( 0 ), diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h index 8523d0e..963a81b 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h @@ -36,7 +36,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob TQ_OBJECT public: - K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* parent ); ~K3bVideoDVDTitleTranscodingJob(); /** diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp index 075deb2..b2d347b 100644 --- a/libk3b/plugin/k3baudiodecoder.cpp +++ b/libk3b/plugin/k3baudiodecoder.cpp @@ -106,8 +106,8 @@ public: -K3bAudioDecoder::K3bAudioDecoder( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bAudioDecoder::K3bAudioDecoder( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); } diff --git a/libk3b/plugin/k3baudiodecoder.h b/libk3b/plugin/k3baudiodecoder.h index ed13c66..c4c97f9 100644 --- a/libk3b/plugin/k3baudiodecoder.h +++ b/libk3b/plugin/k3baudiodecoder.h @@ -37,7 +37,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public TQObject TQ_OBJECT public: - K3bAudioDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioDecoder( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bAudioDecoder(); @@ -213,8 +213,8 @@ class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin TQ_OBJECT public: - K3bAudioDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ) - : K3bPlugin( tqparent, name ) { + K3bAudioDecoderFactory( TQObject* parent = 0, const char* name = 0 ) + : K3bPlugin( parent, name ) { } virtual ~K3bAudioDecoderFactory() { @@ -241,7 +241,7 @@ class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin */ virtual bool canDecode( const KURL& filename ) = 0; - virtual K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const = 0; + virtual K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const = 0; /** * Searching for an audiodecoder for @p filename. diff --git a/libk3b/plugin/k3baudioencoder.cpp b/libk3b/plugin/k3baudioencoder.cpp index d7f72d1..76240e4 100644 --- a/libk3b/plugin/k3baudioencoder.cpp +++ b/libk3b/plugin/k3baudioencoder.cpp @@ -34,8 +34,8 @@ public: }; -K3bAudioEncoder::K3bAudioEncoder( TQObject* tqparent, const char* name ) - : K3bPlugin( tqparent, name ) +K3bAudioEncoder::K3bAudioEncoder( TQObject* parent, const char* name ) + : K3bPlugin( parent, name ) { d = new Private(); } diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h index b3fc01b..928b432 100644 --- a/libk3b/plugin/k3baudioencoder.h +++ b/libk3b/plugin/k3baudioencoder.h @@ -36,7 +36,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin TQ_OBJECT public: - K3bAudioEncoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioEncoder( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bAudioEncoder(); // TODO: if the following methods are to be activated the config methods in diff --git a/libk3b/plugin/k3baudiooutputplugin.h b/libk3b/plugin/k3baudiooutputplugin.h index fdd57a5..0145465 100644 --- a/libk3b/plugin/k3baudiooutputplugin.h +++ b/libk3b/plugin/k3baudiooutputplugin.h @@ -62,8 +62,8 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin virtual int write( char* data, int len ) = 0; protected: - K3bAudioOutputPlugin( TQObject* tqparent = 0, const char* name = 0 ) - : K3bPlugin( tqparent, name ) { + K3bAudioOutputPlugin( TQObject* parent = 0, const char* name = 0 ) + : K3bPlugin( parent, name ) { } }; diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp index 3251ed5..197a042 100644 --- a/libk3b/plugin/k3baudioserver.cpp +++ b/libk3b/plugin/k3baudioserver.cpp @@ -89,8 +89,8 @@ private: }; -K3bAudioServer::K3bAudioServer( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ), +K3bAudioServer::K3bAudioServer( TQObject* parent, const char* name ) + : TQObject( parent, name ), m_usedOutputPlugin(0), m_pluginInitialized(false), m_client(0) diff --git a/libk3b/plugin/k3baudioserver.h b/libk3b/plugin/k3baudioserver.h index b428056..a4cd49d 100644 --- a/libk3b/plugin/k3baudioserver.h +++ b/libk3b/plugin/k3baudioserver.h @@ -32,7 +32,7 @@ class LIBK3B_EXPORT K3bAudioServer : public TQObject TQ_OBJECT public: - K3bAudioServer( TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioServer( TQObject* parent = 0, const char* name = 0 ); ~K3bAudioServer(); /** diff --git a/libk3b/plugin/k3bplugin.cpp b/libk3b/plugin/k3bplugin.cpp index 6929bd0..2f1afe9 100644 --- a/libk3b/plugin/k3bplugin.cpp +++ b/libk3b/plugin/k3bplugin.cpp @@ -17,8 +17,8 @@ #include "k3bplugin.h" -K3bPlugin::K3bPlugin( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bPlugin::K3bPlugin( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } diff --git a/libk3b/plugin/k3bplugin.h b/libk3b/plugin/k3bplugin.h index 1eeb622..5a41b66 100644 --- a/libk3b/plugin/k3bplugin.h +++ b/libk3b/plugin/k3bplugin.h @@ -85,7 +85,7 @@ class LIBK3B_EXPORT K3bPlugin : public TQObject friend class K3bPluginManager; public: - K3bPlugin( TQObject* tqparent = 0, const char* name = 0 ); + K3bPlugin( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bPlugin(); const K3bPluginInfo& pluginInfo() const { return m_pluginInfo; } @@ -105,7 +105,7 @@ class LIBK3B_EXPORT K3bPlugin : public TQObject * * The caller has to destroy the widget */ - virtual K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; + virtual K3bPluginConfigWidget* createConfigWidget( TQWidget* parent = 0, const char* name = 0 ) const; private: K3bPluginInfo m_pluginInfo; diff --git a/libk3b/plugin/k3bpluginconfigwidget.cpp b/libk3b/plugin/k3bpluginconfigwidget.cpp index b93fa9d..21876d5 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.cpp +++ b/libk3b/plugin/k3bpluginconfigwidget.cpp @@ -22,8 +22,8 @@ #include -K3bPluginConfigWidget::K3bPluginConfigWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +K3bPluginConfigWidget::K3bPluginConfigWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { } diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h index 3e5068d..7840ac4 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.h +++ b/libk3b/plugin/k3bpluginconfigwidget.h @@ -26,7 +26,7 @@ class LIBK3B_EXPORT K3bPluginConfigWidget : public TQWidget TQ_OBJECT public: - K3bPluginConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bPluginConfigWidget( TQWidget* parent = 0, const char* name = 0 ); virtual ~K3bPluginConfigWidget(); public slots: diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h index 463703f..7892dfa 100644 --- a/libk3b/plugin/k3bpluginfactory.h +++ b/libk3b/plugin/k3bpluginfactory.h @@ -64,10 +64,10 @@ class K3bPluginFactory : public KLibFactory } } - virtual TQObject* createObject( TQObject *tqparent, const char *name, + virtual TQObject* createObject( TQObject *parent, const char *name, const char*, const TQStringList& ) { initializeMessageCatalogue(); - return new T( tqparent, name ); + return new T( parent, name ); } private: diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index fc69933..3274ef6 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -42,8 +42,8 @@ public: -K3bPluginManager::K3bPluginManager( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bPluginManager::K3bPluginManager( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); } @@ -163,9 +163,9 @@ int K3bPluginManager::pluginSystemVersion() const } -int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* tqparent, const char* name ) +int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, const char* name ) { - KDialogBase dlg( tqparent, + KDialogBase dlg( parent, name, true, i18n("Configure plugin %1").tqarg( plugin->pluginInfo().name() ) ); @@ -181,7 +181,7 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* tqparent, c return r; } else { - KMessageBox::sorry( tqparent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) ); + KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) ); return 0; } } diff --git a/libk3b/plugin/k3bpluginmanager.h b/libk3b/plugin/k3bpluginmanager.h index c047c1a..64a4b74 100644 --- a/libk3b/plugin/k3bpluginmanager.h +++ b/libk3b/plugin/k3bpluginmanager.h @@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bPluginManager : public TQObject TQ_OBJECT public: - K3bPluginManager( TQObject* tqparent = 0, const char* name = 0 ); + K3bPluginManager( TQObject* parent = 0, const char* name = 0 ); ~K3bPluginManager(); /** @@ -61,7 +61,7 @@ class LIBK3B_EXPORT K3bPluginManager : public TQObject void loadPlugin( const TQString& fileName ); - int execPluginDialog( K3bPlugin*, TQWidget* tqparent = 0, const char* name = 0 ); + int execPluginDialog( K3bPlugin*, TQWidget* parent = 0, const char* name = 0 ); private: class Private; diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h index a8d0c47..aafb359 100644 --- a/libk3b/plugin/k3bprojectplugin.h +++ b/libk3b/plugin/k3bprojectplugin.h @@ -77,8 +77,8 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin * @p activate() will not be used. A plugin has a GUI if it's functionality is started * by some user input. */ - K3bProjectPlugin( int type, bool gui = false, TQObject* tqparent = 0, const char* name = 0 ) - : K3bPlugin( tqparent, name ), + K3bProjectPlugin( int type, bool gui = false, TQObject* parent = 0, const char* name = 0 ) + : K3bPlugin( parent, name ), m_type(type), m_hasGUI(gui) { } @@ -139,9 +139,9 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin * this will be the doc to work on. It should * be dynamically casted to the needed project type. * - * @param tqparent the tqparent widget to be used for things like progress dialogs. + * @param parent the parent widget to be used for things like progress dialogs. */ - virtual void activate( K3bDoc* doc, TQWidget* tqparent ) { Q_UNUSED(doc); Q_UNUSED(tqparent); } + virtual void activate( K3bDoc* doc, TQWidget* parent ) { Q_UNUSED(doc); Q_UNUSED(parent); } protected: void setText( const TQString& s ) { m_text = s; } diff --git a/libk3b/projects/audiocd/k3baudiodatasource.h b/libk3b/projects/audiocd/k3baudiodatasource.h index 5ac7336..f3bc770 100644 --- a/libk3b/projects/audiocd/k3baudiodatasource.h +++ b/libk3b/projects/audiocd/k3baudiodatasource.h @@ -150,7 +150,7 @@ class LIBK3B_EXPORT K3bAudioDataSource protected: /** - * Informs the tqparent track about changes. + * Informs the parent track about changes. */ void emitChange(); diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index 0cd8ae1..625f5bf 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -69,8 +69,8 @@ public: }; -K3bAudioDoc::K3bAudioDoc( TQObject* tqparent ) - : K3bDoc( tqparent ), +K3bAudioDoc::K3bAudioDoc( TQObject* parent ) + : K3bDoc( parent ), m_firstTrack(0), m_lastTrack(0) { @@ -288,11 +288,11 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) } -void K3bAudioDoc::addSources( K3bAudioTrack* tqparent, +void K3bAudioDoc::addSources( K3bAudioTrack* parent, const KURL::List& urls, K3bAudioDataSource* sourceAfter ) { - kdDebug() << "(K3bAudioDoc::addSources( " << tqparent << ", " + kdDebug() << "(K3bAudioDoc::addSources( " << parent << ", " << urls.first().path() << ", " << sourceAfter << " )" << endl; KURL::List allUrls = extractUrlList( urls ); @@ -302,7 +302,7 @@ void K3bAudioDoc::addSources( K3bAudioTrack* tqparent, if( sourceAfter ) file->moveAfter( sourceAfter ); else - file->moveAhead( tqparent->firstSource() ); + file->moveAhead( parent->firstSource() ); sourceAfter = file; } } @@ -916,9 +916,9 @@ int K3bAudioDoc::numOfTracks() const } -K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bAudioJob( this, hdl, tqparent ); + return new K3bAudioJob( this, hdl, parent ); } diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h index 943bf14..70f8826 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.h +++ b/libk3b/projects/audiocd/k3baudiodoc.h @@ -112,7 +112,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc */ K3bDevice::Toc toToc() const; - K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ); + K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* parent = 0 ); /** * Shows dialogs. @@ -159,7 +159,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc */ void addTrack( K3bAudioTrack* track, uint position = 0 ); - void addSources( K3bAudioTrack* tqparent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 ); + void addSources( K3bAudioTrack* parent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 ); void removeTrack( K3bAudioTrack* ); void moveTrack( K3bAudioTrack* track, K3bAudioTrack* after ); diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp index 0a385e9..ba0692f 100644 --- a/libk3b/projects/audiocd/k3baudioimager.cpp +++ b/libk3b/projects/audiocd/k3baudioimager.cpp @@ -167,8 +167,8 @@ void K3bAudioImager::WorkThread::cancel() -K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ), +K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ), m_doc(doc) { m_thread = new WorkThread(doc); diff --git a/libk3b/projects/audiocd/k3baudioimager.h b/libk3b/projects/audiocd/k3baudioimager.h index bfa1d83..fae29e5 100644 --- a/libk3b/projects/audiocd/k3baudioimager.h +++ b/libk3b/projects/audiocd/k3baudioimager.h @@ -26,7 +26,7 @@ class K3bAudioImager : public K3bThreadJob TQ_OBJECT public: - K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioImager(); /** diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp index ddf15a3..a03a218 100644 --- a/libk3b/projects/audiocd/k3baudiojob.cpp +++ b/libk3b/projects/audiocd/k3baudiojob.cpp @@ -92,8 +92,8 @@ class K3bAudioJob::Private }; -K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_doc( doc ), m_normalizeJob(0), m_maxSpeedJob(0) diff --git a/libk3b/projects/audiocd/k3baudiojob.h b/libk3b/projects/audiocd/k3baudiojob.h index 309d3f3..22b527b 100644 --- a/libk3b/projects/audiocd/k3baudiojob.h +++ b/libk3b/projects/audiocd/k3baudiojob.h @@ -41,7 +41,7 @@ class K3bAudioJob : public K3bBurnJob TQ_OBJECT public: - K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, TQObject* parent = 0 ); ~K3bAudioJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp index 538d454..abbf753 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp @@ -43,8 +43,8 @@ public: }; -K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private( doc ); } diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.h b/libk3b/projects/audiocd/k3baudiojobtempdata.h index 62bc7e7..1291683 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.h +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.h @@ -31,7 +31,7 @@ class K3bAudioJobTempData : public TQObject TQ_OBJECT public: - K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioJobTempData(); const TQString& bufferFileName( int track ); diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp index cde09c9..2f8713b 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp @@ -203,8 +203,8 @@ int K3bAudioMaxSpeedJob::WorkThread::maxSpeedByMedia() const -K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ) +K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ) { m_thread = new WorkThread( doc ); setThread( m_thread ); diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h index 9526d4a..cb7f820 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h @@ -27,7 +27,7 @@ class K3bAudioMaxSpeedJob : public K3bThreadJob TQ_OBJECT public: - K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioMaxSpeedJob(); /** diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index 88c769b..52afb5e 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -23,8 +23,8 @@ #include -K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bJob( hdl, tqparent, name ), +K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bJob( hdl, parent, name ), m_process(0) { } diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h index b623a41..eeff0ae 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.h +++ b/libk3b/projects/audiocd/k3baudionormalizejob.h @@ -32,7 +32,7 @@ class K3bAudioNormalizeJob : public K3bJob TQ_OBJECT public: - K3bAudioNormalizeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioNormalizeJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioNormalizeJob(); public slots: diff --git a/libk3b/projects/audiocd/k3baudiotrack.cpp b/libk3b/projects/audiocd/k3baudiotrack.cpp index 53d1d34..5f133a4 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.cpp +++ b/libk3b/projects/audiocd/k3baudiotrack.cpp @@ -59,8 +59,8 @@ K3bAudioTrack::K3bAudioTrack() } -K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* tqparent ) - : m_parent(tqparent), +K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* parent ) + : m_parent(parent), m_copy(false), m_preEmp(false), m_index0Offset(150), @@ -282,7 +282,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track ) kdDebug() << "(K3bAudioTrack::moveAfter( " << track << " )" << endl; if( !track ) { if( !doc() ) { - kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl; + kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl; return; } @@ -302,7 +302,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track ) // remove this from the list take(); - // set the new tqparent doc + // set the new parent doc m_parent = track->doc(); K3bAudioTrack* oldNext = track->m_next; @@ -330,7 +330,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track ) { if( !track ) { if( !doc() ) { - kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl; + kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl; return; } @@ -350,7 +350,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track ) // remove this from the list take(); - // set the new tqparent doc + // set the new parent doc m_parent = track->doc(); K3bAudioTrack* oldPrev = track->m_prev; @@ -568,7 +568,7 @@ K3bAudioTrack* K3bAudioTrack::split( const K3b::Msf& pos ) splitTrack->addSource( addSource ); } - kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with tqparent " << doc() << endl; + kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with parent " << doc() << endl; splitTrack->moveAfter( this ); return splitTrack; diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h index 0edef0a..410b1f0 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.h +++ b/libk3b/projects/audiocd/k3baudiotrack.h @@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bAudioTrack public: K3bAudioTrack(); - K3bAudioTrack( K3bAudioDoc* tqparent ); + K3bAudioTrack( K3bAudioDoc* parent ); ~K3bAudioTrack(); K3bAudioDoc* doc() const { return m_parent; } diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index 14a78a4..2c4fa51 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -67,8 +67,8 @@ * \li or create your own K3bDirItems and K3bFileItems. The doc will be properly updated * by the constructors of the items. */ -K3bDataDoc::K3bDataDoc( TQObject* tqparent ) - : K3bDoc( tqparent ) +K3bDataDoc::K3bDataDoc( TQObject* parent ) + : K3bDoc( parent ) { m_root = 0; @@ -219,9 +219,9 @@ bool K3bDataDoc::nameAlreadyInDir( const TQString& name, K3bDirItem* dir ) } -K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* tqparent ) +K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* parent ) { - K3bDirItem* item = new K3bDirItem( name, this, tqparent ); + K3bDirItem* item = new K3bDirItem( name, this, parent ); setModified( true ); @@ -332,7 +332,7 @@ bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem ) // file we create a default one here. // if( !m_bootImages.isEmpty() && !m_bootCataloge ) - createBootCatalogeItem( m_bootImages.first()->tqparent() ); + createBootCatalogeItem( m_bootImages.first()->parent() ); informAboutNotFoundFiles(); @@ -511,7 +511,7 @@ bool K3bDataDoc::loadDocumentDataHeader( TQDomElement headerElem ) } -bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) +bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* parent ) { K3bDataItem* newItem = 0; @@ -535,7 +535,7 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) else if( !elem.attribute( "bootimage" ).isEmpty() ) { K3bBootItem* bootItem = new K3bBootItem( urlElem.text(), this, - tqparent, + parent, elem.attributeNode( "name" ).value() ); if( elem.attribute( "bootimage" ) == "floppy" ) bootItem->setImageType( K3bBootItem::FLOPPY ); @@ -554,18 +554,18 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) else { newItem = new K3bFileItem( urlElem.text(), this, - tqparent, + parent, elem.attributeNode( "name" ).value() ); } } else if( elem.nodeName() == "special" ) { if( elem.attributeNode( "type" ).value() == "boot cataloge" ) - createBootCatalogeItem( tqparent )->setK3bName( elem.attributeNode( "name" ).value() ); + createBootCatalogeItem( parent )->setK3bName( elem.attributeNode( "name" ).value() ); } else if( elem.nodeName() == "directory" ) { // This is for the VideoDVD project which already contains the *_TS folders K3bDirItem* newDirItem = 0; - if( K3bDataItem* item = tqparent->find( elem.attributeNode( "name" ).value() ) ) { + if( K3bDataItem* item = parent->find( elem.attributeNode( "name" ).value() ) ) { if( item->isDir() ) { newDirItem = static_cast(item); } @@ -576,7 +576,7 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) } if( !newDirItem ) - newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, tqparent ); + newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, parent ); TQDomNodeList childNodes = elem.childNodes(); for( uint i = 0; i < childNodes.count(); i++ ) { @@ -835,7 +835,7 @@ void K3bDataDoc::saveDocumentDataHeader( TQDomElement& headerElem ) } -void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ) +void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* parent ) { if( K3bFileItem* fileItem = dynamic_cast( item ) ) { if( m_oldSession.contains( fileItem ) ) { @@ -851,7 +851,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme if( item->sortWeight() != 0 ) topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) ); - tqparent->appendChild( topElem ); + parent->appendChild( topElem ); // add boot options as attributes to preserve compatibility to older K3b versions if( K3bBootItem* bootItem = dynamic_cast( fileItem ) ) { @@ -874,7 +874,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme topElem.setAttribute( "name", m_bootCataloge->k3bName() ); topElem.setAttribute( "type", "boot cataloge" ); - tqparent->appendChild( topElem ); + parent->appendChild( topElem ); } else if( K3bDirItem* dirItem = dynamic_cast( item ) ) { TQDomElement topElem = doc->createElement( "directory" ); @@ -888,7 +888,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme saveDataItem( it.current(), doc, &topElem ); } - tqparent->appendChild( topElem ); + parent->appendChild( topElem ); } } @@ -979,9 +979,9 @@ void K3bDataDoc::moveItems( TQPtrList itemList, K3bDirItem* newPare } -K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bDataJob( this, hdl, tqparent ); + return new K3bDataJob( this, hdl, parent ); } @@ -1211,7 +1211,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device ) } -void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* tqparent ) +void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* parent ) { Q_ASSERT(importDir); TQStringList entries = importDir->entries(); @@ -1220,7 +1220,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, for( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { const K3bIso9660Entry* entry = importDir->entry( *it ); - K3bDataItem* oldItem = tqparent->find( entry->name() ); + K3bDataItem* oldItem = parent->find( entry->name() ); if( entry->isDirectory() ) { K3bDirItem* dir = 0; if( oldItem && oldItem->isDir() ) { @@ -1230,7 +1230,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, // we overwrite without warning! if( oldItem ) removeItem( oldItem ); - dir = new K3bDirItem( entry->name(), this, tqparent ); + dir = new K3bDirItem( entry->name(), this, parent ); } dir->setRemoveable(false); @@ -1250,7 +1250,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, if( oldItem ) removeItem( oldItem ); - K3bSessionImportItem* item = new K3bSessionImportItem( file, this, tqparent ); + K3bSessionImportItem* item = new K3bSessionImportItem( file, this, parent ); item->setExtraInfo( i18n("From previous session") ); m_oldSession.append( item ); } diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h index eccbde9..ebb6507 100644 --- a/libk3b/projects/datacd/k3bdatadoc.h +++ b/libk3b/projects/datacd/k3bdatadoc.h @@ -64,7 +64,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc TQ_OBJECT public: - K3bDataDoc( TQObject* tqparent = 0 ); + K3bDataDoc( TQObject* parent = 0 ); virtual ~K3bDataDoc(); virtual int type() const { return DATA; } @@ -111,11 +111,11 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc void moveItem( K3bDataItem* item, K3bDirItem* newParent ); void moveItems( TQPtrList itemList, K3bDirItem* newParent ); - K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* tqparent ); + K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* parent ); TQString treatWhitespace( const TQString& ); - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent = 0 ); MultiSessionMode multiSessionMode() const { return m_multisessionMode; } void setMultiSessionMode( MultiSessionMode mode ); @@ -246,22 +246,22 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc private: void prepareFilenamesInDir( K3bDirItem* dir ); - void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* tqparent ); + void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* parent ); /** * used by K3bDirItem to inform about removed items. */ - void itemRemovedFromDir( K3bDirItem* tqparent, K3bDataItem* removedItem ); - void itemAddedToDir( K3bDirItem* tqparent, K3bDataItem* addedItem ); + void itemRemovedFromDir( K3bDirItem* parent, K3bDataItem* removedItem ); + void itemAddedToDir( K3bDirItem* parent, K3bDataItem* addedItem ); /** * load recursivly */ - bool loadDataItem( TQDomElement& e, K3bDirItem* tqparent ); + bool loadDataItem( TQDomElement& e, K3bDirItem* parent ); /** * save recursivly */ - void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ); + void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* parent ); void informAboutNotFoundFiles(); diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp index b2df008..f5ce21d 100644 --- a/libk3b/projects/datacd/k3bdataitem.cpp +++ b/libk3b/projects/datacd/k3bdataitem.cpp @@ -29,7 +29,7 @@ public: }; -K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags ) +K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags ) : m_bHideOnRockRidge(false), m_bHideOnJoliet(false), m_bRemoveable(true), @@ -45,8 +45,8 @@ K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags ) m_doc = doc; m_bHideOnRockRidge = m_bHideOnJoliet = false; - if( tqparent ) - m_parentDir = tqparent->getDirItem(); + if( parent ) + m_parentDir = parent->getDirItem(); else m_parentDir = 0; } @@ -121,8 +121,8 @@ void K3bDataItem::setK3bName( const TQString& name ) { return; } - if( tqparent() ) { - K3bDataItem* item = tqparent()->find( name ); + if( parent() ) { + K3bDataItem* item = parent()->find( name ); if( item && item != this ) { kdDebug() << "(K3bDataItem) item with that name already exists." << endl; return; @@ -143,8 +143,8 @@ const TQString& K3bDataItem::k3bName() const K3bDataItem* K3bDataItem::take() { - if( tqparent() ) - tqparent()->takeDataItem( this ); + if( parent() ) + parent()->takeDataItem( this ); return this; } @@ -153,7 +153,7 @@ K3bDataItem* K3bDataItem::take() TQString K3bDataItem::k3bPath() const { if( !getParent() ) - return TQString(); // the root item is the only one not having a tqparent + return TQString(); // the root item is the only one not having a parent else if( isDir() ) return getParent()->k3bPath() + k3bName() + "/"; else @@ -164,7 +164,7 @@ TQString K3bDataItem::k3bPath() const TQString K3bDataItem::writtenPath() const { if( !getParent() ) - return TQString(); // the root item is the only one not having a tqparent + return TQString(); // the root item is the only one not having a parent else if( isDir() ) return getParent()->writtenPath() + writtenName() + "/"; else @@ -175,7 +175,7 @@ TQString K3bDataItem::writtenPath() const TQString K3bDataItem::iso9660Path() const { if( !getParent() ) - return TQString(); // the root item is the only one not having a tqparent + return TQString(); // the root item is the only one not having a parent else if( isDir() ) return getParent()->iso9660Path() + iso9660Name() + "/"; else @@ -232,7 +232,7 @@ bool K3bDataItem::hideOnJoliet() const void K3bDataItem::setHideOnRockRidge( bool b ) { // there is no use in changing the value if - // it is already set by the tqparent + // it is already set by the parent if( ( !getParent() || !getParent()->hideOnRockRidge() ) && b != m_bHideOnRockRidge ) { m_bHideOnRockRidge = b; @@ -245,7 +245,7 @@ void K3bDataItem::setHideOnRockRidge( bool b ) void K3bDataItem::setHideOnJoliet( bool b ) { // there is no use in changing the value if - // it is already set by the tqparent + // it is already set by the parent if( ( !getParent() || !getParent()->hideOnJoliet() ) && b != m_bHideOnJoliet ) { m_bHideOnJoliet = b; diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h index db7452b..043a0d5 100644 --- a/libk3b/projects/datacd/k3bdataitem.h +++ b/libk3b/projects/datacd/k3bdataitem.h @@ -35,12 +35,12 @@ class K3bDataDoc; class LIBK3B_EXPORT K3bDataItem { public: - K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent = 0, int flags = 0 ); + K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent = 0, int flags = 0 ); /** * Default copy constructor. * - * The result is an exact copy except that no tqparent dir it set and, thus, also no doc. + * The result is an exact copy except that no parent dir it set and, thus, also no doc. */ K3bDataItem( const K3bDataItem& ); @@ -49,17 +49,17 @@ class LIBK3B_EXPORT K3bDataItem /** * Return an exact copy of this data item. * - * The result is an exact copy except that no tqparent dir it set and, thus, also no doc. + * The result is an exact copy except that no parent dir it set and, thus, also no doc. * * Implementations should use the default constructor. */ virtual K3bDataItem* copy() const = 0; - K3bDirItem* tqparent() { return m_parentDir; } + K3bDirItem* parent() { return m_parentDir; } K3bDirItem* getParent() const { return m_parentDir; } /** - * Remove this item from it's tqparent and return a pointer to it. + * Remove this item from it's parent and return a pointer to it. */ K3bDataItem* take(); @@ -133,7 +133,7 @@ class LIBK3B_EXPORT K3bDataItem virtual void reparent( K3bDirItem* ); // FIXME: use all these flags and make the isXXX methods - // non-virtual. Then move the tqparent()->addDataItem call + // non-virtual. Then move the parent()->addDataItem call // to the K3bDataItem constructor enum ItemFlags { DIR = 0x1, diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index abceb3a..0295e27 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -83,8 +83,8 @@ public: }; -K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ) +K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ) { d = new Private; diff --git a/libk3b/projects/datacd/k3bdatajob.h b/libk3b/projects/datacd/k3bdatajob.h index a55e2d9..2604f47 100644 --- a/libk3b/projects/datacd/k3bdatajob.h +++ b/libk3b/projects/datacd/k3bdatajob.h @@ -43,7 +43,7 @@ class K3bDataJob : public K3bBurnJob TQ_OBJECT public: - K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* parent = 0 ); virtual ~K3bDataJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp index d9d4893..e562541 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp +++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp @@ -149,8 +149,8 @@ static TQString createItemsString( const TQValueList& items, unsig } -K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bJob( hdl, tqparent ) +K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bJob( hdl, parent ) { d = new Private( doc ); d->threadJob = new K3bThreadJob( d, this, this ); diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.h b/libk3b/projects/datacd/k3bdatapreparationjob.h index 3ac7d7d..e705d06 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.h +++ b/libk3b/projects/datacd/k3bdatapreparationjob.h @@ -32,7 +32,7 @@ class K3bDataPreparationJob : public K3bJob TQ_OBJECT public: - K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ); + K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ); ~K3bDataPreparationJob(); bool hasBeenCanceled() const; diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp index 16627c7..72af70b 100644 --- a/libk3b/projects/datacd/k3bdiritem.cpp +++ b/libk3b/projects/datacd/k3bdiritem.cpp @@ -37,8 +37,8 @@ K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* parent m_k3bName = name; // add automagically like a qlistviewitem - if( tqparent() ) - tqparent()->addDataItem( this ); + if( parent() ) + parent()->addDataItem( this ); } @@ -106,7 +106,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) int cnt = 1; while( K3bDataItem* oldItem = find( name ) ) { if( !oldItem->isDir() && oldItem->isFromOldSession() ) { - // in this case we remove this item from it's tqparent and save it in the new one + // in this case we remove this item from it's parent and save it in the new one // to be able to recover it oldItem->take(); static_cast(oldItem)->setReplaceItem( static_cast(item) ); @@ -238,8 +238,8 @@ bool K3bDirItem::mkdir( const TQString& dirPath ) // An absolut path always starts at the root item // if( dirPath[0] == '/' ) { - if( tqparent() ) - return tqparent()->mkdir( dirPath ); + if( parent() ) + return parent()->mkdir( dirPath ); else return mkdir( dirPath.mid( 1 ) ); } @@ -294,12 +294,12 @@ bool K3bDirItem::isSubItem( K3bDataItem* item ) const if( dynamic_cast(item) == this ) return true; - K3bDirItem* d = item->tqparent(); + K3bDirItem* d = item->parent(); while( d ) { if( d == this ) { return true; } - d = d->tqparent(); + d = d->parent(); } return false; @@ -349,16 +349,16 @@ void K3bDirItem::updateSize( K3bDataItem* item, bool removed ) } } - if( tqparent() ) - tqparent()->updateSize( item, removed ); + if( parent() ) + parent()->updateSize( item, removed ); } void K3bDirItem::updateFiles( long files, long dirs ) { m_files += files; m_dirs += dirs; - if( tqparent() ) - tqparent()->updateFiles( files, dirs ); + if( parent() ) + parent()->updateFiles( files, dirs ); } diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index 7ec0fba..304cf1a 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem /** * Default copy constructor. Copies the dir including all tqchildren. However, none of the - * tqchildren will have set a doc and the copy dir will not have set a tqparent dir. + * tqchildren will have set a doc and the copy dir will not have set a parent dir. */ K3bDirItem( const K3bDirItem& ); @@ -111,7 +111,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem private: /** * this recursivly updates the size of the directories. - * The size of this dir and the tqparent dir is updated. + * The size of this dir and the parent dir is updated. * These values are just used for user information. */ void updateSize( K3bDataItem*, bool removed = false ); diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp index c6c7bb4..7cabec8 100644 --- a/libk3b/projects/datacd/k3bfileitem.cpp +++ b/libk3b/projects/datacd/k3bfileitem.cpp @@ -113,8 +113,8 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem* } // add automagically like a qlistviewitem - if( tqparent() ) - tqparent()->addDataItem( this ); + if( parent() ) + parent()->addDataItem( this ); } @@ -151,8 +151,8 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat, m_sizeFollowed = m_size; } - if( tqparent() ) - tqparent()->addDataItem( this ); + if( parent() ) + parent()->addDataItem( this ); } @@ -267,7 +267,7 @@ bool K3bFileItem::isValid() const } else if( tokens[i] == ".." ) { // change the directory - dir = dir->tqparent(); + dir = dir->parent(); if( dir == 0 ) return false; } diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h index e758d95..46e2930 100644 --- a/libk3b/projects/datacd/k3bfileitem.h +++ b/libk3b/projects/datacd/k3bfileitem.h @@ -53,7 +53,7 @@ public: /** * Default copy constructor * Creates a copy of the fileitem. The copy, however, is not an exact duplicate of this item. - * The copy does not have a tqparent dir set and any old session items are set to 0. + * The copy does not have a parent dir set and any old session items are set to 0. */ K3bFileItem( const K3bFileItem& ); diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index e511a30..1db1997 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -85,8 +85,8 @@ public: }; -K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bJob( hdl, tqparent, name ), +K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bJob( hdl, parent, name ), m_pathSpecFile(0), m_rrHideFile(0), m_jolietHideFile(0), diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h index 446fef8..1208be3 100644 --- a/libk3b/projects/datacd/k3bisoimager.h +++ b/libk3b/projects/datacd/k3bisoimager.h @@ -39,7 +39,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler TQ_OBJECT public: - K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); virtual ~K3bIsoImager(); virtual bool active() const; diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index a799374..e6d07e8 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -30,8 +30,8 @@ #include -K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_process(0), m_device(0), m_dvd(false) diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h index da609cb..7a56f9f 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.h +++ b/libk3b/projects/datacd/k3bmsinfofetcher.h @@ -30,7 +30,7 @@ class K3bMsInfoFetcher : public K3bJob TQ_OBJECT public: - K3bMsInfoFetcher( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bMsInfoFetcher( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bMsInfoFetcher(); const TQString& msInfo() const { return m_msInfo; } diff --git a/libk3b/projects/datacd/k3bsessionimportitem.cpp b/libk3b/projects/datacd/k3bsessionimportitem.cpp index 92b52e4..35f7936 100644 --- a/libk3b/projects/datacd/k3bsessionimportitem.cpp +++ b/libk3b/projects/datacd/k3bsessionimportitem.cpp @@ -29,8 +29,8 @@ K3bSessionImportItem::K3bSessionImportItem( const K3bIso9660File* isoF, K3bDataD setK3bName( isoF->name() ); // add automagically like a qlistviewitem - if( tqparent() ) - tqparent()->addDataItem( this ); + if( parent() ) + parent()->addDataItem( this ); } @@ -48,8 +48,8 @@ K3bSessionImportItem::~K3bSessionImportItem() m_replaceItem->setReplacedItemFromOldSession(0); // remove this from parentdir - if( tqparent() ) - tqparent()->takeDataItem( this ); + if( parent() ) + parent()->takeDataItem( this ); } diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h index c8b7937..1dc3bb7 100644 --- a/libk3b/projects/datacd/k3bspecialdataitem.h +++ b/libk3b/projects/datacd/k3bspecialdataitem.h @@ -29,15 +29,15 @@ class K3bSpecialDataItem : public K3bDataItem { public: - K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* tqparent = 0, const TQString& k3bName = TQString() ) - : K3bDataItem( doc, tqparent ), + K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* parent = 0, const TQString& k3bName = TQString() ) + : K3bDataItem( doc, parent ), m_size( size ) { setK3bName( k3bName ); // add automagically like a qlistviewitem - if( tqparent ) - tqparent->addDataItem( this ); + if( parent ) + parent->addDataItem( this ); } K3bSpecialDataItem( const K3bSpecialDataItem& item ) @@ -48,8 +48,8 @@ class K3bSpecialDataItem : public K3bDataItem ~K3bSpecialDataItem() { // remove this from parentdir - if( tqparent() ) - tqparent()->takeDataItem( this ); + if( parent() ) + parent()->takeDataItem( this ); } K3bDataItem* copy() const { diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp index 795a314..2526b28 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp @@ -61,8 +61,8 @@ public: }; -K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_action(0) { d = new Private; diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h index 6605007..4ede94e 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h @@ -37,7 +37,7 @@ class K3bDvdBooktypeJob : public K3bJob TQ_OBJECT public: - K3bDvdBooktypeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bDvdBooktypeJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bDvdBooktypeJob(); TQString jobDescription() const; diff --git a/libk3b/projects/datadvd/k3bdvddoc.cpp b/libk3b/projects/datadvd/k3bdvddoc.cpp index 2d6ae46..2f8a87f 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.cpp +++ b/libk3b/projects/datadvd/k3bdvddoc.cpp @@ -22,8 +22,8 @@ #include -K3bDvdDoc::K3bDvdDoc( TQObject* tqparent ) - : K3bDataDoc( tqparent ) +K3bDvdDoc::K3bDvdDoc( TQObject* parent ) + : K3bDataDoc( parent ) { } @@ -31,9 +31,9 @@ K3bDvdDoc::~K3bDvdDoc() { } -K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bDvdJob( this, hdl, tqparent ); + return new K3bDvdJob( this, hdl, parent ); } //#include "k3bdvddoc.moc" diff --git a/libk3b/projects/datadvd/k3bdvddoc.h b/libk3b/projects/datadvd/k3bdvddoc.h index 20b039e..ff3ebbf 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.h +++ b/libk3b/projects/datadvd/k3bdvddoc.h @@ -23,12 +23,12 @@ class KConfig; class LIBK3B_EXPORT K3bDvdDoc : public K3bDataDoc { public: - K3bDvdDoc( TQObject* tqparent = 0 ); + K3bDvdDoc( TQObject* parent = 0 ); virtual ~K3bDvdDoc(); virtual int type() const { return DVD; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent = 0 ); protected: virtual TQString typeString() const { return "dvd"; } diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp index d8bb75c..4a4adcb 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.cpp +++ b/libk3b/projects/datadvd/k3bdvdjob.cpp @@ -39,8 +39,8 @@ public: }; -K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bDataJob( doc, hdl, tqparent ), +K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bDataJob( doc, hdl, parent ), m_doc( doc ) { d = new Private(); diff --git a/libk3b/projects/datadvd/k3bdvdjob.h b/libk3b/projects/datadvd/k3bdvdjob.h index 3bdf7b6..99b1176 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.h +++ b/libk3b/projects/datadvd/k3bdvdjob.h @@ -34,7 +34,7 @@ class K3bDvdJob : public K3bDataJob /** * To be more flexible we allow writing of any data doc */ - K3bDvdJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bDvdJob( K3bDataDoc*, K3bJobHandler*, TQObject* parent = 0 ); virtual ~K3bDvdJob(); virtual TQString jobDescription() const; diff --git a/libk3b/projects/datadvd/k3bdvdview.cpp b/libk3b/projects/datadvd/k3bdvdview.cpp index dc5f67a..c245e04 100644 --- a/libk3b/projects/datadvd/k3bdvdview.cpp +++ b/libk3b/projects/datadvd/k3bdvdview.cpp @@ -22,8 +22,8 @@ #include -K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bDataView( doc, tqparent, name ) +K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *parent, const char *name ) + : K3bDataView( doc, parent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView() } -K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bDvdBurnDialog( m_doc, tqparent, name, true ); + return new K3bDvdBurnDialog( m_doc, parent, name, true ); } #include "k3bdvdview.moc" diff --git a/libk3b/projects/datadvd/k3bdvdview.h b/libk3b/projects/datadvd/k3bdvdview.h index 1072cc2..5d2b6ad 100644 --- a/libk3b/projects/datadvd/k3bdvdview.h +++ b/libk3b/projects/datadvd/k3bdvdview.h @@ -28,11 +28,11 @@ class K3bDvdView : public K3bDataView TQ_OBJECT public: - K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); + K3bDvdView( K3bDvdDoc* doc, TQWidget *parent = 0, const char *name = 0 ); ~K3bDvdView(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private: K3bDvdDoc* m_doc; diff --git a/libk3b/projects/k3babstractwriter.cpp b/libk3b/projects/k3babstractwriter.cpp index 61d2ac6..e911a2f 100644 --- a/libk3b/projects/k3babstractwriter.cpp +++ b/libk3b/projects/k3babstractwriter.cpp @@ -26,8 +26,8 @@ -K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_burnDevice(dev), m_burnSpeed(1), m_simulate(false), diff --git a/libk3b/projects/k3babstractwriter.h b/libk3b/projects/k3babstractwriter.h index b6f4e1d..53d1841 100644 --- a/libk3b/projects/k3babstractwriter.h +++ b/libk3b/projects/k3babstractwriter.h @@ -74,7 +74,7 @@ class K3bAbstractWriter : public K3bJob protected: K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); bool wasSourceUnreadable() const { return m_sourceUnreadable; } diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index 9472079..5d0f780 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -124,8 +124,8 @@ public: K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - TQObject* tqparent, const char* name ) - : K3bAbstractWriter( dev, hdl, tqparent, name ), + TQObject* parent, const char* name ) + : K3bAbstractWriter( dev, hdl, parent, name ), m_command(WRITE), m_blankMode(MINIMAL), m_sourceDevice(0), diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h index 704125d..5a54abb 100644 --- a/libk3b/projects/k3bcdrdaowriter.h +++ b/libk3b/projects/k3bcdrdaowriter.h @@ -41,7 +41,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter enum SubMode { None, RW, RW_RAW }; K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler*, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); ~K3bCdrdaoWriter(); /** diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp index e42c977..acc1d2d 100644 --- a/libk3b/projects/k3bcdrecordwriter.cpp +++ b/libk3b/projects/k3bcdrecordwriter.cpp @@ -66,8 +66,8 @@ public: K3bCdrecordWriter::K3bCdrecordWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - TQObject* tqparent, const char* name ) - : K3bAbstractWriter( dev, hdl, tqparent, name ), + TQObject* parent, const char* name ) + : K3bAbstractWriter( dev, hdl, parent, name ), m_clone(false), m_cue(false), m_forceNoEject(false) diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h index 6bb9792..a949034 100644 --- a/libk3b/projects/k3bcdrecordwriter.h +++ b/libk3b/projects/k3bcdrecordwriter.h @@ -35,7 +35,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter public: K3bCdrecordWriter( K3bDevice::Device*, K3bJobHandler* hdl, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); ~K3bCdrecordWriter(); bool active() const; diff --git a/libk3b/projects/k3bdoc.cpp b/libk3b/projects/k3bdoc.cpp index 29648a7..ee70921 100644 --- a/libk3b/projects/k3bdoc.cpp +++ b/libk3b/projects/k3bdoc.cpp @@ -40,8 +40,8 @@ #include -K3bDoc::K3bDoc( TQObject* tqparent ) - : TQObject( tqparent ), +K3bDoc::K3bDoc( TQObject* parent ) + : TQObject( parent ), m_modified(false), m_view(0) { diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index 1cdde4f..a77a5b8 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -155,7 +155,7 @@ class LIBK3B_EXPORT K3bDoc : public TQObject * easier this way since you don't need to distinguish between the different * project types. */ - virtual K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ) = 0; + virtual K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* parent = 0 ) = 0; int writingApp() const { return m_writingApp; } void setWritingApp( int a ) { m_writingApp = a; } diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp index ae33599..a7b8db7 100644 --- a/libk3b/projects/k3bdvdrecordwriter.cpp +++ b/libk3b/projects/k3bdvdrecordwriter.cpp @@ -26,8 +26,8 @@ #include -K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* tqparent, const char* name ) - : K3bCdrecordWriter( dev, tqparent, name ) +K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* parent, const char* name ) + : K3bCdrecordWriter( dev, parent, name ) { } diff --git a/libk3b/projects/k3bdvdrecordwriter.h b/libk3b/projects/k3bdvdrecordwriter.h index 02421bb..97b5d16 100644 --- a/libk3b/projects/k3bdvdrecordwriter.h +++ b/libk3b/projects/k3bdvdrecordwriter.h @@ -31,7 +31,7 @@ class K3bDvdrecordWriter : public K3bCdrecordWriter TQ_OBJECT public: - K3bDvdrecordWriter( K3bDevice::Device*, TQObject* tqparent = 0, const char* name = 0 ); + K3bDvdrecordWriter( K3bDevice::Device*, TQObject* parent = 0, const char* name = 0 ); ~K3bDvdrecordWriter(); protected: diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp index a91d5c6..fabaaed 100644 --- a/libk3b/projects/k3bgrowisofshandler.cpp +++ b/libk3b/projects/k3bgrowisofshandler.cpp @@ -39,8 +39,8 @@ public: }; -K3bGrowisofsHandler::K3bGrowisofsHandler( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bGrowisofsHandler::K3bGrowisofsHandler( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private; reset(); diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h index 5243ebc..7150fce 100644 --- a/libk3b/projects/k3bgrowisofshandler.h +++ b/libk3b/projects/k3bgrowisofshandler.h @@ -35,7 +35,7 @@ class K3bGrowisofsHandler : public TQObject TQ_OBJECT public: - K3bGrowisofsHandler( TQObject* tqparent = 0, const char* name = 0 ); + K3bGrowisofsHandler( TQObject* parent = 0, const char* name = 0 ); ~K3bGrowisofsHandler(); enum ErrorType { diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp index 5af4599..2881036 100644 --- a/libk3b/projects/k3bgrowisofswriter.cpp +++ b/libk3b/projects/k3bgrowisofswriter.cpp @@ -97,8 +97,8 @@ public: K3bGrowisofsWriter::K3bGrowisofsWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - TQObject* tqparent, const char* name ) - : K3bAbstractWriter( dev, hdl, tqparent, name ) + TQObject* parent, const char* name ) + : K3bAbstractWriter( dev, hdl, parent, name ) { d = new Private; d->speedEst = new K3bThroughputEstimator( this ); diff --git a/libk3b/projects/k3bgrowisofswriter.h b/libk3b/projects/k3bgrowisofswriter.h index b65b894..b7254dc 100644 --- a/libk3b/projects/k3bgrowisofswriter.h +++ b/libk3b/projects/k3bgrowisofswriter.h @@ -34,7 +34,7 @@ class K3bGrowisofsWriter : public K3bAbstractWriter public: K3bGrowisofsWriter( K3bDevice::Device*, K3bJobHandler*, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); ~K3bGrowisofsWriter(); bool active() const; diff --git a/libk3b/projects/k3bpipebuffer.cpp b/libk3b/projects/k3bpipebuffer.cpp index 4dbfd38..8e689c0 100644 --- a/libk3b/projects/k3bpipebuffer.cpp +++ b/libk3b/projects/k3bpipebuffer.cpp @@ -221,8 +221,8 @@ public: }; -K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ) +K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ) { m_thread = new WorkThread(); setThread( m_thread ); diff --git a/libk3b/projects/k3bpipebuffer.h b/libk3b/projects/k3bpipebuffer.h index 7f6ad1b..86b7218 100644 --- a/libk3b/projects/k3bpipebuffer.h +++ b/libk3b/projects/k3bpipebuffer.h @@ -25,7 +25,7 @@ class K3bPipeBuffer : public K3bThreadJob { public: - K3bPipeBuffer( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bPipeBuffer( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bPipeBuffer(); /** diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index 2160581..8bd8eac 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -31,8 +31,8 @@ -K3bMixedDoc::K3bMixedDoc( TQObject* tqparent ) - : K3bDoc( tqparent ) +K3bMixedDoc::K3bMixedDoc( TQObject* parent ) + : K3bDoc( parent ) { m_dataDoc = new K3bDataDoc( this ); m_audioDoc = new K3bAudioDoc( this ); @@ -102,9 +102,9 @@ int K3bMixedDoc::numOfTracks() const } -K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bMixedJob( this, hdl, tqparent ); + return new K3bMixedJob( this, hdl, parent ); } diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h index b4ebc07..f1ef9d6 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.h +++ b/libk3b/projects/mixedcd/k3bmixeddoc.h @@ -36,7 +36,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc TQ_OBJECT public: - K3bMixedDoc( TQObject* tqparent = 0 ); + K3bMixedDoc( TQObject* parent = 0 ); ~K3bMixedDoc(); TQString name() const; @@ -51,7 +51,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc int numOfTracks() const; - K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ); + K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* parent = 0 ); K3bAudioDoc* audioDoc() const { return m_audioDoc; } K3bDataDoc* dataDoc() const { return m_dataDoc; } diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index 8fbe2ff..e99a1f9 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -95,8 +95,8 @@ public: }; -K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_doc( doc ), m_normalizeJob(0) { diff --git a/libk3b/projects/mixedcd/k3bmixedjob.h b/libk3b/projects/mixedcd/k3bmixedjob.h index a00a0ce..6feb9d6 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.h +++ b/libk3b/projects/mixedcd/k3bmixedjob.h @@ -43,7 +43,7 @@ class K3bMixedJob : public K3bBurnJob TQ_OBJECT public: - K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, TQObject* parent = 0 ); ~K3bMixedJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index d73e39a..cedf255 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -34,8 +34,8 @@ #include -K3bMovixDoc::K3bMovixDoc( TQObject* tqparent ) - : K3bDataDoc( tqparent ) +K3bMovixDoc::K3bMovixDoc( TQObject* parent ) + : K3bDataDoc( parent ) { connect( this, TQT_SIGNAL(itemRemoved(K3bDataItem*)), this, TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); @@ -47,9 +47,9 @@ K3bMovixDoc::~K3bMovixDoc() } -K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bMovixJob( this, hdl, tqparent ); + return new K3bMovixJob( this, hdl, parent ); } diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h index cd46dbf..90a4f1f 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.h +++ b/libk3b/projects/movixcd/k3bmovixdoc.h @@ -37,12 +37,12 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc TQ_OBJECT public: - K3bMovixDoc( TQObject* tqparent = 0 ); + K3bMovixDoc( TQObject* parent = 0 ); virtual ~K3bMovixDoc(); virtual int type() const { return MOVIX; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent ); bool newDocument(); diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 38d8f81..79c70b3 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -68,8 +68,8 @@ public: }; -K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ) +K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ) { d = new Private(); d->doc = doc; @@ -406,7 +406,7 @@ bool K3bMovixDocPreparer::addMovixFilesNew() // set the proper sort weight bootItem->setSortWeight( 200 ); - bootItem->tqparent()->setSortWeight( 100 ); + bootItem->parent()->setSortWeight( 100 ); } else if( fileName != "movixrc" ) { // we create our own movixrc K3bFileItem* item = createItem( filePath, docPath ); @@ -478,8 +478,8 @@ K3bDirItem* K3bMovixDocPreparer::createDir( const TQString& docPath ) // remember the dir to remove it if( dir != d->doc->root() ) { K3bDirItem* delDir = dir; - while( delDir->tqparent() != d->doc->root() ) - delDir = delDir->tqparent(); + while( delDir->parent() != d->doc->root() ) + delDir = delDir->parent(); if( d->newMovixItems.findRef( delDir ) == -1 ) d->newMovixItems.append( delDir ); } diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.h b/libk3b/projects/movixcd/k3bmovixdocpreparer.h index 8d4ba1e..4f1129c 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.h +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.h @@ -33,7 +33,7 @@ class K3bMovixDocPreparer : public K3bJob TQ_OBJECT public: - explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bMovixDocPreparer(); K3bMovixDoc* doc() const; diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.cpp b/libk3b/projects/movixcd/k3bmovixfileitem.cpp index 5242061..f727404 100644 --- a/libk3b/projects/movixcd/k3bmovixfileitem.cpp +++ b/libk3b/projects/movixcd/k3bmovixfileitem.cpp @@ -40,8 +40,8 @@ K3bMovixFileItem::~K3bMovixFileItem() // it is important to do it here and not // rely on the K3bFileItem destructor becasue // otherwise the doc is not informed early enough - if( tqparent() ) - tqparent()->takeDataItem( this ); + if( parent() ) + parent()->takeDataItem( this ); } diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp index 220a8da..8edcaae 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.cpp +++ b/libk3b/projects/movixcd/k3bmovixjob.cpp @@ -27,8 +27,8 @@ #include -K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) - : K3bBurnJob( jh, tqparent ), +K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* parent ) + : K3bBurnJob( jh, parent ), m_doc(doc) { m_dataJob = new K3bDataJob( doc, this, this ); diff --git a/libk3b/projects/movixcd/k3bmovixjob.h b/libk3b/projects/movixcd/k3bmovixjob.h index d1689f6..98338fa 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.h +++ b/libk3b/projects/movixcd/k3bmovixjob.h @@ -34,7 +34,7 @@ class K3bMovixJob : public K3bBurnJob TQ_OBJECT public: - K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, TQObject* parent = 0 ); ~K3bMovixJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp index d05c75a..1672043 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp @@ -19,8 +19,8 @@ #include -K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* tqparent ) - : K3bMovixDoc( tqparent ) +K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* parent ) + : K3bMovixDoc( parent ) { } @@ -28,9 +28,9 @@ K3bMovixDvdDoc::~K3bMovixDvdDoc() { } -K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bMovixDvdJob( this, hdl, tqparent ); + return new K3bMovixDvdJob( this, hdl, parent ); } #include "k3bmovixdvddoc.moc" diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.h b/libk3b/projects/movixdvd/k3bmovixdvddoc.h index cd19cc8..063423c 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.h +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.h @@ -27,12 +27,12 @@ class LIBK3B_EXPORT K3bMovixDvdDoc : public K3bMovixDoc TQ_OBJECT public: - K3bMovixDvdDoc( TQObject* tqparent = 0 ); + K3bMovixDvdDoc( TQObject* parent = 0 ); ~K3bMovixDvdDoc(); int type() const { return MOVIX_DVD; } - K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent ); protected: TQString typeString() const { return "movixdvd"; } diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp index d97f42a..362511f 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp @@ -27,8 +27,8 @@ #include -K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) - : K3bBurnJob( jh, tqparent ), +K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject* parent ) + : K3bBurnJob( jh, parent ), m_doc(doc) { m_dvdJob = new K3bDvdJob( doc, this, this ); diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.h b/libk3b/projects/movixdvd/k3bmovixdvdjob.h index a803b75..0d098be 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.h +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.h @@ -34,7 +34,7 @@ class K3bMovixDvdJob : public K3bBurnJob TQ_OBJECT public: - K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, TQObject* parent = 0 ); ~K3bMovixDvdJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index 1695353..a361d5d 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -49,8 +49,8 @@ bool print_progress = true; bool aspect_correction = false; byte forced_sequence_header = 0; -K3bVcdDoc::K3bVcdDoc( TQObject* tqparent ) - : K3bDoc( tqparent ) +K3bVcdDoc::K3bVcdDoc( TQObject* parent ) + : K3bDoc( parent ) { m_tracks = 0L; m_vcdOptions = new K3bVcdOptions(); @@ -395,9 +395,9 @@ TQString K3bVcdDoc::typeString() const } -K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bVcdJob( this, hdl, tqparent ); + return new K3bVcdJob( this, hdl, parent ); } void K3bVcdDoc::informAboutNotFoundFiles() diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h index 4f24200..1878c31 100644 --- a/libk3b/projects/videocd/k3bvcddoc.h +++ b/libk3b/projects/videocd/k3bvcddoc.h @@ -109,7 +109,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc KIO::filesize_t size() const; K3b::Msf length() const; - K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent ); K3bVcdOptions* vcdOptions() const { return m_vcdOptions; diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index bdeebec..662145c 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -43,8 +43,8 @@ #include #include -K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bBurnJob( jh, tqparent, name ) +K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bBurnJob( jh, parent, name ) { m_doc = doc; m_doc->setCopies( m_doc->dummy() || m_doc->onlyCreateImages() ? 1 : m_doc->copies() ); diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h index 96d9026..151c1b1 100644 --- a/libk3b/projects/videocd/k3bvcdjob.h +++ b/libk3b/projects/videocd/k3bvcdjob.h @@ -34,7 +34,7 @@ class K3bVcdJob : public K3bBurnJob TQ_OBJECT public: - K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bVcdJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index e3939cc..b008476 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -30,12 +30,12 @@ #include "k3bvcdtrack.h" #include -K3bVcdTrack::K3bVcdTrack( TQPtrList* tqparent, const TQString& filename ) +K3bVcdTrack::K3bVcdTrack( TQPtrList* parent, const TQString& filename ) : m_pbcnumkeys( true ), m_pbcnumkeysuserdefined( false ), m_file( filename ) { - m_parent = tqparent; + m_parent = parent; m_title = TQFileInfo( m_file ).baseName( true ); m_revreflist = new TQPtrList; @@ -67,7 +67,7 @@ int K3bVcdTrack::index() const { int i = m_parent->find( this ); if ( i < 0 ) - kdDebug() << "(K3bVcdTrack) I'm not part of my tqparent!" << endl; + kdDebug() << "(K3bVcdTrack) I'm not part of my parent!" << endl; return i; } diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index a06552e..c48be55 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -31,7 +31,7 @@ class LIBK3B_EXPORT K3bVcdTrack { public: - K3bVcdTrack( TQPtrList* tqparent, const TQString& filename ); + K3bVcdTrack( TQPtrList* parent, const TQString& filename ); ~K3bVcdTrack(); TQString fileName() const diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp index 0857013..203f54f 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.cpp +++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp @@ -245,16 +245,16 @@ bool K3bVcdXmlView::write( const TQString& fname ) return false; } -void K3bVcdXmlView::addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text ) +void K3bVcdXmlView::addComment( TQDomDocument& doc, TQDomElement& parent, const TQString& text ) { TQDomComment comment = doc.createComment( text ); - tqparent.appendChild( comment ); + parent.appendChild( comment ); } -TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const TQString& value ) +TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& parent, const TQString& name, const TQString& value ) { TQDomElement element = doc.createElement( name ); - tqparent.appendChild( element ); + parent.appendChild( element ); if ( !value.isNull() ) { TQDomText t = doc.createTextNode( value ); element.appendChild( t ); @@ -262,10 +262,10 @@ TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqp return element; } -TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const int& value ) +TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& parent, const TQString& name, const int& value ) { TQDomElement element = doc.createElement( name ); - tqparent.appendChild( element ); + parent.appendChild( element ); if ( value >= -1 ) { TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) ); element.appendChild( t ); @@ -273,17 +273,17 @@ TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqp return element; } -TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name ) +TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement& parent, const TQString& name ) { - TQDomElement elemFolder = addSubElement( doc, tqparent, "folder" ); + TQDomElement elemFolder = addSubElement( doc, parent, "folder" ); addSubElement( doc, elemFolder, "name", name ); return elemFolder; } -void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& src, const TQString& name, bool mixed ) +void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& parent, const TQString& src, const TQString& name, bool mixed ) { - TQDomElement elemFile = addSubElement( doc, tqparent, "file" ); + TQDomElement elemFile = addSubElement( doc, parent, "file" ); elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) ); if ( mixed ) elemFile.setAttribute( "format", "mixed" ); @@ -291,11 +291,11 @@ void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& tqparent, addSubElement( doc, elemFile, "name", name ); } -void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) +void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack* track ) { TQString ref = ( track->isSegment() ) ? "segment" : "sequence"; - TQDomElement elemSelection = addSubElement( doc, tqparent, "selection" ); + TQDomElement elemSelection = addSubElement( doc, parent, "selection" ); elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); setNumkeyBSN( doc, elemSelection, track ); @@ -374,7 +374,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTra setNumkeySEL( doc, elemSelection, track ); } -void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) +void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack* track ) { if ( track->PbcNumKeys() ) { if ( track->PbcNumKeysUserdefined() ) { @@ -387,18 +387,18 @@ void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& tqparent, K3 m_startkey = trackIt.key(); if ( m_startkey > 0 ) - addSubElement( doc, tqparent, "bsn", m_startkey ); + addSubElement( doc, parent, "bsn", m_startkey ); else // user has no numKeys defined for this track track->setPbcNumKeys( false ); } else { // default start with key #1 - addSubElement( doc, tqparent, "bsn", 1 ); + addSubElement( doc, parent, "bsn", 1 ); } } } -void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) +void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack* track ) { if ( track->PbcNumKeys() ) { TQDomElement elemPbcSelectionNumKeySEL; @@ -412,27 +412,27 @@ void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& tqparent, K3 kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl; while ( none < trackIt.key() ) { - elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); - addComment( doc, tqparent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) ); + addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) ); none++; } if ( trackIt.data() ) { TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence"; - elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + 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, tqparent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) ); + addComment( doc, parent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) ); } else { - elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" ); - addComment( doc, tqparent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) ); + addComment( doc, parent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) ); } none++; } } else { // default reference to itSelf - elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); } } diff --git a/libk3b/projects/videocd/k3bvcdxmlview.h b/libk3b/projects/videocd/k3bvcdxmlview.h index cce8341..6368dec 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.h +++ b/libk3b/projects/videocd/k3bvcdxmlview.h @@ -43,7 +43,7 @@ class K3bVcdXmlView private: TQString m_xmlstring; - void addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text ); + void addComment( TQDomDocument& doc, TQDomElement& parent, const TQString& text ); TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const TQString& value = TQString() ); TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const int& value ); diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.cpp b/libk3b/projects/videodvd/k3bvideodvddoc.cpp index f86830d..7ea3666 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.cpp +++ b/libk3b/projects/videodvd/k3bvideodvddoc.cpp @@ -24,8 +24,8 @@ #include -K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* tqparent ) - : K3bDvdDoc( tqparent ) +K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* parent ) + : K3bDvdDoc( parent ) { } @@ -63,9 +63,9 @@ bool K3bVideoDvdDoc::newDocument() } -K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bVideoDvdJob( this, hdl, tqparent ); + return new K3bVideoDvdJob( this, hdl, parent ); } //#include "k3bdvddoc.moc" diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.h b/libk3b/projects/videodvd/k3bvideodvddoc.h index cdfdfa7..e12ee07 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.h +++ b/libk3b/projects/videodvd/k3bvideodvddoc.h @@ -23,12 +23,12 @@ class KConfig; class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc { public: - K3bVideoDvdDoc( TQObject* tqparent = 0 ); + K3bVideoDvdDoc( TQObject* parent = 0 ); virtual ~K3bVideoDvdDoc(); virtual int type() const { return VIDEODVD; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent ); virtual bool newDocument(); diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp index 7ac82ee..f175779 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp @@ -42,8 +42,8 @@ public: }; -K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bIsoImager( doc, jh, tqparent, name ) +K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bIsoImager( doc, jh, parent, name ) { d = new Private; d->doc = doc; diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.h b/libk3b/projects/videodvd/k3bvideodvdimager.h index b1a9678..08f3c74 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.h +++ b/libk3b/projects/videodvd/k3bvideodvdimager.h @@ -35,7 +35,7 @@ class K3bVideoDvdImager : public K3bIsoImager TQ_OBJECT public: - K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); virtual ~K3bVideoDvdImager(); public slots: diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index b550379..194dff7 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -30,8 +30,8 @@ -K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) - : K3bDvdJob( doc, jh, tqparent ), +K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* parent ) + : K3bDvdJob( doc, jh, parent ), m_doc(doc) { } diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.h b/libk3b/projects/videodvd/k3bvideodvdjob.h index a1d079e..4c8628f 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.h +++ b/libk3b/projects/videodvd/k3bvideodvdjob.h @@ -31,7 +31,7 @@ class K3bVideoDvdJob : public K3bDvdJob TQ_OBJECT public: - K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, TQObject* parent = 0 ); virtual ~K3bVideoDvdJob(); virtual TQString jobDescription() const; diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp index 2f53629..a5f81e3 100644 --- a/libk3b/tools/k3bbusywidget.cpp +++ b/libk3b/tools/k3bbusywidget.cpp @@ -21,8 +21,8 @@ #include -K3bBusyWidget::K3bBusyWidget( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +K3bBusyWidget::K3bBusyWidget( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { m_busyTimer = new TQTimer( this ); m_iBusyPosition = 0; diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h index bc83c5e..7eb927e 100644 --- a/libk3b/tools/k3bbusywidget.h +++ b/libk3b/tools/k3bbusywidget.h @@ -30,7 +30,7 @@ class LIBK3B_EXPORT K3bBusyWidget : public TQFrame TQ_OBJECT public: - K3bBusyWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bBusyWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bBusyWidget(); void showBusy( bool b ); diff --git a/libk3b/tools/k3bcdtextvalidator.cpp b/libk3b/tools/k3bcdtextvalidator.cpp index 19e20d7..abd2fc5 100644 --- a/libk3b/tools/k3bcdtextvalidator.cpp +++ b/libk3b/tools/k3bcdtextvalidator.cpp @@ -16,8 +16,8 @@ #include "k3bcdtextvalidator.h" -K3bCdTextValidator::K3bCdTextValidator(TQObject *tqparent, const char *name) - : K3bLatin1Validator(tqparent, name) +K3bCdTextValidator::K3bCdTextValidator(TQObject *parent, const char *name) + : K3bLatin1Validator(parent, name) { } diff --git a/libk3b/tools/k3bcdtextvalidator.h b/libk3b/tools/k3bcdtextvalidator.h index e2d3983..896e712 100644 --- a/libk3b/tools/k3bcdtextvalidator.h +++ b/libk3b/tools/k3bcdtextvalidator.h @@ -24,7 +24,7 @@ class LIBK3B_EXPORT K3bCdTextValidator : public K3bLatin1Validator { public: - K3bCdTextValidator(TQObject *tqparent = 0, const char *name = 0); + K3bCdTextValidator(TQObject *parent = 0, const char *name = 0); ~K3bCdTextValidator(); State validate( TQString& input, int& pos ) const; diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp index c4b1d20..3536c24 100644 --- a/libk3b/tools/k3bcutcombobox.cpp +++ b/libk3b/tools/k3bcutcombobox.cpp @@ -41,16 +41,16 @@ public: }; -K3bCutComboBox::K3bCutComboBox( TQWidget* tqparent, const char* name ) - : KComboBox( tqparent, name ) +K3bCutComboBox::K3bCutComboBox( TQWidget* parent, const char* name ) + : KComboBox( parent, name ) { d = new Private(); // tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() ); } -K3bCutComboBox::K3bCutComboBox( int method, TQWidget* tqparent, const char* name ) - : KComboBox( tqparent, name ) +K3bCutComboBox::K3bCutComboBox( int method, TQWidget* parent, const char* name ) + : KComboBox( parent, name ) { d = new Private(); d->method = method; diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h index 19e4ef7..7bc8f70 100644 --- a/libk3b/tools/k3bcutcombobox.h +++ b/libk3b/tools/k3bcutcombobox.h @@ -38,8 +38,8 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox TQ_OBJECT public: - K3bCutComboBox( TQWidget* tqparent = 0, const char* name = 0 ); - K3bCutComboBox( int method, TQWidget* tqparent = 0, const char* name = 0 ); + K3bCutComboBox( TQWidget* parent = 0, const char* name = 0 ); + K3bCutComboBox( int method, TQWidget* parent = 0, const char* name = 0 ); virtual ~K3bCutComboBox(); enum Method { diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp index 4993e11..8d2870c 100644 --- a/libk3b/tools/k3bdevicecombobox.cpp +++ b/libk3b/tools/k3bdevicecombobox.cpp @@ -32,8 +32,8 @@ public: }; -K3bDeviceComboBox::K3bDeviceComboBox( TQWidget* tqparent, const char* name ) - : KComboBox( tqparent, name ) +K3bDeviceComboBox::K3bDeviceComboBox( TQWidget* parent, const char* name ) + : KComboBox( parent, name ) { d = new Private(); connect( this, TQT_SIGNAL(activated(int)), diff --git a/libk3b/tools/k3bdevicecombobox.h b/libk3b/tools/k3bdevicecombobox.h index 51b93ce..d427179 100644 --- a/libk3b/tools/k3bdevicecombobox.h +++ b/libk3b/tools/k3bdevicecombobox.h @@ -37,7 +37,7 @@ class LIBK3B_EXPORT K3bDeviceComboBox : public KComboBox TQ_OBJECT public: - K3bDeviceComboBox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDeviceComboBox( TQWidget* parent = 0, const char* name = 0 ); ~K3bDeviceComboBox(); K3bDevice::Device* selectedDevice() const; diff --git a/libk3b/tools/k3bdevicehandler.cpp b/libk3b/tools/k3bdevicehandler.cpp index 92fd2ff..daabe01 100644 --- a/libk3b/tools/k3bdevicehandler.cpp +++ b/libk3b/tools/k3bdevicehandler.cpp @@ -139,8 +139,8 @@ private: }; -K3bDevice::DeviceHandler::DeviceHandler( Device* dev, TQObject* tqparent, const char* name ) - : K3bThreadJob( 0, tqparent, name ), +K3bDevice::DeviceHandler::DeviceHandler( Device* dev, TQObject* parent, const char* name ) + : K3bThreadJob( 0, parent, name ), m_selfDelete(false) { m_thread = new DeviceHandlerThread(); @@ -149,8 +149,8 @@ K3bDevice::DeviceHandler::DeviceHandler( Device* dev, TQObject* tqparent, const } -K3bDevice::DeviceHandler::DeviceHandler( TQObject* tqparent, const char* name ) - : K3bThreadJob( 0, tqparent, name ), +K3bDevice::DeviceHandler::DeviceHandler( TQObject* parent, const char* name ) + : K3bThreadJob( 0, parent, name ), m_selfDelete(false) { m_thread = new DeviceHandlerThread(); diff --git a/libk3b/tools/k3bdevicehandler.h b/libk3b/tools/k3bdevicehandler.h index da26629..bd27294 100644 --- a/libk3b/tools/k3bdevicehandler.h +++ b/libk3b/tools/k3bdevicehandler.h @@ -50,8 +50,8 @@ namespace K3bDevice TQ_OBJECT public: - DeviceHandler( Device*, TQObject* tqparent = 0, const char* name = 0 ); - DeviceHandler( TQObject* tqparent = 0, const char* name = 0 ); + DeviceHandler( Device*, TQObject* parent = 0, const char* name = 0 ); + DeviceHandler( TQObject* parent = 0, const char* name = 0 ); /** * This constructor is used by the global "quick" methods and should not be used diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp index c4e03ee..0c6c3f4 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.cpp +++ b/libk3b/tools/k3bdeviceselectiondialog.cpp @@ -37,7 +37,7 @@ public: }; -K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( TQWidget* tqparent, +K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( TQWidget* parent, const char* name, const TQString& text, bool modal ) @@ -45,7 +45,7 @@ K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( TQWidget* tqparent, i18n("Device Selection"), Ok|Cancel, Ok, - tqparent, + parent, name, modal ) { @@ -94,7 +94,7 @@ void K3bDeviceSelectionDialog::setSelectedDevice( K3bDevice::Device* dev ) } -K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, +K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* parent, const TQPtrList& devices, const TQString& text ) { @@ -103,7 +103,7 @@ K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, if( devices.count() == 1 ) return devices.getFirst(); - K3bDeviceSelectionDialog dlg( tqparent, 0, text ); + K3bDeviceSelectionDialog dlg( parent, 0, text ); dlg.addDevices( devices ); if( dlg.exec() == Accepted ) @@ -112,18 +112,18 @@ K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, return 0; } -K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, +K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* parent, const TQString& text ) { - return selectDevice( tqparent, k3bcore->deviceManager()->allDevices(), text ); + return selectDevice( parent, k3bcore->deviceManager()->allDevices(), text ); } -K3bDevice::Device* K3bDeviceSelectionDialog::selectWriter( TQWidget* tqparent, const TQString& text ) +K3bDevice::Device* K3bDeviceSelectionDialog::selectWriter( TQWidget* parent, const TQString& text ) { - return selectDevice( tqparent, k3bcore->deviceManager()->burningDevices(), text ); + return selectDevice( parent, k3bcore->deviceManager()->burningDevices(), text ); } diff --git a/libk3b/tools/k3bdeviceselectiondialog.h b/libk3b/tools/k3bdeviceselectiondialog.h index 5295408..c4a4fdc 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.h +++ b/libk3b/tools/k3bdeviceselectiondialog.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bDeviceSelectionDialog : public KDialogBase TQ_OBJECT public: - K3bDeviceSelectionDialog( TQWidget* tqparent = 0, + K3bDeviceSelectionDialog( TQWidget* parent = 0, const char* name = 0, const TQString& text = TQString(), bool modal = false ); @@ -47,11 +47,11 @@ class LIBK3B_EXPORT K3bDeviceSelectionDialog : public KDialogBase K3bDevice::Device* selectedDevice() const; - static K3bDevice::Device* selectWriter( TQWidget* tqparent, + static K3bDevice::Device* selectWriter( TQWidget* parent, const TQString& text = TQString() ); - static K3bDevice::Device* selectDevice( TQWidget* tqparent, + static K3bDevice::Device* selectDevice( TQWidget* parent, const TQString& text = TQString() ); - static K3bDevice::Device* selectDevice( TQWidget* tqparent, + static K3bDevice::Device* selectDevice( TQWidget* parent, const TQPtrList& devices, const TQString& text = TQString() ); diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp index 51b28e8..cddf0e7 100644 --- a/libk3b/tools/k3bdirsizejob.cpp +++ b/libk3b/tools/k3bdirsizejob.cpp @@ -131,8 +131,8 @@ private: }; -K3bDirSizeJob::K3bDirSizeJob( TQObject* tqparent ) - : K3bThreadJob( new K3bSimpleJobHandler(), tqparent ) +K3bDirSizeJob::K3bDirSizeJob( TQObject* parent ) + : K3bThreadJob( new K3bSimpleJobHandler(), parent ) { d = new WorkThread; setThread( d ); diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h index 82c54d5..4b8ca7e 100644 --- a/libk3b/tools/k3bdirsizejob.h +++ b/libk3b/tools/k3bdirsizejob.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bDirSizeJob : public K3bThreadJob TQ_OBJECT public: - K3bDirSizeJob( TQObject* tqparent = 0 ); + K3bDirSizeJob( TQObject* parent = 0 ); ~K3bDirSizeJob(); KIO::filesize_t totalSize() const; diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp index c3db356..3dd9731 100644 --- a/libk3b/tools/k3bintmapcombobox.cpp +++ b/libk3b/tools/k3bintmapcombobox.cpp @@ -31,8 +31,8 @@ public: }; -K3bIntMapComboBox::K3bIntMapComboBox( TQWidget* tqparent, const char* name ) - : KComboBox( tqparent, name ) +K3bIntMapComboBox::K3bIntMapComboBox( TQWidget* parent, const char* name ) + : KComboBox( parent, name ) { d = new Private; connect( this, TQT_SIGNAL(highlighted(int)), diff --git a/libk3b/tools/k3bintmapcombobox.h b/libk3b/tools/k3bintmapcombobox.h index 622c202..f1da427 100644 --- a/libk3b/tools/k3bintmapcombobox.h +++ b/libk3b/tools/k3bintmapcombobox.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bIntMapComboBox : public KComboBox TQ_OBJECT public: - K3bIntMapComboBox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bIntMapComboBox( TQWidget* parent = 0, const char* name = 0 ); ~K3bIntMapComboBox(); int selectedValue() const; diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp index ed38088..725de5a 100644 --- a/libk3b/tools/k3bintvalidator.cpp +++ b/libk3b/tools/k3bintvalidator.cpp @@ -24,15 +24,15 @@ #include -K3bIntValidator::K3bIntValidator ( TQWidget * tqparent, const char * name ) - : TQValidator(TQT_TQOBJECT(tqparent), name) +K3bIntValidator::K3bIntValidator ( TQWidget * parent, const char * name ) + : TQValidator(TQT_TQOBJECT(parent), name) { m_min = m_max = 0; } -K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * tqparent, const char * name ) - : TQValidator(TQT_TQOBJECT(tqparent), name) +K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * parent, const char * name ) + : TQValidator(TQT_TQOBJECT(parent), name) { m_min = bottom; m_max = top; diff --git a/libk3b/tools/k3bintvalidator.h b/libk3b/tools/k3bintvalidator.h index 0945f89..ecb1a9e 100644 --- a/libk3b/tools/k3bintvalidator.h +++ b/libk3b/tools/k3bintvalidator.h @@ -34,12 +34,12 @@ class LIBK3B_EXPORT K3bIntValidator : public TQValidator /** * Constuctor. Also sets the base value. */ - K3bIntValidator ( TQWidget * tqparent, const char * name = 0 ); + K3bIntValidator ( TQWidget * parent, const char * name = 0 ); /** * Constructor. Also sets the minimum, maximum, and numeric base values. */ - K3bIntValidator ( int bottom, int top, TQWidget * tqparent, const char * name = 0 ); + K3bIntValidator ( int bottom, int top, TQWidget * parent, const char * name = 0 ); /** * Destructs the validator. diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index 4af4480..fb3be4b 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -97,70 +97,70 @@ public: -K3bListViewItem::K3bListViewItem(TQListView *tqparent) - : KListViewItem( tqparent ) +K3bListViewItem::K3bListViewItem(TQListView *parent) + : KListViewItem( parent ) { init(); } -K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent) - : KListViewItem( tqparent ) +K3bListViewItem::K3bListViewItem(TQListViewItem *parent) + : KListViewItem( parent ) { init(); } -K3bListViewItem::K3bListViewItem(TQListView *tqparent, TQListViewItem *after) - : KListViewItem( tqparent, after ) +K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after) + : KListViewItem( parent, after ) { init(); } -K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after) - : KListViewItem( tqparent, after ) +K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after) + : KListViewItem( parent, after ) { init(); } -K3bListViewItem::K3bListViewItem(TQListView *tqparent, +K3bListViewItem::K3bListViewItem(TQListView *parent, const TQString& s1, const TQString& s2, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( tqparent, s1, s2, s3, s4, s5, s6, s7, s8 ) + : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, +K3bListViewItem::K3bListViewItem(TQListViewItem *parent, const TQString& s1, const TQString& s2, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( tqparent, s1, s2, s3, s4, s5, s6, s7, s8 ) + : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(TQListView *tqparent, TQListViewItem *after, +K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after, const TQString& s1, const TQString& s2, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( tqparent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) + : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after, +K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after, const TQString& s1, const TQString& s2, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( tqparent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) + : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } @@ -461,29 +461,29 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i -K3bCheckListViewItem::K3bCheckListViewItem(TQListView *tqparent) - : K3bListViewItem( tqparent ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListView *parent) + : K3bListViewItem( parent ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *tqparent) - : K3bListViewItem( tqparent ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *parent) + : K3bListViewItem( parent ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(TQListView *tqparent, TQListViewItem *after) - : K3bListViewItem( tqparent, after ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListView *parent, TQListViewItem *after) + : K3bListViewItem( parent, after ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *tqparent, TQListViewItem *after) - : K3bListViewItem( tqparent, after ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *parent, TQListViewItem *after) + : K3bListViewItem( parent, after ), m_checked(false) { } @@ -545,8 +545,8 @@ public: }; -K3bListView::K3bListView( TQWidget* tqparent, const char* name ) - : KListView( tqparent, name ), +K3bListView::K3bListView( TQWidget* parent, const char* name ) + : KListView( parent, name ), m_noItemVMargin( 20 ), m_noItemHMargin( 20 ) { @@ -1210,8 +1210,8 @@ TQListViewItem* K3bListView::parentItem( TQListViewItem* item ) { if( !item ) return 0; - if( item->tqparent() ) - return item->tqparent(); + if( item->parent() ) + return item->parent(); else return K3bListView::parentItem( item->itemAbove() ); } @@ -1221,7 +1221,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList& items ) { // // Create drag pixmap. - // If there are too many items fade the pixmap using the tqmask + // If there are too many items fade the pixmap using the mask // always fade invisible items // int width = header()->width(); @@ -1245,7 +1245,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList& items ) KPixmap pix; pix.resize( width, height ); pix.fill( TQt::white ); - // TQBitmap tqmask( width, bottom-top ); + // TQBitmap mask( width, bottom-top ); // now paint all the visible items into the pixmap // FIXME: only paint the visible items diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h index 03daf00..6512052 100644 --- a/libk3b/tools/k3blistview.h +++ b/libk3b/tools/k3blistview.h @@ -42,30 +42,30 @@ class K3bListView; class LIBK3B_EXPORT K3bListViewItem : public KListViewItem { public: - K3bListViewItem(TQListView *tqparent); - K3bListViewItem(TQListViewItem *tqparent); - K3bListViewItem(TQListView *tqparent, TQListViewItem *after); - K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after); + K3bListViewItem(TQListView *parent); + K3bListViewItem(TQListViewItem *parent); + K3bListViewItem(TQListView *parent, TQListViewItem *after); + K3bListViewItem(TQListViewItem *parent, TQListViewItem *after); - K3bListViewItem(TQListView *tqparent, + K3bListViewItem(TQListView *parent, const TQString&, const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString()); - K3bListViewItem(TQListViewItem *tqparent, + K3bListViewItem(TQListViewItem *parent, const TQString&, const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString()); - K3bListViewItem(TQListView *tqparent, TQListViewItem *after, + K3bListViewItem(TQListView *parent, TQListViewItem *after, const TQString&, const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString()); - K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after, + K3bListViewItem(TQListViewItem *parent, TQListViewItem *after, const TQString&, const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), @@ -136,10 +136,10 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem class LIBK3B_EXPORT K3bCheckListViewItem : public K3bListViewItem { public: - K3bCheckListViewItem(TQListView *tqparent); - K3bCheckListViewItem(TQListViewItem *tqparent); - K3bCheckListViewItem(TQListView *tqparent, TQListViewItem *after); - K3bCheckListViewItem(TQListViewItem *tqparent, TQListViewItem *after); + K3bCheckListViewItem(TQListView *parent); + K3bCheckListViewItem(TQListViewItem *parent); + K3bCheckListViewItem(TQListView *parent, TQListViewItem *after); + K3bCheckListViewItem(TQListViewItem *parent, TQListViewItem *after); virtual bool isChecked() const; virtual void setChecked( bool checked ); @@ -161,7 +161,7 @@ class LIBK3B_EXPORT K3bListView : public KListView TQ_OBJECT public: - K3bListView (TQWidget *tqparent = 0, const char *name = 0); + K3bListView (TQWidget *parent = 0, const char *name = 0); virtual ~K3bListView(); virtual void setCurrentItem( TQListViewItem* ); diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp index b1bcf71..eef276e 100644 --- a/libk3b/tools/k3blistviewitemanimator.cpp +++ b/libk3b/tools/k3blistviewitemanimator.cpp @@ -22,15 +22,15 @@ #include -K3bListViewItemAnimator::K3bListViewItemAnimator( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bListViewItemAnimator::K3bListViewItemAnimator( TQObject* parent, const char* name ) + : TQObject( parent, name ) { init(); } -K3bListViewItemAnimator::K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bListViewItemAnimator::K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* parent, const char* name ) + : TQObject( parent, name ) { init(); setItem( item, col ); diff --git a/libk3b/tools/k3blistviewitemanimator.h b/libk3b/tools/k3blistviewitemanimator.h index 660ee98..c4dfabc 100644 --- a/libk3b/tools/k3blistviewitemanimator.h +++ b/libk3b/tools/k3blistviewitemanimator.h @@ -33,11 +33,11 @@ class LIBK3B_EXPORT K3bListViewItemAnimator : public TQObject TQ_OBJECT public: - K3bListViewItemAnimator( TQObject* tqparent = 0, const char* name = 0 ); + K3bListViewItemAnimator( TQObject* parent = 0, const char* name = 0 ); /** * Will use the items pixmap. */ - K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* tqparent = 0, const char* name = 0 ); + K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* parent = 0, const char* name = 0 ); ~K3bListViewItemAnimator(); TQListViewItem* item() const; diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index 7c46eea..a04c9a0 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -68,8 +68,8 @@ public: }; -K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ) +K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ) { d = new K3bMd5JobPrivate; d->data = new char[K3bMd5JobPrivate::BUFFERSIZE]; diff --git a/libk3b/tools/k3bmd5job.h b/libk3b/tools/k3bmd5job.h index 8c487a2..8292862 100644 --- a/libk3b/tools/k3bmd5job.h +++ b/libk3b/tools/k3bmd5job.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bMd5Job : public K3bJob TQ_OBJECT public: - K3bMd5Job( K3bJobHandler* jh , TQObject* tqparent = 0, const char* name = 0 ); + K3bMd5Job( K3bJobHandler* jh , TQObject* parent = 0, const char* name = 0 ); ~K3bMd5Job(); TQCString hexDigest(); diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index 86c018a..2266be8 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -26,15 +26,15 @@ -K3bMsfValidator::K3bMsfValidator( TQObject* tqparent, const char* name ) - : TQRegExpValidator( K3b::Msf::regExp(), tqparent, name ) +K3bMsfValidator::K3bMsfValidator( TQObject* parent, const char* name ) + : TQRegExpValidator( K3b::Msf::regExp(), parent, name ) { } -K3bMsfEdit::K3bMsfEdit( TQWidget* tqparent, const char* name ) - : TQSpinBox( tqparent, name ) +K3bMsfEdit::K3bMsfEdit( TQWidget* parent, const char* name ) + : TQSpinBox( parent, name ) { setValidator( new K3bMsfValidator( TQT_TQOBJECT(this) ) ); setMinValue( 0 ); diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h index 984c674..d3e75ec 100644 --- a/libk3b/tools/k3bmsfedit.h +++ b/libk3b/tools/k3bmsfedit.h @@ -28,7 +28,7 @@ class K3bMsfValidator : public TQRegExpValidator { public: - K3bMsfValidator( TQObject* tqparent = 0, const char* name = 0 ); + K3bMsfValidator( TQObject* parent = 0, const char* name = 0 ); }; @@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox TQ_OBJECT public: - K3bMsfEdit( TQWidget* tqparent = 0, const char* name = 0 ); + K3bMsfEdit( TQWidget* parent = 0, const char* name = 0 ); ~K3bMsfEdit(); TQSize tqsizeHint() const; diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp index e4cc364..01f64cd 100644 --- a/libk3b/tools/k3bmultichoicedialog.cpp +++ b/libk3b/tools/k3bmultichoicedialog.cpp @@ -78,8 +78,8 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon) K3bMultiChoiceDialog::K3bMultiChoiceDialog( const TQString& caption, const TQString& text, TQMessageBox::Icon icon, - TQWidget* tqparent, const char* name ) - : KDialog( tqparent, name ) + TQWidget* parent, const char* name ) + : KDialog( parent, name ) { d = new Private(); d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); @@ -161,7 +161,7 @@ void K3bMultiChoiceDialog::closeEvent( TQCloseEvent* e ) int K3bMultiChoiceDialog::choose( const TQString& caption, const TQString& text, TQMessageBox::Icon icon, - TQWidget* tqparent, + TQWidget* parent, const char* name, int buttonCount, const KGuiItem& b1, @@ -171,7 +171,7 @@ int K3bMultiChoiceDialog::choose( const TQString& caption, const KGuiItem& b5, const KGuiItem& b6 ) { - K3bMultiChoiceDialog dlg( caption, text, icon, tqparent, name ); + K3bMultiChoiceDialog dlg( caption, text, icon, parent, name ); dlg.addButton( b1 ); if( buttonCount > 1 ) dlg.addButton( b2 ); diff --git a/libk3b/tools/k3bmultichoicedialog.h b/libk3b/tools/k3bmultichoicedialog.h index be0748a..bfa57af 100644 --- a/libk3b/tools/k3bmultichoicedialog.h +++ b/libk3b/tools/k3bmultichoicedialog.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog K3bMultiChoiceDialog( const TQString& caption, const TQString& text, TQMessageBox::Icon = TQMessageBox::Information, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); ~K3bMultiChoiceDialog(); /** @@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog static int choose( const TQString& caption, const TQString& text, TQMessageBox::Icon = TQMessageBox::Information, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0, int buttonCount = 2, const KGuiItem& b1 = KStdGuiItem::yes(), diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp index e0e5a05..fe7b2af 100644 --- a/libk3b/tools/k3bprogressdialog.cpp +++ b/libk3b/tools/k3bprogressdialog.cpp @@ -28,10 +28,10 @@ K3bProgressDialog::K3bProgressDialog( const TQString& text, - TQWidget* tqparent, + TQWidget* parent, const TQString& caption, const char* name ) - : KDialogBase( tqparent, name, true, caption, Cancel|Ok, Ok, true ) + : KDialogBase( parent, name, true, caption, Cancel|Ok, Ok, true ) { TQFrame* main = makeMainWidget(); TQGridLayout* mainLayout = new TQGridLayout( main ); diff --git a/libk3b/tools/k3bprogressdialog.h b/libk3b/tools/k3bprogressdialog.h index 5ff9ad8..35cc73d 100644 --- a/libk3b/tools/k3bprogressdialog.h +++ b/libk3b/tools/k3bprogressdialog.h @@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bProgressDialog : public KDialogBase public: K3bProgressDialog( const TQString& text = TQString(), - TQWidget* tqparent = 0, + TQWidget* parent = 0, const TQString& caption = TQString(), const char* name = 0 ); ~K3bProgressDialog(); diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index 43ac0a3..a4c58bd 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -37,16 +37,16 @@ public: -K3bPushButton::K3bPushButton( TQWidget* tqparent, const char* name ) - : KPushButton( tqparent, name ) +K3bPushButton::K3bPushButton( TQWidget* parent, const char* name ) + : KPushButton( parent, name ) { d = new Private(); installEventFilter(this); } -K3bPushButton::K3bPushButton( const TQString& text, TQWidget* tqparent, const char* name ) - : KPushButton( text, tqparent, name ) +K3bPushButton::K3bPushButton( const TQString& text, TQWidget* parent, const char* name ) + : KPushButton( text, parent, name ) { d = new Private(); installEventFilter(this); @@ -54,16 +54,16 @@ K3bPushButton::K3bPushButton( const TQString& text, TQWidget* tqparent, const ch K3bPushButton::K3bPushButton( const TQIconSet& icon, const TQString& text, - TQWidget* tqparent, const char* name ) - : KPushButton( icon, text, tqparent, name ) + TQWidget* parent, const char* name ) + : KPushButton( icon, text, parent, name ) { d = new Private(); installEventFilter(this); } -K3bPushButton::K3bPushButton( const KGuiItem& item, TQWidget* tqparent, const char* name ) - : KPushButton( item, tqparent, name ) +K3bPushButton::K3bPushButton( const KGuiItem& item, TQWidget* parent, const char* name ) + : KPushButton( item, parent, name ) { d = new Private(); installEventFilter(this); diff --git a/libk3b/tools/k3bpushbutton.h b/libk3b/tools/k3bpushbutton.h index 523cefe..89729b2 100644 --- a/libk3b/tools/k3bpushbutton.h +++ b/libk3b/tools/k3bpushbutton.h @@ -32,24 +32,24 @@ class LIBK3B_EXPORT K3bPushButton : public KPushButton /** * Default constructor. */ - K3bPushButton( TQWidget* tqparent = 0, const char* name = 0 ); + K3bPushButton( TQWidget* parent = 0, const char* name = 0 ); /** * Constructor, that sets the button-text to @p text */ - K3bPushButton( const TQString& text, TQWidget* tqparent = 0, const char* name = 0 ); + K3bPushButton( const TQString& text, TQWidget* parent = 0, const char* name = 0 ); /** * Constructor, that sets an icon and the button-text to @p text */ K3bPushButton( const TQIconSet& icon, const TQString& text, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); /** * Constructor that takes a KGuiItem for the text, the icon, the tooltip * and the what's this help */ - K3bPushButton( const KGuiItem& item, TQWidget* tqparent = 0, const char* name = 0 ); + K3bPushButton( const KGuiItem& item, TQWidget* parent = 0, const char* name = 0 ); /** * Destructs the button. diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp index 5315dcd..4293322 100644 --- a/libk3b/tools/k3bradioaction.cpp +++ b/libk3b/tools/k3bradioaction.cpp @@ -18,32 +18,32 @@ #include K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, - TQObject* tqparent, const char* name ) - : KToggleAction( text, cut, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, cut, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) - : KToggleAction( text, cut, receiver, slot, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - TQObject* tqparent, const char* name ) - : KToggleAction( text, pix, cut, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, pix, cut, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, - TQObject* tqparent, const char* name ) - : KToggleAction( text, pix, cut, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, pix, cut, parent, name ), m_alwaysEmit(false) { } @@ -51,8 +51,8 @@ K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) - : KToggleAction( text, pix, cut, receiver, slot, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, pix, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } @@ -60,14 +60,14 @@ K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) - : KToggleAction( text, pix, cut, receiver, slot, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, pix, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( TQObject* tqparent, const char* name ) - : KToggleAction( tqparent, name ), +K3bRadioAction::K3bRadioAction( TQObject* parent, const char* name ) + : KToggleAction( parent, name ), m_alwaysEmit(false) { } diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h index d65b3f5..262e153 100644 --- a/libk3b/tools/k3bradioaction.h +++ b/libk3b/tools/k3bradioaction.h @@ -39,72 +39,72 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 ); + K3bRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name = 0 ); + TQObject* parent, const char* name = 0 ); /** - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( TQObject* tqparent = 0, const char* name = 0 ); + K3bRadioAction( TQObject* parent = 0, const char* name = 0 ); /** * @param b if true the action will always emit the activated signal diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp index af6c471..02878c2 100644 --- a/libk3b/tools/k3brichtextlabel.cpp +++ b/libk3b/tools/k3brichtextlabel.cpp @@ -35,15 +35,15 @@ static TQString qrichtextify( const TQString& text ) return lines.join(TQString()); } -K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +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 ); setText(text); } -K3bRichTextLabel::K3bRichTextLabel( TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); tqsetAlignment( TQt::WordBreak ); } diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index 3f1c407..cf1bc79 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -37,8 +37,8 @@ public: /** * Default constructor. */ - K3bRichTextLabel( TQWidget *tqparent, const char *name = 0 ); - K3bRichTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 ); + K3bRichTextLabel( TQWidget *parent, const char *name = 0 ); + K3bRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp index ebc9666..c8fee1b 100644 --- a/libk3b/tools/k3bstdguiitems.cpp +++ b/libk3b/tools/k3bstdguiitems.cpp @@ -25,9 +25,9 @@ #include -TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Simulate"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Simulate"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked K3b will perform all writing steps with the " "laser turned off." "

This is useful, for example, to test a higher writing speed " @@ -37,9 +37,9 @@ TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* tqparent, const char* na return c; } -TQCheckBox* K3bStdGuiItems::daoCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::daoCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Disk at once"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Disk at once"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will write the CD in 'disk at once' mode as " "compared to 'track at once' (TAO)." "

It is always recommended to use DAO where possible." @@ -49,9 +49,9 @@ TQCheckBox* K3bStdGuiItems::daoCheckbox( TQWidget* tqparent, const char* name ) return c; } -TQCheckBox* K3bStdGuiItems::burnproofCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::burnproofCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Use Burnfree"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Use Burnfree"), parent, name ); TQToolTip::add( c, i18n("Enable Burnfree (or Just Link) to avoid buffer underruns") ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b enables Burnfree " "(or Just Link). This is " @@ -70,9 +70,9 @@ TQCheckBox* K3bStdGuiItems::burnproofCheckbox( TQWidget* tqparent, const char* n return c; } -TQCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Only create image"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Only create image"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will only create an " "image and not do any actual writing." "

The image can later be written to a CD/DVD with most current writing " @@ -81,9 +81,9 @@ TQCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( TQWidget* tqparent, const return c; } -TQCheckBox* K3bStdGuiItems::createCacheImageCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::createCacheImageCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Create image"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Create image"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will create an image before writing " "the files to the CD/DVD. Otherwise the data will be written on-the-fly, " "i.e. no intermediate image will be created." @@ -94,9 +94,9 @@ TQCheckBox* K3bStdGuiItems::createCacheImageCheckbox( TQWidget* tqparent, const return c; } -TQCheckBox* K3bStdGuiItems::removeImagesCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::removeImagesCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Remove image"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Remove image"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will remove any created images after the " "writing has finished." "

Uncheck this if you want to keep the images.") ); @@ -104,9 +104,9 @@ TQCheckBox* K3bStdGuiItems::removeImagesCheckbox( TQWidget* tqparent, const char return c; } -TQCheckBox* K3bStdGuiItems::onTheFlyCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::onTheFlyCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("On the fly"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("On the fly"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will not create an image first but write " "the files directly to the CD/DVD." "

Caution: Although this should work on most systems, make sure " @@ -116,9 +116,9 @@ TQCheckBox* K3bStdGuiItems::onTheFlyCheckbox( TQWidget* tqparent, const char* na return c; } -TQCheckBox* K3bStdGuiItems::cdTextCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::cdTextCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Write CD-TEXT"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Write CD-TEXT"), parent, name ); TQToolTip::add( c, i18n("Create CD-TEXT entries") ); TQWhatsThis::add( c, i18n("

If this option is checked K3b uses some otherwise-unused space on the audio " "CD to store additional information, like the artist or the CD title." @@ -131,9 +131,9 @@ TQCheckBox* K3bStdGuiItems::cdTextCheckbox( TQWidget* tqparent, const char* name } -TQComboBox* K3bStdGuiItems::paranoiaModeComboBox( TQWidget* tqparent, const char* name ) +TQComboBox* K3bStdGuiItems::paranoiaModeComboBox( TQWidget* parent, const char* name ) { - TQComboBox* c = new TQComboBox( tqparent, name ); + TQComboBox* c = new TQComboBox( parent, name ); c->insertItem( "0" ); c->insertItem( "1" ); c->insertItem( "2" ); @@ -150,9 +150,9 @@ TQComboBox* K3bStdGuiItems::paranoiaModeComboBox( TQWidget* tqparent, const char } -TQCheckBox* K3bStdGuiItems::startMultisessionCheckBox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::startMultisessionCheckBox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Start multisession CD"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Start multisession CD"), parent, name ); TQToolTip::add( c, i18n("Do not close the disk to allow additional sessions to be added later") ); TQWhatsThis::add( c, i18n("

If this option is checked K3b will not close the CD, and will write " "a temporary table of contents.

" @@ -161,9 +161,9 @@ TQCheckBox* K3bStdGuiItems::startMultisessionCheckBox( TQWidget* tqparent, const } -TQCheckBox* K3bStdGuiItems::normalizeCheckBox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::normalizeCheckBox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Normalize volume levels"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Normalize volume levels"), parent, name ); TQToolTip::add( c, i18n("Adjust the volume levels of all tracks") ); TQWhatsThis::add( c, i18n("

If this option is checked K3b will adjust the volume of all tracks " "to a standard level. This is useful for things like creating mixes, " @@ -175,9 +175,9 @@ TQCheckBox* K3bStdGuiItems::normalizeCheckBox( TQWidget* tqparent, const char* n } -TQCheckBox* K3bStdGuiItems::verifyCheckBox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::verifyCheckBox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Verify written data"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Verify written data"), parent, name ); TQToolTip::add( c, i18n("Compare original with written data") ); TQWhatsThis::add( c, i18n("

If this option is checked, then after successfully " "writing the disk K3b will compare the original source data " @@ -187,9 +187,9 @@ TQCheckBox* K3bStdGuiItems::verifyCheckBox( TQWidget* tqparent, const char* name } -TQCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Ignore read errors"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Ignore read errors"), parent, name ); TQToolTip::add( c, i18n("Skip unreadable audio sectors") ); TQWhatsThis::add( c, i18n("

If this option is checked and K3b is not able to read an " "audio sector from the source CD it will be replaced with zeros " @@ -200,16 +200,16 @@ TQCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( TQWidget* tqparent, c } -TQFrame* K3bStdGuiItems::horizontalLine( TQWidget* tqparent, const char* name ) +TQFrame* K3bStdGuiItems::horizontalLine( TQWidget* parent, const char* name ) { - TQFrame* line = new TQFrame( tqparent, name ); + TQFrame* line = new TQFrame( parent, name ); line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); return line; } -TQFrame* K3bStdGuiItems::verticalLine( TQWidget* tqparent, const char* name ) +TQFrame* K3bStdGuiItems::verticalLine( TQWidget* parent, const char* name ) { - TQFrame* line = new TQFrame( tqparent, name ); + TQFrame* line = new TQFrame( parent, name ); line->setFrameStyle( TQFrame::VLine | TQFrame::Sunken ); return line; } diff --git a/libk3b/tools/k3bstdguiitems.h b/libk3b/tools/k3bstdguiitems.h index c90aaf8..d65133c 100644 --- a/libk3b/tools/k3bstdguiitems.h +++ b/libk3b/tools/k3bstdguiitems.h @@ -25,21 +25,21 @@ class TQFrame; namespace K3bStdGuiItems { - LIBK3B_EXPORT TQCheckBox* simulateCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* daoCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* burnproofCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* onlyCreateImagesCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* createCacheImageCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* removeImagesCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* onTheFlyCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* cdTextCheckbox( TQWidget* tqparent = 0, const char* name = 0); - LIBK3B_EXPORT TQComboBox* paranoiaModeComboBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* startMultisessionCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* normalizeCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* verifyCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* ignoreAudioReadErrorsCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQFrame* horizontalLine( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQFrame* verticalLine( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* simulateCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* daoCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* burnproofCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* onlyCreateImagesCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* createCacheImageCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* removeImagesCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* onTheFlyCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* cdTextCheckbox( TQWidget* parent = 0, const char* name = 0); + LIBK3B_EXPORT TQComboBox* paranoiaModeComboBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* startMultisessionCheckBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* normalizeCheckBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* verifyCheckBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* ignoreAudioReadErrorsCheckBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQFrame* horizontalLine( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQFrame* verticalLine( TQWidget* parent = 0, const char* name = 0 ); } #endif diff --git a/libk3b/tools/k3bthreadwidget.cpp b/libk3b/tools/k3bthreadwidget.cpp index efbe2fa..103b67b 100644 --- a/libk3b/tools/k3bthreadwidget.cpp +++ b/libk3b/tools/k3bthreadwidget.cpp @@ -34,14 +34,14 @@ public: class K3bThreadWidget::DeviceSelectionEvent : public TQCustomEvent { public: - DeviceSelectionEvent( TQWidget* tqparent, const TQString& text, int id ) + DeviceSelectionEvent( TQWidget* parent, const TQString& text, int id ) : TQCustomEvent( TQEvent::User + 22 ), - m_parent(tqparent), + m_parent(parent), m_text(text), m_id(id) { } - TQWidget* tqparent() const { return m_parent; } + TQWidget* parent() const { return m_parent; } const TQString& text() const { return m_text; } int id() const { return m_id; } @@ -102,7 +102,7 @@ K3bThreadWidget* K3bThreadWidget::instance() // static -K3bDevice::Device* K3bThreadWidget::selectDevice( TQWidget* tqparent, +K3bDevice::Device* K3bThreadWidget::selectDevice( TQWidget* parent, const TQString& text ) { // request a new data set @@ -110,7 +110,7 @@ K3bDevice::Device* K3bThreadWidget::selectDevice( TQWidget* tqparent, // inform the instance about the request TQApplication::postEvent( K3bThreadWidget::instance(), - new K3bThreadWidget::DeviceSelectionEvent( tqparent, text, data->id ) ); + new K3bThreadWidget::DeviceSelectionEvent( parent, text, data->id ) ); // wait for the result to be ready data->con.wait(); @@ -128,7 +128,7 @@ void K3bThreadWidget::customEvent( TQCustomEvent* e ) { if( DeviceSelectionEvent* dse = dynamic_cast(e) ) { // create dialog - K3bDevice::Device* dev = K3bDeviceSelectionDialog::selectDevice( dse->tqparent(), dse->text() ); + K3bDevice::Device* dev = K3bDeviceSelectionDialog::selectDevice( dse->parent(), dse->text() ); // return it to the thread Data* dat = data( dse->id() ); diff --git a/libk3b/tools/k3bthreadwidget.h b/libk3b/tools/k3bthreadwidget.h index 1b514c2..6bf67ea 100644 --- a/libk3b/tools/k3bthreadwidget.h +++ b/libk3b/tools/k3bthreadwidget.h @@ -45,7 +45,7 @@ class K3bThreadWidget : public TQObject /** * Call this from a thread to show a device selection dialog. */ - static K3bDevice::Device* selectDevice( TQWidget* tqparent, + static K3bDevice::Device* selectDevice( TQWidget* parent, const TQString& text = TQString() ); protected: diff --git a/libk3b/tools/k3bthroughputestimator.cpp b/libk3b/tools/k3bthroughputestimator.cpp index d6183b3..7e330b4 100644 --- a/libk3b/tools/k3bthroughputestimator.cpp +++ b/libk3b/tools/k3bthroughputestimator.cpp @@ -38,8 +38,8 @@ public: }; -K3bThroughputEstimator::K3bThroughputEstimator( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bThroughputEstimator::K3bThroughputEstimator( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); } diff --git a/libk3b/tools/k3bthroughputestimator.h b/libk3b/tools/k3bthroughputestimator.h index 52d3272..07b0a54 100644 --- a/libk3b/tools/k3bthroughputestimator.h +++ b/libk3b/tools/k3bthroughputestimator.h @@ -31,7 +31,7 @@ class K3bThroughputEstimator : public TQObject TQ_OBJECT public: - K3bThroughputEstimator( TQObject* tqparent = 0, const char* name = 0 ); + K3bThroughputEstimator( TQObject* parent = 0, const char* name = 0 ); ~K3bThroughputEstimator(); int average() const; diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp index db9edc0..21476b0 100644 --- a/libk3b/tools/k3btitlelabel.cpp +++ b/libk3b/tools/k3btitlelabel.cpp @@ -94,8 +94,8 @@ public: -K3bTitleLabel::K3bTitleLabel( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +K3bTitleLabel::K3bTitleLabel( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { d = new Private(); m_toolTip = new ToolTip( this ); diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h index 3547a5c..b850b12 100644 --- a/libk3b/tools/k3btitlelabel.h +++ b/libk3b/tools/k3btitlelabel.h @@ -29,7 +29,7 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame TQ_OBJECT public: - K3bTitleLabel( TQWidget* tqparent = 0, const char* name = 0 ); + K3bTitleLabel( TQWidget* parent = 0, const char* name = 0 ); ~K3bTitleLabel(); TQSize tqsizeHint() const; diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index 2adf274..cf72a3b 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -42,7 +42,7 @@ class K3bToolBoxSeparator : public TQWidget TQ_OBJECT public: - K3bToolBoxSeparator( K3bToolBox* tqparent ); + K3bToolBoxSeparator( K3bToolBox* parent ); TQSize tqsizeHint() const; @@ -51,8 +51,8 @@ class K3bToolBoxSeparator : public TQWidget }; -K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* tqparent ) - : TQWidget( tqparent ) +K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent ) + : TQWidget( parent ) { tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); } @@ -77,8 +77,8 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) -K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* tqparent ) - : TQToolButton( tqparent ), +K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent ) + : TQToolButton( parent ), m_popupMenu(0) { tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); @@ -123,8 +123,8 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* tqparent ) K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon, const TQString& tooltip, const TQString& whatsthis, TQObject* receiver, const char* slot, - TQWidget* tqparent ) - : TQToolButton( tqparent ), + TQWidget* parent ) + : TQToolButton( parent ), m_popupMenu(0) { tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); @@ -168,8 +168,8 @@ void K3bToolBoxButton::resizeEvent( TQResizeEvent* e ) -K3bToolBox::K3bToolBox( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +K3bToolBox::K3bToolBox( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) ); diff --git a/libk3b/tools/k3btoolbox.h b/libk3b/tools/k3btoolbox.h index b93346b..77f2424 100644 --- a/libk3b/tools/k3btoolbox.h +++ b/libk3b/tools/k3btoolbox.h @@ -39,11 +39,11 @@ class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton TQ_OBJECT public: - K3bToolBoxButton( KAction*, TQWidget* tqparent ); + K3bToolBoxButton( KAction*, TQWidget* parent ); K3bToolBoxButton( const TQString& text, const TQString& icon, const TQString& tooltip, const TQString& whatsthis, TQObject* receiver, const char* slot, - TQWidget* tqparent ); + TQWidget* parent ); private slots: void slotPopupActivated(); @@ -62,7 +62,7 @@ class LIBK3B_EXPORT K3bToolBox : public TQFrame TQ_OBJECT public: - K3bToolBox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bToolBox( TQWidget* parent = 0, const char* name = 0 ); ~K3bToolBox(); K3bToolBoxButton* addButton( const TQString& text, const TQString& icon, diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index 6f63c63..67af0d5 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -31,8 +31,8 @@ public: }; -K3bToolButton::K3bToolButton( TQWidget* tqparent ) - : TQToolButton( tqparent ) +K3bToolButton::K3bToolButton( TQWidget* parent ) + : TQToolButton( parent ) { d = new Private; d->instantMenu = false; diff --git a/libk3b/tools/k3btoolbutton.h b/libk3b/tools/k3btoolbutton.h index 707801f..6b2057d 100644 --- a/libk3b/tools/k3btoolbutton.h +++ b/libk3b/tools/k3btoolbutton.h @@ -33,7 +33,7 @@ class TQEvent; class LIBK3B_EXPORT K3bToolButton : public TQToolButton { public: - K3bToolButton( TQWidget* tqparent = 0 ); + K3bToolButton( TQWidget* parent = 0 ); ~K3bToolButton(); void setInstantMenu( bool ); diff --git a/libk3b/tools/k3bvalidators.cpp b/libk3b/tools/k3bvalidators.cpp index b8a6e65..6bf63b6 100644 --- a/libk3b/tools/k3bvalidators.cpp +++ b/libk3b/tools/k3bvalidators.cpp @@ -19,8 +19,8 @@ #include -K3bCharValidator::K3bCharValidator( TQObject* tqparent, const char* name ) - : TQValidator( tqparent, name ), +K3bCharValidator::K3bCharValidator( TQObject* parent, const char* name ) + : TQValidator( parent, name ), m_replaceChar( '_' ) { } @@ -49,8 +49,8 @@ void K3bCharValidator::fixup( TQString& s ) const } -K3bLatin1Validator::K3bLatin1Validator( TQObject* tqparent, const char* name ) - : K3bCharValidator( tqparent, name ) +K3bLatin1Validator::K3bLatin1Validator( TQObject* parent, const char* name ) + : K3bCharValidator( parent, name ) { } @@ -64,8 +64,8 @@ TQValidator::State K3bLatin1Validator::validateChar( const TQChar& c ) const } -K3bAsciiValidator::K3bAsciiValidator( TQObject* tqparent, const char* name ) - : K3bLatin1Validator( tqparent, name ) +K3bAsciiValidator::K3bAsciiValidator( TQObject* parent, const char* name ) + : K3bLatin1Validator( parent, name ) { } @@ -82,15 +82,15 @@ TQValidator::State K3bAsciiValidator::validateChar( const TQChar& c ) const -K3bValidator::K3bValidator( TQObject* tqparent, const char* name ) - : TQRegExpValidator( tqparent, name ), +K3bValidator::K3bValidator( TQObject* parent, const char* name ) + : TQRegExpValidator( parent, name ), m_replaceChar('_') { } -K3bValidator::K3bValidator( const TQRegExp& rx, TQObject* tqparent, const char* name ) - : TQRegExpValidator( rx, tqparent, name ), +K3bValidator::K3bValidator( const TQRegExp& rx, TQObject* parent, const char* name ) + : TQRegExpValidator( rx, parent, name ), m_replaceChar('_') { } @@ -116,22 +116,22 @@ TQString K3bValidators::fixup( const TQString& input, const TQRegExp& rx, const } -K3bValidator* K3bValidators::isrcValidator( TQObject* tqparent, const char* name ) +K3bValidator* K3bValidators::isrcValidator( TQObject* parent, const char* name ) { - return new K3bValidator( TQRegExp("^[A-Z\\d]{2,2}-[A-Z\\d]{3,3}-\\d{2,2}-\\d{5,5}$"), tqparent, name ); + return new K3bValidator( TQRegExp("^[A-Z\\d]{2,2}-[A-Z\\d]{3,3}-\\d{2,2}-\\d{5,5}$"), parent, name ); } -K3bValidator* K3bValidators::iso9660Validator( bool allowEmpty, TQObject* tqparent, const char* name ) +K3bValidator* K3bValidators::iso9660Validator( bool allowEmpty, TQObject* parent, const char* name ) { if( allowEmpty ) - return new K3bValidator( TQRegExp( "[^/]*" ), tqparent, name ); + return new K3bValidator( TQRegExp( "[^/]*" ), parent, name ); else - return new K3bValidator( TQRegExp( "[^/]+" ), tqparent, name ); + return new K3bValidator( TQRegExp( "[^/]+" ), parent, name ); } -K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, TQObject* tqparent, const char* name ) +K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, TQObject* parent, const char* name ) { TQRegExp rx; switch ( type ) { @@ -150,5 +150,5 @@ K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, TQO break; } - return new K3bValidator( rx, tqparent, name ); + return new K3bValidator( rx, parent, name ); } diff --git a/libk3b/tools/k3bvalidators.h b/libk3b/tools/k3bvalidators.h index d391cb9..42197f4 100644 --- a/libk3b/tools/k3bvalidators.h +++ b/libk3b/tools/k3bvalidators.h @@ -26,7 +26,7 @@ class LIBK3B_EXPORT K3bCharValidator : public TQValidator { public: - K3bCharValidator( TQObject* tqparent = 0, const char* name = 0 ); + K3bCharValidator( TQObject* parent = 0, const char* name = 0 ); virtual State validateChar( const TQChar& ) const = 0; @@ -50,7 +50,7 @@ class LIBK3B_EXPORT K3bCharValidator : public TQValidator class LIBK3B_EXPORT K3bLatin1Validator : public K3bCharValidator { public: - K3bLatin1Validator( TQObject* tqparent = 0, const char* name = 0 ); + K3bLatin1Validator( TQObject* parent = 0, const char* name = 0 ); virtual State validateChar( const TQChar& ) const; }; @@ -59,7 +59,7 @@ class LIBK3B_EXPORT K3bLatin1Validator : public K3bCharValidator class LIBK3B_EXPORT K3bAsciiValidator : public K3bLatin1Validator { public: - K3bAsciiValidator( TQObject* tqparent = 0, const char* name = 0 ); + K3bAsciiValidator( TQObject* parent = 0, const char* name = 0 ); virtual State validateChar( const TQChar& ) const; }; @@ -74,8 +74,8 @@ class LIBK3B_EXPORT K3bAsciiValidator : public K3bLatin1Validator class LIBK3B_EXPORT K3bValidator : public TQRegExpValidator { public: - K3bValidator( TQObject* tqparent, const char * name = 0 ); - K3bValidator( const TQRegExp& rx, TQObject* tqparent, const char* name = 0 ); + K3bValidator( TQObject* parent, const char * name = 0 ); + K3bValidator( const TQRegExp& rx, TQObject* parent, const char* name = 0 ); void setReplaceChar( const TQChar& s ) { m_replaceChar = s; } const TQChar& replaceChar() const { return m_replaceChar; } @@ -105,13 +105,13 @@ namespace K3bValidators *

  • S: serial number (digits)
    • * */ - LIBK3B_EXPORT K3bValidator* isrcValidator( TQObject* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT K3bValidator* isrcValidator( TQObject* parent = 0, const char* name = 0 ); /** * This needs to be replaced by something better in the future... * Even the name sucks! */ - LIBK3B_EXPORT K3bValidator* iso9660Validator( bool allowEmpty = true, TQObject* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT K3bValidator* iso9660Validator( bool allowEmpty = true, TQObject* parent = 0, const char* name = 0 ); /** * (1) d-characters are: A-Z, 0-9, _ (see ISO-9660:1988, Annex A, Table 15) @@ -125,7 +125,7 @@ namespace K3bValidators LIBK3B_EXPORT K3bValidator* iso646Validator( int type = Iso646_a, bool AllowLowerCase = false, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); } #endif diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp index 650f83d..fd806ba 100644 --- a/libk3b/tools/kcutlabel.cpp +++ b/libk3b/tools/kcutlabel.cpp @@ -23,8 +23,8 @@ #include -KCutLabel::KCutLabel( const TQString &text , TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ), +KCutLabel::KCutLabel( const TQString &text , TQWidget *parent, const char *name ) + : TQLabel ( parent, name ), m_minChars(1) { TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); tqsetSizePolicy(myLabelSizePolicy); @@ -32,8 +32,8 @@ KCutLabel::KCutLabel( const TQString &text , TQWidget *tqparent, const char *nam cutTextToLabel(); } -KCutLabel::KCutLabel( TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ), +KCutLabel::KCutLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ), m_minChars(1) { TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); tqsetSizePolicy(myLabelSizePolicy); diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h index 5df44b3..7b96fe2 100644 --- a/libk3b/tools/kcutlabel.h +++ b/libk3b/tools/kcutlabel.h @@ -33,8 +33,8 @@ class LIBK3B_EXPORT KCutLabel : public TQLabel /** * Default constructor. */ - KCutLabel( TQWidget *tqparent = 0, const char *name = 0); - KCutLabel( const TQString &text, TQWidget *tqparent = 0, const char *name = 0 ); + KCutLabel( TQWidget *parent = 0, const char *name = 0); + KCutLabel( const TQString &text, TQWidget *parent = 0, const char *name = 0 ); virtual TQSize tqminimumSizeHint() const; diff --git a/libk3b/tools/libisofs/iso_fs.h b/libk3b/tools/libisofs/iso_fs.h index b726b9f..43353b0 100644 --- a/libk3b/tools/libisofs/iso_fs.h +++ b/libk3b/tools/libisofs/iso_fs.h @@ -131,13 +131,13 @@ struct hs_primary_descriptor { char root_directory_record [ISODCL (181, 214)]; /* 9.1 */ }; -/* We use this to help us look up the tqparent inode numbers. */ +/* We use this to help us look up the parent inode numbers. */ struct iso_path_table{ char name_len[1]; /* 711 */ char ext_attr_length[1]; /* 711 */ char extent[4]; /* 731 */ - char tqparent[2]; /* 721 */ + char parent[2]; /* 721 */ char name[1]; }; diff --git a/libk3b/tools/libisofs/isofs.h b/libk3b/tools/libisofs/isofs.h index 6f2fe2d..f284903 100644 --- a/libk3b/tools/libisofs/isofs.h +++ b/libk3b/tools/libisofs/isofs.h @@ -43,7 +43,7 @@ typedef struct _rr_entry { int serno; int dev_major; int dev_minor; - int pl; /* tqparent location */ + int pl; /* parent location */ int cl; /* child location */ int re; /* relocated */ char z_algo[2]; /* zizofs algorithm */ @@ -60,7 +60,7 @@ typedef struct _iso_vol_desc { typedef struct _boot_entry { struct _boot_entry *next; struct _boot_entry *prev; - struct _boot_entry *tqparent; + struct _boot_entry *parent; struct _boot_entry *child; char data[32]; } boot_entry; diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp index c417c65..b319312 100644 --- a/libk3bdevice/k3bdevicemanager.cpp +++ b/libk3bdevice/k3bdevicemanager.cpp @@ -119,8 +119,8 @@ public: -K3bDevice::DeviceManager::DeviceManager( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bDevice::DeviceManager::DeviceManager( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private; } @@ -324,7 +324,7 @@ void K3bDevice::DeviceManager::NetBSDDeviceScan() int i; - // Whole disk tqmask (According to cd(4), the AMD64, i386 and BeBox ports use + // Whole disk mask (According to cd(4), the AMD64, i386 and BeBox ports use // 'd' as whole-disk partition, the rest uses 'c'.) #if defined(__i386__) || defined (__amd64__) || defined (__bebox__) diff --git a/libk3bdevice/k3bdevicemanager.h b/libk3bdevice/k3bdevicemanager.h index 258afa2..dc0ebd7 100644 --- a/libk3bdevice/k3bdevicemanager.h +++ b/libk3bdevice/k3bdevicemanager.h @@ -56,7 +56,7 @@ namespace K3bDevice { /** * Creates a new DeviceManager */ - DeviceManager( TQObject* tqparent = 0, const char* name = 0 ); + DeviceManager( TQObject* parent = 0, const char* name = 0 ); virtual ~DeviceManager(); /** diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp index 23f9af5..cbb1453 100644 --- a/libk3bdevice/k3bhalconnection.cpp +++ b/libk3bdevice/k3bhalconnection.cpp @@ -101,8 +101,8 @@ K3bDevice::HalConnection* K3bDevice::HalConnection::instance() } -K3bDevice::HalConnection::HalConnection( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bDevice::HalConnection::HalConnection( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); } diff --git a/libk3bdevice/k3bhalconnection.h b/libk3bdevice/k3bhalconnection.h index 882b7b4..953c959 100644 --- a/libk3bdevice/k3bhalconnection.h +++ b/libk3bdevice/k3bhalconnection.h @@ -204,7 +204,7 @@ namespace K3bDevice { /** * HalConnection is a signelton class. Use the instance() method to create it. */ - HalConnection( TQObject* tqparent = 0, const char* name = 0 ); + HalConnection( TQObject* parent = 0, const char* name = 0 ); /** * Tries to open a connection to HAL. diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp index 437f188..3e97cda 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp @@ -54,8 +54,8 @@ public: }; -K3bAlsaOutputPlugin::K3bAlsaOutputPlugin( TQObject* tqparent, const char* name ) - : K3bAudioOutputPlugin( tqparent, name ) +K3bAlsaOutputPlugin::K3bAlsaOutputPlugin( TQObject* parent, const char* name ) + : K3bAudioOutputPlugin( parent, name ) { d = new Private; } @@ -242,16 +242,16 @@ TQString K3bAlsaOutputPlugin::lastErrorMessage() const } -K3bPluginConfigWidget* K3bAlsaOutputPlugin::createConfigWidget( TQWidget* tqparent, +K3bPluginConfigWidget* K3bAlsaOutputPlugin::createConfigWidget( TQWidget* parent, const char* name ) const { - return new K3bAlsaOutputPluginConfigWidget( tqparent, name ); + return new K3bAlsaOutputPluginConfigWidget( parent, name ); } -K3bAlsaOutputPluginConfigWidget::K3bAlsaOutputPluginConfigWidget( TQWidget* tqparent, const char* name ) - : K3bPluginConfigWidget( tqparent, name ) +K3bAlsaOutputPluginConfigWidget::K3bAlsaOutputPluginConfigWidget( TQWidget* parent, const char* name ) + : K3bPluginConfigWidget( parent, name ) { TQHBoxLayout* l = new TQHBoxLayout( this ); l->setSpacing( KDialog::spacingHint() ); diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.h b/plugins/audiooutput/alsa/k3balsaoutputplugin.h index b0fce65..73d9cc9 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.h +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.h @@ -25,7 +25,7 @@ class KComboBox; class K3bAlsaOutputPlugin : public K3bAudioOutputPlugin { public: - K3bAlsaOutputPlugin( TQObject* tqparent = 0, const char* name = 0 ); + K3bAlsaOutputPlugin( TQObject* parent = 0, const char* name = 0 ); ~K3bAlsaOutputPlugin(); int pluginSystemVersion() const { return 3; } @@ -38,7 +38,7 @@ class K3bAlsaOutputPlugin : public K3bAudioOutputPlugin int write( char* data, int len ); - K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* parent = 0, const char* name = 0 ) const; private: @@ -56,7 +56,7 @@ class K3bAlsaOutputPluginConfigWidget : public K3bPluginConfigWidget TQ_OBJECT public: - K3bAlsaOutputPluginConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAlsaOutputPluginConfigWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bAlsaOutputPluginConfigWidget(); public slots: diff --git a/plugins/audiooutput/arts/k3bartsoutputplugin.cpp b/plugins/audiooutput/arts/k3bartsoutputplugin.cpp index e3ce210..6919bf8 100644 --- a/plugins/audiooutput/arts/k3bartsoutputplugin.cpp +++ b/plugins/audiooutput/arts/k3bartsoutputplugin.cpp @@ -24,8 +24,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3bartsoutputplugin, K3bPluginFactory( "k3bartsoutputplugin" ) ) -K3bArtsOutputPlugin::K3bArtsOutputPlugin( TQObject* tqparent, const char* name ) - : K3bAudioOutputPlugin( tqparent, name ), +K3bArtsOutputPlugin::K3bArtsOutputPlugin( TQObject* parent, const char* name ) + : K3bAudioOutputPlugin( parent, name ), m_initialized(false), m_lastErrorCode(0) { diff --git a/plugins/audiooutput/arts/k3bartsoutputplugin.h b/plugins/audiooutput/arts/k3bartsoutputplugin.h index 8778187..e1b5499 100644 --- a/plugins/audiooutput/arts/k3bartsoutputplugin.h +++ b/plugins/audiooutput/arts/k3bartsoutputplugin.h @@ -24,7 +24,7 @@ class K3bArtsOutputPlugin : public K3bAudioOutputPlugin { public: - K3bArtsOutputPlugin( TQObject* tqparent = 0, const char* name = 0 ); + K3bArtsOutputPlugin( TQObject* parent = 0, const char* name = 0 ); ~K3bArtsOutputPlugin(); int pluginSystemVersion() const { return 3; } diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp b/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp index d4ab6a9..f2afd02 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp @@ -31,8 +31,8 @@ extern "C" { K_EXPORT_COMPONENT_FACTORY( libk3bffmpegdecoder, K3bPluginFactory( "k3bffmpegdecoder" ) ) -K3bFFMpegDecoderFactory::K3bFFMpegDecoderFactory( TQObject* tqparent, const char* name ) - : K3bAudioDecoderFactory( tqparent, name ) +K3bFFMpegDecoderFactory::K3bFFMpegDecoderFactory( TQObject* parent, const char* name ) + : K3bAudioDecoderFactory( parent, name ) { } @@ -42,10 +42,10 @@ K3bFFMpegDecoderFactory::~K3bFFMpegDecoderFactory() } -K3bAudioDecoder* K3bFFMpegDecoderFactory::createDecoder( TQObject* tqparent, +K3bAudioDecoder* K3bFFMpegDecoderFactory::createDecoder( TQObject* parent, const char* name ) const { - return new K3bFFMpegDecoder( tqparent, name ); + return new K3bFFMpegDecoder( parent, name ); } @@ -66,8 +66,8 @@ bool K3bFFMpegDecoderFactory::canDecode( const KURL& url ) -K3bFFMpegDecoder::K3bFFMpegDecoder( TQObject* tqparent, const char* name ) - : K3bAudioDecoder( tqparent, name ), +K3bFFMpegDecoder::K3bFFMpegDecoder( TQObject* parent, const char* name ) + : K3bAudioDecoder( parent, name ), m_file(0) { } diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h index 59d7ef0..fab5093 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h +++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h @@ -27,7 +27,7 @@ class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory TQ_OBJECT public: - K3bFFMpegDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); + K3bFFMpegDecoderFactory( TQObject* parent = 0, const char* name = 0 ); ~K3bFFMpegDecoderFactory(); bool canDecode( const KURL& filename ); @@ -36,7 +36,7 @@ class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory bool multiFormatDecoder() const { return true; } - K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, + K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const; }; @@ -47,7 +47,7 @@ class K3bFFMpegDecoder : public K3bAudioDecoder TQ_OBJECT public: - K3bFFMpegDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bFFMpegDecoder( TQObject* parent = 0, const char* name = 0 ); ~K3bFFMpegDecoder(); TQString fileType() const; diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp index 495e3d9..40a61c9 100644 --- a/plugins/decoder/flac/k3bflacdecoder.cpp +++ b/plugins/decoder/flac/k3bflacdecoder.cpp @@ -240,8 +240,8 @@ FLAC__StreamDecoderWriteStatus K3bFLACDecoder::Private::write_callback(const FLA return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } -K3bFLACDecoder::K3bFLACDecoder( TQObject* tqparent, const char* name ) - : K3bAudioDecoder( tqparent, name ) +K3bFLACDecoder::K3bFLACDecoder( TQObject* parent, const char* name ) + : K3bAudioDecoder( parent, name ) { d = 0; } @@ -404,8 +404,8 @@ TQString K3bFLACDecoder::technicalInfo( const TQString& info ) const -K3bFLACDecoderFactory::K3bFLACDecoderFactory( TQObject* tqparent, const char* name ) - : K3bAudioDecoderFactory( tqparent, name ) +K3bFLACDecoderFactory::K3bFLACDecoderFactory( TQObject* parent, const char* name ) + : K3bAudioDecoderFactory( parent, name ) { } @@ -415,10 +415,10 @@ K3bFLACDecoderFactory::~K3bFLACDecoderFactory() } -K3bAudioDecoder* K3bFLACDecoderFactory::createDecoder( TQObject* tqparent, +K3bAudioDecoder* K3bFLACDecoderFactory::createDecoder( TQObject* parent, const char* name ) const { - return new K3bFLACDecoder( tqparent, name ); + return new K3bFLACDecoder( parent, name ); } diff --git a/plugins/decoder/flac/k3bflacdecoder.h b/plugins/decoder/flac/k3bflacdecoder.h index 2e3bccf..fae7082 100644 --- a/plugins/decoder/flac/k3bflacdecoder.h +++ b/plugins/decoder/flac/k3bflacdecoder.h @@ -27,14 +27,14 @@ class K3bFLACDecoderFactory : public K3bAudioDecoderFactory TQ_OBJECT public: - K3bFLACDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); + K3bFLACDecoderFactory( TQObject* parent = 0, const char* name = 0 ); ~K3bFLACDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, + K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const; }; @@ -45,7 +45,7 @@ class K3bFLACDecoder : public K3bAudioDecoder TQ_OBJECT public: - K3bFLACDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bFLACDecoder( TQObject* parent = 0, const char* name = 0 ); ~K3bFLACDecoder(); void cleanup(); diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp index 0f23d4e..8532da9 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp @@ -57,8 +57,8 @@ public: -K3bLibsndfileDecoder::K3bLibsndfileDecoder( TQObject* tqparent, const char* name ) - : K3bAudioDecoder( tqparent, name ) +K3bLibsndfileDecoder::K3bLibsndfileDecoder( TQObject* parent, const char* name ) + : K3bAudioDecoder( parent, name ) { d = new Private(); } @@ -202,8 +202,8 @@ void K3bLibsndfileDecoder::cleanup() /********************************************************/ -K3bLibsndfileDecoderFactory::K3bLibsndfileDecoderFactory( TQObject* tqparent, const char* name ) - : K3bAudioDecoderFactory( tqparent, name ) +K3bLibsndfileDecoderFactory::K3bLibsndfileDecoderFactory( TQObject* parent, const char* name ) + : K3bAudioDecoderFactory( parent, name ) { } @@ -213,10 +213,10 @@ K3bLibsndfileDecoderFactory::~K3bLibsndfileDecoderFactory() } -K3bAudioDecoder* K3bLibsndfileDecoderFactory::createDecoder( TQObject* tqparent, +K3bAudioDecoder* K3bLibsndfileDecoderFactory::createDecoder( TQObject* parent, const char* name ) const { - return new K3bLibsndfileDecoder( tqparent, name ); + return new K3bLibsndfileDecoder( parent, name ); } diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h index 005cb0b..cd23eb1 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h @@ -28,7 +28,7 @@ class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory TQ_OBJECT public: - K3bLibsndfileDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); + K3bLibsndfileDecoderFactory( TQObject* parent = 0, const char* name = 0 ); ~K3bLibsndfileDecoderFactory(); bool canDecode( const KURL& filename ); @@ -37,7 +37,7 @@ class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory bool multiFormatDecoder() const { return true; } - K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, + K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const; }; @@ -48,7 +48,7 @@ class K3bLibsndfileDecoder : public K3bAudioDecoder TQ_OBJECT public: - K3bLibsndfileDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bLibsndfileDecoder( TQObject* parent = 0, const char* name = 0 ); ~K3bLibsndfileDecoder(); void cleanup(); TQString fileType() const; diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp index f23bfce..9fe9b15 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.cpp +++ b/plugins/decoder/mp3/k3bmaddecoder.cpp @@ -86,8 +86,8 @@ public: -K3bMadDecoder::K3bMadDecoder( TQObject* tqparent, const char* name ) - : K3bAudioDecoder( tqparent, name ) +K3bMadDecoder::K3bMadDecoder( TQObject* parent, const char* name ) + : K3bAudioDecoder( parent, name ) { d = new MadDecoderPrivate(); d->handle = new K3bMad(); @@ -457,8 +457,8 @@ TQString K3bMadDecoder::technicalInfo( const TQString& name ) const } -K3bMadDecoderFactory::K3bMadDecoderFactory( TQObject* tqparent, const char* name ) - : K3bAudioDecoderFactory( tqparent, name ) +K3bMadDecoderFactory::K3bMadDecoderFactory( TQObject* parent, const char* name ) + : K3bAudioDecoderFactory( parent, name ) { } @@ -468,10 +468,10 @@ K3bMadDecoderFactory::~K3bMadDecoderFactory() } -K3bAudioDecoder* K3bMadDecoderFactory::createDecoder( TQObject* tqparent, +K3bAudioDecoder* K3bMadDecoderFactory::createDecoder( TQObject* parent, const char* name ) const { - return new K3bMadDecoder( tqparent, name ); + return new K3bMadDecoder( parent, name ); } diff --git a/plugins/decoder/mp3/k3bmaddecoder.h b/plugins/decoder/mp3/k3bmaddecoder.h index 8eef755..57e2d76 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.h +++ b/plugins/decoder/mp3/k3bmaddecoder.h @@ -30,14 +30,14 @@ class K3bMadDecoderFactory : public K3bAudioDecoderFactory TQ_OBJECT public: - K3bMadDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); + K3bMadDecoderFactory( TQObject* parent = 0, const char* name = 0 ); ~K3bMadDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, + K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const; }; @@ -48,7 +48,7 @@ class K3bMadDecoder : public K3bAudioDecoder TQ_OBJECT public: - K3bMadDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bMadDecoder( TQObject* parent = 0, const char* name = 0 ); ~K3bMadDecoder(); TQString metaInfo( MetaDataField ); diff --git a/plugins/decoder/musepack/k3bmpcdecoder.cpp b/plugins/decoder/musepack/k3bmpcdecoder.cpp index 6975bee..84dd9d7 100644 --- a/plugins/decoder/musepack/k3bmpcdecoder.cpp +++ b/plugins/decoder/musepack/k3bmpcdecoder.cpp @@ -26,8 +26,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3bmpcdecoder, K3bPluginFactory( "libk3bmpcdecoder" ) ) -K3bMpcDecoderFactory::K3bMpcDecoderFactory( TQObject* tqparent, const char* name ) - : K3bAudioDecoderFactory( tqparent, name ) +K3bMpcDecoderFactory::K3bMpcDecoderFactory( TQObject* parent, const char* name ) + : K3bAudioDecoderFactory( parent, name ) { } @@ -37,10 +37,10 @@ K3bMpcDecoderFactory::~K3bMpcDecoderFactory() } -K3bAudioDecoder* K3bMpcDecoderFactory::createDecoder( TQObject* tqparent, +K3bAudioDecoder* K3bMpcDecoderFactory::createDecoder( TQObject* parent, const char* name ) const { - return new K3bMpcDecoder( tqparent, name ); + return new K3bMpcDecoder( parent, name ); } @@ -55,8 +55,8 @@ bool K3bMpcDecoderFactory::canDecode( const KURL& url ) -K3bMpcDecoder::K3bMpcDecoder( TQObject* tqparent, const char* name ) - : K3bAudioDecoder( tqparent, name ) +K3bMpcDecoder::K3bMpcDecoder( TQObject* parent, const char* name ) + : K3bAudioDecoder( parent, name ) { m_mpc = new K3bMpcWrapper(); } diff --git a/plugins/decoder/musepack/k3bmpcdecoder.h b/plugins/decoder/musepack/k3bmpcdecoder.h index d0f6935..1be280b 100644 --- a/plugins/decoder/musepack/k3bmpcdecoder.h +++ b/plugins/decoder/musepack/k3bmpcdecoder.h @@ -27,14 +27,14 @@ class K3bMpcDecoderFactory : public K3bAudioDecoderFactory TQ_OBJECT public: - K3bMpcDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); + K3bMpcDecoderFactory( TQObject* parent = 0, const char* name = 0 ); ~K3bMpcDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, + K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const; }; @@ -45,7 +45,7 @@ class K3bMpcDecoder : public K3bAudioDecoder TQ_OBJECT public: - K3bMpcDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bMpcDecoder( TQObject* parent = 0, const char* name = 0 ); ~K3bMpcDecoder(); TQString fileType() const; diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp index 29b3805..b48a85d 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp @@ -51,8 +51,8 @@ public: }; -K3bOggVorbisDecoder::K3bOggVorbisDecoder( TQObject* tqparent, const char* name ) - : K3bAudioDecoder( tqparent, name ) +K3bOggVorbisDecoder::K3bOggVorbisDecoder( TQObject* parent, const char* name ) + : K3bAudioDecoder( parent, name ) { d = new Private(); } @@ -209,8 +209,8 @@ TQString K3bOggVorbisDecoder::fileType() const } -K3bOggVorbisDecoderFactory::K3bOggVorbisDecoderFactory( TQObject* tqparent, const char* name ) - : K3bAudioDecoderFactory( tqparent, name ) +K3bOggVorbisDecoderFactory::K3bOggVorbisDecoderFactory( TQObject* parent, const char* name ) + : K3bAudioDecoderFactory( parent, name ) { } @@ -220,10 +220,10 @@ K3bOggVorbisDecoderFactory::~K3bOggVorbisDecoderFactory() } -K3bAudioDecoder* K3bOggVorbisDecoderFactory::createDecoder( TQObject* tqparent, +K3bAudioDecoder* K3bOggVorbisDecoderFactory::createDecoder( TQObject* parent, const char* name ) const { - return new K3bOggVorbisDecoder( tqparent, name ); + return new K3bOggVorbisDecoder( parent, name ); } diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.h b/plugins/decoder/ogg/k3boggvorbisdecoder.h index 47c1709..9fdc715 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.h +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.h @@ -29,14 +29,14 @@ class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory TQ_OBJECT public: - K3bOggVorbisDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); + K3bOggVorbisDecoderFactory( TQObject* parent = 0, const char* name = 0 ); ~K3bOggVorbisDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, + K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const; }; @@ -50,7 +50,7 @@ class K3bOggVorbisDecoder : public K3bAudioDecoder TQ_OBJECT public: - K3bOggVorbisDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bOggVorbisDecoder( TQObject* parent = 0, const char* name = 0 ); ~K3bOggVorbisDecoder(); void cleanup(); diff --git a/plugins/decoder/skeleton.cpp b/plugins/decoder/skeleton.cpp index 7b627b1..0e31ded 100644 --- a/plugins/decoder/skeleton.cpp +++ b/plugins/decoder/skeleton.cpp @@ -23,8 +23,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3bdecoder, K3bPluginFactoryDecoderFactory>( "libk3bdecoder" ) ) -K3bDecoderFactory::K3bDecoderFactory( TQObject* tqparent, const char* name ) - : K3bAudioDecoderFactory( tqparent, name ) +K3bDecoderFactory::K3bDecoderFactory( TQObject* parent, const char* name ) + : K3bAudioDecoderFactory( parent, name ) { } @@ -34,10 +34,10 @@ K3bDecoderFactory::~K3bDecoderFactory() } -K3bAudioDecoder* K3bDecoderFactory::createDecoder( TQObject* tqparent, +K3bAudioDecoder* K3bDecoderFactory::createDecoder( TQObject* parent, const char* name ) const { - return new K3bDecoder( tqparent, name ); + return new K3bDecoder( parent, name ); } @@ -52,8 +52,8 @@ bool K3bDecoderFactory::canDecode( const KURL& url ) -K3bDecoder::K3bDecoder( TQObject* tqparent, const char* name ) - : K3bAudioDecoder( tqparent, name ) +K3bDecoder::K3bDecoder( TQObject* parent, const char* name ) + : K3bAudioDecoder( parent, name ) { } diff --git a/plugins/decoder/skeleton.h b/plugins/decoder/skeleton.h index 7b22113..1c7cff1 100644 --- a/plugins/decoder/skeleton.h +++ b/plugins/decoder/skeleton.h @@ -25,14 +25,14 @@ class K3bDecoderFactory : public K3bAudioDecoderFactory TQ_OBJECT public: - K3bDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); + K3bDecoderFactory( TQObject* parent = 0, const char* name = 0 ); ~K3bDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, + K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const; }; @@ -43,7 +43,7 @@ class K3bDecoder : public K3bAudioDecoder TQ_OBJECT public: - K3bDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bDecoder( TQObject* parent = 0, const char* name = 0 ); ~K3bDecoder(); TQString fileType() const; diff --git a/plugins/decoder/wave/k3bwavedecoder.cpp b/plugins/decoder/wave/k3bwavedecoder.cpp index 21f385e..1c0fd57 100644 --- a/plugins/decoder/wave/k3bwavedecoder.cpp +++ b/plugins/decoder/wave/k3bwavedecoder.cpp @@ -197,8 +197,8 @@ public: }; -K3bWaveDecoder::K3bWaveDecoder( TQObject* tqparent, const char* name ) - : K3bAudioDecoder( tqparent, name ) +K3bWaveDecoder::K3bWaveDecoder( TQObject* parent, const char* name ) + : K3bAudioDecoder( parent, name ) { d = new Private(); d->file = new TQFile(); @@ -358,8 +358,8 @@ TQString K3bWaveDecoder::technicalInfo( const TQString& name ) const } -K3bWaveDecoderFactory::K3bWaveDecoderFactory( TQObject* tqparent, const char* name ) - : K3bAudioDecoderFactory( tqparent, name ) +K3bWaveDecoderFactory::K3bWaveDecoderFactory( TQObject* parent, const char* name ) + : K3bAudioDecoderFactory( parent, name ) { } @@ -369,10 +369,10 @@ K3bWaveDecoderFactory::~K3bWaveDecoderFactory() } -K3bAudioDecoder* K3bWaveDecoderFactory::createDecoder( TQObject* tqparent, +K3bAudioDecoder* K3bWaveDecoderFactory::createDecoder( TQObject* parent, const char* name ) const { - return new K3bWaveDecoder( tqparent, name ); + return new K3bWaveDecoder( parent, name ); } diff --git a/plugins/decoder/wave/k3bwavedecoder.h b/plugins/decoder/wave/k3bwavedecoder.h index ddef738..0fbc681 100644 --- a/plugins/decoder/wave/k3bwavedecoder.h +++ b/plugins/decoder/wave/k3bwavedecoder.h @@ -32,14 +32,14 @@ class LIBK3B_EXPORT K3bWaveDecoderFactory : public K3bAudioDecoderFactory TQ_OBJECT public: - K3bWaveDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ); + K3bWaveDecoderFactory( TQObject* parent = 0, const char* name = 0 ); ~K3bWaveDecoderFactory(); bool canDecode( const KURL& filename ); int pluginSystemVersion() const { return 3; } - K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, + K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const; }; @@ -50,7 +50,7 @@ class LIBK3B_EXPORT K3bWaveDecoder : public K3bAudioDecoder TQ_OBJECT public: - K3bWaveDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bWaveDecoder( TQObject* parent = 0, const char* name = 0 ); ~K3bWaveDecoder(); void cleanup(); diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index 6db4ea3..7f54bf9 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -99,8 +99,8 @@ public: }; -K3bExternalEncoder::K3bExternalEncoder( TQObject* tqparent, const char* name ) - : K3bAudioEncoder( tqparent, name ) +K3bExternalEncoder::K3bExternalEncoder( TQObject* parent, const char* name ) + : K3bAudioEncoder( parent, name ) { d = new Private(); } @@ -370,10 +370,10 @@ TQString K3bExternalEncoder::fileTypeComment( const TQString& ext ) const } -K3bPluginConfigWidget* K3bExternalEncoder::createConfigWidget( TQWidget* tqparent, +K3bPluginConfigWidget* K3bExternalEncoder::createConfigWidget( TQWidget* parent, const char* name ) const { - return new K3bExternalEncoderSettingsWidget( tqparent, name ); + return new K3bExternalEncoderSettingsWidget( parent, name ); } diff --git a/plugins/encoder/external/k3bexternalencoder.h b/plugins/encoder/external/k3bexternalencoder.h index 266299f..85a4491 100644 --- a/plugins/encoder/external/k3bexternalencoder.h +++ b/plugins/encoder/external/k3bexternalencoder.h @@ -30,7 +30,7 @@ class K3bExternalEncoder : public K3bAudioEncoder TQ_OBJECT public: - K3bExternalEncoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bExternalEncoder( TQObject* parent = 0, const char* name = 0 ); ~K3bExternalEncoder(); TQStringList extensions() const; @@ -39,7 +39,7 @@ class K3bExternalEncoder : public K3bAudioEncoder int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent, + K3bPluginConfigWidget* createConfigWidget( TQWidget* parent, const char* name ) const; /** diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index 473c2ab..7f2b289 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -30,12 +30,12 @@ -K3bExternalEncoderEditDialog::K3bExternalEncoderEditDialog( TQWidget* tqparent ) +K3bExternalEncoderEditDialog::K3bExternalEncoderEditDialog( TQWidget* parent ) : KDialogBase( Swallow, i18n("Editing external audio encoder"), Ok|Cancel, Ok, - tqparent ) + parent ) { m_editW = new base_K3bExternalEncoderEditWidget( this ); setMainWidget( m_editW ); @@ -109,8 +109,8 @@ public: }; -K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( TQWidget* tqparent, const char* name ) - : K3bPluginConfigWidget( tqparent, name ) +K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( TQWidget* parent, const char* name ) + : K3bPluginConfigWidget( parent, name ) { d = new Private(); diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.h b/plugins/encoder/external/k3bexternalencoderconfigwidget.h index c8c607a..ee4a467 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.h +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.h @@ -30,7 +30,7 @@ class K3bExternalEncoderEditDialog : public KDialogBase TQ_OBJECT public: - K3bExternalEncoderEditDialog( TQWidget* tqparent ); + K3bExternalEncoderEditDialog( TQWidget* parent ); ~K3bExternalEncoderEditDialog(); K3bExternalEncoderCommand currentCommand() const; @@ -50,7 +50,7 @@ class K3bExternalEncoderSettingsWidget : public K3bPluginConfigWidget TQ_OBJECT public: - K3bExternalEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bExternalEncoderSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bExternalEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index 19cbf16..8946f19 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -142,8 +142,8 @@ public: -K3bLameEncoder::K3bLameEncoder( TQObject* tqparent, const char* name ) - : K3bAudioEncoder( tqparent, name ) +K3bLameEncoder::K3bLameEncoder( TQObject* parent, const char* name ) + : K3bAudioEncoder( parent, name ) { d = new Private(); } @@ -398,8 +398,8 @@ void K3bLameEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, cons -K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* tqparent, const char* name ) - : K3bPluginConfigWidget( tqparent, name ) +K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* parent, const char* name ) + : K3bPluginConfigWidget( parent, name ) { m_w = new base_K3bLameEncoderSettingsWidget( this ); m_w->m_sliderQuality->setRange( 0, 9 ); @@ -617,10 +617,10 @@ long long K3bLameEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const } -K3bPluginConfigWidget* K3bLameEncoder::createConfigWidget( TQWidget* tqparent, +K3bPluginConfigWidget* K3bLameEncoder::createConfigWidget( TQWidget* parent, const char* name ) const { - return new K3bLameEncoderSettingsWidget( tqparent, name ); + return new K3bLameEncoderSettingsWidget( parent, name ); } diff --git a/plugins/encoder/lame/k3blameencoder.h b/plugins/encoder/lame/k3blameencoder.h index 25f5975..4e3a5dd 100644 --- a/plugins/encoder/lame/k3blameencoder.h +++ b/plugins/encoder/lame/k3blameencoder.h @@ -33,7 +33,7 @@ class K3bLameEncoder : public K3bAudioEncoder TQ_OBJECT public: - K3bLameEncoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bLameEncoder( TQObject* parent = 0, const char* name = 0 ); ~K3bLameEncoder(); bool openFile( const TQString& extension, const TQString& filename, const K3b::Msf& length ); @@ -49,7 +49,7 @@ class K3bLameEncoder : public K3bAudioEncoder int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* parent = 0, const char* name = 0 ) const; private: @@ -69,7 +69,7 @@ class K3bLameEncoderSettingsWidget : public K3bPluginConfigWidget TQ_OBJECT public: - K3bLameEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bLameEncoderSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bLameEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index 22f49a6..7878497 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -124,8 +124,8 @@ public: }; -K3bOggVorbisEncoder::K3bOggVorbisEncoder( TQObject* tqparent, const char* name ) - : K3bAudioEncoder( tqparent, name ) +K3bOggVorbisEncoder::K3bOggVorbisEncoder( TQObject* parent, const char* name ) + : K3bAudioEncoder( parent, name ) { d = new Private(); } @@ -426,8 +426,8 @@ void K3bOggVorbisEncoder::loadConfig() -K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( TQWidget* tqparent, const char* name ) - : K3bPluginConfigWidget( tqparent, name ) +K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( TQWidget* parent, const char* name ) + : K3bPluginConfigWidget( parent, name ) { w = new base_K3bOggVorbisEncoderSettingsWidget( this ); @@ -545,10 +545,10 @@ long long K3bOggVorbisEncoder::fileSize( const TQString&, const K3b::Msf& msf ) } -K3bPluginConfigWidget* K3bOggVorbisEncoder::createConfigWidget( TQWidget* tqparent, +K3bPluginConfigWidget* K3bOggVorbisEncoder::createConfigWidget( TQWidget* parent, const char* name ) const { - return new K3bOggVorbisEncoderSettingsWidget( tqparent, name ); + return new K3bOggVorbisEncoderSettingsWidget( parent, name ); } diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.h b/plugins/encoder/ogg/k3boggvorbisencoder.h index 801021f..55e1f4b 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.h +++ b/plugins/encoder/ogg/k3boggvorbisencoder.h @@ -30,7 +30,7 @@ class K3bOggVorbisEncoder : public K3bAudioEncoder TQ_OBJECT public: - K3bOggVorbisEncoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bOggVorbisEncoder( TQObject* parent = 0, const char* name = 0 ); ~K3bOggVorbisEncoder(); TQStringList extensions() const { return TQStringList("ogg"); } @@ -41,7 +41,7 @@ class K3bOggVorbisEncoder : public K3bAudioEncoder int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* parent = 0, const char* name = 0 ) const; private: @@ -66,7 +66,7 @@ class K3bOggVorbisEncoderSettingsWidget : public K3bPluginConfigWidget TQ_OBJECT public: - K3bOggVorbisEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bOggVorbisEncoderSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bOggVorbisEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp index ef1a1c9..e7cc01e 100644 --- a/plugins/encoder/skeleton.cpp +++ b/plugins/encoder/skeleton.cpp @@ -25,8 +25,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3bencoder, K3bPluginFactoryEncoder>( "libk3bencoder" ) ) -K3bEncoder::K3bEncoder( TQObject* tqparent, const char* name ) - : K3bAudioEncoder( tqparent, name ) +K3bEncoder::K3bEncoder( TQObject* parent, const char* name ) + : K3bAudioEncoder( parent, name ) { } @@ -83,16 +83,16 @@ long long K3bEncoder::fileSize( const TQString&, const K3b::Msf& msf ) con } -K3bPluginConfigWidget* K3bEncoder::createConfigWidget( TQWidget* tqparent, +K3bPluginConfigWidget* K3bEncoder::createConfigWidget( TQWidget* parent, const char* name ) const { - return new K3bEncoderSettingsWidget( tqparent, name ); + return new K3bEncoderSettingsWidget( parent, name ); } -K3bEncoderSettingsWidget::K3bEncoderSettingsWidget( TQWidget* tqparent, const char* name ) - : K3bPluginConfigWidget( tqparent, name ) +K3bEncoderSettingsWidget::K3bEncoderSettingsWidget( TQWidget* parent, const char* name ) + : K3bPluginConfigWidget( parent, name ) { } diff --git a/plugins/encoder/skeleton.h b/plugins/encoder/skeleton.h index 49258f3..edcf308 100644 --- a/plugins/encoder/skeleton.h +++ b/plugins/encoder/skeleton.h @@ -27,7 +27,7 @@ class K3bEncoder : public K3bAudioEncoder TQ_OBJECT public: - K3bEncoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bEncoder( TQObject* parent = 0, const char* name = 0 ); ~K3bEncoder(); TQStringList extensions() const; @@ -38,7 +38,7 @@ class K3bEncoder : public K3bAudioEncoder int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* parent = 0, const char* name = 0 ) const; private: @@ -55,7 +55,7 @@ class K3bEncoderSettingsWidget : public K3bPluginConfigWidget TQ_OBJECT public: - K3bEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bEncoderSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index b9097d3..ee69541 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -122,8 +122,8 @@ public: }; -K3bSoxEncoder::K3bSoxEncoder( TQObject* tqparent, const char* name ) - : K3bAudioEncoder( tqparent, name ) +K3bSoxEncoder::K3bSoxEncoder( TQObject* parent, const char* name ) + : K3bAudioEncoder( parent, name ) { if( k3bcore->externalBinManager()->program( "sox" ) == 0 ) k3bcore->externalBinManager()->addProgram( new K3bSoxProgram() ); @@ -364,16 +364,16 @@ long long K3bSoxEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const } -K3bPluginConfigWidget* K3bSoxEncoder::createConfigWidget( TQWidget* tqparent, +K3bPluginConfigWidget* K3bSoxEncoder::createConfigWidget( TQWidget* parent, const char* name ) const { - return new K3bSoxEncoderSettingsWidget( tqparent, name ); + return new K3bSoxEncoderSettingsWidget( parent, name ); } -K3bSoxEncoderSettingsWidget::K3bSoxEncoderSettingsWidget( TQWidget* tqparent, const char* name ) - : K3bPluginConfigWidget( tqparent, name ) +K3bSoxEncoderSettingsWidget::K3bSoxEncoderSettingsWidget( TQWidget* parent, const char* name ) + : K3bPluginConfigWidget( parent, name ) { w = new base_K3bSoxEncoderConfigWidget( this ); w->m_editSamplerate->setValidator( new TQIntValidator( TQT_TQOBJECT(w->m_editSamplerate) ) ); diff --git a/plugins/encoder/sox/k3bsoxencoder.h b/plugins/encoder/sox/k3bsoxencoder.h index 1a923c9..6e38f35 100644 --- a/plugins/encoder/sox/k3bsoxencoder.h +++ b/plugins/encoder/sox/k3bsoxencoder.h @@ -30,7 +30,7 @@ class K3bSoxEncoder : public K3bAudioEncoder TQ_OBJECT public: - K3bSoxEncoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bSoxEncoder( TQObject* parent = 0, const char* name = 0 ); ~K3bSoxEncoder(); TQStringList extensions() const; @@ -41,7 +41,7 @@ class K3bSoxEncoder : public K3bAudioEncoder int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* parent = 0, const char* name = 0 ) const; /** @@ -70,7 +70,7 @@ class K3bSoxEncoderSettingsWidget : public K3bPluginConfigWidget TQ_OBJECT public: - K3bSoxEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bSoxEncoderSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bSoxEncoderSettingsWidget(); public slots: diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index db68657..5211b36 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -74,9 +74,9 @@ public: K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc* doc, - TQWidget* tqparent, + TQWidget* parent, const char* name ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { d = new Private(); d->doc = dynamic_cast(doc); @@ -352,14 +352,14 @@ TQString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) bool K3bAudioMetainfoRenamerPluginWidget::existsOtherItemWithSameName( K3bFileItem* item, const TQString& name ) { - K3bDirItem* dir = item->tqparent(); + K3bDirItem* dir = item->parent(); K3bDataItem* otherItem = dir->find( name ); if( otherItem && otherItem != item ) return true; TQListViewItem* dirViewItem = d->dirItemDict[dir]; TQListViewItem* current = dirViewItem->firstChild(); - while( current && current->tqparent() == dirViewItem ) { + while( current && current->parent() == dirViewItem ) { if( current->text(0) == name ) return true; current = current->nextSibling(); @@ -370,9 +370,9 @@ bool K3bAudioMetainfoRenamerPluginWidget::existsOtherItemWithSameName( K3bFileIt -K3bAudioMetainfoRenamerPlugin::K3bAudioMetainfoRenamerPlugin( TQObject* tqparent, +K3bAudioMetainfoRenamerPlugin::K3bAudioMetainfoRenamerPlugin( TQObject* parent, const char* name ) - : K3bProjectPlugin( DATA_PROJECTS, true, tqparent, name ) + : K3bProjectPlugin( DATA_PROJECTS, true, parent, name ) { setText( i18n("Rename Audio Files") ); setToolTip( i18n("Rename audio files based on their meta info.") ); @@ -384,9 +384,9 @@ K3bAudioMetainfoRenamerPlugin::~K3bAudioMetainfoRenamerPlugin() } -K3bProjectPluginGUIBase* K3bAudioMetainfoRenamerPlugin::createGUI( K3bDoc* doc, TQWidget* tqparent, const char* name ) +K3bProjectPluginGUIBase* K3bAudioMetainfoRenamerPlugin::createGUI( K3bDoc* doc, TQWidget* parent, const char* name ) { - return new K3bAudioMetainfoRenamerPluginWidget( doc, tqparent, name ); + return new K3bAudioMetainfoRenamerPluginWidget( doc, parent, name ); } #include "k3baudiometainforenamerplugin.moc" diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h index 66f5167..e64e81d 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h @@ -33,7 +33,7 @@ class K3bAudioMetainfoRenamerPluginWidget : public TQWidget, public K3bProjectPl TQ_OBJECT public: - K3bAudioMetainfoRenamerPluginWidget( K3bDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioMetainfoRenamerPluginWidget( K3bDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioMetainfoRenamerPluginWidget(); TQWidget* qWidget() { return this; } @@ -51,7 +51,7 @@ class K3bAudioMetainfoRenamerPluginWidget : public TQWidget, public K3bProjectPl void slotScanClicked(); private: - void scanDir( K3bDirItem*, TQListViewItem* tqparent ); + void scanDir( K3bDirItem*, TQListViewItem* parent ); TQString createNewName( K3bFileItem* ); bool existsOtherItemWithSameName( K3bFileItem*, const TQString& ); @@ -66,7 +66,7 @@ class K3bAudioMetainfoRenamerPlugin : public K3bProjectPlugin TQ_OBJECT public: - K3bAudioMetainfoRenamerPlugin( TQObject* tqparent, const char* name ); + K3bAudioMetainfoRenamerPlugin( TQObject* parent, const char* name ); ~K3bAudioMetainfoRenamerPlugin(); int pluginSystemVersion() const { return 3; } diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp index 844071b..2f93124 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp @@ -44,9 +44,9 @@ K_EXPORT_COMPONENT_FACTORY( libk3baudioprojectcddbplugin, K3bPluginFactory( "libk3baudioprojectcddbplugin" ) ) -K3bAudioProjectCddbPlugin::K3bAudioProjectCddbPlugin( TQObject* tqparent, +K3bAudioProjectCddbPlugin::K3bAudioProjectCddbPlugin( TQObject* parent, const char* name ) - : K3bProjectPlugin( AUDIO_CD, false, tqparent, name ), + : K3bProjectPlugin( AUDIO_CD, false, parent, name ), m_cddb(0), m_progress(0) { @@ -61,14 +61,14 @@ K3bAudioProjectCddbPlugin::~K3bAudioProjectCddbPlugin() } -void K3bAudioProjectCddbPlugin::activate( K3bDoc* doc, TQWidget* tqparent ) +void K3bAudioProjectCddbPlugin::activate( K3bDoc* doc, TQWidget* parent ) { m_doc = dynamic_cast( doc ); - m_parentWidget = tqparent; + m_parentWidget = parent; m_canceled = false; if( !m_doc || m_doc->numOfTracks() == 0 ) { - KMessageBox::sorry( tqparent, i18n("Please select a non-empty audio project for a cddb query.") ); + KMessageBox::sorry( parent, i18n("Please select a non-empty audio project for a cddb query.") ); } else { if( !m_cddb ) { @@ -77,7 +77,7 @@ void K3bAudioProjectCddbPlugin::activate( K3bDoc* doc, TQWidget* tqparent ) this, TQT_SLOT(slotCddbQueryFinished(int)) ); } if( !m_progress ) { - m_progress = new K3bProgressDialog( i18n("Query Cddb"), tqparent, i18n("Audio Project") ); + m_progress = new K3bProgressDialog( i18n("Query Cddb"), parent, i18n("Audio Project") ); connect( m_progress, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelClicked()) ); } @@ -141,7 +141,7 @@ void K3bAudioProjectCddbPlugin::slotCddbQueryFinished( int error ) } } - // make sure the progress dialog does not get deleted by it's tqparent + // make sure the progress dialog does not get deleted by it's parent delete m_progress; m_doc = 0; m_parentWidget = 0; diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h index 40aabd5..b53a472 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h @@ -30,12 +30,12 @@ class K3bAudioProjectCddbPlugin : public K3bProjectPlugin TQ_OBJECT public: - K3bAudioProjectCddbPlugin( TQObject* tqparent, const char* name ); + K3bAudioProjectCddbPlugin( TQObject* parent, const char* name ); ~K3bAudioProjectCddbPlugin(); int pluginSystemVersion() const { return 3; } - void activate( K3bDoc* doc, TQWidget* tqparent ); + void activate( K3bDoc* doc, TQWidget* parent ); private slots: void slotCddbQueryFinished( int result ); diff --git a/src/k3b.cpp b/src/k3b.cpp index f11780b..33fa52a 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -776,10 +776,10 @@ bool K3bMainWindow::queryClose() // // // // now here we have the problem that due to the whole TQt event thing the exec call (or // // in this case most likely the startJob call) does not return until we leave this method. -// // That means that the progress dialog might be deleted by it's tqparent below (when we +// // That means that the progress dialog might be deleted by it's parent below (when we // // close docs) before it is deleted by the creator (most likely a projectburndialog). // // That would result in a double deletion and thus a crash. -// // So we just reparent the dialog to 0 here so it's (former) tqparent won't delete it. +// // So we just reparent the dialog to 0 here so it's (former) parent won't delete it. // // // progressDialog->reparent( 0, TQPoint(0,0) ); // } diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp index 1cf13ae..776df75 100644 --- a/src/k3bappdevicemanager.cpp +++ b/src/k3bappdevicemanager.cpp @@ -31,8 +31,8 @@ #include -K3bAppDeviceManager::K3bAppDeviceManager( TQObject* tqparent, const char* name ) - : K3bDevice::DeviceManager( tqparent, name ), +K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name ) + : K3bDevice::DeviceManager( parent, name ), m_currentDevice(0), m_ejectRequested(false) { diff --git a/src/k3bappdevicemanager.h b/src/k3bappdevicemanager.h index 2fe7925..280b271 100644 --- a/src/k3bappdevicemanager.h +++ b/src/k3bappdevicemanager.h @@ -43,7 +43,7 @@ class K3bAppDeviceManager : public K3bDevice::DeviceManager TQ_OBJECT public: - K3bAppDeviceManager( TQObject* tqparent = 0, const char* name = 0 ); + K3bAppDeviceManager( TQObject* parent = 0, const char* name = 0 ); ~K3bAppDeviceManager(); K3bDevice::Device* currentDevice() const; diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index 73fd5fb..b9640bc 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -315,8 +315,8 @@ void K3bApplication::slotShutDown() -K3bApplication::Core::Core( TQObject* tqparent ) - : K3bCore( tqparent ), +K3bApplication::Core::Core( TQObject* parent ) + : K3bCore( parent ), m_appDeviceManager(0), m_mediaCache(0) { @@ -424,7 +424,7 @@ bool K3bApplication::Core::internalBlockDevice( K3bDevice::Device* dev ) // // Check if the device is in use // - // FIXME: Use the top level widget as tqparent + // FIXME: Use the top level widget as parent K3bLsofWrapperDialog::checkDevice( dev ); return true; diff --git a/src/k3bapplication.h b/src/k3bapplication.h index 0f64201..ffee2b0 100644 --- a/src/k3bapplication.h +++ b/src/k3bapplication.h @@ -79,7 +79,7 @@ class K3bApplication::Core : public K3bCore TQ_OBJECT public: - Core( TQObject* tqparent ); + Core( TQObject* parent ); ~Core(); void init(); diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp index 6f44693..5832940 100644 --- a/src/k3baudioplayer.cpp +++ b/src/k3baudioplayer.cpp @@ -49,16 +49,16 @@ using namespace std; -K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* tqparent ) - : KListViewItem( tqparent ), m_filename( filename ) +K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* parent ) + : KListViewItem( parent ), m_filename( filename ) { m_length = 0; m_bActive = false; } -K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* tqparent, TQListViewItem* after ) - : KListViewItem( tqparent, after ), m_filename( filename ) +K3bPlayListViewItem::K3bPlayListViewItem( const TQString& filename, TQListView* parent, TQListViewItem* after ) + : KListViewItem( parent, after ), m_filename( filename ) { m_length = 0; m_bActive = false; @@ -110,8 +110,8 @@ void K3bPlayListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int c } -K3bPlayListView::K3bPlayListView( TQWidget* tqparent, const char* name ) - : KListView( tqparent, name ) +K3bPlayListView::K3bPlayListView( TQWidget* parent, const char* name ) + : KListView( parent, name ) { addColumn( i18n("Filename") ); addColumn( i18n("Length") ); @@ -154,8 +154,8 @@ TQDragObject* K3bPlayListView::dragObject() } -K3bAudioPlayer::K3bAudioPlayer( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) #ifdef WITH_ARTS , m_playObject( Arts::PlayObject::null() ) #endif diff --git a/src/k3baudioplayer.h b/src/k3baudioplayer.h index 9a4f0f0..1e32602 100644 --- a/src/k3baudioplayer.h +++ b/src/k3baudioplayer.h @@ -45,8 +45,8 @@ class KActionMenu; class K3bPlayListViewItem : public KListViewItem { public: - K3bPlayListViewItem( const TQString&, TQListView* tqparent ); - K3bPlayListViewItem( const TQString&, TQListView* tqparent, TQListViewItem* after ); + K3bPlayListViewItem( const TQString&, TQListView* parent ); + K3bPlayListViewItem( const TQString&, TQListView* parent, TQListViewItem* after ); ~K3bPlayListViewItem(); /** @returns the filename for the first column and the @@ -88,7 +88,7 @@ Q_OBJECT TQ_OBJECT public: - K3bPlayListView( TQWidget* tqparent = 0, const char* name = 0 ); + K3bPlayListView( TQWidget* parent = 0, const char* name = 0 ); ~K3bPlayListView(); protected: @@ -108,7 +108,7 @@ Q_OBJECT TQ_OBJECT public: - K3bAudioPlayer( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioPlayer( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioPlayer(); bool supportsMimetype( const TQString& mimetype ); diff --git a/src/k3bburnprogressdialog.cpp b/src/k3bburnprogressdialog.cpp index 32be32c..e6dcc55 100644 --- a/src/k3bburnprogressdialog.cpp +++ b/src/k3bburnprogressdialog.cpp @@ -33,9 +33,9 @@ #include -K3bBurnProgressDialog::K3bBurnProgressDialog( TQWidget *tqparent, const char *name, bool showSubProgress, +K3bBurnProgressDialog::K3bBurnProgressDialog( TQWidget *parent, const char *name, bool showSubProgress, bool modal, WFlags wf ) - : K3bJobProgressDialog(tqparent,name, showSubProgress, modal, wf) + : K3bJobProgressDialog(parent,name, showSubProgress, modal, wf) { m_labelWritingSpeed = new TQLabel( m_frameExtraInfo, "m_labelWritingSpeed" ); // m_labelWritingSpeed->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); diff --git a/src/k3bburnprogressdialog.h b/src/k3bburnprogressdialog.h index 11a0afb..2b7efb0 100644 --- a/src/k3bburnprogressdialog.h +++ b/src/k3bburnprogressdialog.h @@ -33,7 +33,7 @@ class K3bBurnProgressDialog : public K3bJobProgressDialog { TQ_OBJECT public: - K3bBurnProgressDialog( TQWidget* tqparent = 0, const char* name = 0, bool showSubProgress = true, + K3bBurnProgressDialog( TQWidget* parent = 0, const char* name = 0, bool showSubProgress = true, bool modal = true, WFlags = 0 ); ~K3bBurnProgressDialog(); diff --git a/src/k3bcontentsview.cpp b/src/k3bcontentsview.cpp index 536fa53..2cafbf2 100644 --- a/src/k3bcontentsview.cpp +++ b/src/k3bcontentsview.cpp @@ -23,9 +23,9 @@ K3bContentsView::K3bContentsView( bool withHeader, - TQWidget* tqparent, + TQWidget* parent, const char* name ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), m_header(0), m_centerWidget(0) { diff --git a/src/k3bcontentsview.h b/src/k3bcontentsview.h index 48c4751..dabc80a 100644 --- a/src/k3bcontentsview.h +++ b/src/k3bcontentsview.h @@ -33,7 +33,7 @@ class K3bContentsView : public TQWidget protected: K3bContentsView( bool withHeader, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0 ); TQWidget* mainWidget(); diff --git a/src/k3bdatamodewidget.cpp b/src/k3bdatamodewidget.cpp index 6072ebd..7b10ff6 100644 --- a/src/k3bdatamodewidget.cpp +++ b/src/k3bdatamodewidget.cpp @@ -28,8 +28,8 @@ static const int s_mode1Index = 1; static const int s_mode2Index = 2; -K3bDataModeWidget::K3bDataModeWidget( TQWidget* tqparent, const char* name ) - : TQComboBox( false, tqparent, name ) +K3bDataModeWidget::K3bDataModeWidget( TQWidget* parent, const char* name ) + : TQComboBox( false, parent, name ) { insertItem( i18n("Auto"), s_autoIndex ); insertItem( i18n("Mode1"), s_mode1Index ); diff --git a/src/k3bdatamodewidget.h b/src/k3bdatamodewidget.h index e5277c9..b072675 100644 --- a/src/k3bdatamodewidget.h +++ b/src/k3bdatamodewidget.h @@ -29,7 +29,7 @@ class K3bDataModeWidget : public TQComboBox TQ_OBJECT public: - K3bDataModeWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataModeWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataModeWidget(); /** diff --git a/src/k3bdataprojectinterface.cpp b/src/k3bdataprojectinterface.cpp index d1773e4..3a115e5 100644 --- a/src/k3bdataprojectinterface.cpp +++ b/src/k3bdataprojectinterface.cpp @@ -38,9 +38,9 @@ bool K3bDataProjectInterface::createFolder( const TQString& name ) } -bool K3bDataProjectInterface::createFolder( const TQString& name, const TQString& tqparent ) +bool K3bDataProjectInterface::createFolder( const TQString& name, const TQString& parent ) { - K3bDataItem* p = m_dataDoc->root()->findByPath( tqparent ); + K3bDataItem* p = m_dataDoc->root()->findByPath( parent ); if( p && p->isDir() && !static_cast(p)->find( name ) ) { m_dataDoc->addEmptyDir( name, static_cast(p) ); return true; @@ -49,15 +49,15 @@ bool K3bDataProjectInterface::createFolder( const TQString& name, const TQString } -void K3bDataProjectInterface::addUrl( const TQString& url, const TQString& tqparent ) +void K3bDataProjectInterface::addUrl( const TQString& url, const TQString& parent ) { - addUrls( TQStringList(url), tqparent ); + addUrls( TQStringList(url), parent ); } -void K3bDataProjectInterface::addUrls( const TQStringList& urls, const TQString& tqparent ) +void K3bDataProjectInterface::addUrls( const TQStringList& urls, const TQString& parent ) { - K3bDataItem* p = m_dataDoc->root()->findByPath( tqparent ); + K3bDataItem* p = m_dataDoc->root()->findByPath( parent ); if( p && p->isDir() ) m_dataDoc->addUrls( KURL::List(urls), static_cast(p) ); } diff --git a/src/k3bdataprojectinterface.h b/src/k3bdataprojectinterface.h index c4edfd8..0cc9229 100644 --- a/src/k3bdataprojectinterface.h +++ b/src/k3bdataprojectinterface.h @@ -41,16 +41,16 @@ class K3bDataProjectInterface : public K3bProjectInterface /** * Create a new folder with name @p name in the folder with the - * absolute path @p tqparent. + * absolute path @p parent. * * \return true if the folder was created successfully, false if - * an item with the same name already exists or the tqparent + * an item with the same name already exists or the parent * directory could not be found. * * Example: createFolder( "test", "/foo/bar" ) will create the * folder /foo/bar/test. */ - bool createFolder( const TQString& name, const TQString& tqparent ); + bool createFolder( const TQString& name, const TQString& parent ); /** * Add urls to a specific folder in the project. @@ -58,9 +58,9 @@ class K3bDataProjectInterface : public K3bProjectInterface * Example: addUrl( "test.txt", "/foo/bar" ) will add the file test.txt * to folder /foo/bar. */ - void addUrl( const TQString& url, const TQString& tqparent ); + void addUrl( const TQString& url, const TQString& parent ); - void addUrls( const TQStringList& urls, const TQString& tqparent ); + void addUrls( const TQStringList& urls, const TQString& parent ); /** * Remove an item diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index b497654..956f927 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -35,8 +35,8 @@ #include -K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, "debugViewDialog", true, i18n("Debugging Output"), Close|User1|User2, Close, +K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( TQWidget* parent ) + : KDialogBase( parent, "debugViewDialog", true, i18n("Debugging Output"), Close|User1|User2, Close, false, KStdGuiItem::saveAs(), KGuiItem( i18n("Copy"), "editcopy" ) ) diff --git a/src/k3bdebuggingoutputdialog.h b/src/k3bdebuggingoutputdialog.h index 6f335a6..485e4c2 100644 --- a/src/k3bdebuggingoutputdialog.h +++ b/src/k3bdebuggingoutputdialog.h @@ -27,7 +27,7 @@ class K3bDebuggingOutputDialog : public KDialogBase TQ_OBJECT public: - K3bDebuggingOutputDialog( TQWidget* tqparent ); + K3bDebuggingOutputDialog( TQWidget* parent ); public slots: void setOutput( const TQMap& ); diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp index 0f0b739..c498285 100644 --- a/src/k3bdiroperator.cpp +++ b/src/k3bdiroperator.cpp @@ -31,8 +31,8 @@ #include -K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* tqparent, const char* name ) - : KDirOperator( url, tqparent, name ) +K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* parent, const char* name ) + : KDirOperator( url, parent, name ) { setViewConfig( k3bcore->config(), "file view" ); setMode( KFile::Files ); diff --git a/src/k3bdiroperator.h b/src/k3bdiroperator.h index eb695d7..37034f1 100644 --- a/src/k3bdiroperator.h +++ b/src/k3bdiroperator.h @@ -36,7 +36,7 @@ class K3bDirOperator : public KDirOperator, public KBookmarkOwner TQ_OBJECT public: - K3bDirOperator( const KURL& urlName = KURL(), TQWidget* tqparent = 0, const char* name = 0 ); + K3bDirOperator( const KURL& urlName = KURL(), TQWidget* parent = 0, const char* name = 0 ); ~K3bDirOperator(); /** diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp index d2ab1e4..50c69b0 100644 --- a/src/k3bdirview.cpp +++ b/src/k3bdirview.cpp @@ -90,8 +90,8 @@ public: -K3bDirView::K3bDirView(K3bFileTreeView* treeView, TQWidget *tqparent, const char *name ) - : TQVBox(tqparent, name), +K3bDirView::K3bDirView(K3bFileTreeView* treeView, TQWidget *parent, const char *name ) + : TQVBox(parent, name), m_fileTreeView(treeView), m_bViewDiskInfo(false) { diff --git a/src/k3bdirview.h b/src/k3bdirview.h index e13899c..c818f82 100644 --- a/src/k3bdirview.h +++ b/src/k3bdirview.h @@ -55,7 +55,7 @@ class K3bDirView : public TQVBox TQ_OBJECT public: - K3bDirView(K3bFileTreeView* tree, TQWidget *tqparent=0, const char *name=0); + K3bDirView(K3bFileTreeView* tree, TQWidget *parent=0, const char *name=0); ~K3bDirView(); public slots: diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp index bb32911..028e020 100644 --- a/src/k3bdiskinfoview.cpp +++ b/src/k3bdiskinfoview.cpp @@ -51,22 +51,22 @@ class K3bDiskInfoView::HeaderViewItem : public KListViewItem { public: - HeaderViewItem( TQListView* tqparent ) - : KListViewItem( tqparent ) {} - HeaderViewItem( TQListViewItem* tqparent ) - : KListViewItem( tqparent ) {} - HeaderViewItem( TQListView* tqparent, TQListViewItem* after ) - : KListViewItem( tqparent, after ) {} - HeaderViewItem( TQListViewItem* tqparent, TQListViewItem* after ) - : KListViewItem( tqparent, after ) {} - HeaderViewItem( TQListView* tqparent, const TQString& t1 ) - : KListViewItem( tqparent, t1 ) {} - HeaderViewItem( TQListViewItem* tqparent, const TQString& t1 ) - : KListViewItem( tqparent, t1 ) {} - HeaderViewItem( TQListView* tqparent, TQListViewItem* after, const TQString& t1 ) - : KListViewItem( tqparent, after, t1 ) {} - HeaderViewItem( TQListViewItem* tqparent, TQListViewItem* after, const TQString& t1 ) - : KListViewItem( tqparent, after, t1 ) {} + HeaderViewItem( TQListView* parent ) + : KListViewItem( parent ) {} + HeaderViewItem( TQListViewItem* parent ) + : KListViewItem( parent ) {} + HeaderViewItem( TQListView* parent, TQListViewItem* after ) + : KListViewItem( parent, after ) {} + HeaderViewItem( TQListViewItem* parent, TQListViewItem* after ) + : KListViewItem( parent, after ) {} + HeaderViewItem( TQListView* parent, const TQString& t1 ) + : KListViewItem( parent, t1 ) {} + HeaderViewItem( TQListViewItem* parent, const TQString& t1 ) + : KListViewItem( parent, t1 ) {} + HeaderViewItem( TQListView* parent, TQListViewItem* after, const TQString& t1 ) + : KListViewItem( parent, after, t1 ) {} + HeaderViewItem( TQListViewItem* parent, TQListViewItem* after, const TQString& t1 ) + : KListViewItem( parent, after, t1 ) {} void paintCell( TQPainter* p, const TQColorGroup & cg, int column, int width, int align ) { @@ -81,22 +81,22 @@ public: class K3bDiskInfoView::TwoColumnViewItem : public KListViewItem { public: - TwoColumnViewItem( TQListView* tqparent ) - : KListViewItem( tqparent ) {} - TwoColumnViewItem( TQListViewItem* tqparent ) - : KListViewItem( tqparent ) {} - TwoColumnViewItem( TQListView* tqparent, TQListViewItem* after ) - : KListViewItem( tqparent, after ) {} - TwoColumnViewItem( TQListViewItem* tqparent, TQListViewItem* after ) - : KListViewItem( tqparent, after ) {} - TwoColumnViewItem( TQListView* tqparent, const TQString& t1 ) - : KListViewItem( tqparent, t1 ) {} - TwoColumnViewItem( TQListViewItem* tqparent, const TQString& t1 ) - : KListViewItem( tqparent, t1 ) {} - TwoColumnViewItem( TQListView* tqparent, TQListViewItem* after, const TQString& t1 ) - : KListViewItem( tqparent, after, t1 ) {} - TwoColumnViewItem( TQListViewItem* tqparent, TQListViewItem* after, const TQString& t1 ) - : KListViewItem( tqparent, after, t1 ) {} + TwoColumnViewItem( TQListView* parent ) + : KListViewItem( parent ) {} + TwoColumnViewItem( TQListViewItem* parent ) + : KListViewItem( parent ) {} + TwoColumnViewItem( TQListView* parent, TQListViewItem* after ) + : KListViewItem( parent, after ) {} + TwoColumnViewItem( TQListViewItem* parent, TQListViewItem* after ) + : KListViewItem( parent, after ) {} + TwoColumnViewItem( TQListView* parent, const TQString& t1 ) + : KListViewItem( parent, t1 ) {} + TwoColumnViewItem( TQListViewItem* parent, const TQString& t1 ) + : KListViewItem( parent, t1 ) {} + TwoColumnViewItem( TQListView* parent, TQListViewItem* after, const TQString& t1 ) + : KListViewItem( parent, after, t1 ) {} + TwoColumnViewItem( TQListViewItem* parent, TQListViewItem* after, const TQString& t1 ) + : KListViewItem( parent, after, t1 ) {} void paintCell( TQPainter* p, const TQColorGroup & cg, int column, int width, int align ) { @@ -124,12 +124,12 @@ public: -K3bDiskInfoView::K3bDiskInfoView( TQWidget* tqparent, const char* name ) +K3bDiskInfoView::K3bDiskInfoView( TQWidget* parent, const char* name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_ALL, K3bDevice::MEDIA_ALL|K3bDevice::MEDIA_UNKNOWN, K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE|K3bDevice::STATE_UNKNOWN, - tqparent, name ) + parent, name ) { m_infoView = new KListView( this ); setMainWidget( m_infoView ); @@ -247,7 +247,7 @@ void K3bDiskInfoView::reloadMedium() lastSession = track.session(); trackItem->setOpen(true); trackItem = new HeaderViewItem( trackHeaderItem, - m_infoView->lastItem()->tqparent(), + m_infoView->lastItem()->parent(), i18n("Session %1").tqarg(lastSession) ); } diff --git a/src/k3bdiskinfoview.h b/src/k3bdiskinfoview.h index d5cf3a8..e86588c 100644 --- a/src/k3bdiskinfoview.h +++ b/src/k3bdiskinfoview.h @@ -36,7 +36,7 @@ class K3bDiskInfoView : public K3bMediaContentsView TQ_OBJECT public: - K3bDiskInfoView( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDiskInfoView( TQWidget* parent = 0, const char* name = 0 ); ~K3bDiskInfoView(); void enableInteraction( bool enable ); diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index a361994..619db8c 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -84,10 +84,10 @@ public: -K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* tqparent, const char* name ) +K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("Waiting for Disk"), KDialogBase::Cancel|KDialogBase::User1|KDialogBase::User2|KDialogBase::User3, - KDialogBase::User3, tqparent, name, true, true, i18n("Force"), i18n("Eject"), i18n("Load") ) + KDialogBase::User3, parent, name, true, true, i18n("Force"), i18n("Eject"), i18n("Load") ) { d = new Private(); d->device = device; @@ -683,9 +683,9 @@ void K3bEmptyDiscWaiter::slotReloadingAfterErasingFinished( K3bDevice::DeviceHan } -int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, bool appendable, int mediaType, TQWidget* tqparent ) +int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, bool appendable, int mediaType, TQWidget* parent ) { - K3bEmptyDiscWaiter d( device, tqparent ? tqparent : TQT_TQWIDGET(tqApp->activeWindow()) ); + K3bEmptyDiscWaiter d( device, parent ? parent : TQT_TQWIDGET(tqApp->activeWindow()) ); int mediaState = K3bDevice::STATE_EMPTY; if( appendable ) mediaState |= K3bDevice::STATE_INCOMPLETE; return d.waitForDisc( mediaState, mediaType ); @@ -696,16 +696,16 @@ int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, int mediaState, int mediaType, const TQString& message, - TQWidget* tqparent ) + TQWidget* parent ) { - K3bEmptyDiscWaiter d( device, tqparent ? tqparent : TQT_TQWIDGET(tqApp->activeWindow()) ); + K3bEmptyDiscWaiter d( device, parent ? parent : TQT_TQWIDGET(tqApp->activeWindow()) ); return d.waitForDisc( mediaState, mediaType, message ); } void K3bEmptyDiscWaiter::prepareErasingDialog() { - // we hide the emptydiskwaiter so the info dialog needs to have the same tqparent + // we hide the emptydiskwaiter so the info dialog needs to have the same parent if( !d->erasingInfoDialog ) d->erasingInfoDialog = new K3bProgressDialog( TQString(), parentWidget() ); diff --git a/src/k3bemptydiscwaiter.h b/src/k3bemptydiscwaiter.h index 3d3f55c..865ff12 100644 --- a/src/k3bemptydiscwaiter.h +++ b/src/k3bemptydiscwaiter.h @@ -84,7 +84,7 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler static int wait( K3bDevice::Device* device, bool appendable = false, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); /** * Starts the emptydiskwaiter. @@ -97,7 +97,7 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler int mediaState, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, const TQString& message = TQString(), - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); protected slots: void slotCancel(); @@ -114,7 +114,7 @@ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler /** * Use the static wait methods. */ - explicit K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* tqparent = 0, const char* name = 0 ); + explicit K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* parent = 0, const char* name = 0 ); int waitForDisc( int mediaState = K3bDevice::STATE_EMPTY, int mediaType = K3bDevice::MEDIA_WRITABLE_CD, diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp index 50b58d4..a4b3d3a 100644 --- a/src/k3bfiletreecombobox.cpp +++ b/src/k3bfiletreecombobox.cpp @@ -53,8 +53,8 @@ public: }; -K3bFileTreeComboBox::K3bFileTreeComboBox( TQWidget* tqparent, const char* name ) - : KComboBox( true, tqparent, name ) +K3bFileTreeComboBox::K3bFileTreeComboBox( TQWidget* parent, const char* name ) + : KComboBox( true, parent, name ) { d = new Private; diff --git a/src/k3bfiletreecombobox.h b/src/k3bfiletreecombobox.h index 9e4af1f..e19569a 100644 --- a/src/k3bfiletreecombobox.h +++ b/src/k3bfiletreecombobox.h @@ -34,7 +34,7 @@ class K3bFileTreeComboBox : public KComboBox TQ_OBJECT public: - K3bFileTreeComboBox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bFileTreeComboBox( TQWidget* parent = 0, const char* name = 0 ); ~K3bFileTreeComboBox(); void popup(); diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 9ffdbd6..c56d1e5 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -151,10 +151,10 @@ K3bFileTreeBranch::K3bFileTreeBranch( KFileTreeView* view, -K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeViewItem* tqparent, +K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeViewItem* parent, K3bDevice::Device* dev, K3bDeviceBranch* branch ) - : KFileTreeViewItem( tqparent, + : KFileTreeViewItem( parent, new KFileItem( KURL( "media:/" + dev->blockDeviceName() ), "inode/directory", S_IFDIR ), @@ -165,10 +165,10 @@ K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeViewItem* tqparent, } -K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeView* tqparent, +K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeView* parent, K3bDevice::Device* dev, K3bDeviceBranch* branch ) - : KFileTreeViewItem( tqparent, + : KFileTreeViewItem( parent, new KFileItem( KURL( "media:/" + dev->blockDeviceName() ), "inode/directory", S_IFDIR ), @@ -279,14 +279,14 @@ TQString K3bDeviceBranchViewItem::key( int column, bool ascending ) const -K3bFileTreeViewItem::K3bFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch ) - : KFileTreeViewItem( tqparent, item, branch ) +K3bFileTreeViewItem::K3bFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch ) + : KFileTreeViewItem( parent, item, branch ) { } -K3bFileTreeViewItem::K3bFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) - : KFileTreeViewItem( tqparent, item, branch ) +K3bFileTreeViewItem::K3bFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) + : KFileTreeViewItem( parent, item, branch ) { } @@ -300,7 +300,7 @@ TQString K3bFileTreeViewItem::key( int column, bool ascending ) const class K3bDeviceTreeToolTip : public K3bToolTip { public: - K3bDeviceTreeToolTip( TQWidget* tqparent, K3bFileTreeView* lv ); + K3bDeviceTreeToolTip( TQWidget* parent, K3bFileTreeView* lv ); void maybeTip( const TQPoint &pos ); @@ -309,8 +309,8 @@ private: }; -K3bDeviceTreeToolTip::K3bDeviceTreeToolTip( TQWidget* tqparent, K3bFileTreeView* lv ) - : K3bToolTip( tqparent ), +K3bDeviceTreeToolTip::K3bDeviceTreeToolTip( TQWidget* parent, K3bFileTreeView* lv ) + : K3bToolTip( parent ), m_view( lv ) { setTipTimeout( 500 ); @@ -396,8 +396,8 @@ public: K3bDeviceTreeToolTip* toolTip; }; -K3bFileTreeView::K3bFileTreeView( TQWidget *tqparent, const char *name ) - : KFileTreeView( tqparent, name ) +K3bFileTreeView::K3bFileTreeView( TQWidget *parent, const char *name ) + : KFileTreeView( parent, name ) { d = new Private(); diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h index b44af66..03d0f87 100644 --- a/src/k3bfiletreeview.h +++ b/src/k3bfiletreeview.h @@ -120,7 +120,7 @@ class K3bFileTreeView : public KFileTreeView TQ_OBJECT public: - K3bFileTreeView( TQWidget *tqparent = 0, const char *name = 0 ); + K3bFileTreeView( TQWidget *parent = 0, const char *name = 0 ); ~K3bFileTreeView(); diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp index 910dc60..556bab3 100644 --- a/src/k3bfileview.cpp +++ b/src/k3bfileview.cpp @@ -43,8 +43,8 @@ #include -K3bFileView::K3bFileView(TQWidget *tqparent, const char *name ) - : K3bContentsView( false, tqparent, name) +K3bFileView::K3bFileView(TQWidget *parent, const char *name ) + : K3bContentsView( false, parent, name) { setupGUI(); } diff --git a/src/k3bfileview.h b/src/k3bfileview.h index 923125a..67af808 100644 --- a/src/k3bfileview.h +++ b/src/k3bfileview.h @@ -40,7 +40,7 @@ class K3bFileView : public K3bContentsView TQ_OBJECT public: - K3bFileView(TQWidget *tqparent=0, const char *name=0); + K3bFileView(TQWidget *parent=0, const char *name=0); ~K3bFileView(); void setUrl( const KURL &url, bool forward = true ); diff --git a/src/k3bfirstrun.cpp b/src/k3bfirstrun.cpp index 37eee7a..f27d927 100644 --- a/src/k3bfirstrun.cpp +++ b/src/k3bfirstrun.cpp @@ -26,7 +26,7 @@ #include -void K3bFirstRun::run( TQWidget* tqparent ) +void K3bFirstRun::run( TQWidget* parent ) { if( !k3bcore->config()->readBoolEntry( "First run", true ) ) return; @@ -41,18 +41,18 @@ void K3bFirstRun::run( TQWidget* tqparent ) if( si.allInstalled() ) return; - K3bFirstRun dlg( tqparent ); + K3bFirstRun dlg( parent ); if( dlg.exec() == TQDialog::Accepted ) - si.install( tqparent ); + si.install( parent ); } -K3bFirstRun::K3bFirstRun( TQWidget* tqparent ) +K3bFirstRun::K3bFirstRun( TQWidget* parent ) : KDialogBase( Plain, i18n("First Run"), Ok|Cancel, Ok, - tqparent, + parent, 0, true, true ) diff --git a/src/k3bfirstrun.h b/src/k3bfirstrun.h index d67f688..b3b8fe0 100644 --- a/src/k3bfirstrun.h +++ b/src/k3bfirstrun.h @@ -25,10 +25,10 @@ class K3bFirstRun : public KDialogBase TQ_OBJECT public: - static void run( TQWidget* tqparent = 0 ); + static void run( TQWidget* parent = 0 ); private: - K3bFirstRun( TQWidget* tqparent ); + K3bFirstRun( TQWidget* parent ); ~K3bFirstRun(); }; diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp index b30104e..8d68f6f 100644 --- a/src/k3bflatbutton.cpp +++ b/src/k3bflatbutton.cpp @@ -27,16 +27,16 @@ #include -K3bFlatButton::K3bFlatButton( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name/*, WNoAutoErase*/ ), +K3bFlatButton::K3bFlatButton( TQWidget *parent, const char *name ) + : TQFrame( parent, name/*, WNoAutoErase*/ ), m_pressed(false) { init(); } -K3bFlatButton::K3bFlatButton( const TQString& text, TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name/*, WNoAutoErase*/ ), +K3bFlatButton::K3bFlatButton( const TQString& text, TQWidget *parent, const char *name ) + : TQFrame( parent, name/*, WNoAutoErase*/ ), m_pressed(false) { init(); @@ -44,8 +44,8 @@ K3bFlatButton::K3bFlatButton( const TQString& text, TQWidget *tqparent, const ch } -K3bFlatButton::K3bFlatButton( KAction* a, TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name/*, WNoAutoErase*/ ), +K3bFlatButton::K3bFlatButton( KAction* a, TQWidget *parent, const char *name ) + : TQFrame( parent, name/*, WNoAutoErase*/ ), m_pressed(false) { init(); diff --git a/src/k3bflatbutton.h b/src/k3bflatbutton.h index b3f97cf..171476d 100644 --- a/src/k3bflatbutton.h +++ b/src/k3bflatbutton.h @@ -35,9 +35,9 @@ class K3bFlatButton : public TQFrame TQ_OBJECT public: - K3bFlatButton( TQWidget *tqparent = 0, const char *name = 0 ); - K3bFlatButton( const TQString& text, TQWidget *tqparent = 0, const char *name = 0 ); - K3bFlatButton( KAction*, TQWidget *tqparent = 0, const char *name = 0 ); + K3bFlatButton( TQWidget *parent = 0, const char *name = 0 ); + K3bFlatButton( const TQString& text, TQWidget *parent = 0, const char *name = 0 ); + K3bFlatButton( KAction*, TQWidget *parent = 0, const char *name = 0 ); ~K3bFlatButton(); diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp index 1dc7a0f..88ab150 100644 --- a/src/k3binteractiondialog.cpp +++ b/src/k3binteractiondialog.cpp @@ -49,7 +49,7 @@ #include -K3bInteractionDialog::K3bInteractionDialog( TQWidget* tqparent, +K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent, const char* name, const TQString& title, const TQString& subTitle, @@ -58,7 +58,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* tqparent, const TQString& configGroup, bool modal, WFlags fl ) - : KDialog( tqparent, name, modal, fl ), + : KDialog( parent, name, modal, fl ), m_mainWidget(0), m_defaultButton(defaultButton), m_configGroup(configGroup), diff --git a/src/k3binteractiondialog.h b/src/k3binteractiondialog.h index 7e06465..f6978ed 100644 --- a/src/k3binteractiondialog.h +++ b/src/k3binteractiondialog.h @@ -51,7 +51,7 @@ class K3bInteractionDialog : public KDialog * @param defaultButton may also be null to deactivate the feature * @param configgroup The config group used for the loadUserDefaults and saveUserDefaults methods */ - K3bInteractionDialog( TQWidget* tqparent = 0, + K3bInteractionDialog( TQWidget* parent = 0, const char* name = 0, const TQString& title = TQString(), const TQString& subTitle = TQString(), diff --git a/src/k3bjobinterface.cpp b/src/k3bjobinterface.cpp index 2f524ac..1037968 100644 --- a/src/k3bjobinterface.cpp +++ b/src/k3bjobinterface.cpp @@ -21,8 +21,8 @@ #include -K3bJobInterface::K3bJobInterface( TQObject* tqparent ) - : TQObject( tqparent ), +K3bJobInterface::K3bJobInterface( TQObject* parent ) + : TQObject( parent ), DCOPObject( "K3bJobInterface" ), m_job( 0 ) { diff --git a/src/k3bjobinterface.h b/src/k3bjobinterface.h index e62d465..54b5924 100644 --- a/src/k3bjobinterface.h +++ b/src/k3bjobinterface.h @@ -35,7 +35,7 @@ class K3bJobInterface : public TQObject, public DCOPObject K_DCOP public: - K3bJobInterface( TQObject* tqparent ); + K3bJobInterface( TQObject* parent ); void setJob( K3bJob* ); diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index e74a0d5..c179fd9 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -78,11 +78,11 @@ public: -K3bJobProgressDialog::K3bJobProgressDialog( TQWidget* tqparent, +K3bJobProgressDialog::K3bJobProgressDialog( TQWidget* parent, const char* name, bool showSubProgress, bool modal, WFlags fl ) - : KDialog( tqparent, name, modal, fl ), + : KDialog( parent, name, modal, fl ), in_loop(false), m_osd(0) { diff --git a/src/k3bjobprogressdialog.h b/src/k3bjobprogressdialog.h index dc58501..e0f33ea 100644 --- a/src/k3bjobprogressdialog.h +++ b/src/k3bjobprogressdialog.h @@ -52,7 +52,7 @@ class K3bJobProgressDialog : public KDialog, public K3bJobHandler TQ_OBJECT public: - K3bJobProgressDialog( TQWidget* tqparent = 0, + K3bJobProgressDialog( TQWidget* parent = 0, const char* name = 0, bool showSubProgress = true, bool modal = FALSE, diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp index 99a8f0b..966b604 100644 --- a/src/k3bjobprogressosd.cpp +++ b/src/k3bjobprogressosd.cpp @@ -33,8 +33,8 @@ #include -K3bJobProgressOSD::K3bJobProgressOSD( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ), +K3bJobProgressOSD::K3bJobProgressOSD( TQWidget* parent, const char* name ) + : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ), m_dirty(true), m_progress(0), m_dragging(false), diff --git a/src/k3bjobprogressosd.h b/src/k3bjobprogressosd.h index 8d7d886..24c696a 100644 --- a/src/k3bjobprogressosd.h +++ b/src/k3bjobprogressosd.h @@ -34,7 +34,7 @@ class K3bJobProgressOSD : public TQWidget TQ_OBJECT public: - K3bJobProgressOSD( TQWidget* tqparent = 0, const char* name = 0 ); + K3bJobProgressOSD( TQWidget* parent = 0, const char* name = 0 ); ~K3bJobProgressOSD(); int screen() const { return m_screen; } diff --git a/src/k3blsofwrapperdialog.cpp b/src/k3blsofwrapperdialog.cpp index 280def8..d7d1cb4 100644 --- a/src/k3blsofwrapperdialog.cpp +++ b/src/k3blsofwrapperdialog.cpp @@ -39,12 +39,12 @@ static TQString joinProcessNames( const TQValueList& ap } -K3bLsofWrapperDialog::K3bLsofWrapperDialog( TQWidget* tqparent ) +K3bLsofWrapperDialog::K3bLsofWrapperDialog( TQWidget* parent ) : KDialogBase( KDialogBase::Swallow, i18n("Device in use"), Close|User1|User2, Close, - tqparent, + parent, 0, true, true, @@ -116,9 +116,9 @@ void K3bLsofWrapperDialog::slotQuitOtherApps() } -void K3bLsofWrapperDialog::checkDevice( K3bDevice::Device* dev, TQWidget* tqparent ) +void K3bLsofWrapperDialog::checkDevice( K3bDevice::Device* dev, TQWidget* parent ) { - K3bLsofWrapperDialog dlg( tqparent ); + K3bLsofWrapperDialog dlg( parent ); dlg.m_device = dev; if( dlg.slotCheckDevice() ) dlg.exec(); diff --git a/src/k3blsofwrapperdialog.h b/src/k3blsofwrapperdialog.h index ed08ded..a5a7151 100644 --- a/src/k3blsofwrapperdialog.h +++ b/src/k3blsofwrapperdialog.h @@ -38,14 +38,14 @@ class K3bLsofWrapperDialog : public KDialogBase * * If the device is not in use this method simply returns. */ - static void checkDevice( K3bDevice::Device* dev, TQWidget* tqparent = 0 ); + static void checkDevice( K3bDevice::Device* dev, TQWidget* parent = 0 ); private slots: bool slotCheckDevice(); void slotQuitOtherApps(); private: - K3bLsofWrapperDialog( TQWidget* tqparent ); + K3bLsofWrapperDialog( TQWidget* parent ); K3bDevice::Device* m_device; K3bRichTextLabel* m_label; diff --git a/src/k3bmediacache.cpp b/src/k3bmediacache.cpp index 5e2b104..52195d0 100644 --- a/src/k3bmediacache.cpp +++ b/src/k3bmediacache.cpp @@ -161,8 +161,8 @@ void K3bMediaCache::PollThread::run() // //////////////////////////////////////////////////////////////////////////////// -K3bMediaCache::K3bMediaCache( TQObject* tqparent ) - : TQObject( tqparent ) +K3bMediaCache::K3bMediaCache( TQObject* parent ) + : TQObject( parent ) { } diff --git a/src/k3bmediacache.h b/src/k3bmediacache.h index ad13fdb..600a962 100644 --- a/src/k3bmediacache.h +++ b/src/k3bmediacache.h @@ -54,7 +54,7 @@ class K3bMediaCache : public TQObject TQ_OBJECT public: - K3bMediaCache( TQObject* tqparent = 0 ); + K3bMediaCache( TQObject* parent = 0 ); ~K3bMediaCache(); /** diff --git a/src/k3bmediacontentsview.cpp b/src/k3bmediacontentsview.cpp index d23c85a..69c57fa 100644 --- a/src/k3bmediacontentsview.cpp +++ b/src/k3bmediacontentsview.cpp @@ -40,9 +40,9 @@ K3bMediaContentsView::K3bMediaContentsView( bool withHeader, int mediumContent, int mediumTypes, int mediumState, - TQWidget* tqparent, + TQWidget* parent, const char* name ) - : K3bContentsView( withHeader, tqparent, name ) + : K3bContentsView( withHeader, parent, name ) { d = new Private; d->supportedMediumContent = mediumContent; diff --git a/src/k3bmediacontentsview.h b/src/k3bmediacontentsview.h index 310e180..a9838e2 100644 --- a/src/k3bmediacontentsview.h +++ b/src/k3bmediacontentsview.h @@ -91,7 +91,7 @@ class K3bMediaContentsView : public K3bContentsView int mediumContent, int mediumTypes, int mediumState, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0 ); /** diff --git a/src/k3bmediaselectioncombobox.cpp b/src/k3bmediaselectioncombobox.cpp index 42b4b05..666b268 100644 --- a/src/k3bmediaselectioncombobox.cpp +++ b/src/k3bmediaselectioncombobox.cpp @@ -96,8 +96,8 @@ public: }; -K3bMediaSelectionComboBox::K3bMediaSelectionComboBox( TQWidget* tqparent ) - : KComboBox( false, tqparent ) +K3bMediaSelectionComboBox::K3bMediaSelectionComboBox( TQWidget* parent ) + : KComboBox( false, parent ) { d = new Private(); diff --git a/src/k3bmediaselectioncombobox.h b/src/k3bmediaselectioncombobox.h index b40011f..ba1088a 100644 --- a/src/k3bmediaselectioncombobox.h +++ b/src/k3bmediaselectioncombobox.h @@ -37,7 +37,7 @@ class K3bMediaSelectionComboBox : public KComboBox TQ_OBJECT public: - K3bMediaSelectionComboBox( TQWidget* tqparent ); + K3bMediaSelectionComboBox( TQWidget* parent ); virtual ~K3bMediaSelectionComboBox(); /** diff --git a/src/k3bmediaselectiondialog.cpp b/src/k3bmediaselectiondialog.cpp index d4aacf5..7e1bf63 100644 --- a/src/k3bmediaselectiondialog.cpp +++ b/src/k3bmediaselectiondialog.cpp @@ -24,7 +24,7 @@ #include -K3bMediaSelectionDialog::K3bMediaSelectionDialog( TQWidget* tqparent, +K3bMediaSelectionDialog::K3bMediaSelectionDialog( TQWidget* parent, const TQString& title, const TQString& text, bool modal ) @@ -32,7 +32,7 @@ K3bMediaSelectionDialog::K3bMediaSelectionDialog( TQWidget* tqparent, title.isEmpty() ? i18n("Medium Selection") : title, Ok|Cancel, Ok, - tqparent, + parent, 0, modal ) { @@ -90,11 +90,11 @@ void K3bMediaSelectionDialog::slotSelectionChanged( K3bDevice::Device* dev ) K3bDevice::Device* K3bMediaSelectionDialog::selectMedium( int type, int state, int content, - TQWidget* tqparent, + TQWidget* parent, const TQString& title, const TQString& text, bool* canceled ) { - K3bMediaSelectionDialog dlg( tqparent, title, text ); + K3bMediaSelectionDialog dlg( parent, title, text ); dlg.setWantedMediumType( type ); dlg.setWantedMediumState( state ); dlg.setWantedMediumContent( content ); @@ -117,11 +117,11 @@ K3bDevice::Device* K3bMediaSelectionDialog::selectMedium( int type, int state, i K3bDevice::Device* K3bMediaSelectionDialog::selectMedium( int type, int state, - TQWidget* tqparent, + TQWidget* parent, const TQString& title, const TQString& text, bool* canceled ) { - return selectMedium( type, state, K3bMedium::CONTENT_ALL, tqparent, title, text, canceled ); + return selectMedium( type, state, K3bMedium::CONTENT_ALL, parent, title, text, canceled ); } #include "k3bmediaselectiondialog.moc" diff --git a/src/k3bmediaselectiondialog.h b/src/k3bmediaselectiondialog.h index e197ef5..aa963f0 100644 --- a/src/k3bmediaselectiondialog.h +++ b/src/k3bmediaselectiondialog.h @@ -33,7 +33,7 @@ class K3bMediaSelectionDialog : public KDialogBase /** * Do not use the constructor. Use the static method instead. */ - K3bMediaSelectionDialog( TQWidget* tqparent = 0, + K3bMediaSelectionDialog( TQWidget* parent = 0, const TQString& title = TQString(), const TQString& text = TQString(), bool modal = false ); @@ -67,13 +67,13 @@ class K3bMediaSelectionDialog : public KDialogBase * If only one medium of the wanted type is found the method returns immideately * without showing the dialog. */ - static K3bDevice::Device* selectMedium( int type, int state, TQWidget* tqparent = 0, + static K3bDevice::Device* selectMedium( int type, int state, TQWidget* parent = 0, const TQString& title = TQString(), const TQString& text = TQString(), bool* canceled = 0 ); static K3bDevice::Device* selectMedium( int type, int state, int content = K3bMedium::CONTENT_ALL, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const TQString& title = TQString(), const TQString& text = TQString(), bool* canceled = 0 ); diff --git a/src/k3bminibutton.cpp b/src/k3bminibutton.cpp index 9626e47..7d425d5 100644 --- a/src/k3bminibutton.cpp +++ b/src/k3bminibutton.cpp @@ -23,8 +23,8 @@ #include -K3bMiniButton::K3bMiniButton( TQWidget *tqparent, const char * name ) - :TQPushButton( tqparent, name ), +K3bMiniButton::K3bMiniButton( TQWidget *parent, const char * name ) + :TQPushButton( parent, name ), m_mouseOver( false ) { setFocusPolicy( TQ_NoFocus ); diff --git a/src/k3bminibutton.h b/src/k3bminibutton.h index c04ab67..67e1e25 100644 --- a/src/k3bminibutton.h +++ b/src/k3bminibutton.h @@ -37,7 +37,7 @@ class K3bMiniButton : public TQPushButton TQ_OBJECT public: - K3bMiniButton( TQWidget *tqparent=0, const char *name=0 ); + K3bMiniButton( TQWidget *parent=0, const char *name=0 ); virtual ~K3bMiniButton(); protected: diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp index 384615a..550e7b4 100644 --- a/src/k3bpassivepopup.cpp +++ b/src/k3bpassivepopup.cpp @@ -96,8 +96,8 @@ public: }; -K3bPassivePopup::K3bPassivePopup( TQWidget* tqparent ) - : TQFrame( tqparent ) +K3bPassivePopup::K3bPassivePopup( TQWidget* parent ) + : TQFrame( parent ) { d = new Private; d->timeout = 6000; diff --git a/src/k3bpassivepopup.h b/src/k3bpassivepopup.h index a2b43c4..d2e5b85 100644 --- a/src/k3bpassivepopup.h +++ b/src/k3bpassivepopup.h @@ -34,7 +34,7 @@ class K3bPassivePopup : public TQFrame TQ_OBJECT public: - K3bPassivePopup( TQWidget* tqparent ); + K3bPassivePopup( TQWidget* parent ); ~K3bPassivePopup(); enum MessageType { diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp index d8d4c9e..93a51d4 100644 --- a/src/k3bprojectmanager.cpp +++ b/src/k3bprojectmanager.cpp @@ -74,8 +74,8 @@ public: -K3bProjectManager::K3bProjectManager( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bProjectManager::K3bProjectManager( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); d->activeProject = 0; diff --git a/src/k3bprojectmanager.h b/src/k3bprojectmanager.h index 15e8fdb..929b522 100644 --- a/src/k3bprojectmanager.h +++ b/src/k3bprojectmanager.h @@ -31,7 +31,7 @@ class K3bProjectManager : public TQObject TQ_OBJECT public: - K3bProjectManager( TQObject* tqparent = 0, const char* name = 0 ); + K3bProjectManager( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bProjectManager(); const TQPtrList& projects() const; diff --git a/src/k3bprojecttabwidget.cpp b/src/k3bprojecttabwidget.cpp index 31d0b9c..4cc74d3 100644 --- a/src/k3bprojecttabwidget.cpp +++ b/src/k3bprojecttabwidget.cpp @@ -54,8 +54,8 @@ public: -K3bProjectTabWidget::K3bProjectTabWidget( TQWidget *tqparent, const char *name, WFlags f ) - : TQTabWidget( tqparent, name, f ) +K3bProjectTabWidget::K3bProjectTabWidget( TQWidget *parent, const char *name, WFlags f ) + : TQTabWidget( parent, name, f ) { tabBar()->setAcceptDrops(true); tabBar()->installEventFilter( this ); diff --git a/src/k3bprojecttabwidget.h b/src/k3bprojecttabwidget.h index 4cadf33..ea75b63 100644 --- a/src/k3bprojecttabwidget.h +++ b/src/k3bprojecttabwidget.h @@ -37,7 +37,7 @@ class K3bProjectTabWidget : public TQTabWidget TQ_OBJECT public: - K3bProjectTabWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags = 0 ); + K3bProjectTabWidget( TQWidget *parent = 0, const char *name = 0, WFlags = 0 ); ~K3bProjectTabWidget(); void insertTab( K3bDoc* ); diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp index dd409e1..43413d9 100644 --- a/src/k3bservicemenuinstaller.cpp +++ b/src/k3bservicemenuinstaller.cpp @@ -77,7 +77,7 @@ bool K3bServiceInstaller::allInstalled() const } -bool K3bServiceInstaller::install( TQWidget* tqparent ) +bool K3bServiceInstaller::install( TQWidget* parent ) { d->update(); @@ -87,11 +87,11 @@ bool K3bServiceInstaller::install( TQWidget* tqparent ) for( unsigned int i = 0; i < d->allServiceMenus.count(); ++i ) if( !KIO::NetAccess::file_copy( KURL::fromPathOrURL( d->allServiceMenus[i] ), KURL::fromPathOrURL( d->konqiServicemenusFolder + d->allServiceMenuFiles[i] ), -1, - true, false, tqparent ) ) + true, false, parent ) ) success = false; - if( !success && tqparent ) - KMessageBox::error( tqparent, + if( !success && parent ) + KMessageBox::error( parent, KIO::NetAccess::lastErrorString(), i18n("Failed to copy service menu files") ); @@ -99,19 +99,19 @@ bool K3bServiceInstaller::install( TQWidget* tqparent ) } -bool K3bServiceInstaller::remove( TQWidget* tqparent ) +bool K3bServiceInstaller::remove( TQWidget* parent ) { d->update(); bool success = true; for( unsigned int i = 0; i < d->allServiceMenuFiles.count(); ++i ) - if( KIO::NetAccess::exists( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], true, tqparent ) ) - if( !KIO::NetAccess::del( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], tqparent ) ) + if( KIO::NetAccess::exists( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], true, parent ) ) + if( !KIO::NetAccess::del( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], parent ) ) success = false; - if( !success && tqparent ) - KMessageBox::error( tqparent, + if( !success && parent ) + KMessageBox::error( parent, KIO::NetAccess::lastErrorString(), i18n("Failed to remove service menu files") ); diff --git a/src/k3bservicemenuinstaller.h b/src/k3bservicemenuinstaller.h index 271d314..015a672 100644 --- a/src/k3bservicemenuinstaller.h +++ b/src/k3bservicemenuinstaller.h @@ -38,14 +38,14 @@ class K3bServiceInstaller bool allInstalled() const; /** - * If tqparent != 0 a messagebox will be shown in case of an error. + * If parent != 0 a messagebox will be shown in case of an error. */ - bool install( TQWidget* tqparent = 0 ); + bool install( TQWidget* parent = 0 ); /** - * If tqparent != 0 a messagebox will be shown in case of an error. + * If parent != 0 a messagebox will be shown in case of an error. */ - bool remove( TQWidget* tqparent = 0 ); + bool remove( TQWidget* parent = 0 ); private: class Private; diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp index 6a39807..3ef831d 100644 --- a/src/k3bsidepanel.cpp +++ b/src/k3bsidepanel.cpp @@ -27,8 +27,8 @@ -K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* tqparent, const char* name ) - : TQToolBox( tqparent, name ), +K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* parent, const char* name ) + : TQToolBox( parent, name ), m_mainWindow(m) { // our first widget is the tree view diff --git a/src/k3bsidepanel.h b/src/k3bsidepanel.h index 29b1ebc..e6d6c7e 100644 --- a/src/k3bsidepanel.h +++ b/src/k3bsidepanel.h @@ -30,7 +30,7 @@ class K3bSidePanel : public TQToolBox TQ_OBJECT public: - K3bSidePanel( K3bMainWindow*, TQWidget* tqparent = 0, const char* name = 0 ); + K3bSidePanel( K3bMainWindow*, TQWidget* parent = 0, const char* name = 0 ); ~K3bSidePanel(); /** diff --git a/src/k3bsplash.cpp b/src/k3bsplash.cpp index ff39d85..5966eed 100644 --- a/src/k3bsplash.cpp +++ b/src/k3bsplash.cpp @@ -31,8 +31,8 @@ #include -K3bSplash::K3bSplash( TQWidget* tqparent, const char* name ) - : TQVBox( tqparent, name, +K3bSplash::K3bSplash( TQWidget* parent, const char* name ) + : TQVBox( parent, name, WStyle_Customize| WDestructiveClose| /* WStyle_Splash|*/ diff --git a/src/k3bsplash.h b/src/k3bsplash.h index a08b421..7007f2c 100644 --- a/src/k3bsplash.h +++ b/src/k3bsplash.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - K3bSplash( TQWidget* tqparent = 0, const char* name = 0 ); + K3bSplash( TQWidget* parent = 0, const char* name = 0 ); ~K3bSplash(); public slots: diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index cd0ad1f..375a3d5 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -46,9 +46,9 @@ -K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* tqparent ) - : TQObject(tqparent), - m_mainWindow(tqparent) +K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent ) + : TQObject(parent), + m_mainWindow(parent) { // setup free temp space box TQHBox* boxFreeTemp = new TQHBox( m_mainWindow->statusBar() ); diff --git a/src/k3bstatusbarmanager.h b/src/k3bstatusbarmanager.h index b73b82b..aa37263 100644 --- a/src/k3bstatusbarmanager.h +++ b/src/k3bstatusbarmanager.h @@ -32,7 +32,7 @@ class K3bStatusBarManager : public TQObject TQ_OBJECT public: - K3bStatusBarManager( K3bMainWindow* tqparent ); + K3bStatusBarManager( K3bMainWindow* parent ); ~K3bStatusBarManager(); public slots: diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index ec8a27f..75a9f58 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -80,9 +80,9 @@ K3bSystemProblem::K3bSystemProblem( int t, K3bSystemProblemDialog::K3bSystemProblemDialog( const TQValueList& problems, - TQWidget* tqparent, + TQWidget* parent, const char* name ) - : KDialog( tqparent, name ) + : KDialog( parent, name ) { setCaption( i18n("System Configuration Problems") ); @@ -168,7 +168,7 @@ void K3bSystemProblemDialog::closeEvent( TQCloseEvent* e ) } -void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent, +void K3bSystemProblemDialog::checkSystem( TQWidget* parent, const char* name ) { TQValueList problems; @@ -594,7 +594,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent, static K3bSystemProblemDialog* s_openDlg = 0; if( s_openDlg ) s_openDlg->close(); - K3bSystemProblemDialog dlg( problems, tqparent, name ); + K3bSystemProblemDialog dlg( problems, parent, name ); s_openDlg = &dlg; dlg.exec(); s_openDlg = 0; diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h index f884d2a..84835bd 100644 --- a/src/k3bsystemproblemdialog.h +++ b/src/k3bsystemproblemdialog.h @@ -78,7 +78,7 @@ class K3bSystemProblemDialog : public KDialog * or K3b is started for the first time. */ static bool readCheckSystemConfig(); - static void checkSystem( TQWidget* tqparent = 0, + static void checkSystem( TQWidget* parent = 0, const char* name = 0 ); protected: @@ -89,7 +89,7 @@ class K3bSystemProblemDialog : public KDialog private: K3bSystemProblemDialog( const TQValueList&, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0 ); static int dmaActivated( K3bDevice::Device* ); static TQPtrList checkForAutomounting(); diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp index a91da03..375c870 100644 --- a/src/k3btempdirselectionwidget.cpp +++ b/src/k3btempdirselectionwidget.cpp @@ -39,8 +39,8 @@ #include -K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *tqparent, const char *name ) - : TQGroupBox( 4, Qt::Vertical, tqparent, name ), +K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const char *name ) + : TQGroupBox( 4, Qt::Vertical, parent, name ), m_labelCdSize(0), m_defaultImageFileName( "k3b_image.iso" ) { diff --git a/src/k3btempdirselectionwidget.h b/src/k3btempdirselectionwidget.h index f456e6b..74cd874 100644 --- a/src/k3btempdirselectionwidget.h +++ b/src/k3btempdirselectionwidget.h @@ -35,7 +35,7 @@ class K3bTempDirSelectionWidget : public TQGroupBox TQ_OBJECT public: - K3bTempDirSelectionWidget( TQWidget *tqparent = 0, const char *name = 0 ); + K3bTempDirSelectionWidget( TQWidget *parent = 0, const char *name = 0 ); ~K3bTempDirSelectionWidget(); /** determines if the selection dialog should ask for a dir or a file */ diff --git a/src/k3bthemedheader.cpp b/src/k3bthemedheader.cpp index 5808c37..45796db 100644 --- a/src/k3bthemedheader.cpp +++ b/src/k3bthemedheader.cpp @@ -23,15 +23,15 @@ #include -K3bThemedHeader::K3bThemedHeader( TQWidget* tqparent ) - : TQFrame( tqparent ) +K3bThemedHeader::K3bThemedHeader( TQWidget* parent ) + : TQFrame( parent ) { init(); } -K3bThemedHeader::K3bThemedHeader( const TQString& title, const TQString& subtitle, TQWidget* tqparent ) - : TQFrame( tqparent ) +K3bThemedHeader::K3bThemedHeader( const TQString& title, const TQString& subtitle, TQWidget* parent ) + : TQFrame( parent ) { setTitle( title ); setSubTitle( subtitle ); diff --git a/src/k3bthemedheader.h b/src/k3bthemedheader.h index 62708ee..e5f319b 100644 --- a/src/k3bthemedheader.h +++ b/src/k3bthemedheader.h @@ -29,8 +29,8 @@ class K3bThemedHeader : public TQFrame TQ_OBJECT public: - K3bThemedHeader( TQWidget* tqparent = 0 ); - K3bThemedHeader( const TQString& title, const TQString& subtitle, TQWidget* tqparent = 0 ); + K3bThemedHeader( TQWidget* parent = 0 ); + K3bThemedHeader( const TQString& title, const TQString& subtitle, TQWidget* parent = 0 ); ~K3bThemedHeader(); public slots: diff --git a/src/k3bthemedlabel.cpp b/src/k3bthemedlabel.cpp index 11e5001..77138f9 100644 --- a/src/k3bthemedlabel.cpp +++ b/src/k3bthemedlabel.cpp @@ -16,8 +16,8 @@ #include "k3bthemedlabel.h" #include "k3bapplication.h" -K3bThemedLabel::K3bThemedLabel( TQWidget* tqparent ) - : KCutLabel( tqparent ), +K3bThemedLabel::K3bThemedLabel( TQWidget* parent ) + : KCutLabel( parent ), m_themePixmapCode( -1 ) { slotThemeChanged(); @@ -29,8 +29,8 @@ K3bThemedLabel::K3bThemedLabel( TQWidget* tqparent ) } -K3bThemedLabel::K3bThemedLabel( const TQString& text, TQWidget* tqparent ) - : KCutLabel( text, tqparent ), +K3bThemedLabel::K3bThemedLabel( const TQString& text, TQWidget* parent ) + : KCutLabel( text, parent ), m_themePixmapCode( -1 ) { slotThemeChanged(); @@ -42,8 +42,8 @@ K3bThemedLabel::K3bThemedLabel( const TQString& text, TQWidget* tqparent ) } -K3bThemedLabel::K3bThemedLabel( K3bTheme::PixmapType pix, TQWidget* tqparent ) - : KCutLabel( tqparent ) +K3bThemedLabel::K3bThemedLabel( K3bTheme::PixmapType pix, TQWidget* parent ) + : KCutLabel( parent ) { setThemePixmap( pix ); diff --git a/src/k3bthemedlabel.h b/src/k3bthemedlabel.h index 2c6d27f..2bd1b1d 100644 --- a/src/k3bthemedlabel.h +++ b/src/k3bthemedlabel.h @@ -26,9 +26,9 @@ class K3bThemedLabel : public KCutLabel TQ_OBJECT public: - K3bThemedLabel( TQWidget* tqparent = 0 ); - K3bThemedLabel( const TQString& text, TQWidget* tqparent = 0 ); - K3bThemedLabel( K3bTheme::PixmapType, TQWidget* tqparent = 0 ); + K3bThemedLabel( TQWidget* parent = 0 ); + K3bThemedLabel( const TQString& text, TQWidget* parent = 0 ); + K3bThemedLabel( K3bTheme::PixmapType, TQWidget* parent = 0 ); public slots: void setThemePixmap( K3bTheme::PixmapType ); diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp index 6e86bd6..3471342 100644 --- a/src/k3bthememanager.cpp +++ b/src/k3bthememanager.cpp @@ -166,8 +166,8 @@ public: -K3bThemeManager::K3bThemeManager( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bThemeManager::K3bThemeManager( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); d->emptyTheme.m_name = "Empty Theme"; diff --git a/src/k3bthememanager.h b/src/k3bthememanager.h index 618a254..c5646bb 100644 --- a/src/k3bthememanager.h +++ b/src/k3bthememanager.h @@ -114,7 +114,7 @@ class K3bThemeManager : public TQObject TQ_OBJECT public: - K3bThemeManager( TQObject* tqparent = 0, const char* name = 0 ); + K3bThemeManager( TQObject* parent = 0, const char* name = 0 ); ~K3bThemeManager(); const TQValueList& themes() const; diff --git a/src/k3btimeoutwidget.cpp b/src/k3btimeoutwidget.cpp index 12453bb..ea89f20 100644 --- a/src/k3btimeoutwidget.cpp +++ b/src/k3btimeoutwidget.cpp @@ -35,8 +35,8 @@ public: }; -K3bTimeoutWidget::K3bTimeoutWidget( TQWidget* tqparent ) - : TQWidget( tqparent ) +K3bTimeoutWidget::K3bTimeoutWidget( TQWidget* parent ) + : TQWidget( parent ) { d = new Private; d->timeout = 10000; diff --git a/src/k3btimeoutwidget.h b/src/k3btimeoutwidget.h index 3775332..b7c7dae 100644 --- a/src/k3btimeoutwidget.h +++ b/src/k3btimeoutwidget.h @@ -28,7 +28,7 @@ class K3bTimeoutWidget : public TQWidget TQ_OBJECT public: - K3bTimeoutWidget( TQWidget* tqparent ); + K3bTimeoutWidget( TQWidget* parent ); ~K3bTimeoutWidget(); TQSize tqsizeHint() const; diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index ab3192f..161a8b8 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -76,8 +76,8 @@ static const char* s_allActions[] = { 0 }; -K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* tqparent ) - : TQWidget( tqparent->viewport() ) +K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* parent ) + : TQWidget( parent->viewport() ) { setWFlags( TQt::WNoAutoErase ); @@ -96,7 +96,7 @@ K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* tqparent ) m_rows = m_cols = 1; m_buttonMore = new K3bFlatButton( i18n("Further actions..."), this ); - connect( m_buttonMore, TQT_SIGNAL(pressed()), tqparent, TQT_SLOT(slotMoreActions()) ); + connect( m_buttonMore, TQT_SIGNAL(pressed()), parent, TQT_SLOT(slotMoreActions()) ); connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), this, TQT_SLOT(slotThemeChanged()) ); @@ -344,8 +344,8 @@ void K3bWelcomeWidget::Display::dropEvent( TQDropEvent* e ) -K3bWelcomeWidget::K3bWelcomeWidget( K3bMainWindow* mw, TQWidget* tqparent, const char* name ) - : TQScrollView( tqparent, name ), +K3bWelcomeWidget::K3bWelcomeWidget( K3bMainWindow* mw, TQWidget* parent, const char* name ) + : TQScrollView( parent, name ), m_mainWindow( mw ) { main = new Display( this ); diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h index 41592db..b40b3b3 100644 --- a/src/k3bwelcomewidget.h +++ b/src/k3bwelcomewidget.h @@ -43,7 +43,7 @@ class K3bWelcomeWidget : public TQScrollView TQ_OBJECT public: - K3bWelcomeWidget( K3bMainWindow*, TQWidget* tqparent = 0, const char* name = 0 ); + K3bWelcomeWidget( K3bMainWindow*, TQWidget* parent = 0, const char* name = 0 ); ~K3bWelcomeWidget(); void loadConfig( KConfigBase* c ); @@ -73,7 +73,7 @@ class K3bWelcomeWidget::Display : public TQWidget TQ_OBJECT public: - Display( K3bWelcomeWidget* tqparent ); + Display( K3bWelcomeWidget* parent ); ~Display(); TQSize tqminimumSizeHint() const; diff --git a/src/k3bwidgetshoweffect.cpp b/src/k3bwidgetshoweffect.cpp index 2292c19..1da951e 100644 --- a/src/k3bwidgetshoweffect.cpp +++ b/src/k3bwidgetshoweffect.cpp @@ -63,9 +63,9 @@ void K3bWidgetShowEffect::show( bool effectOnly ) m_widget->polish(); if( m_effect == Dissolve ) { - // necessary to create the tqmask - m_tqmask.resize( m_widget->width(), m_widget->height() ); - // make the tqmask empty and hence will not show widget with show() called below + // necessary to create the mask + m_mask.resize( m_widget->width(), m_widget->height() ); + // make the mask empty and hence will not show widget with show() called below dissolveMask(); m_timerId = startTimer( 1000 / 30 ); } @@ -97,13 +97,13 @@ void K3bWidgetShowEffect::dissolveMask() { if( m_bShow ) { m_widget->tqrepaint( false ); - TQPainter maskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(TQt::black); + m_mask.fill(TQt::black); maskPainter.setBrush(TQt::white); maskPainter.setPen(TQt::white); - maskPainter.drawRect( m_tqmask.rect() ); + maskPainter.drawRect( m_mask.rect() ); m_dissolveSize += m_dissolveDelta; @@ -135,7 +135,7 @@ void K3bWidgetShowEffect::dissolveMask() deleteLater(); } - m_widget->setMask( m_tqmask ); + m_widget->setMask( m_mask ); } else { diff --git a/src/k3bwidgetshoweffect.h b/src/k3bwidgetshoweffect.h index 9f6d960..e69582f 100644 --- a/src/k3bwidgetshoweffect.h +++ b/src/k3bwidgetshoweffect.h @@ -98,7 +98,7 @@ class K3bWidgetShowEffect : public TQObject Effect m_effect; TQWidget* m_widget; - TQBitmap m_tqmask; + TQBitmap m_mask; int m_dissolveSize; int m_dissolveDelta; diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp index 720d390..a89593d 100644 --- a/src/k3bwriterselectionwidget.cpp +++ b/src/k3bwriterselectionwidget.cpp @@ -47,8 +47,8 @@ class K3bWriterSelectionWidget::MediaSelectionComboBox : public K3bMediaSelectionComboBox { public: - MediaSelectionComboBox( TQWidget* tqparent ) - : K3bMediaSelectionComboBox( tqparent ), + MediaSelectionComboBox( TQWidget* parent ) + : K3bMediaSelectionComboBox( parent ), m_overrideDevice( 0 ) { } @@ -110,8 +110,8 @@ public: }; -K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { d = new Private; d->forceAutoSpeed = false; diff --git a/src/k3bwriterselectionwidget.h b/src/k3bwriterselectionwidget.h index acb989e..ef94d8a 100644 --- a/src/k3bwriterselectionwidget.h +++ b/src/k3bwriterselectionwidget.h @@ -41,7 +41,7 @@ class K3bWriterSelectionWidget : public TQWidget /** * Creates a writerselectionwidget */ - K3bWriterSelectionWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bWriterSelectionWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bWriterSelectionWidget(); int writerSpeed() const; diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp index 6a8e563..1d329ce 100644 --- a/src/k3bwritingmodewidget.cpp +++ b/src/k3bwritingmodewidget.cpp @@ -61,16 +61,16 @@ public: }; -K3bWritingModeWidget::K3bWritingModeWidget( int modes, TQWidget* tqparent, const char* name ) - : K3bIntMapComboBox( tqparent, name ) +K3bWritingModeWidget::K3bWritingModeWidget( int modes, TQWidget* parent, const char* name ) + : K3bIntMapComboBox( parent, name ) { init(); setSupportedModes( modes ); } -K3bWritingModeWidget::K3bWritingModeWidget( TQWidget* tqparent, const char* name ) - : K3bIntMapComboBox( tqparent, name ) +K3bWritingModeWidget::K3bWritingModeWidget( TQWidget* parent, const char* name ) + : K3bIntMapComboBox( parent, name ) { init(); setSupportedModes( K3b::DAO | K3b::TAO | K3b::RAW ); // default: support all CD-R(W) modes diff --git a/src/k3bwritingmodewidget.h b/src/k3bwritingmodewidget.h index 6b6ed07..664f052 100644 --- a/src/k3bwritingmodewidget.h +++ b/src/k3bwritingmodewidget.h @@ -33,8 +33,8 @@ class K3bWritingModeWidget : public K3bIntMapComboBox TQ_OBJECT public: - K3bWritingModeWidget( TQWidget* tqparent = 0, const char* name = 0 ); - K3bWritingModeWidget( int modes, TQWidget* tqparent = 0, const char* name = 0 ); + K3bWritingModeWidget( TQWidget* parent = 0, const char* name = 0 ); + K3bWritingModeWidget( int modes, TQWidget* parent = 0, const char* name = 0 ); ~K3bWritingModeWidget(); int writingMode() const; diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index fca3b3f..69bacb7 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -67,8 +67,8 @@ public: }; -K3bBlankingDialog::K3bBlankingDialog( TQWidget* tqparent, const char* name ) - : K3bInteractionDialog( tqparent, name, +K3bBlankingDialog::K3bBlankingDialog( TQWidget* parent, const char* name ) + : K3bInteractionDialog( parent, name, i18n("Erase CD-RW"), TQString(), START_BUTTON|CANCEL_BUTTON, diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index 66b4171..413e9ba 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -63,8 +63,8 @@ #include -K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *tqparent, const char *name, bool modal ) - : K3bInteractionDialog( tqparent, name, i18n("CD Copy"), i18n("and CD Cloning"), +K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal ) + : K3bInteractionDialog( parent, name, i18n("CD Copy"), i18n("and CD Cloning"), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "CD Copy", diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h index 818966c..e6c27f6 100644 --- a/src/misc/k3bcdcopydialog.h +++ b/src/misc/k3bcdcopydialog.h @@ -48,7 +48,7 @@ class K3bCdCopyDialog : public K3bInteractionDialog TQ_OBJECT public: - K3bCdCopyDialog(TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); + K3bCdCopyDialog(TQWidget *parent = 0, const char *name = 0, bool modal = true ); ~K3bCdCopyDialog(); void setReadingDevice( K3bDevice::Device* ); diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 9e3e7e6..99f3849 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -111,8 +111,8 @@ public: }; -K3bCdImageWritingDialog::K3bCdImageWritingDialog( TQWidget* tqparent, const char* name, bool modal ) - : K3bInteractionDialog( tqparent, name, +K3bCdImageWritingDialog::K3bCdImageWritingDialog( TQWidget* parent, const char* name, bool modal ) + : K3bInteractionDialog( parent, name, i18n("Burn CD Image"), "iso cue toc", START_BUTTON|CANCEL_BUTTON, diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index 999dc3a..ff721b3 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -55,8 +55,8 @@ -K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* tqparent, const char* name, bool modal ) - : K3bInteractionDialog( tqparent, name, +K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool modal ) + : K3bInteractionDialog( parent, name, i18n("DVD Copy"), i18n("No video transcoding!"), START_BUTTON|CANCEL_BUTTON, diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h index 00436cc..469a1b6 100644 --- a/src/misc/k3bdvdcopydialog.h +++ b/src/misc/k3bdvdcopydialog.h @@ -41,7 +41,7 @@ class K3bDvdCopyDialog : public K3bInteractionDialog TQ_OBJECT public: - K3bDvdCopyDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); + K3bDvdCopyDialog( TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~K3bDvdCopyDialog(); void setReadingDevice( K3bDevice::Device* ); diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 5289089..a232479 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -38,8 +38,8 @@ #include -K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* tqparent, const char* name, bool modal ) - : K3bInteractionDialog( tqparent, name, +K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* name, bool modal ) + : K3bInteractionDialog( parent, name, i18n("DVD Formatting"), i18n("DVD%1RW").tqarg("�"), START_BUTTON|CANCEL_BUTTON, diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 2c9a2c8..687fd1a 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -83,8 +83,8 @@ public: }; -K3bIsoImageWritingDialog::K3bIsoImageWritingDialog( TQWidget* tqparent, const char* name, bool modal ) - : K3bInteractionDialog( tqparent, name, +K3bIsoImageWritingDialog::K3bIsoImageWritingDialog( TQWidget* parent, const char* name, bool modal ) + : K3bInteractionDialog( parent, name, i18n("Burn Iso9660 Image"), i18n("to DVD"), START_BUTTON|CANCEL_BUTTON, diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp index 3238d41..18bc7be 100644 --- a/src/option/k3bburningoptiontab.cpp +++ b/src/option/k3bburningoptiontab.cpp @@ -39,8 +39,8 @@ #include -K3bBurningOptionTab::K3bBurningOptionTab( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +K3bBurningOptionTab::K3bBurningOptionTab( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { setupGui(); } diff --git a/src/option/k3bburningoptiontab.h b/src/option/k3bburningoptiontab.h index b62274e..ad26e11 100644 --- a/src/option/k3bburningoptiontab.h +++ b/src/option/k3bburningoptiontab.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - K3bBurningOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); + K3bBurningOptionTab( TQWidget* parent = 0, const char* name = 0 ); ~K3bBurningOptionTab(); void saveSettings(); diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 3d75d9b..4410b4a 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -41,8 +41,8 @@ #include -K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* tqparent, const char* name ) - : base_K3bCddbOptionTab( tqparent, name ) +K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* parent, const char* name ) + : base_K3bCddbOptionTab( parent, name ) { // fix all the margins and spacings that have been corrupted by TQDesigner ;-) // ----------------------------------------------------------------------------- diff --git a/src/option/k3bcddboptiontab.h b/src/option/k3bcddboptiontab.h index 2633b0a..8975fe4 100644 --- a/src/option/k3bcddboptiontab.h +++ b/src/option/k3bcddboptiontab.h @@ -25,7 +25,7 @@ class K3bCddbOptionTab : public base_K3bCddbOptionTab TQ_OBJECT public: - K3bCddbOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); + K3bCddbOptionTab( TQWidget* parent = 0, const char* name = 0 ); ~K3bCddbOptionTab(); public slots: diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index 8931fe7..c8517a5 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -32,8 +32,8 @@ #include -K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { TQGridLayout* frameLayout = new TQGridLayout( this ); frameLayout->setSpacing( KDialog::spacingHint() ); diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index 2be5054..d19e42a 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -144,8 +144,8 @@ private: -K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), m_deviceManager( manager ) +K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), m_deviceManager( manager ) { TQGridLayout* frameLayout = new TQGridLayout( this ); frameLayout->setSpacing( KDialog::spacingHint() ); @@ -229,7 +229,7 @@ void K3bDeviceWidget::updateDeviceListViews() { m_viewDevices->clear(); - // create the tqparent view items + // create the parent view items // ----------------------------------------- m_writerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Writer Drives") ); m_writerParentViewItem->setPixmap( 0, SmallIcon( "cdwriter_unmount" ) ); diff --git a/src/option/k3bdevicewidget.h b/src/option/k3bdevicewidget.h index b4e1590..a1e684f 100644 --- a/src/option/k3bdevicewidget.h +++ b/src/option/k3bdevicewidget.h @@ -45,7 +45,7 @@ class K3bDeviceWidget : public TQWidget TQ_OBJECT public: - K3bDeviceWidget( K3bDevice::DeviceManager*, TQWidget *tqparent = 0, const char *name = 0 ); + K3bDeviceWidget( K3bDevice::DeviceManager*, TQWidget *parent = 0, const char *name = 0 ); ~K3bDeviceWidget(); public slots: diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp index 6be5b19..4d3e062 100644 --- a/src/option/k3bexternalbinoptiontab.cpp +++ b/src/option/k3bexternalbinoptiontab.cpp @@ -36,8 +36,8 @@ -K3bExternalBinOptionTab::K3bExternalBinOptionTab( K3bExternalBinManager* manager, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +K3bExternalBinOptionTab::K3bExternalBinOptionTab( K3bExternalBinManager* manager, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_manager = manager; diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp index a9d5129..f745da7 100644 --- a/src/option/k3bexternalbinwidget.cpp +++ b/src/option/k3bexternalbinwidget.cpp @@ -43,8 +43,8 @@ -K3bExternalBinWidget::K3bExternalProgramViewItem::K3bExternalProgramViewItem( K3bExternalProgram* p, TQListView* tqparent ) - : K3bListViewItem( tqparent ), m_program(p) +K3bExternalBinWidget::K3bExternalProgramViewItem::K3bExternalProgramViewItem( K3bExternalProgram* p, TQListView* parent ) + : K3bListViewItem( parent ), m_program(p) { TQFont f( listView()->font() ); f.setBold(true); @@ -57,8 +57,8 @@ K3bExternalBinWidget::K3bExternalProgramViewItem::K3bExternalProgramViewItem( K3 } -K3bExternalBinWidget::K3bExternalBinViewItem::K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* tqparent ) - : K3bListViewItem( tqparent ), m_bin( bin ), m_parent( tqparent ) +K3bExternalBinWidget::K3bExternalBinViewItem::K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* parent ) + : K3bListViewItem( parent ), m_bin( bin ), m_parent( parent ) { setText( 0, bin->path ); setText( 1, bin->version ); @@ -95,8 +95,8 @@ void K3bExternalBinWidget::K3bExternalBinViewItem::setDefault( bool b ) // ////////////////////////////////////////////////////////// -K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), m_manager( manager ) +K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, TQWidget* parent, const char* name ) + : TQWidget( parent, name ), m_manager( manager ) { TQGridLayout* mainGrid = new TQGridLayout( this ); mainGrid->setMargin( 0 ); @@ -292,7 +292,7 @@ void K3bExternalBinWidget::slotSetDefaultButtonClicked() // remove all default flags K3bExternalBinViewItem* bi = (K3bExternalBinViewItem*)item->parentProgramItem()->firstChild(); TQListViewItemIterator it( bi ); - while( it.current() && it.current()->tqparent() == item->parentProgramItem() ) { + while( it.current() && it.current()->parent() == item->parentProgramItem() ) { ((K3bExternalBinViewItem*)it.current())->setDefault(false); ++it; } diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h index cc0a9a8..08c2a59 100644 --- a/src/option/k3bexternalbinwidget.h +++ b/src/option/k3bexternalbinwidget.h @@ -38,7 +38,7 @@ class K3bExternalBinWidget : public TQWidget TQ_OBJECT public: - K3bExternalBinWidget( K3bExternalBinManager*, TQWidget* tqparent = 0, const char* name = 0 ); + K3bExternalBinWidget( K3bExternalBinManager*, TQWidget* parent = 0, const char* name = 0 ); ~K3bExternalBinWidget(); class K3bExternalBinViewItem; @@ -72,7 +72,7 @@ class K3bExternalBinWidget : public TQWidget class K3bExternalBinWidget::K3bExternalProgramViewItem : public K3bListViewItem { public: - K3bExternalProgramViewItem( K3bExternalProgram* p, TQListView* tqparent ); + K3bExternalProgramViewItem( K3bExternalProgram* p, TQListView* parent ); K3bExternalProgram* program() const { return m_program; } @@ -85,7 +85,7 @@ class K3bExternalBinWidget::K3bExternalProgramViewItem : public K3bListViewItem class K3bExternalBinWidget::K3bExternalBinViewItem : public K3bListViewItem { public: - K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* tqparent ); + K3bExternalBinViewItem( K3bExternalBin* bin, K3bExternalProgramViewItem* parent ); K3bExternalBin* bin() const { return m_bin; } K3bExternalProgramViewItem* parentProgramItem() const { return m_parent; } diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index d6c7de0..cf740eb 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -38,8 +38,8 @@ #include -K3bMiscOptionTab::K3bMiscOptionTab(TQWidget *tqparent, const char *name ) - : base_K3bMiscOptionTab(tqparent,name) +K3bMiscOptionTab::K3bMiscOptionTab(TQWidget *parent, const char *name ) + : base_K3bMiscOptionTab(parent,name) { m_editTempDir->setMode( KFile::Directory ); connect( m_buttonConfigureAudioOutput, TQT_SIGNAL(clicked()), diff --git a/src/option/k3bmiscoptiontab.h b/src/option/k3bmiscoptiontab.h index 1c5de7e..bc09181 100644 --- a/src/option/k3bmiscoptiontab.h +++ b/src/option/k3bmiscoptiontab.h @@ -31,7 +31,7 @@ class K3bMiscOptionTab : public base_K3bMiscOptionTab TQ_OBJECT public: - K3bMiscOptionTab(TQWidget *tqparent=0, const char *name=0); + K3bMiscOptionTab(TQWidget *parent=0, const char *name=0); ~K3bMiscOptionTab(); void readSettings(); diff --git a/src/option/k3bnotifyoptiontab.cpp b/src/option/k3bnotifyoptiontab.cpp index 0cc6e5d..c94359f 100644 --- a/src/option/k3bnotifyoptiontab.cpp +++ b/src/option/k3bnotifyoptiontab.cpp @@ -25,8 +25,8 @@ -K3bNotifyOptionTab::K3bNotifyOptionTab( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +K3bNotifyOptionTab::K3bNotifyOptionTab( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_notifyWidget = new KNotify::KNotifyWidget( this ); diff --git a/src/option/k3bnotifyoptiontab.h b/src/option/k3bnotifyoptiontab.h index 6eb3fed..22a0b2c 100644 --- a/src/option/k3bnotifyoptiontab.h +++ b/src/option/k3bnotifyoptiontab.h @@ -31,7 +31,7 @@ class K3bNotifyOptionTab : public TQWidget TQ_OBJECT public: - K3bNotifyOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); + K3bNotifyOptionTab( TQWidget* parent = 0, const char* name = 0 ); ~K3bNotifyOptionTab(); void readSettings(); diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index 91a9fb3..4be5047 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -40,8 +40,8 @@ // TODO: handle the default-settings -K3bOptionDialog::K3bOptionDialog(TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( IconList, i18n("Settings"), Apply|Ok|Cancel, Ok, tqparent,name, modal, true) +K3bOptionDialog::K3bOptionDialog(TQWidget *parent, const char *name, bool modal ) + : KDialogBase( IconList, i18n("Settings"), Apply|Ok|Cancel, Ok, parent,name, modal, true) { setupMiscPage(); setupDevicePage(); diff --git a/src/option/k3boptiondialog.h b/src/option/k3boptiondialog.h index c033504..8bd6809 100644 --- a/src/option/k3boptiondialog.h +++ b/src/option/k3boptiondialog.h @@ -38,7 +38,7 @@ class K3bOptionDialog : public KDialogBase TQ_OBJECT public: - K3bOptionDialog(TQWidget *tqparent=0, const char *name=0, bool modal = true); + K3bOptionDialog(TQWidget *parent=0, const char *name=0, bool modal = true); ~K3bOptionDialog(); enum m_configPageIndex { Burning = 0, Devices = 1, Programs = 2, Cddb = 3 }; diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 2e67ae5..a48d001 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -37,8 +37,8 @@ class K3bPluginOptionTab::PluginViewItem : public K3bListViewItem { public: - PluginViewItem( K3bPlugin* p, KListViewItem* tqparent ) - : K3bListViewItem( tqparent ), + PluginViewItem( K3bPlugin* p, KListViewItem* parent ) + : K3bListViewItem( parent ), plugin(p) { const K3bPluginInfo& info = p->pluginInfo(); setText( 0, info.name() ); @@ -58,8 +58,8 @@ public: -K3bPluginOptionTab::K3bPluginOptionTab( TQWidget* tqparent, const char* name ) - : base_K3bPluginOptionTab( tqparent, name ) +K3bPluginOptionTab::K3bPluginOptionTab( TQWidget* parent, const char* name ) + : base_K3bPluginOptionTab( parent, name ) { #if KDE_IS_VERSION(3,4,0) m_viewPlugins->setShadeSortColumn( false ); diff --git a/src/option/k3bpluginoptiontab.h b/src/option/k3bpluginoptiontab.h index c9db5af..e2681bd 100644 --- a/src/option/k3bpluginoptiontab.h +++ b/src/option/k3bpluginoptiontab.h @@ -26,7 +26,7 @@ class K3bPluginOptionTab : public base_K3bPluginOptionTab TQ_OBJECT public: - K3bPluginOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); + K3bPluginOptionTab( TQWidget* parent = 0, const char* name = 0 ); ~K3bPluginOptionTab(); public slots: diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index 005af83..45e435c 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -46,8 +46,8 @@ public: class ThemeViewItem : public KListViewItem { public: - ThemeViewItem( K3bTheme* theme_, TQListView* tqparent, TQListViewItem* after ) - : KListViewItem( tqparent, after ), + ThemeViewItem( K3bTheme* theme_, TQListView* parent, TQListViewItem* after ) + : KListViewItem( parent, after ), theme(theme_) { setText( 0, theme->name() ); setText( 1, theme->author() ); @@ -58,8 +58,8 @@ public: K3bTheme* theme; }; -K3bThemeOptionTab::K3bThemeOptionTab(TQWidget *tqparent, const char *name ) - : base_K3bThemeOptionTab(tqparent,name) +K3bThemeOptionTab::K3bThemeOptionTab(TQWidget *parent, const char *name ) + : base_K3bThemeOptionTab(parent,name) { d = new Private(); diff --git a/src/option/k3bthemeoptiontab.h b/src/option/k3bthemeoptiontab.h index d247f94..04a88b0 100644 --- a/src/option/k3bthemeoptiontab.h +++ b/src/option/k3bthemeoptiontab.h @@ -29,7 +29,7 @@ class K3bThemeOptionTab : public base_K3bThemeOptionTab TQ_OBJECT public: - K3bThemeOptionTab( TQWidget* tqparent = 0, const char* name = 0 ); + K3bThemeOptionTab( TQWidget* parent = 0, const char* name = 0 ); ~K3bThemeOptionTab(); void readSettings(); diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 4ec9ff3..0634caa 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -55,8 +55,8 @@ #include -K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, tqparent, name, modal ), +K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, parent, name, modal ), m_doc(_doc) { prepareGui(); diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h index 64355a2..3b3bb07 100644 --- a/src/projects/k3baudioburndialog.h +++ b/src/projects/k3baudioburndialog.h @@ -45,7 +45,7 @@ class K3bAudioBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bAudioBurnDialog(K3bAudioDoc* doc, TQWidget *tqparent=0, const char *name=0, bool modal = true ); + K3bAudioBurnDialog(K3bAudioDoc* doc, TQWidget *parent=0, const char *name=0, bool modal = true ); ~K3bAudioBurnDialog(); protected: diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp index f6237b9..a1dff26 100644 --- a/src/projects/k3baudiocdtextwidget.cpp +++ b/src/projects/k3baudiocdtextwidget.cpp @@ -36,8 +36,8 @@ class K3bAudioCdTextWidget::AllFieldsDialog : public KDialogBase { public: - AllFieldsDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, + AllFieldsDialog( TQWidget* parent ) + : KDialogBase( parent, "cdtext_allfields_dialog", true, i18n("CD-Text"), @@ -52,8 +52,8 @@ public: }; -K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* tqparent, const char* name ) - : base_K3bAudioCdTextWidget( tqparent, name ), +K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* parent, const char* name ) + : base_K3bAudioCdTextWidget( parent, name ), m_doc(0) { m_allFieldsDlg = new AllFieldsDialog( this ); diff --git a/src/projects/k3baudiocdtextwidget.h b/src/projects/k3baudiocdtextwidget.h index 88ff568..e4c2e35 100644 --- a/src/projects/k3baudiocdtextwidget.h +++ b/src/projects/k3baudiocdtextwidget.h @@ -28,7 +28,7 @@ class K3bAudioCdTextWidget : public base_K3bAudioCdTextWidget TQ_OBJECT public: - K3bAudioCdTextWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioCdTextWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioCdTextWidget(); bool isChecked() const; diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp index 541c946..4a6e722 100644 --- a/src/projects/k3baudiodatasourceeditwidget.cpp +++ b/src/projects/k3baudiodatasourceeditwidget.cpp @@ -27,8 +27,8 @@ #include -K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), +K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ), m_source(0) { m_editor = new K3bAudioEditorWidget( this ); diff --git a/src/projects/k3baudiodatasourceeditwidget.h b/src/projects/k3baudiodatasourceeditwidget.h index 10a7ace..4fe29f4 100644 --- a/src/projects/k3baudiodatasourceeditwidget.h +++ b/src/projects/k3baudiodatasourceeditwidget.h @@ -33,7 +33,7 @@ class K3bAudioDataSourceEditWidget : public TQWidget TQ_OBJECT public: - K3bAudioDataSourceEditWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioDataSourceEditWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioDataSourceEditWidget(); K3b::Msf startOffset() const; diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index eb70a66..6609d00 100644 --- a/src/projects/k3baudiodatasourceviewitem.cpp +++ b/src/projects/k3baudiodatasourceviewitem.cpp @@ -23,11 +23,11 @@ #include -K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* tqparent, +K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* parent, K3bAudioDataSourceViewItem* after, K3bAudioDataSource* source ) - : K3bListViewItem( tqparent, after ), - m_trackViewItem( tqparent ), + : K3bListViewItem( parent, after ), + m_trackViewItem( parent ), m_source( source ), m_animationCounter(1) { diff --git a/src/projects/k3baudiodatasourceviewitem.h b/src/projects/k3baudiodatasourceviewitem.h index 7b2fb5a..89a7c74 100644 --- a/src/projects/k3baudiodatasourceviewitem.h +++ b/src/projects/k3baudiodatasourceviewitem.h @@ -25,7 +25,7 @@ class K3bAudioTrackViewItem; class K3bAudioDataSourceViewItem : public K3bListViewItem { public: - K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* tqparent, + K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* parent, K3bAudioDataSourceViewItem* after, K3bAudioDataSource* ); diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index 186fdb5..fe0be91 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -168,8 +168,8 @@ public: }; -K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name, TQt::WNoAutoErase ), +K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* parent, const char* name ) + : TQFrame( parent, name, TQt::WNoAutoErase ), m_maxMarkers(1), m_idCnt(1), m_mouseAt(true), diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h index fdb3088..b2edfa2 100644 --- a/src/projects/k3baudioeditorwidget.h +++ b/src/projects/k3baudioeditorwidget.h @@ -31,7 +31,7 @@ class K3bAudioEditorWidget : public TQFrame TQ_OBJECT public: - K3bAudioEditorWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioEditorWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioEditorWidget(); TQSize tqsizeHint() const; diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index 6894732..5e5ca7e 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -54,12 +54,12 @@ public: }; -K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* tqparent, const char* name ) +K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n("Please be patient..."), Cancel, Cancel, - tqparent, + parent, name, true, true ), @@ -93,12 +93,12 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, K3bAudioTrack* afterTrack, K3bAudioTrack* parentTrack, K3bAudioDataSource* afterSource, - TQWidget* tqparent ) + TQWidget* parent ) { if( urls.isEmpty() ) return 0; - K3bAudioTrackAddingDialog dlg( tqparent ); + K3bAudioTrackAddingDialog dlg( parent ); dlg.m_urls = extractUrlList( urls ); dlg.m_doc = doc; dlg.m_trackAfter = afterTrack; @@ -132,7 +132,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, .tqarg( dlg.m_unsupportedFiles.join( "
    " ) ); if( !message.isEmpty() ) - KMessageBox::detailedSorry( tqparent, i18n("Problems while adding files to the project."), message ); + KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); return ret; } diff --git a/src/projects/k3baudiotrackaddingdialog.h b/src/projects/k3baudiotrackaddingdialog.h index 9fa5485..f0ee9cf 100644 --- a/src/projects/k3baudiotrackaddingdialog.h +++ b/src/projects/k3baudiotrackaddingdialog.h @@ -68,7 +68,7 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler K3bAudioTrack* afterTrack = 0, K3bAudioTrack* parentTrack = 0, K3bAudioDataSource* afterSource = 0, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); private slots: void slotAddUrls(); @@ -76,7 +76,7 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler void slotCancel(); private: - K3bAudioTrackAddingDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioTrackAddingDialog( TQWidget* parent = 0, const char* name = 0 ); static KURL::List extractUrlList( const KURL::List& urls ); diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp index 676e12b..bdfb9f0 100644 --- a/src/projects/k3baudiotrackdialog.cpp +++ b/src/projects/k3baudiotrackdialog.cpp @@ -54,10 +54,10 @@ // do only show cd-text and options (eventuelle index0) -K3bAudioTrackDialog::K3bAudioTrackDialog( TQPtrList& tracks, TQWidget *tqparent, const char *name ) +K3bAudioTrackDialog::K3bAudioTrackDialog( TQPtrList& tracks, TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Audio Track Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply, - KDialogBase::Ok, tqparent, name ) + KDialogBase::Ok, parent, name ) { m_tracks = tracks; diff --git a/src/projects/k3baudiotrackdialog.h b/src/projects/k3baudiotrackdialog.h index 8eb0ce6..36a5eff 100644 --- a/src/projects/k3baudiotrackdialog.h +++ b/src/projects/k3baudiotrackdialog.h @@ -37,7 +37,7 @@ class K3bAudioTrackDialog : public KDialogBase TQ_OBJECT public: - K3bAudioTrackDialog( TQPtrList&, TQWidget *tqparent=0, const char *name=0); + K3bAudioTrackDialog( TQPtrList&, TQWidget *parent=0, const char *name=0); ~K3bAudioTrackDialog(); protected slots: diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index 1175de7..adc1e41 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -52,8 +52,8 @@ public: }; -K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ), +K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, const char* name ) + : TQObject( parent, name ), K3bAudioClient(), m_doc( doc ), m_currentTrack( 0 ) diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h index 7868500..b4e7aff 100644 --- a/src/projects/k3baudiotrackplayer.h +++ b/src/projects/k3baudiotrackplayer.h @@ -33,7 +33,7 @@ class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient TQ_OBJECT public: - K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioTrackPlayer(); K3bAudioTrack* currentPlayingTrack() const { return m_currentTrack; } diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 9ec443a..6a987e6 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -30,10 +30,10 @@ #include -K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* tqparent, const char* name ) +K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("Split Audio Track"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name ), + KDialogBase::Ok, parent, name ), m_track(track) { TQFrame* frame = plainPage(); @@ -193,10 +193,10 @@ void K3bAudioTrackSplitDialog::slotRemoveRange() void K3bAudioTrackSplitDialog::splitTrack( K3bAudioTrack* track, - TQWidget* tqparent, + TQWidget* parent, const char* name ) { - K3bAudioTrackSplitDialog d( track, tqparent, name ); + K3bAudioTrackSplitDialog d( track, parent, name ); if( d.exec() == TQDialog::Accepted ) { TQValueList ranges = d.m_editorWidget->allRanges(); // we split the track at all range ends and just delete those that relate to the gaps in between diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h index ce9b01b..58ade55 100644 --- a/src/projects/k3baudiotracksplitdialog.h +++ b/src/projects/k3baudiotracksplitdialog.h @@ -37,7 +37,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase TQ_OBJECT public: - K3bAudioTrackSplitDialog( K3bAudioTrack*, TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioTrackSplitDialog( K3bAudioTrack*, TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioTrackSplitDialog(); bool eventFilter( TQObject* o, TQEvent* e ); @@ -47,7 +47,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase /** * if this method returns true val is filled with the user selected value. */ - static void splitTrack( K3bAudioTrack* track, TQWidget* tqparent = 0, const char* name = 0 ); + static void splitTrack( K3bAudioTrack* track, TQWidget* parent = 0, const char* name = 0 ); private slots: void slotRangeModified( int, const K3b::Msf& start, const K3b::Msf& ); diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp index 0187d33..0bf23ec 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.cpp +++ b/src/projects/k3baudiotracktrmlookupdialog.cpp @@ -41,12 +41,12 @@ #include -K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* tqparent, const char* name ) +K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("MusicBrainz Query"), KDialogBase::Cancel, KDialogBase::Cancel, - tqparent, + parent, name, true, true ) diff --git a/src/projects/k3baudiotracktrmlookupdialog.h b/src/projects/k3baudiotracktrmlookupdialog.h index f0d6718..b3cde66 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.h +++ b/src/projects/k3baudiotracktrmlookupdialog.h @@ -31,7 +31,7 @@ class K3bAudioTrackTRMLookupDialog : public KDialogBase TQ_OBJECT public: - K3bAudioTrackTRMLookupDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioTrackTRMLookupDialog( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioTrackTRMLookupDialog(); /** diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 4aebd99..23f3478 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -61,8 +61,8 @@ #include -K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* tqparent, const char* name ) - : K3bListView( tqparent, name ), +K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const char* name ) + : K3bListView( parent, name ), m_doc(doc), m_updatingColumnWidths(false), m_currentMouseOverItem(0), @@ -230,7 +230,7 @@ TQDragObject* K3bAudioTrackView::dragObject() } -void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ) +void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after ) { m_autoOpenTrackTimer->stop(); @@ -249,7 +249,7 @@ void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, T } } - if( K3bAudioTrackViewItem* tv = dynamic_cast( tqparent ) ) { + if( K3bAudioTrackViewItem* tv = dynamic_cast( parent ) ) { m_dropTrackParent = tv->track(); } @@ -594,12 +594,12 @@ void K3bAudioTrackView::contentsDragLeaveEvent( TQDragLeaveEvent* e ) K3bAudioTrackViewItem* K3bAudioTrackView::findTrackItem( const TQPoint& pos ) const { - TQListViewItem* tqparent = 0; + TQListViewItem* parent = 0; TQListViewItem* after = 0; K3bAudioTrackView* that = const_cast(this); - that->findDrop( pos, tqparent, after ); - if( tqparent ) - return static_cast( tqparent ); + that->findDrop( pos, parent, after ); + if( parent ) + return static_cast( parent ); else if( K3bAudioTrackViewItem* tv = dynamic_cast(after) ) return tv; else if( K3bAudioDataSourceViewItem* sv = dynamic_cast(after) ) diff --git a/src/projects/k3baudiotrackview.h b/src/projects/k3baudiotrackview.h index fb52509..5618089 100644 --- a/src/projects/k3baudiotrackview.h +++ b/src/projects/k3baudiotrackview.h @@ -46,7 +46,7 @@ class K3bAudioTrackView : public K3bListView TQ_OBJECT public: - K3bAudioTrackView( K3bAudioDoc*, TQWidget* tqparent, const char* name = 0 ); + K3bAudioTrackView( K3bAudioDoc*, TQWidget* parent, const char* name = 0 ); ~K3bAudioTrackView(); KActionCollection* actionCollection() const { return m_actionCollection; } @@ -106,7 +106,7 @@ class K3bAudioTrackView : public K3bListView private slots: void slotAnimation(); - void slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ); + void slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after ); void slotChanged(); void slotTrackChanged( K3bAudioTrack* ); void slotTrackRemoved( K3bAudioTrack* ); diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 6c0418f..24d6f48 100644 --- a/src/projects/k3baudiotrackviewitem.cpp +++ b/src/projects/k3baudiotrackviewitem.cpp @@ -25,10 +25,10 @@ #include -K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* tqparent, +K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent, K3bAudioTrackViewItem* after, K3bAudioTrack* track ) - : K3bListViewItem( tqparent, after ), + : K3bListViewItem( parent, after ), m_track( track ), m_alreadyRemoved(false), m_showingSources(false), diff --git a/src/projects/k3baudiotrackviewitem.h b/src/projects/k3baudiotrackviewitem.h index c9974ba..ecd40f9 100644 --- a/src/projects/k3baudiotrackviewitem.h +++ b/src/projects/k3baudiotrackviewitem.h @@ -25,7 +25,7 @@ class K3bAudioTrack; class K3bAudioTrackViewItem : public K3bListViewItem { public: - K3bAudioTrackViewItem( K3bAudioTrackView* tqparent, + K3bAudioTrackViewItem( K3bAudioTrackView* parent, K3bAudioTrackViewItem* after, K3bAudioTrack* track ); ~K3bAudioTrackViewItem(); diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp index 6dc0fe3..76f0c97 100644 --- a/src/projects/k3baudiotrackwidget.cpp +++ b/src/projects/k3baudiotrackwidget.cpp @@ -36,8 +36,8 @@ K3bAudioTrackWidget::K3bAudioTrackWidget( const TQPtrList& tracks, - TQWidget* tqparent, const char* name ) - : base_K3bAudioTrackWidget( tqparent, name ), + TQWidget* parent, const char* name ) + : base_K3bAudioTrackWidget( parent, name ), m_tracks(tracks) { m_labelPostGap->setBuddy( m_editPostGap ); diff --git a/src/projects/k3baudiotrackwidget.h b/src/projects/k3baudiotrackwidget.h index bd7124b..aea9310 100644 --- a/src/projects/k3baudiotrackwidget.h +++ b/src/projects/k3baudiotrackwidget.h @@ -36,7 +36,7 @@ class K3bAudioTrackWidget : public base_K3bAudioTrackWidget public: K3bAudioTrackWidget( const TQPtrList& tracks, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioTrackWidget(); public slots: diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index 929907e..c0019b9 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -49,8 +49,8 @@ -K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* tqparent, const char *name ) - : K3bView( pDoc, tqparent, name ) +K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *name ) + : K3bView( pDoc, parent, name ) { m_doc = pDoc; @@ -115,9 +115,9 @@ void K3bAudioView::init() } -K3bProjectBurnDialog* K3bAudioView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bAudioView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bAudioBurnDialog( m_doc, tqparent, name, true ); + return new K3bAudioBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3baudioview.h b/src/projects/k3baudioview.h index 006ee14..40dd01f 100644 --- a/src/projects/k3baudioview.h +++ b/src/projects/k3baudioview.h @@ -37,7 +37,7 @@ class K3bAudioView : public K3bView TQ_OBJECT public: - K3bAudioView( K3bAudioDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); + K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *name = 0 ); ~K3bAudioView(); K3bAudioTrackPlayer* player() const { return m_songlist->player(); } @@ -46,7 +46,7 @@ class K3bAudioView : public K3bView void addUrls( const KURL::List& ); protected: - K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bbootimagedialog.cpp b/src/projects/k3bbootimagedialog.cpp index 2cd1a63..a722736 100644 --- a/src/projects/k3bbootimagedialog.cpp +++ b/src/projects/k3bbootimagedialog.cpp @@ -21,10 +21,10 @@ K3bBootImageDialog::K3bBootImageDialog( K3bDataDoc* doc, - TQWidget* tqparent, + TQWidget* parent, const char* name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Boot Images"), Ok ) + : KDialogBase( parent, name, modal, i18n("Boot Images"), Ok ) { m_bootImageView = new K3bBootImageView( doc, this ); setMainWidget( m_bootImageView ); diff --git a/src/projects/k3bbootimagedialog.h b/src/projects/k3bbootimagedialog.h index 6f42849..9887b46 100644 --- a/src/projects/k3bbootimagedialog.h +++ b/src/projects/k3bbootimagedialog.h @@ -30,7 +30,7 @@ class K3bBootImageDialog : public KDialogBase public: K3bBootImageDialog( K3bDataDoc*, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~K3bBootImageDialog(); diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 718bc04..92b4c87 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -39,14 +39,14 @@ class K3bBootImageView::PrivateBootImageViewItem : public KListViewItem { public: - PrivateBootImageViewItem( K3bBootItem* image, TQListView* tqparent ) - : KListViewItem( tqparent ), + PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent ) + : KListViewItem( parent ), m_image( image ) { } - PrivateBootImageViewItem( K3bBootItem* image, TQListView* tqparent, TQListViewItem* after ) - : KListViewItem( tqparent, after ), + PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent, TQListViewItem* after ) + : KListViewItem( parent, after ), m_image( image ) { } @@ -75,8 +75,8 @@ private: }; -K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, TQWidget* tqparent, const char* name ) - : base_K3bBootImageView( tqparent, name ), +K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, TQWidget* parent, const char* name ) + : base_K3bBootImageView( parent, name ), m_doc(doc) { connect( m_buttonNew, TQT_SIGNAL(clicked()), diff --git a/src/projects/k3bbootimageview.h b/src/projects/k3bbootimageview.h index 102cedd..de0ca6a 100644 --- a/src/projects/k3bbootimageview.h +++ b/src/projects/k3bbootimageview.h @@ -29,7 +29,7 @@ class K3bBootImageView : public base_K3bBootImageView TQ_OBJECT public: - K3bBootImageView( K3bDataDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bBootImageView( K3bDataDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bBootImageView(); private slots: diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp index 7ce1789..782d898 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.cpp +++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp @@ -120,12 +120,12 @@ private: class K3bDataAdvancedImageSettingsWidget::PrivateCheckViewItem : public TQCheckListItem { public: - PrivateCheckViewItem( TQListView* tqparent, const TQString& text, Type tt = Controller ) - : TQCheckListItem( tqparent, text, tt ) { + PrivateCheckViewItem( TQListView* parent, const TQString& text, Type tt = Controller ) + : TQCheckListItem( parent, text, tt ) { } - PrivateCheckViewItem( TQListViewItem* tqparent, const TQString& text, Type tt = Controller ) - : TQCheckListItem( tqparent, text, tt ) { + PrivateCheckViewItem( TQListViewItem* parent, const TQString& text, Type tt = Controller ) + : TQCheckListItem( parent, text, tt ) { } protected: @@ -141,8 +141,8 @@ protected: }; -K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget* tqparent, const char* name ) - : base_K3bAdvancedDataImageSettings( tqparent, name ) +K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget* parent, const char* name ) + : base_K3bAdvancedDataImageSettings( parent, name ) { m_viewIsoSettings->header()->hide(); m_viewIsoSettings->setSorting( -1 ); diff --git a/src/projects/k3bdataadvancedimagesettingswidget.h b/src/projects/k3bdataadvancedimagesettingswidget.h index 9ea8124..2268193 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.h +++ b/src/projects/k3bdataadvancedimagesettingswidget.h @@ -29,7 +29,7 @@ class K3bDataAdvancedImageSettingsWidget : public base_K3bAdvancedDataImageSetti TQ_OBJECT public: - K3bDataAdvancedImageSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataAdvancedImageSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataAdvancedImageSettingsWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index 85f6a7d..2b4375f 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -64,8 +64,8 @@ #include "k3bfilecompilationsizehandler.h" -K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, tqparent, name, modal ) +K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, parent, name, modal ) { prepareGui(); diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h index 4105884..a1b0b4b 100644 --- a/src/projects/k3bdataburndialog.h +++ b/src/projects/k3bdataburndialog.h @@ -45,7 +45,7 @@ class K3bDataBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bDataBurnDialog(K3bDataDoc*, TQWidget *tqparent=0, const char *name=0, bool modal = true ); + K3bDataBurnDialog(K3bDataDoc*, TQWidget *parent=0, const char *name=0, bool modal = true ); ~K3bDataBurnDialog(); protected: diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 82f11b4..6164aa2 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -64,8 +64,8 @@ public: }; -K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget* tqparent ) - : K3bListView( tqparent ), m_view(view) +K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget* parent ) + : K3bListView( parent ), m_view(view) { d = new Private(); @@ -171,7 +171,7 @@ void K3bDataDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListVie if( d->addParentDir ) { - // startDropAnimation( tqparent ); + // startDropAnimation( parent ); // check if items have been moved if( m_fileView && @@ -231,7 +231,7 @@ void K3bDataDirTreeView::slotItemAdded( K3bDataItem* item ) // should only be emitted once for every item // K3bDirItem* dirItem = static_cast( item ); - K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->parent()]; K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } @@ -268,7 +268,7 @@ void K3bDataDirTreeView::setCurrentDir( K3bDirItem* dirItem ) setCurrentItem( it.data() ); it.data()->setOpen(true); if( it.data() != root() ) - it.data()->tqparent()->setOpen(true); + it.data()->parent()->setOpen(true); } else { kdDebug() << "Tried to set unknown dirItem to current" << endl; @@ -328,7 +328,7 @@ void K3bDataDirTreeView::showPopupMenu( KListView*, TQListViewItem* item, const void K3bDataDirTreeView::slotNewDir() { if( K3bDataDirViewItem* vI = dynamic_cast(currentItem()) ) { - K3bDirItem* tqparent = vI->dirItem(); + K3bDirItem* parent = vI->dirItem(); TQString name; bool ok; @@ -337,7 +337,7 @@ void K3bDataDirTreeView::slotNewDir() i18n("Please insert the name for the new directory:"), i18n("New Directory"), &ok, this ); - while( ok && K3bDataDoc::nameAlreadyInDir( name, tqparent ) ) { + while( ok && K3bDataDoc::nameAlreadyInDir( name, parent ) ) { name = KInputDialog::getText( i18n("New Directory"), i18n("A file with that name already exists. " "Please insert the name for the new directory:"), @@ -348,7 +348,7 @@ void K3bDataDirTreeView::slotNewDir() return; - m_doc->addEmptyDir( name, tqparent ); + m_doc->addEmptyDir( name, parent ); } } @@ -448,7 +448,7 @@ void K3bDataDirTreeView::checkForNewItems() while( item != 0 ) { // check if we have an entry and if not, create one - // we can assume that a listViewItem for the tqparent exists + // we can assume that a listViewItem for the parent exists // since we go top to bottom if( item->isDir() ) { @@ -456,15 +456,15 @@ void K3bDataDirTreeView::checkForNewItems() TQMapIterator itDirItem = m_itemMap.find( dirItem ); if( itDirItem == m_itemMap.end() ) { - K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->parent()]; K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } else { - // check if tqparent still correct (to get moved items) + // check if parent still correct (to get moved items) K3bDataDirViewItem* dirViewItem = itDirItem.data(); - K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent(); - K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->parent(); + K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->parent()]; if( dirParentViewItem != parentViewItem ) { // reparent it parentViewItem->takeItem( dirViewItem ); diff --git a/src/projects/k3bdatadirtreeview.h b/src/projects/k3bdatadirtreeview.h index 2ffaaa7..5379d30 100644 --- a/src/projects/k3bdatadirtreeview.h +++ b/src/projects/k3bdatadirtreeview.h @@ -47,7 +47,7 @@ class K3bDataDirTreeView : public K3bListView TQ_OBJECT public: - K3bDataDirTreeView( K3bView*, K3bDataDoc*, TQWidget* tqparent ); + K3bDataDirTreeView( K3bView*, K3bDataDoc*, TQWidget* parent ); virtual ~K3bDataDirTreeView(); K3bDataDirViewItem* root() { return m_root; } @@ -61,7 +61,7 @@ class K3bDataDirTreeView : public K3bListView void setCurrentDir( K3bDirItem* ); signals: - // void urlsDropped( const KURL::List&, TQListViewItem* tqparent ); + // void urlsDropped( const KURL::List&, TQListViewItem* parent ); void dirSelected( K3bDirItem* ); protected: @@ -77,7 +77,7 @@ class K3bDataDirTreeView : public K3bListView KAction* m_actionProperties; protected slots: - virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); + virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); private: void setupActions(); diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 996ca69..e5c0e84 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -47,8 +47,8 @@ #include -K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, TQWidget* tqparent ) - : K3bListView( tqparent ), +K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, TQWidget* parent ) + : K3bListView( parent ), m_view(view), m_dropDirItem(0) { @@ -126,7 +126,7 @@ void K3bDataFileView::clearItems() void K3bDataFileView::slotItemAdded( K3bDataItem* item ) { - if( item->tqparent() == currentDir() ) { + if( item->parent() == currentDir() ) { K3bDataViewItem* vi = 0; if( item->isDir() ) vi = new K3bDataDirViewItem( static_cast(item), this ); @@ -174,7 +174,7 @@ void K3bDataFileView::checkForNewItems() // now check if some of the items have been moved out of the currently showing dir. for( TQListViewItemIterator it( this ); it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast( it.current() ); - if( dataViewItem && dataViewItem->dataItem()->tqparent() != currentDir() ) + if( dataViewItem && dataViewItem->dataItem()->parent() != currentDir() ) delete dataViewItem; } } @@ -373,7 +373,7 @@ void K3bDataFileView::showPopupMenu( KListView*, TQListViewItem* item, const TQP void K3bDataFileView::slotNewDir() { - K3bDirItem* tqparent = currentDir(); + K3bDirItem* parent = currentDir(); TQString name; bool ok; @@ -382,7 +382,7 @@ void K3bDataFileView::slotNewDir() i18n("Please insert the name for the new directory:"), i18n("New Directory"), &ok, this ); - while( ok && K3bDataDoc::nameAlreadyInDir( name, tqparent ) ) { + while( ok && K3bDataDoc::nameAlreadyInDir( name, parent ) ) { name = KInputDialog::getText( i18n("New Directory"), i18n("A file with that name already exists. " "Please insert the name for the new directory:"), @@ -393,7 +393,7 @@ void K3bDataFileView::slotNewDir() return; - m_doc->addEmptyDir( name, tqparent ); + m_doc->addEmptyDir( name, parent ); } @@ -418,7 +418,7 @@ void K3bDataFileView::slotRemoveItem() void K3bDataFileView::slotParentDir() { if( currentDir() != m_doc->root() ) { - slotSetCurrentDir( currentDir()->tqparent() ); + slotSetCurrentDir( currentDir()->parent() ); emit dirSelected( currentDir() ); } diff --git a/src/projects/k3bdatafileview.h b/src/projects/k3bdatafileview.h index cd7e2c8..804f128 100644 --- a/src/projects/k3bdatafileview.h +++ b/src/projects/k3bdatafileview.h @@ -50,7 +50,7 @@ class K3bDataFileView : public K3bListView TQ_OBJECT public: - K3bDataFileView( K3bView*, K3bDataDirTreeView*, K3bDataDoc*, TQWidget* tqparent ); + K3bDataFileView( K3bView*, K3bDataDirTreeView*, K3bDataDoc*, TQWidget* parent ); ~K3bDataFileView(); K3bDirItem* currentDir() const; @@ -67,7 +67,7 @@ class K3bDataFileView : public K3bListView private slots: void slotDataItemRemoved( K3bDataItem* ); void slotExecuted( TQListViewItem* ); - void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); + void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index be55ae6..88decbc 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -126,8 +126,8 @@ static void initializePresets() class K3bDataImageSettingsWidget::CustomFilesystemsDialog : public KDialogBase { public: - CustomFilesystemsDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, + CustomFilesystemsDialog( TQWidget* parent ) + : KDialogBase( parent, "custom_filesystems_dialog", true, i18n("Custom Data Project Filesystems"), @@ -145,8 +145,8 @@ public: class K3bDataImageSettingsWidget::VolumeDescDialog : public KDialogBase { public: - VolumeDescDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, + VolumeDescDialog( TQWidget* parent ) + : KDialogBase( parent, "voldesc_dialog", true, i18n("Volume Descriptor"), @@ -167,8 +167,8 @@ public: -K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* tqparent, const char* name ) - : base_K3bDataImageSettings( tqparent, name ), +K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const char* name ) + : base_K3bDataImageSettings( parent, name ), m_fileSystemOptionsShown(true) { tqlayout()->setMargin( KDialog::marginHint() ); diff --git a/src/projects/k3bdataimagesettingswidget.h b/src/projects/k3bdataimagesettingswidget.h index 13086f3..d82394a 100644 --- a/src/projects/k3bdataimagesettingswidget.h +++ b/src/projects/k3bdataimagesettingswidget.h @@ -28,7 +28,7 @@ class K3bDataImageSettingsWidget : public base_K3bDataImageSettings TQ_OBJECT public: - K3bDataImageSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataImageSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataImageSettingsWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp index 87e6551..98736b1 100644 --- a/src/projects/k3bdatamultisessioncombobox.cpp +++ b/src/projects/k3bdatamultisessioncombobox.cpp @@ -29,8 +29,8 @@ static const int s_continueIndex = 3; static const int s_finishIndex = 4; -K3bDataMultiSessionCombobox::K3bDataMultiSessionCombobox( TQWidget* tqparent, const char* name ) - : TQComboBox( tqparent, name ), +K3bDataMultiSessionCombobox::K3bDataMultiSessionCombobox( TQWidget* parent, const char* name ) + : TQComboBox( parent, name ), m_forceNoMultiSession(false) { init( false ); diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h index 71ccc02..9618c00 100644 --- a/src/projects/k3bdatamultisessioncombobox.h +++ b/src/projects/k3bdatamultisessioncombobox.h @@ -28,7 +28,7 @@ class K3bDataMultiSessionCombobox : public TQComboBox TQ_OBJECT public: - K3bDataMultiSessionCombobox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataMultiSessionCombobox( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataMultiSessionCombobox(); /** diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 36f985e..6a3c057 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -41,8 +41,8 @@ -K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidget* tqparent, const char* name ) - : KDialogBase( Plain, i18n("File Properties"), Ok|Cancel, Ok, tqparent, name, true, false ) +K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidget* parent, const char* name ) + : KDialogBase( Plain, i18n("File Properties"), Ok|Cancel, Ok, parent, name, true, false ) { m_dataItem = dataItem; @@ -182,10 +182,10 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge m_checkHideOnRockRidge->setChecked( dataItem->hideOnRockRidge() ); m_editSortWeight->setText( TQString::number(dataItem->sortWeight()) ); - // if the tqparent is hidden the value cannot be changed (see K3bDataItem::setHide...) - if( dataItem->tqparent() ) { - m_checkHideOnRockRidge->setDisabled( dataItem->tqparent()->hideOnRockRidge() ); - m_checkHideOnJoliet->setDisabled( dataItem->tqparent()->hideOnJoliet() ); + // if the parent is hidden the value cannot be changed (see K3bDataItem::setHide...) + if( dataItem->parent() ) { + m_checkHideOnRockRidge->setDisabled( dataItem->parent()->hideOnRockRidge() ); + m_checkHideOnJoliet->setDisabled( dataItem->parent()->hideOnJoliet() ); } if( !dataItem->isHideable() ) { diff --git a/src/projects/k3bdatapropertiesdialog.h b/src/projects/k3bdatapropertiesdialog.h index 8c79c47..de03d95 100644 --- a/src/projects/k3bdatapropertiesdialog.h +++ b/src/projects/k3bdatapropertiesdialog.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - K3bDataPropertiesDialog( K3bDataItem*, TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataPropertiesDialog( K3bDataItem*, TQWidget* parent = 0, const char* name = 0 ); ~K3bDataPropertiesDialog(); protected slots: diff --git a/src/projects/k3bdatasessionimportdialog.cpp b/src/projects/k3bdatasessionimportdialog.cpp index 80e45f1..bf5d263 100644 --- a/src/projects/k3bdatasessionimportdialog.cpp +++ b/src/projects/k3bdatasessionimportdialog.cpp @@ -30,8 +30,8 @@ #include -K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, +K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* parent ) + : KDialogBase( parent, "session_import_dialog", true, i18n("Session Import"), @@ -125,9 +125,9 @@ void K3bDataSessionImportDialog::slotSelectionChanged( K3bDevice::Device* dev ) } -K3bDataDoc* K3bDataSessionImportDialog::importSession( K3bDataDoc* doc, TQWidget* tqparent ) +K3bDataDoc* K3bDataSessionImportDialog::importSession( K3bDataDoc* doc, TQWidget* parent ) { - K3bDataSessionImportDialog dlg( tqparent ); + K3bDataSessionImportDialog dlg( parent ); dlg.importSession( doc ); dlg.exec(); return dlg.m_doc; diff --git a/src/projects/k3bdatasessionimportdialog.h b/src/projects/k3bdatasessionimportdialog.h index 7a092db..0213515 100644 --- a/src/projects/k3bdatasessionimportdialog.h +++ b/src/projects/k3bdatasessionimportdialog.h @@ -45,7 +45,7 @@ class K3bDataSessionImportDialog : public KDialogBase * * \return the project */ - static K3bDataDoc* importSession( K3bDataDoc* doc, TQWidget* tqparent ); + static K3bDataDoc* importSession( K3bDataDoc* doc, TQWidget* parent ); private slots: void slotOk(); @@ -55,7 +55,7 @@ class K3bDataSessionImportDialog : public KDialogBase void slotSelectionChanged( K3bDevice::Device* ); private: - K3bDataSessionImportDialog( TQWidget* tqparent = 0 ); + K3bDataSessionImportDialog( TQWidget* parent = 0 ); ~K3bDataSessionImportDialog(); K3bDataDoc* m_doc; diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 9f69d86..630d7f9 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -55,12 +55,12 @@ #include -K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* tqparent, const char* name ) +K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n("Adding files to project '%1'").tqarg(doc->URL().fileName()), Cancel, Cancel, - tqparent, + parent, name, true, true ), @@ -108,7 +108,7 @@ K3bDataUrlAddingDialog::~K3bDataUrlAddingDialog() int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, K3bDirItem* dir, - TQWidget* tqparent ) + TQWidget* parent ) { if( urls.isEmpty() ) return 0; @@ -120,7 +120,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, if( urls.count() == 1 ) { K3bIso9660 isoF( urls.first().path() ); if( isoF.open() ) { - if( KMessageBox::warningYesNo( tqparent, + if( KMessageBox::warningYesNo( parent, i18n("

    The file you are about to add to the project is an ISO9660 image. As such " "it can be burned to a medium directly since it already contains a file " "system.
    " @@ -138,7 +138,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, } } - K3bDataUrlAddingDialog dlg( dir->doc(), tqparent ); + K3bDataUrlAddingDialog dlg( dir->doc(), parent ); dlg.m_urls = urls; for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) dlg.m_urlQueue.append( tqMakePair( K3b::convertToLocalUrl(*it), dir ) ); @@ -158,7 +158,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, TQString message = dlg.resultMessage(); if( !message.isEmpty() ) - KMessageBox::detailedSorry( tqparent, i18n("Problems while adding files to the project."), message ); + KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); return ret; } @@ -199,29 +199,29 @@ TQString K3bDataUrlAddingDialog::resultMessage() const int K3bDataUrlAddingDialog::moveItems( const TQValueList& items, K3bDirItem* dir, - TQWidget* tqparent ) + TQWidget* parent ) { - return copyMoveItems( items, dir, tqparent, false ); + return copyMoveItems( items, dir, parent, false ); } int K3bDataUrlAddingDialog::copyItems( const TQValueList& items, K3bDirItem* dir, - TQWidget* tqparent ) + TQWidget* parent ) { - return copyMoveItems( items, dir, tqparent, true ); + return copyMoveItems( items, dir, parent, true ); } int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList& items, K3bDirItem* dir, - TQWidget* tqparent, + TQWidget* parent, bool copy ) { if( items.isEmpty() ) return 0; - K3bDataUrlAddingDialog dlg( dir->doc(), tqparent ); + K3bDataUrlAddingDialog dlg( dir->doc(), parent ); dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").tqarg(dir->doc()->URL().fileName()) ); dlg.m_copyItems = copy; @@ -608,8 +608,8 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); - if( dir == item->tqparent() ) { - kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into its own tqparent dir." << endl; + if( dir == item->parent() ) { + kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into its own parent dir." << endl; } else if( dir == item ) { kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into itselft." << endl; diff --git a/src/projects/k3bdataurladdingdialog.h b/src/projects/k3bdataurladdingdialog.h index ca6b4b2..2481eb5 100644 --- a/src/projects/k3bdataurladdingdialog.h +++ b/src/projects/k3bdataurladdingdialog.h @@ -43,16 +43,16 @@ class K3bDataUrlAddingDialog : public KDialogBase * \return \see TQDialog::exec() */ static int addUrls( const KURL::List& urls, K3bDirItem* dir = 0, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); static int moveItems( const TQValueList& items, K3bDirItem* dir, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); static int copyItems( const TQValueList& items, K3bDirItem* dir, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); static int copyMoveItems( const TQValueList& items, K3bDirItem* dir, - TQWidget* tqparent, bool copy ); + TQWidget* parent, bool copy ); private slots: void slotAddUrls(); @@ -62,7 +62,7 @@ class K3bDataUrlAddingDialog : public KDialogBase void updateProgress(); private: - K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent = 0, const char* name = 0 ); bool getNewName( const TQString& oldName, K3bDirItem* dir, TQString& newName ); diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index 9aaa2b3..1ac59f8 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -53,8 +53,8 @@ #include -K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *tqparent, const char *name ) - : K3bView(doc, tqparent,name) +K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) + : K3bView(doc, parent,name) { m_doc = doc; @@ -156,9 +156,9 @@ void K3bDataView::editBootImages() } -K3bProjectBurnDialog* K3bDataView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bDataView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bDataBurnDialog( m_doc, tqparent, name, true ); + return new K3bDataBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h index ea2a6a1..6fed6d4 100644 --- a/src/projects/k3bdataview.h +++ b/src/projects/k3bdataview.h @@ -46,7 +46,7 @@ class K3bDataView : public K3bView TQ_OBJECT public: - K3bDataView(K3bDataDoc* doc, TQWidget *tqparent=0, const char *name=0); + K3bDataView(K3bDataDoc* doc, TQWidget *parent=0, const char *name=0); virtual ~K3bDataView(); K3bDirItem* currentDir() const; @@ -66,7 +66,7 @@ class K3bDataView : public K3bView K3bDataFileView* m_dataFileView; TQLineEdit* m_volumeIDEdit; - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private: K3bDataDoc* m_doc; diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index f200e55..c60f5d7 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -35,15 +35,15 @@ #include -K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListView* tqparent ) - : K3bListViewItem( tqparent ), +K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListView* parent ) + : K3bListViewItem( parent ), m_dataItem(item) { init(); } -K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListViewItem* tqparent ) - : K3bListViewItem( tqparent ), +K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListViewItem* parent ) + : K3bListViewItem( parent ), m_dataItem(item) { init(); @@ -134,16 +134,16 @@ TQString K3bDataViewItem::key( int col, bool a ) const } -K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListView* tqparent ) - : K3bDataViewItem( dir, tqparent ) +K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListView* parent ) + : K3bDataViewItem( dir, parent ) { m_dirItem = dir; setPixmap( 0, dir->depth() > 7 ? SmallIcon( "folder_red" ) : SmallIcon( "folder" ) ); } -K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* tqparent ) - : K3bDataViewItem( dir, tqparent ) +K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* parent ) + : K3bDataViewItem( dir, parent ) { m_dirItem = dir; setPixmap( 0, dir->depth() > 7 ? SmallIcon( "folder_red" ) : SmallIcon( "folder" ) ); @@ -189,15 +189,15 @@ void K3bDataDirViewItem::highlightIcon( bool b ) -K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListView* tqparent ) - : K3bDataViewItem( file, tqparent ) +K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListView* parent ) + : K3bDataViewItem( file, parent ) { init( file ); } -K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListViewItem* tqparent ) - : K3bDataViewItem( file, tqparent ) +K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListViewItem* parent ) + : K3bDataViewItem( file, parent ) { init( file ); } @@ -262,8 +262,8 @@ TQString K3bDataFileViewItem::text( int index ) const -K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, TQListView* tqparent ) - : K3bDataDirViewItem( doc->root(), tqparent ) +K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, TQListView* parent ) + : K3bDataDirViewItem( doc->root(), parent ) { m_doc = doc; setPixmap( 0, SmallIcon( "cdrom_unmount" ) ); @@ -297,8 +297,8 @@ void K3bDataRootViewItem::setText( int col, const TQString& text ) } -K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, TQListView* tqparent ) - : K3bDataViewItem( item, tqparent ) +K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, TQListView* parent ) + : K3bDataViewItem( item, parent ) { setPixmap( 0, SmallIcon("unknown") ); } @@ -319,8 +319,8 @@ TQString K3bSpecialDataViewItem::text( int col ) const -K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, TQListView* tqparent ) - : K3bDataViewItem( item, tqparent ) +K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, TQListView* parent ) + : K3bDataViewItem( item, parent ) { setPixmap( 0, SmallIcon("unknown") ); } diff --git a/src/projects/k3bdataviewitem.h b/src/projects/k3bdataviewitem.h index ac95e98..645c076 100644 --- a/src/projects/k3bdataviewitem.h +++ b/src/projects/k3bdataviewitem.h @@ -34,8 +34,8 @@ class TQColorGroup; class K3bDataViewItem : public K3bListViewItem { public: - K3bDataViewItem( K3bDataItem*, TQListView* tqparent ); - K3bDataViewItem( K3bDataItem*, TQListViewItem* tqparent ); + K3bDataViewItem( K3bDataItem*, TQListView* parent ); + K3bDataViewItem( K3bDataItem*, TQListViewItem* parent ); virtual ~K3bDataViewItem(); virtual K3bDataItem* dataItem() const { return m_dataItem; } @@ -59,8 +59,8 @@ class K3bDataViewItem : public K3bListViewItem class K3bDataDirViewItem : public K3bDataViewItem { public: - K3bDataDirViewItem( K3bDirItem* dir, TQListView* tqparent ); - K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* tqparent ); + K3bDataDirViewItem( K3bDirItem* dir, TQListView* parent ); + K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* parent ); ~K3bDataDirViewItem(); virtual TQString text( int ) const; @@ -81,8 +81,8 @@ class K3bDataDirViewItem : public K3bDataViewItem class K3bDataFileViewItem : public K3bDataViewItem { public: - K3bDataFileViewItem( K3bFileItem*, TQListView* tqparent ); - K3bDataFileViewItem( K3bFileItem*, TQListViewItem* tqparent ); + K3bDataFileViewItem( K3bFileItem*, TQListView* parent ); + K3bDataFileViewItem( K3bFileItem*, TQListViewItem* parent ); ~K3bDataFileViewItem() {} TQString text( int ) const; @@ -102,7 +102,7 @@ class K3bDataFileViewItem : public K3bDataViewItem class K3bDataRootViewItem : public K3bDataDirViewItem { public: - K3bDataRootViewItem( K3bDataDoc*, TQListView* tqparent ); + K3bDataRootViewItem( K3bDataDoc*, TQListView* parent ); ~K3bDataRootViewItem(); TQString text( int ) const; diff --git a/src/projects/k3bdatavolumedescwidget.cpp b/src/projects/k3bdatavolumedescwidget.cpp index be443a5..580fed6 100644 --- a/src/projects/k3bdatavolumedescwidget.cpp +++ b/src/projects/k3bdatavolumedescwidget.cpp @@ -24,8 +24,8 @@ #include -K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* tqparent, const char* name ) - : base_K3bDataVolumeDescWidget( tqparent, name ) +K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* parent, const char* name ) + : base_K3bDataVolumeDescWidget( parent, name ) { // the maximal number of characters that can be inserted are set in the ui file! diff --git a/src/projects/k3bdatavolumedescwidget.h b/src/projects/k3bdatavolumedescwidget.h index 27102e2..fdff6ea 100644 --- a/src/projects/k3bdatavolumedescwidget.h +++ b/src/projects/k3bdatavolumedescwidget.h @@ -28,7 +28,7 @@ class K3bDataVolumeDescWidget : public base_K3bDataVolumeDescWidget TQ_OBJECT public: - K3bDataVolumeDescWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataVolumeDescWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataVolumeDescWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index 4654bb9..17ee516 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -44,8 +44,8 @@ #include -K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), +K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal, true ), m_doc( doc ) { prepareGui(); diff --git a/src/projects/k3bdvdburndialog.h b/src/projects/k3bdvdburndialog.h index 3400c7d..dccffd9 100644 --- a/src/projects/k3bdvdburndialog.h +++ b/src/projects/k3bdvdburndialog.h @@ -35,7 +35,7 @@ class K3bDvdBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bDvdBurnDialog( K3bDvdDoc*, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); + K3bDvdBurnDialog( K3bDvdDoc*, TQWidget *parent = 0, const char *name = 0, bool modal = true ); ~K3bDvdBurnDialog(); protected slots: diff --git a/src/projects/k3bdvdview.cpp b/src/projects/k3bdvdview.cpp index dc5f67a..c245e04 100644 --- a/src/projects/k3bdvdview.cpp +++ b/src/projects/k3bdvdview.cpp @@ -22,8 +22,8 @@ #include -K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bDataView( doc, tqparent, name ) +K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *parent, const char *name ) + : K3bDataView( doc, parent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView() } -K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bDvdBurnDialog( m_doc, tqparent, name, true ); + return new K3bDvdBurnDialog( m_doc, parent, name, true ); } #include "k3bdvdview.moc" diff --git a/src/projects/k3bdvdview.h b/src/projects/k3bdvdview.h index 1072cc2..5d2b6ad 100644 --- a/src/projects/k3bdvdview.h +++ b/src/projects/k3bdvdview.h @@ -28,11 +28,11 @@ class K3bDvdView : public K3bDataView TQ_OBJECT public: - K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); + K3bDvdView( K3bDvdDoc* doc, TQWidget *parent = 0, const char *name = 0 ); ~K3bDvdView(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private: K3bDvdDoc* m_doc; diff --git a/src/projects/k3bencodingconverter.cpp b/src/projects/k3bencodingconverter.cpp index 38e219e..9fa2a79 100644 --- a/src/projects/k3bencodingconverter.cpp +++ b/src/projects/k3bencodingconverter.cpp @@ -77,7 +77,7 @@ bool K3bEncodingConverter::encodedLocally( const TQCString& s ) } -bool K3bEncodingConverter::fixEncoding( const TQCString& s, TQCString& result, TQWidget* tqparent, bool cache ) +bool K3bEncodingConverter::fixEncoding( const TQCString& s, TQCString& result, TQWidget* parent, bool cache ) { #ifdef IMPLEMENT_THIS_METHOD // HAVE_ICONV_H if( !d->lastEncoding.isEmpty() ) { diff --git a/src/projects/k3bencodingconverter.h b/src/projects/k3bencodingconverter.h index c88f5be..4054d08 100644 --- a/src/projects/k3bencodingconverter.h +++ b/src/projects/k3bencodingconverter.h @@ -41,13 +41,13 @@ class K3bEncodingConverter * the proper encoding based on example conversions. * * \param s The string to be fixed. - * \param tqparent The tqparent widget to be used when showing the encoding selection dialog. + * \param parent The parent widget to be used when showing the encoding selection dialog. * \param cacheEncoding If true the codeset used for successful conversion is cached and * reused for the next call to fixEncoding. * * \return True if the conversion was successful. */ - bool fixEncoding( const TQCString& s, TQCString& result, TQWidget* tqparent = 0, bool cacheEncoding = true ); + bool fixEncoding( const TQCString& s, TQCString& result, TQWidget* parent = 0, bool cacheEncoding = true ); private: bool convert( const TQCString& s, TQCString& result, const TQString& from, const TQString& to ); diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 4d9f543..30f10e6 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -67,8 +67,8 @@ public: }; -K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* tqparent ) - : TQWidget( tqparent, 0, WRepaintNoErase ) +K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent ) + : TQWidget( parent, 0, WRepaintNoErase ) { d = new Private(); d->doc = doc; @@ -279,8 +279,8 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) class K3bFillStatusDisplay::ToolTip : public TQToolTip { public: - ToolTip( K3bDoc* doc, TQWidget* tqparent ) - : TQToolTip( tqparent, 0 ), + ToolTip( K3bDoc* doc, TQWidget* parent ) + : TQToolTip( parent, 0 ), m_doc(doc) { } @@ -329,8 +329,8 @@ public: }; -K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *tqparent, const char *name ) - : TQFrame(tqparent,name) +K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const char *name ) + : TQFrame(parent,name) { d = new Private; d->doc = doc; diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index d123426..c1cc810 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -48,7 +48,7 @@ class K3bFillStatusDisplayWidget : public TQWidget TQ_OBJECT public: - K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* tqparent ); + K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent ); ~K3bFillStatusDisplayWidget(); TQSize tqsizeHint() const; @@ -79,7 +79,7 @@ class K3bFillStatusDisplay : public TQFrame { TQ_OBJECT public: - K3bFillStatusDisplay(K3bDoc* doc, TQWidget *tqparent=0, const char *name=0); + K3bFillStatusDisplay(K3bDoc* doc, TQWidget *parent=0, const char *name=0); ~K3bFillStatusDisplay(); public slots: diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 791b3d0..2053e32 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -59,8 +59,8 @@ #include -K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal ), m_doc(doc) +K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal ), m_doc(doc) { prepareGui(); diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h index 94d224e..5c390fb 100644 --- a/src/projects/k3bmixedburndialog.h +++ b/src/projects/k3bmixedburndialog.h @@ -40,7 +40,7 @@ class K3bMixedBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bMixedBurnDialog( K3bMixedDoc*, TQWidget *tqparent=0, const char *name=0, bool modal = true ); + K3bMixedBurnDialog( K3bMixedDoc*, TQWidget *parent=0, const char *name=0, bool modal = true ); protected: void loadK3bDefaults(); diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp index 9a014dc..c19bd28 100644 --- a/src/projects/k3bmixeddirtreeview.cpp +++ b/src/projects/k3bmixeddirtreeview.cpp @@ -33,8 +33,8 @@ class K3bMixedDirTreeView::PrivateAudioRootViewItem : public K3bListViewItem { public: - PrivateAudioRootViewItem( K3bMixedDoc* doc, TQListView* tqparent, TQListViewItem* after ) - : K3bListViewItem( tqparent, after ), + PrivateAudioRootViewItem( K3bMixedDoc* doc, TQListView* parent, TQListViewItem* after ) + : K3bListViewItem( parent, after ), m_doc(doc) { setPixmap( 0, SmallIcon("sound") ); @@ -52,8 +52,8 @@ public: }; -K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* tqparent, const char* ) - : K3bDataDirTreeView( view, doc->dataDoc(), tqparent ), m_doc(doc) +K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* parent, const char* ) + : K3bDataDirTreeView( view, doc->dataDoc(), parent ), m_doc(doc) { m_audioRootItem = new PrivateAudioRootViewItem( doc, this, root() ); @@ -68,7 +68,7 @@ K3bMixedDirTreeView::~K3bMixedDirTreeView() } -void K3bMixedDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ) +void K3bMixedDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after ) { if( !e->isAccepted() ) return; @@ -81,7 +81,7 @@ void K3bMixedDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, } } else - K3bDataDirTreeView::slotDropped( e, tqparent, after ); + K3bDataDirTreeView::slotDropped( e, parent, after ); } diff --git a/src/projects/k3bmixeddirtreeview.h b/src/projects/k3bmixeddirtreeview.h index a7320fc..b1b3a39 100644 --- a/src/projects/k3bmixeddirtreeview.h +++ b/src/projects/k3bmixeddirtreeview.h @@ -32,7 +32,7 @@ class K3bMixedDirTreeView : public K3bDataDirTreeView TQ_OBJECT public: - K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bMixedDirTreeView(); signals: @@ -40,7 +40,7 @@ class K3bMixedDirTreeView : public K3bDataDirTreeView void dataTreeSelected(); protected slots: - void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); + void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); private slots: void slotSelectionChanged( TQListViewItem* i ); diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp index 1022d0a..8d1b939 100644 --- a/src/projects/k3bmixedview.cpp +++ b/src/projects/k3bmixedview.cpp @@ -44,8 +44,8 @@ #include -K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* tqparent, const char* name ) - : K3bView( doc, tqparent, name ), m_doc(doc) +K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* parent, const char* name ) + : K3bView( doc, parent, name ), m_doc(doc) { TQSplitter* splitter = new TQSplitter( this ); m_mixedDirTreeView = new K3bMixedDirTreeView( this, doc, splitter ); @@ -138,9 +138,9 @@ void K3bMixedView::slotBurn() } -K3bProjectBurnDialog* K3bMixedView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bMixedView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bMixedBurnDialog( m_doc, tqparent, name, true ); + return new K3bMixedBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bmixedview.h b/src/projects/k3bmixedview.h index 1111dd3..4da7391 100644 --- a/src/projects/k3bmixedview.h +++ b/src/projects/k3bmixedview.h @@ -36,7 +36,7 @@ class K3bMixedView : public K3bView TQ_OBJECT public: - K3bMixedView( K3bMixedDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bMixedView( K3bMixedDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bMixedView(); K3bDirItem* currentDir() const; @@ -48,7 +48,7 @@ class K3bMixedView : public K3bView void addUrls( const KURL::List& ); protected: - K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private slots: void slotAudioTreeSelected(); diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index 1a785d8..4a49d4f 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -43,8 +43,8 @@ #include -K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* tqparent, const char* name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal ), +K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, const char* name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal ), m_doc(doc) { prepareGui(); diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h index 326a5b7..05fc413 100644 --- a/src/projects/k3bmovixburndialog.h +++ b/src/projects/k3bmovixburndialog.h @@ -33,7 +33,7 @@ class K3bMovixBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); + K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~K3bMovixBurnDialog(); protected slots: diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index fccc3b0..9cc5617 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -45,8 +45,8 @@ #include -K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* tqparent, const char* name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), +K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* parent, const char* name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal, true ), m_doc(doc) { prepareGui(); diff --git a/src/projects/k3bmovixdvdburndialog.h b/src/projects/k3bmovixdvdburndialog.h index ca0b4d0..fe08e29 100644 --- a/src/projects/k3bmovixdvdburndialog.h +++ b/src/projects/k3bmovixdvdburndialog.h @@ -32,7 +32,7 @@ class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); + K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~K3bMovixDvdBurnDialog(); protected slots: diff --git a/src/projects/k3bmovixdvdview.cpp b/src/projects/k3bmovixdvdview.cpp index 42b864d..ae1e5a7 100644 --- a/src/projects/k3bmovixdvdview.cpp +++ b/src/projects/k3bmovixdvdview.cpp @@ -22,8 +22,8 @@ #include -K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bMovixView( doc, tqparent, name ) +K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *parent, const char *name ) + : K3bMovixView( doc, parent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bMovixDvdView::~K3bMovixDvdView() } -K3bProjectBurnDialog* K3bMovixDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bMovixDvdView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bMovixDvdBurnDialog( m_doc, tqparent, name, true ); + return new K3bMovixDvdBurnDialog( m_doc, parent, name, true ); } #include "k3bmovixdvdview.moc" diff --git a/src/projects/k3bmovixdvdview.h b/src/projects/k3bmovixdvdview.h index d6d1977..e368ed7 100644 --- a/src/projects/k3bmovixdvdview.h +++ b/src/projects/k3bmovixdvdview.h @@ -28,11 +28,11 @@ class K3bMovixDvdView : public K3bMovixView TQ_OBJECT public: - K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); + K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *parent = 0, const char *name = 0 ); ~K3bMovixDvdView(); protected: - K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private: K3bMovixDvdDoc* m_doc; diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index f6fbfa1..e43dfd5 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -32,9 +32,9 @@ K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - TQListView* tqparent, + TQListView* parent, TQListViewItem* after ) - : K3bListViewItem( tqparent, after ), + : K3bListViewItem( parent, after ), m_doc(doc), m_fileItem(item) { @@ -43,8 +43,8 @@ K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - TQListViewItem* tqparent ) - : K3bListViewItem( tqparent ), + TQListViewItem* parent ) + : K3bListViewItem( parent ), m_doc(doc), m_fileItem(item) { @@ -58,9 +58,9 @@ K3bMovixListViewItem::~K3bMovixListViewItem() K3bMovixFileViewItem::K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - TQListView* tqparent, + TQListView* parent, TQListViewItem* after ) - : K3bMovixListViewItem( doc, item, tqparent, after ), + : K3bMovixListViewItem( doc, item, parent, after ), KFileItem( 0, 0, KURL::fromPathOrURL(item->localPath()) ) { setPixmap( 1, KFileItem::pixmap( 16, KIcon::DefaultState ) ); @@ -119,8 +119,8 @@ TQString K3bMovixFileViewItem::key( int, bool ) const K3bMovixSubTitleViewItem::K3bMovixSubTitleViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - K3bMovixListViewItem* tqparent ) - : K3bMovixListViewItem( doc, item, tqparent ), + K3bMovixListViewItem* parent ) + : K3bMovixListViewItem( doc, item, parent ), KFileItem( 0, 0, KURL::fromPathOrURL(item->subTitleItem()->localPath()) ) { } @@ -166,8 +166,8 @@ TQString K3bMovixSubTitleViewItem::text( int c ) const -K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* tqparent, const char* name ) - : K3bListView( tqparent, name ), +K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const char* name ) + : K3bListView( parent, name ), m_doc(doc) { addColumn( i18n("No.") ); diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index d3b8119..fac8e4b 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -32,8 +32,8 @@ class K3bFileItem; class K3bMovixListViewItem : public K3bListViewItem { public: - K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* tqparent, TQListViewItem* after ); - K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListViewItem* tqparent ); + K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* parent, TQListViewItem* after ); + K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListViewItem* parent ); ~K3bMovixListViewItem(); K3bMovixFileItem* fileItem() const { return m_fileItem; } @@ -50,7 +50,7 @@ class K3bMovixListViewItem : public K3bListViewItem class K3bMovixFileViewItem : public K3bMovixListViewItem, public KFileItem { public: - K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* tqparent, TQListViewItem* ); + K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* parent, TQListViewItem* ); TQString text( int ) const; void setText(int col, const TQString& text ); @@ -62,7 +62,7 @@ class K3bMovixFileViewItem : public K3bMovixListViewItem, public KFileItem class K3bMovixSubTitleViewItem : public K3bMovixListViewItem, public KFileItem { public: - K3bMovixSubTitleViewItem( K3bMovixDoc*, K3bMovixFileItem* item, K3bMovixListViewItem* tqparent ); + K3bMovixSubTitleViewItem( K3bMovixDoc*, K3bMovixFileItem* item, K3bMovixListViewItem* parent ); ~K3bMovixSubTitleViewItem(); TQString text( int ) const; @@ -77,7 +77,7 @@ class K3bMovixListView : public K3bListView TQ_OBJECT public: - K3bMovixListView( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bMovixListView(); TQDragObject* dragObject(); diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index f9220a9..5041244 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -79,8 +79,8 @@ private: }; -K3bMovixOptionsWidget::K3bMovixOptionsWidget( TQWidget* tqparent, const char* name ) - : base_K3bMovixOptionsWidget( tqparent, name ) +K3bMovixOptionsWidget::K3bMovixOptionsWidget( TQWidget* parent, const char* name ) + : base_K3bMovixOptionsWidget( parent, name ) { m_keyboardLangHelper = new LanguageSelectionHelper( m_comboKeyboardLayout ); m_helpLangHelper = new LanguageSelectionHelper( m_comboBootMessageLanguage ); diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h index 76437f7..fe0e83e 100644 --- a/src/projects/k3bmovixoptionswidget.h +++ b/src/projects/k3bmovixoptionswidget.h @@ -30,7 +30,7 @@ class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget TQ_OBJECT public: - K3bMovixOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bMovixOptionsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bMovixOptionsWidget(); public slots: diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 45a30ff..58c6ba7 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -38,8 +38,8 @@ #include -K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* tqparent, const char* name ) - : K3bView( doc, tqparent, name ), +K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name ) + : K3bView( doc, parent, name ), m_doc(doc) { m_listView = new K3bMovixListView( m_doc, this ); @@ -176,9 +176,9 @@ void K3bMovixView::slotAddSubTitleFile() } -K3bProjectBurnDialog* K3bMovixView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bMovixView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bMovixBurnDialog( m_doc, tqparent, name, true ); + return new K3bMovixBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h index 3f07c68..2b58bc9 100644 --- a/src/projects/k3bmovixview.h +++ b/src/projects/k3bmovixview.h @@ -35,7 +35,7 @@ class K3bMovixView : public K3bView TQ_OBJECT public: - K3bMovixView( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bMovixView( K3bMovixDoc* doc, TQWidget* parent = 0, const char* name = 0 ); virtual ~K3bMovixView(); private slots: @@ -47,7 +47,7 @@ class K3bMovixView : public K3bView void slotDocChanged(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); K3bMovixListView* m_listView; diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index 09d59d1..2074cd2 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -152,9 +152,9 @@ void K3bMusicBrainzJob::MusicBrainzThread::run() -// cannot use this as tqparent for the K3bSimpleJobHandler since this has not been constructed yet -K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* tqparent, const char* name ) - : K3bJob( new K3bSimpleJobHandler( 0 ), TQT_TQOBJECT(tqparent), name ), +// cannot use this as parent for the K3bSimpleJobHandler since this has not been constructed yet +K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* parent, const char* name ) + : K3bJob( new K3bSimpleJobHandler( 0 ), TQT_TQOBJECT(parent), name ), m_canceled( false ) { m_trmThread = new TRMThread(); @@ -259,7 +259,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) 0, false, &ok, - dynamic_cast(tqparent()) ); + dynamic_cast(parent()) ); else s = resultStringsUnique.first(); diff --git a/src/projects/k3bmusicbrainzjob.h b/src/projects/k3bmusicbrainzjob.h index 52653a1..5e85f67 100644 --- a/src/projects/k3bmusicbrainzjob.h +++ b/src/projects/k3bmusicbrainzjob.h @@ -45,10 +45,10 @@ class K3bMusicBrainzJob : public K3bJob public: /** - * \param tqparent since we do not use this job with a normal progressdialog we need a widget - * as tqparent + * \param parent since we do not use this job with a normal progressdialog we need a widget + * as parent */ - K3bMusicBrainzJob( TQWidget* tqparent = 0, const char* name = 0 ); + K3bMusicBrainzJob( TQWidget* parent = 0, const char* name = 0 ); ~K3bMusicBrainzJob(); bool hasBeenCanceled() const { return m_canceled; } diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index 5390e4c..66bd61a 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -51,8 +51,8 @@ #include -K3bProjectBurnDialog::K3bProjectBurnDialog( K3bDoc* doc, TQWidget *tqparent, const char *name, bool modal, bool dvd ) - : K3bInteractionDialog( tqparent, name, i18n("Project"), TQString(), +K3bProjectBurnDialog::K3bProjectBurnDialog( K3bDoc* doc, TQWidget *parent, const char *name, bool modal, bool dvd ) + : K3bInteractionDialog( parent, name, i18n("Project"), TQString(), START_BUTTON|SAVE_BUTTON|CANCEL_BUTTON, START_BUTTON, "default " + doc->typeString() + " settings", modal ), m_writerSelectionWidget(0), diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h index 2e7f32f..92e8c99 100644 --- a/src/projects/k3bprojectburndialog.h +++ b/src/projects/k3bprojectburndialog.h @@ -42,7 +42,7 @@ class K3bProjectBurnDialog : public K3bInteractionDialog TQ_OBJECT public: - K3bProjectBurnDialog( K3bDoc* doc, TQWidget *tqparent=0, const char *name=0, + K3bProjectBurnDialog( K3bDoc* doc, TQWidget *parent=0, const char *name=0, bool modal = true, bool dvd = false ); ~K3bProjectBurnDialog(); diff --git a/src/projects/k3bprojectplugindialog.cpp b/src/projects/k3bprojectplugindialog.cpp index 4a6d1fb..6b59c68 100644 --- a/src/projects/k3bprojectplugindialog.cpp +++ b/src/projects/k3bprojectplugindialog.cpp @@ -20,8 +20,8 @@ #include -K3bProjectPluginDialog::K3bProjectPluginDialog( K3bProjectPlugin* plugin, K3bDoc* doc, TQWidget* tqparent, const char* name ) - : K3bInteractionDialog( tqparent, name, +K3bProjectPluginDialog::K3bProjectPluginDialog( K3bProjectPlugin* plugin, K3bDoc* doc, TQWidget* parent, const char* name ) + : K3bInteractionDialog( parent, name, TQString(), TQString(), START_BUTTON|CANCEL_BUTTON, diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 07c7b85..3f2434c 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -47,8 +47,8 @@ #include #include -K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, tqparent, name, modal ) +K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, parent, name, modal ) { m_vcdDoc = _doc; diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h index 322fedf..3f75d3d 100644 --- a/src/projects/k3bvcdburndialog.h +++ b/src/projects/k3bvcdburndialog.h @@ -39,7 +39,7 @@ class K3bVcdBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bVcdBurnDialog( K3bVcdDoc* doc, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); + K3bVcdBurnDialog( K3bVcdDoc* doc, TQWidget *parent = 0, const char *name = 0, bool modal = true ); ~K3bVcdBurnDialog(); K3bVcdDoc* vcdDoc() const diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index 372ae1c..3232384 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -39,8 +39,8 @@ #include "k3bvcddoc.h" #include -K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bListView( tqparent, name ), m_doc( doc ), m_view( view ) +K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, const char *name ) + : K3bListView( parent, name ), m_doc( doc ), m_view( view ) { setAcceptDrops( true ); setDropVisualizer( true ); diff --git a/src/projects/k3bvcdlistview.h b/src/projects/k3bvcdlistview.h index 01fa218..bb48a87 100644 --- a/src/projects/k3bvcdlistview.h +++ b/src/projects/k3bvcdlistview.h @@ -41,7 +41,7 @@ class K3bVcdListView : public K3bListView TQ_OBJECT public: - K3bVcdListView( K3bView*, K3bVcdDoc*, TQWidget *tqparent = 0, const char *name = 0 ); + K3bVcdListView( K3bView*, K3bVcdDoc*, TQWidget *parent = 0, const char *name = 0 ); ~K3bVcdListView(); /** diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index 5232632..9ad778f 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -22,15 +22,15 @@ #include "k3bvcdtrack.h" #include -K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent ) - : K3bListViewItem( tqparent ), m_track( track ) +K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent ) + : K3bListViewItem( parent ), m_track( track ) { setEditor( 1, LINE ); animate(); } -K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent, TQListViewItem* after ) - : K3bListViewItem( tqparent, after ), m_track( track ) +K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, TQListViewItem* after ) + : K3bListViewItem( parent, after ), m_track( track ) { setEditor( 1, LINE ); animate(); diff --git a/src/projects/k3bvcdlistviewitem.h b/src/projects/k3bvcdlistviewitem.h index 9a1a290..085deb7 100644 --- a/src/projects/k3bvcdlistviewitem.h +++ b/src/projects/k3bvcdlistviewitem.h @@ -24,8 +24,8 @@ class K3bVcdListViewItem : public K3bListViewItem { public: - K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent ); - K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent, TQListViewItem* after ); + K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent ); + K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, TQListViewItem* after ); ~K3bVcdListViewItem(); /** reimplemented from TQListViewItem */ diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 7fac6b1..be140f7 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -47,9 +47,9 @@ #include -K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList& tracks, TQPtrList& selectedTracks, TQWidget* tqparent, const char* name ) +K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList& tracks, TQPtrList& selectedTracks, TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Video Track Properties" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, - KDialogBase::Ok, tqparent, name ) + KDialogBase::Ok, parent, name ) { prepareGui(); diff --git a/src/projects/k3bvcdtrackdialog.h b/src/projects/k3bvcdtrackdialog.h index 565275b..0bf23e3 100644 --- a/src/projects/k3bvcdtrackdialog.h +++ b/src/projects/k3bvcdtrackdialog.h @@ -40,7 +40,7 @@ class K3bVcdTrackDialog : public KDialogBase TQ_OBJECT public: - K3bVcdTrackDialog( K3bVcdDoc*, TQPtrList& tracks, TQPtrList& selectedTracks, TQWidget* tqparent = 0, const char* name = 0 ); + K3bVcdTrackDialog( K3bVcdDoc*, TQPtrList& tracks, TQPtrList& selectedTracks, TQWidget* parent = 0, const char* name = 0 ); ~K3bVcdTrackDialog(); protected slots: diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index 852928f..2a42495 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -34,8 +34,8 @@ #include -K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, TQWidget* tqparent, const char *name ) - : K3bView( pDoc, tqparent, name ) +K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, TQWidget* parent, const char *name ) + : K3bView( pDoc, parent, name ) { m_doc = pDoc; @@ -53,9 +53,9 @@ K3bVcdView::~K3bVcdView() {} -K3bProjectBurnDialog* K3bVcdView::newBurnDialog( TQWidget * tqparent, const char * name ) +K3bProjectBurnDialog* K3bVcdView::newBurnDialog( TQWidget * parent, const char * name ) { - return new K3bVcdBurnDialog( m_doc, tqparent, name, true ); + return new K3bVcdBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bvcdview.h b/src/projects/k3bvcdview.h index a58a465..036dbdc 100644 --- a/src/projects/k3bvcdview.h +++ b/src/projects/k3bvcdview.h @@ -39,11 +39,11 @@ class K3bVcdView : public K3bView TQ_OBJECT public: - K3bVcdView( K3bVcdDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); + K3bVcdView( K3bVcdDoc* pDoc, TQWidget* parent, const char *name = 0 ); ~K3bVcdView(); protected: - K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp index d7602b0..c5adefb 100644 --- a/src/projects/k3bvideodvdburndialog.cpp +++ b/src/projects/k3bvideodvdburndialog.cpp @@ -40,8 +40,8 @@ #include -K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), +K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal, true ), m_doc( doc ) { prepareGui(); diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h index af393d1..5dfc9d5 100644 --- a/src/projects/k3bvideodvdburndialog.h +++ b/src/projects/k3bvideodvdburndialog.h @@ -31,7 +31,7 @@ class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bVideoDvdBurnDialog( K3bVideoDvdDoc*, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); + K3bVideoDvdBurnDialog( K3bVideoDvdDoc*, TQWidget *parent = 0, const char *name = 0, bool modal = true ); ~K3bVideoDvdBurnDialog(); protected slots: diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp index 792ffc5..252e2d0 100644 --- a/src/projects/k3bvideodvdview.cpp +++ b/src/projects/k3bvideodvdview.cpp @@ -31,8 +31,8 @@ #include -K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bView( doc, tqparent, name ), +K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *parent, const char *name ) + : K3bView( doc, parent, name ), m_doc(doc) { fillStatusDisplay()->showDvdSizes(true); @@ -58,9 +58,9 @@ K3bVideoDvdView::~K3bVideoDvdView() } -K3bProjectBurnDialog* K3bVideoDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bVideoDvdView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bVideoDvdBurnDialog( m_doc, tqparent, name, true ); + return new K3bVideoDvdBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bvideodvdview.h b/src/projects/k3bvideodvdview.h index 59dd88d..cd0d037 100644 --- a/src/projects/k3bvideodvdview.h +++ b/src/projects/k3bvideodvdview.h @@ -30,13 +30,13 @@ class K3bVideoDvdView : public K3bView TQ_OBJECT public: - K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); + K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *parent = 0, const char *name = 0 ); ~K3bVideoDvdView(); void addUrls( const KURL::List& ); protected: - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index ccb2656..fbd3a91 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -40,8 +40,8 @@ #include -K3bView::K3bView( K3bDoc* pDoc, TQWidget *tqparent, const char* name ) - : TQWidget( tqparent, name ), +K3bView::K3bView( K3bDoc* pDoc, TQWidget *parent, const char* name ) + : TQWidget( parent, name ), m_doc( pDoc ) { TQGridLayout* grid = new TQGridLayout( this ); diff --git a/src/projects/k3bview.h b/src/projects/k3bview.h index 9ca4438..7736cf5 100644 --- a/src/projects/k3bview.h +++ b/src/projects/k3bview.h @@ -48,7 +48,7 @@ class K3bView : public TQWidget, public KXMLGUIClient /** * */ - K3bView( K3bDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); + K3bView( K3bDoc* pDoc, TQWidget* parent, const char *name = 0 ); virtual ~K3bView(); /** diff --git a/src/rip/k3baudiocdlistview.cpp b/src/rip/k3baudiocdlistview.cpp index fe7fcde..8e0a31a 100644 --- a/src/rip/k3baudiocdlistview.cpp +++ b/src/rip/k3baudiocdlistview.cpp @@ -22,8 +22,8 @@ #include -K3bAudioCdListView::K3bAudioCdListView( K3bAudioCdView* view, TQWidget* tqparent, const char* name ) - : K3bListView( tqparent, name ), +K3bAudioCdListView::K3bAudioCdListView( K3bAudioCdView* view, TQWidget* parent, const char* name ) + : K3bListView( parent, name ), m_view(view) { setFullWidth(true); diff --git a/src/rip/k3baudiocdlistview.h b/src/rip/k3baudiocdlistview.h index dccdc20..3dc0d5d 100644 --- a/src/rip/k3baudiocdlistview.h +++ b/src/rip/k3baudiocdlistview.h @@ -30,7 +30,7 @@ class K3bAudioCdListView : public K3bListView TQ_OBJECT public: - K3bAudioCdListView( K3bAudioCdView*, TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioCdListView( K3bAudioCdView*, TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioCdListView(); protected: diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index f8e5c0a..807e462 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -60,11 +60,11 @@ class K3bAudioCdView::AudioTrackViewItem : public K3bCheckListViewItem { public: - AudioTrackViewItem( TQListView* tqparent, + AudioTrackViewItem( TQListView* parent, TQListViewItem* after, int _trackNumber, const K3b::Msf& length) - : K3bCheckListViewItem( tqparent, after ) { + : K3bCheckListViewItem( parent, after ) { setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) ); setText( 3, i18n("Track %1").tqarg(_trackNumber) ); @@ -94,12 +94,12 @@ public: }; -K3bAudioCdView::K3bAudioCdView( TQWidget* tqparent, const char *name ) +K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_AUDIO, K3bDevice::MEDIA_CD_ALL, K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE, - tqparent, name ) + parent, name ) { TQGridLayout* mainGrid = new TQGridLayout( mainWidget() ); diff --git a/src/rip/k3baudiocdview.h b/src/rip/k3baudiocdview.h index f28e3a9..5da344c 100644 --- a/src/rip/k3baudiocdview.h +++ b/src/rip/k3baudiocdview.h @@ -47,7 +47,7 @@ class K3bAudioCdView : public K3bMediaContentsView TQ_OBJECT public: - K3bAudioCdView( TQWidget* tqparent = 0, const char * name = 0 ); + K3bAudioCdView( TQWidget* parent = 0, const char * name = 0 ); ~K3bAudioCdView(); KActionCollection* actionCollection() const { return m_actionCollection; } diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp index c03db69..f777ef7 100644 --- a/src/rip/k3baudioconvertingoptionwidget.cpp +++ b/src/rip/k3baudioconvertingoptionwidget.cpp @@ -77,8 +77,8 @@ public: }; -K3bAudioConvertingOptionWidget::K3bAudioConvertingOptionWidget( TQWidget* tqparent, const char* name ) - : base_K3bAudioRippingOptionWidget( tqparent, name ) +K3bAudioConvertingOptionWidget::K3bAudioConvertingOptionWidget( TQWidget* parent, const char* name ) + : base_K3bAudioRippingOptionWidget( parent, name ) { d = new Private(); diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h index 5ef51a7..6dbeab6 100644 --- a/src/rip/k3baudioconvertingoptionwidget.h +++ b/src/rip/k3baudioconvertingoptionwidget.h @@ -34,7 +34,7 @@ class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget TQ_OBJECT public: - K3bAudioConvertingOptionWidget( TQWidget* tqparent, const char* name = 0 ); + K3bAudioConvertingOptionWidget( TQWidget* parent, const char* name = 0 ); ~K3bAudioConvertingOptionWidget(); void setBaseDir( const TQString& path ); diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index 7143ed3..60200e3 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -64,8 +64,8 @@ public: }; -K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* doc, TQWidget *tqparent, const char *name ) - : K3bInteractionDialog( tqparent, name, +K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* doc, TQWidget *parent, const char *name ) + : K3bInteractionDialog( parent, name, TQString(), TQString(), START_BUTTON|CANCEL_BUTTON, diff --git a/src/rip/k3baudioprojectconvertingdialog.h b/src/rip/k3baudioprojectconvertingdialog.h index f9956ff..fd7c8f9 100644 --- a/src/rip/k3baudioprojectconvertingdialog.h +++ b/src/rip/k3baudioprojectconvertingdialog.h @@ -45,7 +45,7 @@ class K3bAudioProjectConvertingDialog : public K3bInteractionDialog TQ_OBJECT public: - K3bAudioProjectConvertingDialog( K3bAudioDoc*, TQWidget *tqparent = 0, const char *name = 0 ); + K3bAudioProjectConvertingDialog( K3bAudioDoc*, TQWidget *parent = 0, const char *name = 0 ); ~K3bAudioProjectConvertingDialog(); void setBaseDir( const TQString& path ); diff --git a/src/rip/k3baudioripjob.cpp b/src/rip/k3baudioripjob.cpp index ac53c38..3aed35c 100644 --- a/src/rip/k3baudioripjob.cpp +++ b/src/rip/k3baudioripjob.cpp @@ -23,8 +23,8 @@ #include -K3bAudioRipJob::K3bAudioRipJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bJob( hdl, tqparent ) +K3bAudioRipJob::K3bAudioRipJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bJob( hdl, parent ) { m_thread = new K3bAudioRipThread(); m_threadJob = new K3bThreadJob( m_thread, this, this ); diff --git a/src/rip/k3baudioripjob.h b/src/rip/k3baudioripjob.h index 691af34..259cdc1 100644 --- a/src/rip/k3baudioripjob.h +++ b/src/rip/k3baudioripjob.h @@ -35,7 +35,7 @@ class K3bAudioRipJob : public K3bJob TQ_OBJECT public: - K3bAudioRipJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bAudioRipJob( K3bJobHandler* hdl, TQObject* parent ); ~K3bAudioRipJob(); TQString jobDescription() const; diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index e669749..d1088ca 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -82,8 +82,8 @@ K3bAudioRippingDialog::K3bAudioRippingDialog(const K3bDevice::Toc& toc, K3bDevice::Device* device, const K3bCddbResultEntry& entry, const TQValueList& tracks, - TQWidget *tqparent, const char *name ) - : K3bInteractionDialog( tqparent, name, + TQWidget *parent, const char *name ) + : K3bInteractionDialog( parent, name, TQString(), TQString(), START_BUTTON|CANCEL_BUTTON, diff --git a/src/rip/k3baudiorippingdialog.h b/src/rip/k3baudiorippingdialog.h index 2a0304b..e397b87 100644 --- a/src/rip/k3baudiorippingdialog.h +++ b/src/rip/k3baudiorippingdialog.h @@ -51,7 +51,7 @@ class K3bAudioRippingDialog : public K3bInteractionDialog K3bDevice::Device*, const K3bCddbResultEntry&, const TQValueList&, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~K3bAudioRippingDialog(); void setStaticDir( const TQString& path ); diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index ba5427a..79e1375 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -29,8 +29,8 @@ #include -K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* tqparent, const char* name ) - : base_K3bCddbPatternWidget( tqparent, name ) +K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name ) + : base_K3bCddbPatternWidget( parent, name ) { // fix the tqlayout ((TQGridLayout*)tqlayout())->setRowStretch( 4, 1 ); diff --git a/src/rip/k3bcddbpatternwidget.h b/src/rip/k3bcddbpatternwidget.h index ef15ae7..f4dee19 100644 --- a/src/rip/k3bcddbpatternwidget.h +++ b/src/rip/k3bcddbpatternwidget.h @@ -28,7 +28,7 @@ class K3bCddbPatternWidget : public base_K3bCddbPatternWidget TQ_OBJECT public: - K3bCddbPatternWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bCddbPatternWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bCddbPatternWidget(); TQString filenamePattern() const; diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index c4da751..89cdc37 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -31,8 +31,8 @@ #include -K3bVideoCdInfo::K3bVideoCdInfo( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bVideoCdInfo::K3bVideoCdInfo( TQObject* parent, const char* name ) + : TQObject( parent, name ) { m_process = 0L; m_isXml = false; diff --git a/src/rip/k3bvideocdinfo.h b/src/rip/k3bvideocdinfo.h index c5acebe..2a90a22 100644 --- a/src/rip/k3bvideocdinfo.h +++ b/src/rip/k3bvideocdinfo.h @@ -74,7 +74,7 @@ class K3bVideoCdInfo : public TQObject TQ_OBJECT public: - K3bVideoCdInfo( TQObject* tqparent = 0, const char* name = 0 ); + K3bVideoCdInfo( TQObject* parent = 0, const char* name = 0 ); ~K3bVideoCdInfo(); /** diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index 04cf41b..1248138 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -36,8 +36,8 @@ #include #include -K3bVideoCdRip::K3bVideoCdRip( K3bJobHandler* hdl, K3bVideoCdRippingOptions* options, TQObject* tqparent, const char* name ) - : K3bJob( hdl, tqparent, name ), +K3bVideoCdRip::K3bVideoCdRip( K3bJobHandler* hdl, K3bVideoCdRippingOptions* options, TQObject* parent, const char* name ) + : K3bJob( hdl, parent, name ), m_ripsourceType( 0 ), m_subPosition ( 0 ), m_videooptions( options ), diff --git a/src/rip/k3bvideocdrip.h b/src/rip/k3bvideocdrip.h index a47f1d0..ed23019 100644 --- a/src/rip/k3bvideocdrip.h +++ b/src/rip/k3bvideocdrip.h @@ -30,7 +30,7 @@ class K3bVideoCdRip : public K3bJob TQ_OBJECT public: - K3bVideoCdRip( K3bJobHandler*, K3bVideoCdRippingOptions* options, TQObject* tqparent = 0, const char* name = 0 ); + K3bVideoCdRip( K3bJobHandler*, K3bVideoCdRippingOptions* options, TQObject* parent = 0, const char* name = 0 ); ~K3bVideoCdRip(); enum { CDROM, BIN_IMAGE, NRG_IMAGE }; diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index c8dbe6f..9283f00 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -45,8 +45,8 @@ #include #include -K3bVideoCdRippingDialog::K3bVideoCdRippingDialog( K3bVideoCdRippingOptions* options, TQWidget* tqparent, const char* name ) - : K3bInteractionDialog( tqparent, name, +K3bVideoCdRippingDialog::K3bVideoCdRippingDialog( K3bVideoCdRippingOptions* options, TQWidget* parent, const char* name ) + : K3bInteractionDialog( parent, name, i18n( "Video CD Ripping" ), TQString(), START_BUTTON|CANCEL_BUTTON, diff --git a/src/rip/k3bvideocdrippingdialog.h b/src/rip/k3bvideocdrippingdialog.h index 6b7e565..2301515 100644 --- a/src/rip/k3bvideocdrippingdialog.h +++ b/src/rip/k3bvideocdrippingdialog.h @@ -38,7 +38,7 @@ class K3bVideoCdRippingDialog : public K3bInteractionDialog TQ_OBJECT public: - K3bVideoCdRippingDialog( K3bVideoCdRippingOptions* options, TQWidget* tqparent = 0, const char* name = 0 ); + K3bVideoCdRippingDialog( K3bVideoCdRippingOptions* options, TQWidget* parent = 0, const char* name = 0 ); ~K3bVideoCdRippingDialog(); private: diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp index c8fe675..7fbe3b2 100644 --- a/src/rip/k3bvideocdview.cpp +++ b/src/rip/k3bvideocdview.cpp @@ -49,24 +49,24 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem { public: - VideoTrackViewItem( TQListViewItem* tqparent, TQListViewItem* after ) - : TQListViewItem( tqparent, after ) + VideoTrackViewItem( TQListViewItem* parent, TQListViewItem* after ) + : TQListViewItem( parent, after ) { setSelectable( false ); } - VideoTrackViewItem( TQListView* tqparent, TQListViewItem* after ) - : TQListViewItem( tqparent, after ) + VideoTrackViewItem( TQListView* parent, TQListViewItem* after ) + : TQListViewItem( parent, after ) { setSelectable( false ); } - VideoTrackViewItem( TQListViewItem* tqparent, + VideoTrackViewItem( TQListViewItem* parent, const TQString& name, const TQString& id, int _trackNumber, const K3b::Msf& length ) - : TQListViewItem( tqparent ) + : TQListViewItem( parent ) { setText( 0, TQString( "%1. %2" ).tqarg( _trackNumber ).tqarg( id ) ); setText( 1, name ); @@ -92,9 +92,9 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem class K3bVideoCdView::VideoTrackViewCheckItem : public TQCheckListItem { public: - VideoTrackViewCheckItem( TQListViewItem* tqparent, + VideoTrackViewCheckItem( TQListViewItem* parent, const TQString& desc ) - : TQCheckListItem( tqparent, + : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ) { @@ -103,9 +103,9 @@ class K3bVideoCdView::VideoTrackViewCheckItem : public TQCheckListItem setOn( true ); } - VideoTrackViewCheckItem( TQListView* tqparent, + VideoTrackViewCheckItem( TQListView* parent, const TQString& desc ) - : TQCheckListItem( tqparent, + : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ) { @@ -114,9 +114,9 @@ class K3bVideoCdView::VideoTrackViewCheckItem : public TQCheckListItem setOn( true ); } - VideoTrackViewCheckItem( VideoTrackViewCheckItem* tqparent, + VideoTrackViewCheckItem( VideoTrackViewCheckItem* parent, const TQString& desc ) - : TQCheckListItem( tqparent, + : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ) { @@ -136,12 +136,12 @@ class K3bVideoCdView::VideoTrackViewCheckItem : public TQCheckListItem }; -K3bVideoCdView::K3bVideoCdView( TQWidget* tqparent, const char *name ) +K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_VIDEO_CD, K3bDevice::MEDIA_CD_ALL, K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE, - tqparent, name ) + parent, name ) { TQGridLayout * mainGrid = new TQGridLayout( mainWidget() ); diff --git a/src/rip/k3bvideocdview.h b/src/rip/k3bvideocdview.h index da7756c..f5a52ea 100644 --- a/src/rip/k3bvideocdview.h +++ b/src/rip/k3bvideocdview.h @@ -49,7 +49,7 @@ class K3bVideoCdView : public K3bMediaContentsView TQ_OBJECT public: - K3bVideoCdView( TQWidget* tqparent = 0, const char * name = 0 ); + K3bVideoCdView( TQWidget* parent = 0, const char * name = 0 ); ~K3bVideoCdView(); KActionCollection* actionCollection() const diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 072052f..bcdb0f6 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -117,9 +117,9 @@ class K3bVideoDVDRippingDialog::AudioStreamViewItem : public TQCheckListItem { public: AudioStreamViewItem( K3bVideoDVDRippingDialog* dlg, - TQCheckListItem* tqparent, TQListViewItem* after, const TQString& text, + TQCheckListItem* parent, TQListViewItem* after, const TQString& text, int audioStream ) - : TQCheckListItem( tqparent, after, text, RadioButton ), + : TQCheckListItem( parent, after, text, RadioButton ), m_audioStream( audioStream ), m_dlg( dlg ) { } @@ -127,7 +127,7 @@ public: private: void stateChange( bool ) { if( state() == On ) { - m_dlg->m_titleRipInfos[static_cast(tqparent())].audioStream = m_audioStream; + m_dlg->m_titleRipInfos[static_cast(parent())].audioStream = m_audioStream; m_dlg->slotUpdateFilenames(); } } @@ -146,8 +146,8 @@ public: K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& dvd, const TQValueList& titles, - TQWidget* tqparent, const char* name ) - : K3bInteractionDialog( tqparent, name, + TQWidget* parent, const char* name ) + : K3bInteractionDialog( parent, name, i18n("Video DVD Ripping"), TQString(), START_BUTTON|CANCEL_BUTTON, diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.h b/src/rip/videodvd/k3bvideodvdrippingdialog.h index bd8b7a0..f439ef4 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.h +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.h @@ -35,7 +35,7 @@ class K3bVideoDVDRippingDialog : public K3bInteractionDialog public: K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& dvd, const TQValueList& titles, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~K3bVideoDVDRippingDialog(); void setBaseDir( const TQString& path ); diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp index 1cc9e9e..bc08f3e 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp @@ -82,8 +82,8 @@ public: -K3bVideoDVDRippingJob::K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bJob( hdl, tqparent ) +K3bVideoDVDRippingJob::K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bJob( hdl, parent ) { d = new Private(); diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.h b/src/rip/videodvd/k3bvideodvdrippingjob.h index 93ec1b0..a4a6b81 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.h +++ b/src/rip/videodvd/k3bvideodvdrippingjob.h @@ -35,7 +35,7 @@ class K3bVideoDVDRippingJob : public K3bJob TQ_OBJECT public: - K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* parent ); ~K3bVideoDVDRippingJob(); class TitleRipInfo { diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp index a08ba51..577b674 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp @@ -27,8 +27,8 @@ -K3bVideoDVDRippingPreview::K3bVideoDVDRippingPreview( TQObject* tqparent ) - : TQObject( tqparent ), +K3bVideoDVDRippingPreview::K3bVideoDVDRippingPreview( TQObject* parent ) + : TQObject( parent ), m_tempDir( 0 ), m_process( 0 ) { diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h index ab7b994..5b9803b 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.h +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h @@ -31,7 +31,7 @@ class K3bVideoDVDRippingPreview : public TQObject TQ_OBJECT public: - K3bVideoDVDRippingPreview( TQObject* tqparent = 0 ); + K3bVideoDVDRippingPreview( TQObject* parent = 0 ); ~K3bVideoDVDRippingPreview(); const TQImage& preview() const { return m_preview; } diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index 10b5831..5811750 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -90,8 +90,8 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne class K3bVideoDVDRippingTitleListView::TitleViewItem : public K3bCheckListViewItem { public: - TitleViewItem( K3bVideoDVDRippingTitleListView* tqparent, TQListViewItem* after, const K3bVideoDVD::Title& title ) - : K3bCheckListViewItem( tqparent, after ), + TitleViewItem( K3bVideoDVDRippingTitleListView* parent, TQListViewItem* after, const K3bVideoDVD::Title& title ) + : K3bCheckListViewItem( parent, after ), m_title( title ) { setMarginVertical( 4 ); @@ -330,8 +330,8 @@ private: -K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( TQWidget* tqparent ) - : K3bListView( tqparent ) +K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( TQWidget* parent ) + : K3bListView( parent ) { setFullWidth(true); setSorting(-1); diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h index 2aa0dbc..3129fb8 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h @@ -32,7 +32,7 @@ class K3bVideoDVDRippingTitleListView : public K3bListView TQ_OBJECT public: - K3bVideoDVDRippingTitleListView( TQWidget* tqparent ); + K3bVideoDVDRippingTitleListView( TQWidget* parent ); ~K3bVideoDVDRippingTitleListView(); void setVideoDVD( const K3bVideoDVD::VideoDVD& dvd ); diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index 4f3113d..101d965 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -37,12 +37,12 @@ #include -K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* tqparent, const char * name ) +K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_VIDEO_DVD, K3bDevice::MEDIA_DVD_ALL, K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE, - tqparent, name ) + parent, name ) { TQGridLayout* mainGrid = new TQGridLayout( mainWidget() ); diff --git a/src/rip/videodvd/k3bvideodvdrippingview.h b/src/rip/videodvd/k3bvideodvdrippingview.h index 1bf58f3..6650aa4 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.h +++ b/src/rip/videodvd/k3bvideodvdrippingview.h @@ -34,7 +34,7 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView TQ_OBJECT public: - K3bVideoDVDRippingView( TQWidget* tqparent = 0, const char * name = 0 ); + K3bVideoDVDRippingView( TQWidget* parent = 0, const char * name = 0 ); ~K3bVideoDVDRippingView(); KActionCollection* actionCollection() const { return m_actionCollection; } diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index a9cbb6c..d05f915 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -72,8 +72,8 @@ static const char* s_pictureSizeNames[] = { }; -K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* tqparent ) - : base_K3bVideoDVDRippingWidget( tqparent ) +K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent ) + : base_K3bVideoDVDRippingWidget( parent ) { m_editBaseDir->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h index 5335b7c..c8c2fd9 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.h +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h @@ -33,7 +33,7 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget TQ_OBJECT public: - K3bVideoDVDRippingWidget( TQWidget* tqparent ); + K3bVideoDVDRippingWidget( TQWidget* parent ); ~K3bVideoDVDRippingWidget(); K3bVideoDVDTitleTranscodingJob::VideoCodec selectedVideoCodec() const; -- cgit v1.2.3