From 650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:55:47 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit ef5831dd5c8811c94c9b1bc1377a90174d17c82c. --- src/k3bemptydiscwaiter.cpp | 84 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'src/k3bemptydiscwaiter.cpp') diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index ba0e53f..619db8c 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include @@ -95,10 +95,10 @@ K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* par // setup the gui // ----------------------------- d->labelRequest = new TQLabel( plainPage() ); - d->labelRequest->setAlignment( TQt::AlignLeft | TQt::AlignVCenter ); + d->labelRequest->tqsetAlignment( TQt::AlignLeft | TQt::AlignVCenter ); d->labelFoundMedia = new TQLabel( plainPage() ); d->pixLabel = new TQLabel( plainPage() ); - d->pixLabel->setAlignment( TQt::AlignHCenter | TQt::AlignTop ); + d->pixLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop ); TQFont f( d->labelFoundMedia->font() ); f.setBold(true); @@ -152,11 +152,11 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri // if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) && (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) ) - d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("�"); + d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").tqarg("�"); else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL ) - d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("�"); + d->wantedMediaTypeString = i18n("DVD%1R(W)").tqarg("�"); else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL ) - d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("�"); + d->wantedMediaTypeString = i18n("Double Layer DVD%1R").tqarg("�"); else d->wantedMediaTypeString = i18n("CD-R(W)"); @@ -164,44 +164,44 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri if( (d->wantedMediaState & K3bDevice::STATE_COMPLETE) && (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) ) d->labelRequest->setText( i18n("Please insert a complete or appendable %4 medium " "into drive

%1 %2 (%3).") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else if( d->wantedMediaState & K3bDevice::STATE_COMPLETE ) d->labelRequest->setText( i18n("Please insert a complete %4 medium " "into drive

%1 %2 (%3).") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else if( (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) && (d->wantedMediaState & K3bDevice::STATE_EMPTY) ) d->labelRequest->setText( i18n("Please insert an empty or appendable %4 medium " "into drive

%1 %2 (%3).") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else if( d->wantedMediaState & K3bDevice::STATE_INCOMPLETE ) d->labelRequest->setText( i18n("Please insert an appendable %4 medium " "into drive

%1 %2 (%3).") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else if( d->wantedMediaState & K3bDevice::STATE_EMPTY ) d->labelRequest->setText( i18n("Please insert an empty %4 medium " "into drive

%1 %2 (%3).") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) - .arg( d->wantedMediaTypeString ) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) + .tqarg( d->wantedMediaTypeString ) ); else // fallback case (this should not happen in K3b) d->labelRequest->setText( i18n("Please insert a suitable medium " "into drive

%1 %2 (%3).") - .arg(d->device->vendor()) - .arg(d->device->description()) - .arg(d->device->devicename()) ); + .tqarg(d->device->vendor()) + .tqarg(d->device->description()) + .tqarg(d->device->devicename()) ); } else @@ -340,10 +340,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) KMessageBox::warningContinueCancel( parentWidgetToUse(), i18n("Found %1 media in %2 - %3. " "Should it be overwritten?") - .arg("DVD+RW") - .arg(d->device->vendor()) - .arg(d->device->description()), - i18n("Found %1").arg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { + .tqarg("DVD+RW") + .tqarg(d->device->vendor()) + .tqarg(d->device->description()), + i18n("Found %1").tqarg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { finishWaiting( K3bDevice::MEDIA_DVD_PLUS_RW ); } else { @@ -410,10 +410,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) KMessageBox::warningContinueCancel( parentWidgetToUse(), i18n("Found %1 media in %2 - %3. " "Should it be overwritten?") - .arg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType())) - .arg(d->device->vendor()) - .arg(d->device->description()), - i18n("Found %1").arg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { + .tqarg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType())) + .tqarg(d->device->vendor()) + .tqarg(d->device->description()), + i18n("Found %1").tqarg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { finishWaiting( K3bDevice::MEDIA_DVD_RW_OVWR ); } else { @@ -467,10 +467,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) KMessageBox::warningContinueCancel( parentWidgetToUse(), i18n("Found %1 media in %2 - %3. " "Should it be formatted?") - .arg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) ) - .arg(d->device->vendor()) - .arg(d->device->description()), - i18n("Found %1").arg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) { + .tqarg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) ) + .tqarg(d->device->vendor()) + .tqarg(d->device->description()), + i18n("Found %1").tqarg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) { kdDebug() << "(K3bEmptyDiscWaiter) ------ formatting DVD-RW." << endl; @@ -542,7 +542,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) if( formatWithoutAsking || KMessageBox::questionYesNo( parentWidgetToUse(), i18n("Found rewritable media in %1 - %2. " - "Should it be erased?").arg(d->device->vendor()).arg(d->device->description()), + "Should it be erased?").tqarg(d->device->vendor()).tqarg(d->device->description()), i18n("Found Rewritable Disk"), KGuiItem(i18n("&Erase"), "cdrwblank"), KGuiItem(i18n("E&ject")) ) == KMessageBox::Yes ) { -- cgit v1.2.1