diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | d98fea1f859d23e1b1220a65d7a8eda3b757fd08 (patch) | |
tree | a7e6a450baf5017f93f73636f9e8f9b5e9a56f05 /src/devices/pic/prog | |
parent | 704123e8152edcd80447659317f1c8b31a1576e6 (diff) | |
download | piklab-d98fea1f859d23e1b1220a65d7a8eda3b757fd08.tar.gz piklab-d98fea1f859d23e1b1220a65d7a8eda3b757fd08.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/devices/pic/prog')
-rw-r--r-- | src/devices/pic/prog/pic_debug.cpp | 2 | ||||
-rw-r--r-- | src/devices/pic/prog/pic_prog.cpp | 2 | ||||
-rw-r--r-- | src/devices/pic/prog/pic_prog_specific.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/pic/prog/pic_debug.cpp b/src/devices/pic/prog/pic_debug.cpp index ebdcd75..9434a74 100644 --- a/src/devices/pic/prog/pic_debug.cpp +++ b/src/devices/pic/prog/pic_debug.cpp @@ -16,7 +16,7 @@ Register::TypeData Debugger::PicBase::registerTypeData(const TQString &name) const { const Pic::RegistersData &rdata = device()->registersData(); - Q_ASSERT(rdata.sfrs.tqcontains(name)); + Q_ASSERT(rdata.sfrs.contains(name)); return Register::TypeData(rdata.sfrs[name].address, rdata.nbChars()); } diff --git a/src/devices/pic/prog/pic_prog.cpp b/src/devices/pic/prog/pic_prog.cpp index da0b1ca..42eeafb 100644 --- a/src/devices/pic/prog/pic_prog.cpp +++ b/src/devices/pic/prog/pic_prog.cpp @@ -271,7 +271,7 @@ bool Programmer::PicBase::verifyDeviceId() TQString message; if ( ids.count()!=0 ) { log(Log::LineType::Information, i18n("Read id: %1").tqarg(device()->idNames(ids).join("; "))); - if ( ids.tqcontains(device()->name()) ) return true; + if ( ids.contains(device()->name()) ) return true; message = i18n("Read id does not match the specified device name \"%1\".").tqarg(device()->name()); } else { log(Log::LineType::Warning, i18n(" Unknown or incorrect device (Read id is %1).").tqarg(toHexLabel(rawId, nbChars))); diff --git a/src/devices/pic/prog/pic_prog_specific.cpp b/src/devices/pic/prog/pic_prog_specific.cpp index bca71b4..ed13adf 100644 --- a/src/devices/pic/prog/pic_prog_specific.cpp +++ b/src/devices/pic/prog/pic_prog_specific.cpp @@ -109,7 +109,7 @@ bool Programmer::PicHardware::compareWords(Pic::MemoryRangeType type, uint index bool Programmer::PicHardware::verifyWord(uint i, BitValue word, Pic::MemoryRangeType type, const VerifyData &vdata) { - if ( !(vdata.actions & ::Programmer::IgnoreProtectedVerify) && vdata.protectedRanges.tqcontains(i) ) return true; // protected + if ( !(vdata.actions & ::Programmer::IgnoreProtectedVerify) && vdata.protectedRanges.contains(i) ) return true; // protected BitValue v = static_cast<const Pic::Memory &>(vdata.memory).normalizedWord(type, i); BitValue d = static_cast<const Pic::Memory &>(vdata.memory).normalizeWord(type, i, word); if ( type==Pic::MemoryRangeType::Config ) { |