From f7ceb2957839027e8027a9a4c0dfff730cb9b704 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: 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 --- src/devices/pic/prog/pic_prog_specific.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/devices/pic/prog/pic_prog_specific.cpp') diff --git a/src/devices/pic/prog/pic_prog_specific.cpp b/src/devices/pic/prog/pic_prog_specific.cpp index ed13adf..c8d958b 100644 --- a/src/devices/pic/prog/pic_prog_specific.cpp +++ b/src/devices/pic/prog/pic_prog_specific.cpp @@ -28,7 +28,7 @@ uint Programmer::PicDeviceSpecific::findNonMaskStart(Pic::MemoryRangeType type, { uint start = 0; for (; start(this)->log(Log::DebugLevel::Normal, TQString("start before align: %1").tqarg(start)); uint align = device().nbWordsWriteAlignment(type); start -= start % align; @@ -40,7 +40,7 @@ uint Programmer::PicDeviceSpecific::findNonMaskEnd(Pic::MemoryRangeType type, co { uint end = data.count()-1; for (; end>0; end--) - if ( data[end]!=device().tqmask(type) ) break; + if ( data[end]!=device().mask(type) ) break; const_cast(this)->log(Log::DebugLevel::Normal, TQString("end before align: %1").tqarg(end)); uint align = device().nbWordsWriteAlignment(type); if ( (end+1) % align ) end += align - (end+1) % align; @@ -113,9 +113,9 @@ bool Programmer::PicHardware::verifyWord(uint i, BitValue word, Pic::MemoryRange BitValue v = static_cast(vdata.memory).normalizedWord(type, i); BitValue d = static_cast(vdata.memory).normalizeWord(type, i, word); if ( type==Pic::MemoryRangeType::Config ) { - BitValue ptqmask = device().config()._words[i].ptqmask; - v = v.clearMaskBits(ptqmask); - d = d.clearMaskBits(ptqmask); + BitValue pmask = device().config()._words[i].pmask; + v = v.clearMaskBits(pmask); + d = d.clearMaskBits(pmask); } return compareWords(type, i, v, d, vdata.actions); } -- cgit v1.2.1