summaryrefslogtreecommitdiffstats
path: root/src/progs/tbl_bootloader/base/tbl_bootloader.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commitf7ceb2957839027e8027a9a4c0dfff730cb9b704 (patch)
treed1d583f11612d149bc0718c80779df4653699dbb /src/progs/tbl_bootloader/base/tbl_bootloader.cpp
parentd98fea1f859d23e1b1220a65d7a8eda3b757fd08 (diff)
downloadpiklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.tar.gz
piklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/progs/tbl_bootloader/base/tbl_bootloader.cpp')
-rw-r--r--src/progs/tbl_bootloader/base/tbl_bootloader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/progs/tbl_bootloader/base/tbl_bootloader.cpp b/src/progs/tbl_bootloader/base/tbl_bootloader.cpp
index 9c52fb7..3b8c324 100644
--- a/src/progs/tbl_bootloader/base/tbl_bootloader.cpp
+++ b/src/progs/tbl_bootloader/base/tbl_bootloader.cpp
@@ -158,7 +158,7 @@ bool TinyBootloader::Hardware::writeCode(const Device::Array &data, bool erase)
// check that there is nothing on top of bootloader
for (uint i=nb; i<data.size(); i++) {
- if ( data[i]==device().tqmask(Pic::MemoryRangeType::Code) ) continue;
+ if ( data[i]==device().mask(Pic::MemoryRangeType::Code) ) continue;
uint address = device().addressIncrement(Pic::MemoryRangeType::Code) * i;
log(Log::LineType::Warning, " " + i18n("Code is present in bootloader reserved area (at address %1). It will be ignored.").tqarg(toHexLabel(address, device().nbCharsAddress())));
break;
@@ -194,7 +194,7 @@ bool TinyBootloader::Hardware::writeCode(const Device::Array &data, bool erase)
if ( !erase ) {
bool write = false;
for (uint k=0; k<nbWords; k++) {
- if ( wdata[i+k]==device().tqmask(Pic::MemoryRangeType::Code) ) continue;
+ if ( wdata[i+k]==device().mask(Pic::MemoryRangeType::Code) ) continue;
write = true;
break;
}