diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 704123e8152edcd80447659317f1c8b31a1576e6 (patch) | |
tree | 55b04c5bf6dd4a3bc998a26d354c4711bbc043d4 /src/piklab-test/checksum | |
parent | 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 (diff) | |
download | piklab-704123e8152edcd80447659317f1c8b31a1576e6.tar.gz piklab-704123e8152edcd80447659317f1c8b31a1576e6.zip |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/piklab-test/checksum')
-rw-r--r-- | src/piklab-test/checksum/checksum_check.cpp | 22 | ||||
-rw-r--r-- | src/piklab-test/checksum/checksum_check.h | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/piklab-test/checksum/checksum_check.cpp b/src/piklab-test/checksum/checksum_check.cpp index 86877c0..1a472ae 100644 --- a/src/piklab-test/checksum/checksum_check.cpp +++ b/src/piklab-test/checksum/checksum_check.cpp @@ -29,10 +29,10 @@ void ChecksumCheck::cleanup(const Device::Data &) } void ChecksumCheck::setProtection(const Pic::Data &data, const Pic::Checksum::Data &cdata, - const TQString &tqmaskName, const TQString &valueName) + const TQString &maskName, const TQString &valueName) { const Pic::Protection &protection = data.config().protection(); - if ( !tqmaskName.isEmpty() && !valueName.isEmpty() ) _memory->setConfigValue(tqmaskName, valueName); + if ( !maskName.isEmpty() && !valueName.isEmpty() ) _memory->setConfigValue(maskName, valueName); if ( !valueName.isEmpty() ) _memory->setUserIdToUnprotectedChecksum(); for (uint i=0; i<cdata.protectedMaskNames.count(); i++) { TQString pmName = cdata.protectedMaskNames[i]; @@ -54,21 +54,21 @@ bool ChecksumCheck::checkChecksum(BitValue checksum, const TQString &label) return true; } -void ChecksumCheck::checkChecksum(const Pic::Data &pdata, const TQString &tqmaskName, const TQString &valueName, bool &ok) +void ChecksumCheck::checkChecksum(const Pic::Data &pdata, const TQString &maskName, const TQString &valueName, bool &ok) { if ( !pdata.checksums().tqcontains(valueName) ) { - const Pic::Config::Mask *tqmask = pdata.config().findMask(tqmaskName); + const Pic::Config::Mask *tqmask = pdata.config().findMask(maskName); TQString label = valueName + (tqmask ? "/" + tqmask->name : TQString()); printf("Missing checksum for \"%s\"", label.latin1()); return; } const Pic::Checksum::Data &cdata = pdata.checksums()[valueName]; _memory->clear(); - setProtection(pdata, cdata, tqmaskName, valueName); - if ( !checkChecksum(cdata.blankChecksum, tqmaskName + ":" + valueName + "/" + "blank") ) ok = false; + setProtection(pdata, cdata, maskName, valueName); + if ( !checkChecksum(cdata.blankChecksum, maskName + ":" + valueName + "/" + "blank") ) ok = false; _memory->checksumCheckFill(); - setProtection(pdata, cdata, tqmaskName, valueName); - if ( !checkChecksum(cdata.checkChecksum, tqmaskName + ":" + valueName + "/" + "check") ) ok = false; + setProtection(pdata, cdata, maskName, valueName); + if ( !checkChecksum(cdata.checkChecksum, maskName + ":" + valueName + "/" + "check") ) ok = false; } bool ChecksumCheck::execute(const Device::Data &data) @@ -83,13 +83,13 @@ bool ChecksumCheck::execute(const Device::Data &data) checkChecksum(pdata, TQString(), TQString(), ok); break; case Pic::Protection::BasicProtection: { - TQString tqmaskName = protection.tqmaskName(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Code); - const Pic::Config::Mask *tqmask = pdata.config().findMask(tqmaskName); + TQString maskName = protection.maskName(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Code); + const Pic::Config::Mask *tqmask = pdata.config().findMask(maskName); Q_ASSERT(tqmask); for (uint i=0; i<tqmask->values.count(); i++) { TQString valueName = tqmask->values[i].name; if ( valueName.isEmpty() ) continue; // invalid value - checkChecksum(pdata, tqmaskName, valueName, ok); + checkChecksum(pdata, maskName, valueName, ok); } break; } diff --git a/src/piklab-test/checksum/checksum_check.h b/src/piklab-test/checksum/checksum_check.h index e56fd2b..7dc8c97 100644 --- a/src/piklab-test/checksum/checksum_check.h +++ b/src/piklab-test/checksum/checksum_check.h @@ -27,9 +27,9 @@ private: Pic::Memory *_memory; void setProtection(const Pic::Data &data, const Pic::Checksum::Data &cdata, - const TQString &tqmaskName, const TQString &valueName); + const TQString &maskName, const TQString &valueName); bool checkChecksum(BitValue checksum, const TQString &label); - void checkChecksum(const Pic::Data &data, const TQString &tqmaskName, const TQString &valueName, bool &ok); + void checkChecksum(const Pic::Data &data, const TQString &maskName, const TQString &valueName, bool &ok); }; #endif |