Remove additional unneeded tq method conversions

13 files changed, 40 insertions, 40 deletions

diff --git a/src/electronics/component.cpp b/src/electronics/component.cpp
index c05993d..4c8b797 100644
--- a/src/electronics/component.cpp
+++ b/src/electronics/component.cpp
@@ -482,7 +482,7 @@ void Component::initDIPSymbol( const TQStringList & pins, int _width )
 }
 
 
-// 	TQString createNode( double _x, double _y, int tqshape, int orientation, const TQString &name, int type, bool isInput = true );
+// 	TQString createNode( double _x, double _y, int shape, int orientation, const TQString &name, int type, bool isInput = true );
 
 void Component::init1PinLeft( int h1 )
 {
diff --git a/src/electronics/component.h b/src/electronics/component.h
index 8a30315..a2b215f 100644
--- a/src/electronics/component.h
+++ b/src/electronics/component.h
@@ -244,7 +244,7 @@ class Component : public CNItem
 	
 	protected:
 		/**
-		 * Convenience functionality provided for components in a port tqshape
+		 * Convenience functionality provided for components in a port shape
 		 * (such as ParallelPortComponent and SerialPortComponent).
 		 */
 		void drawPortShape( TQPainter & p );
@@ -263,7 +263,7 @@ class Component : public CNItem
 		void initDIP( const TQStringList & pins );
 		/**
 		 * Creates the DIP symbol:
-		 * @li constructs rectangular tqshape
+		 * @li constructs rectangular shape
 		 * @li puts on text labels in appropriate positions from TQStringList pins
 		 */
 		void initDIPSymbol( const TQStringList & pins, int width );
diff --git a/src/electronics/components/bussplitter.cpp b/src/electronics/components/bussplitter.cpp
index 85619a4..6eb58e8 100644
--- a/src/electronics/components/bussplitter.cpp
+++ b/src/electronics/components/bussplitter.cpp
@@ -107,7 +107,7 @@ void BusSplitter::dataChanged()
 
 TQString BusSplitter::outNodeID( unsigned node ) const
 {
-	return TQString("out_%1").tqarg(TQString::number(node));
+	return TQString("out_%1").arg(TQString::number(node));
 }
 
 
diff --git a/src/electronics/components/eckeypad.cpp b/src/electronics/components/eckeypad.cpp
index c92a562..4a0ec7b 100644
--- a/src/electronics/components/eckeypad.cpp
+++ b/src/electronics/components/eckeypad.cpp
@@ -66,7 +66,7 @@ ECKeyPad::ECKeyPad( ICNDocument *icnDocument, bool newItem, const char *id )
 	v->setValue(5e-3);
 	
 	for ( int i = 0; i < 4; i++ )
-		createPin( 0, -32+i*24, 0, TQString("row_%1").tqarg(TQString::number(i)) );
+		createPin( 0, -32+i*24, 0, TQString("row_%1").arg(TQString::number(i)) );
 	
 	m_numCols = 0;
 }
@@ -79,7 +79,7 @@ ECKeyPad::~ECKeyPad()
 
 TQString ECKeyPad::buttonID( int row, int col ) const
 {
-	return TQString("b_%1_%2").tqarg(TQString::number(row)).tqarg(TQString::number(col));
+	return TQString("b_%1_%2").arg(TQString::number(row)).arg(TQString::number(col));
 }
 
 
diff --git a/src/electronics/components/magnitudecomparator.cpp b/src/electronics/components/magnitudecomparator.cpp
index 3e1f8f9..bae9b12 100644
--- a/src/electronics/components/magnitudecomparator.cpp
+++ b/src/electronics/components/magnitudecomparator.cpp
@@ -119,9 +119,9 @@ void MagnitudeComparator::initPins()
 	for ( int i = 0; i < space; i++ )
 		leftPins << "";
 	for ( int i = 0; i < newABLogicCount; i++ )
-		leftPins << TQString("A%1").tqarg( TQString::number(i) );
+		leftPins << TQString("A%1").arg( TQString::number(i) );
 	for ( int i = 0; i < newABLogicCount; i++ )
-		leftPins << TQString("B%1").tqarg( TQString::number(i) );
+		leftPins << TQString("B%1").arg( TQString::number(i) );
 	for ( int i = 0; i < space; i++ )
 		leftPins << "";
 	
diff --git a/src/electronics/components/matrixdisplay.cpp b/src/electronics/components/matrixdisplay.cpp
index c2a271d..4ba3dc6 100644
--- a/src/electronics/components/matrixdisplay.cpp
+++ b/src/electronics/components/matrixdisplay.cpp
@@ -223,11 +223,11 @@ void MatrixDisplay::initPins( unsigned numRows, unsigned numCols )
 
 TQString MatrixDisplay::colPinID( int col ) const
 {
-	return TQString("col_%1").tqarg(TQString::number(col));
+	return TQString("col_%1").arg(TQString::number(col));
 }
 TQString MatrixDisplay::rowPinID( int row ) const
 {
-	return TQString("row_%1").tqarg(TQString::number(row));
+	return TQString("row_%1").arg(TQString::number(row));
 }
 
 
