Rename old tq methods that no longer need a unique name

(cherry picked from commit 9d9fe02a944fe0719c2475739411727a729251ad)

50 files changed, 139 insertions, 139 deletions

diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp
index ed63f86..238d336 100644
--- a/src/common/global/process.cpp
+++ b/src/common/global/process.cpp
@@ -146,13 +146,13 @@ bool Process::Base::isFilteredLine(const TQString &line)
 //----------------------------------------------------------------------------
 void Process::StringOutput::receivedStdout(KProcess*, char *data, int len)
 {
-  _stdout += TQString::tqfromLatin1(data, len);
+  _stdout += TQString::fromLatin1(data, len);
   emit stdoutDataReceived();
 }
 
 void Process::StringOutput::receivedStderr(KProcess*, char *data, int len)
 {
-  _stderr += TQString::tqfromLatin1(data, len);
+  _stderr += TQString::fromLatin1(data, len);
   emit stderrDataReceived();
 }
 
@@ -164,7 +164,7 @@ void Process::LineBase::receivedStdout(KProcess*, char *data, int len)
     if ( data[i]=='\n' ) {
       if ( !isFilteredLine(_stdout) ) addStdoutLine(_stdout);
       _stdout = TQString();
-    } else _stdout += TQString::tqfromLatin1(data + i, 1);
+    } else _stdout += TQString::fromLatin1(data + i, 1);
   }
   if ( !_process->isRunning() && !isFilteredLine(_stdout) ) addStdoutLine(_stdout);
   emit stdoutDataReceived();
@@ -177,7 +177,7 @@ void Process::LineBase::receivedStderr(KProcess*, char *data, int len)
     if ( data[i]=='\n' ) {
       if ( !isFilteredLine(_stderr) ) addStderrLine(_stderr);
       _stderr = TQString();
-    } else _stderr += TQString::tqfromLatin1(data + i, 1);
+    } else _stderr += TQString::fromLatin1(data + i, 1);
   }
   if ( !_process->isRunning() && !isFilteredLine(_stderr) ) addStderrLine(_stderr);
   emit stderrDataReceived();
diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp
index 1bf54cd..8df1564 100644
--- a/src/common/gui/editlistbox.cpp
+++ b/src/common/gui/editlistbox.cpp
@@ -53,7 +53,7 @@ void EditListBox::init(uint nbColumns, TQWidget *view)
     _moveDownButton = 0;
     _removeAllButton = 0;
     _resetButton = 0;
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 
     TQGridLayout *grid = new TQGridLayout(this, 1, 1, 0, KDialog::spacingHint());
     uint row = 0;
diff --git a/src/common/gui/hexword_gui.cpp b/src/common/gui/hexword_gui.cpp
index bf1430c..3030d65 100644
--- a/src/common/gui/hexword_gui.cpp
+++ b/src/common/gui/hexword_gui.cpp
@@ -125,12 +125,12 @@ bool GenericHexWordEditor::event(TQEvent *e)
   return TQLineEdit::event(e);
 }
 
-TQSize GenericHexWordEditor::tqsizeHint() const
+TQSize GenericHexWordEditor::sizeHint() const
 {
   return TQSize(maxCharWidth(NumberBase::Hex, font()) * (_nbChars+1), fontMetrics().height());
 }
 
-TQSize GenericHexWordEditor::tqminimumSizeHint() const
+TQSize GenericHexWordEditor::minimumSizeHint() const
 {
   return TQSize(maxCharWidth(NumberBase::Hex, font()) * (_nbChars+1), fontMetrics().height());
 }
diff --git a/src/common/gui/hexword_gui.h b/src/common/gui/hexword_gui.h
index a973291..2be2a75 100644
--- a/src/common/gui/hexword_gui.h
+++ b/src/common/gui/hexword_gui.h
@@ -35,8 +35,8 @@ Q_OBJECT
   TQ_OBJECT
 public:
   GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *parent);
-  virtual TQSize tqsizeHint() const;
-  virtual TQSize tqminimumSizeHint() const;
+  virtual TQSize sizeHint() const;
+  virtual TQSize minimumSizeHint() const;
 
 signals:
   void modified();
