Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

27 files changed, 274 insertions, 274 deletions

diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp
index bdc22c56..99cbd65d 100644
--- a/kppp/accounting.cpp
+++ b/kppp/accounting.cpp
@@ -439,8 +439,8 @@ void ExecutableAccounting::slotStart() {
   TQString s_total;
   s_total.sprintf("%0.8f", total());
   *proc << s << s_total;
-  connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-	  this, TQT_SLOT(gotData(TDEProcess *, char *, int)));
+  connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+	  this, TQ_SLOT(gotData(TDEProcess *, char *, int)));
   proc->start();
 
   time_t start_time = time(0); 
diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index 352fdd5b..13f2ea37 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -63,16 +63,16 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
 
   accountlist_l = new TQListBox(parent);
   accountlist_l->setMinimumSize(160, 128);
-  connect(accountlist_l, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(slotListBoxSelect(int)));
-  connect(accountlist_l, TQT_SIGNAL(selected(int)),
-	  this, TQT_SLOT(editaccount()));
+  connect(accountlist_l, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(slotListBoxSelect(int)));
+  connect(accountlist_l, TQ_SIGNAL(selected(int)),
+	  this, TQ_SLOT(editaccount()));
   l11->addWidget(accountlist_l, 10);
 
   TQVBoxLayout *l111 = new TQVBoxLayout;
   l11->addLayout(l111, 1);
   edit_b = new TQPushButton(i18n("&Edit..."), parent);
-  connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editaccount()));
+  connect(edit_b, TQ_SIGNAL(clicked()), TQ_SLOT(editaccount()));
   TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account"));
 
   min = edit_b->sizeHint().width();
@@ -82,13 +82,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
   l111->addWidget(edit_b);
 
   new_b = new TQPushButton(i18n("&New..."), parent);
-  connect(new_b, TQT_SIGNAL(clicked()), TQT_SLOT(newaccount()));
+  connect(new_b, TQ_SIGNAL(clicked()), TQ_SLOT(newaccount()));
   l111->addWidget(new_b);
   TQWhatsThis::add(new_b, i18n("Create a new dialup connection\n"
   			      "to the Internet"));
 
   copy_b = new TQPushButton(i18n("Co&py"), parent);
-  connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copyaccount()));
+  connect(copy_b, TQ_SIGNAL(clicked()), TQ_SLOT(copyaccount()));
   l111->addWidget(copy_b);
   TQWhatsThis::add(copy_b,
 		  i18n("Makes a copy of the selected account. All\n"
@@ -97,7 +97,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
 		       "needs"));
 
   delete_b = new TQPushButton(i18n("De&lete"), parent);
-  connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deleteaccount()));
+  connect(delete_b, TQ_SIGNAL(clicked()), TQ_SLOT(deleteaccount()));
   l111->addWidget(delete_b);
   TQWhatsThis::add(delete_b,
 		  i18n("<p>Deletes the selected account\n\n"
@@ -155,13 +155,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
   l122->addStretch(1);
   reset = new TQPushButton(i18n("&Reset..."), parent);
   reset->setEnabled(FALSE);
-  connect(reset, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(resetClicked()));
+  connect(reset, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(resetClicked()));
   l122->addWidget(reset);
 
   log = new TQPushButton(i18n("&View Logs"), parent);
-  connect(log, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(viewLogClicked()));
+  connect(log, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(viewLogClicked()));
   l122->addWidget(log);
   l122->addStretch(1);
 
@@ -461,10 +461,10 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
   ok->setDefault(true);
   TQPushButton *cancel = bbox->addButton(KStdGuiItem::cancel());
 
-  connect(ok, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(accepted()));
-  connect(cancel, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(reject()));
+  connect(ok, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(accepted()));
+  connect(cancel, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(reject()));
 
   bbox->layout();
   tl->addWidget(bbox);
diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp
index f42b5a66..cd4013dd 100644
--- a/kppp/acctselect.cpp
+++ b/kppp/acctselect.cpp
@@ -60,20 +60,20 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con
 
   enable_accounting = new TQCheckBox(i18n("&Enable accounting"), parent);
   l1->addWidget(enable_accounting, 1);
-  connect(enable_accounting, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableItems(bool)));
+  connect(enable_accounting, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableItems(bool)));
 
   // insert the tree widget
   tl = new TQListView(parent, "treewidget");
 
-  connect(tl, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
-          TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+  connect(tl, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this,
+          TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
   tl->setMinimumSize(220, 200);
   l1->addWidget(tl, 1);
 
   KURLLabel *up = new KURLLabel(parent);
   up->setText(i18n("Check for rule updates"));
   up->setURL("http://developer.kde.org/~kppp/rules.html");
-  connect(up, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString&)));
+  connect(up, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(openURL(const TQString&)));
 
   l1->addWidget(up, 1);
 
diff --git a/kppp/connect.cpp b/kppp/connect.cpp
index 4e494ea1..abcc277c 100644
--- a/kppp/connect.cpp
+++ b/kppp/connect.cpp
@@ -125,11 +125,11 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st)
 
   debug = new TQPushButton(i18n("&Log"), this);
   debug->setToggleButton(true);
-  connect(debug, TQT_SIGNAL(clicked()), TQT_SIGNAL(toggleDebugWindow()));
+  connect(debug, TQ_SIGNAL(clicked()), TQ_SIGNAL(toggleDebugWindow()));
 
   cancel = new KPushButton(KStdGuiItem::cancel(), this);
   cancel->setFocus();
-  connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton()));
+  connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancelbutton()));
 
   int maxw = TQMAX(cancel->sizeHint().width(),
 		 debug->sizeHint().width());
@@ -143,24 +143,24 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st)
   setFixedSize(sizeHint());
 
   pausetimer = new TQTimer(this);
-  connect(pausetimer, TQT_SIGNAL(timeout()), TQT_SLOT(pause()));
+  connect(pausetimer, TQ_SIGNAL(timeout()), TQ_SLOT(pause()));
 
   kapp->processEvents();
 
   timeout_timer = new TQTimer(this);
-  connect(timeout_timer, TQT_SIGNAL(timeout()), TQT_SLOT(script_timed_out()));
+  connect(timeout_timer, TQ_SIGNAL(timeout()), TQ_SLOT(script_timed_out()));
 
   inittimer = new TQTimer(this);
-  connect(inittimer, TQT_SIGNAL(timeout()), TQT_SLOT(init()));
+  connect(inittimer, TQ_SIGNAL(timeout()), TQ_SLOT(init()));
 
   if_timeout_timer = new TQTimer(this);
-  connect(if_timeout_timer, TQT_SIGNAL(timeout()), TQT_SLOT(if_waiting_timed_out()));
+  connect(if_timeout_timer, TQ_SIGNAL(timeout()), TQ_SLOT(if_waiting_timed_out()));
 
-  connect(this,TQT_SIGNAL(if_waiting_signal()),this,TQT_SLOT(if_waiting_slot()));
+  connect(this,TQ_SIGNAL(if_waiting_signal()),this,TQ_SLOT(if_waiting_slot()));
 
   prompt = new PWEntry( this, "pw" );
   if_timer = new TQTimer(this);
-  connect(if_timer,TQT_SIGNAL(timeout()), TQT_SLOT(if_waiting_slot()));
+  connect(if_timer,TQ_SIGNAL(timeout()), TQ_SLOT(if_waiting_slot()));
 }
 
 
@@ -259,7 +259,7 @@ void ConnectWidget::init() {
       semaphore = false;
 
       Modem::modem->stop();
-      Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char)));
+      Modem::modem->notify(this, TQ_SLOT(readChar(unsigned char)));
 
       // if we are stuck anywhere we will time out
       timeout_timer->start(gpppdata.modemTimeout()*1000);
diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp
index 4523af90..9f4a10bd 100644
--- a/kppp/conwindow.cpp
+++ b/kppp/conwindow.cpp
@@ -62,15 +62,15 @@ ConWindow::ConWindow(TQWidget *parent, const char *name,TQWidget *mainwidget,
 
   cancelbutton = new TQPushButton(this);
   cancelbutton->setText(i18n("&Disconnect"));
-  connect(cancelbutton, TQT_SIGNAL(clicked()), mainwidget, TQT_SLOT(disconnect()));
+  connect(cancelbutton, TQ_SIGNAL(clicked()), mainwidget, TQ_SLOT(disconnect()));
 
   statsbutton = new TQPushButton(this);
   statsbutton->setText(i18n("De&tails"));
   statsbutton->setFocus();
-  connect(statsbutton, TQT_SIGNAL(clicked()), mainwidget, TQT_SLOT(showStats()));
+  connect(statsbutton, TQ_SIGNAL(clicked()), mainwidget, TQ_SLOT(showStats()));
 
   clocktimer = new TQTimer(this);
-  connect(clocktimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeclick()));
+  connect(clocktimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeclick()));
 
   // read window position from config file
   int p_x, p_y;
