From abb8cd68f820cfe0c96965136890a6bdd1093db5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:13:30 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/gui/asmformattingwidget.ui | 2 +- src/gui/contexthelp.cpp | 2 +- src/gui/createsubprojectwidget.ui | 2 +- src/gui/doublespinbox.cpp | 4 ++-- src/gui/generaloptionswidget.ui | 2 +- src/gui/gpasmsettingswidget.ui | 8 ++++---- src/gui/logicwidget.ui | 2 +- src/gui/microselectwidget.cpp | 4 ++-- src/gui/microsettingsdlg.cpp | 8 ++++---- src/gui/microsettingswidget.ui | 4 ++-- src/gui/newfilewidget.ui | 8 ++++---- src/gui/newpinmappingwidget.ui | 6 +++--- src/gui/newprojectwidget.ui | 2 +- src/gui/oscilloscopewidget.ui | 12 ++++++------ src/gui/outputmethodwidget.ui | 6 +++--- src/gui/picprogrammerconfigwidget.ui | 4 ++-- src/gui/processingoptionswidget.ui | 4 ++-- src/gui/programmerwidget.ui | 4 ++-- src/gui/propertieslistview.cpp | 6 +++--- src/gui/sdccoptionswidget.ui | 10 +++++----- 20 files changed, 50 insertions(+), 50 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..41b975e 100644 --- a/src/gui/contexthelp.cpp +++ b/src/gui/contexthelp.cpp @@ -50,7 +50,7 @@ ContextHelp::ContextHelp( KateMDI::ToolView * parent ) m_info = new TQTextBrowser( this, "" ); vtqlayout->addWidget(m_info); - m_info->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + m_info->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); TQSpacerItem *spacer3 = new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Preferred ); vtqlayout->addItem(spacer3); 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..201a567 100644 --- a/src/gui/generaloptionswidget.ui +++ b/src/gui/generaloptionswidget.ui @@ -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/logicwidget.ui b/src/gui/logicwidget.ui index 2280eb4..99ef045 100644 --- a/src/gui/logicwidget.ui +++ b/src/gui/logicwidget.ui @@ -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/microselectwidget.cpp b/src/gui/microselectwidget.cpp index 59dfa33..d6c1ced 100644 --- a/src/gui/microselectwidget.cpp +++ b/src/gui/microselectwidget.cpp @@ -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..55ef185 100644 --- a/src/gui/microsettingsdlg.cpp +++ b/src/gui/microsettingsdlg.cpp @@ -72,7 +72,7 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par groupBox->tqlayout()->setSpacing( 6 ); groupBox->tqlayout()->setMargin( 11 ); TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); - groupBoxLayout->tqsetAlignment( TQt::AlignTop ); + 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 ); @@ -370,7 +370,7 @@ 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 ); @@ -383,7 +383,7 @@ void MicroSettingsDlg::savePort( int row ) 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 ); @@ -406,7 +406,7 @@ 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) 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..94df077 100644 --- a/src/gui/newfilewidget.ui +++ b/src/gui/newfilewidget.ui @@ -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/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui index 0a6acb9..199b070 100644 --- a/src/gui/oscilloscopewidget.ui +++ b/src/gui/oscilloscopewidget.ui @@ -67,13 +67,13 @@ probePositioner - + 16 0 - + 16 32767 @@ -150,7 +150,7 @@ MinimumExpanding - + 20 30 @@ -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..70f18f3 100644 --- a/src/gui/picprogrammerconfigwidget.ui +++ b/src/gui/picprogrammerconfigwidget.ui @@ -43,7 +43,7 @@ Expanding - + 295 20 @@ -249,7 +249,7 @@ Expanding - + 20 16 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/propertieslistview.cpp b/src/gui/propertieslistview.cpp index 75d21ba..a620621 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 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 -- cgit v1.2.1