TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 95 insertions, 95 deletions

diff --git a/kppp/edit.cpp b/kppp/edit.cpp
index 8986520b..e330db7f 100644
--- a/kppp/edit.cpp
+++ b/kppp/edit.cpp
@@ -44,17 +44,17 @@
 #include "iplined.h"
 #include "auth.h"
 
-DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
-  : TQWidget(parent, name)
+DialWidget::DialWidget( TQWidget *tqparent, bool isnewaccount, const char *name )
+  : TQWidget(tqparent, name)
 {
   const int GRIDROWS = 8;
 
-  TQGridLayout *tl = new TQGridLayout(parent, GRIDROWS, 2, 0, KDialog::spacingHint());
+  TQGridLayout *tl = new TQGridLayout(tqparent, GRIDROWS, 2, 0, KDialog::spacingHint());
 
-  connect_label = new TQLabel(i18n("Connection &name:"), parent);
+  connect_label = new TQLabel(i18n("Connection &name:"), tqparent);
   tl->addWidget(connect_label, 0, 0);
 
-  connectname_l = new TQLineEdit(parent);
+  connectname_l = new TQLineEdit(tqparent);
   connectname_l->setMaxLength(ACCNAME_SIZE);
   connect_label->setBuddy(connectname_l);
 
@@ -65,24 +65,24 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQWhatsThis::add(connectname_l,tmp);
 
 
-  number_label = new TQLabel(i18n("P&hone number:"), parent);
-  number_label->setAlignment(AlignTop|AlignLeft);
+  number_label = new TQLabel(i18n("P&hone number:"), tqparent);
+  number_label->tqsetAlignment(AlignTop|AlignLeft);
   tl->addWidget(number_label, 1, 0);
 
   TQHBoxLayout *lpn = new TQHBoxLayout(5);
   tl->addLayout(lpn, 1, 1);
-  numbers = new TQListBox(parent);
+  numbers = new TQListBox(tqparent);
   number_label->setBuddy(numbers);
   numbers->setMinimumSize(120, 70);
   lpn->addWidget(numbers);
   TQVBoxLayout *lpn1 = new TQVBoxLayout;
   lpn->addLayout(lpn1);
-  add = new TQPushButton(i18n("&Add..."), parent);
-  del = new TQPushButton(i18n("&Remove"), parent);
+  add = new TQPushButton(i18n("&Add..."), tqparent);
+  del = new TQPushButton(i18n("&Remove"), tqparent);
 
-  up = new TQPushButton(parent);
+  up = new TQPushButton(tqparent);
   up->setIconSet(BarIconSet("up"));
-  down = new TQPushButton(parent);
+  down = new TQPushButton(tqparent);
   down->setIconSet(BarIconSet("down"));
   lpn1->addWidget(add);
   lpn1->addWidget(del);
@@ -112,10 +112,10 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQWhatsThis::add(number_label,tmp);
   TQWhatsThis::add(numbers,tmp);
 
-  auth_l = new TQLabel(i18n("A&uthentication:"), parent);
+  auth_l = new TQLabel(i18n("A&uthentication:"), tqparent);
   tl->addWidget(auth_l, 3, 0);
 
-  auth = new TQComboBox(parent);
+  auth = new TQComboBox(tqparent);
   auth_l->setBuddy(auth);
   auth->insertItem(i18n("Script-based"));
   auth->insertItem(i18n("PAP"));
@@ -136,7 +136,7 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQWhatsThis::add(auth_l,tmp);
   TQWhatsThis::add(auth,tmp);
 
-  store_password = new TQCheckBox(i18n("Store &password"), parent);
+  store_password = new TQCheckBox(i18n("Store &password"), tqparent);
   store_password->setChecked(true);
   tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight);
   TQWhatsThis::add(store_password,
@@ -149,10 +149,10 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
 		       "readable only to you. Make sure nobody\n"
 		       "gains access to this file!"));
 
-  cbtype_l = new TQLabel(i18n("&Callback type:"), parent);
+  cbtype_l = new TQLabel(i18n("&Callback type:"), tqparent);
   tl->addWidget(cbtype_l, 5, 0);
 
