1 files changed, 7 insertions, 7 deletions
diff --git a/src/progs/direct/base/direct_16.cpp b/src/progs/direct/base/direct_16.cpp
index 124b35e..a9e33e1 100644
--- a/src/progs/direct/base/direct_16.cpp
+++ b/src/progs/direct/base/direct_16.cpp
@@ -56,7 +56,7 @@ BitValue Direct::pic16::get_word()
         hardware().setPin(Clock, High);
         Port::usleep(1+_clockDelay);
         if ( hardware().readBit() ) ind |= 0x8000;
-        else ind = ind.maskWith(0x7FFF);
+        else ind = ind.tqmaskWith(0x7FFF);
         ind >>= 1;
         hardware().setPin(Clock, Low);
         Port::usleep(1+_clockDelay);
@@ -87,10 +87,10 @@ bool Direct::pic16::doRead(Pic::MemoryRangeType type, Device::Array &data, const
     const Device::Array wdata = static_cast<const Pic::Memory &>(vdata->memory).arrayForWriting(type);
     if (only) nbWords = findNonMaskEnd(type, wdata)+1;
   }
-  BitValue mask = device().mask(type);
+  BitValue tqmask = device().tqmask(type);
   for (uint i = 0; i<nbWords; i++) {
-    if ( !only || data[i]!=mask || type!=Pic::MemoryRangeType::Code ) {
-      data[i] = readWord(type).maskWith(mask);
+    if ( !only || data[i]!=tqmask || type!=Pic::MemoryRangeType::Code ) {
+      data[i] = readWord(type).tqmaskWith(tqmask);
       if ( vdata && !hardware().verifyWord(i, data[i], type, *vdata) ) return false;
     }
     incrementPC(1);
@@ -105,7 +105,7 @@ bool Direct::pic16::doWrite(Pic::MemoryRangeType type, const Device::Array &data
   gotoMemory(type);
   for (uint i = 0; i<data.count(); ) {
     if ( !writeWords(type, data, i, force) ) {
-      log(Log::LineType::Error, i18n("Error programming %1 at %2.").arg(type.label()).arg(toHexLabel(i, 8)));
+      log(Log::LineType::Error, i18n("Error programming %1 at %2.").tqarg(type.label()).tqarg(toHexLabel(i, 8)));
       return false;
     }
   }
@@ -117,7 +117,7 @@ bool Direct::pic16::skipMaskWords(Pic::MemoryRangeType type, const Device::Array
   if (force) return false;
   uint nb = (type==Pic::MemoryRangeType::Code ? nbWordsCodeProg() : 1);
   for (uint k=0; k<nb; k++)
-    if ( data[i+k]!=device().mask(type) ) return false;
+    if ( data[i+k]!=device().tqmask(type) ) return false;
   incrementPC(nb);
   i += nb;
   return true;
@@ -134,7 +134,7 @@ bool Direct::pic16::writeWords(Pic::MemoryRangeType type, const Device::Array &d
     }
   }
   startProg(type);
-  QString cmd = QString("w%1").arg(waitProgTime(type));
+  TQString cmd = TQString("w%1").tqarg(waitProgTime(type));
   pulseEngine(cmd.latin1());
   endProg(type);
   return true;