summaryrefslogtreecommitdiffstats
path: root/src/piklab-test/base
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/piklab-test/base
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/piklab-test/base')
-rw-r--r--src/piklab-test/base/generator_check.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/piklab-test/base/generator_check.cpp b/src/piklab-test/base/generator_check.cpp
index 5819188..f7ce96f 100644
--- a/src/piklab-test/base/generator_check.cpp
+++ b/src/piklab-test/base/generator_check.cpp
@@ -129,8 +129,8 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data)
bool ok = false;
for (uint i=0; i<config._words.count(); i++) {
const Pic::Config::Word &cword = config._words[i];
- for (uint k=0; k<cword.tqmasks.count(); k++) {
- const Pic::Config::Mask &ctqmask = cword.tqmasks[k];
+ for (uint k=0; k<cword.masks.count(); k++) {
+ const Pic::Config::Mask &ctqmask = cword.masks[k];
if ( l<ctqmask.values.count() ) {
ok = true;
if ( !ctqmask.values[l].name.isEmpty() ) _memory2->setConfigValue(ctqmask.name, ctqmask.values[l].name);
@@ -157,11 +157,11 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data)
BitValue word1 = _memory1->word(Pic::MemoryRangeType::Config, i);
BitValue word2 = _memory2->word(Pic::MemoryRangeType::Config, i);
if ( word1==word2 ) continue;
- for (uint k=0; k<cword.tqmasks.count(); k++) {
- const Pic::Config::Mask &ctqmask = cword.tqmasks[k];
+ for (uint k=0; k<cword.masks.count(); k++) {
+ const Pic::Config::Mask &ctqmask = cword.masks[k];
if ( ctqmask.value.isInside(cword.ptqmask) ) continue;
- BitValue value1 = word1.tqmaskWith(ctqmask.value);
- BitValue value2 = word2.tqmaskWith(ctqmask.value);
+ BitValue value1 = word1.maskWith(ctqmask.value);
+ BitValue value2 = word2.maskWith(ctqmask.value);
if ( value1==value2 ) continue;
TQString name1, name2;
uint l1, l2;
@@ -173,7 +173,7 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data)
if ( name1==name2 ) continue;
TEST_FAILED_RETURN(TQString("Config bits are different in %1: set\"%2\"=(%3) != compiled=%4)")
.tqarg(ctqmask.name).tqarg(ctqmask.values[l2].name)
- .tqarg(toHexLabel(word2.tqmaskWith(ctqmask.value), nbChars)).tqarg(toHexLabel(word1.tqmaskWith(ctqmask.value), nbChars)))
+ .tqarg(toHexLabel(word2.maskWith(ctqmask.value), nbChars)).tqarg(toHexLabel(word1.maskWith(ctqmask.value), nbChars)))
}
}
}