diff --git a/src/electronics/components/parallelportcomponent.cpp b/src/electronics/components/parallelportcomponent.cpp
index 22f1584..6126c1e 100644
--- a/src/electronics/components/parallelportcomponent.cpp
+++ b/src/electronics/components/parallelportcomponent.cpp
@@ -87,7 +87,7 @@ ParallelPortComponent::ParallelPortComponent( ICNDocument *icnDocument, bool new
 	//BEGIN Data register
 	for ( int i = 0; i < 8; ++i )
 	{
-		TQString id = TQString("D%1").tqarg(i);
+		TQString id = TQString("D%1").arg(i);
 		TQString name = id;
 		
 		pin = createPin( -40, -80 + 16*i, 0, id );
@@ -167,7 +167,7 @@ ParallelPortComponent::ParallelPortComponent( ICNDocument *icnDocument, bool new
 	// And make the rest of the pins ground
 	for ( int i = 0; i < 8; ++i )
 	{
-		pin = createPin( 40, -24 + i*16, 180, TQString("GND%1").tqarg( i ) );
+		pin = createPin( 40, -24 + i*16, 180, TQString("GND%1").arg( i ) );
 		pin->pin()->setGroundType( Pin::gt_always );
 	}
 #endif
@@ -200,7 +200,7 @@ void ParallelPortComponent::initPort( const TQString & port )
 	
 	if ( ! m_pParallelPort->openPort( port ) )
 	{
-		p_itemDocument->canvas()->setMessage( i18n("Could not open port %1").tqarg( port ) );
+		p_itemDocument->canvas()->setMessage( i18n("Could not open port %1").arg( port ) );
 		return;
 	}
 }
diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp
index b1d39bc..00a32c3 100644
--- a/src/electronics/components/piccomponent.cpp
+++ b/src/electronics/components/piccomponent.cpp
@@ -159,14 +159,14 @@ void PICComponent::initPIC( bool forceReload )
 		case GpsimProcessor::DoesntExist:
 			if ( newProgram == _def_PICComponent_fileName && !newProgram.isEmpty() )
 				break;
-			KMessageBox::sorry( 0l, i18n("The file \"%1\" does not exist.").tqarg( newProgram ) );
+			KMessageBox::sorry( 0l, i18n("The file \"%1\" does not exist.").arg( newProgram ) );
 			m_picFile = TQString();
 			break;
 			
 		case GpsimProcessor::IncorrectType:
 			if ( newProgram == _def_PICComponent_fileName && !newProgram.isEmpty() )
 				break;
-			KMessageBox::sorry( 0L, i18n("\"%1\" is not a valid PIC program.\nThe file must exist, and the extension should be \".cod\", \".asm\", \".flowcode\", \".basic\", \".microbe\" or \".c\".\n\".hex\" is allowed, provided that there is a corresponding \".cod\" file.").tqarg(newProgram) );
+			KMessageBox::sorry( 0L, i18n("\"%1\" is not a valid PIC program.\nThe file must exist, and the extension should be \".cod\", \".asm\", \".flowcode\", \".basic\", \".microbe\" or \".c\".\n\".hex\" is allowed, provided that there is a corresponding \".cod\" file.").arg(newProgram) );
 			m_picFile = TQString();
 			break;
 			
diff --git a/src/electronics/components/ram.cpp b/src/electronics/components/ram.cpp
index a8b259e..d0ac2b1 100644
--- a/src/electronics/components/ram.cpp
+++ b/src/electronics/components/ram.cpp
@@ -128,13 +128,13 @@ void RAM::initPins()
 	TQStringList leftPins; // Pins on left of IC
 	leftPins << "CS" << "OE" << "WE";
 	for ( int i = 0; i < newAddressSize; ++i )
-		leftPins << TQString("A%1").tqarg( TQString::number(i) );
+		leftPins << TQString("A%1").arg( TQString::number(i) );
 	
 	TQStringList rightPins; // Pins on right of IC
 	for ( unsigned i = newWordSize; i > 0; --i )
-		rightPins << TQString("DI%1").tqarg( TQString::number(i-1) );
+		rightPins << TQString("DI%1").arg( TQString::number(i-1) );
 	for ( unsigned i = newWordSize; i > 0; --i )
-		rightPins << TQString("DO%1").tqarg( TQString::number(i-1) );
+		rightPins << TQString("DO%1").arg( TQString::number(i-1) );
 	
 	// Make pin lists of consistent sizes
 	for ( unsigned i = leftPins.size(); i < rightPins.size(); ++i )
@@ -177,11 +177,11 @@ void RAM::initPins()
 		
 		for ( int i = oldWordSize; i < newWordSize; ++i )
 		{
-			node = ecNodeWithID( TQString("DI%1").tqarg( TQString::number(i) ) );
+			node = ecNodeWithID( TQString("DI%1").arg( TQString::number(i) ) );
 			m_dataIn.insert( i, createLogicIn(node) );
 			m_dataIn[i]->setCallback( this, (CallbackPtr)(&RAM::inStateChanged) ); 
 			
-			node = ecNodeWithID( TQString("DO%1").tqarg( TQString::number(i) ) );
+			node = ecNodeWithID( TQString("DO%1").arg( TQString::number(i) ) );
 			m_dataOut.insert( i, createLogicOut(node, false) );
 		}
 	}
@@ -189,12 +189,12 @@ void RAM::initPins()
 	{
 		for ( int i = newWordSize; i < oldWordSize; ++i )
 		{
-			TQString id = TQString("DO%1").tqarg( TQString::number(i) );
+			TQString id = TQString("DO%1").arg( TQString::number(i) );
 			removeDisplayText(id);
 			removeElement( m_dataIn[i], false );
 			removeNode(id);
 			
-			id = TQString("DI%1").tqarg( TQString::number(i) );
+			id = TQString("DI%1").arg( TQString::number(i) );
 			removeDisplayText(id);
 			removeElement( m_dataOut[i], false );
 			removeNode(id);
@@ -210,7 +210,7 @@ void RAM::initPins()
 		
 		for ( int i = oldAddressSize; i < newAddressSize; ++i )
 		{
-			node = ecNodeWithID( TQString("A%1").tqarg( TQString::number(i) ) );
+			node = ecNodeWithID( TQString("A%1").arg( TQString::number(i) ) );
 			m_address.insert( i, createLogicIn(node) );
 			m_address[i]->setCallback( this, (CallbackPtr)(&RAM::inStateChanged) );
 		}
@@ -219,7 +219,7 @@ void RAM::initPins()
 	{
 		for ( int i = newAddressSize; i < oldAddressSize; ++i )
 		{
-			TQString id = TQString("A%1").tqarg( TQString::number(i) );
+			TQString id = TQString("A%1").arg( TQString::number(i) );
 			removeDisplayText(id);
 			removeElement( m_address[i], false );
 			removeNode(id);
diff --git a/src/electronics/components/rotoswitch.cpp b/src/electronics/components/rotoswitch.cpp
index ac7f1a0..738942b 100644
--- a/src/electronics/components/rotoswitch.cpp
+++ b/src/electronics/components/rotoswitch.cpp
@@ -245,7 +245,7 @@ void ECRotoSwitch::setUpSwitches()
     for(int i=0; i<m_numPositions; i++)
     {
         SwitchPosition& sp = m_positions[i];
-        TQString pinName = TQString("pin_%1").tqarg(i);
+        TQString pinName = TQString("pin_%1").arg(i);
         removeNode(pinName);
         removeSwitch(sp.posSwitch);
     }
@@ -284,7 +284,7 @@ void ECRotoSwitch::setUpSwitches()
         // kdDebug() << contactX <<", "<< contactY <<endl;
         
         
-        sp.node = createPin(contactX,-contactY,sp.pinAngle,TQString("pin_%1").tqarg(i));
+        sp.node = createPin(contactX,-contactY,sp.pinAngle,TQString("pin_%1").arg(i));
         sp.posSwitch = createSwitch(m_inNode, sp.node, true);
         sp.isMomentary = false;//(map[i] == 'M');
         m_positions.push_back(sp);
diff --git a/src/electronics/components/serialportcomponent.cpp b/src/electronics/components/serialportcomponent.cpp
index 6e6bfed..4e3a221 100644
--- a/src/electronics/components/serialportcomponent.cpp
+++ b/src/electronics/components/serialportcomponent.cpp
@@ -197,7 +197,7 @@ void SerialPortComponent::initPort( const TQString & port, unsigned baudRate )
 	
 	if ( ! m_pSerialPort->openPort( port, baudRate ) )
 	{
-		p_itemDocument->canvas()->setMessage( i18n("Could not open port %1").tqarg( port ) );
+		p_itemDocument->canvas()->setMessage( i18n("Could not open port %1").arg( port ) );
 		return;
 	}
 }
diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp
index 8e2ccfa..76fc20b 100644
--- a/src/electronics/gpsimprocessor.cpp
+++ b/src/electronics/gpsimprocessor.cpp
@@ -161,26 +161,26 @@ void GpsimProcessor::displayCodLoadStatus( )
 		case CodSuccess:
 			break;
 		case CodFileNotFound:
-			KMessageBox::sorry( 0l, i18n("The cod file \"%1\" was not found.").tqarg(m_symbolFile), i18n("File Not Found") );
+			KMessageBox::sorry( 0l, i18n("The cod file \"%1\" was not found.").arg(m_symbolFile), i18n("File Not Found") );
 			break;
 		case CodUnrecognizedProcessor:
-			KMessageBox::sorry( 0l, i18n("The processor for cod file \"%1\" is unrecognized.").tqarg(m_symbolFile), i18n("Unrecognized Processor") );
+			KMessageBox::sorry( 0l, i18n("The processor for cod file \"%1\" is unrecognized.").arg(m_symbolFile), i18n("Unrecognized Processor") );
 			break;
 		case CodFileNameTooLong:
-			KMessageBox::sorry( 0l, i18n("The file name \"%1\" is too long.").tqarg(m_symbolFile), i18n("Filename Too Long") );
+			KMessageBox::sorry( 0l, i18n("The file name \"%1\" is too long.").arg(m_symbolFile), i18n("Filename Too Long") );
 			break;
 		case CodLstNotFound:
-			KMessageBox::sorry( 0l, i18n("The lst file associated with the cod file \"%1\" was not found.").tqarg(m_symbolFile), i18n("LST File Not Found") );
+			KMessageBox::sorry( 0l, i18n("The lst file associated with the cod file \"%1\" was not found.").arg(m_symbolFile), i18n("LST File Not Found") );
 			break;
 		case CodBadFile:
-			KMessageBox::sorry( 0l, i18n("The cod file \"%1\" is bad.").tqarg(m_symbolFile), i18n("Bad File") );
+			KMessageBox::sorry( 0l, i18n("The cod file \"%1\" is bad.").arg(m_symbolFile), i18n("Bad File") );
 			break;
 		case CodFileUnreadable:
-			KMessageBox::sorry( 0l, i18n("The cod file \"%1\" could not be read from.").tqarg(m_symbolFile), i18n("Unreadable File") );
+			KMessageBox::sorry( 0l, i18n("The cod file \"%1\" could not be read from.").arg(m_symbolFile), i18n("Unreadable File") );
 			break;
 		case CodFailure:
 		case CodUnknown:
-			KMessageBox::sorry( 0l, i18n("An error occured with the cod file \"%1\".").tqarg(m_symbolFile), i18n("Error") );
+			KMessageBox::sorry( 0l, i18n("An error occured with the cod file \"%1\".").arg(m_symbolFile), i18n("Error") );
 			break;
 	}
 }
diff --git a/src/electronics/port.cpp b/src/electronics/port.cpp
index 124fe1d..8a92402 100644
--- a/src/electronics/port.cpp
+++ b/src/electronics/port.cpp
@@ -207,28 +207,28 @@ TQStringList SerialPort::ports( unsigned probeResult )
 	
 	for ( int i = 0; i < 8; ++i )
 	{
-		TQString dev = TQString("/dev/ttyS%1").tqarg(i);
+		TQString dev = TQString("/dev/ttyS%1").arg(i);
 		if ( probe(dev) & probeResult )
 			list << dev;
 	}
 	
 	for ( unsigned i = 0; i < 8; ++i )
 	{
-		TQString dev = TQString("/dev/tts/%1").tqarg(i);
+		TQString dev = TQString("/dev/tts/%1").arg(i);
 		if ( probe(dev) & probeResult )
 			list << dev;
 	}
 	
 	for ( unsigned i = 0; i < 8; ++i )
 	{
-		TQString dev = TQString("/dev/ttyUSB%1").tqarg(i);
+		TQString dev = TQString("/dev/ttyUSB%1").arg(i);
 		if ( probe(dev) & probeResult )
 			list << dev;
 	}
 	
 	for ( unsigned i = 0; i < 8; ++i )
 	{
-		TQString dev = TQString("/dev/usb/tts/%1").tqarg(i);
+		TQString dev = TQString("/dev/usb/tts/%1").arg(i);
 		if ( probe(dev) & probeResult )
 			list << dev;
 	}
@@ -453,14 +453,14 @@ TQStringList ParallelPort::ports( unsigned probeResult )
 	
 	for ( unsigned i = 0; i < 8; ++i )
 	{
-		TQString dev = TQString("/dev/parport%1").tqarg(i);
+		TQString dev = TQString("/dev/parport%1").arg(i);
 		if ( probe(dev) & probeResult )
 			list << dev;
 	}
 	
 	for ( unsigned i = 0; i < 8; ++i )
 	{
-		TQString dev = TQString("/dev/parports/%1").tqarg(i);
+		TQString dev = TQString("/dev/parports/%1").arg(i);
 		if ( probe(dev) & probeResult )
 			list << dev;
 	}