From 9d9fe02a944fe0719c2475739411727a729251ad Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:14:26 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/progs/base/generic_debug.cpp | 2 +- src/progs/base/generic_debug.h | 4 ++-- src/progs/direct/gui/direct_config_widget.cpp | 10 +++++----- src/progs/direct/gui/direct_config_widget.h | 2 +- src/progs/gpsim/base/gpsim_debug.cpp | 2 +- src/progs/gpsim/base/gpsim_debug.h | 2 +- src/progs/gpsim/gui/gpsim_group_ui.cpp | 4 ++-- src/progs/gpsim/gui/gpsim_group_ui.h | 2 +- src/progs/gui/port_selector.cpp | 2 +- src/progs/gui/port_selector.h | 2 +- src/progs/gui/prog_config_center.cpp | 2 +- src/progs/gui/prog_config_widget.h | 2 +- src/progs/manager/debug_manager.cpp | 2 +- src/progs/pickit2v2/base/pickit2v2.cpp | 4 ++-- src/progs/pickit2v2/base/pickit2v2.h | 4 ++-- src/progs/pickit2v2/base/pickit2v2_prog.cpp | 2 +- src/progs/sdcdb/base/sdcdb_debug.cpp | 2 +- src/progs/sdcdb/base/sdcdb_debug.h | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/progs') diff --git a/src/progs/base/generic_debug.cpp b/src/progs/base/generic_debug.cpp index 46c6597..ed86c35 100644 --- a/src/progs/base/generic_debug.cpp +++ b/src/progs/base/generic_debug.cpp @@ -53,7 +53,7 @@ bool Debugger::Base::init() bool Debugger::Base::update() { if ( !updateState() ) return false; - if ( _programmer.state()==::Programmer::Halted ) return _deviceSpecific->updatetqStatus(); + if ( _programmer.state()==::Programmer::Halted ) return _deviceSpecific->updateStatus(); return true; } diff --git a/src/progs/base/generic_debug.h b/src/progs/base/generic_debug.h index 48f9e60..5486ad1 100644 --- a/src/progs/base/generic_debug.h +++ b/src/progs/base/generic_debug.h @@ -44,7 +44,7 @@ public: Register::TypeData pcTypeData() const; virtual bool readRegister(const Register::TypeData &data, BitValue &value) = 0; virtual bool writeRegister(const Register::TypeData &data, BitValue value) = 0; - virtual bool updatePorttqStatus(uint index, TQMap &bits) = 0; + virtual bool updatePortStatus(uint index, TQMap &bits) = 0; protected: Programmer::Base &_programmer; @@ -68,7 +68,7 @@ class DeviceSpecific : public Log::Base { public: DeviceSpecific(Debugger::Base &base) : Log::Base(base), _base(base) {} - virtual bool updatetqStatus() = 0; + virtual bool updateStatus() = 0; virtual TQString statusString() const = 0; protected: diff --git a/src/progs/direct/gui/direct_config_widget.cpp b/src/progs/direct/gui/direct_config_widget.cpp index 36a8f11..b5f651c 100644 --- a/src/progs/direct/gui/direct_config_widget.cpp +++ b/src/progs/direct/gui/direct_config_widget.cpp @@ -57,7 +57,7 @@ Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, _testLabels[i] = new TQLabel(w); TQToolTip::add(_testcbs[i], PIN_DATA[i].testComment); grid->addWidget(_testLabels[i], i, 4); - updateTesttqStatus(PinType(i), false); + updateTestStatus(PinType(i), false); } else { _testcbs[i] = 0; _testLabels[i] = 0; @@ -150,11 +150,11 @@ void Direct::HConfigWidget::updateTestPin(PinType ptype) Q_ASSERT( _connected && ptype!=DataIn ); bool on = _testcbs[ptype]->isChecked(); hardware()->setPin(ptype, on); - updateTesttqStatus(ptype, on); + updateTestStatus(ptype, on); if ( ptype==Vpp ) updateDataIn(); } -void Direct::HConfigWidget::updateTesttqStatus(PinType ptype, bool on) +void Direct::HConfigWidget::updateTestStatus(PinType ptype, bool on) { if (on) _testLabels[ptype]->setText(i18n(PIN_DATA[ptype].onLabel)); else _testLabels[ptype]->setText(i18n(PIN_DATA[ptype].offLabel)); @@ -163,7 +163,7 @@ void Direct::HConfigWidget::updateTesttqStatus(PinType ptype, bool on) void Direct::HConfigWidget::updateDataIn() { bool on = hardware()->readBit(); - updateTesttqStatus(DataIn, on); + updateTestStatus(DataIn, on); _testcbs[DataIn]->setChecked(on); } @@ -204,7 +204,7 @@ bool Direct::HConfigWidget::set(const Port::Description &pd, const ::Hardware::D if (_edit) { for (uint i=0; isetEnabled(_connected); - updateTesttqStatus(PinType(i), false); + updateTestStatus(PinType(i), false); } if ( _connected ) _timerPollDataOut->start(100); _sendBitsButton->setEnabled(_connected); diff --git a/src/progs/direct/gui/direct_config_widget.h b/src/progs/direct/gui/direct_config_widget.h index d61be1a..8d7d5cb 100644 --- a/src/progs/direct/gui/direct_config_widget.h +++ b/src/progs/direct/gui/direct_config_widget.h @@ -55,7 +55,7 @@ private: void sendBits(uint d, int nbb); void updateTestPin(PinType ptype); - void updateTesttqStatus(PinType ptype, bool on); + void updateTestStatus(PinType ptype, bool on); uint pin(PinType ptype) const; void updatePin(PinType ptype); Hardware *hardware() { return static_cast(_hardware); } diff --git a/src/progs/gpsim/base/gpsim_debug.cpp b/src/progs/gpsim/base/gpsim_debug.cpp index eca9841..c446bad 100644 --- a/src/progs/gpsim/base/gpsim_debug.cpp +++ b/src/progs/gpsim/base/gpsim_debug.cpp @@ -195,7 +195,7 @@ bool GPSim::Debugger::writeWreg(BitValue value) return setRegister("W", value); } -bool GPSim::Debugger::updatePorttqStatus(uint index, TQMap &bits) +bool GPSim::Debugger::updatePortStatus(uint index, TQMap &bits) { for (uint i=0; iregistersData().hasPortBit(index, i) ) continue; diff --git a/src/progs/gpsim/base/gpsim_debug.h b/src/progs/gpsim/base/gpsim_debug.h index 7c258d9..920bc9a 100644 --- a/src/progs/gpsim/base/gpsim_debug.h +++ b/src/progs/gpsim/base/gpsim_debug.h @@ -45,7 +45,7 @@ public: virtual bool setBreakpoints(const TQValueList
&list); virtual bool readRegister(const Register::TypeData &data, BitValue &value); virtual bool writeRegister(const Register::TypeData &data, BitValue value); - virtual bool updatePorttqStatus(uint index, TQMap &bits); + virtual bool updatePortStatus(uint index, TQMap &bits); private: uint _nbBreakpoints; diff --git a/src/progs/gpsim/gui/gpsim_group_ui.cpp b/src/progs/gpsim/gui/gpsim_group_ui.cpp index 931ffaf..02d7559 100644 --- a/src/progs/gpsim/gui/gpsim_group_ui.cpp +++ b/src/progs/gpsim/gui/gpsim_group_ui.cpp @@ -23,10 +23,10 @@ GPSim::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *pa _status = new TQLabel(this); addWidget(_status, row,row, 1,1); - TQTimer::singleShot(0, this, TQT_SLOT(updatetqStatus())); + TQTimer::singleShot(0, this, TQT_SLOT(updateStatus())); } -void GPSim::ConfigWidget::updatetqStatus() +void GPSim::ConfigWidget::updateStatus() { VersionData version; ProcessManager manager(0); diff --git a/src/progs/gpsim/gui/gpsim_group_ui.h b/src/progs/gpsim/gui/gpsim_group_ui.h index 1978574..26c69cc 100644 --- a/src/progs/gpsim/gui/gpsim_group_ui.h +++ b/src/progs/gpsim/gui/gpsim_group_ui.h @@ -23,7 +23,7 @@ public: ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); private slots: - void updatetqStatus(); + void updateStatus(); private: TQLabel *_status; diff --git a/src/progs/gui/port_selector.cpp b/src/progs/gui/port_selector.cpp index f34d426..32b1887 100644 --- a/src/progs/gui/port_selector.cpp +++ b/src/progs/gui/port_selector.cpp @@ -101,7 +101,7 @@ void PortSelector::addPortType(const Port::Description &pd) } } -void PortSelector::settqStatus(PortType ptype, const TQString &message) +void PortSelector::setStatus(PortType ptype, const TQString &message) { _pending = false; FOR_EACH(PortType, type) { diff --git a/src/progs/gui/port_selector.h b/src/progs/gui/port_selector.h index 5127976..6673c96 100644 --- a/src/progs/gui/port_selector.h +++ b/src/progs/gui/port_selector.h @@ -27,7 +27,7 @@ public: void setGroup(const Programmer::Group &group); Port::Description portDescription() const { return Port::Description(type(), device(type())); } void saveConfig(); - void settqStatus(PortType type, const TQString &message); + void setStatus(PortType type, const TQString &message); signals: void changed(); diff --git a/src/progs/gui/prog_config_center.cpp b/src/progs/gui/prog_config_center.cpp index f781280..5e5ca96 100644 --- a/src/progs/gui/prog_config_center.cpp +++ b/src/progs/gui/prog_config_center.cpp @@ -86,7 +86,7 @@ void Programmer::SelectConfigWidget::portChanged() delete config; TQWidget *w = _stack->item(_combo->currentItem()); bool ok = static_cast< ::Programmer::ConfigWidget *>(w)->setPort(hd); - _portSelector->settqStatus(hd.port.type, ok ? i18n("Connection: Ok") : i18n("Connection: Error")); + _portSelector->setStatus(hd.port.type, ok ? i18n("Connection: Ok") : i18n("Connection: Error")); } TQPixmap Programmer::SelectConfigWidget::pixmap() const diff --git a/src/progs/gui/prog_config_widget.h b/src/progs/gui/prog_config_widget.h index 2da2330..0ec3fd0 100644 --- a/src/progs/gui/prog_config_widget.h +++ b/src/progs/gui/prog_config_widget.h @@ -32,7 +32,7 @@ public: virtual bool setPort(const HardwareDescription &hd); signals: - void updatePorttqStatus(bool ok); + void updatePortStatus(bool ok); protected: const Group &_group; diff --git a/src/progs/manager/debug_manager.cpp b/src/progs/manager/debug_manager.cpp index d8b88b2..7a47d5b 100644 --- a/src/progs/manager/debug_manager.cpp +++ b/src/progs/manager/debug_manager.cpp @@ -213,7 +213,7 @@ bool Debugger::Manager::updateRegister(const Register::TypeData &data) int index = rdata->portIndex(data.address()); if ( index!=-1 ) { TQMap data; - if ( !debugger()->updatePorttqStatus(index, data) ) return false; + if ( !debugger()->updatePortStatus(index, data) ) return false; Register::list().setPortData(index, data); } } diff --git a/src/progs/pickit2v2/base/pickit2v2.cpp b/src/progs/pickit2v2/base/pickit2v2.cpp index 478a0f7..fbd9997 100644 --- a/src/progs/pickit2v2/base/pickit2v2.cpp +++ b/src/progs/pickit2v2/base/pickit2v2.cpp @@ -45,9 +45,9 @@ bool Pickit2V2::Hardware::setTarget() return true; } -bool Pickit2V2::Hardware::readtqStatus(ushort &status) +bool Pickit2V2::Hardware::readStatus(ushort &status) { - if ( !port().command(ReadtqStatus) ) return false; + if ( !port().command(ReadStatus) ) return false; Array a; if ( !port().receive(a) ) return false; status = (a[1] << 8) + a[0]; diff --git a/src/progs/pickit2v2/base/pickit2v2.h b/src/progs/pickit2v2/base/pickit2v2.h index d1bd567..f50adb1 100644 --- a/src/progs/pickit2v2/base/pickit2v2.h +++ b/src/progs/pickit2v2/base/pickit2v2.h @@ -18,7 +18,7 @@ namespace Pickit2V2 enum FirmwareCommand { EnterBootloader = 0x42, NoOperation = 0x5A, FirmwareVersion = 0x76, - SetVdd = 0xA0, SetVpp = 0xA1, ReadtqStatus = 0xA2, ReadVoltages = 0xA3, + SetVdd = 0xA0, SetVpp = 0xA1, ReadStatus = 0xA2, ReadVoltages = 0xA3, DownloadScript = 0xA4, RunScript = 0xA5, ExecuteScript = 0xA6, ClearDownloadBuffer = 0xA7, DownloadData = 0xA8, ClearUploadBuffer = 0xA9, UploadData = 0xAA, ClearScriptBuffer = 0xAB, UploadDataNoLen = 0xAC, @@ -94,7 +94,7 @@ public: bool setTarget(); bool setFastProgramming(bool fast); virtual bool readVoltages(VoltagesData &voltagesData); - bool readtqStatus(ushort &status); + bool readStatus(ushort &status); bool readMemory(Pic::MemoryRangeType type, ::Device::Array &data, const ::Programmer::VerifyData *vdata); bool writeMemory(Pic::MemoryRangeType type, const ::Device::Array &data, bool force); bool eraseAll(); diff --git a/src/progs/pickit2v2/base/pickit2v2_prog.cpp b/src/progs/pickit2v2/base/pickit2v2_prog.cpp index 67788e9..ab378c4 100644 --- a/src/progs/pickit2v2/base/pickit2v2_prog.cpp +++ b/src/progs/pickit2v2/base/pickit2v2_prog.cpp @@ -92,7 +92,7 @@ bool Pickit2V2::Base::setTarget() bool Pickit2V2::Base::selfTest(bool ask) { ushort status; - if ( !hardware().readtqStatus(status) ) return false; + if ( !hardware().readStatus(status) ) return false; TQString error; if ( status & VppError ) error += i18n("Vpp voltage level error; "); if ( status & VddError ) error += i18n("Vdd voltage level error; "); diff --git a/src/progs/sdcdb/base/sdcdb_debug.cpp b/src/progs/sdcdb/base/sdcdb_debug.cpp index d8d4ad4..ba0e78f 100644 --- a/src/progs/sdcdb/base/sdcdb_debug.cpp +++ b/src/progs/sdcdb/base/sdcdb_debug.cpp @@ -194,7 +194,7 @@ bool GPSim::Debugger::writeWreg(BitValue value) return setRegister("W", value); } -bool GPSim::Debugger::updatePorttqStatus(uint index, TQMap &bits) +bool GPSim::Debugger::updatePortStatus(uint index, TQMap &bits) { for (uint i=0; iregistersData().hasPortBit(index, i) ) continue; diff --git a/src/progs/sdcdb/base/sdcdb_debug.h b/src/progs/sdcdb/base/sdcdb_debug.h index e1f109b..18f3e85 100644 --- a/src/progs/sdcdb/base/sdcdb_debug.h +++ b/src/progs/sdcdb/base/sdcdb_debug.h @@ -45,7 +45,7 @@ public: virtual bool setBreakpoints(const TQValueList
&list); virtual bool readRegister(const Register::TypeData &data, BitValue &value); virtual bool writeRegister(const Register::TypeData &data, BitValue value); - virtual bool updatePorttqStatus(uint index, TQMap &bits); + virtual bool updatePortStatus(uint index, TQMap &bits); private: uint _nbBreakpoints; -- cgit v1.2.1