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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

7 files changed, 20 insertions, 20 deletions

diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp
index efff4e06..4a3947da 100644
--- a/ktalkd/kcmktalkd/answmachpage.cpp
+++ b/ktalkd/kcmktalkd/answmachpage.cpp
@@ -49,27 +49,27 @@ KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name,
     mail_edit->setMinimumWidth(150);
     mail_label = new TQLabel(mail_edit,i18n("&Mail address:"),this);
     mail_label->adjustSize();
-    mail_label->setAlignment( ShowPrefix | AlignVCenter );
+    mail_label->tqsetAlignment( ShowPrefix | AlignVCenter );
 
     subj_edit = new TQLineEdit(this);
     subj_edit->adjustSize();
     subj_edit->setMinimumWidth(150);
     subj_label = new TQLabel(subj_edit, i18n("Mail s&ubject:"),this);
     subj_label->adjustSize();
-    subj_label->setAlignment( ShowPrefix | AlignVCenter );
+    subj_label->tqsetAlignment( ShowPrefix | AlignVCenter );
     subj_tip = new TQLabel(i18n("Use %s for the caller name"),this);
-    subj_tip->setAlignment( ShowPrefix );
+    subj_tip->tqsetAlignment( ShowPrefix );
 
     head_edit = new TQLineEdit(this);
     head_edit->adjustSize();
     head_edit->setMinimumWidth(150);
     head_label = new TQLabel(head_edit, i18n("Mail &first line:"),this);
     head_label->adjustSize();
-    head_label->setAlignment( ShowPrefix | AlignVCenter );
+    head_label->tqsetAlignment( ShowPrefix | AlignVCenter );
     head_tip = new TQLabel(
         i18n("Use first %s for caller name, and second %s for caller hostname"),
         this);
-    head_tip->setAlignment( ShowPrefix );
+    head_tip->tqsetAlignment( ShowPrefix );
 
     emptymail_cb = new TQCheckBox(i18n("&Receive a mail even if no message left"), this);
     emptymail_cb->adjustSize();
@@ -79,7 +79,7 @@ KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name,
     msg_ml->setMinimumWidth(150);
     msg_label = new TQLabel(msg_ml, i18n("&Banner displayed on answering machine startup:"),this);
     msg_label->adjustSize();
-    msg_label->setAlignment( ShowPrefix | AlignVCenter );
+    msg_label->tqsetAlignment( ShowPrefix | AlignVCenter );
 
     int h = 10 + answmach_cb->height() + mail_edit->height() +
         subj_edit->height() + subj_tip->height() + head_edit->height()
diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp
index 33438651..2046833d 100644
--- a/ktalkd/kcmktalkd/forwmachpage.cpp
+++ b/ktalkd/kcmktalkd/forwmachpage.cpp
@@ -45,7 +45,7 @@ KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name,
     address_edit->setMinimumWidth(150);
     address_label = new TQLabel(address_edit,i18n("&Destination (user or user@host):"),this);
     address_label->adjustSize();
-    address_label->setAlignment( ShowPrefix | AlignVCenter );
+    address_label->tqsetAlignment( ShowPrefix | AlignVCenter );
 
     method_combo = new TQComboBox(this);
     method_combo->insertItem("FWA");
@@ -55,7 +55,7 @@ KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name,
     method_combo->setMinimumWidth(80);
     method_label = new TQLabel(method_combo, i18n("Forward &method:"),this);
     method_label->adjustSize();
-    method_label->setAlignment( ShowPrefix | AlignVCenter );
+    method_label->tqsetAlignment( ShowPrefix | AlignVCenter );
 
     expl_label = new TQLabel(i18n(
 "FWA: Forward announcement only. Direct connection. Not recommended.\n\
diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp
index 19bc3c61..bd68e17a 100644
--- a/ktalkd/kcmktalkd/main.cpp
+++ b/ktalkd/kcmktalkd/main.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <tqtabwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name)
     : KCModule(parent, name)
@@ -36,11 +36,11 @@ KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name)
     config = new KSimpleConfig("ktalkdrc");
     announceconfig = new KSimpleConfig("ktalkannouncerc");
 
