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/progs/icd2 | |
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/progs/icd2')
-rw-r--r-- | src/progs/icd2/base/icd2_debug.cpp | 6 | ||||
-rw-r--r-- | src/progs/icd2/base/icd2_debug_specific.cpp | 2 | ||||
-rw-r--r-- | src/progs/icd2/base/icd2_debug_specific.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/progs/icd2/base/icd2_debug.cpp b/src/progs/icd2/base/icd2_debug.cpp index ba10a4d..5d4a35f 100644 --- a/src/progs/icd2/base/icd2_debug.cpp +++ b/src/progs/icd2/base/icd2_debug.cpp @@ -97,14 +97,14 @@ bool Icd2::Debugger::readRegister(const Register::TypeData &data, BitValue &valu { if ( data.type()==Register::Special ) { if ( data.name()=="WREG" ) return hardware()->readRegister(specific()->addressWREG(), value, 1); - if ( data.name()=="PC" ) { value = hardware()->getProgramCounter().tqmaskWith(specific()->tqmaskPC()); return !hasError(); } + if ( data.name()=="PC" ) { value = hardware()->getProgramCounter().maskWith(specific()->maskPC()); return !hasError(); } Q_ASSERT(false); return true; } TQString name = device()->registersData().sfrNames[data.address()]; if ( name=="WREG" ) return hardware()->readRegister(specific()->addressWREG(), value, 1); - if ( name=="PCL" ) { value = hardware()->getProgramCounter().tqmaskWith(specific()->tqmaskPC()).byte(0); return !hasError(); } - if ( name=="PCLATH" ) { value = hardware()->getProgramCounter().tqmaskWith(specific()->tqmaskPC()).byte(1); return !hasError(); } + if ( name=="PCL" ) { value = hardware()->getProgramCounter().maskWith(specific()->maskPC()).byte(0); return !hasError(); } + if ( name=="PCLATH" ) { value = hardware()->getProgramCounter().maskWith(specific()->maskPC()).byte(1); return !hasError(); } return hardware()->readRegister(specific()->addressRegister(data.address()), value, 1); } diff --git a/src/progs/icd2/base/icd2_debug_specific.cpp b/src/progs/icd2/base/icd2_debug_specific.cpp index 61bc373..cd05d06 100644 --- a/src/progs/icd2/base/icd2_debug_specific.cpp +++ b/src/progs/icd2/base/icd2_debug_specific.cpp @@ -41,7 +41,7 @@ bool Icd2::P16FDebuggerSpecific::setBreakpoint(Address address) bool Icd2::P16FDebuggerSpecific::readBreakpoint(BitValue &value) { if ( !hardware()->readRegister(0x18E, value, 2) ) return false; - value = value.tqmaskWith(0x1FFF); + value = value.maskWith(0x1FFF); return true; } diff --git a/src/progs/icd2/base/icd2_debug_specific.h b/src/progs/icd2/base/icd2_debug_specific.h index 830ab0f..d14887b 100644 --- a/src/progs/icd2/base/icd2_debug_specific.h +++ b/src/progs/icd2/base/icd2_debug_specific.h @@ -25,7 +25,7 @@ public: DebugProgrammer &programmer() { return base().programmer(); } ::Debugger::PicSpecific *deviceSpecific() { return base().deviceSpecific(); } virtual Address addressWREG() const = 0; - virtual BitValue tqmaskPC() const = 0; + virtual BitValue maskPC() const = 0; virtual Address addressRegister(Address address) const = 0; virtual bool setBreakpoint(Address address) = 0; virtual bool readBreakpoint(BitValue &value) = 0; @@ -42,7 +42,7 @@ public: virtual BitValue writeMaskBreakpointRegister() const { return 0x8000; } virtual BitValue readMaskBreakpointRegister() const { return 0x1FFF; } virtual Address addressWREG() const; - virtual BitValue tqmaskPC() const { return 0x1FFF; } + virtual BitValue maskPC() const { return 0x1FFF; } virtual Address addressRegister(Address address) const; virtual bool setBreakpoint(Address address); virtual bool readBreakpoint(BitValue &value); @@ -80,7 +80,7 @@ class P18FDebuggerSpecific : public DebuggerSpecific public: P18FDebuggerSpecific(::Debugger::Base &base); virtual Address addressWREG() const; - virtual BitValue tqmaskPC() const { return 0xFFFF; } + virtual BitValue maskPC() const { return 0xFFFF; } virtual Address addressRegister(Address address) const; virtual bool setBreakpoint(Address address); virtual bool readBreakpoint(BitValue &value); |