diff --git a/kppp/debug.cpp b/kppp/debug.cpp
index 24fd939f..23790300 100644
--- a/kppp/debug.cpp
+++ b/kppp/debug.cpp
@@ -65,7 +65,7 @@ DebugWidget::DebugWidget(TQWidget *parent, const char *name)
   dismiss->setGeometry(330,340,70,30);
   dismiss->setText(i18n("&Close"));
   dismiss->setFocus();
-  connect(dismiss, TQT_SIGNAL(clicked()), TQT_SLOT(hide()));
+  connect(dismiss, TQ_SIGNAL(clicked()), TQ_SLOT(hide()));
 
 
   /*  fline = new TQFrame(this,"line");
diff --git a/kppp/docking.cpp b/kppp/docking.cpp
index 792d80a6..041dcd46 100644
--- a/kppp/docking.cpp
+++ b/kppp/docking.cpp
@@ -50,12 +50,12 @@ DockWidget::DockWidget(TQWidget *parent, const char *name, PPPStats *st)
   // popup menu for right mouse button
   popup_m = contextMenu();
   toggleID = popup_m->insertItem(i18n("Restore"),
-				 this, TQT_SLOT(toggle_window_state()));
-  popup_m->insertItem(i18n("Details"), p_kppp, TQT_SLOT(showStats()));
+				 this, TQ_SLOT(toggle_window_state()));
+  popup_m->insertItem(i18n("Details"), p_kppp, TQ_SLOT(showStats()));
   popup_m->insertSeparator();
-  popup_m->insertItem(i18n("Disconnect"), p_kppp, TQT_SLOT(disconnect()));
+  popup_m->insertItem(i18n("Disconnect"), p_kppp, TQ_SLOT(disconnect()));
   // connect to stats for little modem animation
-  connect(stats, TQT_SIGNAL(statsChanged(int)), TQT_SLOT(paintIcon(int)));
+  connect(stats, TQ_SIGNAL(statsChanged(int)), TQ_SLOT(paintIcon(int)));
 
   DockWidget::dock_widget = this;
 }
diff --git a/kppp/edit.cpp b/kppp/edit.cpp
index 7e7d46c2..b4537617 100644
--- a/kppp/edit.cpp
+++ b/kppp/edit.cpp
@@ -89,16 +89,16 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
   lpn1->addStretch(1);
   lpn1->addWidget(up);
   lpn1->addWidget(down);
-  connect(add, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(addNumber()));
-  connect(del, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(delNumber()));
-  connect(up, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(upNumber()));
-  connect(down, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(downNumber()));
-  connect(numbers, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(selectionChanged(int)));
+  connect(add, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(addNumber()));
+  connect(del, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(delNumber()));
+  connect(up, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(upNumber()));
+  connect(down, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(downNumber()));
+  connect(numbers, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(selectionChanged(int)));
   numbersChanged();
 
   tmp = i18n("<p>Specifies the phone numbers to dial. You\n"
@@ -157,8 +157,8 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
   cbtype->insertItem(i18n("None"));
   cbtype->insertItem(i18n("Administrator-defined"));
   cbtype->insertItem(i18n("User-defined"));
-  connect(cbtype, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(cbtypeChanged(int)));
+  connect(cbtype, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(cbtypeChanged(int)));
   tl->addWidget(cbtype, 5, 1);
   tmp = i18n("Callback type");
 
@@ -178,7 +178,7 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQWhatsThis::add(cbphone,tmp);
 
   pppdargs = new TQPushButton(i18n("Customize &pppd Arguments..."), parent);
-  connect(pppdargs, TQT_SIGNAL(clicked()), TQT_SLOT(pppdargsbutton()));
+  connect(pppdargs, TQ_SIGNAL(clicked()), TQ_SLOT(pppdargsbutton()));
   tl->addMultiCellWidget(pppdargs, 7, 7, 0, 1, AlignCenter);
 
   // Set defaults if editing an existing connection
@@ -438,8 +438,8 @@ IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name )
 
   rb = new TQButtonGroup(parent);
   rb->hide();
-  connect(rb, TQT_SIGNAL(clicked(int)),
-	  TQT_SLOT(hitIPSelect(int)));
+  connect(rb, TQ_SIGNAL(clicked(int)),
+	  TQ_SLOT(hitIPSelect(int)));
 
   dynamicadd_rb = new TQRadioButton(box);
   dynamicadd_rb->setText(i18n("Dynamic IP address"));
@@ -496,8 +496,8 @@ IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name )
 
   autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), parent);
   autoname->setChecked(gpppdata.autoname());
-  connect(autoname,TQT_SIGNAL(toggled(bool)),
-	  this,TQT_SLOT(autoname_t(bool)));
+  connect(autoname,TQ_SIGNAL(toggled(bool)),
+	  this,TQ_SLOT(autoname_t(bool)));
 
   TQWhatsThis::add(autoname,
 		  i18n("<p>Whenever you connect, this reconfigures\n"
@@ -613,7 +613,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
 
   bg = new TQButtonGroup("Group", this);
   conf_label->setBuddy(bg);
-  connect(bg, TQT_SIGNAL(clicked(int)), TQT_SLOT(DNS_Mode_Selected(int)));
+  connect(bg, TQ_SIGNAL(clicked(int)), TQ_SLOT(DNS_Mode_Selected(int)));
   bg->hide();
 
   autodns = new TQRadioButton(i18n("Automatic"), parent);
@@ -634,10 +634,10 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
   tl->addLayout(l2, 3, 1);
   dnsipaddr = new IPLineEdit(parent);
   dns_label->setBuddy(dnsipaddr);
-  connect(dnsipaddr, TQT_SIGNAL(returnPressed()),
-	  TQT_SLOT(adddns()));
-  connect(dnsipaddr, TQT_SIGNAL(textChanged(const TQString &)),
-	  TQT_SLOT(DNS_Edit_Changed(const TQString &)));
+  connect(dnsipaddr, TQ_SIGNAL(returnPressed()),
+	  TQ_SLOT(adddns()));
+  connect(dnsipaddr, TQ_SIGNAL(textChanged(const TQString &)),
+	  TQ_SLOT(DNS_Edit_Changed(const TQString &)));
   l2->addWidget(dnsipaddr, 1);
   l2->addStretch(1);
   tmp = i18n("<p>Allows you to specify a new DNS server to be\n"
@@ -654,7 +654,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
   TQHBoxLayout *l1 = new TQHBoxLayout;
   tl->addLayout(l1, 4, 1);
   add = new TQPushButton(i18n("&Add"), parent);
-  connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(adddns()));
+  connect(add, TQ_SIGNAL(clicked()), TQ_SLOT(adddns()));
   int width = add->sizeHint().width();
   width = TQMAX(width,60);
   add->setMinimumWidth(width);
@@ -666,7 +666,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
 		       "will then be added to the list below"));
 
   remove = new TQPushButton(i18n("&Remove"), parent);
-  connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removedns()));
+  connect(remove, TQ_SIGNAL(clicked()), TQ_SLOT(removedns()));
   width = remove->sizeHint().width();
   width = TQMAX(width,60);
   remove->setMinimumWidth(width);
@@ -682,8 +682,8 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
   dnsservers = new TQListBox(parent);
   servers_label->setBuddy(dnsservers);
   dnsservers->setMinimumSize(150, 80);
-  connect(dnsservers, TQT_SIGNAL(highlighted(int)),
-	  TQT_SLOT(DNS_Entry_Selected(int)));
+  connect(dnsservers, TQ_SIGNAL(highlighted(int)),
+	  TQ_SLOT(DNS_Entry_Selected(int)));
   tl->addWidget(dnsservers, 5, 1);
   tmp = i18n("<p>This shows all defined DNS servers to use\n"
 	     "while you are connected. Use the <b>Add</b> and\n"
@@ -793,7 +793,7 @@ GatewayWidget::GatewayWidget( TQWidget *parent, bool isnewaccount, const char *n
 
   rb = new TQButtonGroup(parent);
   rb->hide();
-  connect(rb, TQT_SIGNAL(clicked(int)), TQT_SLOT(hitGatewaySelect(int)));
+  connect(rb, TQ_SIGNAL(clicked(int)), TQ_SLOT(hitGatewaySelect(int)));
 
   defaultgateway = new TQRadioButton(box);
   defaultgateway->setText(i18n("Default gateway"));
@@ -879,19 +879,19 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam
 {
   TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint());
   se = new ScriptEdit(parent);
-  connect(se, TQT_SIGNAL(returnPressed()), TQT_SLOT(addButton()));
+  connect(se, TQ_SIGNAL(returnPressed()), TQ_SLOT(addButton()));
   tl->addWidget(se);
 
   // insert equal-sized buttons
   KButtonBox *bbox = new KButtonBox(parent);
   add = bbox->addButton(i18n("&Add"));
-  connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(addButton()));
+  connect(add, TQ_SIGNAL(clicked()), TQ_SLOT(addButton()));
   bbox->addStretch(1);
   insert = bbox->addButton(i18n("&Insert"));
-  connect(insert, TQT_SIGNAL(clicked()), TQT_SLOT(insertButton()));
+  connect(insert, TQ_SIGNAL(clicked()), TQ_SLOT(insertButton()));
   bbox->addStretch(1);
   remove = bbox->addButton(i18n("&Remove"));
-  connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeButton()));
+  connect(remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeButton()));
   bbox->layout();
   tl->addWidget(bbox);
 
@@ -899,17 +899,17 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam
   tl->addLayout(l12);
   stl = new TQListBox(parent);
   stl->setVScrollBarMode( TQScrollView::AlwaysOff );
-  connect(stl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(stlhighlighted(int)));
+  connect(stl, TQ_SIGNAL(highlighted(int)), TQ_SLOT(stlhighlighted(int)));
   stl->setMinimumSize(TQSize(70, 140));
 
   sl = new TQListBox(parent);
   sl->setVScrollBarMode( TQScrollView::AlwaysOff );
-  connect(sl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slhighlighted(int)));
+  connect(sl, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slhighlighted(int)));
   sl->setMinimumSize(TQSize(150, 140));
 
   slb = new TQScrollBar(parent);
   slb->setFixedWidth(slb->sizeHint().width());
-  connect(slb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrolling(int)));
+  connect(slb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(scrolling(int)));
 
   l12->addWidget(stl, 1);
   l12->addWidget(sl, 3);
@@ -1214,8 +1214,8 @@ PhoneNumberDialog::PhoneNumberDialog(TQWidget *parent) : KDialogBase(parent, 0,
   le = newLineEdit(14, hbox);
   le->setMinimumWidth(125);
 
-  connect(le, TQT_SIGNAL(textChanged(const TQString &)),
-	  this, TQT_SLOT(textChanged(const TQString &)));
+  connect(le, TQ_SIGNAL(textChanged(const TQString &)),
+	  this, TQ_SLOT(textChanged(const TQString &)));
 
   le->setFocus();
   textChanged("");
diff --git a/kppp/general.cpp b/kppp/general.cpp
index b1e2c0b0..aeea5059 100644
--- a/kppp/general.cpp
+++ b/kppp/general.cpp
@@ -66,8 +66,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name)
   pppdTimeout->setLabel(i18n("pppd &timeout:"));
   pppdTimeout->setRange(1, TIMEOUT_SIZE, 5, true);
   pppdTimeout->setSuffix(i18n(" sec"));
-  connect(pppdTimeout, TQT_SIGNAL(valueChanged(int)),
-          TQT_SLOT(pppdtimeoutchanged(int)));
+  connect(pppdTimeout, TQ_SIGNAL(valueChanged(int)),
+          TQ_SLOT(pppdtimeoutchanged(int)));
   tl->addWidget(pppdTimeout);
   TQString tmp = i18n("<i>kppp</i> will wait this number of seconds\n"
 		     "to see if a PPP connection is established.\n"
@@ -90,14 +90,14 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name)
 		       "size."));
 
   chkBox->setChecked(gpppdata.get_dock_into_panel());
-  connect(chkBox,TQT_SIGNAL(toggled(bool)),
-	  this, TQT_SLOT(docking_toggled(bool)));
+  connect(chkBox,TQ_SIGNAL(toggled(bool)),
+	  this, TQ_SLOT(docking_toggled(bool)));
   tl->addWidget(chkBox);
 
   chkBox = new TQCheckBox(i18n("A&utomatic redial on disconnect"), parent);
   chkBox->setChecked(gpppdata.automatic_redial());
-  connect(chkBox,TQT_SIGNAL(toggled(bool)),
-	  this, TQT_SLOT(redial_toggled(bool)));
+  connect(chkBox,TQ_SIGNAL(toggled(bool)),
+	  this, TQ_SLOT(redial_toggled(bool)));
   tl->addWidget(chkBox);
   TQWhatsThis::add(chkBox,
 		  i18n("<p>When a connection is established and\n"
@@ -108,8 +108,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name)
 
   chkBox = new TQCheckBox(i18n("Automatic redial on NO &CARRIER"), parent);
   chkBox->setChecked(gpppdata.get_redial_on_nocarrier());
-  connect(chkBox,TQT_SIGNAL(toggled(bool)),
-	  this, TQT_SLOT(nocarrier_toggled(bool)));
+  connect(chkBox,TQ_SIGNAL(toggled(bool)),
+	  this, TQ_SLOT(nocarrier_toggled(bool)));
   tl->addWidget(chkBox);
   TQWhatsThis::add(chkBox,
 		  i18n("<p>When dialing if modem returns NO CARRIER\n"
@@ -119,8 +119,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name)
 
   chkBox = new TQCheckBox(i18n("&Show clock on caption"), parent);
   chkBox->setChecked(gpppdata.get_show_clock_on_caption());
-  connect(chkBox, TQT_SIGNAL(toggled(bool)),
-	  this, TQT_SLOT(caption_toggled(bool)));
+  connect(chkBox, TQ_SIGNAL(toggled(bool)),
+	  this, TQ_SLOT(caption_toggled(bool)));
   tl->addWidget(chkBox);
   TQWhatsThis::add(chkBox,
 		  i18n("When this option is checked, the window\n"
@@ -130,8 +130,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name)
 
   chkBox = new TQCheckBox(i18n("Disco&nnect on X server shutdown"), parent);
   chkBox->setChecked(gpppdata.get_xserver_exit_disconnect());
-  connect(chkBox, TQT_SIGNAL(toggled(bool)),
-	  this, TQT_SLOT(xserver_toggled(bool)));
+  connect(chkBox, TQ_SIGNAL(toggled(bool)),
+	  this, TQ_SLOT(xserver_toggled(bool)));
   tl->addWidget(chkBox);
   TQWhatsThis::add(chkBox,
 		  i18n("<p>Checking this option will close any\n"
@@ -143,8 +143,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name)
 
   chkBox = new TQCheckBox(i18n("&Quit on disconnect"), parent);
   chkBox->setChecked(gpppdata.quit_on_disconnect());
-  connect(chkBox, TQT_SIGNAL(toggled(bool)),
-	  this, TQT_SLOT(quit_toggled(bool)));
+  connect(chkBox, TQ_SIGNAL(toggled(bool)),
+	  this, TQ_SLOT(quit_toggled(bool)));
   tl->addWidget(chkBox);
   TQWhatsThis::add(chkBox,
 		  i18n("When this option is turned on, <i>kppp</i>\n"
@@ -152,8 +152,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name)
 
   chkBox = new TQCheckBox(i18n("Minimi&ze window on connect"), parent);
   chkBox->setChecked(gpppdata.get_iconify_on_connect());
-  connect(chkBox,TQT_SIGNAL(toggled(bool)),
-	  this,TQT_SLOT(iconify_toggled(bool)));
+  connect(chkBox,TQ_SIGNAL(toggled(bool)),
+	  this,TQ_SLOT(iconify_toggled(bool)));
   tl->addWidget(chkBox);
   TQWhatsThis::add(chkBox,
 		  i18n("Iconifies <i>kppp</i>'s window when a\n"
@@ -238,8 +238,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name)
       modemdevice->insertItem(gpppdata.modemDevice());
 
   tl->addWidget(modemdevice, 1, 1);
-/*  connect(modemdevice, TQT_SIGNAL(activated(int)),
-	  TQT_SLOT(setmodemdc(int)));*/
+/*  connect(modemdevice, TQ_SIGNAL(activated(int)),
+	  TQ_SLOT(setmodemdc(int)));*/
    tmp = i18n("This specifies the serial port your modem is attached \n"
 		     "to. On Linux/x86, typically this is either /dev/ttyS0 \n"
 		     "(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).\n"
@@ -266,8 +266,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name)
   flowListItem << "None";
 
   tl->addWidget(flowcontrol, 2, 1);
