From bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:32:48 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/gui/asmformattingwidget.ui | 2 +- src/gui/contexthelp.cpp | 16 ++++++++-------- src/gui/createsubprojectwidget.ui | 2 +- src/gui/doublespinbox.cpp | 4 ++-- src/gui/generaloptionswidget.ui | 6 +++--- src/gui/gpasmsettingswidget.ui | 8 ++++---- src/gui/itemeditor.cpp | 14 +++++++------- src/gui/itemselector.cpp | 6 +++--- src/gui/logicwidget.ui | 4 ++-- src/gui/logview.cpp | 10 +++++----- src/gui/microselectwidget.cpp | 6 +++--- src/gui/microsettingsdlg.cpp | 26 +++++++++++++------------- src/gui/microsettingswidget.ui | 4 ++-- src/gui/newfilewidget.ui | 10 +++++----- src/gui/newpinmappingwidget.ui | 6 +++--- src/gui/newprojectwidget.ui | 2 +- src/gui/orientationwidget.cpp | 6 +++--- src/gui/oscilloscopeview.cpp | 4 ++-- src/gui/oscilloscopeview.h | 2 +- src/gui/oscilloscopewidget.ui | 20 ++++++++++---------- src/gui/outputmethodwidget.ui | 6 +++--- src/gui/picprogrammerconfigwidget.ui | 6 +++--- src/gui/pieditor.cpp | 30 +++++++++++++++--------------- src/gui/probepositioner.cpp | 2 +- src/gui/processingoptionswidget.ui | 4 ++-- src/gui/programmerwidget.ui | 4 ++-- src/gui/projectdlgs.cpp | 6 +++--- src/gui/propertieslistview.cpp | 8 ++++---- src/gui/sdccoptionswidget.ui | 10 +++++----- src/gui/settingsdlg.cpp | 16 ++++++++-------- src/gui/symbolviewer.cpp | 2 +- 31 files changed, 126 insertions(+), 126 deletions(-) (limited to 'src/gui') diff --git a/src/gui/asmformattingwidget.ui b/src/gui/asmformattingwidget.ui index 1245538..db4ee05 100644 --- a/src/gui/asmformattingwidget.ui +++ b/src/gui/asmformattingwidget.ui @@ -185,7 +185,7 @@ Expanding - + 20 484 diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp index f7a2432..050eecb 100644 --- a/src/gui/contexthelp.cpp +++ b/src/gui/contexthelp.cpp @@ -16,10 +16,10 @@ #include -#include +#include #include #include -#include +#include #include #include @@ -42,18 +42,18 @@ ContextHelp::ContextHelp( KateMDI::ToolView * parent ) { TQWhatsThis::add( this, i18n("Provides context-sensitive help relevant to the current editing being performed.") ); - TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 ); + TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 ); m_nameLbl = new TQLabel( this, "" ); - vtqlayout->addWidget(m_nameLbl); - vtqlayout->addSpacing(8); + vlayout->addWidget(m_nameLbl); + vlayout->addSpacing(8); m_info = new TQTextBrowser( this, "" ); - vtqlayout->addWidget(m_info); - m_info->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + vlayout->addWidget(m_info); + m_info->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); TQSpacerItem *spacer3 = new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Preferred ); - vtqlayout->addItem(spacer3); + vlayout->addItem(spacer3); slotClear(); } diff --git a/src/gui/createsubprojectwidget.ui b/src/gui/createsubprojectwidget.ui index 2d18c06..5354bcd 100644 --- a/src/gui/createsubprojectwidget.ui +++ b/src/gui/createsubprojectwidget.ui @@ -81,7 +81,7 @@ Expanding - + 20 20 diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp index b994c23..4418538 100644 --- a/src/gui/doublespinbox.cpp +++ b/src/gui/doublespinbox.cpp @@ -40,7 +40,7 @@ DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double m_minAbsValue = minAbs; m_queuedSuffix = TQString(); - editor()->tqsetAlignment( TQt::AlignRight ); + editor()->setAlignment( TQt::AlignRight ); connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(checkIfChanged()) ); TQSpinBox::setMinValue( -(1<<30) ); @@ -129,7 +129,7 @@ double DoubleSpinBox::getMult() if ( text.length() == 0 ) return 1.0; - if ( text.tqendsWith( m_unit, false ) ) + if ( text.endsWith( m_unit, false ) ) text = text.remove( text.length() - m_unit.length(), m_unit.length() ); text.stripWhiteSpace(); diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui index 6c9cd19..729861b 100644 --- a/src/gui/generaloptionswidget.ui +++ b/src/gui/generaloptionswidget.ui @@ -152,7 +152,7 @@ - tqlayout8_2 + layout8_2 @@ -217,7 +217,7 @@ false - + WordBreak|AlignVCenter @@ -233,7 +233,7 @@ Expanding - + 20 40 diff --git a/src/gui/gpasmsettingswidget.ui b/src/gui/gpasmsettingswidget.ui index 2e94ebc..e8d5c32 100644 --- a/src/gui/gpasmsettingswidget.ui +++ b/src/gui/gpasmsettingswidget.ui @@ -87,7 +87,7 @@ Expanding - + 20 16 @@ -207,7 +207,7 @@ Expanding - + 40 20 @@ -224,7 +224,7 @@ Expanding - + 40 20 @@ -241,7 +241,7 @@ Expanding - + 40 20 diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp index 58b0661..4e800e5 100644 --- a/src/gui/itemeditor.cpp +++ b/src/gui/itemeditor.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include @@ -42,17 +42,17 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent ) { TQWhatsThis::add( this, i18n("This allows editing of advanced properties of the selected item(s). Right click on the picture of the item to set the orientation.") ); - TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 ); + TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 ); m_nameLbl = new TQLabel( this, "" ); - vtqlayout->addWidget(m_nameLbl); - vtqlayout->addSpacing(8); + vlayout->addWidget(m_nameLbl); + vlayout->addSpacing(8); propList = new PropertiesListView(this); - vtqlayout->addWidget(propList); + vlayout->addWidget(propList); TQWhatsThis::add(propList,i18n("Shows properties associated with the currently selected item(s).

