diff options
Diffstat (limited to 'src/devices/pic')
-rw-r--r-- | src/devices/pic/gui/pic_config_word_editor.cpp | 2 | ||||
-rw-r--r-- | src/devices/pic/gui/pic_register_view.cpp | 4 | ||||
-rw-r--r-- | src/devices/pic/prog/pic_debug.cpp | 8 | ||||
-rw-r--r-- | src/devices/pic/prog/pic_debug.h | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp index 67c5cc9..39430ca 100644 --- a/src/devices/pic/gui/pic_config_word_editor.cpp +++ b/src/devices/pic/gui/pic_config_word_editor.cpp @@ -114,7 +114,7 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd connect(_mdb, TQT_SIGNAL(modified()), TQT_SLOT(updateDisplay())); hbox->addWidget(_mdb); KPushButton *button = new KPushButton(i18n("Details..."), this); - button->setFixedHeight(button->tqsizeHint().height()); + button->setFixedHeight(button->sizeHint().height()); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog())); hbox->addWidget(button); hbox->addStretch(1); diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp index b640036..1cba9c9 100644 --- a/src/devices/pic/gui/pic_register_view.cpp +++ b/src/devices/pic/gui/pic_register_view.cpp @@ -46,7 +46,7 @@ Pic::BankWidget::BankWidget(uint i, TQWidget *parent) if ( (i/2)==0 ) { TQString title = ((i%2)==0 ? i18n("Access Bank (low)") : i18n("Access Bank (high)")); TQLabel *label = new TQLabel(title, this); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); top->addMultiCellWidget(label, row,row, 0,6, AlignHCenter); } else { _bankCombo = new TQComboBox(this); @@ -59,7 +59,7 @@ Pic::BankWidget::BankWidget(uint i, TQWidget *parent) } } else { TQLabel *label = new TQLabel(i18n("Bank %1").tqarg(i), this); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); top->addMultiCellWidget(label, row,row, 0,6, AlignHCenter); } row++; diff --git a/src/devices/pic/prog/pic_debug.cpp b/src/devices/pic/prog/pic_debug.cpp index 9434a74..7dda5c2 100644 --- a/src/devices/pic/prog/pic_debug.cpp +++ b/src/devices/pic/prog/pic_debug.cpp @@ -20,7 +20,7 @@ Register::TypeData Debugger::PicBase::registerTypeData(const TQString &name) con return Register::TypeData(rdata.sfrs[name].address, rdata.nbChars()); } -bool Debugger::PicBase::updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits) +bool Debugger::PicBase::updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits) { const Pic::RegistersData &rdata = device()->registersData(); BitValue tris; @@ -65,7 +65,7 @@ const Debugger::PicBase &Debugger::PicSpecific::base() const return static_cast<PicBase &>(_base); } -bool Debugger::PicSpecific::updatetqStatus() +bool Debugger::PicSpecific::updateStatus() { if ( !Debugger::manager->readRegister(base().pcTypeData()) ) return false; if ( !Debugger::manager->readRegister(base().registerTypeData("STATUS")) ) return false; @@ -92,9 +92,9 @@ TQString Debugger::P16FSpecific::statusString() const } //---------------------------------------------------------------------------- -bool Debugger::P18FSpecific::updatetqStatus() +bool Debugger::P18FSpecific::updateStatus() { - if ( !PicSpecific::updatetqStatus() ) return false; + if ( !PicSpecific::updateStatus() ) return false; if ( !Debugger::manager->readRegister(base().registerTypeData("BSR")) ) return false; return true; } diff --git a/src/devices/pic/prog/pic_debug.h b/src/devices/pic/prog/pic_debug.h index ce08387..d73aeee 100644 --- a/src/devices/pic/prog/pic_debug.h +++ b/src/devices/pic/prog/pic_debug.h @@ -25,7 +25,7 @@ public: const Pic::Data &device() const { return static_cast<const Pic::Data &>(*_base.device()); } PicBase &base(); const PicBase &base() const; - virtual bool updatetqStatus(); + virtual bool updateStatus(); virtual Register::TypeData wregTypeData() const = 0; }; @@ -44,7 +44,7 @@ class P18FSpecific : public PicSpecific public: P18FSpecific(Debugger::Base &base) : PicSpecific(base) {} virtual TQString statusString() const; - virtual bool updatetqStatus(); + virtual bool updateStatus(); virtual Register::TypeData wregTypeData() const; }; @@ -57,7 +57,7 @@ public: const PicSpecific *deviceSpecific() const { return static_cast<const PicSpecific *>(_deviceSpecific); } const Pic::Data *device() const { return static_cast<const Pic::Data *>(Debugger::Base::device()); } Register::TypeData registerTypeData(const TQString &name) const; - virtual bool updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits); + virtual bool updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits); }; } // namespace |