Rename old tq methods that no longer need a unique name

4 files changed, 10 insertions, 10 deletions

diff --git a/src/electronics/components/ecpotentiometer.cpp b/src/electronics/components/ecpotentiometer.cpp
index 8f55ff5..e989c7c 100644
--- a/src/electronics/components/ecpotentiometer.cpp
+++ b/src/electronics/components/ecpotentiometer.cpp
@@ -98,7 +98,7 @@ void ECPotentiometer::drawShape( TQPainter &p )
 	pa[1] = TQPoint( 4, -3 );
 	pa[2] = TQPoint( 4, 3 );
 	
-	int space = m_pSlider->tqstyle().tqpixelMetric( TQStyle::PM_SliderSpaceAvailable, m_pSlider );
+	int space = m_pSlider->tqstyle().pixelMetric( TQStyle::PM_SliderSpaceAvailable, m_pSlider );
 	int base_y = _y + (( angleDegrees() == 0 || angleDegrees() == 270 ) ? 1 : -1) * int( space * m_sliderProp );
 	
 	pa.translate( _x+16, base_y );
diff --git a/src/electronics/components/parallelportcomponent.cpp b/src/electronics/components/parallelportcomponent.cpp
index 7a2ac55..22f1584 100644
--- a/src/electronics/components/parallelportcomponent.cpp
+++ b/src/electronics/components/parallelportcomponent.cpp
@@ -99,20 +99,20 @@ ParallelPortComponent::ParallelPortComponent( ICNDocument *icnDocument, bool new
 	//END Data register
 	
 	
-	//BEGIN tqStatus register
+	//BEGIN Status register
 	TQString statusNames[] = { "ERR", "ON", "PE", "ACK", "BUSY" };
 	
 	// The statusIDs are referenced in the save file and must not change
 	TQString statusIDs[] = { "ERROR", "ONLINE", "PE", "ACK", "BUSY" };
 	
-	// Bits 0...2 in the tqStatus register are not used
+	// Bits 0...2 in the Status register are not used
 	for ( int i = 3; i < 8; ++i )
 	{
 		TQString id = statusIDs[i-3];
 		TQString name = statusNames[i-3];
 		
 		// Bit 3 (pin 15) doesn't not follow the same positioning pattern as
-		// the other pins in the tqStatus register.
+		// the other pins in the Status register.
 		if ( i == 3 )
 		{
 			pin = createPin( 40, -72, 180, id );
@@ -126,7 +126,7 @@ ParallelPortComponent::ParallelPortComponent( ICNDocument *icnDocument, bool new
 		
 		m_pLogic[i+8] = createLogicOut( pin, false );
 	}
-	//END tqStatus register
+	//END Status register
 	
 	
 	//BEGIN Control register
@@ -228,8 +228,8 @@ void ParallelPortComponent::controlCallback( bool )
 
 void ParallelPortComponent::stepNonLogic()
 {
-	uchar status = m_pParallelPort->readFromRegister( ParallelPort::tqStatus );
-	// Bits 0...2 in the tqStatus register are not used
+	uchar status = m_pParallelPort->readFromRegister( ParallelPort::Status );
+	// Bits 0...2 in the Status register are not used
 	for ( int i = 3; i < 8; ++i )
 		m_pLogic[i + 8]->setHigh( status | (1 << i) );
 }
diff --git a/src/electronics/components/parallelportcomponent.h b/src/electronics/components/parallelportcomponent.h
index eebc12b..bffd85d 100644
--- a/src/electronics/components/parallelportcomponent.h
+++ b/src/electronics/components/parallelportcomponent.h
@@ -40,7 +40,7 @@ class ParallelPortComponent : public CallbackClass, public Component
 		void dataCallback( bool );
 		void controlCallback( bool );
 		
-		/// Registers: { Data[0...7], tqStatus[0...5], 0[6...7], Control[0...4], 0[5...7] }
+		/// Registers: { Data[0...7], Status[0...5], 0[6...7], Control[0...4], 0[5...7] }
 		LogicOut * m_pLogic[24];
 		
 		ParallelPort * m_pParallelPort;
diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp
index 3741182..b1d39bc 100644
--- a/src/electronics/components/piccomponent.cpp
+++ b/src/electronics/components/piccomponent.cpp
@@ -375,7 +375,7 @@ void PICComponent::slotCODCreationSucceeded()
 	delete m_pGpsim;
 	m_pGpsim = new GpsimProcessor(m_symbolFile);
 	
-	if ( m_pGpsim->codLoadtqStatus() == GpsimProcessor::CodSuccess )
+	if ( m_pGpsim->codLoadStatus() == GpsimProcessor::CodSuccess )
 	{
 		MicroInfo * microInfo = m_pGpsim->microInfo();
 		property("lastPackage")->setValue( microInfo->id() );
@@ -387,7 +387,7 @@ void PICComponent::slotCODCreationSucceeded()
 	
 	else
 	{
-		m_pGpsim->displayCodLoadtqStatus();
+		m_pGpsim->displayCodLoadStatus();
 		delete m_pGpsim;
 		m_pGpsim = 0l;
 	}