diff --git a/src/common/gui/key_gui.h b/src/common/gui/key_gui.h
index 5afce35..f40c5d2 100644
--- a/src/common/gui/key_gui.h
+++ b/src/common/gui/key_gui.h
@@ -77,7 +77,7 @@ public:
     ParentType::_widget->clear();
   }
   void fixMinimumWidth() {
-    ParentType::_widget->setMinimumWidth(ParentType::_widget->tqsizeHint().width());
+    ParentType::_widget->setMinimumWidth(ParentType::_widget->sizeHint().width());
   }
 
 protected:
diff --git a/src/common/gui/list_view.cpp b/src/common/gui/list_view.cpp
index 52bd32b..1e0cb66 100644
--- a/src/common/gui/list_view.cpp
+++ b/src/common/gui/list_view.cpp
@@ -62,8 +62,8 @@ bool ListView::eventFilter(TQObject *o, TQEvent *e)
             break;
           }
           case TQEvent::FocusOut: {
-            //qDebug("focus out %i %i=%i", tqApp->tqfocusWidget(), tqfocusWidget(), (*it)->_editWidgets[i]);
-            if ( tqApp->tqfocusWidget() && tqfocusWidget()==(*it)->_editWidgets[i] ) break;
+            //qDebug("focus out %i %i=%i", tqApp->focusWidget(), focusWidget(), (*it)->_editWidgets[i]);
+            if ( tqApp->focusWidget() && focusWidget()==(*it)->_editWidgets[i] ) break;
             //qDebug("ext");
             TQCustomEvent *e = new TQCustomEvent(9999);
             TQApplication::postEvent(o, e);
@@ -95,7 +95,7 @@ void ListViewToolTip::maybeTip(const TQPoint &p)
   if ( _listView==0 ) return;
   const TQListViewItem* item = _listView->itemAt(p);
   if ( item==0 ) return;
-  TQRect rect = _listView->tqitemRect(item);
+  TQRect rect = _listView->itemRect(item);
   if ( !rect.isValid() ) return;
   int col = _listView->header()->sectionAt(p.x());
   TQString text = _listView->tooltip(*item, col);
@@ -149,7 +149,7 @@ void EditListViewItem::startRename()
   _renaming = true;
   _editWidgets.resize(lv->columns());
   for (uint i=0; i<_editWidgets.count(); i++) {
-    TQRect r = lv->tqitemRect(this);
+    TQRect r = lv->itemRect(this);
     r = TQRect(lv->viewportToContents(r.topLeft()), r.size());
     r.setLeft(lv->header()->sectionPos(i));
     r.setWidth(lv->header()->sectionSize(i) - 1);
@@ -162,7 +162,7 @@ void EditListViewItem::startRename()
     if ( _editWidgets[i]==0 ) continue;
     _editWidgets[i]->installEventFilter(lv);
     lv->addChild(_editWidgets[i], r.x(), r.y());
-    uint w = TQMIN(r.width(), _editWidgets[i]->tqsizeHint().width());
+    uint w = TQMIN(r.width(), _editWidgets[i]->sizeHint().width());
     _editWidgets[i]->resize(w, r.height());
     lv->viewport()->setFocusProxy(_editWidgets[i]);
     _editWidgets[i]->setFocus();
@@ -191,9 +191,9 @@ void EditListViewItem::removeEditBox()
 
 void EditListViewItem::editDone(int col, const TQWidget *edit)
 {
-  if ( edit->tqmetaObject()->findProperty("text", true)!=-1 )
+  if ( edit->metaObject()->findProperty("text", true)!=-1 )
     emit listView()->itemRenamed(this, col, edit->property("text").toString());
-  else if ( edit->tqmetaObject()->findProperty("currentText", true)!=-1 )
+  else if ( edit->metaObject()->findProperty("currentText", true)!=-1 )
     emit listView()->itemRenamed(this, col, edit->property("currentText").toString());
 }
 
@@ -215,7 +215,7 @@ int EditListViewItem::width(const TQFontMetrics &fm, const TQListView *lv, int c
   int w = KListViewItem::width(fm, lv, col);
   TQWidget *edit = editWidgetFactory(col);
   if ( edit==0 ) return w;
-  w = TQMAX(w, edit->tqsizeHint().width());
+  w = TQMAX(w, edit->sizeHint().width());
   delete edit;
   return w;
 }
diff --git a/src/common/nokde/nokde_kaboutdata.cpp b/src/common/nokde/nokde_kaboutdata.cpp
index 6dd8f33..62d0d3d 100644
--- a/src/common/nokde/nokde_kaboutdata.cpp
+++ b/src/common/nokde/nokde_kaboutdata.cpp
@@ -271,7 +271,7 @@ KAboutData::setProgramLogo(const TQImage& image)
 TQString
 KAboutData::version() const
 {
-   return TQString::tqfromLatin1(mVersion);
+   return TQString::fromLatin1(mVersion);
 }
 
 TQString
@@ -286,13 +286,13 @@ KAboutData::shortDescription() const
 TQString
 KAboutData::homepage() const
 {
-   return TQString::tqfromLatin1(mHomepageAddress);
+   return TQString::fromLatin1(mHomepageAddress);
 }
 
 TQString
 KAboutData::bugAddress() const
 {
-   return TQString::tqfromLatin1(mBugEmailAddress);
+   return TQString::fromLatin1(mBugEmailAddress);
 }
 
 const TQValueList<KAboutPerson>
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_kcmdlineargs.cpp
index e73de61..4bc893c 100644
--- a/src/common/nokde/nokde_kcmdlineargs.cpp
+++ b/src/common/nokde/nokde_kcmdlineargs.cpp
@@ -880,7 +880,7 @@ KCmdLineArgs::usage(const char *id)
      bool hasOptions = false;
      TQString optionsHeader;
      if (args->name)
-        optionsHeader = optionHeaderString.tqarg(i18n("%1 options").tqarg(TQString::tqfromLatin1(args->name)));
+        optionsHeader = optionHeaderString.tqarg(i18n("%1 options").tqarg(TQString::fromLatin1(args->name)));
      else
         optionsHeader = i18n("\nOptions:\n");
 
diff --git a/src/common/port/parallel.cpp b/src/common/port/parallel.cpp
index daa0c6a..46e395b 100644
--- a/src/common/port/parallel.cpp
+++ b/src/common/port/parallel.cpp
@@ -100,12 +100,12 @@ const Port::Parallel::PPinData Port::Parallel::PIN_DATA[Nb_Pins] = {
   { Data,    0x20, Out, "D5"     }, // data 5
   { Data,    0x40, Out, "D6"     }, // data 6
   { Data,    0x80, Out, "D7"     }, // data 7
-  { tqStatus,  0x40, In,  "/ACK"   }, // !ack
-  { tqStatus,  0x80, In,  "BUSY"   }, // busy
-  { tqStatus,  0x20, In,  "PAPER"  }, // pout
-  { tqStatus,  0x10, In,  "SELin"  }, // select
+  { Status,  0x40, In,  "/ACK"   }, // !ack
+  { Status,  0x80, In,  "BUSY"   }, // busy
+  { Status,  0x20, In,  "PAPER"  }, // pout
+  { Status,  0x10, In,  "SELin"  }, // select
   { Control, 0x02, Out, "LF"     }, // !feed
-  { tqStatus,  0x08, In,  "/ERROR" }, // !error
+  { Status,  0x08, In,  "/ERROR" }, // !error
   { Control, 0x04, Out, "PRIME"  }, // !init
   { Control, 0x08, Out, "SELout" }, // !si
   { Nb_RequestTypes, 0x00, NoIO, "GND" }, // GND
diff --git a/src/common/port/parallel.h b/src/common/port/parallel.h
index 08741e1..d25529d 100644
--- a/src/common/port/parallel.h
+++ b/src/common/port/parallel.h
@@ -33,7 +33,7 @@ public:
   enum Pin { DS = 0, D0, D1, D2, D3, D4, D5, D6, D7, ACK, BUSY, PAPER, SELin,
              LF, ERROR, PRIME, SELout, P18, P19, P20, P21, P22, P23, P24, P25,
              Nb_Pins };
-  enum RequestType { Control = 0, tqStatus, Data, Nb_RequestTypes };
+  enum RequestType { Control = 0, Status, Data, Nb_RequestTypes };
   struct PPinData {
     RequestType rType;
     uchar       mask;
diff --git a/src/common/port/serial.cpp b/src/common/port/serial.cpp
index 2db84b9..2aaa7a8 100644
--- a/src/common/port/serial.cpp
+++ b/src/common/port/serial.cpp
@@ -387,7 +387,7 @@ bool Port::Serial::internalReadPin(Pin pin, LogicType type, bool &value)
   return true;
 #elif defined(Q_OS_WIN)
   DWORD status;
-  if ( GetCommModemtqStatus(_fd, &status)==0 ) return false;
+  if ( GetCommModemStatus(_fd, &status)==0 ) return false;
   switch (pin) {
     case DCD: value = (status & MS_RLSD_ON); break;
     case DSR: value = (status & MS_DSR_ON); break;
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
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index bb91cea..fafd5a1 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -147,7 +147,7 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
   shbox = new TQHBoxLayout(vbox);
 
   // status filter
-  _statusCombo = new EnumComboBox<Device::tqStatus>(i18n("<Status>"), "status", frame);
+  _statusCombo = new EnumComboBox<Device::Status>(i18n("<Status>"), "status", frame);
   connect(_statusCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList()));
   shbox->addWidget(_statusCombo->combo());
 
@@ -274,7 +274,7 @@ void DeviceChooser::Dialog::updateList(const TQString &device)
     const Device::Data *data = Device::lister().data(list[i]);
     Q_ASSERT(data);
     if ( _memoryCombo->value()!=Device::MemoryTechnology::Nb_Types && data->memoryTechnology()!=_memoryCombo->value() ) continue;
-    if ( _statusCombo->value()!=Device::tqStatus::Nb_Types && data->status()!=_statusCombo->value() ) continue;
+    if ( _statusCombo->value()!=Device::Status::Nb_Types && data->status()!=_statusCombo->value() ) continue;
     if ( _featureCombo->value()!=Pic::Feature::Nb_Types ) {
       if ( data->group().name()!="pic" ) continue;
       if ( !static_cast<const Pic::Data *>(data)->hasFeature(_featureCombo->value()) ) continue;
diff --git a/src/libgui/device_gui.h b/src/libgui/device_gui.h
index de28bbf..887b98c 100644
--- a/src/libgui/device_gui.h
+++ b/src/libgui/device_gui.h
@@ -105,7 +105,7 @@ private:
   KeyComboBox<TQString> *_programmerCombo, *_toolCombo;
   EnumComboBox<ListType>                 *_listTypeCombo;
   EnumComboBox<Device::MemoryTechnology> *_memoryCombo;
-  EnumComboBox<Device::tqStatus>           *_statusCombo;
+  EnumComboBox<Device::Status>           *_statusCombo;
   EnumComboBox<Pic::Feature>             *_featureCombo;
   KListView   *_listView;
   View        *_deviceView;
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index 2073f03..28e6f19 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -110,7 +110,7 @@ LikeBack::LikeBack(Button buttons)
 //                KMessageBox::saveDontShowAgainContinue(messageShown);
 //        }
 
-        resize(tqsizeHint());
+        resize(sizeHint());
 
         connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) );
         m_timer.start(10);
@@ -452,7 +452,7 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons)
         if (m_process)
                 return;
         m_process = new KProcess();
-        *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount");
+        *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
         connect( m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(endFetchingEmailFrom()) );
         if (!m_process->start()) {
                 kdDebug() << "Couldn't start kcmshell.." << endl;
@@ -473,23 +473,23 @@ void LikeBack::endFetchingEmailFrom()
 //      m_configureEmail->setEnabled(true);
 
         // ### KDE4: why oh why is KEmailSettings in kio?
-        KConfig emailConf( TQString::tqfromLatin1("emaildefaults") );
+        KConfig emailConf( TQString::fromLatin1("emaildefaults") );
 
         // find out the default profile
-        emailConf.setGroup(TQString::tqfromLatin1("Defaults"));
-        TQString profile = TQString::tqfromLatin1("PROFILE_");
-        profile += emailConf.readEntry(TQString::tqfromLatin1("Profile"), TQString::tqfromLatin1("Default"));
+        emailConf.setGroup(TQString::fromLatin1("Defaults"));
+        TQString profile = TQString::fromLatin1("PROFILE_");
+        profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default"));
 
         emailConf.setGroup(profile);
-        TQString fromaddr = emailConf.readEntry(TQString::tqfromLatin1("EmailAddress"));
+        TQString fromaddr = emailConf.readEntry(TQString::fromLatin1("EmailAddress"));
         if (fromaddr.isEmpty()) {
                 struct passwd *p;
                 p = getpwuid(getuid());
-                m_fetchedEmail = TQString::tqfromLatin1(p->pw_name);
+                m_fetchedEmail = TQString::fromLatin1(p->pw_name);
         } else {
-                TQString name = emailConf.readEntry(TQString::tqfromLatin1("FullName"));
+                TQString name = emailConf.readEntry(TQString::fromLatin1("FullName"));
                 if (!name.isEmpty())
-                        m_fetchedEmail = /*name + TQString::tqfromLatin1(" <") +*/ fromaddr /*+ TQString::tqfromLatin1(">")*/;
+                        m_fetchedEmail = /*name + TQString::fromLatin1(" <") +*/ fromaddr /*+ TQString::fromLatin1(">")*/;
         }
 //      m_from->setText( fromaddr );
 }
@@ -580,7 +580,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
         m_comment = new TQTextEdit(coloredWidget);
         TQIconSet sendIconSet = kapp->iconLoader()->loadIconSet("mail_send", KIcon::Toolbar);
         m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget);
-        m_sendButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
+        m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
         m_sendButton->setEnabled(false);
         connect( m_sendButton, TQT_SIGNAL(clicked()),     this, TQT_SLOT(send())           );
         connect( m_comment,    TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) );