-  /*connect(flowcontrol, TQT_SIGNAL(activated(int)),
-	  TQT_SLOT(setflowcontrol(int)));*/
+  /*connect(flowcontrol, TQ_SIGNAL(activated(int)),
+	  TQ_SLOT(setflowcontrol(int)));*/
 
   tmp = i18n("<p>Specifies how the serial port and modem\n"
 	     "communicate. You should not change this unless\n"
@@ -287,7 +287,7 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name)
   enter->insertItem("LF");
   enter->insertItem("CR/LF");
   tl->addWidget(enter, 3, 1);
- /* connect(enter, TQT_SIGNAL(activated(int)), TQT_SLOT(setenter(int)));*/
+ /* connect(enter, TQ_SIGNAL(activated(int)), TQ_SLOT(setenter(int)));*/
   tmp = i18n("<p>Specifies how AT commands are sent to your\n"
 	     "modem. Most modems will work fine with the\n"
 	     "default <i>CR/LF</i>. If your modem does not react\n"
@@ -336,8 +336,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name)
     baud_c->insertItem(baudrates[k]);
 
   baud_c->setCurrentItem(3);
-  /*connect(baud_c, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(speed_selection(int)));*/
+  /*connect(baud_c, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(speed_selection(int)));*/
   tl->addWidget(baud_c, 4, 1);
 
   tmp = i18n("Specifies the speed your modem and the serial\n"
@@ -361,8 +361,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name)
   modemlockfile = new TQCheckBox(i18n("&Use lock file"), parent);
 
   modemlockfile->setChecked(gpppdata.modemLockFile());
