From bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:32:48 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/languages/flowcode.cpp | 4 ++-- src/languages/picprogrammer.cpp | 26 +++++++++++++------------- src/languages/processchain.cpp | 2 +- src/languages/sdcc.cpp | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/languages') diff --git a/src/languages/flowcode.cpp b/src/languages/flowcode.cpp index 5356eab..fe575f9 100644 --- a/src/languages/flowcode.cpp +++ b/src/languages/flowcode.cpp @@ -173,7 +173,7 @@ TQString FlowCode::generateMicrobe( const ItemList &itemList, MicroSettings *set continue; if ( !startPart->outputPart( nodeMapIt.key() ) ) - outputWarning( i18n("Warning: Floating connection for %1").tqarg( startPart->id() ) ); + outputWarning( i18n("Warning: Floating connection for %1").arg( startPart->id() ) ); } FlowContainer * fc = dynamic_cast((Item*)*it); @@ -259,7 +259,7 @@ TQString FlowCode::generateMicrobe( const ItemList &itemList, MicroSettings *set if ( type.isEmpty() ) continue; - addCode( TQString("%1 %2 %3").tqarg( type ).tqarg( it.key() ).tqarg( it.data().pins().join(" ") ) ); + addCode( TQString("%1 %2 %3").arg( type ).arg( it.key() ).arg( it.data().pins().join(" ") ) ); } } diff --git a/src/languages/picprogrammer.cpp b/src/languages/picprogrammer.cpp index 5ef37dd..3200e99 100644 --- a/src/languages/picprogrammer.cpp +++ b/src/languages/picprogrammer.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -63,7 +63,7 @@ void PicProgrammerSettings::initStaticConfigs() m_bDoneStaticConfigsInit = true; ProgrammerConfig config; - config.description = i18n("Supported programmers: %1").tqarg("JuPic, PICStart Plus, Warp-13"); + config.description = i18n("Supported programmers: %1").arg("JuPic, PICStart Plus, Warp-13"); config.description += i18n("
Interface: Serial Port"); config.initCommand = ""; config.readCommand = "picp %port %device -rp %file"; @@ -75,7 +75,7 @@ void PicProgrammerSettings::initStaticConfigs() m_staticConfigs[ "PICP" ] = config; - config.description = i18n("Supported programmers: %1").tqarg("Epic Plus"); + config.description = i18n("Supported programmers: %1").arg("Epic Plus"); config.description += i18n("
Interface: Parallel Port"); config.initCommand = "odyssey init"; config.readCommand = "odyssey %device read %file"; @@ -87,7 +87,7 @@ void PicProgrammerSettings::initStaticConfigs() m_staticConfigs[ "Odyssey" ] = config; - config.description = i18n("Supported programmers: %1").tqarg("JDM PIC-Programmer 2, PIC-PG2C"); + config.description = i18n("Supported programmers: %1").arg("JDM PIC-Programmer 2, PIC-PG2C"); config.description += i18n("
Interface: Serial Port"); config.initCommand = ""; config.readCommand = "picprog --output %file --pic %port"; @@ -98,7 +98,7 @@ void PicProgrammerSettings::initStaticConfigs() m_staticConfigs[ "PICProg" ] = config; - config.description = i18n("Supported programmers: %1").tqarg("Epic Plus"); + config.description = i18n("Supported programmers: %1").arg("Epic Plus"); config.description += i18n("
Interface: Parallel Port"); config.initCommand = ""; config.readCommand = "dump84 --dump-all --output=%file"; @@ -109,7 +109,7 @@ void PicProgrammerSettings::initStaticConfigs() m_staticConfigs[ "prog84" ] = config; - config.description = i18n("Supported programmers: %1").tqarg("Kit 149, Kit 150"); + config.description = i18n("Supported programmers: %1").arg("Kit 149, Kit 150"); config.description += i18n("
Interface: USB Port"); config.initCommand = ""; config.readCommand = "pp -d %device -r %file"; @@ -120,7 +120,7 @@ void PicProgrammerSettings::initStaticConfigs() m_staticConfigs[ "PP" ] = config; - config.description = i18n("Supported programmers: %1").tqarg("Wisp628"); + config.description = i18n("Supported programmers: %1").arg("Wisp628"); config.description += i18n("
Interface: Serial Port"); config.initCommand = ""; config.readCommand = "xwisp ID %device PORT %device DUMP"; @@ -132,7 +132,7 @@ void PicProgrammerSettings::initStaticConfigs() #if 0 - config.description = i18n("Supported programmers: %1").tqarg("Epic Plus, JDM PIC-Programmer 2, PICCOLO, PICCOLO Grande, Trivial HVP Programmer"); + config.description = i18n("Supported programmers: %1").arg("Epic Plus, JDM PIC-Programmer 2, PICCOLO, PICCOLO Grande, Trivial HVP Programmer"); config.description += i18n("
Interface: Serial Port and Parallel Port"); config.initCommand = ""; config.readCommand = ""; @@ -145,7 +145,7 @@ void PicProgrammerSettings::initStaticConfigs() config.executable = ""; - config.description = i18n("Supported programmers: %1").tqarg("Trivial LVP programmer, Trivial HVP Programmer"); + config.description = i18n("Supported programmers: %1").arg("Trivial LVP programmer, Trivial HVP Programmer"); config.description += i18n("
Interface: Parallel Port"); config.initCommand = ""; config.readCommand = ""; @@ -156,7 +156,7 @@ void PicProgrammerSettings::initStaticConfigs() m_staticConfigs[ "PicPrg2" ] = config; - config.description = i18n("Supported programmers: %1").tqarg("El Cheapo"); + config.description = i18n("Supported programmers: %1").arg("El Cheapo"); config.description += i18n("
Interface: Parallel Port"); config.initCommand = ""; config.readCommand = ""; @@ -167,7 +167,7 @@ void PicProgrammerSettings::initStaticConfigs() m_staticConfigs[ "PP06" ] = config; - config.description = i18n("Supported programmers: %1").tqarg("NOPPP"); + config.description = i18n("Supported programmers: %1").arg("NOPPP"); config.description += i18n("
Interface: Parallel Port"); config.initCommand = ""; config.readCommand = ""; @@ -178,7 +178,7 @@ void PicProgrammerSettings::initStaticConfigs() m_staticConfigs[ "NOPPP" ] = config; - config.description = i18n("Supported programmers: %1").tqarg("SNOPPP"); + config.description = i18n("Supported programmers: %1").arg("SNOPPP"); config.description += i18n("
Interface: Parallel Port"); config.initCommand = ""; config.readCommand = ""; @@ -232,7 +232,7 @@ void PicProgrammerSettings::save( KConfig * config ) ProgrammerConfigMap::iterator end = m_customConfigs.end(); for ( ProgrammerConfigMap::iterator it = m_customConfigs.begin(); it != end; ++it ) { - config->setGroup( TQString("CustomProgrammer_%1").tqarg(at++) ); + config->setGroup( TQString("CustomProgrammer_%1").arg(at++) ); config->writeEntry( "Name", it.key() ); config->writeEntry( "InitCommand", it.data().initCommand ); diff --git a/src/languages/processchain.cpp b/src/languages/processchain.cpp index 6f5c95a..00edbb8 100644 --- a/src/languages/processchain.cpp +++ b/src/languages/processchain.cpp @@ -56,7 +56,7 @@ ProcessChain::ProcessChain( ProcessOptions options, KTechlab * ktechlab, const c else target = options.targetFile(); - LanguageManager::self()->logView()->addOutput( i18n("Building: %1").tqarg( target ), LogView::ot_important ); + LanguageManager::self()->logView()->addOutput( i18n("Building: %1").arg( target ), LogView::ot_important ); TQTimer::singleShot( 0, this, TQT_SLOT(compile()) ); } diff --git a/src/languages/sdcc.cpp b/src/languages/sdcc.cpp index ea1845d..96cf54c 100644 --- a/src/languages/sdcc.cpp +++ b/src/languages/sdcc.cpp @@ -40,7 +40,7 @@ void SDCC::processInput( ProcessOptions options ) MicroInfo * info = MicroLibrary::self()->microInfoWithID( options.m_picID ); if (!info) { - outputError( i18n("Could not find PIC with ID \"%1\".").tqarg(options.m_picID) ); + outputError( i18n("Could not find PIC with ID \"%1\".").arg(options.m_picID) ); return; } @@ -50,7 +50,7 @@ void SDCC::processInput( ProcessOptions options ) //BEGIN Pass custom sdcc options -#define ARG(text,option) if ( KTLConfig::text() ) *m_languageProcess << ( TQString("--%1").tqarg(option) ); +#define ARG(text,option) if ( KTLConfig::text() ) *m_languageProcess << ( TQString("--%1").arg(option) ); // General ARG( sDCC_nostdlib, "nostdlib" ) ARG( sDCC_nostdinc, "nostdinc" ) -- cgit v1.2.1