@@ -607,7 +607,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
         resize(kapp->desktop()->width() / 2, kapp->desktop()->height() / 3);
 
         setCaption(kapp->makeStdCaption(i18n("Send a Comment")));
-        //      setMinimumSize(mainLayout->tqsizeHint()); // FIXME: Doesn't work!
+        //      setMinimumSize(mainLayout->sizeHint()); // FIXME: Doesn't work!
 }
 
 LikeBackDialog::~LikeBackDialog()
diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp
index 78fcd49..35e76b5 100644
--- a/src/libgui/project_wizard.cpp
+++ b/src/libgui/project_wizard.cpp
@@ -76,7 +76,7 @@ FileListBox::FileListBox(TQWidget *parent)
   _listView->header()->setResizeEnabled(false);
   _listView->header()->setMovingEnabled(false);
   _listView->setColumnText(0, i18n("Copy"));
-  int spacing = tqstyle().tqpixelMetric(TQStyle::PM_HeaderMargin);
+  int spacing = tqstyle().pixelMetric(TQStyle::PM_HeaderMargin);
   TQFontMetrics fm(font());
   _listView->header()->resizeSection(0, fm.width(i18n("Copy")) + 2*spacing); // hack
   _listView->setColumnText(1, i18n("Filename"));
diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp
index e7f0382..d9d0692 100644
--- a/src/libgui/text_editor.cpp
+++ b/src/libgui/text_editor.cpp
@@ -96,7 +96,7 @@ void TextEditor::addView()
     connect(v, TQT_SIGNAL(gotFocus(Kate::View *)), TQT_SLOT(gotFocus(Kate::View *)));
     connect(v, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(statusChanged()));
     connect(v, TQT_SIGNAL(dropEventPass(TQDropEvent *)), TQT_SIGNAL(dropEventPass(TQDropEvent *)));
