rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 17 insertions, 17 deletions

diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp
index 704aacf..8ad853c 100644
--- a/src/electronics/gpsimprocessor.cpp
+++ b/src/electronics/gpsimprocessor.cpp
@@ -71,8 +71,8 @@ TQString sanitizeGpsimFile( TQString file )
 }
 
 
-GpsimProcessor::GpsimProcessor( TQString symbolFile, TQObject *tqparent )
-	: TQObject(tqparent),
+GpsimProcessor::GpsimProcessor( TQString symbolFile, TQObject *parent )
+	: TQObject(parent),
 	m_symbolFile(symbolFile)
 {
 	if (!bDoneGpsimInit)
diff --git a/src/electronics/gpsimprocessor.h b/src/electronics/gpsimprocessor.h
index 0259889..9939be4 100644
--- a/src/electronics/gpsimprocessor.h
+++ b/src/electronics/gpsimprocessor.h
@@ -255,7 +255,7 @@ class GpsimProcessor : public TQObject
 		 * should always call codLoadtqStatus() to ensure that the cod file was
 		 * loaded successfully.
 		 */
-		GpsimProcessor( TQString symbolFile, TQObject *tqparent = 0 );
+		GpsimProcessor( TQString symbolFile, TQObject *parent = 0 );
 		~GpsimProcessor();
 		
 		void setDebugMode( GpsimDebugger::Type mode ) { m_debugMode = mode; }
diff --git a/src/electronics/pin.cpp b/src/electronics/pin.cpp
index f3cdc0c..56848fc 100644
--- a/src/electronics/pin.cpp
+++ b/src/electronics/pin.cpp
@@ -13,10 +13,10 @@
 #include <assert.h>
 #include <kdebug.h>
 
-Pin::Pin( ECNode * tqparent )
+Pin::Pin( ECNode * parent )
 {
-	assert(tqparent);
-	m_pECNode = tqparent;
+	assert(parent);
+	m_pECNode = parent;
 	m_voltage = 0.;
 	m_current = 0.;
 	m_eqId = -2;
diff --git a/src/electronics/pin.h b/src/electronics/pin.h
index 77a9e80..502d986 100644
--- a/src/electronics/pin.h
+++ b/src/electronics/pin.h
@@ -53,7 +53,7 @@ class Pin : public TQObject
 			gt_low = 15, // current sources
 			gt_never = 20 // everything else
 		};
-		Pin( ECNode * tqparent );
+		Pin( ECNode * parent );
 		~Pin();
 		
 		ECNode * parentECNode() const { return m_pECNode; }
diff --git a/src/electronics/port.cpp b/src/electronics/port.cpp
index cb7f4fb..ec74bfc 100644
--- a/src/electronics/port.cpp
+++ b/src/electronics/port.cpp
@@ -99,24 +99,24 @@ bool SerialPort::pinState( Pin pin )
 	if ( m_file == -1 )
 		return false;
 	
-	int tqmask = 0;
+	int mask = 0;
 	
 	switch ( pin )
 	{
 		case CD:
-			tqmask = TIOCM_CD;
+			mask = TIOCM_CD;
 			break;
 			
 		case RD:
-			tqmask = TIOCM_SR;
+			mask = TIOCM_SR;
 			break;
 			
 		case CTS:
-			tqmask = TIOCM_CTS;
+			mask = TIOCM_CTS;
 			break;
 			
 		case RI:
-			tqmask = TIOCM_RI;
+			mask = TIOCM_RI;
 			break;
 			
 		case TD:
@@ -127,7 +127,7 @@ bool SerialPort::pinState( Pin pin )
 			break;
 	}
 	
-	if ( tqmask == 0 )
+	if ( mask == 0 )
 	{
 		kdError() << k_funcinfo << "Bad pin " << pin << endl;
 		return false;
@@ -140,7 +140,7 @@ bool SerialPort::pinState( Pin pin )
 		return false;
 	}
 	
-	return bits & tqmask;
+	return bits & mask;
 }
 
 		
diff --git a/src/electronics/switch.cpp b/src/electronics/switch.cpp
index f91095a..581b5b1 100644
--- a/src/electronics/switch.cpp
+++ b/src/electronics/switch.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h> // for rand
 #include <time.h>
 
-Switch::Switch( Component * tqparent, Pin * p1, Pin * p2, State state )
+Switch::Switch( Component * parent, Pin * p1, Pin * p2, State state )
 {
 	m_bouncePeriod_ms = 5;
 	m_bBounce = false;
@@ -31,7 +31,7 @@ Switch::Switch( Component * tqparent, Pin * p1, Pin * p2, State state )
 	m_pBounceResistance = 0l;
 	m_pP1 = p1;
 	m_pP2 = p2;
-	m_pComponent = tqparent;
+	m_pComponent = parent;
 	m_pStopBouncingTimer = new TQTimer( this );
 	connect( m_pStopBouncingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(stopBouncing()) );
 	
diff --git a/src/electronics/switch.h b/src/electronics/switch.h
index 17fd493..cd1cf4c 100644
--- a/src/electronics/switch.h
+++ b/src/electronics/switch.h
@@ -35,7 +35,7 @@ class Switch : public TQObject
 			Closed,
 		};
 		
-		Switch( Component * tqparent, Pin * p1, Pin * p2, State state );
+		Switch( Component * parent, Pin * p1, Pin * p2, State state );
 		~Switch();
 		/**
 		 * If bouncing has been set to true, then the state will not switch