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

5 files changed, 22 insertions, 22 deletions

diff --git a/src/progs/direct/base/direct.cpp b/src/progs/direct/base/direct.cpp
index c0d7de6..7603ca3 100644
--- a/src/progs/direct/base/direct.cpp
+++ b/src/progs/direct/base/direct.cpp
@@ -375,7 +375,7 @@ int Direct::Hardware::timing_test()
         for (long j=0; j<loop; ++j)
         {
             int d = 0x2AAA ;
-            d &= 0x3FFF ;               // tqmask unused msb
+            d &= 0x3FFF ;               // mask unused msb
             d <<= 1;                // insert start bit
 
             for (uint x = 0; x<16; x++) {
diff --git a/src/progs/direct/base/direct_16.cpp b/src/progs/direct/base/direct_16.cpp
index 330c037..ef17479 100644
--- a/src/progs/direct/base/direct_16.cpp
+++ b/src/progs/direct/base/direct_16.cpp
@@ -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 tqmask = device().tqmask(type);
+  BitValue mask = device().mask(type);
   for (uint i = 0; i<nbWords; i++) {
-    if ( !only || data[i]!=tqmask || type!=Pic::MemoryRangeType::Code ) {
-      data[i] = readWord(type).maskWith(tqmask);
+    if ( !only || data[i]!=mask || type!=Pic::MemoryRangeType::Code ) {
+      data[i] = readWord(type).maskWith(mask);
       if ( vdata && !hardware().verifyWord(i, data[i], type, *vdata) ) return false;
     }
     incrementPC(1);
@@ -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().tqmask(type) ) return false;
+    if ( data[i+k]!=device().mask(type) ) return false;
   incrementPC(nb);
   i += nb;
   return true;
diff --git a/src/progs/direct/base/direct_18F.cpp b/src/progs/direct/base/direct_18F.cpp
index 5760bf8..0ad5533 100644
--- a/src/progs/direct/base/direct_18F.cpp
+++ b/src/progs/direct/base/direct_18F.cpp
@@ -17,7 +17,7 @@ bool Direct::P18F::skipMaskWords(Pic::MemoryRangeType type, const Device::Array
 {
   if (forceProgram) return false;
   for (uint k=0; k<nb; k++)
-    if ( data[i+k]!=device().tqmask(type) ) return false;
+    if ( data[i+k]!=device().mask(type) ) return false;
   i += nb;
   return true;
 }
@@ -82,7 +82,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const
       nbWords = findNonMaskEnd(type, wdata)+1;
     }
   }
-  BitValue tqmask = device().tqmask(type);
+  BitValue mask = device().mask(type);
   //qDebug("read %s %i", Pic::MEMORY_RANGE_TYPE_DATA[type].label, device().nbWords(type));
   //pulseEngine("w300000"); // what for ?
   directAccess(type);
@@ -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").maskWith(tqmask);
+        data[i] = pulseEngine("r").maskWith(mask);
         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").maskWith(tqmask);
+        data[i] = pulseEngine("R").maskWith(mask);
         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.maskWith(tqmask);
+        data[i] = w.maskWith(mask);
         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;
diff --git a/src/progs/direct/gui/direct_config_widget.cpp b/src/progs/direct/gui/direct_config_widget.cpp
index fc7b867..36a8f11 100644
--- a/src/progs/direct/gui/direct_config_widget.cpp
+++ b/src/progs/direct/gui/direct_config_widget.cpp
@@ -18,17 +18,17 @@
 #include "progs/direct/base/direct_prog.h"
 
 //-----------------------------------------------------------------------------
-::Programmer::ConfigWidget *Direct::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Direct::GroupUI::createConfigWidget(TQWidget *parent) const
 {
-  return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent);
+  return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent);
 }
 
 //-----------------------------------------------------------------------------
 const char * const INV_PIN_LABEL = I18N_NOOP("Check this option if your hardware uses negative logic for this pin.");
 const char * const DELAY_LABEL = I18N_NOOP("Some programming cards need low clock rate:\nadding delay to clock pulses might help.");
 
-Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit)
-  : ::Hardware::HConfigWidget(base, tqparent, edit)
+Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit)
+  : ::Hardware::HConfigWidget(base, parent, edit)
 {
   // pins assignment
   TQGroupBox *groupb = new TQGroupBox(1,Qt::Horizontal, i18n("Pin assignment"), this);
@@ -239,11 +239,11 @@ Hardware::Data *Direct::HConfigWidget::data() const
 }
 
 //-----------------------------------------------------------------------------
-Direct::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent)
-  : ::Hardware::ConfigWidget(new ::Direct::PicBase(group, 0), new Config, tqparent)
+Direct::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *parent)
+  : ::Hardware::ConfigWidget(new ::Direct::PicBase(group, 0), new Config, parent)
 {}
 
-Hardware::HConfigWidget *Direct::ConfigWidget::createHardwareConfigWidget(TQWidget *tqparent, bool edit) const
+Hardware::HConfigWidget *Direct::ConfigWidget::createHardwareConfigWidget(TQWidget *parent, bool edit) const
 {
-  return new HConfigWidget(*_base, tqparent, edit);
+  return new HConfigWidget(*_base, parent, edit);
 }
diff --git a/src/progs/direct/gui/direct_config_widget.h b/src/progs/direct/gui/direct_config_widget.h
index 093e9fa..d61be1a 100644
--- a/src/progs/direct/gui/direct_config_widget.h
+++ b/src/progs/direct/gui/direct_config_widget.h
@@ -22,7 +22,7 @@ namespace Direct
 class GroupUI : public ::Programmer::GroupUI
 {
 public:
-  virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const;
+  virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const;
   virtual bool hasAdvancedDialog() const { return false; }
   virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, TQWidget *) const { return 0; }
 };
@@ -33,7 +33,7 @@ class HConfigWidget : public ::Hardware::HConfigWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-  HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit);
+  HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit);
   virtual bool set(const Port::Description &pd, const ::Hardware::Data &data);
   virtual ::Hardware::Data *data() const;
 
@@ -67,8 +67,8 @@ class ConfigWidget : public ::Hardware::ConfigWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-  ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent);
-  virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(TQWidget *tqparent, bool edit) const;
+  ConfigWidget(const ::Programmer::Group &group, TQWidget *parent);
+  virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(TQWidget *parent, bool edit) const;
 };
 
 } // namespace