-    connect(v, TQT_SIGNAL(newtqStatus()), TQT_SLOT(statusChanged()));
+    connect(v, TQT_SIGNAL(newStatus()), TQT_SLOT(statusChanged()));
     v->show();
     v->setFocus();
     v->child(0, "KateViewInternal")->installEventFilter(this);
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index f087a4a..b909b82 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -91,23 +91,23 @@ MainWindow::MainWindow()
   Main::_toplevel = this;
 
 // status bar
-    _actiontqStatus = new TQLabel(statusBar());
-    statusBar()->addWidget(_actiontqStatus);
+    _actionStatus = new TQLabel(statusBar());
+    statusBar()->addWidget(_actionStatus);
     _actionProgress = new TQProgressBar(statusBar());
     statusBar()->addWidget(_actionProgress);
-    _debugtqStatus = new TQLabel(statusBar());
-    statusBar()->addWidget(_debugtqStatus, 0, true);
-    _editortqStatus = new TQLabel(statusBar());
-    statusBar()->addWidget(_editortqStatus, 0, true);
-    _programmertqStatus = new ProgrammerStatusWidget(statusBar());
-    connect(_programmertqStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProgrammer()));
-    connect(_programmertqStatus, TQT_SIGNAL(selected(const Programmer::Group &)), TQT_SLOT(selectProgrammer(const Programmer::Group &)));
-    statusBar()->addWidget(_programmertqStatus->widget(), 0, true);
-    _tooltqStatus = new ToolStatusWidget(statusBar());
-    connect(_tooltqStatus, TQT_SIGNAL(configureToolchain()), TQT_SLOT(configureToolchains()));
-    connect(_tooltqStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProject()));
-    connect(_tooltqStatus, TQT_SIGNAL(selected(const Tool::Group &)), TQT_SLOT(selectTool(const Tool::Group &)));
-    statusBar()->addWidget(_tooltqStatus->widget(), 0, true);
+    _debugStatus = new TQLabel(statusBar());
+    statusBar()->addWidget(_debugStatus, 0, true);
+    _editorStatus = new TQLabel(statusBar());
+    statusBar()->addWidget(_editorStatus, 0, true);
+    _programmerStatus = new ProgrammerStatusWidget(statusBar());
+    connect(_programmerStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProgrammer()));
+    connect(_programmerStatus, TQT_SIGNAL(selected(const Programmer::Group &)), TQT_SLOT(selectProgrammer(const Programmer::Group &)));
+    statusBar()->addWidget(_programmerStatus->widget(), 0, true);
+    _toolStatus = new ToolStatusWidget(statusBar());
+    connect(_toolStatus, TQT_SIGNAL(configureToolchain()), TQT_SLOT(configureToolchains()));
+    connect(_toolStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProject()));
+    connect(_toolStatus, TQT_SIGNAL(selected(const Tool::Group &)), TQT_SLOT(selectTool(const Tool::Group &)));
+    statusBar()->addWidget(_toolStatus->widget(), 0, true);
 
 // interface
     _mainDock = createDockWidget("main_dock_widget", TQPixmap());