-/*  connect(modemlockfile, TQT_SIGNAL(toggled(bool)),
-          TQT_SLOT(modemlockfilechanged(bool)));*/
+/*  connect(modemlockfile, TQ_SIGNAL(toggled(bool)),
+          TQ_SLOT(modemlockfilechanged(bool)));*/
   tl->addMultiCellWidget(modemlockfile, 5, 5, 0, 1);
   //  l12->addStretch(1);
   TQWhatsThis::add(modemlockfile,
@@ -382,8 +382,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name)
   modemtimeout->setLabel(i18n("Modem &timeout:"));
   modemtimeout->setRange(1, 120, 1);
   modemtimeout->setSuffix(i18n(" sec"));
-/*  connect(modemtimeout, TQT_SIGNAL(valueChanged(int)),
-	  TQT_SLOT(modemtimeoutchanged(int)));*/
+/*  connect(modemtimeout, TQ_SIGNAL(valueChanged(int)),
+	  TQ_SLOT(modemtimeoutchanged(int)));*/
   tl->addMultiCellWidget(modemtimeout, 6, 6, 0, 1);
 
   TQWhatsThis::add(modemtimeout,
@@ -453,7 +453,7 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name)
 
   waitfordt = new TQCheckBox(i18n("&Wait for dial tone before dialing"), parent);
   waitfordt->setChecked(gpppdata.waitForDialTone());
- // connect(waitfordt, TQT_SIGNAL(toggled(bool)), TQT_SLOT(waitfordtchanged(bool)));
+ // connect(waitfordt, TQ_SIGNAL(toggled(bool)), TQ_SLOT(waitfordtchanged(bool)));
   l1->addWidget(waitfordt);
   TQWhatsThis::add(waitfordt,
 		  i18n("<p>Normally the modem waits for a dial tone\n"
@@ -468,7 +468,7 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name)
   busywait->setLabel(i18n("B&usy wait:"));
   busywait->setRange(0, 300, 5, true);
   busywait->setSuffix(i18n(" sec"));
- // connect(busywait, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(busywaitchanged(int)));
+ // connect(busywait, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(busywaitchanged(int)));
   l1->addWidget(busywait);
 
   TQWhatsThis::add(busywait,
@@ -494,8 +494,8 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name)
 
   l1->addLayout(hbl);
 
- /* connect(volume, TQT_SIGNAL(valueChanged(int)),
-	  this, TQT_SLOT(volumeChanged(int)));*/
+ /* connect(volume, TQ_SIGNAL(valueChanged(int)),
+	  this, TQ_SLOT(volumeChanged(int)));*/
   TQString tmp = i18n("Most modems have a speaker which makes\n"
 	     "a lot of noise when dialing. Here you can\n"
 	     "either turn this completely off or select a\n"
@@ -512,8 +512,8 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name)
 #if 0
   chkbox1 = new TQCheckBox(i18n("Modem asserts CD line"), parent);
   chkbox1->setChecked(gpppdata.UseCDLine());
-  connect(chkbox1,TQT_SIGNAL(toggled(bool)),
-	  this,TQT_SLOT(use_cdline_toggled(bool)));
+  connect(chkbox1,TQ_SIGNAL(toggled(bool)),
+	  this,TQ_SLOT(use_cdline_toggled(bool)));
   l12->addWidget(chkbox1);
   l12->addStretch(1);
   l1->addStretch(1);
@@ -558,12 +558,12 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name)
   hbox->addStretch(1);
   l1->addStretch(1);
 
-  connect(modemcmds, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(modemcmdsbutton()));
-  connect(modeminfo_button, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(query_modem()));
-  connect(terminal_button, TQT_SIGNAL(clicked()),
-	  TQT_SLOT(terminal()));
+  connect(modemcmds, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(modemcmdsbutton()));
+  connect(modeminfo_button, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(query_modem()));
+  connect(terminal_button, TQ_SIGNAL(clicked()),
+	  TQ_SLOT(terminal()));
 
 		// Create the Modem Command so if the window is not opened they are autosaved anyway
 	mc = new ModemCommands(this);
@@ -647,15 +647,15 @@ GraphSetup::GraphSetup(TQWidget *parent, const char *name) :
 
   tl->addStretch();
 
-  connect(enable_check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableToggled(bool)));
-  connect(bg_color, TQT_SIGNAL(changed(const TQColor &)),
-	  TQT_SLOT(colorChanged(const TQColor&)));
-  connect(text_color, TQT_SIGNAL(changed(const TQColor &)),
-	  TQT_SLOT(colorChanged(const TQColor&)));
-  connect(in_color, TQT_SIGNAL(changed(const TQColor &)),
-	  TQT_SLOT(colorChanged(const TQColor&)));
-  connect(out_color, TQT_SIGNAL(changed(const TQColor &)),
-	  TQT_SLOT(colorChanged(const TQColor&)));
+  connect(enable_check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableToggled(bool)));
+  connect(bg_color, TQ_SIGNAL(changed(const TQColor &)),
+	  TQ_SLOT(colorChanged(const TQColor&)));
+  connect(text_color, TQ_SIGNAL(changed(const TQColor &)),
+	  TQ_SLOT(colorChanged(const TQColor&)));
+  connect(in_color, TQ_SIGNAL(changed(const TQColor &)),
+	  TQ_SLOT(colorChanged(const TQColor&)));
+  connect(out_color, TQ_SIGNAL(changed(const TQColor &)),
+	  TQ_SLOT(colorChanged(const TQColor&)));
 
   tl->activate();
 
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 3599145a..a6dfae00 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -105,8 +105,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
   connectto_c = new TQComboBox(false, this);
   label1->setBuddy(connectto_c);
 
-  connect(connectto_c, TQT_SIGNAL(activated(int)),
-	  TQT_SLOT(newdefaultaccount(int)));
+  connect(connectto_c, TQ_SIGNAL(activated(int)),
+	  TQ_SLOT(newdefaultaccount(int)));
   l1->addWidget(connectto_c, 0, 2);
 
   label7 = new TQLabel(i18n("Use &modem: "), this);
@@ -115,8 +115,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
   label7->setBuddy(connectto_c);
   m_bModemCShown = false;
 
-  connect(modem_c, TQT_SIGNAL(activated(int)),
-	  TQT_SLOT(newdefaultmodem(int)));
+  connect(modem_c, TQ_SIGNAL(activated(int)),
+	  TQ_SLOT(newdefaultmodem(int)));
   // l1->addWidget(modem_c, 1, 2); (done in resetmodems())
 
   ID_Label = new TQLabel(i18n("&Login ID:"), this);
@@ -126,8 +126,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
   ID_Edit = new TQLineEdit(this);
   ID_Label->setBuddy(ID_Edit);
   l1->addWidget(ID_Edit, 2, 2);
-  connect(ID_Edit, TQT_SIGNAL(returnPressed()),
-	  this, TQT_SLOT(enterPressedInID()));
+  connect(ID_Edit, TQ_SIGNAL(returnPressed()),
+	  this, TQ_SLOT(enterPressedInID()));
   TQString tmp = i18n("<p>Type in the username that you got from your\n"
 		     "ISP. This is especially important for PAP\n"
 		     "and CHAP. You may omit this when you use\n"
@@ -146,8 +146,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
   PW_Label->setBuddy(PW_Edit);
   PW_Edit->setEchoMode(TQLineEdit::Password);
   l1->addWidget(PW_Edit, 3, 2);
-  connect(PW_Edit, TQT_SIGNAL(returnPressed()),
-	  this, TQT_SLOT(enterPressedInPW()));
+  connect(PW_Edit, TQ_SIGNAL(returnPressed()),
+	  this, TQ_SLOT(enterPressedInPW()));
 
   tmp = i18n("<p>Type in the password that you got from your\n"
 	     "ISP. This is especially important for PAP\n"
@@ -166,8 +166,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
    tl->addSpacing(5);
    l3->addSpacing(10);
    log = new TQCheckBox(i18n("Show lo&g window"), this);
-   connect(log, TQT_SIGNAL(toggled(bool)),
-  	  this, TQT_SLOT(log_window_toggled(bool)));
+   connect(log, TQ_SIGNAL(toggled(bool)),
+  	  this, TQ_SLOT(log_window_toggled(bool)));
    log->setChecked(gpppdata.get_show_log_window());
    l3->addWidget(log);
 
@@ -188,12 +188,12 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
 
   int minw = 0;
   quit_b = new KPushButton(KStdGuiItem::quit(), this);
-  connect( quit_b, TQT_SIGNAL(clicked()), TQT_SLOT(quitbutton()));
+  connect( quit_b, TQ_SIGNAL(clicked()), TQ_SLOT(quitbutton()));
   if(quit_b->sizeHint().width() > minw)
       minw = quit_b->sizeHint().width();
 
   setup_b = new KPushButton(KGuiItem(i18n("Co&nfigure..."), "configure"), this);
-  connect( setup_b, TQT_SIGNAL(clicked()), TQT_SLOT(expandbutton()));
+  connect( setup_b, TQ_SIGNAL(clicked()), TQ_SLOT(expandbutton()));
   if(setup_b->sizeHint().width() > minw)
       minw = setup_b->sizeHint().width();
 
@@ -201,7 +201,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
     setup_b->setEnabled(false);
 
   help_b = new KPushButton(KStdGuiItem::help(), this);
-  connect( help_b, TQT_SIGNAL(clicked()), TQT_SLOT(helpbutton()));
+  connect( help_b, TQ_SIGNAL(clicked()), TQ_SLOT(helpbutton()));
 
   KHelpMenu *helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), true);
   help_b->setPopup((TQPopupMenu*)helpMenu->menu());
