From f7ceb2957839027e8027a9a4c0dfff730cb9b704 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: 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 --- src/progs/gui/hardware_config_widget.cpp | 8 ++++---- src/progs/gui/hardware_config_widget.h | 8 ++++---- src/progs/gui/port_selector.cpp | 4 ++-- src/progs/gui/port_selector.h | 2 +- src/progs/gui/prog_config_widget.cpp | 4 ++-- src/progs/gui/prog_config_widget.h | 2 +- src/progs/gui/prog_group_ui.cpp | 12 ++++++------ src/progs/gui/prog_group_ui.h | 10 +++++----- 8 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/progs/gui') diff --git a/src/progs/gui/hardware_config_widget.cpp b/src/progs/gui/hardware_config_widget.cpp index 999a188..193fdfb 100644 --- a/src/progs/gui/hardware_config_widget.cpp +++ b/src/progs/gui/hardware_config_widget.cpp @@ -17,8 +17,8 @@ #include "common/gui/misc_gui.h" //----------------------------------------------------------------------------- -Hardware::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit) - : TQFrame(tqparent, "hardware_config_widget"), _edit(edit), _connected(false), _base(base) +Hardware::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit) + : TQFrame(parent, "hardware_config_widget"), _edit(edit), _connected(false), _base(base) { _hardware = 0; @@ -94,8 +94,8 @@ void Hardware::EditDialog::slotCancel() } //----------------------------------------------------------------------------- -Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *tqparent) - : ::Programmer::ConfigWidget(base->group(), tqparent), _base(base), _config(config), _hc(0) +Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *parent) + : ::Programmer::ConfigWidget(base->group(), parent), _base(base), _config(config), _hc(0) { // programmer combo uint row = numRows(); diff --git a/src/progs/gui/hardware_config_widget.h b/src/progs/gui/hardware_config_widget.h index 2f94e81..d6a943f 100644 --- a/src/progs/gui/hardware_config_widget.h +++ b/src/progs/gui/hardware_config_widget.h @@ -29,7 +29,7 @@ class HConfigWidget : public TQFrame Q_OBJECT TQ_OBJECT public: - HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit); + HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit); virtual ~HConfigWidget() { delete _hardware; } virtual bool set(const Port::Description &pd, const Data &data) = 0; virtual Data *data() const = 0; @@ -50,7 +50,7 @@ class EditDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - EditDialog(ConfigWidget *tqparent, const TQString &name, const Port::Description &pd, Data *data); + EditDialog(ConfigWidget *parent, const TQString &name, const Port::Description &pd, Data *data); TQString savedName() const { return _savedName; } private slots: @@ -71,11 +71,11 @@ class ConfigWidget : public ::Programmer::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *tqparent); + ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *parent); virtual ~ConfigWidget() { delete _base; } virtual void saveConfig(); virtual bool setPort(const ::Programmer::HardwareDescription &hd); - virtual HConfigWidget *createHardwareConfigWidget(TQWidget *tqparent, bool edit) const = 0; + virtual HConfigWidget *createHardwareConfigWidget(TQWidget *parent, bool edit) const = 0; private slots: void editClicked(); diff --git a/src/progs/gui/port_selector.cpp b/src/progs/gui/port_selector.cpp index 644caaf..f34d426 100644 --- a/src/progs/gui/port_selector.cpp +++ b/src/progs/gui/port_selector.cpp @@ -21,8 +21,8 @@ const char * const PortSelector::LABELS[PortType::Nb_Types] = { I18N_NOOP("Serial"), I18N_NOOP("Parallel"), I18N_NOOP("USB") }; -PortSelector::PortSelector(TQWidget *tqparent) - : TQFrame(tqparent, "port_selector"), _group(0), _main(0) +PortSelector::PortSelector(TQWidget *parent) + : TQFrame(parent, "port_selector"), _group(0), _main(0) { _top = new TQGridLayout(this, 1, 1, 0, 10); _top->setRowStretch(1, 1); diff --git a/src/progs/gui/port_selector.h b/src/progs/gui/port_selector.h index 86a0d4d..5127976 100644 --- a/src/progs/gui/port_selector.h +++ b/src/progs/gui/port_selector.h @@ -23,7 +23,7 @@ class PortSelector : public TQFrame Q_OBJECT TQ_OBJECT public: - PortSelector(TQWidget *tqparent); + PortSelector(TQWidget *parent); void setGroup(const Programmer::Group &group); Port::Description portDescription() const { return Port::Description(type(), device(type())); } void saveConfig(); diff --git a/src/progs/gui/prog_config_widget.cpp b/src/progs/gui/prog_config_widget.cpp index 5ff6047..1578e3b 100644 --- a/src/progs/gui/prog_config_widget.cpp +++ b/src/progs/gui/prog_config_widget.cpp @@ -17,8 +17,8 @@ #include "progs/base/prog_config.h" #include "progs/base/prog_group.h" -Programmer::ConfigWidget::ConfigWidget(const Group &group, TQWidget *tqparent) - : ::ConfigWidget(tqparent), _group(group) +Programmer::ConfigWidget::ConfigWidget(const Group &group, TQWidget *parent) + : ::ConfigWidget(parent), _group(group) { if ( group.properties() & NeedDeviceSpecificFirmware ) { uint row = numRows(); diff --git a/src/progs/gui/prog_config_widget.h b/src/progs/gui/prog_config_widget.h index 2dc8b7e..2da2330 100644 --- a/src/progs/gui/prog_config_widget.h +++ b/src/progs/gui/prog_config_widget.h @@ -25,7 +25,7 @@ class ConfigWidget: public ::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(const Group &group, TQWidget *tqparent); + ConfigWidget(const Group &group, TQWidget *parent); virtual void loadConfig(); const Group &group() const { return _group; } virtual void saveConfig(); diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp index 90643a0..2dd14ea 100644 --- a/src/progs/gui/prog_group_ui.cpp +++ b/src/progs/gui/prog_group_ui.cpp @@ -24,8 +24,8 @@ #include "devices/pic/prog/pic_prog.h" //---------------------------------------------------------------------------- -Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *tqparent) - : Pic::MemoryCalibrationEditor(0, const_cast(memory), tqparent) +Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *parent) + : Pic::MemoryCalibrationEditor(0, const_cast(memory), parent) {} void Programmer::StandaloneMemoryCalibrationEditor::init(bool first) @@ -39,15 +39,15 @@ void Programmer::StandaloneMemoryCalibrationEditor::init(bool first) //---------------------------------------------------------------------------- Programmer::ButtonContainer::ButtonContainer(const TQString &title, - TQObject *receiver, const char *updateSlot, TQWidget *tqparent) - : ::ButtonContainer(title, tqparent) + TQObject *receiver, const char *updateSlot, TQWidget *parent) + : ::ButtonContainer(title, parent) { if (receiver) button().appendAction(i18n("Read"), "reload", receiver, updateSlot); } //---------------------------------------------------------------------------- -Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *tqparent, const char *name) - : Dialog(IconList, i18n("Advanced Dialog"), Close, Close, tqparent, name, true, false), +Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const char *name) + : Dialog(IconList, i18n("Advanced Dialog"), Close, Close, parent, name, true, false), _base(base), _calEditor(0) { // programmer diff --git a/src/progs/gui/prog_group_ui.h b/src/progs/gui/prog_group_ui.h index edc15ee..47ae425 100644 --- a/src/progs/gui/prog_group_ui.h +++ b/src/progs/gui/prog_group_ui.h @@ -29,7 +29,7 @@ class StandaloneMemoryCalibrationEditor : public Pic::MemoryCalibrationEditor Q_OBJECT TQ_OBJECT public: - StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *tqparent); + StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *parent); virtual void init(bool first); virtual bool hasAction(Device::Action) const { return false; } @@ -44,7 +44,7 @@ class ButtonContainer : public ::ButtonContainer Q_OBJECT TQ_OBJECT public: - ButtonContainer(const TQString &title, TQObject *receiver, const char *updateSlot, TQWidget *tqparent); + ButtonContainer(const TQString &title, TQObject *receiver, const char *updateSlot, TQWidget *parent); }; //---------------------------------------------------------------------------- @@ -53,7 +53,7 @@ class AdvancedDialog : public Dialog Q_OBJECT TQ_OBJECT public: - AdvancedDialog(Base &base, TQWidget *tqparent, const char *name); + AdvancedDialog(Base &base, TQWidget *parent, const char *name); virtual void updateDisplay(); protected: @@ -80,9 +80,9 @@ private: class GroupUI : public ::Group::BaseGui { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const = 0; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const = 0; virtual bool hasAdvancedDialog() const = 0; - virtual AdvancedDialog *createAdvancedDialog(Base &base, TQWidget *tqparent) const = 0; + virtual AdvancedDialog *createAdvancedDialog(Base &base, TQWidget *parent) const = 0; }; inline const ::Programmer::GroupUI &groupui(const ::Programmer::Base &base) { return static_cast(*base.group().gui()); } -- cgit v1.2.1