From 1fc61c6e1d0a2b34f7b1d0de181bb4e6f954a8c2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:39:40 -0600 Subject: Remove additional unneeded tq method conversions --- src/gui/generaloptionswidget.ui | 2 +- src/gui/itemselector.cpp | 4 ++-- src/gui/logicwidget.ui | 2 +- src/gui/logview.cpp | 10 +++++----- src/gui/microsettingsdlg.cpp | 6 +++--- src/gui/newfilewidget.ui | 2 +- src/gui/oscilloscopeview.cpp | 4 ++-- src/gui/oscilloscopeview.h | 2 +- src/gui/oscilloscopewidget.ui | 4 ++-- src/gui/probepositioner.cpp | 2 +- src/gui/propertieslistview.cpp | 2 +- src/gui/settingsdlg.cpp | 16 ++++++++-------- 12 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/gui') diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui index 201a567..08c1de2 100644 --- a/src/gui/generaloptionswidget.ui +++ b/src/gui/generaloptionswidget.ui @@ -217,7 +217,7 @@ false - + WordBreak|AlignVCenter diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index 539bc40..89f5bb2 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -163,7 +163,7 @@ void ItemSelector::slotContextMenuRequested( TQListViewItem* item, const TQPoint } TQPopupMenu *menu = new TQPopupMenu(this); - menu->insertItem( i18n("Remove %1").tqarg(item->text(0)), this, TQT_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete ); + menu->insertItem( i18n("Remove %1").arg(item->text(0)), this, TQT_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete ); menu->popup(pos); } @@ -177,7 +177,7 @@ void ItemSelector::slotRemoveSelectedItem() emit itemRemoved( item->key( 0, 0 ) ); ILVItem *parent = dynamic_cast(item->TQListViewItem::parent()); delete item; - // Get rid of the category as well if it has no tqchildren + // Get rid of the category as well if it has no children if ( parent && !parent->firstChild() ) { m_categories.remove(parent->text(0)); diff --git a/src/gui/logicwidget.ui b/src/gui/logicwidget.ui index 99ef045..e57feab 100644 --- a/src/gui/logicwidget.ui +++ b/src/gui/logicwidget.ui @@ -239,7 +239,7 @@ These values will apply to all components, apart from the PIC, whose pins' impedances depend on the pin in use. - + WordBreak|AlignVCenter diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp index 574d967..2da75a2 100644 --- a/src/gui/logview.cpp +++ b/src/gui/logview.cpp @@ -49,23 +49,23 @@ void LogView::addOutput( TQString text, OutputType outputType, MessageInfo messa switch(outputType) { case LogView::ot_important: - append( TQString("%1").tqarg(text) ); + append( TQString("%1").arg(text) ); break; case LogView::ot_info: - append( TQString("%1").tqarg(text) ); + append( TQString("%1").arg(text) ); break; case LogView::ot_message: - append( TQString("%1").tqarg(text) ); + append( TQString("%1").arg(text) ); break; case LogView::ot_warning: - append( TQString("%1").tqarg(text) ); + append( TQString("%1").arg(text) ); break; case LogView::ot_error: - append( TQString("%1").tqarg(text) ); + append( TQString("%1").arg(text) ); break; } diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp index 55ef185..318c3ea 100644 --- a/src/gui/microsettingsdlg.cpp +++ b/src/gui/microsettingsdlg.cpp @@ -376,7 +376,7 @@ void MicroSettingsDlg::savePort( int row ) if ( !typeOk ) { -// KMessageBox::sorry( this, i18n("Unregnised Port Type: %1").tqarg(typeText) ); +// KMessageBox::sorry( this, i18n("Unregnised Port Type: %1").arg(typeText) ); return; } @@ -389,7 +389,7 @@ void MicroSettingsDlg::savePort( int row ) if ( !stateOk ) { -// KMessageBox::sorry( this, i18n("Unregnised Port State: %1").tqarg(stateText) ); +// KMessageBox::sorry( this, i18n("Unregnised Port State: %1").arg(stateText) ); return; } @@ -411,7 +411,7 @@ void MicroSettingsDlg::saveVariable( int row ) if (!ok) { - KMessageBox::sorry( this, i18n("Invalid variable value: %1").tqarg(valueText) ); + KMessageBox::sorry( this, i18n("Invalid variable value: %1").arg(valueText) ); return; } diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui index 94df077..4f0b4dc 100644 --- a/src/gui/newfilewidget.ui +++ b/src/gui/newfilewidget.ui @@ -59,7 +59,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci File Type: - + AlignVCenter diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp index f74a822..e42af21 100644 --- a/src/gui/oscilloscopeview.cpp +++ b/src/gui/oscilloscopeview.cpp @@ -77,7 +77,7 @@ void OscilloscopeView::updateView() void OscilloscopeView::updateViewTimeout() { b_needRedraw = true; - tqrepaint(false); + repaint(false); updateTimeLabel(); } @@ -130,7 +130,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event ) for ( uint i=0; i<5; ++i ) { const int num = fps[i]; - fpsMenu.insertItem( i18n("%1 fps").tqarg(num), num ); + fpsMenu.insertItem( i18n("%1 fps").arg(num), num ); fpsMenu.setItemChecked( num, num == m_fps ); } diff --git a/src/gui/oscilloscopeview.h b/src/gui/oscilloscopeview.h index b4e6a10..533c92e 100644 --- a/src/gui/oscilloscopeview.h +++ b/src/gui/oscilloscopeview.h @@ -33,7 +33,7 @@ class OscilloscopeView : public TQFrame public slots: /** - * Sets the needRedraw flag to true, and then class tqrepaint + * Sets the needRedraw flag to true, and then class repaint */ void updateView(); void slotSetFrameRate( int fps ); diff --git a/src/gui/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui index 199b070..d422136 100644 --- a/src/gui/oscilloscopewidget.ui +++ b/src/gui/oscilloscopewidget.ui @@ -111,7 +111,7 @@ Zoom - + AlignCenter @@ -164,7 +164,7 @@ - + AlignCenter diff --git a/src/gui/probepositioner.cpp b/src/gui/probepositioner.cpp index 481612c..25f7119 100644 --- a/src/gui/probepositioner.cpp +++ b/src/gui/probepositioner.cpp @@ -41,7 +41,7 @@ ProbePositioner::~ProbePositioner() void ProbePositioner::forceRepaint() { b_needRedraw = true; - tqrepaint(false); + repaint(false); } diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp index a620621..e647997 100644 --- a/src/gui/propertieslistview.cpp +++ b/src/gui/propertieslistview.cpp @@ -271,7 +271,7 @@ void PropertiesListView::headerSizeChanged(int section, int /*oldSize*/, int new // Resize the editor to the new column width // and move it to the right place. - TQRect rect = m_editor->tqgeometry(); + TQRect rect = m_editor->geometry(); rect.setWidth(newSize); rect.setX( columnWidth(0) ); m_editor->setGeometry(rect); diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp index 72a7a07..3fd5a28 100644 --- a/src/gui/settingsdlg.cpp +++ b/src/gui/settingsdlg.cpp @@ -104,19 +104,19 @@ void SettingsDlg::slotUpdateRefreshRateLabel( int sliderValue ) switch(sliderValue) { case 0: - m_generalOptionsWidget->refreshRateLabel->setText( i18n("Lowest (%1 FPS)").tqarg(number) ); + m_generalOptionsWidget->refreshRateLabel->setText( i18n("Lowest (%1 FPS)").arg(number) ); break; case 1: - m_generalOptionsWidget->refreshRateLabel->setText( i18n("Low (%1 FPS)").tqarg(number) ); + m_generalOptionsWidget->refreshRateLabel->setText( i18n("Low (%1 FPS)").arg(number) ); break; case 2: - m_generalOptionsWidget->refreshRateLabel->setText( i18n("Medium (%1 FPS)").tqarg(number) ); + m_generalOptionsWidget->refreshRateLabel->setText( i18n("Medium (%1 FPS)").arg(number) ); break; case 3: - m_generalOptionsWidget->refreshRateLabel->setText( i18n("High (%1 FPS)").tqarg(number) ); + m_generalOptionsWidget->refreshRateLabel->setText( i18n("High (%1 FPS)").arg(number) ); break; case 4: - m_generalOptionsWidget->refreshRateLabel->setText( i18n("Highest (%1 FPS)").tqarg(number) ); + m_generalOptionsWidget->refreshRateLabel->setText( i18n("Highest (%1 FPS)").arg(number) ); break; default: m_generalOptionsWidget->refreshRateLabel->setText( i18n("Unknown value") ); @@ -141,9 +141,9 @@ void SettingsDlg::slotUpdatePicProgrammerDescription() TQString programLocation = KStandardDirs::findExe( executable ); if ( programLocation.isNull() ) - description.prepend( i18n("%1 cannot be found.
").tqarg( executable ) ); + description.prepend( i18n("%1 cannot be found.
").arg( executable ) ); else - description.prepend( i18n("%1 found: %2
").tqarg( executable ).tqarg(programLocation) ); + description.prepend( i18n("%1 found: %2
").arg( executable ).arg(programLocation) ); m_picProgrammerConfigWidget->m_pProgrammerDescription->setText( description ); m_picProgrammerConfigWidget->removeButton->setEnabled( customProgrammer ); @@ -193,7 +193,7 @@ void SettingsDlg::slotRemoveProgrammerConfig() TQString program = combo->currentText(); - KMessageBox::ButtonCode confirm = (KMessageBox::ButtonCode)KMessageBox::warningContinueCancel( this, i18n("Remove programmer configuration \"%1\"?").tqarg(program), i18n("Remove \"%1\"").tqarg(program), i18n("Remove") ); + KMessageBox::ButtonCode confirm = (KMessageBox::ButtonCode)KMessageBox::warningContinueCancel( this, i18n("Remove programmer configuration \"%1\"?").arg(program), i18n("Remove \"%1\"").arg(program), i18n("Remove") ); if ( confirm == KMessageBox::Cancel ) return; -- cgit v1.2.1