From 704123e8152edcd80447659317f1c8b31a1576e6 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 9 Jul 2011 02:23:29 +0000
Subject: 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
---
 src/coff/base/coff_object.cpp  | 2 +-
 src/coff/base/disassembler.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/coff')

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];
-- 
cgit v1.2.3