rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 93 insertions, 93 deletions

diff --git a/src/devices/pic/xml/pic_xml_to_data.cpp b/src/devices/pic/xml/pic_xml_to_data.cpp
index 18a5409..85eed73 100644
--- a/src/devices/pic/xml/pic_xml_to_data.cpp
+++ b/src/devices/pic/xml/pic_xml_to_data.cpp
@@ -52,9 +52,9 @@ bool getMemoryRange(MemoryRangeType type, TQDomElement element)
   uint nbCharsWord = data()->nbCharsWord(type);
   if ( data()->nbBitsWord(type)==0 ) qFatal(TQString("Architecture doesn't contain memory range %1").tqarg(type.key()));
   if ( type==MemoryRangeType::UserId ) {
-    data()->_userIdRecommendedMask = fromHexLabel(range.attribute("rtqmask"), nbCharsWord, &ok);
-    if ( !ok ) qFatal("Cannot extract rtqmask value for user id");
-    if ( !data()->_userIdRecommendedMask.isInside(data()->tqmask(type)) ) qFatal(TQString("rtqmask is not inside tqmask %1 (%2)").tqarg(toHexLabel(data()->_userIdRecommendedMask, 8)).tqarg(toHexLabel(data()->tqmask(type), 8)));
+    data()->_userIdRecommendedMask = fromHexLabel(range.attribute("rmask"), nbCharsWord, &ok);
+    if ( !ok ) qFatal("Cannot extract rmask value for user id");
+    if ( !data()->_userIdRecommendedMask.isInside(data()->mask(type)) ) qFatal(TQString("rmask is not inside mask %1 (%2)").tqarg(toHexLabel(data()->_userIdRecommendedMask, 8)).tqarg(toHexLabel(data()->mask(type), 8)));
   }
   if ( range.attribute("hexfile_offset")!="?" ) {
     data()->_ranges[type].properties |= Programmable;
@@ -64,12 +64,12 @@ bool getMemoryRange(MemoryRangeType type, TQDomElement element)
     }
   }
   if ( type==MemoryRangeType::Cal && !data()->is18Family() ) {
-    data()->_calibration.opcodeMask = fromHexLabel(range.attribute("cal_optqmask"), nbCharsWord, &ok);
-    if ( !ok ) qFatal("Cannot extract calibration opcode tqmask");
+    data()->_calibration.opcodeMask = fromHexLabel(range.attribute("cal_opmask"), nbCharsWord, &ok);
+    if ( !ok ) qFatal("Cannot extract calibration opcode mask");
     data()->_calibration.opcode = fromHexLabel(range.attribute("cal_opcode"), nbCharsWord, &ok);
     if ( !ok ) qFatal("Cannot extract calibration opcode");
-    if ( !data()->_calibration.opcode.isInside(data()->_calibration.opcodeMask) ) qFatal("Calibration opcode should be inside opcode tqmask");
-    if ( !data()->_calibration.opcodeMask.isInside(data()->tqmask(type)) ) qFatal("Calibration tqmask should be inside opcode tqmask");
+    if ( !data()->_calibration.opcode.isInside(data()->_calibration.opcodeMask) ) qFatal("Calibration opcode should be inside opcode mask");
+    if ( !data()->_calibration.opcodeMask.isInside(data()->mask(type)) ) qFatal("Calibration mask should be inside opcode mask");
   }
   TQString wwa = range.attribute("word_write_align");
   TQString wea = range.attribute("word_erase_align");
@@ -88,31 +88,31 @@ bool getMemoryRange(MemoryRangeType type, TQDomElement element)
   return true;
 }
 
-bool hasValue(const Pic::Config::Mask &tqmask, BitValue value)
+bool hasValue(const Pic::Config::Mask &mask, BitValue value)
 {
-  for (uint i=0; i<uint(tqmask.values.count()); i++)
-    if ( tqmask.values[i].value==value ) return true;
+  for (uint i=0; i<uint(mask.values.count()); i++)
+    if ( mask.values[i].value==value ) return true;
   return false;
 }
 