-  cbtype = new TQComboBox(parent);
+  cbtype = new TQComboBox(tqparent);
   cbtype_l->setBuddy(cbtype);
   cbtype->insertItem(i18n("None"));
   cbtype->insertItem(i18n("Administrator-defined"));
@@ -165,10 +165,10 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQWhatsThis::add(cbtype_l,tmp);
   TQWhatsThis::add(cbtype,tmp);
 
-  cbphone_l = new TQLabel(i18n("Call&back number:"), parent);
+  cbphone_l = new TQLabel(i18n("Call&back number:"), tqparent);
   tl->addWidget(cbphone_l, 6, 0);
 
-  cbphone = new TQLineEdit(parent);
+  cbphone = new TQLineEdit(tqparent);
   cbphone_l->setBuddy(cbphone);
   cbphone->setMaxLength(140);
   tl->addWidget(cbphone, 6, 1);
@@ -177,7 +177,7 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQWhatsThis::add(cbphone_l,tmp);
   TQWhatsThis::add(cbphone,tmp);
 
-  pppdargs = new TQPushButton(i18n("Customize &pppd Arguments..."), parent);
+  pppdargs = new TQPushButton(i18n("Customize &pppd Arguments..."), tqparent);
   connect(pppdargs, TQT_SIGNAL(clicked()), TQT_SLOT(pppdargsbutton()));
   tl->addMultiCellWidget(pppdargs, 7, 7, 0, 1, AlignCenter);
 
@@ -312,10 +312,10 @@ void DialWidget::pppdargsbutton() {
 /////////////////////////////////////////////////////////////////////////////
 // ExecWidget
 /////////////////////////////////////////////////////////////////////////////
-ExecWidget::ExecWidget(TQWidget *parent, bool isnewaccount, const char *name) :
-  TQWidget(parent, name)
+ExecWidget::ExecWidget(TQWidget *tqparent, bool isnewaccount, const char *name) :
+  TQWidget(tqparent, name)
 {
-  TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
+  TQVBoxLayout *tl = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint());
 
   TQLabel *l = new TQLabel(\
 i18n("Here you can select commands to run at certain stages of the\n"
@@ -323,8 +323,8 @@ i18n("Here you can select commands to run at certain stages of the\n"
      "you cannot run any commands here requiring root permissions\n"
      "(unless, of course, you are root).\n\n"
      "Be sure to supply the whole path to the program otherwise\n"
-     "kppp might be unable to find it."), parent);
-  l->setMinimumHeight(l->sizeHint().height());
+     "kppp might be unable to find it."), tqparent);
+  l->setMinimumHeight(l->tqsizeHint().height());
   tl->addWidget(l);
   tl->addStretch(1);
 