@@ -132,7 +132,7 @@ MainWindow::MainWindow()
     _mainDock->setWidget(Main::_editorManager);
     connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI()));
     connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(modified(const PURL::Url &)), TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(modified(const PURL::Url &)));
-    connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(statusChanged(const TQString &)), _editortqStatus, TQT_SLOT(setText(const TQString &)));
+    connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQT_SLOT(setText(const TQString &)));
 
     dock = createDock("compile_log_dock_widget", loader.loadIcon("piklab_compile", KIcon::Small),
                       i18n("Compile Log"), DockPosition(KDockWidget::DockBottom, 80));
@@ -160,15 +160,15 @@ MainWindow::MainWindow()
 // managers
     Programmer::manager = new Programmer::GuiManager(TQT_TQOBJECT(this));
     Programmer::manager->setView(_programLog);
-    connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actiontqStatus, TQT_SLOT(setText(const TQString &)));
+    connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &)));
     connect(Programmer::manager, TQT_SIGNAL(showProgress(bool)), TQT_SLOT(showProgress(bool)));
     connect(Programmer::manager, TQT_SIGNAL(setTotalProgress(uint)), TQT_SLOT(setTotalProgress(uint)));
     connect(Programmer::manager, TQT_SIGNAL(setProgress(uint)), TQT_SLOT(setProgress(uint)));
 
     Debugger::manager = new Debugger::GuiManager;
     connect(Debugger::manager, TQT_SIGNAL(targetStateChanged()), TQT_SLOT(updateGUI()));