@@ -212,7 +212,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
   connect_b = new TQPushButton(i18n("&Connect"), this);
   connect_b->setDefault(true);
   connect_b->setFocus();
-  connect(connect_b, TQT_SIGNAL(clicked()), TQT_SLOT(beginConnect()));
+  connect(connect_b, TQ_SIGNAL(clicked()), TQ_SLOT(beginConnect()));
   if(connect_b->sizeHint().width() > minw)
       minw = connect_b->sizeHint().width();
 
@@ -233,7 +233,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
 
   // we also connect cmld_start to the beginConnect so that I can run
   // the dialer through a command line argument
-  connect(this,TQT_SIGNAL(cmdl_start()),this,TQT_SLOT(beginConnect()));
+  connect(this,TQ_SIGNAL(cmdl_start()),this,TQ_SLOT(beginConnect()));
 
   stats = new PPPStats;
 
@@ -256,28 +256,28 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
   resetmodems();
   con = new ConnectWidget(0, "con", stats);
   KWin::setIcons(con->winId(), kapp->icon(), kapp->miniIcon() );
-  connect(this, TQT_SIGNAL(begin_connect()),con, TQT_SLOT(preinit()));
+  connect(this, TQ_SIGNAL(begin_connect()),con, TQ_SLOT(preinit()));
 
   TQRect desk = TDEGlobalSettings::desktopGeometry(topLevelWidget());
   con->setGeometry(desk.center().x()-175, desk.center().y()-55, 350,110);
 
   // connect the ConnectWidgets various signals
-  connect(con, TQT_SIGNAL(closeDebugWindow()),
-	  debugwindow, TQT_SLOT(hide()));
-  connect(con, TQT_SIGNAL(debugMessage(const TQString &)),
-	  debugwindow, TQT_SLOT(statusLabel(const TQString &)));
-  connect(con, TQT_SIGNAL(toggleDebugWindow()),
-	  debugwindow, TQT_SLOT(toggleVisibility()));
-  connect(con, TQT_SIGNAL(debugPutChar(unsigned char)),
-	  debugwindow, TQT_SLOT(addChar(unsigned char)));
-  connect(con, TQT_SIGNAL(startAccounting()),
-	  this, TQT_SLOT(startAccounting()));
-  connect(con, TQT_SIGNAL(stopAccounting()),
-	  this, TQT_SLOT(stopAccounting()));
-  connect(TDEApplication::kApplication(), TQT_SIGNAL(saveYourself()),
-	  this, TQT_SLOT(saveMyself()));
-  connect(TDEApplication::kApplication(), TQT_SIGNAL(shutDown()),
-	  this, TQT_SLOT(shutDown()));
+  connect(con, TQ_SIGNAL(closeDebugWindow()),
+	  debugwindow, TQ_SLOT(hide()));
+  connect(con, TQ_SIGNAL(debugMessage(const TQString &)),
+	  debugwindow, TQ_SLOT(statusLabel(const TQString &)));
+  connect(con, TQ_SIGNAL(toggleDebugWindow()),
+	  debugwindow, TQ_SLOT(toggleVisibility()));
+  connect(con, TQ_SIGNAL(debugPutChar(unsigned char)),
+	  debugwindow, TQ_SLOT(addChar(unsigned char)));
+  connect(con, TQ_SIGNAL(startAccounting()),
+	  this, TQ_SLOT(startAccounting()));
+  connect(con, TQ_SIGNAL(stopAccounting()),
+	  this, TQ_SLOT(stopAccounting()));
+  connect(TDEApplication::kApplication(), TQ_SIGNAL(saveYourself()),
+	  this, TQ_SLOT(saveMyself()));
+  connect(TDEApplication::kApplication(), TQ_SIGNAL(shutDown()),
+	  this, TQ_SLOT(shutDown()));
 
   debugwindow->setGeometry(desk.center().x()+190, desk.center().y()-55,
 			   debugwindow->width(),debugwindow->height());
@@ -342,7 +342,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
   // this timer will delay the actual disconnection DISCONNECTION_DELAY ms
   // to give applications time to shutdown, logout, whatever..
   disconnectTimer = new TQTimer(this);
-  connect(disconnectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(delayedDisconnect()));
+  connect(disconnectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(delayedDisconnect()));
 }
 
 KPPPWidget::~KPPPWidget()