-	TQVBoxLayout *layout = new TQVBoxLayout(this);
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
     
 	tab = new TQTabWidget(this);
     
-	layout->addWidget(tab);
+	tqlayout->addWidget(tab);
 
 	soundpage = new KSoundPageConfig(this, "soundpage", config, announceconfig);
 	answmachpage = new KAnswmachPageConfig(this, "answmachpage", config);
diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp
index 535fb36d..26b82f59 100644
--- a/ktalkd/kcmktalkd/soundpage.cpp
+++ b/ktalkd/kcmktalkd/soundpage.cpp
@@ -27,7 +27,7 @@
 #include <stdlib.h> //for setenv
 
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqcheckbox.h>
@@ -66,7 +66,7 @@ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name,
     extprg_box->setColumnLayout( 0, Qt::Horizontal );
     toplay->addWidget(extprg_box);
 
-    TQGridLayout* l = new TQGridLayout(extprg_box->layout());
+    TQGridLayout* l = new TQGridLayout(extprg_box->tqlayout());
 
     extprg_edit = new KURLRequester(extprg_box);
     l->addWidget(extprg_edit, 2, 4);
@@ -193,7 +193,7 @@ void KSoundPageConfig::sound_listDropEvent(TQDropEvent* e){
 
       if (url.path().right(4).upper() != ".WAV") {
         TQString msg = i18n("%1\ndoes not appear "\
-                            "to be a WAV file.").arg(url.path());
+                            "to be a WAV file.").tqarg(url.path());
 
         KMessageBox::sorry(this, msg, i18n("Improper File Extension"));
 
@@ -203,7 +203,7 @@ void KSoundPageConfig::sound_listDropEvent(TQDropEvent* e){
 
         if (!addToSound_List(url.path())) {
           // did not add file because it is already in the list
-          TQString msg = i18n("The file %1 is already in the list").arg(url.path());
+          TQString msg = i18n("The file %1 is already in the list").tqarg(url.path());
 
           KMessageBox::information(this, msg, i18n("File Already in List"));
 
diff --git a/ktalkd/ktalkd/threads.cpp b/ktalkd/ktalkd/threads.cpp
index 604280b2..2cee3338 100644
--- a/ktalkd/ktalkd/threads.cpp
+++ b/ktalkd/ktalkd/threads.cpp
@@ -44,7 +44,7 @@ static int nb_child_to_wait=0;
 
 #undef DEBUG_THREADS
 
-/** Register a new process (by just increasing the number of children */
+/** Register a new process (by just increasing the number of tqchildren */
 void new_process()
 {
 	nb_child_to_wait++;
@@ -76,7 +76,7 @@ int wait_process(int pid)
     return status;
 }
 
-/** Wait for children (if any) to exit. Return 1 if no more child to wait */
+/** Wait for tqchildren (if any) to exit. Return 1 if no more child to wait */
 int ack_process()
 {
    if (nb_child_to_wait>0)
diff --git a/ktalkd/ktalkd/threads.h b/ktalkd/ktalkd/threads.h
index 4630f8b0..600ae53b 100644
--- a/ktalkd/ktalkd/threads.h
+++ b/ktalkd/ktalkd/threads.h
@@ -31,9 +31,9 @@
  * (BSD License, from tdelibs/doc/common/bsd-license.html)
  */
 
-/** Register a new process (by just increasing the number of children */
+/** Register a new process (by just increasing the number of tqchildren */
 void new_process();
 /** Wait for a given process - not registered - and see if others exited */
 int wait_process(int pid);
-/** Wait for children (if any) to exit. Return 1 if no more child to wait */
+/** Wait for tqchildren (if any) to exit. Return 1 if no more child to wait */
 int ack_process();
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index c987179e..b7fa0684 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -98,7 +98,7 @@ int main (int argc, char **argv)
     {
       s += '\n';
       TQString callee = args->arg(1);
-      s += i18n ("for user %1").arg( callee.isEmpty() ? i18n("<nobody>") : callee );
+      s += i18n ("for user %1").tqarg( callee.isEmpty() ? i18n("<nobody>") : callee );
     }
 
     s += ".";