-    connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugtqStatus, TQT_SLOT(setText(const TQString &)));
-    connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actiontqStatus, TQT_SLOT(setText(const TQString &)));
+    connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugStatus, TQT_SLOT(setText(const TQString &)));
+    connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &)));
 
     Main::_compileManager = new Compile::Manager(TQT_TQOBJECT(this));
     Main::_compileManager->setView(Main::_compileLog);
@@ -570,7 +570,7 @@ void MainWindow::updateGUI()
     showProgress(false);
     break;
   case Main::Compiling:
-    _actiontqStatus->setText(Main::_compileManager->label());
+    _actionStatus->setText(Main::_compileManager->label());
     showProgress(true);
     makeWidgetDockVisible(Main::_compileLog);
     break;
@@ -618,7 +618,7 @@ void MainWindow::updateGUI()
   Main::action("project_add_current_file")->setEnabled(Main::project() && !inProject && idle && isSource);
 
   // update build actions
-  static_cast<PopupButton *>(_tooltqStatus->widget())->setText(" " + Main::toolGroup().label() + " ");
+  static_cast<PopupButton *>(_toolStatus->widget())->setText(" " + Main::toolGroup().label() + " ");
   bool hexProject = ( Main::_projectManager->projectUrl().fileType()==PURL::Hex );
   bool customTool = Main::toolGroup().isCustom();
   Main::action("build_build_project")->setEnabled((Main::project() || (inProject && !hexProject) ) && idle);
