summaryrefslogtreecommitdiffstats
path: root/src/devices/pic/base/pic.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commit704123e8152edcd80447659317f1c8b31a1576e6 (patch)
tree55b04c5bf6dd4a3bc998a26d354c4711bbc043d4 /src/devices/pic/base/pic.cpp
parent0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 (diff)
downloadpiklab-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/devices/pic/base/pic.cpp')
-rw-r--r--src/devices/pic/base/pic.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/pic/base/pic.cpp b/src/devices/pic/base/pic.cpp
index b58f480..fd8622b 100644
--- a/src/devices/pic/base/pic.cpp
+++ b/src/devices/pic/base/pic.cpp
@@ -175,23 +175,23 @@ bool Pic::Data::matchId(BitValue rawId, Device::IdData &idata) const
case Architecture::P18F:
case Architecture::P18J:
nid = rawId.clearMaskBits(0x1F);
- idata.revision = rawId.tqmaskWith(0x1F);
+ idata.revision = rawId.maskWith(0x1F);
break;
case Architecture::P24F:
- nid = (rawId >> 16).tqmaskWith(0x3FFF);
- idata.revision = (rawId >> 6).tqmaskWith(0x7);
- idata.minorRevision = rawId.tqmaskWith(0x7);
+ nid = (rawId >> 16).maskWith(0x3FFF);
+ idata.revision = (rawId >> 6).maskWith(0x7);
+ idata.minorRevision = rawId.maskWith(0x7);
break;
case Architecture::P30F:
- nid = (rawId >> 16).tqmaskWith(0xFFFF);
- idata.revision = (rawId >> 6).tqmaskWith(0x3F);
- idata.minorRevision = rawId.tqmaskWith(0x3F);
- idata.process = (rawId >> 12).tqmaskWith(0xF);
+ nid = (rawId >> 16).maskWith(0xFFFF);
+ idata.revision = (rawId >> 6).maskWith(0x3F);
+ idata.minorRevision = rawId.maskWith(0x3F);
+ idata.process = (rawId >> 12).maskWith(0xF);
break;
case Architecture::P24H:
case Architecture::P33F:
- nid = (rawId >> 16).tqmaskWith(0xFFFF);
- idata.revision = rawId.tqmaskWith(0xFFFF); // ??
+ nid = (rawId >> 16).maskWith(0xFFFF);
+ idata.revision = rawId.maskWith(0xFFFF); // ??
break;
case Architecture::Nb_Types: Q_ASSERT(false); break;
}
@@ -241,7 +241,7 @@ bool Pic::Data::checkCalibration(const Device::Array &data, TQString *message) c
}
}
if ( data.count()==1 ) {
- if ( data[0].tqmaskWith(_calibration.opcodeMask)!=_calibration.opcode ) {
+ if ( data[0].maskWith(_calibration.opcodeMask)!=_calibration.opcode ) {
if (message) *message = i18n("Calibration word is not a compatible opcode (%2).")
.tqarg(toHexLabel(_calibration.opcode, nbCharsWord(MemoryRangeType::Code)));
return false;
@@ -326,16 +326,16 @@ Device::Array Pic::Data::gotoInstruction(Address address, bool withPageSelection
bool Pic::Data::isGotoInstruction(BitValue instruction) const
{
switch (_architecture.type()) {
- case Architecture::P10X: return ( instruction.tqmaskWith(0xE00)==0xA00 );
- case Architecture::P16X: return ( instruction.tqmaskWith(0xF800)==0x2800 );
- case Architecture::P17C: return ( instruction.tqmaskWith(0xE000)==0xC000 );
+ case Architecture::P10X: return ( instruction.maskWith(0xE00)==0xA00 );
+ case Architecture::P16X: return ( instruction.maskWith(0xF800)==0x2800 );
+ case Architecture::P17C: return ( instruction.maskWith(0xE000)==0xC000 );
case Architecture::P18C:
case Architecture::P18F:
- case Architecture::P18J: return ( instruction.tqmaskWith(0xFF00)==0xEF00 );
+ case Architecture::P18J: return ( instruction.maskWith(0xFF00)==0xEF00 );
case Architecture::P24F:
case Architecture::P24H:
case Architecture::P30F:
- case Architecture::P33F: return ( instruction.tqmaskWith(0xFF0000)==0x040000 );
+ case Architecture::P33F: return ( instruction.maskWith(0xFF0000)==0x040000 );
case Architecture::Nb_Types: Q_ASSERT(false); break;
}
return false;