3 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 a9e33e1..330c037 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.tqmaskWith(0x7FFF);
+        else ind = ind.maskWith(0x7FFF);
         ind >>= 1;
         hardware().setPin(Clock, Low);
         Port::usleep(1+_clockDelay);
@@ -90,7 +90,7 @@ bool Direct::pic16::doRead(Pic::MemoryRangeType type, Device::Array &data, const
   BitValue tqmask = device().tqmask(type);
   for (uint i = 0; i<nbWords; i++) {
     if ( !only || data[i]!=tqmask || type!=Pic::MemoryRangeType::Code ) {
-      data[i] = readWord(type).tqmaskWith(tqmask);
+      data[i] = readWord(type).maskWith(tqmask);
       if ( vdata && !hardware().verifyWord(i, data[i], type, *vdata) ) return false;
     }
     incrementPC(1);
diff --git a/src/progs/direct/base/direct_16.h b/src/progs/direct/base/direct_16.h
index beb6c43..683083e 100644
--- a/src/progs/direct/base/direct_16.h
+++ b/src/progs/direct/base/direct_16.h
@@ -20,7 +20,7 @@ class pic16 : public Pic8DeviceSpecific
 public:
   pic16(::Programmer::Base &base) : Pic8DeviceSpecific(base) {}
   virtual BitValue get_word();
-  virtual BitValue get_byte() { return get_word().tqmaskWith(0xFF); }
+  virtual BitValue get_byte() { return get_word().maskWith(0xFF); }
   virtual void send_word(BitValue word);
   virtual void send_bits(BitValue d, uint nbBits);
   virtual void send_cmd(BitValue d) { send_bits(d, 6); }
diff --git a/src/progs/direct/base/direct_18F.cpp b/src/progs/direct/base/direct_18F.cpp
index 75112c2..5760bf8 100644
--- a/src/progs/direct/base/direct_18F.cpp
+++ b/src/progs/direct/base/direct_18F.cpp
@@ -91,7 +91,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       for (uint i = 0; i<data.count(); i++) {
         setPointer(type, i);
         pulseEngine("k0,X80A6,k0,X50A8,k0,X6EF5,k0,X0000");
-        data[i] = pulseEngine("r").tqmaskWith(tqmask);
+        data[i] = pulseEngine("r").maskWith(tqmask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
       }
       _base.progressMonitor().addTaskProgress(data.count());
@@ -100,7 +100,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       setPointer(type, offset);
       //pulseEngine("w1000"); ??
       for (uint i=0; i<nbWords; i++) {
-        data[i] = pulseEngine("R").tqmaskWith(tqmask);
+        data[i] = pulseEngine("R").maskWith(tqmask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
       }
       _base.progressMonitor().addTaskProgress(data.count());
@@ -111,7 +111,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       setPointer(type, 0);
       for (uint i = 0; i<data.count(); i+=2) {
         BitValue w = pulseEngine("R");
-        data[i] = w.tqmaskWith(tqmask);
+        data[i] = w.maskWith(tqmask);
         if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false;
         data[i+1] = w >> 8;
         if ( vdata && !hardware().verifyWord(offset+i+1, data[i+1], type, *vdata) ) return false;
@@ -249,7 +249,7 @@ void Direct::P18F242::configureSinglePanel()
 //-----------------------------------------------------------------------------
 bool Direct::P18F2539::doErase(bool)
 {
-  // aptqparently there is no chip erase...
+  // apparently there is no chip erase...
   return ( doEraseRange(Pic::MemoryRangeType::Code) && doEraseRange(Pic::MemoryRangeType::Eeprom) );
 }