@@ -630,11 +630,11 @@ void MainWindow::updateGUI()
 
   // update programmer status
   PortType ptype = Programmer::GroupConfig::portType(Main::programmerGroup());
-  static_cast<PopupButton *>(_programmertqStatus->widget())->setText(" " + Main::programmerGroup().statusLabel(ptype) + " ");
+  static_cast<PopupButton *>(_programmerStatus->widget())->setText(" " + Main::programmerGroup().statusLabel(ptype) + " ");
   TQFont f = font();
   bool supported = (Main::deviceData() ? Main::programmerGroup().isSupported(Main::deviceData()->name()) : false);
   f.setItalic(!supported);
-  _programmertqStatus->widget()->setFont(f);
+  _programmerStatus->widget()->setFont(f);
   bool isProgrammer = ( Main::programmerGroup().properties() & ::Programmer::Programmer );
   PURL::Url purl = Main::_projectManager->projectUrl();
   bool hasHex = ( currentType==PURL::Hex || Main::_projectManager->contains(purl.toFileType(PURL::Hex)) );
@@ -965,11 +965,11 @@ void MainWindow::showProgress(bool show)
 {
   if (show) {
     PBusyCursor::start();
-    _actiontqStatus->show();
+    _actionStatus->show();
     _actionProgress->show();
   } else {
     PBusyCursor::stop();
-    _actiontqStatus->hide();
+    _actionStatus->hide();
     _actionProgress->hide();
   }
 }
diff --git a/src/libgui/toplevel.h b/src/libgui/toplevel.h
index f7ef383..a3c6306 100644
--- a/src/libgui/toplevel.h
+++ b/src/libgui/toplevel.h
@@ -93,9 +93,9 @@ signals:
 
 private:
   Log::Widget            *_programLog;
-  TQLabel                 *_actiontqStatus, *_debugtqStatus, *_editortqStatus;
-  ProgrammerStatusWidget *_programmertqStatus;
-  ToolStatusWidget       *_tooltqStatus;
+  TQLabel                 *_actionStatus, *_debugStatus, *_editorStatus;
+  ProgrammerStatusWidget *_programmerStatus;
+  ToolStatusWidget       *_toolStatus;
   TQProgressBar           *_actionProgress;
   ConfigGenerator        *_configGenerator;
   ::Process::Base        *_pikloopsProcess, *_kfindProcess;
diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp
index 51abeab..83a92c4 100644
--- a/src/libgui/toplevel_ui.cpp
+++ b/src/libgui/toplevel_ui.cpp
@@ -65,7 +65,7 @@ MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent)
   : TQToolButton(parent, "menu_bar_button")
 {
   TQFontMetrics fm(font());
-  int h = fm.height() + 2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this);
+  int h = fm.height() + 2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this);
   setFixedHeight(h);
   KIconLoader loader;
   setIconSet(loader.loadIconSet(icon, KIcon::Small, fm.height()-2));
@@ -73,7 +73,7 @@ MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent)
   setAutoRaise(true);
 }
 