@@ -333,10 +333,10 @@ i18n("Here you can select commands to run at certain stages of the\n"
   l1->setColStretch(0, 0);
   l1->setColStretch(1, 1);
 
-  before_connect_l = new TQLabel(i18n("&Before connect:"), parent);
-  before_connect_l->setAlignment(AlignVCenter);
+  before_connect_l = new TQLabel(i18n("&Before connect:"), tqparent);
+  before_connect_l->tqsetAlignment(AlignVCenter);
   l1->addWidget(before_connect_l, 0, 0);
-  before_connect = new TQLineEdit(parent);
+  before_connect = new TQLineEdit(tqparent);
   before_connect_l->setBuddy(before_connect);
   before_connect->setMaxLength(COMMAND_SIZE);
   l1->addWidget(before_connect, 0, 1);
@@ -349,10 +349,10 @@ i18n("Here you can select commands to run at certain stages of the\n"
   TQWhatsThis::add(before_connect_l,tmp);
   TQWhatsThis::add(before_connect,tmp);
 
-  command_label = new TQLabel(i18n("&Upon connect:"), parent);
-  command_label->setAlignment(AlignVCenter);
+  command_label = new TQLabel(i18n("&Upon connect:"), tqparent);
+  command_label->tqsetAlignment(AlignVCenter);
   l1->addWidget(command_label, 1, 0);
-  command = new TQLineEdit(parent);
+  command = new TQLineEdit(tqparent);
   command_label->setBuddy(command);
   command->setMaxLength(COMMAND_SIZE);
   l1->addWidget(command, 1, 1);
@@ -366,10 +366,10 @@ i18n("Here you can select commands to run at certain stages of the\n"
   TQWhatsThis::add(command,tmp);
 
   predisconnect_label = new TQLabel(i18n("Before &disconnect:"),
-				 parent);
-  predisconnect_label->setAlignment(AlignVCenter);
+				 tqparent);
+  predisconnect_label->tqsetAlignment(AlignVCenter);
   l1->addWidget(predisconnect_label, 2, 0);
-  predisconnect = new TQLineEdit(parent);
+  predisconnect = new TQLineEdit(tqparent);
   predisconnect_label->setBuddy(predisconnect);
   predisconnect->setMaxLength(COMMAND_SIZE);
   l1->addWidget(predisconnect, 2, 1);
@@ -381,11 +381,11 @@ i18n("Here you can select commands to run at certain stages of the\n"
   TQWhatsThis::add(predisconnect,tmp);
 
   discommand_label = new TQLabel(i18n("U&pon disconnect:"),
-			      parent);
-  discommand_label->setAlignment(AlignVCenter);
+			      tqparent);
+  discommand_label->tqsetAlignment(AlignVCenter);
   l1->addWidget(discommand_label, 3, 0);
 
-  discommand = new TQLineEdit(parent);
+  discommand = new TQLineEdit(tqparent);
   discommand_label->setBuddy(discommand);
   discommand->setMaxLength(COMMAND_SIZE);
   l1->addWidget(discommand, 3, 1);
@@ -427,16 +427,16 @@ bool ExecWidget::save() {
 // IPWidget
 //
 /////////////////////////////////////////////////////////////////////////////
-IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name )
-  : TQWidget(parent, name)
+IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name )
+  : TQWidget(tqparent, name)
 {
-  TQVBoxLayout *topLayout = new TQVBoxLayout(parent);
+  TQVBoxLayout *topLayout = new TQVBoxLayout(tqparent);
   topLayout->setSpacing(KDialog::spacingHint());
 
-  box = new TQVGroupBox(i18n("C&onfiguration"), parent);
+  box = new TQVGroupBox(i18n("C&onfiguration"), tqparent);
   box->setInsideSpacing(KDialog::spacingHint());
 
-  rb = new TQButtonGroup(parent);
+  rb = new TQButtonGroup(tqparent);
   rb->hide();
   connect(rb, TQT_SIGNAL(clicked(int)),
 	  TQT_SLOT(hitIPSelect(int)));
@@ -478,23 +478,23 @@ IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQWhatsThis::add(ipaddress_label,tmp);
   TQWhatsThis::add(ipaddress_l,tmp);
 
-  sub_label = new TQLabel(i18n("&Subnet mask:"), ipWidget);
+  sub_label = new TQLabel(i18n("&Subnet tqmask:"), ipWidget);
   tmp = i18n("<p>If your computer has a static Internet address,\n"
-	     "you must supply a network mask here. In almost\n"
-	     "all cases this netmask will be <b>255.255.255.0</b>,\n"
+	     "you must supply a network tqmask here. In almost\n"
+	     "all cases this nettqmask will be <b>255.255.255.0</b>,\n"
 	     "but your mileage may vary.\n"
 	     "\n"
 	     "If unsure, contact your Internet Service Provider");
   ipLayout->addWidget(sub_label, 1, 0);
 
-  subnetmask_l = new IPLineEdit(ipWidget);
-  sub_label->setBuddy(subnetmask_l);
-  ipLayout->addWidget(subnetmask_l, 1, 1);
+  subnettqmask_l = new IPLineEdit(ipWidget);
+  sub_label->setBuddy(subnettqmask_l);
+  ipLayout->addWidget(subnettqmask_l, 1, 1);
 
   TQWhatsThis::add(sub_label,tmp);
-  TQWhatsThis::add(subnetmask_l,tmp);
+  TQWhatsThis::add(subnettqmask_l,tmp);
 
-  autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), parent);
+  autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), tqparent);
   autoname->setChecked(gpppdata.autoname());
   connect(autoname,TQT_SIGNAL(toggled(bool)),
 	  this,TQT_SLOT(autoname_t(bool)));
