Remove additional unneeded tq method conversions

(cherry picked from commit 1fc61c6e1d0a2b34f7b1d0de181bb4e6f954a8c2)

17 files changed, 27 insertions, 27 deletions

diff --git a/src/flowparts/callsub.cpp b/src/flowparts/callsub.cpp
index 09687e2..2b2d30b 100644
--- a/src/flowparts/callsub.cpp
+++ b/src/flowparts/callsub.cpp
@@ -51,7 +51,7 @@ CallSub::~CallSub()
 
 void CallSub::dataChanged()
 {
-	setCaption( i18n("Call %1").tqarg(dataString("sub")) );
+	setCaption( i18n("Call %1").arg(dataString("sub")) );
 }
 
 void CallSub::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/count.cpp b/src/flowparts/count.cpp
index 2357fb8..e4bbdc3 100644
--- a/src/flowparts/count.cpp
+++ b/src/flowparts/count.cpp
@@ -58,7 +58,7 @@ Count::~Count()
 void Count::dataChanged()
 {
 	double count = dataDouble("1-length");
-	setCaption( i18n("Count %1 for %2 sec").tqarg(dataString("0-trigger")).tqarg(TQString::number( count / getMultiplier(count), 'g', 3 ) + getNumberMag(count)) );
+	setCaption( i18n("Count %1 for %2 sec").arg(dataString("0-trigger")).arg(TQString::number( count / getMultiplier(count), 'g', 3 ) + getNumberMag(count)) );
 }
 
 void Count::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/delay.cpp b/src/flowparts/delay.cpp
index f31a0e9..ae85595 100644
--- a/src/flowparts/delay.cpp
+++ b/src/flowparts/delay.cpp
@@ -53,7 +53,7 @@ Delay::~Delay()
 void Delay::dataChanged()
 {
 	double delay = dataDouble("delay_length");
-	setCaption( i18n("Delay for %1 sec").tqarg(TQString::number( delay / getMultiplier(delay), 'g', 3 )+getNumberMag(delay)) );
+	setCaption( i18n("Delay for %1 sec").arg(TQString::number( delay / getMultiplier(delay), 'g', 3 )+getNumberMag(delay)) );
 }
 
 void Delay::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/embed.cpp b/src/flowparts/embed.cpp
index f6bb3b2..7e5f3a3 100644
--- a/src/flowparts/embed.cpp
+++ b/src/flowparts/embed.cpp
@@ -59,7 +59,7 @@ Embed::~Embed()
 void Embed::dataChanged()
 {
 	const TQString sample = dataString("code").left(10).replace("\n"," ");
-	setCaption( i18n("%1: %2...").tqarg(dataString("type")).tqarg(sample) );
+	setCaption( i18n("%1: %2...").arg(dataString("type")).arg(sample) );
 }
 
 
diff --git a/src/flowparts/flowpart.cpp b/src/flowparts/flowpart.cpp
index 1ec4a6e..d19ce45 100644
--- a/src/flowparts/flowpart.cpp
+++ b/src/flowparts/flowpart.cpp
@@ -186,7 +186,7 @@ void FlowPart::initSymbol( FlowPart::FlowSymbol symbol, int width )
 		
 		case FlowPart::ps_io:
 		{
-			// define parallelogram tqshape
+			// define parallelogram shape
 			TQPointArray pa(4);
 			pa[0] = TQPoint( -(width-10)/2, -16 );
 			pa[1] = TQPoint( width/2, -16 );
@@ -292,7 +292,7 @@ void FlowPart::drawShape( TQPainter &p )
 		
 		case FlowPart::ps_decision:
 		{
-			// TODO Make the tqshape nice and pretty with rounded corners
+			// TODO Make the shape nice and pretty with rounded corners
 			CNItem::drawShape(p);
 			break;
 		}
diff --git a/src/flowparts/flowpart.h b/src/flowparts/flowpart.h
index afa20c8..9cd2553 100644
--- a/src/flowparts/flowpart.h
+++ b/src/flowparts/flowpart.h
@@ -42,8 +42,8 @@ public:
 		ps_call, // Call - Rectangular box with double vertical lines at either end
 		ps_io, // I/O - Slanter rectangular box
 		ps_round, // Start/End - Rounded rectangular box
-		ps_decision, // Decision - Diamond tqshape
-		ps_other // Custom tqshape, which is ignored by FlowPart
+		ps_decision, // Decision - Diamond shape
+		ps_other // Custom shape, which is ignored by FlowPart
 	};
 	FlowPart( ICNDocument *icnDocument, bool newItem, const TQString &id );
 	virtual ~FlowPart();
@@ -167,7 +167,7 @@ protected:
 	 */
 	void createAltOutput();
 	/**
-	 * Initialises a symbol, by calling setItemPoints with the tqshape
+	 * Initialises a symbol, by calling setItemPoints with the shape
 	 */
 	void initSymbol( FlowPart::FlowSymbol symbol, int width = 48 );
 	