-TQSize MenuBarButton::tqsizeHint() const
+TQSize MenuBarButton::sizeHint() const
 {
-  return TQSize(TQToolButton::tqsizeHint().width(), height());
+  return TQSize(TQToolButton::sizeHint().width(), height());
 }
diff --git a/src/libgui/toplevel_ui.h b/src/libgui/toplevel_ui.h
index 651809c..77ae7fc 100644
--- a/src/libgui/toplevel_ui.h
+++ b/src/libgui/toplevel_ui.h
@@ -75,7 +75,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
   MenuBarButton(const TQString &icon, TQWidget *parent);
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 };
 
 #endif
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<uint, Device::PortBitData> &bits) = 0;
+  virtual bool updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &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; i<Nb_PinTypes; i++) {
       _testcbs[i]->setEnabled(_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 *>(_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<uint, Device::PortBitData> &bits)
+bool GPSim::Debugger::updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits)
 {
   for (uint i=0; i<Device::MAX_NB_PORT_BITS; i++) {
     if ( !device()->registersData().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<Address> &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<uint, Device::PortBitData> &bits);
+  virtual bool updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &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<uint, Device::PortBitData> 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<uint, Device::PortBitData> &bits)
+bool GPSim::Debugger::updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits)
 {
   for (uint i=0; i<Device::MAX_NB_PORT_BITS; i++) {
     if ( !device()->registersData().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<Address> &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<uint, Device::PortBitData> &bits);
+  virtual bool updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits);
 
 private:
   uint _nbBreakpoints;
diff --git a/src/xml_to_data/device_xml_to_data.cpp b/src/xml_to_data/device_xml_to_data.cpp
index c1d41ac..3389664 100644
--- a/src/xml_to_data/device_xml_to_data.cpp
+++ b/src/xml_to_data/device_xml_to_data.cpp
@@ -90,21 +90,21 @@ void Device::XmlToDataBase::processDevice(TQDomElement device)
   _data->_name = name;
   _data->_alternatives = TQStringList::split(' ', device.attribute("alternative"));
   if ( _data->_alternatives.count() ) _alternatives[name] = _data->_alternatives;
-  _data->_status = tqStatus::fromKey(device.attribute("status"));
+  _data->_status = Status::fromKey(device.attribute("status"));
   switch (_data->_status.type()) {
-    case tqStatus::Nb_Types:
+    case Status::Nb_Types:
       qFatal("Unrecognized or absent device status");
       break;
-    case tqStatus::Future:
+    case Status::Future:
       if ( _data->_alternatives.count() ) qFatal("Future device has alternative");
       break;
-    case tqStatus::NotRecommended:
-    case tqStatus::Mature:
+    case Status::NotRecommended:
+    case Status::Mature:
       if ( _data->_alternatives.count()==0 ) warning("Not-recommended/mature device has no alternative");
       break;
-    case tqStatus::InProduction:
-    case tqStatus::EOL:
-    case tqStatus::Unknown: break;
+    case Status::InProduction:
+    case Status::EOL:
+    case Status::Unknown: break;
   }
 
   // document
diff --git a/test/picc/standalone_test.c b/test/picc/standalone_test.c
index ac229a1..4173cf8 100644
--- a/test/picc/standalone_test.c
+++ b/test/picc/standalone_test.c
@@ -13,7 +13,7 @@
  *
  * Use PICCLITE to compile this program for the PIC16F877.
  *
- * tqStatus: Sept 25, 2003
+ * Status: Sept 25, 2003
  *   Working. The code is pretty brute force and the resolution isn't
  *   what I expected. Need to review calculations for angle vs. accel
  *   (gravity). I determined the zero offsets empirically and hard coded
diff --git a/test/picc/test.c b/test/picc/test.c
index f397459..5fc2e81 100644
--- a/test/picc/test.c
+++ b/test/picc/test.c
@@ -10,7 +10,7 @@
  *
  * Use PICCLITE to compile this program for the PIC16F877.
  *
- * tqStatus: Sept 25, 2003
+ * Status: Sept 25, 2003
  *   Working. The code is pretty brute force and the resolution isn't
  *   what I expected. Need to review calculations for angle vs. accel
  *   (gravity). I determined the zero offsets empirically and hard coded