@@ -516,14 +516,14 @@ IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name )
   //load info from gpppdata
   if(!isnewaccount) {
     if(gpppdata.ipaddr() == "0.0.0.0" &&
-       gpppdata.subnetmask() == "0.0.0.0") {
+       gpppdata.subnettqmask() == "0.0.0.0") {
       dynamicadd_rb->setChecked(true);
       hitIPSelect(0);
       autoname->setChecked(gpppdata.autoname());
     }
     else {
       ipaddress_l->setText(gpppdata.ipaddr());
-      subnetmask_l->setText(gpppdata.subnetmask());
+      subnettqmask_l->setText(gpppdata.subnettqmask());
       staticadd_rb->setChecked(true);
       autoname->setChecked(false);
     }
@@ -557,10 +557,10 @@ void IPWidget::autoname_t(bool on) {
 void IPWidget::save() {
   if(dynamicadd_rb->isChecked()) {
     gpppdata.setIpaddr("0.0.0.0");
-    gpppdata.setSubnetmask("0.0.0.0");
+    gpppdata.setSubnettqmask("0.0.0.0");
   } else {
     gpppdata.setIpaddr(ipaddress_l->text());
-    gpppdata.setSubnetmask(subnetmask_l->text());
+    gpppdata.setSubnettqmask(subnettqmask_l->text());
   }
   gpppdata.setAutoname(autoname->isChecked());
 }
@@ -571,28 +571,28 @@ void IPWidget::hitIPSelect( int i ) {
     ipaddress_label->setEnabled(false);
     sub_label->setEnabled(false);
     ipaddress_l->setEnabled(false);
-    subnetmask_l->setEnabled(false);
+    subnettqmask_l->setEnabled(false);
   }
   else {
     ipaddress_label->setEnabled(true);
     sub_label->setEnabled(true);
     ipaddress_l->setEnabled(true);
-    subnetmask_l->setEnabled(true);
+    subnettqmask_l->setEnabled(true);
   }
 }
 
 
 
-DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
-  : TQWidget(parent, name)
+DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name )
+  : TQWidget(tqparent, name)
 {
-  //  box = new TQGroupBox(parent);
-  TQGridLayout *tl = new TQGridLayout(parent, 7, 2, 0, KDialog::spacingHint());
+  //  box = new TQGroupBox(tqparent);
+  TQGridLayout *tl = new TQGridLayout(tqparent, 7, 2, 0, KDialog::spacingHint());
 
-  dnsdomain_label = new TQLabel(i18n("Domain &name:"), parent);
+  dnsdomain_label = new TQLabel(i18n("Domain &name:"), tqparent);
   tl->addWidget(dnsdomain_label, 0, 0);
 
-  dnsdomain = new TQLineEdit(parent);
+  dnsdomain = new TQLineEdit(tqparent);
   dnsdomain_label->setBuddy(dnsdomain);
   dnsdomain->setMaxLength(DOMAIN_SIZE);
   tl->addWidget(dnsdomain, 0, 1);
@@ -608,7 +608,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQWhatsThis::add(dnsdomain_label,tmp);
   TQWhatsThis::add(dnsdomain,tmp);
 
-  conf_label = new TQLabel(i18n("C&onfiguration:"), parent);
+  conf_label = new TQLabel(i18n("C&onfiguration:"), tqparent);
   tl->addWidget(conf_label, 1, 0);
 
   bg = new TQButtonGroup("Group", this);
@@ -616,23 +616,23 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
   connect(bg, TQT_SIGNAL(clicked(int)), TQT_SLOT(DNS_Mode_Selected(int)));
   bg->hide();
 
-  autodns = new TQRadioButton(i18n("Automatic"), parent);
+  autodns = new TQRadioButton(i18n("Automatic"), tqparent);
   bg->insert(autodns, 0);
   tl->addWidget(autodns, 1, 1);
   // no automatic DNS detection for pppd < 2.3.7
   if(!gpppdata.pppdVersionMin(2, 3, 7))
     autodns->setEnabled(false);
 
-  mandns = new TQRadioButton(i18n("Manual"), parent);
+  mandns = new TQRadioButton(i18n("Manual"), tqparent);
   bg->insert(mandns, 1);
   tl->addWidget(mandns, 2, 1);
 
-  dns_label = new TQLabel(i18n("DNS &IP address:"), parent);
+  dns_label = new TQLabel(i18n("DNS &IP address:"), tqparent);
   tl->addWidget(dns_label, 3, 0);
 
   TQHBoxLayout *l2 = new TQHBoxLayout;
   tl->addLayout(l2, 3, 1);
-  dnsipaddr = new IPLineEdit(parent);
+  dnsipaddr = new IPLineEdit(tqparent);
   dns_label->setBuddy(dnsipaddr);
   connect(dnsipaddr, TQT_SIGNAL(returnPressed()),
 	  TQT_SLOT(adddns()));
@@ -653,10 +653,10 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
 
   TQHBoxLayout *l1 = new TQHBoxLayout;
   tl->addLayout(l1, 4, 1);
-  add = new TQPushButton(i18n("&Add"), parent);
+  add = new TQPushButton(i18n("&Add"), tqparent);
   connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(adddns()));
