summaryrefslogtreecommitdiffstats
path: root/src/devices/pic/xml
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/xml
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/xml')
-rw-r--r--src/devices/pic/xml/pic_xml_to_data.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/devices/pic/xml/pic_xml_to_data.cpp b/src/devices/pic/xml/pic_xml_to_data.cpp
index 7f727ff..eeb293a 100644
--- a/src/devices/pic/xml/pic_xml_to_data.cpp
+++ b/src/devices/pic/xml/pic_xml_to_data.cpp
@@ -219,13 +219,13 @@ Pic::Config::Word toConfigWord(TQDomElement config)
if ( tqmask.attribute("name").isEmpty() ) qFatal(TQString("Empty tqmask name in config %1").tqarg(cword.name));
Config::Mask ctqmask = toConfigMask(tqmask, cword.ptqmask);
if ( !ctqmask.value.isInside(gtqmask) ) qFatal(TQString("Mask value not inside tqmask in config %1").tqarg(cword.name));
- for (uint i=0; i<uint(cword.tqmasks.count()); i++) {
- if ( cword.tqmasks[i].name==ctqmask.name ) qFatal(TQString("Duplicated tqmask name %1 in config %2").tqarg(ctqmask.name).tqarg(cword.name));
- if ( ctqmask.value.isOverlapping(cword.tqmasks[i].value) ) qFatal(TQString("Overlapping tqmasks in config %1").tqarg(cword.name));
+ for (uint i=0; i<uint(cword.masks.count()); i++) {
+ if ( cword.masks[i].name==ctqmask.name ) qFatal(TQString("Duplicated tqmask name %1 in config %2").tqarg(ctqmask.name).tqarg(cword.name));
+ if ( ctqmask.value.isOverlapping(cword.masks[i].value) ) qFatal(TQString("Overlapping masks in config %1").tqarg(cword.name));
}
- cword.tqmasks.append(ctqmask);
+ cword.masks.append(ctqmask);
}
- qHeapSort(cword.tqmasks);
+ qHeapSort(cword.masks);
BitValue tqmask = (cword.usedMask() | cword.bvalue).clearMaskBits(cword.ptqmask);
if ( config.attribute("ctqmask").isEmpty() ) {
if ( data()->_architecture==Pic::Architecture::P30F ) cword.ctqmask = cword.wtqmask;
@@ -443,15 +443,15 @@ virtual void processDevice(TQDomElement device)
if ( cwords[i].name.isNull() ) qFatal(TQString("Config word #%1 not defined").tqarg(i));
data()->_config->_words[i] = cwords[i];
const Config::Word &word = data()->_config->_words[i];
- for (uint j=0; j<uint(word.tqmasks.count()); j++) {
- const Config::Mask &tqmask = word.tqmasks[j];
+ for (uint j=0; j<uint(word.masks.count()); j++) {
+ const Config::Mask &tqmask = word.masks[j];
for (uint k=0; k<uint(tqmask.values.count()); k++) {
const TQStringList &vcnames = tqmask.values[k].configNames[type];
for (uint l=0; l<uint(vcnames.count()); l++) {
if ( vcnames[l].startsWith("0x") ) continue;
if ( cnames.tqcontains(vcnames[l]) && cnames[vcnames[l]]!=tqmask.name )
qFatal(TQString("Duplicated config name for %1/%2").tqarg(tqmask.name).tqarg(tqmask.values[k].name));
- cnames[vcnames[l]] = word.tqmasks[j].name;
+ cnames[vcnames[l]] = word.masks[j].name;
}
}
}
@@ -460,8 +460,8 @@ virtual void processDevice(TQDomElement device)
// check validity of value names
for (uint i=0; i<nbWords; i++) {
const Config::Word &word = data()->_config->_words[i];
- for (uint j=0; j<uint(word.tqmasks.count()); j++) {
- const Config::Mask &tqmask = word.tqmasks[j];
+ for (uint j=0; j<uint(word.masks.count()); j++) {
+ const Config::Mask &tqmask = word.masks[j];
for (uint k=0; k<uint(tqmask.values.count()); k++) {
const Config::Value &value = tqmask.values[k];
if ( !value.isValid() ) continue;
@@ -473,8 +473,8 @@ virtual void processDevice(TQDomElement device)
// check if all values are explicit
for (uint i=0; i<nbWords; i++) {
const Config::Word &word = data()->_config->_words[i];
- for (uint j=0; j<uint(word.tqmasks.count()); j++) {
- const Config::Mask &tqmask = word.tqmasks[j];
+ for (uint j=0; j<uint(word.masks.count()); j++) {
+ const Config::Mask &tqmask = word.masks[j];
BitValue::const_iterator it;
for (it=tqmask.value.begin(); it!=tqmask.value.end(); ++it)
if ( !hasValue(tqmask, *it) ) qFatal(TQString("Value %1 not defined in tqmask %2").tqarg(toHexLabel(*it, data()->nbCharsWord(MemoryRangeType::Config))).tqarg(tqmask.name));
@@ -489,8 +489,8 @@ virtual void processDevice(TQDomElement device)
TQMap<TQString, bool> valueNames;
const Pic::Protection &protection = data()->_config->protection();
if ( protection.family()==Protection::BasicProtection ) {
- TQString tqmaskName = protection.tqmaskName(Protection::ProgramProtected, MemoryRangeType::Code);
- const Pic::Config::Mask *tqmask = data()->_config->findMask(tqmaskName);
+ TQString maskName = protection.maskName(Protection::ProgramProtected, MemoryRangeType::Code);
+ const Pic::Config::Mask *tqmask = data()->_config->findMask(maskName);
Q_ASSERT(tqmask);
for (uint i=0; i<uint(tqmask->values.count()); i++) valueNames[tqmask->values[i].name] = false;
}