From 1fc61c6e1d0a2b34f7b1d0de181bb4e6f954a8c2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:39:40 -0600 Subject: Remove additional unneeded tq method conversions --- src/electronics/components/bussplitter.cpp | 2 +- src/electronics/components/eckeypad.cpp | 4 ++-- src/electronics/components/magnitudecomparator.cpp | 4 ++-- src/electronics/components/matrixdisplay.cpp | 4 ++-- src/electronics/components/parallelportcomponent.cpp | 6 +++--- src/electronics/components/piccomponent.cpp | 4 ++-- src/electronics/components/ram.cpp | 18 +++++++++--------- src/electronics/components/rotoswitch.cpp | 4 ++-- src/electronics/components/serialportcomponent.cpp | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/electronics/components') 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; iopenPort( 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; } } -- cgit v1.2.3