Rename old tq methods that no longer need a unique name

9 files changed, 25 insertions, 25 deletions

diff --git a/src/devices/base/device_group.cpp b/src/devices/base/device_group.cpp
index 94586bd..fa26d19 100644
--- a/src/devices/base/device_group.cpp
+++ b/src/devices/base/device_group.cpp
@@ -12,16 +12,16 @@
 #  include <tqpainter.h>
 #  include <kglobal.h>
 
-TQColor Device::statusColor(tqStatus status)
+TQColor Device::statusColor(Status status)
 {
   switch (status.type()) {
-    case tqStatus::Future:         return TQt::blue;
-    case tqStatus::InProduction:   return TQt::green;
-    case tqStatus::Mature:
-    case tqStatus::NotRecommended: return TQColor("orange");
-    case tqStatus::EOL:            return TQt::red;
-    case tqStatus::Unknown:
-    case tqStatus::Nb_Types: break;
+    case Status::Future:         return TQt::blue;
+    case Status::InProduction:   return TQt::green;
+    case Status::Mature:
+    case Status::NotRecommended: return TQColor("orange");
+    case Status::EOL:            return TQt::red;
+    case Status::Unknown:
+    case Status::Nb_Types: break;
   }
   return TQt::black;
 }
diff --git a/src/devices/base/device_group.h b/src/devices/base/device_group.h
index 8414515..1ecc6d1 100644
--- a/src/devices/base/device_group.h
+++ b/src/devices/base/device_group.h
@@ -61,7 +61,7 @@ protected:
 
 //----------------------------------------------------------------------------
 #if !defined(NO_KDE)
-extern TQColor statusColor(tqStatus status);
+extern TQColor statusColor(Status status);
 extern TQPixmap vddGraph(const TQString &xLabel, const TQString &yLabel, const TQValueVector<RangeBox> &boxes);
 extern const Package *barPackage(const char *name, const Data &data);
 extern TQPixmap pinsGraph(const Package &package);
diff --git a/src/devices/base/generic_device.cpp b/src/devices/base/generic_device.cpp
index c0109de..d147e4b 100644
--- a/src/devices/base/generic_device.cpp
+++ b/src/devices/base/generic_device.cpp
@@ -13,7 +13,7 @@
 #include "register.h"
 
 //-----------------------------------------------------------------------------
-const Device::tqStatus::Data Device::tqStatus::DATA[Nb_Types] = {
+const Device::Status::Data Device::Status::DATA[Nb_Types] = {
   { "IP",       I18N_NOOP("In Production")                  },
   { "Future",   I18N_NOOP("Future Product")                 },
   { "NR",       I18N_NOOP("Not Recommended for New Design") },
diff --git a/src/devices/base/generic_device.h b/src/devices/base/generic_device.h
index 73f9b15..4b52060 100644
--- a/src/devices/base/generic_device.h
+++ b/src/devices/base/generic_device.h
@@ -19,9 +19,9 @@
 namespace Device
 {
 //----------------------------------------------------------------------------
-BEGIN_DECLARE_ENUM(tqStatus)
+BEGIN_DECLARE_ENUM(Status)
   InProduction = 0, Future, NotRecommended, EOL, Unknown, Mature
-END_DECLARE_ENUM_STD(tqStatus)
+END_DECLARE_ENUM_STD(Status)
 
 BEGIN_DECLARE_ENUM(MemoryTechnology)
   Flash = 0, Eprom, Rom, Romless
@@ -121,7 +121,7 @@ public:
   virtual TQString name() const { return _name; }
   virtual TQString fname(Special) const { return _name; }
   virtual TQString listViewGroup() const = 0;
-  tqStatus status() const { return _status; }
+  Status status() const { return _status; }
   const Documents &documents() const { return _documents; }
   const TQStringList &alternatives() const { return _alternatives; }
   MemoryTechnology memoryTechnology() const { return _memoryTechnology; }
@@ -141,7 +141,7 @@ protected:
   TQString _name;
   Documents _documents;
   TQStringList _alternatives;
-  tqStatus _status;
+  Status _status;
   TQValueVector<FrequencyRange> _frequencyRanges;
   MemoryTechnology _memoryTechnology;
   RegistersData *_registersData;
diff --git a/src/devices/gui/register_view.cpp b/src/devices/gui/register_view.cpp
index 264a04b..b59fbb3 100644
--- a/src/devices/gui/register_view.cpp
+++ b/src/devices/gui/register_view.cpp
@@ -176,7 +176,7 @@ void Register::LineEdit::updateText()
   setText(_value.isInitialized() ? toLabel(_base, _value, _nbChars) : "--");
   uint w = 2*frameWidth() + maxLabelWidth(_base, _nbChars, font());
   setFixedWidth(w+5);
-  setFixedHeight(tqminimumSizeHint().height());
+  setFixedHeight(minimumSizeHint().height());
 }
 
 void Register::LineEdit::setValue(NumberBase base, BitValue value, uint nbChars)
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