Rename a number of old tq methods that are no longer tq specific

1 files changed, 13 insertions, 13 deletions

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 <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <tqtable.h>
 #include <tqwhatsthis.h>
@@ -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<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->insertWidget( row, groupBox );
-		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->addWidget( groupBox );
+// 		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->insertWidget( row, groupBox );
+		(dynamic_cast<TQVBoxLayout*>(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;
 	}