3 files changed, 13 insertions, 13 deletions
diff --git a/src/progs/psp/base/psp.cpp b/src/progs/psp/base/psp.cpp
index 188fbcb..0f86180 100644
--- a/src/progs/psp/base/psp.cpp
+++ b/src/progs/psp/base/psp.cpp
@@ -46,7 +46,7 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data)
   array[0] = v.byte(1);
   array[1] = v.byte(0);
   // address word width
-  v = data.tqmask(Pic::MemoryRangeType::Code);
+  v = data.mask(Pic::MemoryRangeType::Code);
   array[2] = v.byte(1);
   array[3] = v.byte(0);
   // data word width
@@ -59,12 +59,12 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data)
     if ( data.nbBytesWord(Pic::MemoryRangeType::UserId)==1 ) v += v << 8;
     array[6] = v.byte(1);
     array[7] = v.byte(0);
-    // user id tqmask
+    // user id mask
     array[8] = v.byte(1);
     array[9] = v.byte(0);
   }
 
-  // memory config tqmask
+  // memory config mask
   array[10] = config[0];
   array[11] = config[1];
   array[12] = config[16];
@@ -72,20 +72,20 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data)
 
   if ( data.isReadable(Pic::MemoryRangeType::Eeprom) ) {
     // memory eeprom width
-    v = data.tqmask(Pic::MemoryRangeType::Eeprom);
+    v = data.mask(Pic::MemoryRangeType::Eeprom);
     array[14] = v.byte(1);
     array[15] = v.byte(0);
-    // memory eeprom tqmask
+    // memory eeprom mask
     array[16] = v.byte(1);
     array[17] = v.byte(0);
   }
 
   if ( data.isReadable(Pic::MemoryRangeType::Cal) ) {
     // memory calibration width
-    v = data.tqmask(Pic::MemoryRangeType::Cal);
+    v = data.mask(Pic::MemoryRangeType::Cal);
     array[18] = v.byte(1);
     array[19] = v.byte(0);
-    // memory calibration tqmask
+    // memory calibration mask
     array[20] = v.byte(1);
     array[21] = v.byte(0);
   }
diff --git a/src/progs/psp/gui/psp_group_ui.cpp b/src/progs/psp/gui/psp_group_ui.cpp
index ac9c70c..982c4e9 100644
--- a/src/progs/psp/gui/psp_group_ui.cpp
+++ b/src/progs/psp/gui/psp_group_ui.cpp
@@ -11,12 +11,12 @@
 #include "progs/gui/prog_config_widget.h"
 #include "devices/pic/gui/pic_prog_group_ui.h"
 
-::Programmer::ConfigWidget *Psp::GroupUI::createConfigWidget(TQWidget *tqparent) const
+::Programmer::ConfigWidget *Psp::GroupUI::createConfigWidget(TQWidget *parent) const
 {
-  return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent);
+  return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent);
 }
 
-::Programmer::AdvancedDialog *Psp::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
+::Programmer::AdvancedDialog *Psp::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const
 {
-  return new ::Programmer::PicAdvancedDialog(static_cast< ::Programmer::PicBase &>(base), tqparent, "psp_advanced_dialog");
+  return new ::Programmer::PicAdvancedDialog(static_cast< ::Programmer::PicBase &>(base), parent, "psp_advanced_dialog");
 }
diff --git a/src/progs/psp/gui/psp_group_ui.h b/src/progs/psp/gui/psp_group_ui.h
index be0b4ac..a856bcf 100644
--- a/src/progs/psp/gui/psp_group_ui.h
+++ b/src/progs/psp/gui/psp_group_ui.h
@@ -18,9 +18,9 @@ class Group;
 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 true; }
-  virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const;
+  virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const;
 };
 
 } // namespace