From ef5831dd5c8811c94c9b1bc1377a90174d17c82c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:29:52 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/option/base_k3bcddboptiontab.ui | 6 ++--- src/option/base_k3bmiscoptiontab.ui | 8 +++---- src/option/base_k3bpluginoptiontab.ui | 2 +- src/option/base_k3bthemeoptiontab.ui | 8 +++---- src/option/k3bburningoptiontab.cpp | 10 ++++----- src/option/k3bcddboptiontab.cpp | 16 +++++++------- src/option/k3bdeviceoptiontab.cpp | 4 ++-- src/option/k3bdevicewidget.cpp | 40 +++++++++++++++++----------------- src/option/k3bexternalbinoptiontab.cpp | 4 ++-- src/option/k3bexternalbinwidget.cpp | 2 +- src/option/k3bmiscoptiontab.cpp | 6 ++--- src/option/k3bnotifyoptiontab.cpp | 2 +- src/option/k3boptiondialog.cpp | 2 +- src/option/k3bthemeoptiontab.cpp | 2 +- 14 files changed, 56 insertions(+), 56 deletions(-) (limited to 'src/option') diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui index 6af30c6..09cb8a8 100644 --- a/src/option/base_k3bcddboptiontab.ui +++ b/src/option/base_k3bcddboptiontab.ui @@ -195,7 +195,7 @@ Expanding - + 20 51 @@ -394,7 +394,7 @@ Expanding - + 20 30 @@ -491,7 +491,7 @@ Expanding - + 31 151 diff --git a/src/option/base_k3bmiscoptiontab.ui b/src/option/base_k3bmiscoptiontab.ui index f6a7114..89a20cf 100644 --- a/src/option/base_k3bmiscoptiontab.ui +++ b/src/option/base_k3bmiscoptiontab.ui @@ -35,7 +35,7 @@ - tqlayout2 + layout2 @@ -92,7 +92,7 @@ - tqlayout1 + layout1 @@ -202,7 +202,7 @@ - tqlayout4 + layout4 @@ -241,7 +241,7 @@ Expanding - + 31 0 diff --git a/src/option/base_k3bpluginoptiontab.ui b/src/option/base_k3bpluginoptiontab.ui index 3d34bad..1278f80 100644 --- a/src/option/base_k3bpluginoptiontab.ui +++ b/src/option/base_k3bpluginoptiontab.ui @@ -38,7 +38,7 @@ Expanding - + 411 21 diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui index 78d9333..cad57b1 100644 --- a/src/option/base_k3bthemeoptiontab.ui +++ b/src/option/base_k3bthemeoptiontab.ui @@ -98,7 +98,7 @@ - tqlayout1 + layout1 @@ -135,7 +135,7 @@ no Theme selected - + AlignCenter @@ -153,7 +153,7 @@ - tqlayout5 + layout5 @@ -172,7 +172,7 @@ Expanding - + 161 2 diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp index 18bc7be..4fa760d 100644 --- a/src/option/k3bburningoptiontab.cpp +++ b/src/option/k3bburningoptiontab.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,14 +54,14 @@ K3bBurningOptionTab::~K3bBurningOptionTab() void K3bBurningOptionTab::setupGui() { TQGridLayout* groupAdvancedLayout = new TQGridLayout( this ); - groupAdvancedLayout->tqsetAlignment( TQt::AlignTop ); + groupAdvancedLayout->setAlignment( TQt::AlignTop ); groupAdvancedLayout->setSpacing( KDialog::spacingHint() ); groupAdvancedLayout->setMargin( 0 ); TQGroupBox* groupWritingApp = new TQGroupBox( 0, Qt::Vertical, i18n("Burning"), this ); - groupWritingApp->tqlayout()->setMargin( 0 ); - TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->tqlayout() ); + groupWritingApp->layout()->setMargin( 0 ); + TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->layout() ); bufferLayout->setMargin( KDialog::marginHint() ); bufferLayout->setSpacing( KDialog::spacingHint() ); @@ -132,7 +132,7 @@ void K3bBurningOptionTab::setupGui() "avoid gaps in the data stream due to high system load. The default " "sizes used are %1 MB for CD and %2 MB for DVD burning." "

If this option is checked the value specified will be used for both " - "CD and DVD burning.").tqarg(4).tqarg(32) ); + "CD and DVD burning.").arg(4).arg(32) ); TQWhatsThis::add( m_checkEject, i18n("