@@ -391,16 +391,16 @@ void KPPPWidget::prepareSetupDialog() {
     //    tabWindow->setFixedSize( 365, 375 );
 
     accounts = new AccountWidget(tabWindow->addPage( i18n("&Accounts"), i18n("Account Setup") ) );
-    connect(accounts, TQT_SIGNAL(resetaccounts()),
-	    this, TQT_SLOT(resetaccounts()));
-    connect(accounts, TQT_SIGNAL(resetCosts(const TQString &)),
-	    this, TQT_SLOT(resetCosts(const TQString &)));
-    connect(accounts, TQT_SIGNAL(resetVolume(const TQString &)),
-	    this, TQT_SLOT(resetVolume(const TQString &)));
+    connect(accounts, TQ_SIGNAL(resetaccounts()),
+	    this, TQ_SLOT(resetaccounts()));
+    connect(accounts, TQ_SIGNAL(resetCosts(const TQString &)),
+	    this, TQ_SLOT(resetCosts(const TQString &)));
+    connect(accounts, TQ_SIGNAL(resetVolume(const TQString &)),
+	    this, TQ_SLOT(resetVolume(const TQString &)));
 
     modems = new ModemsWidget(tabWindow->addPage( i18n("&Modems"), i18n("Modems Setup") ) );
-    connect(modems, TQT_SIGNAL(resetmodems()),
-	    this, TQT_SLOT(resetmodems()));
+    connect(modems, TQ_SIGNAL(resetmodems()),
+	    this, TQ_SLOT(resetmodems()));
 
     graph = new GraphSetup( tabWindow->addPage( i18n("&Graph"), i18n("Throughput Graph" ) ) );
     general = new GeneralWidget( tabWindow->addPage( i18n("M&isc"), i18n("Miscellaneous Settings") ) );
@@ -476,11 +476,11 @@ void KPPPWidget::resetaccounts() {
 	PW_Edit->setText(gpppdata.storedPassword());
     }
 
-  connect(ID_Edit, TQT_SIGNAL(textChanged(const TQString &)),
- 	  this, TQT_SLOT(usernameChanged(const TQString &)));
+  connect(ID_Edit, TQ_SIGNAL(textChanged(const TQString &)),
+ 	  this, TQ_SLOT(usernameChanged(const TQString &)));
 
-  connect(PW_Edit, TQT_SIGNAL(textChanged(const TQString &)),
- 	  this, TQT_SLOT(passwordChanged(const TQString &)));
+  connect(PW_Edit, TQ_SIGNAL(textChanged(const TQString &)),
+ 	  this, TQ_SLOT(passwordChanged(const TQString &)));
 
   if (ID_Edit->text().isEmpty())
       ID_Edit->setFocus();
@@ -917,8 +917,8 @@ void KPPPWidget::startAccounting() {
     //    acct = new ExecutableAccounting(this);
 
   // connect to the accounting object
-  connect(acct, TQT_SIGNAL(changed(TQString, TQString)),
-	  con_win, TQT_SLOT(slotAccounting(TQString, TQString)));
+  connect(acct, TQ_SIGNAL(changed(TQString, TQString)),
+	  con_win, TQ_SLOT(slotAccounting(TQString, TQString)));
 
   if(!acct->loadRuleSet(gpppdata.accountingFile())) {
     TQString s= i18n("Can not load the accounting "
@@ -927,7 +927,7 @@ void KPPPWidget::startAccounting() {
     // starting the messagebox with a timer will prevent us
     // from blocking the calling function ConnectWidget::timerEvent
     ruleset_load_errmsg = s;
-    TQTimer::singleShot(0, this, TQT_SLOT(rulesetLoadError()));
+    TQTimer::singleShot(0, this, TQ_SLOT(rulesetLoadError()));
     return;
   } else
     acct->slotStart();
@@ -1043,8 +1043,8 @@ void KPPPWidget::showNews() {
     bbox->addStretch(1);
     TQPushButton *ok = bbox->addButton(KStdGuiItem::ok());
     ok->setDefault(true);
-    dlg.connect(ok, TQT_SIGNAL(clicked()),
-		&dlg, TQT_SLOT(accept()));
+    dlg.connect(ok, TQ_SIGNAL(clicked()),
+		&dlg, TQ_SLOT(accept()));
     bbox->addStretch(1);
     bbox->layout();
 
diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp
index a663e9b2..e5c4f3f1 100644
--- a/kppp/loginterm.cpp
+++ b/kppp/loginterm.cpp
@@ -116,11 +116,11 @@ LoginTerm::LoginTerm (TQWidget *parent, const char *name)
 
   cancel_b = new KPushButton(KStdGuiItem::cancel(), this, "cancel");
   cancel_b->setFixedHeight(25);
-  connect(cancel_b, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton()));
+  connect(cancel_b, TQ_SIGNAL(clicked()), TQ_SLOT(cancelbutton()));
 
   continue_b = new KPushButton(KStdGuiItem::cont(), this, "continue");
   continue_b->setFixedHeight(25);
-  connect(continue_b, TQT_SIGNAL(clicked()), TQT_SLOT(continuebutton()));
+  connect(continue_b, TQ_SIGNAL(clicked()), TQ_SLOT(continuebutton()));
 
   int mwidth;
   if (cancel_b->sizeHint().width() > continue_b->sizeHint().width())
@@ -136,7 +136,7 @@ LoginTerm::LoginTerm (TQWidget *parent, const char *name)
 
   cont = false;
 
-  Modem::modem->notify(text_window, TQT_SLOT(readChar(unsigned char)));
+  Modem::modem->notify(text_window, TQ_SLOT(readChar(unsigned char)));
 }
 
 
diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp
index f236be50..432ec970 100644
--- a/kppp/logview/export.cpp
+++ b/kppp/logview/export.cpp
@@ -60,7 +60,7 @@ ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date)
   TQHBoxLayout *formatLayout = new TQHBoxLayout(formatPage);
 
   typeList = new TQListBox(formatPage);
-  connect(typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT (typeHighlighted(int)));
+  connect(typeList, TQ_SIGNAL(highlighted(int)), TQ_SLOT (typeHighlighted(int)));
   typeList->setMinimumSize(50, 200);
   TQToolTip::add(typeList, i18n("List with possible output formats"));
   int i=0;
@@ -100,7 +100,7 @@ ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date)
   fnGet->setMaximumWidth(200);
   TQToolTip::add(fnGet, i18n("Select the filename of the exported output file"));
   filenameLayout->addWidget(fnGet);
-  connect(fnGet, TQT_SIGNAL(clicked()), TQT_SLOT(getFilename()));
+  connect(fnGet, TQ_SIGNAL(clicked()), TQ_SLOT(getFilename()));
   filenameLayout->addStretch(2);
 
   addPage(filenamePage, i18n("Selection of Filename"));
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index 8633d46f..b4591e0c 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -73,8 +73,8 @@ TopWidget::TopWidget() : TDEMainWindow(0, "") {
     mb->insertItem(i18n("&File"), fm);
 
     mb->setAccel(CTRL + Key_Q, F_EXIT);
-    connect(mb, TQT_SIGNAL(activated(int)),
-	    this, TQT_SLOT(menuCallback(int)));
+    connect(mb, TQ_SIGNAL(activated(int)),
+	    this, TQ_SLOT(menuCallback(int)));
   } else {
     mb = 0;
     TQPushButton *but = new KPushButton(KStdGuiItem::close(),w);
@@ -82,8 +82,8 @@ TopWidget::TopWidget() : TDEMainWindow(0, "") {
     lh->addStretch(10);
     lh->addWidget(but);
 
-    connect(but, TQT_SIGNAL(clicked()),
-	    kapp, TQT_SLOT(quit()));
+    connect(but, TQ_SIGNAL(clicked()),
+	    kapp, TQ_SLOT(quit()));
   }
 
   setMinimumSize(mw->sizeHint().width() + 15,
diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp
index 1a6b5a1f..656bf582 100644
--- a/kppp/logview/monthly.cpp
+++ b/kppp/logview/monthly.cpp
@@ -196,7 +196,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) :
   lv->setMinimumHeight(280);
   lv->setSelectionMode(TQListView::Extended);
   selectionItem = 0L;
-  connect(lv, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+  connect(lv, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
 
   lv2 = new TDEListView(this);
   lv2->addColumn(i18n("Connection"));
@@ -225,8 +225,8 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) :
   cboConnections = new TQComboBox(false, this);            // add a combo box to select connections
   cboConnections->setMaximumWidth(200);                   // a resonable size
   cboConnections->insertItem(i18n("All Connections"));    // default to all connections
-  connect(cboConnections, TQT_SIGNAL(activated(int)),
-	  this, TQT_SLOT(slotConnections(int)));
+  connect(cboConnections, TQ_SIGNAL(activated(int)),
+	  this, TQ_SLOT(slotConnections(int)));
 
   bbox = new KButtonBox(this, TQt::Vertical);
   prev = bbox->addButton(i18n("&Prev Month"));
@@ -236,14 +236,14 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) :
   bbox->addStretch(1);
   exportBttn = bbox->addButton(i18n("&Export..."));
 
-  connect(prev, TQT_SIGNAL(released()),
-	  this, TQT_SLOT(prevMonth()));
-  connect(next, TQT_SIGNAL(released()),
-	  this, TQT_SLOT(nextMonth()));
-  connect(today, TQT_SIGNAL(released()),
-	  this, TQT_SLOT(currentMonth()));
-  connect(exportBttn, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(exportWizard()));
+  connect(prev, TQ_SIGNAL(released()),
+	  this, TQ_SLOT(prevMonth()));
+  connect(next, TQ_SIGNAL(released()),
+	  this, TQ_SLOT(nextMonth()));
+  connect(today, TQ_SIGNAL(released()),
+	  this, TQ_SLOT(currentMonth()));
+  connect(exportBttn, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(exportWizard()));
 
   bbox->addStretch(8);
   bbox->layout();
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index 55f526fd..e65f812e 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -54,9 +54,9 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name)
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
   m_file = new TQPopupMenu(this);
-  m_file->insertItem( SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(cancelbutton()) );
+  m_file->insertItem( SmallIcon("window-close"), i18n("&Close"), this, TQ_SLOT(cancelbutton()) );
   m_options = new TQPopupMenu(this);
-  m_options->insertItem(i18n("&Reset Modem"),this,TQT_SLOT(resetModem()));
+  m_options->insertItem(i18n("&Reset Modem"),this,TQ_SLOT(resetModem()));
   m_help =
     new KHelpMenu(this,
 		      i18n("MiniTerm - A terminal emulation for KPPP\n\n"
@@ -86,7 +86,7 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name)
   layout->addWidget(statusbar);
 
   inittimer = new TQTimer(this);
-  connect(inittimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(init()));
+  connect(inittimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(init()));
   inittimer->start(500);
 
   resize(550,400);
@@ -103,16 +103,16 @@ void MiniTerm::setupToolbar() {
   toolbar = new TDEToolBar( this );
 
   toolbar->insertButton("system-log-out", 0,
-		      TQT_SIGNAL(clicked()), this,
-		      TQT_SLOT(cancelbutton()), TRUE, i18n("Close MiniTerm"));
+		      TQ_SIGNAL(clicked()), this,
+		      TQ_SLOT(cancelbutton()), TRUE, i18n("Close MiniTerm"));
 
   toolbar->insertButton("back", 0,
-		      TQT_SIGNAL(clicked()), this,
-		      TQT_SLOT(resetModem()), TRUE, i18n("Reset Modem"));
+		      TQ_SIGNAL(clicked()), this,
+		      TQ_SLOT(resetModem()), TRUE, i18n("Reset Modem"));
 
   toolbar->insertButton("help", 0,
-		      TQT_SIGNAL(clicked()), this,
-		      TQT_SLOT(help()), TRUE, i18n("Help"));
+		      TQ_SIGNAL(clicked()), this,
+		      TQ_SLOT(help()), TRUE, i18n("Help"));
 
   toolbar->setBarPos( TDEToolBar::Top );
   toolbar->setMovingEnabled(false);
@@ -154,7 +154,7 @@ void MiniTerm::init() {
       kapp->processEvents();
       kapp->processEvents();
 
-      Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char)));
+      Modem::modem->notify(this, TQ_SLOT(readChar(unsigned char)));
       return;
     }
   }