-  int width = add->sizeHint().width();
-  width = QMAX(width,60);
+  int width = add->tqsizeHint().width();
+  width = TQMAX(width,60);
   add->setMinimumWidth(width);
   l1->addWidget(add);
   l1->addStretch(1);
@@ -665,21 +665,21 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
 		       "specified in the field above. The entry\n"
 		       "will then be added to the list below"));
 
-  remove = new TQPushButton(i18n("&Remove"), parent);
+  remove = new TQPushButton(i18n("&Remove"), tqparent);
   connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removedns()));
-  width = remove->sizeHint().width();
-  width = QMAX(width,60);
+  width = remove->tqsizeHint().width();
+  width = TQMAX(width,60);
   remove->setMinimumWidth(width);
   l1->addWidget(remove);
   TQWhatsThis::add(remove,
 		  i18n("Click this button to remove the selected DNS\n"
 		       "server entry from the list below"));
 
-  servers_label = new TQLabel(i18n("DNS address &list:"), parent);
-  servers_label->setAlignment(AlignTop|AlignLeft);
+  servers_label = new TQLabel(i18n("DNS address &list:"), tqparent);
+  servers_label->tqsetAlignment(AlignTop|AlignLeft);
   tl->addWidget(servers_label, 5, 0);
 
-  dnsservers = new TQListBox(parent);
+  dnsservers = new TQListBox(tqparent);
   servers_label->setBuddy(dnsservers);
   dnsservers->setMinimumSize(150, 80);
   connect(dnsservers, TQT_SIGNAL(highlighted(int)),
@@ -694,7 +694,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
 
   exdnsdisabled_toggle = new TQCheckBox(i18n( \
 "&Disable existing DNS servers during connection"),
-				     parent);
+				     tqparent);
   exdnsdisabled_toggle->setChecked(gpppdata.exDNSDisabled());
   tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, AlignCenter);
   TQWhatsThis::add(exdnsdisabled_toggle,
@@ -724,7 +724,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
 
 void DNSWidget::DNS_Edit_Changed(const TQString &text) {
   TQRegExp r("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+");
-  add->setEnabled(text.find(r) != -1);
+  add->setEnabled(text.tqfind(r) != -1);
 }
 
 void DNSWidget::DNS_Entry_Selected(int) {
@@ -782,16 +782,16 @@ void DNSWidget::removedns() {
 //
 // GatewayWidget
 //
-GatewayWidget::GatewayWidget( TQWidget *parent, bool isnewaccount, const char *name )
-  : TQWidget(parent, name)
+GatewayWidget::GatewayWidget( TQWidget *tqparent, bool isnewaccount, const char *name )
+  : TQWidget(tqparent, name)
 {
-  TQVBoxLayout *topLayout = new TQVBoxLayout(parent);
+  TQVBoxLayout *topLayout = new TQVBoxLayout(tqparent);
   topLayout->setSpacing(KDialog::spacingHint());
 
-  box = new TQVGroupBox(i18n("C&onfiguration"), parent);
+  box = new TQVGroupBox(i18n("C&onfiguration"), tqparent);
   box->setInsideSpacing(KDialog::spacingHint());
 
-  rb = new TQButtonGroup(parent);
+  rb = new TQButtonGroup(tqparent);
   rb->hide();
   connect(rb, TQT_SIGNAL(clicked(int)), TQT_SLOT(hitGatewaySelect(int)));
 
@@ -822,7 +822,7 @@ GatewayWidget::GatewayWidget( TQWidget *parent, bool isnewaccount, const char *n
   gate_label->setBuddy(gatewayaddr);
 
   defaultroute = new TQCheckBox(i18n("&Assign the default route to this gateway"),
-			     parent);
+			     tqparent);
   TQWhatsThis::add(defaultroute,
 		  i18n("If this option is enabled, all packets not\n"
 		       "going to the local net are routed through\n"
@@ -874,16 +874,16 @@ void GatewayWidget::hitGatewaySelect( int i ) {
 
 
 
-ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *name )
-  : TQWidget(parent, name)
+ScriptWidget::ScriptWidget( TQWidget *tqparent, bool isnewaccount, const char *name )
+  : TQWidget(tqparent, name)
 {
-  TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
-  se = new ScriptEdit(parent);
+  TQVBoxLayout *tl = new TQVBoxLayout(tqparent, 0, KDialog::spacingHint());
+  se = new ScriptEdit(tqparent);
   connect(se, TQT_SIGNAL(returnPressed()), TQT_SLOT(addButton()));
   tl->addWidget(se);
 
   // insert equal-sized buttons
-  KButtonBox *bbox = new KButtonBox(parent);
+  KButtonBox *bbox = new KButtonBox(tqparent);
   add = bbox->addButton(i18n("&Add"));
   connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(addButton()));
   bbox->addStretch(1);
@@ -892,23 +892,23 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam
   bbox->addStretch(1);
   remove = bbox->addButton(i18n("&Remove"));
   connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeButton()));
-  bbox->layout();
+  bbox->tqlayout();
   tl->addWidget(bbox);
 
   TQHBoxLayout *l12 = new TQHBoxLayout(0);
   tl->addLayout(l12);
-  stl = new TQListBox(parent);
+  stl = new TQListBox(tqparent);
   stl->setVScrollBarMode( TQScrollView::AlwaysOff );
   connect(stl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(stlhighlighted(int)));
   stl->setMinimumSize(TQSize(70, 140));
 
-  sl = new TQListBox(parent);
+  sl = new TQListBox(tqparent);
   sl->setVScrollBarMode( TQScrollView::AlwaysOff );
   connect(sl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slhighlighted(int)));
   sl->setMinimumSize(TQSize(150, 140));
 
-  slb = new TQScrollBar(parent);
-  slb->setFixedWidth(slb->sizeHint().width());
+  slb = new TQScrollBar(tqparent);
+  slb->setFixedWidth(slb->tqsizeHint().width());
   connect(slb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrolling(int)));
 
   l12->addWidget(stl, 1);
@@ -1201,7 +1201,7 @@ void ScriptWidget::removeButton() {
 // Used to specify a new phone number
 //
 /////////////////////////////////////////////////////////////////////////////
-PhoneNumberDialog::PhoneNumberDialog(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Add Phone Number"), Ok|Cancel) {
+PhoneNumberDialog::PhoneNumberDialog(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Add Phone Number"), Ok|Cancel) {
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
   TQHBox *hbox = new TQHBox(this);