If this option is checked K3b will not eject the medium once the burn process " "finishes. This can be helpful in case one leaves the computer after starting the " diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 957f9fa..9493f8a 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -50,20 +50,20 @@ K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* parent, const char* name ) base_K3bCddbOptionTabLayout->setMargin( 0 ); base_K3bCddbOptionTabLayout->setSpacing( KDialog::spacingHint() ); - m_mainTabbed->page(0)->tqlayout()->setMargin( KDialog::marginHint() ); - m_mainTabbed->page(0)->tqlayout()->setSpacing( KDialog::spacingHint() ); - m_mainTabbed->page(1)->tqlayout()->setMargin( KDialog::marginHint() ); - m_mainTabbed->page(1)->tqlayout()->setSpacing( KDialog::spacingHint() ); + m_mainTabbed->page(0)->layout()->setMargin( KDialog::marginHint() ); + m_mainTabbed->page(0)->layout()->setSpacing( KDialog::spacingHint() ); + m_mainTabbed->page(1)->layout()->setMargin( KDialog::marginHint() ); + m_mainTabbed->page(1)->layout()->setSpacing( KDialog::spacingHint() ); -// m_groupLocalDir->tqlayout()->setMargin( 0 ); +// m_groupLocalDir->layout()->setMargin( 0 ); // m_groupLocalDirLayout->setMargin( KDialog::marginHint() ); // m_groupLocalDirLayout->setSpacing( KDialog::spacingHint() ); -// m_groupCddbServer->tqlayout()->setMargin( 0 ); +// m_groupCddbServer->layout()->setMargin( 0 ); // m_groupCddbServerLayout->setMargin( KDialog::marginHint() ); // m_groupCddbServerLayout->setSpacing( KDialog::spacingHint() ); - m_groupCgi->tqlayout()->setMargin( 0 ); + m_groupCgi->layout()->setMargin( 0 ); m_groupCgiLayout->setMargin( KDialog::marginHint() ); m_groupCgiLayout->setSpacing( KDialog::spacingHint() ); diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index c8517a5..fede37c 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -43,7 +43,7 @@ K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* parent, const char* name ) // Info Label // ------------------------------------------------ m_labelDevicesInfo = new TQLabel( this, "m_labelDevicesInfo" ); - m_labelDevicesInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); + m_labelDevicesInfo->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); m_labelDevicesInfo->setText( i18n( "K3b tries to detect all your devices properly. " "You can add devices that have not been detected and change " "the black values by clicking in the list. If K3b is unable " diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index d19e42a..4dfd17e 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include @@ -170,8 +170,8 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *p // Devices Box // ------------------------------------------------ TQGroupBox* groupDevices = new TQGroupBox( 1, Qt::Vertical, i18n( "CD/DVD Drives" ), this ); - groupDevices->tqlayout()->setSpacing( KDialog::spacingHint() ); - groupDevices->tqlayout()->setMargin( KDialog::marginHint() ); + groupDevices->layout()->setSpacing( KDialog::spacingHint() ); + groupDevices->layout()->setMargin( KDialog::marginHint() ); m_viewDevices = new K3bListView( groupDevices, "m_viewDevicesReader" ); m_viewDevices->addColumn( "V" ); @@ -254,30 +254,30 @@ void K3bDeviceWidget::updateDeviceListViews() // create the read-only info items K3bListViewItem* systemDeviceItem = new K3bListViewItem( devRoot, i18n("System device name:") ); if( dev->device->interfaceType() == K3bDevice::SCSI ) - systemDeviceItem->setText( 1, TQString("%1 (%2)").tqarg(dev->device->devicename()).tqarg(dev->device->busTargetLun()) ); + systemDeviceItem->setText( 1, TQString("%1 (%2)").arg(dev->device->devicename()).arg(dev->device->busTargetLun()) ); else systemDeviceItem->setText( 1, dev->device->devicename() ); - systemDeviceItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + systemDeviceItem->setForegroundColor( 1, palette().disabled().foreground() ); K3bListViewItem* interfaceItem = new K3bListViewItem( devRoot, systemDeviceItem, i18n("Interface type:"), ( dev->device->interfaceType() == K3bDevice::SCSI ? i18n("Generic SCSI") : i18n("ATAPI") ) ); - interfaceItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + interfaceItem->setForegroundColor( 1, palette().disabled().foreground() ); K3bListViewItem* vendorItem = new K3bListViewItem( devRoot, interfaceItem, i18n("Vendor:"), dev->device->vendor() ); - vendorItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + vendorItem->setForegroundColor( 1, palette().disabled().foreground() ); K3bListViewItem* modelItem = new K3bListViewItem( devRoot, vendorItem, i18n("Description:"), dev->device->description() ); - modelItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + modelItem->setForegroundColor( 1, palette().disabled().foreground() ); K3bListViewItem* versionItem = new K3bListViewItem( devRoot, modelItem, i18n("Firmware:"), dev->device->version() ); - versionItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + versionItem->setForegroundColor( 1, palette().disabled().foreground() ); // drive type @@ -285,33 +285,33 @@ void K3bDeviceWidget::updateDeviceListViews() K3bListViewItem* typeItem = new K3bListViewItem( devRoot, versionItem, i18n("Writes CD-R:"), dev->device->writesCd() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes CD-RW:"), dev->device->writesCdrw() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Reads DVD:"), dev->device->readsDvd() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD-R(W):"), dev->device->writesDvdMinus() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD-R Dual Layer:"), (dev->device->type() & K3bDevice::DEVICE_DVD_R_DL) ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD+R(W):"), dev->device->writesDvdPlus() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Writes DVD+R Double Layer:"), (dev->device->type() & K3bDevice::DEVICE_DVD_PLUS_R_DL) ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); // -------------------------------- @@ -320,7 +320,7 @@ void K3bDeviceWidget::updateDeviceListViews() typeItem = new K3bListViewItem( devRoot, typeItem, i18n("Buffer Size:"), KIO::convertSizeFromKB(dev->device->bufferSize()) ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); } PrivateDeviceViewItem1* cdrdaoDriverItem = new PrivateDeviceViewItem1( PrivateDeviceViewItem1::t_cdrdaoDriver, @@ -339,14 +339,14 @@ void K3bDeviceWidget::updateDeviceListViews() typeItem = new K3bListViewItem( devRoot, cdTextItem, i18n("Supports Burnfree:"), dev->device->burnfree() ? i18n("yes") : i18n("no") ); - typeItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); + typeItem->setForegroundColor( 1, palette().disabled().foreground() ); // and at last the write modes (new K3bListViewItem( devRoot, typeItem, i18n("Write modes:"), - K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, tqpalette().disabled().foreground() ); + K3bDevice::writingModeString(dev->device->writingModes()) ))->setForegroundColor( 1, palette().disabled().foreground() ); } devRoot->setOpen(true); @@ -383,7 +383,7 @@ void K3bDeviceWidget::slotNewDevice() updateDeviceListViews(); } else - KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename), i18n("Error"), false ); + KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename), i18n("Error"), false ); } } diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp index 4d3e062..00b26b3 100644 --- a/src/option/k3bexternalbinoptiontab.cpp +++ b/src/option/k3bexternalbinoptiontab.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ K3bExternalBinOptionTab::K3bExternalBinOptionTab( K3bExternalBinManager* manager m_labelInfo->setText( i18n( "Specify the paths to the external programs that K3b needs to work properly, " "or press \"Search\" to let K3b search for the programs." ) ); m_labelInfo->setScaledContents( false ); - m_labelInfo->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); + m_labelInfo->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); frameLayout->addWidget( m_labelInfo, 0, 0 ); } diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp index 28c6375..59d6446 100644 --- a/src/option/k3bexternalbinwidget.cpp +++ b/src/option/k3bexternalbinwidget.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index cf740eb..04e660d 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -124,10 +124,10 @@ bool K3bMiscOptionTab::saveSettings() } if( !fi.exists() ) { - if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").tqarg(tempDir), + if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").arg(tempDir), i18n("Create Directory"), i18n("Create"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { if( !KStandardDirs::makeDir( fi.absFilePath() ) ) { - KMessageBox::error( this, i18n("Unable to create directory %1").tqarg(tempDir) ); + KMessageBox::error( this, i18n("Unable to create directory %1").arg(tempDir) ); return false; } } @@ -147,7 +147,7 @@ bool K3bMiscOptionTab::saveSettings() // check for writing permission if( !fi.isWritable() ) { - KMessageBox::error( this, i18n("You do not have permission to write to %1.").tqarg(fi.absFilePath()) ); + KMessageBox::error( this, i18n("You do not have permission to write to %1.").arg(fi.absFilePath()) ); return false; } diff --git a/src/option/k3bnotifyoptiontab.cpp b/src/option/k3bnotifyoptiontab.cpp index 5c12ee6..f1acee4 100644 --- a/src/option/k3bnotifyoptiontab.cpp +++ b/src/option/k3bnotifyoptiontab.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index 2b2b6af..2cd8547 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -26,7 +26,7 @@ #include -#include +#include #include #include #include diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index 0e037fc..ec4ca6c 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -147,7 +147,7 @@ void K3bThemeOptionTab::slotInstallTheme() else sorryText = i18n("Unable to download the icon theme archive.\n" "Please check that address %1 is correct."); - KMessageBox::sorry( this, sorryText.tqarg(themeURL.prettyURL()) ); + KMessageBox::sorry( this, sorryText.arg(themeURL.prettyURL()) ); return; } -- cgit v1.2.3