From ba335c4be73ee8e3ae5c6084e889c003825cda44 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:04:05 -0600 Subject: Rename obsolete tq methods to standard names --- src/misc/k3bblankingdialog.cpp | 4 ++-- src/misc/k3bcdimagewritingdialog.cpp | 38 +++++++++++++++++------------------ src/misc/k3bdvdcopydialog.cpp | 2 +- src/misc/k3bdvdformattingdialog.cpp | 8 ++++---- src/misc/k3bisoimagewritingdialog.cpp | 20 +++++++++--------- 5 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/misc') diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index e80f22b..904683b 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -109,8 +109,8 @@ void K3bBlankingDialog::setupGui() // --- setup the blanking type button group ----------------------------- TQGroupBox* groupBlankType = new TQGroupBox( 1, Qt::Vertical, i18n("&Erase Type"), frame ); - groupBlankType->tqlayout()->setSpacing( spacingHint() ); - groupBlankType->tqlayout()->setMargin( marginHint() ); + groupBlankType->layout()->setSpacing( spacingHint() ); + groupBlankType->layout()->setMargin( marginHint() ); m_comboEraseMode = new TQComboBox( groupBlankType ); // ---------------------------------------------------------------------- diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 9f0c3e1..57b313b 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -588,14 +588,14 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF ) K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Detected:"), i18n("Iso9660 image") ); - isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); + isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); KIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), KIO::convertSize( size ) ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -603,7 +603,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF ) isoF->primaryDescriptor().systemId.isEmpty() ? TQString("-") : isoF->primaryDescriptor().systemId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -611,7 +611,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF ) isoF->primaryDescriptor().volumeId.isEmpty() ? TQString("-") : isoF->primaryDescriptor().volumeId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -619,7 +619,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF ) isoF->primaryDescriptor().volumeSetId.isEmpty() ? TQString("-") : isoF->primaryDescriptor().volumeSetId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -627,14 +627,14 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF ) isoF->primaryDescriptor().publisherId.isEmpty() ? TQString("-") : isoF->primaryDescriptor().publisherId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Preparer Id:"), isoF->primaryDescriptor().preparerId.isEmpty() ? TQString("-") : isoF->primaryDescriptor().preparerId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -642,7 +642,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF ) isoF->primaryDescriptor().applicationId.isEmpty() ? TQString("-") : isoF->primaryDescriptor().applicationId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); isoRootItem->setOpen( true ); } @@ -653,24 +653,24 @@ void K3bCdImageWritingDialog::createCdrecordCloneItems( const TQString& tocFile, K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Detected:"), i18n("Cdrecord clone image") ); - isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); + isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Image file:"), imageFile ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("TOC file:"), tocFile ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); isoRootItem->setOpen( true ); } @@ -681,24 +681,24 @@ void K3bCdImageWritingDialog::createCueBinItems( const TQString& cueFile, const K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Detected:"), i18n("Cue/bin image") ); - isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); + isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Image file:"), imageFile ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Cue file:"), cueFile ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); isoRootItem->setOpen( true ); } @@ -709,7 +709,7 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp ) K3bListViewItem* rootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Detected:"), i18n("Audio Cue Image") ); - rootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); + rootItem->setForegroundColor( 0, palette().disabled().foreground() ); rootItem->setPixmap( 0, SmallIcon( "sound") ); K3bListViewItem* trackParent = new K3bListViewItem( rootItem, @@ -839,7 +839,7 @@ void K3bCdImageWritingDialog::calculateMd5Sum( const TQString& file ) d->md5SumItem = new K3bListViewItem( m_infoView, m_infoView->firstChild() ); d->md5SumItem->setText( 0, i18n("Md5 Sum:") ); - d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); + d->md5SumItem->setForegroundColor( 0, palette().disabled().foreground() ); d->md5SumItem->setProgress( 1, 0 ); d->md5SumItem->setPixmap( 0, SmallIcon( "exec") ); @@ -907,7 +907,7 @@ void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, cons } } else if( r == copyItem ) { - TQApplication::tqclipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( d->md5Job->hexDigest().lower(), TQClipboard::Clipboard ); } } diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index ff721b3..24aeace 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -169,7 +169,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod // - // setup tqlayout + // setup layout // ////////////////////////////////////////////////////////////////////////// TQGridLayout* grid = new TQGridLayout( w ); grid->setMargin( 0 ); diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index c088588..309f48c 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -59,15 +59,15 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* na m_writerSelectionWidget->setForceAutoSpeed(true); TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), frame ); - groupWritingMode->tqlayout()->setMargin( marginHint() ); - groupWritingMode->tqlayout()->setSpacing( spacingHint() ); + groupWritingMode->layout()->setMargin( marginHint() ); + groupWritingMode->layout()->setSpacing( spacingHint() ); m_writingModeWidget = new K3bWritingModeWidget( K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR, groupWritingMode ); TQGroupBox* groupOptions = new TQGroupBox( 2, Qt::Vertical, i18n("Settings"), frame ); - groupOptions->tqlayout()->setMargin( marginHint() ); - groupOptions->tqlayout()->setSpacing( spacingHint() ); + groupOptions->layout()->setMargin( marginHint() ); + groupOptions->layout()->setSpacing( spacingHint() ); m_checkForce = new TQCheckBox( i18n("Force"), groupOptions ); m_checkQuickFormat = new TQCheckBox( i18n("Quick format"), groupOptions ); diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 1e734b9..3d23020 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -319,12 +319,12 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path ) K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Iso9660 image") ); - isoRootItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); + isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), KIO::convertSize( imageSize ) ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -332,7 +332,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path ) isoF.primaryDescriptor().systemId.isEmpty() ? TQString("-") : isoF.primaryDescriptor().systemId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -340,7 +340,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path ) isoF.primaryDescriptor().volumeId.isEmpty() ? TQString("-") : isoF.primaryDescriptor().volumeId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -348,7 +348,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path ) isoF.primaryDescriptor().volumeSetId.isEmpty() ? TQString("-") : isoF.primaryDescriptor().volumeSetId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -356,14 +356,14 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path ) isoF.primaryDescriptor().publisherId.isEmpty() ? TQString("-") : isoF.primaryDescriptor().publisherId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Preparer Id:"), isoF.primaryDescriptor().preparerId.isEmpty() ? TQString("-") : isoF.primaryDescriptor().preparerId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -371,7 +371,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path ) isoF.primaryDescriptor().applicationId.isEmpty() ? TQString("-") : isoF.primaryDescriptor().applicationId ); - item->setForegroundColor( 0, tqpalette().disabled().foreground() ); + item->setForegroundColor( 0, palette().disabled().foreground() ); isoRootItem->setOpen( true ); @@ -441,7 +441,7 @@ void K3bIsoImageWritingDialog::calculateMd5Sum( const TQString& file ) d->md5SumItem = new K3bListViewItem( m_infoView, m_infoView->firstChild() ); d->md5SumItem->setText( 0, i18n("Md5 Sum:") ); - d->md5SumItem->setForegroundColor( 0, tqpalette().disabled().foreground() ); + d->md5SumItem->setForegroundColor( 0, palette().disabled().foreground() ); d->md5SumItem->setProgress( 1, 0 ); d->md5SumItem->setPixmap( 0, SmallIcon( "exec") ); @@ -509,7 +509,7 @@ void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, con } } else if( r == copyItem ) { - TQApplication::tqclipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( m_md5Job->hexDigest().lower(), TQClipboard::Clipboard ); } } -- cgit v1.2.1