diff --git a/kppp/modem.cpp b/kppp/modem.cpp
index ee75d417..9b24cb94 100644
--- a/kppp/modem.cpp
+++ b/kppp/modem.cpp
@@ -253,13 +253,13 @@ void Modem::readtty(int) {
 
 
 void Modem::notify(const TQObject *receiver, const char *member) {
-  connect(this, TQT_SIGNAL(charWaiting(unsigned char)), receiver, member);
+  connect(this, TQ_SIGNAL(charWaiting(unsigned char)), receiver, member);
   startNotifier();
 }
 
 
 void Modem::stop() {
-  disconnect(TQT_SIGNAL(charWaiting(unsigned char)));
+  disconnect(TQ_SIGNAL(charWaiting(unsigned char)));
   stopNotifier();
 }
 
@@ -268,7 +268,7 @@ void Modem::startNotifier() {
   if(modemfd >= 0) {
     if(sn == 0) {
       sn = new TQSocketNotifier(modemfd, TQSocketNotifier::Read, this);
-      connect(sn, TQT_SIGNAL(activated(int)), TQT_SLOT(readtty(int)));
+      connect(sn, TQ_SIGNAL(activated(int)), TQ_SLOT(readtty(int)));
       kdDebug(5002) << "TQSocketNotifier started!" << endl;
     } else {
       //    Debug("TQSocketNotifier re-enabled!");
diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index 625ee40b..0a68996a 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -73,8 +73,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   preinitslider = new TQSlider(0, 300, 1, 0,
                                        TQt::Horizontal, dummyWidget);
   preinitslider->setFixedHeight(preinitslider->sizeHint().height());
-  connect(preinitslider, TQT_SIGNAL(valueChanged(int)),
-	  lpreinitslider, TQT_SLOT(setNum(int)));
+  connect(preinitslider, TQ_SIGNAL(valueChanged(int)),
+	  lpreinitslider, TQ_SLOT(setNum(int)));
   l2->addWidget(lpreinitslider, 0);
   l2->addWidget(preinitslider, 1);
 
@@ -97,8 +97,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   initslider = new TQSlider(1, 300, 1, 0,
 				TQt::Horizontal, dummyWidget);
   initslider->setFixedHeight(initslider->sizeHint().height());
-  connect(initslider, TQT_SIGNAL(valueChanged(int)),
-	  linitslider, TQT_SLOT(setNum(int)));
+  connect(initslider, TQ_SIGNAL(valueChanged(int)),
+	  linitslider, TQ_SLOT(setNum(int)));
   l3->addWidget(linitslider, 0);
   l3->addWidget(initslider, 1);
 
@@ -113,8 +113,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   durationslider = new TQSlider(1, 255, 1, 0,
 				TQt::Horizontal, dummyWidget);
   durationslider->setFixedHeight(durationslider->sizeHint().height());
-  connect(durationslider, TQT_SIGNAL(valueChanged(int)),
-	  ldurationslider, TQT_SLOT(setNum(int)));
+  connect(durationslider, TQ_SIGNAL(valueChanged(int)),
+	  ldurationslider, TQ_SLOT(setNum(int)));
   l4->addWidget(ldurationslider, 0);
   l4->addWidget(durationslider, 1);
 
@@ -229,8 +229,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   slider = new TQSlider(0, 255, 1, 0,
 				TQt::Horizontal, dummyWidget);
   slider->setFixedHeight(slider->sizeHint().height());
-  connect(slider, TQT_SIGNAL(valueChanged(int)),
-	  lslider, TQT_SLOT(setNum(int)));
+  connect(slider, TQ_SIGNAL(valueChanged(int)),
+	  lslider, TQ_SLOT(setNum(int)));
   l5->addWidget(lslider, 0);
   l5->addWidget(slider, 1);
 
diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp
index a59bbb7d..4124f52c 100644
--- a/kppp/modemdb.cpp
+++ b/kppp/modemdb.cpp
@@ -81,16 +81,16 @@ ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) {
   db = new ModemDatabase();
 
   // set up signal/slots
-  connect(ok, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(reject()));
-  connect(cancel, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(reject()));
-  connect(vendor, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(vendorSelected(int)));
-  connect(model, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(modelSelected(int)));
-  connect(model, TQT_SIGNAL(selected(int)),
-	  this, TQT_SLOT(selected(int)));
+  connect(ok, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(reject()));
+  connect(cancel, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(reject()));
+  connect(vendor, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(vendorSelected(int)));
+  connect(model, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(modelSelected(int)));
+  connect(model, TQ_SIGNAL(selected(int)),
+	  this, TQ_SLOT(selected(int)));
 
   // fill vendor list with life
   vendor->insertStringList(*db->vendors());
diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp
index 75a6c00a..7053f2e9 100644
--- a/kppp/modeminfo.cpp
+++ b/kppp/modeminfo.cpp
@@ -67,7 +67,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
 
   cancel = new KPushButton(KStdGuiItem::cancel(), this);
   cancel->setFocus();
-  connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton()));
+  connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancelbutton()));
 
   TQHBoxLayout *l1 = new TQHBoxLayout;
   tl->addLayout(l1);
@@ -81,13 +81,13 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
   ////////////////////////////////////////////////
 
   timeout_timer = new TQTimer(this);
-  connect(timeout_timer, TQT_SIGNAL(timeout()), TQT_SLOT(time_out_slot()));
+  connect(timeout_timer, TQ_SIGNAL(timeout()), TQ_SLOT(time_out_slot()));
 
   scripttimer = new TQTimer(this);
-  connect(scripttimer, TQT_SIGNAL(timeout()), TQT_SLOT(do_script()));
+  connect(scripttimer, TQ_SIGNAL(timeout()), TQ_SLOT(do_script()));
 
   timeout_timer->start(15000,TRUE); // 15 secs single shot
-  TQTimer::singleShot(500, this, TQT_SLOT(init()));
+  TQTimer::singleShot(500, this, TQ_SLOT(init()));
 
 }
 
@@ -151,7 +151,7 @@ void ModemTransfer::init() {
       // clear modem buffer
       Modem::modem->flush();
 
-      Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char)));
+      Modem::modem->notify(this, TQ_SLOT(readChar(unsigned char)));
       return;
     }
   }
@@ -277,7 +277,7 @@ ModemInfo::ModemInfo(TQWidget *parent, const char* name)
   tl->addLayout(l2);
   l2->addStretch(1);
 
-  connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+  connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
   l2->addWidget(ok);
 
   setMinimumSize(sizeHint());
diff --git a/kppp/modems.cpp b/kppp/modems.cpp
index c064b714..9ceab292 100644
--- a/kppp/modems.cpp
+++ b/kppp/modems.cpp
@@ -62,16 +62,16 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name )
 
   modemlist_l = new TQListBox(parent);
   modemlist_l->setMinimumSize(160, 128);
-  connect(modemlist_l, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(slotListBoxSelect(int)));
-  connect(modemlist_l, TQT_SIGNAL(selected(int)),
-	  this, TQT_SLOT(editmodem()));
+  connect(modemlist_l, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(slotListBoxSelect(int)));
+  connect(modemlist_l, TQ_SIGNAL(selected(int)),
+	  this, TQ_SLOT(editmodem()));
   l11->addWidget(modemlist_l, 10);
 
   TQVBoxLayout *l111 = new TQVBoxLayout;
   l11->addLayout(l111, 1);
   edit_b = new TQPushButton(i18n("&Edit..."), parent);
-  connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editmodem()));
+  connect(edit_b, TQ_SIGNAL(clicked()), TQ_SLOT(editmodem()));
   TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account"));
 
   min = edit_b->sizeHint().width();
@@ -81,13 +81,13 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name )
   l111->addWidget(edit_b);
 
   new_b = new TQPushButton(i18n("&New..."), parent);
-  connect(new_b, TQT_SIGNAL(clicked()), TQT_SLOT(newmodem()));
+  connect(new_b, TQ_SIGNAL(clicked()), TQ_SLOT(newmodem()));
   l111->addWidget(new_b);
   TQWhatsThis::add(new_b, i18n("Create a new dialup connection\n"
   			      "to the Internet"));
 
   copy_b = new TQPushButton(i18n("Co&py"), parent);
-  connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copymodem()));
+  connect(copy_b, TQ_SIGNAL(clicked()), TQ_SLOT(copymodem()));
   l111->addWidget(copy_b);
   TQWhatsThis::add(copy_b,
 		  i18n("Makes a copy of the selected account. All\n"
@@ -96,7 +96,7 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name )
 		       "needs"));
 
   delete_b = new TQPushButton(i18n("De&lete"), parent);
-  connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deletemodem()));
+  connect(delete_b, TQ_SIGNAL(clicked()), TQ_SLOT(deletemodem()));
   l111->addWidget(delete_b);
   TQWhatsThis::add(delete_b,
 		  i18n("<p>Deletes the selected account\n\n"
@@ -224,7 +224,7 @@ int ModemsWidget::doTab(){
   }
   modem1 = new ModemWidget(tabWindow->addPage( i18n("&Device"), i18n("Serial Device")), isnewmodem );
   modem2 = new ModemWidget2(tabWindow->addPage( i18n("&Modem"), i18n("Modem Settings")));
-  connect ( modem1->connectName(), TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(modemNameChanged(const TQString & )));
+  connect ( modem1->connectName(), TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(modemNameChanged(const TQString & )));
   
   modemNameChanged(modem1->connectName()->text());
   int result = 0;
diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp
index 138cc663..2bbc1e62 100644
--- a/kppp/pppdargs.cpp
+++ b/kppp/pppdargs.cpp
@@ -61,29 +61,29 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name)
 
   argument = new TQLineEdit(this);
   argument_label->setBuddy(argument);
-  connect(argument, TQT_SIGNAL(returnPressed()),
-	  TQT_SLOT(addbutton()));
+  connect(argument, TQ_SIGNAL(returnPressed()),
+	  TQ_SLOT(addbutton()));
   l11->addWidget(argument);
-  connect(argument, TQT_SIGNAL(textChanged(const TQString &)),
-	  this, TQT_SLOT(textChanged(const TQString &)));
+  connect(argument, TQ_SIGNAL(textChanged(const TQString &)),
+	  this, TQ_SLOT(textChanged(const TQString &)));
 
   arguments = new TQListBox(this);
   arguments->setMinimumSize(1, fontMetrics().lineSpacing()*10);
-  connect(arguments, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(itemSelected(int)));
+  connect(arguments, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(itemSelected(int)));
   l1->addWidget(arguments, 1);
 
   add = new TQPushButton(i18n("&Add"), this);
-  connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(addbutton()));
+  connect(add, TQ_SIGNAL(clicked()), TQ_SLOT(addbutton()));
   l2->addWidget(add);
   l2->addStretch(1);
 
   remove = new TQPushButton(i18n("&Remove"), this);
