diff options
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/Makefile.am | 14 | ||||
| -rw-r--r-- | src/misc/k3bblankingdialog.cpp | 22 | ||||
| -rw-r--r-- | src/misc/k3bblankingdialog.h | 2 | ||||
| -rw-r--r-- | src/misc/k3bcdcopydialog.cpp | 50 | ||||
| -rw-r--r-- | src/misc/k3bcdcopydialog.h | 2 | ||||
| -rw-r--r-- | src/misc/k3bcdimagewritingdialog.cpp | 66 | ||||
| -rw-r--r-- | src/misc/k3bcdimagewritingdialog.h | 2 | ||||
| -rw-r--r-- | src/misc/k3bdvdcopydialog.cpp | 34 | ||||
| -rw-r--r-- | src/misc/k3bdvdcopydialog.h | 2 | ||||
| -rw-r--r-- | src/misc/k3bdvdformattingdialog.cpp | 14 | ||||
| -rw-r--r-- | src/misc/k3bdvdformattingdialog.h | 2 | ||||
| -rw-r--r-- | src/misc/k3bisoimagewritingdialog.cpp | 46 | ||||
| -rw-r--r-- | src/misc/k3bisoimagewritingdialog.h | 2 |
13 files changed, 122 insertions, 136 deletions
diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am deleted file mode 100644 index ea1809b..0000000 --- a/src/misc/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../libk3b/core \ - -I$(srcdir)/../../libk3bdevice \ - -I$(srcdir)/../../libk3b/tools \ - -I$(srcdir)/../../libk3b/jobs \ - -I$(srcdir)/../../libk3b/projects \ - -I$(srcdir)/.. \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libmisc.la - -libmisc_la_SOURCES = k3bdvdformattingdialog.cpp k3bcdcopydialog.cpp k3bdvdcopydialog.cpp \ - k3bcdimagewritingdialog.cpp k3bisoimagewritingdialog.cpp k3bblankingdialog.cpp diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index 0594f1c..f379983 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -80,8 +80,8 @@ K3bBlankingDialog::K3bBlankingDialog( TQWidget* parent, const char* name ) setupGui(); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotWritingAppChanged(int)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), this, TQ_SLOT(slotWritingAppChanged(int)) ); slotWriterChanged(); slotWritingAppChanged( m_writerSelectionWidget->writingApp() ); } @@ -108,7 +108,7 @@ void K3bBlankingDialog::setupGui() m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE ); // --- setup the blanking type button group ----------------------------- - TQGroupBox* groupBlankType = new TQGroupBox( 1, Qt::Vertical, i18n("&Erase Type"), frame ); + TQGroupBox* groupBlankType = new TQGroupBox( 1, TQt::Vertical, i18n("&Erase Type"), frame ); groupBlankType->layout()->setSpacing( spacingHint() ); groupBlankType->layout()->setMargin( marginHint() ); @@ -131,13 +131,13 @@ void K3bBlankingDialog::slotStartClicked() d->debugFile.open(); if( d->job == 0 ) { - d->job = new K3bBlankingJob( this, TQT_TQOBJECT(this) ); - connect( d->job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - d->debugDialog, TQT_SLOT(addOutput(const TQString&, const TQString&)) ); - connect( d->job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - &d->debugFile, TQT_SLOT(addOutput(const TQString&, const TQString&)) ); - connect( d->job, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotJobFinished(bool)) ); + d->job = new K3bBlankingJob( this, this ); + connect( d->job, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + d->debugDialog, TQ_SLOT(addOutput(const TQString&, const TQString&)) ); + connect( d->job, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + &d->debugFile, TQ_SLOT(addOutput(const TQString&, const TQString&)) ); + connect( d->job, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotJobFinished(bool)) ); } d->job->setDevice( m_writerSelectionWidget->writerDevice() ); @@ -150,7 +150,7 @@ void K3bBlankingDialog::slotStartClicked() if( !d->erasingDlg ) d->erasingDlg = new K3bProgressDialog( i18n("Erasing CD-RW"), this ); - connect( d->erasingDlg, TQT_SIGNAL(cancelClicked()), d->job, TQT_SLOT(cancel()) ); + connect( d->erasingDlg, TQ_SIGNAL(cancelClicked()), d->job, TQ_SLOT(cancel()) ); if( !exitLoopOnHide() ) hide(); diff --git a/src/misc/k3bblankingdialog.h b/src/misc/k3bblankingdialog.h index c78d51c..fd84910 100644 --- a/src/misc/k3bblankingdialog.h +++ b/src/misc/k3bblankingdialog.h @@ -32,7 +32,7 @@ namespace K3bDevice { class K3bBlankingDialog : public K3bInteractionDialog, public K3bJobHandler { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index ae35f47..4f12a10 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -38,7 +38,7 @@ #include <kguiitem.h> #include <tdelocale.h> #include <kstdguiitem.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeconfig.h> #include <tdeapplication.h> @@ -76,7 +76,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal mainGrid->setSpacing( spacingHint() ); mainGrid->setMargin( 0 ); - TQGroupBox* groupSource = new TQGroupBox( 1, Qt::Vertical, i18n("Source Medium"), main ); + TQGroupBox* groupSource = new TQGroupBox( 1, TQt::Vertical, i18n("Source Medium"), main ); groupSource->setInsideSpacing( spacingHint() ); groupSource->setInsideMargin( marginHint() ); m_comboSourceDevice = new K3bMediaSelectionComboBox( groupSource ); @@ -99,18 +99,18 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal optionTabGrid->setSpacing( spacingHint() ); optionTabGrid->setMargin( marginHint() ); - TQGroupBox* groupCopyMode = new TQGroupBox( 1, Qt::Vertical, i18n("Copy Mode"), optionTab ); + TQGroupBox* groupCopyMode = new TQGroupBox( 1, TQt::Vertical, i18n("Copy Mode"), optionTab ); groupCopyMode->setInsideMargin( marginHint() ); groupCopyMode->setInsideSpacing( spacingHint() ); m_comboCopyMode = new TQComboBox( groupCopyMode ); m_comboCopyMode->insertItem( i18n("Normal Copy") ); m_comboCopyMode->insertItem( i18n("Clone Copy") ); - TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, TQt::Vertical, i18n("Writing Mode"), optionTab ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -118,7 +118,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal pixLabel->setScaledContents( false ); m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies ); - TQGroupBox* groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* groupOptions = new TQGroupBox( 5, TQt::Vertical, i18n("Settings"), optionTab ); groupOptions->setInsideSpacing( spacingHint() ); groupOptions->setInsideMargin( marginHint() ); m_checkSimulate = K3bStdGuiItems::simulateCheckbox( groupOptions ); @@ -159,7 +159,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - m_groupAdvancedDataOptions = new TQGroupBox( 3, Qt::Vertical, i18n("Data"), advancedTab, "data_options" ); + m_groupAdvancedDataOptions = new TQGroupBox( 3, TQt::Vertical, i18n("Data"), advancedTab, "data_options" ); m_groupAdvancedDataOptions->setInsideSpacing( spacingHint() ); m_groupAdvancedDataOptions->setInsideMargin( marginHint() ); TQHBox* box = new TQHBox( m_groupAdvancedDataOptions ); @@ -169,7 +169,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal m_checkIgnoreDataReadErrors = K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( m_groupAdvancedDataOptions ); m_checkNoCorrection = new TQCheckBox( i18n("No error correction"), m_groupAdvancedDataOptions ); - m_groupAdvancedAudioOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Audio"), advancedTab, "audio_options" ); + m_groupAdvancedAudioOptions = new TQGroupBox( 5, TQt::Vertical, i18n("Audio"), advancedTab, "audio_options" ); m_groupAdvancedAudioOptions->setInsideSpacing( spacingHint() ); m_groupAdvancedAudioOptions->setInsideMargin( marginHint() ); box = new TQHBox( m_groupAdvancedAudioOptions ); @@ -195,18 +195,18 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal mainGrid->setRowStretch( 2, 1 ); - connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, TQT_SLOT(setDevice(K3bDevice::Device*)) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_comboCopyMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkReadCdText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQ_SLOT(setDevice(K3bDevice::Device*)) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkSimulate, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_comboCopyMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkReadCdText, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); TQToolTip::add( m_checkIgnoreDataReadErrors, i18n("Skip unreadable data sectors") ); TQToolTip::add( m_checkNoCorrection, i18n("Disable the source drive's error correction") ); @@ -279,10 +279,10 @@ void K3bCdCopyDialog::slotStartClicked() K3bJobProgressDialog* dlg = 0; if( m_checkOnlyCreateImage->isChecked() ) { - dlg = new K3bJobProgressDialog( kapp->mainWidget() ); + dlg = new K3bJobProgressDialog( tdeApp->mainWidget() ); } else { - dlg = new K3bBurnProgressDialog( kapp->mainWidget() ); + dlg = new K3bBurnProgressDialog( tdeApp->mainWidget() ); } K3bBurnJob* burnJob = 0; @@ -309,7 +309,7 @@ void K3bCdCopyDialog::slotStartClicked() return; } - K3bCloneJob* job = new K3bCloneJob( dlg, TQT_TQOBJECT(this) ); + K3bCloneJob* job = new K3bCloneJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -325,7 +325,7 @@ void K3bCdCopyDialog::slotStartClicked() burnJob = job; } else { - K3bCdCopyJob* job = new K3bCdCopyJob( dlg, TQT_TQOBJECT(this) ); + K3bCdCopyJob* job = new K3bCdCopyJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -392,7 +392,7 @@ void K3bCdCopyDialog::toggleAll() - TQT_TQWIDGET( child( "audio_options" ) )->setDisabled( m_comboCopyMode->currentItem() == 1 ); + static_cast<TQWidget*>( child( "audio_options" ) )->setDisabled( m_comboCopyMode->currentItem() == 1 ); m_checkIgnoreDataReadErrors->setDisabled( m_comboCopyMode->currentItem() == 1 ); diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h index 898a1de..27b20eb 100644 --- a/src/misc/k3bcdcopydialog.h +++ b/src/misc/k3bcdcopydialog.h @@ -44,7 +44,7 @@ class TQGroupBox; */ class K3bCdCopyDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index d7bb604..c75f770 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -126,28 +126,28 @@ K3bCdImageWritingDialog::K3bCdImageWritingDialog( TQWidget* parent, const char* setupGui(); - d->md5Job = new K3bMd5Job( 0, TQT_TQOBJECT(this) ); - connect( d->md5Job, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotMd5JobFinished(bool)) ); - connect( d->md5Job, TQT_SIGNAL(percent(int)), - this, TQT_SLOT(slotMd5JobPercent(int)) ); - - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, TQT_SLOT(setDevice(K3bDevice::Device*)) ); - connect( m_comboImageType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_editImagePath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotUpdateImage(const TQString&)) ); - connect( m_checkDummy, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleAll()) ); + d->md5Job = new K3bMd5Job( 0, this ); + connect( d->md5Job, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotMd5JobFinished(bool)) ); + connect( d->md5Job, TQ_SIGNAL(percent(int)), + this, TQ_SLOT(slotMd5JobPercent(int)) ); + + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQ_SLOT(setDevice(K3bDevice::Device*)) ); + connect( m_comboImageType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_editImagePath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotUpdateImage(const TQString&)) ); + connect( m_checkDummy, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleAll()) ); } @@ -178,7 +178,7 @@ void K3bCdImageWritingDialog::setupGui() // image // ----------------------------------------------------------------------- - TQGroupBox* groupImageUrl = new TQGroupBox( 1, Qt::Horizontal, i18n("Image to Burn"), frame ); + TQGroupBox* groupImageUrl = new TQGroupBox( 1, TQt::Horizontal, i18n("Image to Burn"), frame ); m_editImagePath = new KURLRequester( groupImageUrl ); m_editImagePath->setMode( KFile::File|KFile::ExistingOnly ); m_editImagePath->setCaption( i18n("Choose Image File") ); @@ -192,7 +192,7 @@ void K3bCdImageWritingDialog::setupGui() + "\n" + i18n("*|All Files") ); - TQGroupBox* groupImageType = new TQGroupBox( 1, Qt::Horizontal, i18n("Image Type"), frame ); + TQGroupBox* groupImageType = new TQGroupBox( 1, TQt::Horizontal, i18n("Image Type"), frame ); m_comboImageType = new TQComboBox( groupImageType ); m_comboImageType->insertItem( i18n("Auto Detection") ); m_comboImageType->insertItem( i18n("ISO9660 Image") ); @@ -224,8 +224,8 @@ void K3bCdImageWritingDialog::setupGui() m_infoView->setFullWidth(true); m_infoView->setSelectionMode( TQListView::NoSelection ); - connect( m_infoView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_infoView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); @@ -242,13 +242,13 @@ void K3bCdImageWritingDialog::setupGui() optionTabLayout->setSpacing( spacingHint() ); optionTabLayout->setMargin( marginHint() ); - TQGroupBox* writingModeGroup = new TQGroupBox( 1,Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* writingModeGroup = new TQGroupBox( 1,TQt::Vertical, i18n("Writing Mode"), optionTab ); writingModeGroup->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( writingModeGroup ); // copies -------- - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -259,7 +259,7 @@ void K3bCdImageWritingDialog::setupGui() m_spinCopies->setMaxValue( 999 ); // -------- copies - TQGroupBox* optionGroup = new TQGroupBox( 3,Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* optionGroup = new TQGroupBox( 3,TQt::Vertical, i18n("Settings"), optionTab ); optionGroup->setInsideMargin( marginHint() ); optionGroup->setInsideSpacing( spacingHint() ); m_checkDummy = K3bStdGuiItems::simulateCheckbox( optionGroup ); @@ -347,14 +347,14 @@ void K3bCdImageWritingDialog::slotStartClicked() d->tocFile = imagePath(); // create a progresswidget - K3bBurnProgressDialog dlg( kapp->mainWidget(), "burnProgress", true ); + K3bBurnProgressDialog dlg( tdeApp->mainWidget(), "burnProgress", true ); // create the job K3bBurnJob* job = 0; switch( currentImageType() ) { case IMAGE_CDRECORD_CLONE: { - K3bCloneJob* _job = new K3bCloneJob( &dlg, TQT_TQOBJECT(this) ); + K3bCloneJob* _job = new K3bCloneJob( &dlg, this ); _job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); _job->setImagePath( d->imageFile ); _job->setSimulate( m_checkDummy->isChecked() ); @@ -368,7 +368,7 @@ void K3bCdImageWritingDialog::slotStartClicked() case IMAGE_AUDIO_CUE: { - K3bAudioCueFileWritingJob* job_ = new K3bAudioCueFileWritingJob( &dlg, TQT_TQOBJECT(this) ); + K3bAudioCueFileWritingJob* job_ = new K3bAudioCueFileWritingJob( &dlg, this ); job_->setBurnDevice( m_writerSelectionWidget->writerDevice() ); job_->setSpeed( m_writerSelectionWidget->writerSpeed() ); @@ -387,7 +387,7 @@ void K3bCdImageWritingDialog::slotStartClicked() // for now the K3bBinImageWritingJob decides if it's a toc or a cue file case IMAGE_CDRDAO_TOC: { - K3bBinImageWritingJob* job_ = new K3bBinImageWritingJob( &dlg, TQT_TQOBJECT(this) ); + K3bBinImageWritingJob* job_ = new K3bBinImageWritingJob( &dlg, this ); job_->setWriter( m_writerSelectionWidget->writerDevice() ); job_->setSpeed( m_writerSelectionWidget->writerSpeed() ); diff --git a/src/misc/k3bcdimagewritingdialog.h b/src/misc/k3bcdimagewritingdialog.h index 69830fb..44e33b7 100644 --- a/src/misc/k3bcdimagewritingdialog.h +++ b/src/misc/k3bcdimagewritingdialog.h @@ -47,7 +47,7 @@ class TQPoint; */ class K3bCdImageWritingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index b9a1459..1a8cbc2 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -48,7 +48,7 @@ #include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdemessagebox.h> #include <tdeglobal.h> @@ -69,7 +69,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod // // Source group // ////////////////////////////////////////////////////////////////////////// - TQGroupBox* groupSource = new TQGroupBox( 1, Qt::Vertical, i18n("Source Medium"), w ); + TQGroupBox* groupSource = new TQGroupBox( 1, TQt::Vertical, i18n("Source Medium"), w ); groupSource->setInsideSpacing( spacingHint() ); groupSource->setInsideMargin( marginHint() ); m_comboSourceDevice = new K3bMediaSelectionComboBox( groupSource ); @@ -97,11 +97,11 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod optionTabGrid->setSpacing( spacingHint() ); optionTabGrid->setMargin( marginHint() ); - TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, TQt::Vertical, i18n("Writing Mode"), optionTab ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - TQGroupBox* groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* groupOptions = new TQGroupBox( 5, TQt::Vertical, i18n("Settings"), optionTab ); groupOptions->setInsideSpacing( spacingHint() ); groupOptions->setInsideMargin( marginHint() ); m_checkSimulate = K3bStdGuiItems::simulateCheckbox( groupOptions ); @@ -110,7 +110,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod m_checkDeleteImages = K3bStdGuiItems::removeImagesCheckbox( groupOptions ); m_checkVerifyData = K3bStdGuiItems::verifyCheckBox( groupOptions ); - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -153,7 +153,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - TQGroupBox* groupGeneral = new TQGroupBox( 2, Qt::Vertical, i18n("General"), advancedTab ); + TQGroupBox* groupGeneral = new TQGroupBox( 2, TQt::Vertical, i18n("General"), advancedTab ); groupGeneral->setInsideSpacing( spacingHint() ); groupGeneral->setInsideMargin( marginHint() ); TQHBox* box = new TQHBox( groupGeneral ); @@ -190,14 +190,14 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod // // setup connections // ////////////////////////////////////////////////////////////////////////// - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); - connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); + connect( m_checkSimulate, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); TQToolTip::add( m_checkIgnoreReadErrors, i18n("Skip unreadable sectors") ); TQWhatsThis::add( m_checkIgnoreReadErrors, i18n("<p>If this option is checked and K3b is not able to read a sector from the " @@ -247,13 +247,13 @@ void K3bDvdCopyDialog::slotStartClicked() K3bJobProgressDialog* dlg = 0; if( m_checkOnlyCreateImage->isChecked() ) { - dlg = new K3bJobProgressDialog( kapp->mainWidget() ); + dlg = new K3bJobProgressDialog( tdeApp->mainWidget() ); } else { - dlg = new K3bBurnProgressDialog( kapp->mainWidget() ); + dlg = new K3bBurnProgressDialog( tdeApp->mainWidget() ); } - K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, TQT_TQOBJECT(this) ); + K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h index aad39a3..bbdae7a 100644 --- a/src/misc/k3bdvdcopydialog.h +++ b/src/misc/k3bdvdcopydialog.h @@ -37,7 +37,7 @@ class K3bWritingModeWidget; class K3bDvdCopyDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 7c436fd..ded0a74 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -58,14 +58,14 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* na m_writerSelectionWidget->setSupportedWritingApps( K3b::DVD_RW_FORMAT ); m_writerSelectionWidget->setForceAutoSpeed(true); - TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), frame ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, TQt::Vertical, i18n("Writing Mode"), frame ); groupWritingMode->layout()->setMargin( marginHint() ); groupWritingMode->layout()->setSpacing( spacingHint() ); m_writingModeWidget = new K3bWritingModeWidget( K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR, groupWritingMode ); - TQGroupBox* groupOptions = new TQGroupBox( 2, Qt::Vertical, i18n("Settings"), frame ); + TQGroupBox* groupOptions = new TQGroupBox( 2, TQt::Vertical, i18n("Settings"), frame ); groupOptions->layout()->setMargin( marginHint() ); groupOptions->layout()->setSpacing( spacingHint() ); m_checkForce = new TQCheckBox( i18n("Force"), groupOptions ); @@ -99,9 +99,9 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* na "time and some DVD writers perform a full format even if " "quick format is enabled." ) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, TQT_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQ_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); slotWriterChanged(); } @@ -126,9 +126,9 @@ void K3bDvdFormattingDialog::slotStartClicked() - K3bJobProgressDialog d( kapp->mainWidget(), "formattingProgress", false ); + K3bJobProgressDialog d( tdeApp->mainWidget(), "formattingProgress", false ); - K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, TQT_TQOBJECT(this) ); + K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, this ); job->setDevice( m_writerSelectionWidget->writerDevice() ); job->setMode( m_writingModeWidget->writingMode() ); job->setForce( m_checkForce->isChecked() ); diff --git a/src/misc/k3bdvdformattingdialog.h b/src/misc/k3bdvdformattingdialog.h index a30c97a..e7441ae 100644 --- a/src/misc/k3bdvdformattingdialog.h +++ b/src/misc/k3bdvdformattingdialog.h @@ -28,7 +28,7 @@ namespace K3bDevice { class K3bDvdFormattingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index d293f6e..c417d86 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -102,24 +102,24 @@ K3bIsoImageWritingDialog::K3bIsoImageWritingDialog( TQWidget* parent, const char m_writerSelectionWidget->setSupportedWritingApps( K3b::GROWISOFS ); m_writingModeWidget->setSupportedModes( K3b::DAO|K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR ); - m_md5Job = new K3bMd5Job( 0, TQT_TQOBJECT(this) ); - connect( m_md5Job, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotMd5JobFinished(bool)) ); - connect( m_md5Job, TQT_SIGNAL(percent(int)), - this, TQT_SLOT(slotMd5JobPercent(int)) ); + m_md5Job = new K3bMd5Job( 0, this ); + connect( m_md5Job, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotMd5JobFinished(bool)) ); + connect( m_md5Job, TQ_SIGNAL(percent(int)), + this, TQ_SLOT(slotMd5JobPercent(int)) ); updateImageSize( imagePath() ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), - this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), - this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), - this, TQT_SLOT(slotWriterChanged()) ); - connect( m_editImagePath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateImageSize(const TQString&)) ); - connect( m_checkDummy, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), + this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), + this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), + this, TQ_SLOT(slotWriterChanged()) ); + connect( m_editImagePath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateImageSize(const TQString&)) ); + connect( m_checkDummy, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotWriterChanged()) ); } @@ -149,14 +149,14 @@ void K3bIsoImageWritingDialog::setupGui() // image // ----------------------------------------------------------------------- - TQGroupBox* groupImageUrl = new TQGroupBox( 1, Qt::Horizontal, i18n("Image to Burn"), frame ); + TQGroupBox* groupImageUrl = new TQGroupBox( 1, TQt::Horizontal, i18n("Image to Burn"), frame ); m_editImagePath = new KURLRequester( groupImageUrl ); m_editImagePath->setMode( KFile::File|KFile::ExistingOnly ); m_editImagePath->setCaption( i18n("Choose Image File") ); m_editImagePath->setFilter( i18n("*.iso *.ISO|ISO9660 Image Files") + "\n" + i18n("*|All Files") ); - connect( m_editImagePath->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotWriterChanged() ) ); + connect( m_editImagePath->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotWriterChanged() ) ); // image info // ----------------------------------------------------------------------- @@ -170,8 +170,8 @@ void K3bIsoImageWritingDialog::setupGui() m_infoView->setFullWidth(true); m_infoView->setSelectionMode( TQListView::NoSelection ); - connect( m_infoView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_infoView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); @@ -185,13 +185,13 @@ void K3bIsoImageWritingDialog::setupGui() optionTabLayout->setSpacing( spacingHint() ); optionTabLayout->setMargin( marginHint() ); - TQGroupBox* writingModeGroup = new TQGroupBox( 1,Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* writingModeGroup = new TQGroupBox( 1,TQt::Vertical, i18n("Writing Mode"), optionTab ); writingModeGroup->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( writingModeGroup ); // copies -------- - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -202,7 +202,7 @@ void K3bIsoImageWritingDialog::setupGui() m_spinCopies->setMaxValue( 999 ); // -------- copies - TQGroupBox* optionGroup = new TQGroupBox( 3,Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* optionGroup = new TQGroupBox( 3,TQt::Vertical, i18n("Settings"), optionTab ); optionGroup->setInsideMargin( marginHint() ); optionGroup->setInsideSpacing( spacingHint() ); m_checkDummy = K3bStdGuiItems::simulateCheckbox( optionGroup ); @@ -265,7 +265,7 @@ void K3bIsoImageWritingDialog::slotStartClicked() c->writePathEntry( "last written image", imagePath() ); // create a progresswidget - K3bBurnProgressDialog dlg( kapp->mainWidget(), "burnProgress", true ); + K3bBurnProgressDialog dlg( tdeApp->mainWidget(), "burnProgress", true ); // create the job K3bIso9660ImageWritingJob* job = new K3bIso9660ImageWritingJob( &dlg ); diff --git a/src/misc/k3bisoimagewritingdialog.h b/src/misc/k3bisoimagewritingdialog.h index 050a4f2..8eeaeb9 100644 --- a/src/misc/k3bisoimagewritingdialog.h +++ b/src/misc/k3bisoimagewritingdialog.h @@ -41,7 +41,7 @@ class TQPoint; */ class K3bIsoImageWritingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: |
