1 files changed, 30 insertions, 30 deletions

diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 1f4e62d7..9b3121d0 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -20,23 +20,23 @@
 	 Creates a new sirc process and window !default connected to the
 	 server.  Does nothing if a server connection already exists.
 
-   add_toplevel(TQString tqparent, TQString child):
+   add_toplevel(TQString parent, TQString child):
       Args:
-	   tqparent: the server name that the new channel is being joined on
+	   parent: the server name that the new channel is being joined on
 	   child: the new channel name
       Action:
          Adds "child" to the list of joined channles in the main
 	 window.  Always call this on new window creation!
 
-   delete_toplevel(TQString tqparent, TQString child):
+   delete_toplevel(TQString parent, TQString child):
       Args:
-         tqparent: the server name of which channel is closing
-	         child: the channle that is closing. IFF Emtpy, tqparent is
+         parent: the server name of which channel is closing
+	         child: the channle that is closing. IFF Emtpy, parent is
 		 deleted.
       Action:
 	 Deletes the "child" window from the list of connections.  If
 	 the child is Empty the whole tree is removed since it is assumed
-         the tqparent has disconnected and is closing.
+         the parent has disconnected and is closing.
 
    new_channel:  Creates popup asking for new channel name
 
@@ -48,9 +48,9 @@
          list and join the requested channel.  Does nothing if nothing
          is selected in the tree list.
 
-   recvChangeChanel(TQString tqparent, TQString old, TQString new):
+   recvChangeChanel(TQString parent, TQString old, TQString new):
       Args:
-         tqparent: tqparent server connection
+         parent: parent server connection
          old: the old name for the window
          new: the new name for the window
       Action:
@@ -292,10 +292,10 @@ void servercontroller::new_channel()
     if(proc_list[citem->text(0)]){ // If it's a match with a server, ok
       server = citem->text(0);
     }
-    // Otherwise, check the tqparent to see it's perhaps a server.
-    else if ( citem->tqparent() ) {
-      if(proc_list[citem->tqparent()->text(0)]){
-        server = citem->tqparent()->text(0);
+    // Otherwise, check the parent to see it's perhaps a server.
+    else if ( citem->parent() ) {
+      if(proc_list[citem->parent()->text(0)]){
+        server = citem->parent()->text(0);
       }
     }
   }
@@ -355,9 +355,9 @@ void servercontroller::server_debug()
       if(proc_list[citem->text(0)]){ // If it's a match with a server, ok
           server = citem->text(0);
       }
-      else if ( citem->tqparent() ) {
-	  if(proc_list[citem->tqparent()->text(0)]){
-	      server = citem->tqparent()->text(0);
+      else if ( citem->parent() ) {
+	  if(proc_list[citem->parent()->text(0)]){
+	      server = citem->parent()->text(0);
 	  }
       }
 
@@ -406,7 +406,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
   TQListViewItem *serverItem = 0L;
   TQListViewItem *item = ConnectionTree->firstChild();
   while ( item ) {
-      if ( !item->tqparent() && item->text(0) == server ) {
+      if ( !item->parent() && item->text(0) == server ) {
 	  serverItem = item;
 	  break;
       }
@@ -462,14 +462,14 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
           break;
       }
       /*
-    // Add new channel, first add the tqparent to the path
+    // Add new channel, first add the parent to the path
     path.push(&server);
     path.push(&online);
     path.push(&args);
     // Remove old one if it's there
     ConnectionTree->removeItem(&path); // Remove the item
     path.pop();
-    // add a new child item with tqparent as its tqparent
+    // add a new child item with parent as its parent
     ConnectionTree->addChildItem(args, pic_run, &path);
     if (kSircConfig->BeepNotify) {
       KNotifyClient::beep();
@@ -479,7 +479,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
 
     /**
       *  Args:
-      *	   tqparent: the server name that the new channel is being joined on
+      *	   parent: the server name that the new channel is being joined on
       *    child:  the new channel name
       *  Action:
       *    Adds "child" to the list of joined channles in the main
@@ -489,7 +489,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
     // Add new channel
     if(args[0] == '!')
       args.remove(0, 1); // If the first char is !, it's control, remove it
-    // add a new child item with tqparent as it's tqparent
+    // add a new child item with parent as it's parent
     item = new TQListViewItem( serverItem, args );
     item->setPixmap( 0, pic_ppl );
 
@@ -497,13 +497,13 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
     break;
     /**
       *  Args:
-      *    tqparent: the server name of which channel is closing
-      *	   child: the channle that is closing. IFF Emtpy, tqparent is
+      *    parent: the server name of which channel is closing
+      *	   child: the channle that is closing. IFF Emtpy, parent is
       *	   deleted.
       *  Action:
       *	   Deletes the "child" window from the list of connections.  If
       *	   the child is Empty the whole tree is removed since it is assumed
-      *    the tqparent has disconnected and is closing.
+      *    the parent has disconnected and is closing.
       */
   case ProcCommand::deleteTopLevel:
     // If the child is emtpy, delete the whole tree, otherwise just the child
@@ -520,7 +520,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
 
   /**
       *  Args:
-      *    tqparent: tqparent server connection
+      *    parent: parent server connection
       *    old: the old name for the window
       *    new: the new name for the window
       *  Action:
@@ -762,7 +762,7 @@ void servercontroller::WindowSelected(TQListViewItem *item)
     if ( !item )
 	return;
 
-  TQListViewItem *parent_server = item->tqparent();
+  TQListViewItem *parent_server = item->parent();
   if(!parent_server)
     return;
 
@@ -782,14 +782,14 @@ void servercontroller::WindowSelected(TQListViewItem *item)
 }
 
 
-TQListViewItem * servercontroller::findChild( TQListViewItem *tqparent,
+TQListViewItem * servercontroller::findChild( TQListViewItem *parent,
 					     const TQString& text )
 {
-    if ( !tqparent || tqparent->childCount() == 0 ) {
+    if ( !parent || parent->childCount() == 0 ) {
 	return 0L;
     }
 
-    TQListViewItem *item = tqparent->firstChild();
+    TQListViewItem *item = parent->firstChild();
     while ( item ) {
 	if ( item->text(0) == text ) {
 	    return item;
@@ -944,9 +944,9 @@ void servercontroller::start_autoconnect_check() {
 }
 
 
-scInside::scInside ( TQWidget * tqparent, const char * name, WFlags
+scInside::scInside ( TQWidget * parent, const char * name, WFlags
 		     f )
-  : TQFrame(tqparent, name, f)
+  : TQFrame(parent, name, f)
 {
   ASConn = new TQLabel(i18n("Active server connections:"), this, "servercontroller_label");
   TQFont asfont = ASConn->font();