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/coff/base | |
| 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/coff/base')
| -rw-r--r-- | src/coff/base/coff_object.cpp | 2 | ||||
| -rw-r--r-- | src/coff/base/disassembler.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/coff/base/coff_object.cpp b/src/coff/base/coff_object.cpp index f6263fd..6a1a17a 100644 --- a/src/coff/base/coff_object.cpp +++ b/src/coff/base/coff_object.cpp @@ -394,7 +394,7 @@ Coff::Section::Section(const Device::Data &device, const Object &object, } //qDebug(" %s: %s (%s %s)", toHex(address, 4).data(), _data[address].disasm.data(), _data[address].opcode.data(), (nbop==2 ? _data[address+inc].opcode.data() : "")); } else if ( _flags & FDataRom ) _instructions[address].opcode = toHex(op, 4); - else if ( _flags & FData ) _instructions[address].opcode = toHex(op.tqmaskWith(0xFF), 2); + else if ( _flags & FData ) _instructions[address].opcode = toHex(op.maskWith(0xFF), 2); } } diff --git a/src/coff/base/disassembler.cpp b/src/coff/base/disassembler.cpp index c818beb..9790843 100644 --- a/src/coff/base/disassembler.cpp +++ b/src/coff/base/disassembler.cpp @@ -125,8 +125,8 @@ TQStringList SourceLine::configNames(Pic::ConfigNameType type, const Pic::Memory BitValue v = memory.normalizedWord(Pic::MemoryRangeType::Config, word); const Pic::Config::Word &cword = config._words[word]; TQStringList cnames; - for (uint k=0; k<uint(cword.tqmasks.count()); k++) { - const Pic::Config::Mask &ctqmask = cword.tqmasks[k]; + for (uint k=0; k<uint(cword.masks.count()); k++) { + const Pic::Config::Mask &ctqmask = cword.masks[k]; if ( ctqmask.value.isInside(cword.ptqmask) ) continue; // protected bits for (int l=ctqmask.values.count()-1; l>=0; l--) { const Pic::Config::Value &cvalue = ctqmask.values[l]; |