-void processName(const Pic::Config::Mask &ctqmask, BitValue ptqmask, Pic::Config::Value &cvalue)
+void processName(const Pic::Config::Mask &cmask, BitValue pmask, Pic::Config::Value &cvalue)
 {
   TQStringList &cnames = cvalue.configNames[Pic::ConfigNameType::Default];
   if ( cvalue.name=="invalid" ) {
     cvalue.name = TQString();
-    if ( !cnames.isEmpty() ) qFatal(TQString("No cname should be defined for invalid value in tqmask %1").tqarg(ctqmask.name));
+    if ( !cnames.isEmpty() ) qFatal(TQString("No cname should be defined for invalid value in mask %1").tqarg(cmask.name));
     return;
   }
-  if ( cvalue.name.isEmpty() ) qFatal(TQString("Empty value name in tqmask %1").tqarg(ctqmask.name));
-  if ( ctqmask.value.isInside(ptqmask) ) { // protected bits
-    if ( !cnames.isEmpty() ) qFatal(TQString("Config name should be null for protected config tqmask \"%1\"").tqarg(ctqmask.name));
+  if ( cvalue.name.isEmpty() ) qFatal(TQString("Empty value name in mask %1").tqarg(cmask.name));
+  if ( cmask.value.isInside(pmask) ) { // protected bits
+    if ( !cnames.isEmpty() ) qFatal(TQString("Config name should be null for protected config mask \"%1\"").tqarg(cmask.name));
   } else {
-    if ( cnames.isEmpty() && ctqmask.name!="BSSEC" && ctqmask.name!="BSSIZ" && ctqmask.name!="SSSEC" && ctqmask.name!="SSSIZ" ) {
+    if ( cnames.isEmpty() && cmask.name!="BSSEC" && cmask.name!="BSSIZ" && cmask.name!="SSSEC" && cmask.name!="SSSIZ" ) {
       // ### FIXME: 18J 24H 30F1010/202X
       if ( data()->architecture()!=Pic::Architecture::P18J && data()->architecture()!=Pic::Architecture::P24H
            && data()->architecture()!=Pic::Architecture::P24F && data()->architecture()!=Pic::Architecture::P33F
            && data()->name()!="30F1010" && data()->name()!="30F2020" && data()->name()!="30F2023" )
-        qFatal(TQString("cname not defined for \"%1\" (%2)").tqarg(cvalue.name).tqarg(ctqmask.name));
+        qFatal(TQString("cname not defined for \"%1\" (%2)").tqarg(cvalue.name).tqarg(cmask.name));
     }
     if ( cnames.count()==1 && cnames[0]=="_" ) cnames.clear();
     for (uint i=0; i<uint(cnames.count()); i++) {
@@ -121,10 +121,10 @@ void processName(const Pic::Config::Mask &ctqmask, BitValue ptqmask, Pic::Config
         bool ok;
         BitValue v = fromHexLabel(cnames[i], &ok);
         uint nbChars = data()->nbCharsWord(MemoryRangeType::Config);
-        BitValue tqmask = ctqmask.value.complementInMask(maxValue(NumberBase::Hex, nbChars));
-        if ( ok && v==(tqmask | cvalue.value) ) continue;
+        BitValue mask = cmask.value.complementInMask(maxValue(NumberBase::Hex, nbChars));
+        if ( ok && v==(mask | cvalue.value) ) continue;
       } else if ( XOR(cnames[i].startsWith("_"), data()->architecture()==Pic::Architecture::P30F) ) continue;
-      qFatal(TQString("Invalid config name for \"%1\"/\"%2\"").tqarg(ctqmask.name).tqarg(cvalue.name));
+      qFatal(TQString("Invalid config name for \"%1\"/\"%2\"").tqarg(cmask.name).tqarg(cvalue.name));
     }
     TQStringList &ecnames = cvalue.configNames[Pic::ConfigNameType::Extra];
     for (uint i=0; i<uint(ecnames.count()); i++)
@@ -132,61 +132,61 @@ void processName(const Pic::Config::Mask &ctqmask, BitValue ptqmask, Pic::Config
   }
 }
 
-Pic::Config::Mask toConfigMask(TQDomElement tqmask, BitValue ptqmask)
+Pic::Config::Mask toConfigMask(TQDomElement mask, BitValue pmask)
 {
   uint nbChars = data()->nbCharsWord(MemoryRangeType::Config);
   bool ok;
   TQString defName;
   TQMap<Pic::ConfigNameType, TQStringList> defConfigNames;
-  Config::Mask ctqmask;
-  ctqmask.name = tqmask.attribute("name");
-  if ( !Config::hasMaskName(ctqmask.name) ) qFatal(TQString("Unknown tqmask name %1").tqarg(ctqmask.name));
-  ctqmask.value = fromHexLabel(tqmask.attribute("value"), nbChars, &ok);
-  if ( !ok || ctqmask.value==0 || ctqmask.value>data()->tqmask(MemoryRangeType::Config) )
-    qFatal(TQString("Malformed tqmask value in tqmask %1").tqarg(tqmask.attribute("name")));
+  Config::Mask cmask;
+  cmask.name = mask.attribute("name");
+  if ( !Config::hasMaskName(cmask.name) ) qFatal(TQString("Unknown mask name %1").tqarg(cmask.name));
+  cmask.value = fromHexLabel(mask.attribute("value"), nbChars, &ok);
+  if ( !ok || cmask.value==0 || cmask.value>data()->mask(MemoryRangeType::Config) )
+    qFatal(TQString("Malformed mask value in mask %1").tqarg(mask.attribute("name")));
   //TQStringList names;
-  TQDomNode child = tqmask.firstChild();
+  TQDomNode child = mask.firstChild();
   while ( !child.isNull() ) {
     TQDomElement value = child.toElement();
     child = child.nextSibling();
     if ( value.isNull() ) continue;
-    if ( value.nodeName()!="value" ) qFatal(TQString("Non value child in tqmask %1").tqarg(ctqmask.name));
+    if ( value.nodeName()!="value" ) qFatal(TQString("Non value child in mask %1").tqarg(cmask.name));
     if ( value.attribute("value")=="default" ) {
-      if ( !defName.isEmpty() ) qFatal(TQString("Default value already defined for tqmask %1").tqarg(ctqmask.name));
+      if ( !defName.isEmpty() ) qFatal(TQString("Default value already defined for mask %1").tqarg(cmask.name));
       defName = value.attribute("name");
-      //if ( names.contains(defName) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name));
+      //if ( names.contains(defName) ) qFatal(TQString("Value name duplicated in mask %1").tqarg(cmask.name));
       //names.append(defName);
       FOR_EACH(Pic::ConfigNameType, type) defConfigNames[type] = TQStringList::split(' ', value.attribute(type.data().key));
       continue;
     }
     Config::Value cvalue;
     cvalue.value = fromHexLabel(value.attribute("value"), nbChars, &ok);
-    if ( !ok || !cvalue.value.isInside(ctqmask.value) ) qFatal(TQString("Malformed value in tqmask %1").tqarg(ctqmask.name));
+    if ( !ok || !cvalue.value.isInside(cmask.value) ) qFatal(TQString("Malformed value in mask %1").tqarg(cmask.name));
     cvalue.name = value.attribute("name");
-    //if ( names.contains(cvalue.name) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name));
+    //if ( names.contains(cvalue.name) ) qFatal(TQString("Value name duplicated in mask %1").tqarg(cmask.name));
     //names.append(cvalue.name);
     FOR_EACH(Pic::ConfigNameType, type) cvalue.configNames[type] = TQStringList::split(' ', value.attribute(type.data().key));
-    processName(ctqmask, ptqmask, cvalue);
-    ctqmask.values.append(cvalue);
+    processName(cmask, pmask, cvalue);
+    cmask.values.append(cvalue);
   }
   // add default values
   if ( !defName.isEmpty() ) {
     uint nb = 0;
     BitValue::const_iterator it;
-    for (it=ctqmask.value.begin(); it!=ctqmask.value.end(); ++it) {
-      if ( hasValue(ctqmask, *it) ) continue; // already set
+    for (it=cmask.value.begin(); it!=cmask.value.end(); ++it) {
+      if ( hasValue(cmask, *it) ) continue; // already set
       nb++;
       Config::Value cvalue;
       cvalue.value = *it;
       cvalue.name = defName;
       cvalue.configNames = defConfigNames;
-      processName(ctqmask, ptqmask, cvalue);
-      ctqmask.values.append(cvalue);
+      processName(cmask, pmask, cvalue);
+      cmask.values.append(cvalue);
     }
-    if ( nb<=1 ) qFatal(TQString("Default value used less than twice in tqmask %1").tqarg(ctqmask.name));
+    if ( nb<=1 ) qFatal(TQString("Default value used less than twice in mask %1").tqarg(cmask.name));
   }
-  qHeapSort(ctqmask.values);
-  return ctqmask;
+  qHeapSort(cmask.values);
+  return cmask;
 }
 
 Pic::Config::Word toConfigWord(TQDomElement config)
@@ -196,48 +196,48 @@ Pic::Config::Word toConfigWord(TQDomElement config)
   cword.name = config.attribute("name");
   if ( cword.name.isNull() ) qFatal("Config word name not specified.");
   bool ok;
-  cword.wtqmask = fromHexLabel(config.attribute("wtqmask"), nbChars, &ok);
-  BitValue gtqmask = data()->tqmask(MemoryRangeType::Config);
-  if ( !ok || cword.wtqmask>gtqmask ) qFatal(TQString("Missing or malformed config wtqmask \"%1\"").tqarg(config.attribute("wtqmask")));
+  cword.wmask = fromHexLabel(config.attribute("wmask"), nbChars, &ok);
+  BitValue gmask = data()->mask(MemoryRangeType::Config);
+  if ( !ok || cword.wmask>gmask ) qFatal(TQString("Missing or malformed config wmask \"%1\"").tqarg(config.attribute("wmask")));
   cword.bvalue = fromHexLabel(config.attribute("bvalue"), nbChars, &ok);
   if ( !ok ) qFatal(TQString("Missing or malformed config bvalue \"%1\"").tqarg(config.attribute("bvalue")));
-  if ( config.attribute("ptqmask").isEmpty() ) cword.ptqmask = 0;
+  if ( config.attribute("pmask").isEmpty() ) cword.pmask = 0;
   else {
     bool ok;
-    cword.ptqmask = fromHexLabel(config.attribute("ptqmask"), nbChars, &ok);
-    if ( !ok || cword.ptqmask>gtqmask ) qFatal("Missing or malformed config ptqmask");
+    cword.pmask = fromHexLabel(config.attribute("pmask"), nbChars, &ok);
+    if ( !ok || cword.pmask>gmask ) qFatal("Missing or malformed config pmask");
   }
   cword.ignoredCNames = TQStringList::split(' ', config.attribute("icnames"));
   for (uint i=0; i<uint(cword.ignoredCNames.count()); i++)
     if ( cword.ignoredCNames[i][0]!='_'  ) qFatal(TQString("Invalid ignored config name for %1").tqarg(cword.name));
   TQDomNode child = config.firstChild();
   while ( !child.isNull() ) {
-    TQDomElement tqmask = child.toElement();
+    TQDomElement mask = child.toElement();
     child = child.nextSibling();
-    if ( tqmask.isNull() ) continue;
-    if ( tqmask.nodeName()!="tqmask" ) qFatal(TQString("Non tqmask child in config %1").tqarg(cword.name));
-    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));
+    if ( mask.isNull() ) continue;
+    if ( mask.nodeName()!="mask" ) qFatal(TQString("Non mask child in config %1").tqarg(cword.name));
+    if ( mask.attribute("name").isEmpty() ) qFatal(TQString("Empty mask name in config %1").tqarg(cword.name));
+    Config::Mask cmask = toConfigMask(mask, cword.pmask);
+    if ( !cmask.value.isInside(gmask) ) qFatal(TQString("Mask value not inside mask 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));
+      if ( cword.masks[i].name==cmask.name ) qFatal(TQString("Duplicated mask name %1 in config %2").tqarg(cmask.name).tqarg(cword.name));
+      if ( cmask.value.isOverlapping(cword.masks[i].value) ) qFatal(TQString("Overlapping masks in config %1").tqarg(cword.name));
     }
-    cword.masks.append(ctqmask);
+    cword.masks.append(cmask);
   }
   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;
-    else cword.ctqmask = tqmask;
+  BitValue mask = (cword.usedMask() | cword.bvalue).clearMaskBits(cword.pmask);
+  if ( config.attribute("cmask").isEmpty() ) {
+    if ( data()->_architecture==Pic::Architecture::P30F ) cword.cmask = cword.wmask;
+    else cword.cmask = mask;
   } else {
     bool ok;
-    cword.ctqmask = fromHexLabel(config.attribute("ctqmask"), nbChars, &ok);
-    if ( !ok || cword.ctqmask>gtqmask ) qFatal("Missing or malformed config ctqmask");
-    //if ( data()->_architecture==Pic::Architecture::P30X &&cword.ctqmask==cword.wtqmask ) qFatal(TQString("Redundant ctqmask in %1").tqarg(cword.name));
-    if ( cword.ctqmask==tqmask ) qFatal(TQString("Redundant ctqmask in %1").tqarg(cword.name));
+    cword.cmask = fromHexLabel(config.attribute("cmask"), nbChars, &ok);
+    if ( !ok || cword.cmask>gmask ) qFatal("Missing or malformed config cmask");
+    //if ( data()->_architecture==Pic::Architecture::P30X &&cword.cmask==cword.wmask ) qFatal(TQString("Redundant cmask in %1").tqarg(cword.name));
+    if ( cword.cmask==mask ) qFatal(TQString("Redundant cmask in %1").tqarg(cword.name));
   }
-  if ( !cword.ptqmask.isInside(cword.usedMask()) ) qFatal("ptqmask should be inside or'ed tqmask values.");
+  if ( !cword.pmask.isInside(cword.usedMask()) ) qFatal("pmask should be inside or'ed mask values.");
   return cword;
 }
 
@@ -283,8 +283,8 @@ TQString getChecksumData(TQDomElement checksum)
     if ( nb>0 ) cdata.protectedMaskNames += "CPB";
     for (uint i=1; i<nb; i++) cdata.protectedMaskNames += "CP_" + TQString::number(i-1);
     cdata.bbsize = checksum.attribute("bbsize");
-    const Config::Mask *tqmask = data()->_config->findMask(protection.bootSizeMaskName());
-    if ( tqmask==0 ) {
+    const Config::Mask *mask = data()->_config->findMask(protection.bootSizeMaskName());
+    if ( mask==0 ) {
       if ( !cdata.bbsize.isEmpty() ) qFatal("Device does not have a variable boot size (no \"bbsize\" allowed in checksum)");
     } else if ( cdata.bbsize.isEmpty() ) {
       if ( nb==1 ) qFatal("\"bbsize\" should be define in checksum for \"protected_blocks\"==1");
@@ -319,14 +319,14 @@ TQString getChecksumData(TQDomElement checksum)
   if ( !s.isEmpty() ) {
     TQStringList list = TQStringList::split(" ", s);
     for (uint i=0; i<uint(list.count()); i++) {
-      const Config::Mask *tqmask = data()->config().findMask(list[i]);
-      if ( tqmask==0 ) qFatal(TQString("Not valid tqmask name for \"protected\" tag in checksum: %1").tqarg(list[i]));
-      if ( tqmask->values.count()==2 ) continue;
-      for (uint k=0; k<uint(tqmask->values.count()); k++) {
-        TQString valueName = tqmask->values[k].name;
+      const Config::Mask *mask = data()->config().findMask(list[i]);
+      if ( mask==0 ) qFatal(TQString("Not valid mask name for \"protected\" tag in checksum: %1").tqarg(list[i]));
+      if ( mask->values.count()==2 ) continue;
+      for (uint k=0; k<uint(mask->values.count()); k++) {
+        TQString valueName = mask->values[k].name;
         if ( valueName.isEmpty() ) continue;
         if ( !protection.isNoneProtectedValueName(valueName) && !protection.isAllProtectedValueName(valueName) )
-          qFatal(TQString("Not switch protection from tqmask name for \"protected\" tag in checksum: %1").tqarg(list[i]));
+          qFatal(TQString("Not switch protection from mask name for \"protected\" tag in checksum: %1").tqarg(list[i]));
       }
     }
     cdata.protectedMaskNames = list;
@@ -438,19 +438,19 @@ virtual void processDevice(TQDomElement device)
   uint nbWords = data()->nbWords(MemoryRangeType::Config);
   data()->_config->_words.resize(nbWords);
   FOR_EACH(Pic::ConfigNameType, type) {
-    TQMap<TQString, TQString> cnames; // cname -> tqmask name
+    TQMap<TQString, TQString> cnames; // cname -> mask name
     for (uint i=0; i<nbWords; i++) {
       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.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];
+        const Config::Mask &mask = word.masks[j];
+        for (uint k=0; k<uint(mask.values.count()); k++) {
+          const TQStringList &vcnames = mask.values[k].configNames[type];
           for (uint l=0; l<uint(vcnames.count()); l++) {
             if ( vcnames[l].startsWith("0x") ) continue;
-            if ( cnames.contains(vcnames[l]) && cnames[vcnames[l]]!=tqmask.name )
-              qFatal(TQString("Duplicated config name for %1/%2").tqarg(tqmask.name).tqarg(tqmask.values[k].name));
+            if ( cnames.contains(vcnames[l]) && cnames[vcnames[l]]!=mask.name )
+              qFatal(TQString("Duplicated config name for %1/%2").tqarg(mask.name).tqarg(mask.values[k].name));
             cnames[vcnames[l]] = word.masks[j].name;
           }
         }
@@ -461,12 +461,12 @@ virtual void processDevice(TQDomElement device)
   for (uint i=0; i<nbWords; i++) {
     const Config::Word &word = data()->_config->_words[i];
     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];
+      const Config::Mask &mask = word.masks[j];
+      for (uint k=0; k<uint(mask.values.count()); k++) {
+        const Config::Value &value = mask.values[k];
         if ( !value.isValid() ) continue;
-        if ( !data()->_config->checkValueName(tqmask.name, value.name) )
-          qFatal(TQString("Malformed value name \"%1\" in tqmask %2").tqarg(value.name).tqarg(tqmask.name));
+        if ( !data()->_config->checkValueName(mask.name, value.name) )
+          qFatal(TQString("Malformed value name \"%1\" in mask %2").tqarg(value.name).tqarg(mask.name));
       }
     }
   }
@@ -474,10 +474,10 @@ virtual void processDevice(TQDomElement device)
   for (uint i=0; i<nbWords; i++) {
     const Config::Word &word = data()->_config->_words[i];
     for (uint j=0; j<uint(word.masks.count()); j++) {
-      const Config::Mask &tqmask = word.masks[j];
+      const Config::Mask &mask = 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));
+      for (it=mask.value.begin(); it!=mask.value.end(); ++it)
+        if ( !hasValue(mask, *it) ) qFatal(TQString("Value %1 not defined in mask %2").tqarg(toHexLabel(*it, data()->nbCharsWord(MemoryRangeType::Config))).tqarg(mask.name));
     }
   }
 
@@ -490,9 +490,9 @@ virtual void processDevice(TQDomElement device)
     const Pic::Protection &protection = data()->_config->protection();
     if ( protection.family()==Protection::BasicProtection ) {
       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;
+      const Pic::Config::Mask *mask = data()->_config->findMask(maskName);
+      Q_ASSERT(mask);
+      for (uint i=0; i<uint(mask->values.count()); i++) valueNames[mask->values[i].name] = false;
     }
     TQDomNode child = checksums.firstChild();
     while ( !child.isNull() ) {
@@ -614,8 +614,8 @@ void processDeviceRegisters(TQDomElement element)
   if ( data()->is18Family() ) {
     rdata.accessBankSplit = fromHexLabel(element.attribute("access_bank_split_offset"), &ok);
     if ( !ok || rdata.accessBankSplit==0 || rdata.accessBankSplit>=0xFF ) qFatal("Malformed access bank split offset");
-    rdata.unusedBankMask = fromHexLabel(element.attribute("unused_bank_tqmask"), &ok);
-    if ( !ok || rdata.unusedBankMask>=maxValue(NumberBase::Hex, rdata.nbBanks) ) qFatal("Malformed access unused bank tqmask");
+    rdata.unusedBankMask = fromHexLabel(element.attribute("unused_bank_mask"), &ok);
+    if ( !ok || rdata.unusedBankMask>=maxValue(NumberBase::Hex, rdata.nbBanks) ) qFatal("Malformed access unused bank mask");
   } else {
     rdata.accessBankSplit = 0;
     rdata.unusedBankMask = 0;