diff --git a/src/flowparts/inputbutton.cpp b/src/flowparts/inputbutton.cpp
index a140a2a..d7c2a98 100644
--- a/src/flowparts/inputbutton.cpp
+++ b/src/flowparts/inputbutton.cpp
@@ -59,7 +59,7 @@ InputButton::~InputButton()
 
 void InputButton::dataChanged()
 {
-	setCaption( i18n("Continue on %1 %2").tqarg(dataString("0-trigger")).tqarg(dataString("1-pin")) );
+	setCaption( i18n("Continue on %1 %2").arg(dataString("0-trigger")).arg(dataString("1-pin")) );
 }
 
 
diff --git a/src/flowparts/interrupt.cpp b/src/flowparts/interrupt.cpp
index 14a783f..9325c33 100644
--- a/src/flowparts/interrupt.cpp
+++ b/src/flowparts/interrupt.cpp
@@ -55,7 +55,7 @@ Interrupt::~Interrupt()
 
 void Interrupt::dataChanged()
 {
-	setCaption( i18n("Interrupt %1").tqarg(dataString("interrupt")) );
+	setCaption( i18n("Interrupt %1").arg(dataString("interrupt")) );
 }
 
 void Interrupt::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/keypad.cpp b/src/flowparts/keypad.cpp
index 8e49e29..47e6f30 100644
--- a/src/flowparts/keypad.cpp
+++ b/src/flowparts/keypad.cpp
@@ -55,12 +55,12 @@ Keypad::~Keypad()
 
 void Keypad::dataChanged()
 {
-	setCaption( i18n("Read %1 to %2").tqarg( dataString( "keypad" ) ).tqarg( dataString( "variable" ) ) );
+	setCaption( i18n("Read %1 to %2").arg( dataString( "keypad" ) ).arg( dataString( "variable" ) ) );
 }
 
 void Keypad::generateMicrobe( FlowCode *code )
 {
-	code->addCode( TQString("%1 = %2").tqarg( dataString("variable") ).tqarg( dataString("keypad") ) );
+	code->addCode( TQString("%1 = %2").arg( dataString("variable") ).arg( dataString("keypad") ) );
 	code->addCodeBranch( outputPart("stdoutput") );
 }
 
diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp
index 289cbc4..5b9675d 100644
--- a/src/flowparts/pinmapping.cpp
+++ b/src/flowparts/pinmapping.cpp
@@ -186,10 +186,10 @@ void PinMapDocument::init( const PinMapping & pinMapping, MicroInfo * microInfo
 	{
 		TQStringList::const_iterator it = pins.begin();
 		for ( unsigned row = 0; (row < 4) && (it != end); ++row, ++it )
-			createConnector( m_pKeypad->childNode( TQString("row_%1").tqarg( row ) ), m_pPicComponent->childNode( *it ) );
+			createConnector( m_pKeypad->childNode( TQString("row_%1").arg( row ) ), m_pPicComponent->childNode( *it ) );
 		
 		for ( unsigned col = 0; (col < keypadCols) && (it != end); ++col, ++it )
-			createConnector( m_pKeypad->childNode( TQString("col_%1").tqarg( col ) ), m_pPicComponent->childNode( *it ) );
+			createConnector( m_pKeypad->childNode( TQString("col_%1").arg( col ) ), m_pPicComponent->childNode( *it ) );
 	}
 	
 	clearHistory(); // Don't allow undoing of initial creation of stuff
@@ -255,17 +255,17 @@ PinMapping PinMapDocument::pinMapping() const
 			
 		case PinMapping::Keypad_4x3:
 			for ( unsigned i = 0; i < 4; ++i )
-				attachedIDs << TQString("row_%1").tqarg(i);
+				attachedIDs << TQString("row_%1").arg(i);
 			for ( unsigned i = 0; i < 3; ++i )
-				attachedIDs << TQString("col_%1").tqarg(i);
+				attachedIDs << TQString("col_%1").arg(i);
 			attached = m_pKeypad;
 			break;
 			
 		case PinMapping::Keypad_4x4:
 			for ( unsigned i = 0; i < 4; ++i )
-				attachedIDs << TQString("row_%1").tqarg(i);
+				attachedIDs << TQString("row_%1").arg(i);
 			for ( unsigned i = 0; i < 4; ++i )
-				attachedIDs << TQString("col_%1").tqarg(i);
+				attachedIDs << TQString("col_%1").arg(i);
 			attached = m_pKeypad;
 			break;
 			
diff --git a/src/flowparts/pulse.cpp b/src/flowparts/pulse.cpp
index 86e2239..77f9dd0 100644
--- a/src/flowparts/pulse.cpp
+++ b/src/flowparts/pulse.cpp
@@ -68,7 +68,7 @@ Pulse::~Pulse()
 void Pulse::dataChanged()
 {
 	double pulse = dataDouble("0-duration");
-	setCaption( i18n("Pulse %1 for %2 sec").tqarg(dataString("3-pin")).tqarg(TQString::number( pulse / getMultiplier(pulse), 'f', 1 ) + getNumberMag(pulse)) );
+	setCaption( i18n("Pulse %1 for %2 sec").arg(dataString("3-pin")).arg(TQString::number( pulse / getMultiplier(pulse), 'f', 1 ) + getNumberMag(pulse)) );
 }
 
 void Pulse::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/readport.cpp b/src/flowparts/readport.cpp
index 45623be..4385c58 100644
--- a/src/flowparts/readport.cpp
+++ b/src/flowparts/readport.cpp
@@ -58,7 +58,7 @@ ReadPort::~ReadPort()
 
 void ReadPort::dataChanged()
 {
-	setCaption( i18n("Read %1 to %2").tqarg(dataString("0-port")).tqarg(dataString("1-var")) );
+	setCaption( i18n("Read %1 to %2").arg(dataString("0-port")).arg(dataString("1-var")) );
 }
 
 void ReadPort::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/repeat.cpp b/src/flowparts/repeat.cpp
index 53529ac..3dda0ae 100644
--- a/src/flowparts/repeat.cpp
+++ b/src/flowparts/repeat.cpp
@@ -62,7 +62,7 @@ Repeat::~Repeat()
 
 void Repeat::dataChanged()
 {
-	setCaption( i18n("repeat until %1 %2 %3").tqarg(dataString("0var1")).tqarg(dataString("1op")).tqarg(dataString("2var2")) );
+	setCaption( i18n("repeat until %1 %2 %3").arg(dataString("0var1")).arg(dataString("1op")).arg(dataString("2var2")) );
 }
 
 void Repeat::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/setpin.cpp b/src/flowparts/setpin.cpp
index 81c29ca..be826da 100644
--- a/src/flowparts/setpin.cpp
+++ b/src/flowparts/setpin.cpp
@@ -59,7 +59,7 @@ SetPin::~SetPin()
 
 void SetPin::dataChanged()
 {
-	setCaption( i18n("Set %1 %2").tqarg(dataString("pin")).tqarg(dataString("state")) );
+	setCaption( i18n("Set %1 %2").arg(dataString("pin")).arg(dataString("state")) );
 }
 
 void SetPin::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/sevenseg.cpp b/src/flowparts/sevenseg.cpp
index 1f85e19..90a4e7e 100644
--- a/src/flowparts/sevenseg.cpp
+++ b/src/flowparts/sevenseg.cpp
@@ -59,13 +59,13 @@ SevenSeg::~SevenSeg()
 
 void SevenSeg::dataChanged()
 {
-	setCaption( i18n("Display %1 on %2").tqarg( dataString("expression") ).tqarg( dataString("sevenseg") ) );
+	setCaption( i18n("Display %1 on %2").arg( dataString("expression") ).arg( dataString("sevenseg") ) );
 }
 
 
 void SevenSeg::generateMicrobe( FlowCode *code )
 {
-	code->addCode( TQString("%1 = %2").tqarg( dataString("sevenseg") ).tqarg( dataString("expression") ) );
+	code->addCode( TQString("%1 = %2").arg( dataString("sevenseg") ).arg( dataString("expression") ) );
 	code->addCodeBranch( outputPart("stdoutput") );
 }
 
diff --git a/src/flowparts/while.cpp b/src/flowparts/while.cpp
index ddcf981..be2189d 100644
--- a/src/flowparts/while.cpp
+++ b/src/flowparts/while.cpp
@@ -62,7 +62,7 @@ While::~While()
 
 void While::dataChanged()
 {
-	setCaption( i18n("while %1 %2 %3").tqarg(dataString("0var1")).tqarg(dataString("1op")).tqarg(dataString("2var2")) );
+	setCaption( i18n("while %1 %2 %3").arg(dataString("0var1")).arg(dataString("1op")).arg(dataString("2var2")) );
 }
 
 void While::generateMicrobe( FlowCode *code )
diff --git a/src/flowparts/writeport.cpp b/src/flowparts/writeport.cpp
index 312ea01..9816f69 100644
--- a/src/flowparts/writeport.cpp
+++ b/src/flowparts/writeport.cpp
@@ -59,7 +59,7 @@ WritePort::~WritePort()
 
 void WritePort::dataChanged()
 {
-	setCaption(  i18n("Write %1 to %2").tqarg(dataString("0-var")).tqarg(dataString("1-port")) );
+	setCaption(  i18n("Write %1 to %2").arg(dataString("0-var")).arg(dataString("1-port")) );
 }