summaryrefslogtreecommitdiffstats
path: root/src/progs/icd2/base/icd2_prog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/icd2/base/icd2_prog.cpp')
-rw-r--r--src/progs/icd2/base/icd2_prog.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/progs/icd2/base/icd2_prog.cpp b/src/progs/icd2/base/icd2_prog.cpp
index 7b2a59b..dbea1d3 100644
--- a/src/progs/icd2/base/icd2_prog.cpp
+++ b/src/progs/icd2/base/icd2_prog.cpp
@@ -47,13 +47,13 @@ bool Icd2::ProgrammerBase::selfTest(bool ask)
log(Log::DebugLevel::Normal, " Self-test");
if ( !hardware()->selfTest(_testData) ) return false;
if ( !_testData.pass() ) {
- QString s;
+ TQString s;
for (uint i=0; i<TestData::Nb_VoltageTypes; i++) {
if ( i!=0 ) s += "; ";
s += _testData.pretty(TestData::VoltageType(i));
}
- log(Log::LineType::Warning, i18n("Self-test failed: %1").arg(s));
- if ( ask && !askContinue(i18n("Self-test failed (%1). Do you want to continue anyway?").arg(s)) ) {
+ log(Log::LineType::Warning, i18n("Self-test failed: %1").tqarg(s));
+ if ( ask && !askContinue(i18n("Self-test failed (%1). Do you want to continue anyway?").tqarg(s)) ) {
logUserAbort();
return false;
}
@@ -77,27 +77,27 @@ VersionData Icd2::ProgrammerBase::mplabVersion(::Programmer::FirmwareVersionType
bool Icd2::ProgrammerBase::setupFirmware()
{
const FamilyData &fdata = FAMILY_DATA[family(device()->name())];
- log(Log::DebugLevel::Normal, QString(" Firmware id is %1 and we want %2").arg(_firmwareId).arg(fdata.efid));
+ log(Log::DebugLevel::Normal, TQString(" Firmware id is %1 and we want %2").tqarg(_firmwareId).tqarg(fdata.efid));
if ( fdata.efid==_firmwareId ) return true;
log(Log::LineType::Information, i18n(" Incorrect firmware loaded."));
// find firmware file
PURL::Directory dir = firmwareDirectory();
if ( dir.isEmpty() ) return false;
- QString nameFilter = "ICD" + QString::number(fdata.efid).rightJustify(2, '0') + "??????.hex";
- QStringList files = dir.files(nameFilter);
+ TQString nameFilter = "ICD" + TQString::number(fdata.efid).rightJustify(2, '0') + "??????.hex";
+ TQStringList files = dir.files(nameFilter);
if ( files.isEmpty() ) {
- log(Log::LineType::Error, i18n("Could not find firmware file \"%1\" in directory \"%2\".").arg(nameFilter).arg(dir.path()));
+ log(Log::LineType::Error, i18n("Could not find firmware file \"%1\" in directory \"%2\".").tqarg(nameFilter).tqarg(dir.path()));
return false;
}
// upload hex file
PURL::Url url(dir, files[files.count()-1]);
- log(Log::DebugLevel::Normal, QString(" Firmware file: %1").arg(url.pretty()));
+ log(Log::DebugLevel::Normal, TQString(" Firmware file: %1").tqarg(url.pretty()));
Log::StringView sview;
PURL::File file(url, sview);
if ( !file.openForRead() ) {
- log(Log::LineType::Error, i18n("Could not open firmware file \"%1\".").arg(url.pretty()));
+ log(Log::LineType::Error, i18n("Could not open firmware file \"%1\".").tqarg(url.pretty()));
return false;
}
if ( !doUploadFirmware(file) ) return false;