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

This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.

7 files changed, 13 insertions, 13 deletions

diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp
index be65d35..ff2d6c3 100644
--- a/kregexpeditor/KMultiFormListBox/ccp.cpp
+++ b/kregexpeditor/KMultiFormListBox/ccp.cpp
@@ -38,9 +38,9 @@ CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQO
 void CCP::install(TQObject *elm)
 {
   elm->installEventFilter(this);
-  const TQObjectList children = elm->childrenListObject();
-  if (!children.isEmpty()) {
-    TQObjectListIt it = TQObjectListIt(children);
+  const TQObjectList tqchildren = elm->childrenListObject();
+  if (!tqchildren.isEmpty()) {
+    TQObjectListIt it = TQObjectListIt(tqchildren);
 
     while (TQObject *child=it.current()) {
       if (child->inherits("KMultiFormListBoxMultiVisible")) {
diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp
index ccbd636..f81ea07 100644
--- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp
+++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp
@@ -24,7 +24,7 @@
 
 #include "indexWindow.h"
 #include <iostream>
-#include <layout.h>
+#include <tqlayout.h>
 
 indexWindow::indexWindow() : TQWidget(0,"", WStyle_Customize | WType_Popup)
 {
@@ -71,7 +71,7 @@ int indexWindow::exec(const TQPoint & /*start*/, int /*width*/)
     // 23 Feb. 2003 11:28 -- Jesper K. Pedersen
 /*
     // calculate the height of all the elements together.
-  // I need to do it this way, as sizeHint doesn't report the correct size
+  // I need to do it this way, as tqsizeHint doesn't report the correct size
   // and itemHeight doesn't neither.
   int elm_h = lb->item(0)->height(lb) * lb->count();
   elm_h += 2*lb->frameWidth();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
index 3dcab67..6e82e85 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
@@ -94,9 +94,9 @@ void KMultiFormListBoxMultiVisible::updateClipperContent()
 
   // calculate the required size.
   for (TQWidget *child = elms->first(); child; child=elms->next()) {
-    maxWidth = TQMAX(maxWidth, child->sizeHint().width());
+    maxWidth = TQMAX(maxWidth, child->tqsizeHint().width());
     if (strcmp(child->name(), "seperator") != 0) {
-      totalHeight += child->sizeHint().height();
+      totalHeight += child->tqsizeHint().height();
       count++;
     }
     else {
@@ -116,7 +116,7 @@ void KMultiFormListBoxMultiVisible::updateClipperContent()
   for (TQWidget *child2 = elms->first(); child2; child2=elms->next()) {
     int h;
     if ( strcmp(child2->name(),"seperator") != 0) {
-      h = child2->sizeHint().height();
+      h = child2->tqsizeHint().height();
       h += extra;
     }
     else {
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
index 8d3ffe3..905634c 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
@@ -150,7 +150,7 @@ void KMultiFormListBoxWindowed::slotDeleteEntry()
   WindowListboxItem *item = selected();
   if (item) {
 		int answer =
-			KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").arg(item->text()),i18n("Delete Item"),KStdGuiItem::del());
+			KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").tqarg(item->text()),i18n("Delete Item"),KStdGuiItem::del());
 		if (answer == KMessageBox::Continue) {
 			delete item;
 			slotUpdateButtonState();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
index 58b82da..a455bae 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
@@ -40,9 +40,9 @@ KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiF
 
   TQWidget *widget = theWidget->qWidget();
 
-  TQHBoxLayout *layout = new TQHBoxLayout( this );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 	_factory = factory;
-  layout->addWidget( widget );
+  tqlayout->addWidget( widget );
 }
 
 void KMultiFormListBox::append( KMultiFormListBoxEntry *element )
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
index e432c59..ba9b8a8 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
@@ -22,7 +22,7 @@
 #include "kmultiformlistbox-shower.h"
 #include "kmultiformlistboxentry.h"
 #include <tqptrlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqscrollview.h>
 
 #ifdef TQT_ONLY
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
index 90d4e35..b4bf36c 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
@@ -60,7 +60,7 @@ public:
 
   // This function must return a string representing the KMultiFormListBox. This is
   // used when showing the fast-search menu available from the `Idx' button.
-  virtual TQString idxString() { return TQString::fromLatin1(""); }
+  virtual TQString idxString() { return TQString::tqfromLatin1(""); }
 
 public slots:
   void acceptIndexButton();