Select a property to change its value. If multiple items are selected with different values then the property will appear greyed out, use ""Merge Properties"" to make them the same.

Select ""Defaults to set all properties to their default values""")); - TQHBoxLayout *h1Layout = new TQHBoxLayout( vtqlayout, 4 ); + TQHBoxLayout *h1Layout = new TQHBoxLayout( vlayout, 4 ); TQSpacerItem *spacer1 = new TQSpacerItem( 1, 1 ); h1Layout->addItem(spacer1); @@ -67,7 +67,7 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent ) h1Layout->addWidget(m_mergeBtn); // Qt::Orientation widget stuff - TQHBoxLayout *h2Layout = new TQHBoxLayout( vtqlayout, 6 ); + TQHBoxLayout *h2Layout = new TQHBoxLayout( vlayout, 6 ); TQSpacerItem *spacer2 = new TQSpacerItem( 1, 1 ); h2Layout->addItem(spacer2); m_orientationWidget = new OrientationWidget(this); diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index 539bc40..5b4ae41 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -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 2280eb4..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 @@ -253,7 +253,7 @@ These values will apply to all components, apart from the PIC, whose pins' imped Expanding - + 20 16 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/microselectwidget.cpp b/src/gui/microselectwidget.cpp index 59dfa33..f988a8d 100644 --- a/src/gui/microselectwidget.cpp +++ b/src/gui/microselectwidget.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -35,13 +35,13 @@ MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags m_pMicroFamilyLabel->setText( i18n("Family") ); m_pMicroFamily = new KComboBox( FALSE, this, "m_pMicroFamily" ); - m_pMicroFamily->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + m_pMicroFamily->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); m_pMicroLabel = new TQLabel( this, "m_pMicroLabel" ); m_pMicroLabel->setText( i18n("Micro") ); m_pMicro = new KComboBox( FALSE, this, "m_pMicro" ); - m_pMicro->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); + m_pMicro->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); m_pMicro->setEditable( TRUE ); m_pMicro->setAutoCompletion(true); updateFromAllowed(); diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp index d8d3a05..4a14626 100644 --- a/src/gui/microsettingsdlg.cpp +++ b/src/gui/microsettingsdlg.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -69,10 +69,10 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par TQGroupBox * groupBox = new TQGroupBox( *it, m_pWidget->portsGroupBox ); groupBox->setColumnLayout(0, Qt::Vertical ); - groupBox->tqlayout()->setSpacing( 6 ); - groupBox->tqlayout()->setMargin( 11 ); - TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); - groupBoxLayout->tqsetAlignment( TQt::AlignTop ); + groupBox->layout()->setSpacing( 6 ); + groupBox->layout()->setMargin( 11 ); + TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() ); + groupBoxLayout->setAlignment( TQt::AlignTop ); // TODO: replace this with i18n( "the type", "Type (TRIS register):" ); groupBoxLayout->addWidget( new TQLabel( i18n("Type (TRIS register):"), groupBox ), 0, 0 ); @@ -84,8 +84,8 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par m_portStateEdit[row] = new KLineEdit( portState, groupBox ); groupBoxLayout->addWidget( m_portStateEdit[row], 1, 1 ); -// (dynamic_cast(m_pWidget->portsGroupBox->tqlayout()))->insertWidget( row, groupBox ); - (dynamic_cast(m_pWidget->portsGroupBox->tqlayout()))->addWidget( groupBox ); +// (dynamic_cast(m_pWidget->portsGroupBox->layout()))->insertWidget( row, groupBox ); + (dynamic_cast(m_pWidget->portsGroupBox->layout()))->addWidget( groupBox ); } //END Initialize initial port settings @@ -370,26 +370,26 @@ void MicroSettingsDlg::savePort( int row ) TQString typeText = m_portTypeEdit[row]->text(); bool typeOk = true; - if ( typeText.tqstartsWith( "0x", false ) ) type = typeText.remove(0,2).toInt( &typeOk, 16 ); + if ( typeText.startsWith( "0x", false ) ) type = typeText.remove(0,2).toInt( &typeOk, 16 ); else if ( typeText.contains( TQRegExp("[^01]") ) ) type = typeText.toInt( &typeOk, 10 ); else type = typeText.toInt( &typeOk, 2 ); if ( !typeOk ) { -// KMessageBox::sorry( this, i18n("Unregnised Port Type: %1").tqarg(typeText) ); +// KMessageBox::sorry( this, i18n("Unregnised Port Type: %1").arg(typeText) ); return; } TQString stateText = m_portStateEdit[row]->text(); bool stateOk = true; - if ( stateText.tqstartsWith( "0x", false ) ) state = stateText.remove(0,2).toInt( &stateOk, 16 ); + if ( stateText.startsWith( "0x", false ) ) state = stateText.remove(0,2).toInt( &stateOk, 16 ); else if ( stateText.contains( TQRegExp("[^01]") ) ) state = stateText.toInt( &stateOk, 10 ); else state = stateText.toInt( &stateOk, 2 ); if ( !stateOk ) { -// KMessageBox::sorry( this, i18n("Unregnised Port State: %1").tqarg(stateText) ); +// KMessageBox::sorry( this, i18n("Unregnised Port State: %1").arg(stateText) ); return; } @@ -406,12 +406,12 @@ void MicroSettingsDlg::saveVariable( int row ) TQString valueText = m_pWidget->variables->text( row, 1 ); int value; bool ok = true; - if ( valueText.tqstartsWith( "0x", false ) ) value = valueText.remove(0,2).toInt( &ok, 16 ); + if ( valueText.startsWith( "0x", false ) ) value = valueText.remove(0,2).toInt( &ok, 16 ); else value = valueText.toInt( &ok, 10 ); 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/microsettingswidget.ui b/src/gui/microsettingswidget.ui index 3d5ff66..9030238 100644 --- a/src/gui/microsettingswidget.ui +++ b/src/gui/microsettingswidget.ui @@ -96,7 +96,7 @@ Drag it to set the type (input/output). variables - + 0 64 @@ -145,7 +145,7 @@ Drag it to set the type (input/output). Expanding - + 60 20 diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui index cf33850..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 @@ -75,7 +75,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci 0 - + 500 150 @@ -128,13 +128,13 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci 0 - + 0 0 - + 32767 32767 @@ -151,7 +151,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci Expanding - + 20 0 diff --git a/src/gui/newpinmappingwidget.ui b/src/gui/newpinmappingwidget.ui index 4972642..36a7117 100644 --- a/src/gui/newpinmappingwidget.ui +++ b/src/gui/newpinmappingwidget.ui @@ -64,7 +64,7 @@ Expanding - + 20 21 @@ -83,7 +83,7 @@ 0 - + 300 0 @@ -112,7 +112,7 @@ typeCombo - + 200 0 diff --git a/src/gui/newprojectwidget.ui b/src/gui/newprojectwidget.ui index dc36007..b7c73b8 100644 --- a/src/gui/newprojectwidget.ui +++ b/src/gui/newprojectwidget.ui @@ -48,7 +48,7 @@ Expanding - + 20 16 diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp index 19f88c3..e46e191 100644 --- a/src/gui/orientationwidget.cpp +++ b/src/gui/orientationwidget.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -30,7 +30,7 @@ const int _size = 44; OrientationWidget::OrientationWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 4, 0, 4 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 4, 0, 4 ); p_activeFlowPart = 0l; for ( int row=0; row<2; ++row ) @@ -39,7 +39,7 @@ OrientationWidget::OrientationWidget(TQWidget *parent, const char *name) { TQPushButton *btn = new TQPushButton(this); m_toolBtn[row][col] = btn; - tqlayout->addWidget( btn, row, col ); + layout->addWidget( btn, row, col ); btn->setFixedSize( _size+6, _size+6 ); // btn->setFlat(true); btn->setEnabled(false); 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 0a6acb9..79a98d0 100644 --- a/src/gui/oscilloscopewidget.ui +++ b/src/gui/oscilloscopewidget.ui @@ -27,7 +27,7 @@ - tqlayout7 + layout7 @@ -67,13 +67,13 @@ probePositioner - + 16 0 - + 16 32767 @@ -92,7 +92,7 @@ - tqlayout9 + layout9 @@ -111,7 +111,7 @@ Zoom - + AlignCenter @@ -150,7 +150,7 @@ MinimumExpanding - + 20 30 @@ -164,7 +164,7 @@ - + AlignCenter @@ -178,7 +178,7 @@ Fixed - + 20 6 @@ -216,7 +216,7 @@ Fixed - + 6 6 @@ -233,7 +233,7 @@ Fixed - + 6 6 diff --git a/src/gui/outputmethodwidget.ui b/src/gui/outputmethodwidget.ui index 0814591..3eee06d 100644 --- a/src/gui/outputmethodwidget.ui +++ b/src/gui/outputmethodwidget.ui @@ -20,7 +20,7 @@ 0 - + 450 0 @@ -115,7 +115,7 @@ m_pMicroSelect - + 0 0 @@ -132,7 +132,7 @@ Expanding - + 20 0 diff --git a/src/gui/picprogrammerconfigwidget.ui b/src/gui/picprogrammerconfigwidget.ui index 43929f9..60654f9 100644 --- a/src/gui/picprogrammerconfigwidget.ui +++ b/src/gui/picprogrammerconfigwidget.ui @@ -43,7 +43,7 @@ Expanding - + 295 20 @@ -215,7 +215,7 @@ - tqlayout5 + layout5 @@ -249,7 +249,7 @@ Expanding - + 20 16 diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp index 5adce57..f0daf3f 100644 --- a/src/gui/pieditor.cpp +++ b/src/gui/pieditor.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include //BEGIN class PIEditor PIEditor::PIEditor(TQString id, Variant *data, TQWidget *parent, const char *name) @@ -46,8 +46,8 @@ void PIEditor::valueChanged( TQVariant /*variant*/ ) PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name ) : PIEditor( id, data, parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); m_comboBox = new KComboBox(this); m_comboBox->insertItem( i18n("True"), 0 ); @@ -82,8 +82,8 @@ void PIBool::valueChanged( TQVariant /*variant*/ ) PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name ) : PIEditor(id,data,parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); m_combo = new ColorCombo( (ColorCombo::ColorScheme)m_data->colorScheme(), this ); m_combo->setColor(m_data->value().toColor()); @@ -117,8 +117,8 @@ void PIColor::valueChanged( TQVariant /*variant*/ ) PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *name ) : PIEditor(id,data,parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); spin = new DoubleSpinBox(m_data->minValue(),m_data->maxValue(),m_data->minAbsValue(),m_data->value().toDouble(),m_data->unit(),this); @@ -145,8 +145,8 @@ void PIDouble::valueChanged( TQVariant /*variant*/ ) PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char *name ) : PIEditor(id,data,parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); m_combo = 0L; if( m_data->allowed().count() == 0 ) @@ -196,8 +196,8 @@ void PIFilename::valueChanged( TQVariant /*variant*/ ) PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *name ) : PIEditor( id, data, parent, name ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); spin = new KIntSpinBox( (int)m_data->minValue(), (int)m_data->maxValue(), 1, m_data->value().toInt(), 10, this ); @@ -224,8 +224,8 @@ void PIInt::valueChanged( TQVariant /*variant*/ ) PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char *name) : PIEditor( id, data, parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); m_edit = new KLineEdit( m_data->value().toString() , this ); connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotEditTextChanged())); } @@ -251,8 +251,8 @@ void PILineEdit::valueChanged( TQVariant /*variant*/ ) PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name) : PIEditor( id, data, parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this); + layout->setAutoAdd(true); m_combo = new KComboBox( this ); m_combo->insertStringList(m_data->allowed()); 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/processingoptionswidget.ui b/src/gui/processingoptionswidget.ui index 501fd3b..658e394 100644 --- a/src/gui/processingoptionswidget.ui +++ b/src/gui/processingoptionswidget.ui @@ -26,7 +26,7 @@ m_pMicroSelect - + 0 0 @@ -43,7 +43,7 @@ Expanding - + 20 16 diff --git a/src/gui/programmerwidget.ui b/src/gui/programmerwidget.ui index b41a05a..e9e603e 100644 --- a/src/gui/programmerwidget.ui +++ b/src/gui/programmerwidget.ui @@ -50,7 +50,7 @@ m_pMicroSelect - + 0 0 @@ -83,7 +83,7 @@ Expanding - + 20 0 diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp index 0f3ed9d..4524bea 100644 --- a/src/gui/projectdlgs.cpp +++ b/src/gui/projectdlgs.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include //BEGIN class NewProjectDlg NewProjectDlg::NewProjectDlg( TQWidget * parent ) @@ -165,8 +165,8 @@ LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *pa delete m_pWidget->m_pExternalLibraries; m_pWidget->m_pExternalLibraries = new KEditListBox( i18n("Link libraries outside project"), m_pExternalLibraryRequester->customEditor(), m_pWidget ); - m_pWidget->m_pExternalLibraries->tqlayout()->setMargin(11); - (dynamic_cast(m_pWidget->tqlayout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 ); + m_pWidget->m_pExternalLibraries->layout()->setMargin(11); + (dynamic_cast(m_pWidget->layout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 ); #if defined(KDE_MAKE_VERSION) # if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp index 75d21ba..e647997 100644 --- a/src/gui/propertieslistview.cpp +++ b/src/gui/propertieslistview.cpp @@ -191,18 +191,18 @@ void PropertiesListView::slotSelectionChanged(TQListViewItem *item) connect(m_editor,TQT_SIGNAL(editorDataChanged(const TQString&,TQVariant)),this,TQT_SLOT(slotDataChanged(const TQString&,TQVariant))); int x = columnWidth(0); - int y = viewportToContents(TQPoint(0,tqitemRect(p_lastItem).y())).y(); + int y = viewportToContents(TQPoint(0,itemRect(p_lastItem).y())).y(); addChild(m_editor,x,y); m_editor->setFocus(); m_editor->show(); - m_editor->setGeometry(TQRect(x,y,columnWidth(1),tqitemRect(p_lastItem).height())); + m_editor->setGeometry(TQRect(x,y,columnWidth(1),itemRect(p_lastItem).height())); if(p_lastItem->data()->type() == Variant::Type::FileName) { // The folder button in the KURLComboBox has a minimum size taller than // the height of the ListViewItems so this is a temporary kludge to // make it look slightly acceptable. - m_editor->setGeometry(TQRect(x,y,columnWidth(1),tqitemRect(p_lastItem).height()+7)); + m_editor->setGeometry(TQRect(x,y,columnWidth(1),itemRect(p_lastItem).height()+7)); } // Active the editor as appropriate @@ -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/sdccoptionswidget.ui b/src/gui/sdccoptionswidget.ui index a8412b8..475a53b 100644 --- a/src/gui/sdccoptionswidget.ui +++ b/src/gui/sdccoptionswidget.ui @@ -111,7 +111,7 @@ Expanding - + 20 20 @@ -225,7 +225,7 @@ Expanding - + 20 20 @@ -397,7 +397,7 @@ Expanding - + 20 20 @@ -537,7 +537,7 @@ Expanding - + 20 20 @@ -570,7 +570,7 @@ Expanding - + 20 16 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; diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp index 170880b..f264cd7 100644 --- a/src/gui/symbolviewer.cpp +++ b/src/gui/symbolviewer.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include -- cgit v1.2.1