2 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/pic/prog/pic_prog.cpp b/src/devices/pic/prog/pic_prog.cpp
index 42eeafb..f0c917d 100644
--- a/src/devices/pic/prog/pic_prog.cpp
+++ b/src/devices/pic/prog/pic_prog.cpp
@@ -256,7 +256,7 @@ bool Programmer::PicBase::verifyDeviceId()
   BitValue rawId = readDeviceId();
   if ( hasError() ) return false;
   uint nbChars = device()->nbWords(Pic::MemoryRangeType::DeviceId) * device()->nbCharsWord(Pic::MemoryRangeType::DeviceId);
-  if ( rawId==0x0 || rawId==device()->tqmask(Pic::MemoryRangeType::DeviceId) ) {
+  if ( rawId==0x0 || rawId==device()->mask(Pic::MemoryRangeType::DeviceId) ) {
     log(Log::LineType::Error, i18n("Missing or incorrect device (Read id is %1).").tqarg(toHexLabel(rawId, nbChars)));
     return false;
   }
@@ -366,16 +366,16 @@ bool Programmer::PicBase::restoreBandGapBits()
   if ( !specific()->canReadRange(Pic::MemoryRangeType::Config) ) return true;
   bool hasProtectedBits = false;
   for (uint i=0; i<device()->nbWords(Pic::MemoryRangeType::Config); i++)
-    if ( device()->config()._words[i].ptqmask!=0 ) hasProtectedBits = true;
+    if ( device()->config()._words[i].pmask!=0 ) hasProtectedBits = true;
   if ( !hasProtectedBits ) return true;
   Device::Array cdata;
   if ( !specific()->read(Pic::MemoryRangeType::Config, cdata, 0) ) return false;
   Device::Array data = _deviceMemory->arrayForWriting(Pic::MemoryRangeType::Config);
   for (uint i=0; i<cdata.count(); i++) {
-    BitValue ptqmask = device()->config()._words[i].ptqmask;
-    if ( ptqmask==0 ) continue;
-    cdata[i] = cdata[i].clearMaskBits(ptqmask);
-    cdata[i] |= data[i].maskWith(ptqmask);
+    BitValue pmask = device()->config()._words[i].pmask;
+    if ( pmask==0 ) continue;
+    cdata[i] = cdata[i].clearMaskBits(pmask);
+    cdata[i] |= data[i].maskWith(pmask);
   }
   if ( !specific()->canWriteRange(Pic::MemoryRangeType::Config) ) {
     log(Log::LineType::Warning, i18n("Could not restore band gap bits because programmer does not support writing config bits."));
diff --git a/src/devices/pic/prog/pic_prog_specific.cpp b/src/devices/pic/prog/pic_prog_specific.cpp
index ed13adf..c8d958b 100644
--- a/src/devices/pic/prog/pic_prog_specific.cpp
+++ b/src/devices/pic/prog/pic_prog_specific.cpp
@@ -28,7 +28,7 @@ uint Programmer::PicDeviceSpecific::findNonMaskStart(Pic::MemoryRangeType type,
 {
   uint start = 0;
   for (; start<data.count(); start++)
-    if ( data[start]!=device().tqmask(type) ) break;
+    if ( data[start]!=device().mask(type) ) break;
   const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, TQString("start before align: %1").tqarg(start));
   uint align = device().nbWordsWriteAlignment(type);
   start -= start % align;
@@ -40,7 +40,7 @@ uint Programmer::PicDeviceSpecific::findNonMaskEnd(Pic::MemoryRangeType type, co
 {
   uint end = data.count()-1;
   for (; end>0; end--)
-    if ( data[end]!=device().tqmask(type) ) break;
+    if ( data[end]!=device().mask(type) ) break;
   const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, TQString("end before align: %1").tqarg(end));
   uint align = device().nbWordsWriteAlignment(type);
   if ( (end+1) % align ) end += align - (end+1) % align;
@@ -113,9 +113,9 @@ bool Programmer::PicHardware::verifyWord(uint i, BitValue word, Pic::MemoryRange
   BitValue v = static_cast<const Pic::Memory &>(vdata.memory).normalizedWord(type, i);
   BitValue d = static_cast<const Pic::Memory &>(vdata.memory).normalizeWord(type, i, word);
   if ( type==Pic::MemoryRangeType::Config ) {
-    BitValue ptqmask = device().config()._words[i].ptqmask;
-    v = v.clearMaskBits(ptqmask);
-    d = d.clearMaskBits(ptqmask);
+    BitValue pmask = device().config()._words[i].pmask;
+    v = v.clearMaskBits(pmask);
+    d = d.clearMaskBits(pmask);
   }
   return compareWords(type, i, v, d, vdata.actions);
 }