Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.

7 files changed, 16 insertions, 16 deletions

diff --git a/src/devices/pic/gui/pic_config_editor.cpp b/src/devices/pic/gui/pic_config_editor.cpp
index 193891a..4b70c3d 100644
--- a/src/devices/pic/gui/pic_config_editor.cpp
+++ b/src/devices/pic/gui/pic_config_editor.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "pic_config_editor.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvgroupbox.h>
 #include <tqapplication.h>
 
diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp
index 773ed03..67c5cc9 100644
--- a/src/devices/pic/gui/pic_config_word_editor.cpp
+++ b/src/devices/pic/gui/pic_config_word_editor.cpp
@@ -10,7 +10,7 @@
 #include "pic_config_word_editor.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <klocale.h>
 
@@ -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->sizeHint().height());
+    button->setFixedHeight(button->tqsizeHint().height());
     connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog()));
     hbox->addWidget(button);
     hbox->addStretch(1);
diff --git a/src/devices/pic/gui/pic_group_ui.cpp b/src/devices/pic/gui/pic_group_ui.cpp
index d2ff2f4..fa4aa56 100644
--- a/src/devices/pic/gui/pic_group_ui.cpp
+++ b/src/devices/pic/gui/pic_group_ui.cpp
@@ -56,7 +56,7 @@ void Pic::GroupUI::fillWatchListContainer(ListContainer *container, TQValueVecto
   list = Pic::gprList(data, coff);
   for (uint k=0; k<rdata.nbBanks; k++) {
     if ( !rdata.isBankUsed(k) ) continue;
-    ListContainer *bbranch = (rdata.nbBanks==1 ? branch : branch->appendBranch(i18n("Bank %1").arg(k)));
+    ListContainer *bbranch = (rdata.nbBanks==1 ? branch : branch->appendBranch(i18n("Bank %1").tqarg(k)));
     uint nb = 0;
     for (uint i=0; i<list.count(); i++) {
       if ( rdata.bankFromAddress(list[i].data().address())!=k ) continue;
diff --git a/src/devices/pic/gui/pic_hex_view.cpp b/src/devices/pic/gui/pic_hex_view.cpp
index 0c96654..bbcc161 100644
--- a/src/devices/pic/gui/pic_hex_view.cpp
+++ b/src/devices/pic/gui/pic_hex_view.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 #include "pic_hex_view.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp
index f62cbcb..a964988 100644
--- a/src/devices/pic/gui/pic_memory_editor.cpp
+++ b/src/devices/pic/gui/pic_memory_editor.cpp
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <tqregexp.h>
 #include <tqcolor.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 
 #include <klocale.h>
@@ -112,14 +112,14 @@ void Pic::MemoryEditorLegend::updateDisplay()
   if (_boot.label) {
     AddressRange r = memory().bootRange();
     if ( r.isEmpty() ) _boot.label->setText(i18n("not present"));
-    else _boot.label->setText(TQString("[%1:%2]").arg(toHex(r.start, nbChars)).arg(toHex(r.end, nbChars)));
+    else _boot.label->setText(TQString("[%1:%2]").tqarg(toHex(r.start, nbChars)).tqarg(toHex(r.end, nbChars)));
     _boot.button->setEnabled(!r.isEmpty());
     _boot.setProtected(memory().isBootProtected(ptype));
   }
   for (uint i=0; i<_blocks.count(); i++) {
     AddressRange r = memory().blockRange(i);
     if ( r.isEmpty() ) _blocks[i].label->setText(i18n("not present"));
-    else _blocks[i].label->setText(TQString("[%1:%2]").arg(toHex(r.start, nbChars)).arg(toHex(r.end, nbChars)));
+    else _blocks[i].label->setText(TQString("[%1:%2]").tqarg(toHex(r.start, nbChars)).tqarg(toHex(r.end, nbChars)));
     _blocks[i].button->setEnabled(!r.isEmpty());
     _blocks[i].setProtected(memory().isBlockProtected(ptype, i));
   }
@@ -251,10 +251,10 @@ void Pic::MemoryTypeEditor::init(bool first)
 
   uint nbChars = device().nbCharsWord(type());
   TQString add;
-  if ( type()==MemoryRangeType::UserId ) add = i18n(" - recommended mask: %1").arg(toHexLabel(device().userIdRecommendedMask(), nbChars));
+  if ( type()==MemoryRangeType::UserId ) add = i18n(" - recommended mask: %1").tqarg(toHexLabel(device().userIdRecommendedMask(), nbChars));
   if ( type()==MemoryRangeType::Cal && _hexview ) add = i18n(" - not programmed by default");
   TQString comment = i18n("%1-bit words - mask: %2")
-                   .arg(device().nbBitsWord(type())).arg(toHexLabel(device().mask(type()), nbChars));
+                   .tqarg(device().nbBitsWord(type())).tqarg(toHexLabel(device().mask(type()), nbChars));
   _comment->setText(comment + add);
 }
 
diff --git a/src/devices/pic/gui/pic_prog_group_ui.cpp b/src/devices/pic/gui/pic_prog_group_ui.cpp
index 565ec93..6e350ed 100644
--- a/src/devices/pic/gui/pic_prog_group_ui.cpp
+++ b/src/devices/pic/gui/pic_prog_group_ui.cpp
@@ -36,6 +36,6 @@ void Programmer::PicAdvancedDialog::updateDisplay()
     if ( !base().group().canReadVoltage(Pic::VoltageType(i)) ) continue;
     double v = base().voltage(Pic::VoltageType(i));
     if ( v==::Programmer::UNKNOWN_VOLTAGE ) _voltages[i]->setText("---");
-    else _voltages[i]->setText(TQString("%1 V").arg(v));
+    else _voltages[i]->setText(TQString("%1 V").tqarg(v));
   }
 }
diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp
index c852689..b640036 100644
--- a/src/devices/pic/gui/pic_register_view.cpp
+++ b/src/devices/pic/gui/pic_register_view.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "pic_register_view.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -46,20 +46,20 @@ 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->setAlignment(AlignCenter);
+        label->tqsetAlignment(AlignCenter);
         top->addMultiCellWidget(label, row,row, 0,6, AlignHCenter);
       } else {
         _bankCombo = new TQComboBox(this);
         for (uint k=1; k<2*rdata.nbBanks-1; k++) {
-	  _bankCombo->insertItem((k%2)==0 ? i18n("Bank %1 (low)").arg(k/2) : i18n("Bank %1 (high)").arg(k/2));
+	  _bankCombo->insertItem((k%2)==0 ? i18n("Bank %1 (low)").tqarg(k/2) : i18n("Bank %1 (high)").tqarg(k/2));
 	}
         if ( _bindex==3 ) _bankCombo->setCurrentItem(1);
         connect(_bankCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bankChanged()));
         top->addMultiCellWidget(_bankCombo, row,row, 0,6, AlignHCenter);
       }
     } else {
-      TQLabel *label = new TQLabel(i18n("Bank %1").arg(i), this);
-      label->setAlignment(AlignCenter);
+      TQLabel *label = new TQLabel(i18n("Bank %1").tqarg(i), this);
+      label->tqsetAlignment(AlignCenter);
       top->addMultiCellWidget(label, row,row, 0,6, AlignHCenter);
     }
     row++;