-  connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removebutton()));
+  connect(remove, TQ_SIGNAL(clicked()), TQ_SLOT(removebutton()));
   l2->addWidget(remove);
 
   defaults = new KPushButton(KStdGuiItem::defaults(), this);
-  connect(defaults, TQT_SIGNAL(clicked()), TQT_SLOT(defaultsbutton()));
+  connect(defaults, TQ_SIGNAL(clicked()), TQ_SLOT(defaultsbutton()));
   l2->addWidget(defaults);
 
   l->addSpacing(5);
@@ -91,10 +91,10 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name)
   KButtonBox *bbox = new KButtonBox(this);
   bbox->addStretch(1);
   closebtn = bbox->addButton(KStdGuiItem::ok());
-  connect(closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(closebutton()));
+  connect(closebtn, TQ_SIGNAL(clicked()), TQ_SLOT(closebutton()));
   TQPushButton *cancel = bbox->addButton(KStdGuiItem::cancel());
-  connect(cancel, TQT_SIGNAL(clicked()),
-	  this, TQT_SLOT(reject()));
+  connect(cancel, TQ_SIGNAL(clicked()),
+	  this, TQ_SLOT(reject()));
   bbox->layout();
   l->addWidget(bbox);
 
diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp
index 8ca0a652..590c15bc 100644
--- a/kppp/ppplog.cpp
+++ b/kppp/ppplog.cpp
@@ -265,10 +265,10 @@ void PPPL_ShowLog() {
   for(uint i = 0; i < result.count(); i++)
     diagnosis->append(*result.at(i));
 
-  dlg->connect(close, TQT_SIGNAL(clicked()),
-	       dlg, TQT_SLOT(reject()));
-  dlg->connect(write, TQT_SIGNAL(clicked()),
-	       dlg, TQT_SLOT(accept()));
+  dlg->connect(close, TQ_SIGNAL(clicked()),
+	       dlg, TQ_SLOT(reject()));
+  dlg->connect(write, TQ_SIGNAL(clicked()),
+	       dlg, TQ_SLOT(accept()));
 
   if(dlg->exec()) {
     TQDir d = TQDir::home();
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index f65c36ca..f70b379d 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -174,19 +174,19 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
 
   cancelbutton = new KPushButton(KStdGuiItem::close(),this, "cancelbutton");
   cancelbutton->setFocus();
-  connect(cancelbutton, TQT_SIGNAL(clicked()), this,TQT_SLOT(cancel()));
+  connect(cancelbutton, TQ_SIGNAL(clicked()), this,TQ_SLOT(cancel()));
   cancelbutton->setFixedHeight(cancelbutton->sizeHint().height());
   cancelbutton->setMinimumWidth(TQMAX(cancelbutton->sizeHint().width(), 70));
   l12->addWidget(cancelbutton);
 
   if(gpppdata.graphingEnabled()) {
     graphTimer = new TQTimer(this);
-    connect(graphTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph()));
+    connect(graphTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph()));
   }
 
   setFixedSize(sizeHint());
 
-  connect(stats, TQT_SIGNAL(statsChanged(int)), TQT_SLOT(paintIcon(int)));
+  connect(stats, TQ_SIGNAL(statsChanged(int)), TQ_SLOT(paintIcon(int)));
 
   // read window position from config file
   int p_x, p_y;
diff --git a/kppp/pppstats.cpp b/kppp/pppstats.cpp
index 9dd6f366..aedd63bf 100644
--- a/kppp/pppstats.cpp
+++ b/kppp/pppstats.cpp
@@ -109,7 +109,7 @@ PPPStats::PPPStats()
 {
   clear();
   timer = new TQTimer;
-  connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerClick()));
+  connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerClick()));
 }
 
 
diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp
index d88fbefb..508b5f5f 100644
--- a/kppp/providerdb.cpp
+++ b/kppp/providerdb.cpp
@@ -83,10 +83,10 @@ ProviderDB::ProviderDB(TQWidget *parent) :
   setFinish(page9, true);
   setFinishEnabled(page9, true);
 
-  connect((const TQObject *)nextButton(), TQT_SIGNAL(clicked()),
-  	  this, TQT_SLOT(pageSelected()));
-  connect((const TQObject *)backButton(), TQT_SIGNAL(clicked()),
-  	  this, TQT_SLOT(pageSelected()));
+  connect((const TQObject *)nextButton(), TQ_SIGNAL(clicked()),
+  	  this, TQ_SLOT(pageSelected()));
+  connect((const TQObject *)backButton(), TQ_SIGNAL(clicked()),
+  	  this, TQ_SLOT(pageSelected()));
 
   //  resize(minimumSize());
   adjustSize();
@@ -198,8 +198,8 @@ PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) {
   l1->addStretch(1);
 
   lb = new TQListBox(this);
-  connect(lb, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(selectionChanged(int)));
+  connect(lb, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(selectionChanged(int)));
   lb->setMinimumSize(220, 100);
   l1->addWidget(lb, 2);
   l1->addStretch(1);
@@ -274,8 +274,8 @@ PDB_Provider::PDB_Provider(TQWidget *parent) : TQWidget(parent) {
   l1->addStretch(1);
 
   lb = new TQListBox(this);
-  connect(lb, TQT_SIGNAL(highlighted(int)),
-	  this, TQT_SLOT(selectionChanged(int)));
+  connect(lb, TQ_SIGNAL(highlighted(int)),
+	  this, TQ_SLOT(selectionChanged(int)));
   lb->setMinimumSize(220, 100);
   l1->addWidget(lb, 2);
   l1->addStretch(1);
@@ -350,13 +350,13 @@ PDB_UserInfo::PDB_UserInfo(TQWidget *parent) : TQWidget(parent) {
   l = new TQLabel(i18n("Password:"), this);
   l1->addWidget(l, 1, 0);
   _username = newLineEdit(24, this);
-  connect(_username, TQT_SIGNAL(textChanged(const TQString &)),
-	  this, TQT_SLOT(textChanged(const TQString &)));
+  connect(_username, TQ_SIGNAL(textChanged(const TQString &)),
+	  this, TQ_SLOT(textChanged(const TQString &)));
   l1->addWidget(_username, 0, 1);
   _password = newLineEdit(24, this);
   _password->setEchoMode(TQLineEdit::Password);
-  connect(_password, TQT_SIGNAL(textChanged(const TQString &)),
-	  this, TQT_SLOT(textChanged(const TQString &)));
+  connect(_password, TQ_SIGNAL(textChanged(const TQString &)),
+	  this, TQ_SLOT(textChanged(const TQString &)));
   l1->addWidget(_password, 1, 1);
   tl->activate();
 }
diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp
index 2af3efb4..32442a53 100644
--- a/kppp/pwentry.cpp
+++ b/kppp/pwentry.cpp
@@ -53,7 +53,7 @@ PWEntry::PWEntry( TQWidget *parent, const char *name )
    
    pw = new TQLineEdit( this, "le" );
    pw->setEchoMode( TQLineEdit::Password ); 
-   connect( pw, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(hide()) );
+   connect( pw, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(hide()) );
 
    isconsumed = TRUE;
 }
diff --git a/kppp/scriptedit.cpp b/kppp/scriptedit.cpp
index afa88821..9667776d 100644
--- a/kppp/scriptedit.cpp
+++ b/kppp/scriptedit.cpp
@@ -51,12 +51,12 @@ ScriptEdit::ScriptEdit( TQWidget *parent, const char *name )
   st->insertItem("Scan");
   st->insertItem("Save");
   st->insertItem("SendNoEcho");
-  connect(st, TQT_SIGNAL(activated(int)), TQT_SLOT(setType(int)));
+  connect(st, TQ_SIGNAL(activated(int)), TQ_SLOT(setType(int)));
 
   se = new TQLineEdit(this, "se");
   se->setGeometry(120, 5, 140, 25);
   se->setMaxLength(50);
-  connect(se, TQT_SIGNAL(returnPressed()), TQT_SLOT(seReturnPressed()));
+  connect(se, TQ_SIGNAL(returnPressed()), TQ_SLOT(seReturnPressed()));
 
   tl->addWidget(st, 3);
   tl->addWidget(se, 7);