Remove additional unneeded tq method conversions

32 files changed, 147 insertions, 147 deletions

diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index 76a6a2ef..76fd1190 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -132,7 +132,7 @@ void FilterRuleEditor::updateListBox(int citem )
   }
   if(filter->RuleList->count() > 0)
     filter->RuleList->setCurrentItem(citem);
-  filter->RuleList->tqrepaint();
+  filter->RuleList->repaint();
 
   filter->DeleteButton->setEnabled( filter->RuleList->currentItem() > -1 );
   filter->ModifyButton->setEnabled( filter->RuleList->currentItem() > -1 );
diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui
index b3dcc2da..24dcccd7 100644
--- a/ksirc/KSOpenkSirc/open_ksircData.ui
+++ b/ksirc/KSOpenkSirc/open_ksircData.ui
@@ -134,7 +134,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignTop|AlignLeft</set>
                     </property>
                     <property name="vAlign" stdset="0">
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 49920e42..1b311682 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -59,7 +59,7 @@ void PageAutoConnect::saveConfig()
 	if(it->text(SSL).length() > 0)
             server += " (SSL)";
 	if(it->text(PASS).length() > 0)
-	    server += TQString(" (pass: %1)").tqarg(it->text(PASS));
+	    server += TQString(" (pass: %1)").arg(it->text(PASS));
 
         servers << server;
 
@@ -73,7 +73,7 @@ void PageAutoConnect::saveConfig()
 	    channel = ch->text(NAME);
 
 	    if(ch->text(PK).length() > 0)
-		channel += TQString(" (key: %1)").tqarg(ch->text(PK));
+		channel += TQString(" (key: %1)").arg(ch->text(PK));
 
 	    channels << channel;
 
@@ -183,7 +183,7 @@ void PageAutoConnect::add_pressed()
 	}
 
 	parent->setText(NAME, ServerLE->text());
-	parent->setText(PK, TQString("%1").tqarg(PortKI->value()));
+	parent->setText(PK, TQString("%1").arg(PortKI->value()));
 	parent->setText(PASS, PassLE->text());
 	if(sslCB->isChecked())
 	    parent->setText(SSL, i18n("SSL"));
diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui
index a691708f..5b366680 100644
--- a/ksirc/KSPrefs/page_looknfeelbase.ui
+++ b/ksirc/KSPrefs/page_looknfeelbase.ui
@@ -106,7 +106,7 @@
                     <property name="text">
                         <string>Choose your favorite window mode:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="vAlign" stdset="0">
diff --git a/ksirc/KSPrefs/page_rmbmenubase.ui b/ksirc/KSPrefs/page_rmbmenubase.ui
index b4234c4b..1073d179 100644
--- a/ksirc/KSPrefs/page_rmbmenubase.ui
+++ b/ksirc/KSPrefs/page_rmbmenubase.ui
@@ -41,7 +41,7 @@
             <property name="text">
                 <string>This page allows configuration of the RMB Menu for the nicklist located on the right. You can define names for certain actions. Look at the predefined commands to learn how it works.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index 4f3933db..84821e7d 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -110,7 +110,7 @@ void KSTicker::show()
   if(currentStr.length() != 0)
     startTicker();
   currentChar = 0;
-  tqrepaint(TRUE);
+  repaint(TRUE);
 }
 
 void KSTicker::hide()
@@ -129,7 +129,7 @@ void KSTicker::setString(TQString str)
 {
     strlist.clear();
     strlist.append(str);
-    tqrepaint(TRUE);
+    repaint(TRUE);
     startTicker();
 }
 
@@ -138,7 +138,7 @@ void KSTicker::mergeString(TQString str, TQColor c)
   int num = KSPainter::colour2num(c);
 
   if(num != -1){
-      str.prepend(TQString("~%1").tqarg(num));
+      str.prepend(TQString("~%1").arg(num));
   }
   mergeString(str);
 
@@ -150,7 +150,7 @@ void KSTicker::mergeString(TQString str)
     if(rx.search(str) >= 0){
 	int value = nickColourMaker::colourMaker()->findIdx(rx.cap(1));
 	if(value >= 0){
-	    TQString newText = TQString("~%1\\1~c").tqarg(value);
+	    TQString newText = TQString("~%1\\1~c").arg(value);
 	    str.replace(rx, newText);
 	}
     }
diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp
index 5477cf5a..3dd44896 100644
--- a/ksirc/ahistlineedit.cpp
+++ b/ksirc/ahistlineedit.cpp
@@ -102,13 +102,13 @@ void aHistLineEdit::slotMaybeResize()
     if(text().length() > IRC_SAFE_MAX_LINE){
         if(m_drawrect == false){
             m_drawrect = true;
-            tqrepaint();
+            repaint();
         }
     }
     else {
         if(m_drawrect == true){
             m_drawrect = false;
-            tqrepaint();
+            repaint();
         }
     }
 
@@ -133,7 +133,7 @@ void aHistLineEdit::slotMaybeResize()
         setFixedHeight( h );
         TQLayout *l = topLevelWidget()->tqlayout();
         if(l){
-            l->tqinvalidate();
+            l->invalidate();
             l->activate();
         }
         emit resized();
diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp
index b79ba1e2..26b09ffd 100644
--- a/ksirc/chanButtons.cpp
+++ b/ksirc/chanButtons.cpp
@@ -93,7 +93,7 @@ void chanButtons::limited()
   }
   else {
     Popupmenu->setItemChecked(toggleMenu[1], true);
-    emit mode(TQString("+l %1").tqarg(chanDialog->sendLimitedUsers()), 0);
+    emit mode(TQString("+l %1").arg(chanDialog->sendLimitedUsers()), 0);
   }
   delete chanDialog;
 }
@@ -104,12 +104,12 @@ void chanButtons::key()
   if (Popupmenu->isItemChecked(toggleMenu[2])) {
     chanDialog->exec();
     Popupmenu->setItemChecked(toggleMenu[2], false);
-    emit mode(TQString("-k %1").tqarg(chanDialog->sendKey()), 0);
+    emit mode(TQString("-k %1").arg(chanDialog->sendKey()), 0);
   }
   else {
     chanDialog->exec();
     Popupmenu->setItemChecked(toggleMenu[2], true);
-    emit mode(TQString("+k %1").tqarg(chanDialog->sendKey()), 0);
+    emit mode(TQString("+k %1").arg(chanDialog->sendKey()), 0);
   }
   delete chanDialog;
 }
diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp
index a297dc95..6392721f 100644
--- a/ksirc/chanparser.cpp
+++ b/ksirc/chanparser.cpp
@@ -118,7 +118,7 @@ parseResult * ChannelParser::parseSSFEClear(TQString string)
 {
 //  top->mainw->clear();
     top->clearWindow();
-//  top->mainw->tqrepaint(TRUE);
+//  top->mainw->repaint(TRUE);
   string.truncate(0);
   return new parseSucc(TQString()); // Null string, don't display anything
 }
@@ -159,7 +159,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string)
   if ( nickItem ) {
     if(nickItem->away() != away){
       nickItem->setAway( away );
-      top->nicks->viewport()->tqrepaint( top->nicks->itemRect( nickItem ), false );
+      top->nicks->viewport()->repaint( top->nicks->itemRect( nickItem ), false );
     }
     nickItem->forceColour(&ksopts->ownNickColor);
   }
@@ -191,7 +191,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string)
     top->channelButtons->setMenuItemMode(6, true);
   else top->channelButtons->setMenuItemMode(6, false);
 
-  TQString status_line = TQString("%1 (%2) %3 (%4) ").tqarg(chan).tqarg(chanmode).tqarg(nick).tqarg(modes);
+  TQString status_line = TQString("%1 (%2) %3 (%4) ").arg(chan).arg(chanmode).arg(nick).arg(modes);
 
   /*
    * Go srearching for key and limit messages
@@ -199,7 +199,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string)
   TQRegExp rxKey("<key: (\\S+)>");
   if(rxKey.search(string) >= 0){
     top->channelButtons->setMenuItemMode(2, true);
-    status_line += TQString("<key: %1>").tqarg(rxKey.cap(1));
+    status_line += TQString("<key: %1>").arg(rxKey.cap(1));
   }
   else {
     top->channelButtons->setMenuItemMode(2, false);
@@ -208,7 +208,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string)
   TQRegExp rxLimit("<limit: (\\S+)>");
   if(rxLimit.search(string) >= 0){
     top->channelButtons->setMenuItemMode(1, true);
-    status_line += TQString("<limit: %1>").tqarg(rxLimit.cap(1));
+    status_line += TQString("<limit: %1>").arg(rxLimit.cap(1));
   }
   else {
     top->channelButtons->setMenuItemMode(1, false);
@@ -367,7 +367,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string)
     if(current_item > 0)
       top->nicks->setCurrentItem(current_item);
     top->nicks->setTopItem(top_item);
-    top->nicks->tqrepaint(TRUE);
+    top->nicks->repaint(TRUE);
     return new parseSucc(TQString());           // Parsing ok, don't print anything though
   }
   else if(string[1] == '$'){
@@ -540,7 +540,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string)
       return new parseWrongChannel(string, ksopts->errorColor, "user|kick");
     if (ksopts->autoRejoin == TRUE)
       {
-       TQString str = TQString("/join %1\n").tqarg(top->channelInfo().channel());
+       TQString str = TQString("/join %1\n").arg(top->channelInfo().channel());
        emit top->outputUnicodeLine(str);
        /* if(top->ticker)
 	top->ticker->show();
@@ -555,7 +555,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string)
       int result = KMessageBox::questionYesNo(top, string, i18n("You Have Been Kicked"), i18n("Rejoin"), i18n("Leave"));
       if (result == KMessageBox::Yes)
       {
-        TQString str = TQString("/join %1\n").tqarg(top->channelInfo().channel());
+        TQString str = TQString("/join %1\n").arg(top->channelInfo().channel());
 	emit top->outputUnicodeLine(str);
 	/* if(top->ticker)
 	 * top->ticker->show();
@@ -642,7 +642,7 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string)
       return new parseSucc(" " + string, ksopts->errorColor, "user|error");
     }
 
-    return new parseError(i18n("Unable to parse: %1").tqarg(string), i18n("Unable to parse change nick code"));
+    return new parseError(i18n("Unable to parse: %1").arg(string), i18n("Unable to parse change nick code"));
   }
 
   old_nick = rx.cap(1);
@@ -678,7 +678,7 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string)
     top->changeCompleteNick(old_nick, new_nick);
 
     top->nicks->setCurrentItem(selection);
-    top->nicks->tqrepaint(TRUE);
+    top->nicks->repaint(TRUE);
     // We're done, so let's finish up
     return new parseSucc(" " + string, ksopts->channelColor, "user|join");
   }
@@ -801,7 +801,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string)
   pmList.setAutoDelete(true);
 
   for(uint pos = 0; pos < modes.length(); pos++){
-    switch(modes.tqat(pos).tqunicode()){
+    switch(modes.at(pos).tqunicode()){
     case '+':
       op = true;
       break;
@@ -822,7 +822,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string)
     case 'b': // Ban, arg is mask banned
     case 'k': // kcik, arg is nick
       if(ai == NULL)
-	return new parseError(i18n("Unable to parse mode change: %1").tqarg(string), TQString());
+	return new parseError(i18n("Unable to parse mode change: %1").arg(string), TQString());
       pmList.append(new mode_info(op, modes.at(pos), *ai));
       ai++;
       break;
@@ -878,7 +878,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string)
         irc->setOp(mi->op());
         // add new nick in sorted pass,with colour
         top->nicks->inSort(irc);
-        top->nicks->tqrepaint(TRUE);
+        top->nicks->repaint(TRUE);
       }
       else{
 	kdDebug(5008) << "Toplevel+o: nick search failed on " << mi->arg() << endl;
@@ -922,7 +922,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string)
         irc->setVoice(voice) ;
         // add new nick in sorted pass,with colour
         top->nicks->inSort(irc);
-        top->nicks->tqrepaint();
+        top->nicks->repaint();
       }
     }
     else if(mi->mode() == 'b'){
@@ -1041,7 +1041,7 @@ parseResult * ChannelParser::parseINFOTopic(TQString string)
 
 void ChannelParser::highlightNick(TQString &string, TQString &nick)
 {
-    TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").tqarg(TQRegExp::escape(nick)));
+    TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").arg(TQRegExp::escape(nick)));
     string.replace(rx, "\\1~n" + nick + "~n\\2");
 }
 
diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp
index 47763faa..386644b9 100644
--- a/ksirc/dccManager.cpp
+++ b/ksirc/dccManager.cpp
@@ -38,7 +38,7 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con
     if(m_type == dccChat)
         setText(COL_SIZE, "");
     else
-        setText(COL_SIZE, TQString("%1").tqarg(size));
+        setText(COL_SIZE, TQString("%1").arg(size));
     setText(COL_PER, "");
 
 }
@@ -56,7 +56,7 @@ dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type,
     setText(COL_WHO, who);
     setText(COL_STAT, enumToStatus(status));
     if(type != dccChat)
-	setText(COL_SIZE, TQString("%1").tqarg(size));
+	setText(COL_SIZE, TQString("%1").arg(size));
     setText(COL_PER, "");
 
 }
@@ -108,7 +108,7 @@ TQString dccItem::enumToStatus(enum dccStatus status)
 
 void dccItem::setWhoPostfix(const TQString &post) {
     m_post = post;
-    setText(COL_WHO, TQString("%1 %2").tqarg(m_who).tqarg(post));
+    setText(COL_WHO, TQString("%1 %2").arg(m_who).arg(post));
 }
 
 void dccItem::changeFilename(const TQString &file) {
@@ -146,13 +146,13 @@ void dccItem::setReceivedBytes(int bytes)
        (ctime >= (m_lasttime + 2))
       ){
         m_lasttime = ctime;
-        setText(COL_SIZE, TQString("%1/%2").tqarg(bytes).tqarg(m_size));
-        setText(COL_PER, TQString("%1%").tqarg(per));
+        setText(COL_SIZE, TQString("%1/%2").arg(bytes).arg(m_size));
+        setText(COL_PER, TQString("%1%").arg(per));
 	m_percent = per;
 	if(m_status == dccResumed)
             m_stime = 0; /* if we are got a resume request don't update CPS, reset it */
         else
-	    setText(COL_CPS, TQString("%1").tqarg(1.0*bytes/(time(NULL) - m_stime), 2));
+	    setText(COL_CPS, TQString("%1").arg(1.0*bytes/(time(NULL) - m_stime), 2));
     }
 
 
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index dc9a96d6..7deb5b2f 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -323,7 +323,7 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te
     if(!reason.isNull()){
         TQString br(reason);
         if(text.isNull() && ksopts->runDocked && ksopts->dockPopups)
-	    KPassivePopup::message(TQString("Notify: %1").tqarg(reason), this);
+	    KPassivePopup::message(TQString("Notify: %1").arg(reason), this);
 	else {
 	    TQStringList sl;
 	    TQString cutup = text;
@@ -338,7 +338,7 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te
 	    cutup = sl.join("\n");
 	    cutup.truncate(cutup.length()-1);
 	    if(ksopts->runDocked && ksopts->dockPopups)
-		KPassivePopup::message(TQString("%1").tqarg(reason), cutup, this);
+		KPassivePopup::message(TQString("%1").arg(reason), cutup, this);
 	}
 	m_blink_reason.append(br);
 	createMainPopup();
diff --git a/ksirc/ioBroadcast.cpp b/ksirc/ioBroadcast.cpp
index ef0fa33b..b36e4420 100644
--- a/ksirc/ioBroadcast.cpp
+++ b/ksirc/ioBroadcast.cpp
@@ -5,7 +5,7 @@
  $$Id$$
 
  The IO broadcaster bassed on the ksircmessage receiver takes a
- message and send it all ksircmessage tqreceivers, except of course it
+ message and send it all ksircmessage receivers, except of course it
  self.
 
  It does the same with control_messages.
diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp
index 52c5dc9a..f994cfa7 100644
--- a/ksirc/ioDCC.cpp
+++ b/ksirc/ioDCC.cpp
@@ -61,7 +61,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
   if(str.find("DCC GET read:", 0) != -1){ /*fold01*/
       TQRegExp rx("read: (.+) who: (.+) bytes: (.*)");
       if(rx.search(str)){
-	  TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2));
+	  TQString key = TQString("%1/%2").arg(rx.cap(1)).arg(rx.cap(2));
 	  uint bytesXfer = rx.cap(3).toUInt();
 
 	  //
@@ -76,7 +76,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
   else if(str.find("DCC SEND write:", 0) != -1){ /*fold01*/
       TQRegExp rx("write: (.+) who: (.+) bytes: (.*)");
       if(rx.search(str)){
-	  TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2));
+	  TQString key = TQString("%1/%2").arg(rx.cap(1)).arg(rx.cap(2));
 	  uint bytesXfer = rx.cap(3).toUInt();
 
 	  if(DCCSendItems[key]){
@@ -103,7 +103,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
                   this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString)));
 	  it->setWhoPostfix("(" + ip + ")");
 
-          TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+          TQString key = TQString("%1/%2").arg(filename).arg(who);
 	  if(DCCGetItems[key]){
 	      /*
 	       * don't add duplicates, this cuases real headaches
@@ -113,11 +113,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
 	      dccItem *old = DCCGetItems.take(key);
 	      int i;
 	      for(i = 0; i <= (int) DCCGetItems.count()+1; i++){
-		  renamed = TQString("%1 (finished %2)/%3").tqarg(filename).tqarg(i+1).tqarg(old->who());
+		  renamed = TQString("%1 (finished %2)/%3").arg(filename).arg(i+1).arg(old->who());
 		  if( DCCGetItems[renamed] == 0x0)
                       break;
 	      }
-	      old->changeFilename(TQString("%1 (finished %2)").tqarg(filename).tqarg(i+1));
+	      old->changeFilename(TQString("%1 (finished %2)").arg(filename).arg(i+1));
               DCCGetItems.insert(renamed, it);
 	  }
 
@@ -139,7 +139,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
           // setup dcc dialog
           displayMgr->show(mgr);
 	  dccItem *it = mgr->mgr()->newSendItem(filename, who, dccItem::dccSentOffer, fileSize);
-	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  TQString key = TQString("%1/%2").arg(filename).arg(who);
 	  if(DCCSendItems[key]){
 	      /*
 	       * don't add duplicates, this cuases real headaches
@@ -151,11 +151,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
 	      dccItem *old = DCCSendItems.take(key);
 	      int i;
 	      for(i = 0; i <= (int) DCCSendItems.count()+1; i++){
-		  renamed = TQString("%1 (sent %2)/%3").tqarg(filename).tqarg(i+1).tqarg(old->who());
+		  renamed = TQString("%1 (sent %2)/%3").arg(filename).arg(i+1).arg(old->who());
 		  if( DCCSendItems[renamed] == 0x0)
                       break;
 	      }
-	      old->changeFilename(TQString("%1 (sent %2)").tqarg(filename).tqarg(i+1));
+	      old->changeFilename(TQString("%1 (sent %2)").arg(filename).arg(i+1));
               DCCSendItems.insert(renamed, it);
 	  }
           DCCSendItems.insert(key, it);
@@ -211,9 +211,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
 	  }
           if(error != "OK"){
               status = dccItem::dccError;
-              KPassivePopup::message(i18n("DCC SEND with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr());
+              KPassivePopup::message(i18n("DCC SEND with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr());
 	  }
-	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  TQString key = TQString("%1/%2").arg(filename).arg(who);
           if(DCCSendItems[key]){
               kdDebug(5008) << "SendPercent: " << DCCSendItems[key]->getPercent() << endl;
               if((status == dccItem::dccDone) && (DCCSendItems[key]->getPercent() < 100))
@@ -233,9 +233,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
 
           if(error != "OK"){
               status = dccItem::dccError;
-              KPassivePopup::message(i18n("DCC GET with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr());
+              KPassivePopup::message(i18n("DCC GET with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr());
 	  }
-                    TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+                    TQString key = TQString("%1/%2").arg(filename).arg(who);
           if(DCCGetItems[key]){
               kdDebug(5008) << "GetPercent: " << DCCGetItems[key]->getPercent() << endl;
               if((status == dccItem::dccDone) && (DCCGetItems[key]->getPercent() < 100))
@@ -252,7 +252,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
       if(rx.search(str)){
           TQString who = rx.cap(1);
 	  TQString filename = rx.cap(2);
-	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  TQString key = TQString("%1/%2").arg(filename).arg(who);
 	  if(DCCGetItems[key]){
 	      dccItem *it = DCCGetItems[key];
 	      kdDebug(5008) << "Got DCC GET resumed message..." << it->file() << endl;
@@ -267,7 +267,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
       if(rx.search(str)){
           TQString who = rx.cap(1);
 	  TQString filename = rx.cap(2);
-	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  TQString key = TQString("%1/%2").arg(filename).arg(who);
           if(DCCSendItems[key]){
               DCCSendItems[key]->changeStatus(dccItem::dccResumed);
           }
@@ -278,7 +278,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
       if(rx.search(str)){
           TQString who = rx.cap(1);
 	  TQString filename = rx.cap(2);
-	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  TQString key = TQString("%1/%2").arg(filename).arg(who);
           if(DCCGetItems[key]){
               DCCGetItems[key]->changeStatus(dccItem::dccRecving);
           }
@@ -290,7 +290,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
           TQString who = rx.cap(1);
           TQString filename = rx.cap(2);
 	  TQString ip = rx.cap(3);
-	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  TQString key = TQString("%1/%2").arg(filename).arg(who);
           if(DCCSendItems[key]){
               DCCSendItems[key]->setWhoPostfix("(" + ip + ")");
               DCCSendItems[key]->changeStatus(dccItem::dccSending);
@@ -325,11 +325,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
           TQString who = rx.cap(1);
           TQString filename = rx.cap(2);
 	  TQString error = rx.cap(3);
-	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  TQString key = TQString("%1/%2").arg(filename).arg(who);
           if(DCCGetItems[key]){
               DCCGetItems[key]->changeStatus(dccItem::dccError);
           }
-          KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr());
+          KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr());
       }
   }
   else if(str.find("DCC CHAT failed") != -1){ /*FOLD01*/
@@ -340,7 +340,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
           if(DCCChatItems[who]){
               DCCChatItems[who]->changeStatus(dccItem::dccError);
           }
-          KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").tqarg(who).tqarg(error), mgr->mgr());
+          KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").arg(who).arg(error), mgr->mgr());
       }
   }
   else if(str.find("DCC CHAT renamed") != -1){ /*FOLD01*/
@@ -360,7 +360,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
       if(rx.search(str)){
           TQString who = rx.cap(1);
 	  TQString filename = rx.cap(2);
-	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  TQString key = TQString("%1/%2").arg(filename).arg(who);
           if(DCCGetItems[key]){
               DCCGetItems[key]->changeStatus(dccItem::dccCancel);
           }
@@ -371,7 +371,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
 //      if(rx.search(str)){
 //          TQString who = rx.cap(1);
 //	  TQString filename = rx.cap(2);
-//	  TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+//	  TQString key = TQString("%1/%2").arg(filename).arg(who);
 //          if(DCCSendItems[key]){
 //              DCCSendItems[key]->changeStatus(dccItem::dccCancel);
 //          }
@@ -392,7 +392,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool )
           TQString who = rx.cap(1);
 	  TQString filename = rx.cap(2);
 
-	  //TQString key = TQString("%1/%2").tqarg(filename).tqarg(who);
+	  //TQString key = TQString("%1/%2").arg(filename).arg(who);
 
           TQPtrList<dccItem> toDel;
           TQDict<dccItem> new_list;
@@ -583,10 +583,10 @@ void KSircIODCC::dccAbortClicked(dccItem *it)
     case dccItem::dccError:
         switch(it->type()) {
 	case dccItem::dccGet:
-            DCCGetItems.remove(TQString("%1/%2").tqarg(it->file()).tqarg(it->who()));
+            DCCGetItems.remove(TQString("%1/%2").arg(it->file()).arg(it->who()));
             break;
         case dccItem::dccSend:
-            DCCSendItems.remove(TQString("%1/%2").tqarg(it->file()).tqarg(it->who()));
+            DCCSendItems.remove(TQString("%1/%2").arg(it->file()).arg(it->who()));
             break;
         case dccItem::dccChat:
             DCCChatItems.remove(it->who());
@@ -615,11 +615,11 @@ void KSircIODCC::dccAbortClicked(dccItem *it)
 void KSircIODCC::dccRenameDone(dccItem *it, TQString oldWho, TQString oldFile)
 {
     if(it->type() == dccItem::dccGet){
-	TQString str = TQString("/dcc rename %1 %2 %3\n").tqarg(oldWho).tqarg(oldFile).tqarg(it->file());
-	TQString key = TQString("%1/%2").tqarg(oldFile).tqarg(oldWho);
+	TQString str = TQString("/dcc rename %1 %2 %3\n").arg(oldWho).arg(oldFile).arg(it->file());
+	TQString key = TQString("%1/%2").arg(oldFile).arg(oldWho);
 	if(DCCGetItems[key]){
             DCCGetItems.take(key);
-	    TQString newkey = TQString("%1/%2").tqarg(it->file()).tqarg(it->who());
+	    TQString newkey = TQString("%1/%2").arg(it->file()).arg(it->who());
             DCCGetItems.insert(newkey, it);
 	}
 	emit outputLine(str.ascii());
@@ -629,7 +629,7 @@ void KSircIODCC::dccRenameDone(dccItem *it, TQString oldWho, TQString oldFile)
 	    DCCChatItems.take(oldWho);
 	    DCCChatItems.insert(it->who(), it);
 	}
-	TQString str = TQString("/dcc rchat %1 %2\n").tqarg(oldWho).tqarg(it->who());
+	TQString str = TQString("/dcc rchat %1 %2\n").arg(oldWho).arg(it->who());
 	emit outputLine(str.ascii());
 
     }
diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp
index 296e9049..ae3222bb 100644
--- a/ksirc/ksirc.cpp
+++ b/ksirc/ksirc.cpp
@@ -103,10 +103,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
         sc->restore(1, false );
     }
     else
-    { // no Session management -> care about docking, tqgeometry, etc.
+    { // no Session management -> care about docking, geometry, etc.
 
-        if( !opts.tqgeometry.isEmpty() )
-            sc->setGeometry( opts.tqgeometry );
+        if( !opts.geometry.isEmpty() )
+            sc->setGeometry( opts.geometry );
 
         KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 2aa02e63..26dbc8c7 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -421,7 +421,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name)
   kdDebug(5008) << "KSP: get close_toplevel: " << name << endl;
 
   // the removeTopLevel below also deletes the mditoplevel (in case
-  // we are using mdi) , which deletes its tqchildren, which deletes
+  // we are using mdi) , which deletes its children, which deletes
   // 'wm' , so watch out not to delete twice! (Simon)
   TQGuardedPtr<KSircTopLevel> guardedwm = wm;
   // Do this now or we get junk left on the screen
diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp
index b62579db..de03ab79 100644
--- a/ksirc/ksopts.cpp
+++ b/ksirc/ksopts.cpp
@@ -142,7 +142,7 @@ void KSOptions::load( int sections )
 {
     KConfig *conf = kapp->config();
     conf->setGroup( "ServerController" );
-    tqgeometry = conf->readRectEntry( "Size" );
+    geometry = conf->readRectEntry( "Size" );
 
     // Using the fields itself as default values as they are already
     // set to the defaults.
@@ -232,10 +232,10 @@ void KSOptions::load( int sections )
             colourTheme = conf->readEntry("ColourTheme", colourTheme );
 	    for ( int i = 0; i < 16; ++i ) {
 		ircColors[i] =
-		    conf->readColorEntry(TQString::fromLatin1( "IRC-%1" ).tqarg( i ),
+		    conf->readColorEntry(TQString::fromLatin1( "IRC-%1" ).arg( i ),
 					 &ircColors[i] );
                 nickHighlight[i] =
-		    conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).tqarg( i ),
+		    conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).arg( i ),
 					 &nickHighlight[i] );
 	    }
         }
@@ -422,8 +422,8 @@ void KSOptions::save( int sections )
 	conf->writeEntry( "nickColourization", nickColourization );
         conf->writeEntry( "ColourTheme", colourTheme );
 	for ( int i = 0; i < 16; ++i ) {
-	    conf->writeEntry( TQString::fromLatin1( "IRC-%1" ).tqarg( i ), ircColors[i] );
-	    conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).tqarg( i ), nickHighlight[i] );
+	    conf->writeEntry( TQString::fromLatin1( "IRC-%1" ).arg( i ), ircColors[i] );
+	    conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).arg( i ), nickHighlight[i] );
 	}
         /* Store the font setting */
         conf->setGroup( "GlobalOptions" );
diff --git a/ksirc/ksopts.h b/ksirc/ksopts.h
index 421370fb..9bd96192 100644
--- a/ksirc/ksopts.h
+++ b/ksirc/ksopts.h
@@ -99,7 +99,7 @@ class KSOStartup
 public:
     KSOStartup();
 
-    TQRect tqgeometry;
+    TQRect geometry;
 //    TQString nick;
 //    TQString altNick;
 //    TQString realName;
diff --git a/ksirc/ksparser.cpp b/ksirc/ksparser.cpp
index e2ebf903..100fc4c4 100644
--- a/ksirc/ksparser.cpp
+++ b/ksirc/ksparser.cpp
@@ -63,12 +63,12 @@ TQString KSParser::parse( const TQString &message )
                 TQString at;
                 TQColor c = ircColor(fg);
 		if ( c.isValid() ) {
-		    at += TQString( "color=\"%1\" " ).tqarg( c.name() );
+		    at += TQString( "color=\"%1\" " ).arg( c.name() );
 		}
 
                 c = ircColor(bg);
 		if ( c.isValid() ) {
-		    at += TQString( "bgcolor=\"%1\" " ).tqarg( c.name() );
+		    at += TQString( "bgcolor=\"%1\" " ).arg( c.name() );
 		}
 		if(at.length() > 0){
                     res += pushTag( "font", at );
@@ -108,13 +108,13 @@ TQString KSParser::parse( const TQString &message )
                     res += toggleTag( "u" );
                     break;
                 case 'n':
-                    res += toggleTag( "font", TQString( "color=\"%1\"" ).tqarg( ksopts->nickForeground.name() ) );
+                    res += toggleTag( "font", TQString( "color=\"%1\"" ).arg( ksopts->nickForeground.name() ) );
                     break;
                 case 'o':
-                    res += pushTag( "font", TQString( "color=\"%1\"" ).tqarg( ksopts->msgContainNick.name() ) );
+                    res += pushTag( "font", TQString( "color=\"%1\"" ).arg( ksopts->msgContainNick.name() ) );
 		    break;
 		case '#':
-		    res += pushTag( "font", TQString( "color=\"#%1\"" ).tqarg( message.mid(i, 6) ));
+		    res += pushTag( "font", TQString( "color=\"#%1\"" ).arg( message.mid(i, 6) ));
 		    i+=6;
                     break;
                 case '~':
diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp
index ff198c02..65a9d725 100644
--- a/ksirc/kstextview.cpp
+++ b/ksirc/kstextview.cpp
@@ -1768,14 +1768,14 @@ bool TextView::removeParag( const TextParagIterator &parag )
     return true;
 }
 
-void TextView::clearSelection( bool tqrepaint )
+void TextView::clearSelection( bool repaint )
 {
     m_selectionStart = SelectionPoint();
     m_selectionEnd = SelectionPoint();
     m_selectionEndBeforeStart = false;
     m_selectedText = TQString();
     clearSelectionInternal();
-    if ( tqrepaint )
+    if ( repaint )
         updateContents();
 }
 
diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h
index 4499f370..1ac273eb 100644
--- a/ksirc/kstextview.h
+++ b/ksirc/kstextview.h
@@ -482,7 +482,7 @@ public:
     
     bool removeParag( const TextParagIterator &parag );
 
-    void clearSelection( bool tqrepaint = false ); // ### re-consider the tqrepaint arg...
+    void clearSelection( bool repaint = false ); // ### re-consider the repaint arg...
 
     TQString selectedText() const { return m_selectedText; }
 
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index 62a4bca4..32c37e47 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -74,9 +74,9 @@ TQString KSircView::makeTimeStamp()
 {
     TQTime now = TQTime::currentTime();
     TQString timeStamp = TQString::fromLatin1( "[%1:%2:%3] " )
-        .tqarg( TQString::number( now.hour() ).rightJustify( 2, '0' ) )
-        .tqarg( TQString::number( now.minute() ).rightJustify( 2, '0' ) )
-        .tqarg( TQString::number( now.second() ).rightJustify( 2, '0' ) );
+        .arg( TQString::number( now.hour() ).rightJustify( 2, '0' ) )
+        .arg( TQString::number( now.minute() ).rightJustify( 2, '0' ) )
+        .arg( TQString::number( now.second() ).rightJustify( 2, '0' ) );
     return timeStamp;
 }
 
@@ -109,14 +109,14 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const
     //kdDebug(5008) << "Start Text:      " << _text << endl;
 
     TQString richText( "<font color=\"%1\">" );
-    richText = richText.tqarg( color.name() );
+    richText = richText.arg( color.name() );
 
     if ( !pixmap.isEmpty() )
-        richText.prepend( TQString::fromLatin1( "<img src=\"%1\"></img>" ).tqarg( pixmap ) );
+        richText.prepend( TQString::fromLatin1( "<img src=\"%1\"></img>" ).arg( pixmap ) );
 
     TQString timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" )
-        .tqarg( ksopts->textColor.name() )
-        .tqarg( makeTimeStamp() );
+        .arg( ksopts->textColor.name() )
+        .arg( makeTimeStamp() );
     m_timeStamps.append(timeStamp);
     if ( m_timestamps )
         richText.prepend( timeStamp );
@@ -147,13 +147,13 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const
         if( nickCol.cap(1) != m_proc->getNick()){
             TQColor col = nickColourMaker::colourMaker()->findFg(nickCol.cap(1));
 
-            newText.prepend(TQString("<font color=\"%1\">").tqarg(col.name()));
+            newText.prepend(TQString("<font color=\"%1\">").arg(col.name()));
             newText.append("</font>");
         }  else {
             TQColor col = ksopts->ownNickColor.name();
             if( ! col.isValid())
                 nickColourMaker::colourMaker()->findFg(nickCol.cap(1));
-            newText.prepend(TQString("<font color=\"%1\">").tqarg(col.name()));
+            newText.prepend(TQString("<font color=\"%1\">").arg(col.name()));
             newText.append("</font>");
             if(ksopts->ownNickBold){
                 newText.prepend("<b>");
@@ -225,8 +225,8 @@ void KSircView::addRichText(const TQString &_text)
     }
     else {
 	timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" )
-	    .tqarg( ksopts->textColor.name() )
-	    .tqarg( makeTimeStamp() );
+	    .arg( ksopts->textColor.name() )
+	    .arg( makeTimeStamp() );
 	if ( m_timestamps )
 	    text.prepend( timeStamp );
     }
diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod
index 600f2111..8cae9c86 100644
--- a/ksirc/puke/HOWTO-PUKE.pod
+++ b/ksirc/puke/HOWTO-PUKE.pod
@@ -106,7 +106,7 @@ These set and return your widget.
 
 If you care about inheritance, which you should, all these functions
 should be virtual.  (Since we are using pointers to PWidget's
-everywhere, it's a good bet you want your tqchildren's overriden
+everywhere, it's a good bet you want your children's overriden
 functions called, not yours)
 
 The structure internally will have to hold a local copy of the widget,
diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h
index 2baa316e..fc7f0f0d 100644
--- a/ksirc/puke/commands.h
+++ b/ksirc/puke/commands.h
@@ -130,38 +130,38 @@
 // cArg: not define
 #define PUKE_WIDGET_HIDE_ACK -1003
 
-// Desc: tqrepaint widget
-// iWinId: widget to tqrepaint
+// Desc: repaint widget
+// iWinId: widget to repaint
 // iArg: erase, 0 for false, 1 for true
 // cArg: no defines
 #define PUKE_WIDGET_REPAINT 1005
 
-// Desc: tqrepaint widget ack
-// iWinId: widget to tqrepaint
+// Desc: repaint widget ack
+// iWinId: widget to repaint
 // iArg: not defined
 // cArg: not defined
 #define PUKE_WIDGET_REPAINT_ACK -1005
 
 // Desc: update widget on next event loop
-// iWinId: widget to tqrepaint
+// iWinId: widget to repaint
 // iArg: erase, 0 for false, 1 for true
 // cArg: no defines
 #define PUKE_WIDGET_UPDATE 1010
 
-// Desc: tqrepaint widget ack
-// iWinId: widget to tqrepaint
+// Desc: repaint widget ack
+// iWinId: widget to repaint
 // iArg: not defined
 // cArg: not defined
 #define PUKE_WIDGET_UPDATE_ACK -1010
 
 // Desc: resize the widget
-// iWinId: widget to tqrepaint
+// iWinId: widget to repaint
 // iArg: width in the low 16 bit, height in next 16 bits
 // cArg: not defined
 #define PUKE_WIDGET_RESIZE 1015
 
-// Desc: tqrepaint widget ack
-// iWinId: widget to tqrepaint
+// Desc: repaint widget ack
+// iWinId: widget to repaint
 // iArg: new widget in lower 16 bit, new height in lower 16 bits
 // cArg: not defined
 #define PUKE_WIDGET_RESIZE_ACK -1015
@@ -766,13 +766,13 @@
 
 // Desc: Set label's allignment
 // iWinId: window id
-// iArg: tqalignment
+// iArg: alignment
 // cArg: not defined
 #define PUKE_LABEL_SETALIGNMENT 1715
 
 // Desc: Set label's allignment, ACK
 // iWinId: window id
-// iArg: tqalignment
+// iArg: alignment
 // cArg: not defined
 #define PUKE_LABEL_SETALIGNMENT_ACK -1715
 
@@ -1012,7 +1012,7 @@
 // Desc: add widget into tqlayout manager
 // iWinId: Layout Manager to add widget too
 // iArg: Widget Id to be added
-// cArg: 2 characters, char[0] strech, char[1] tqalignment
+// cArg: 2 characters, char[0] strech, char[1] alignment
 #define PUKE_LAYOUT_ADDWIDGET 11010
 // Desc: ack for add widget
 // iWinId: Layout manager 
diff --git a/ksirc/puke/palistbox.cpp b/ksirc/puke/palistbox.cpp
index 05124441..9f43b124 100644
--- a/ksirc/puke/palistbox.cpp
+++ b/ksirc/puke/palistbox.cpp
@@ -88,7 +88,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
       widget()->removeItem(index);
       item->setVoice(pm->iArg);
       widget()->inSort(item);
-      widget()->tqrepaint(TRUE);
+      widget()->repaint(TRUE);
 
       pmRet.iCommand = - pm->iCommand;
       pmRet.iWinId = pm->iWinId;
@@ -108,7 +108,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm)
       widget()->removeItem(index);
       item->setOp(pm->iArg);
       widget()->inSort(item);
-      widget()->tqrepaint(TRUE);
+      widget()->repaint(TRUE);
 
       pmRet.iCommand = - pm->iCommand;
       pmRet.iWinId = pm->iWinId;
diff --git a/ksirc/puke/pframe.pm b/ksirc/puke/pframe.pm
index 2ef36ebc..f851cdb8 100644
--- a/ksirc/puke/pframe.pm
+++ b/ksirc/puke/pframe.pm
@@ -44,13 +44,13 @@ sub setFrameStyle {
   my $self = shift;
 
   my $frame = shift;
-  my $tqrepaint = shift;
+  my $repaint = shift;
 
   $self->sendMessage('iCommand' => $::PUKE_QFRAME_SET_FRAME,
 		     'iArg' => $frame,
 		    'CallBack' => sub {});
 
-  $self->tqrepaint(1) if($tqrepaint == 1);
+  $self->repaint(1) if($repaint == 1);
 
 }
 
diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp
index ab729315..9e46e042 100644
--- a/ksirc/puke/pobject.cpp
+++ b/ksirc/puke/pobject.cpp
@@ -131,7 +131,7 @@ void PObject::manTerm() {
 
 void PObject::errorInvalidSet(TQObject *_w)
 { 
-  m_error = TQString("Tried setting a %1 to %2").tqarg(_w->className()).tqarg(className());
+  m_error = TQString("Tried setting a %1 to %2").arg(_w->className()).arg(className());
   m_hasError = true;
 }
 #include "pobject.moc"
diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp
index af041c19..b62f64c1 100644
--- a/ksirc/puke/pwidget.cpp
+++ b/ksirc/puke/pwidget.cpp
@@ -90,7 +90,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm)
     emit outputMessage(fd, &pmRet);
     break;    
   case PUKE_WIDGET_REPAINT:
-    widget()->tqrepaint(pm->iArg);
+    widget()->repaint(pm->iArg);
     pmRet.iCommand = PUKE_WIDGET_REPAINT_ACK;
     pmRet.iWinId = pm->iWinId;
     pmRet.iArg = 0;
diff --git a/ksirc/puke/pwidget.pm b/ksirc/puke/pwidget.pm
index 56381db6..5a73d393 100644
--- a/ksirc/puke/pwidget.pm
+++ b/ksirc/puke/pwidget.pm
@@ -61,7 +61,7 @@ sub hide {
   $self->sendMessage('iCommand' => $::PUKE_WIDGET_HIDE);
 }
 
-sub tqrepaint {
+sub repaint {
   my $self = shift;
   
   my $erase = shift; # 1 for erase and reapint
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 4ae34f1e..73d32daf 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -253,7 +253,7 @@ void servercontroller::new_ksircprocess(KSircServer &kss)
     return;
   server_id = kss.server();
   while(proc_list[server_id]){   // if it already exists, quit
-    server_id = TQString("%1 %2").tqarg(kss.server()).tqarg(id++);
+    server_id = TQString("%1 %2").arg(kss.server()).arg(id++);
   }
 
   // Insert new base
@@ -435,7 +435,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
               if(online_item->childCount() == 0)
                   delete online_item;
               if(ksopts->runDocked && ksopts->dockPopups)
-                  KPassivePopup::message(i18n("%1 just went offline on %2").tqarg(args).tqarg(server), dockWidget);
+                  KPassivePopup::message(i18n("%1 just went offline on %2").arg(args).arg(server), dockWidget);
           }
           dockWidget->nickOffline(server, args);
           break;
@@ -457,7 +457,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args)
           item = new TQListViewItem(online_item, args);
 	  item->setPixmap( 0, pic_run );
 	  if(ksopts->runDocked && ksopts->dockPopups)
-	      KPassivePopup::message(i18n("%1 just came online on %2").tqarg(args).tqarg(server), dockWidget);
+	      KPassivePopup::message(i18n("%1 just came online on %2").arg(args).arg(server), dockWidget);
           dockWidget->nickOnline(server, args);
           break;
       }
@@ -615,7 +615,7 @@ void servercontroller::saveGlobalProperties(KConfig *ksc)
 
   ksc->setGroup("ServerController");
 //  ksc->writeEntry("Docked", !isVisible());
-  ksc->writeEntry("Size", tqgeometry());
+  ksc->writeEntry("Size", geometry());
   ksc->setGroup(group);
 }
 
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index 91754dd8..e1623a3c 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -40,7 +40,7 @@ KSircTopic::KSircTopic( TQWidget *parent, const char *name )
     setTextFormat( RichText );
     setWordWrap(TQTextEdit::NoWrap);
     doResize();
-//    setAlignment( tqalignment() | WordBreak );
+//    setAlignment( alignment() | WordBreak );
 }
 
 void KSircTopic::setText( const TQString &_text)
@@ -49,7 +49,7 @@ void KSircTopic::setText( const TQString &_text)
     TQString text = _text;
 
     TQString richText( "<font color=\"%1\">" );
-    richText = richText.tqarg( ksopts->textColor.name() );
+    richText = richText.arg( ksopts->textColor.name() );
 
     text.replace('&', "&amp;");
     text.replace('<', "&lt;");
@@ -111,7 +111,7 @@ void KSircTopic::contentsMouseReleaseEvent( TQMouseEvent *e )
          * the size really breaks and you get
          * a huge widget
          */
-        m_editor->setGeometry( tqgeometry() );
+        m_editor->setGeometry( geometry() );
         m_editor->setFocus();
         m_editor->show();
 
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index 44bca8a3..67b51c3c 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -587,9 +587,9 @@ void KSircTopLevel::setMode(TQString mode, int mode_type, TQString currentNick)
 {
   TQString command;
   if (mode_type == 0)
-    command = TQString::fromLatin1("/mode %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(mode);
+    command = TQString::fromLatin1("/mode %1 %2\n").arg(m_channelInfo.channel()).arg(mode);
   else
-    command = TQString::fromLatin1("/mode %1 %2\n").tqarg(currentNick).tqarg(mode);
+    command = TQString::fromLatin1("/mode %1 %2\n").arg(currentNick).arg(mode);
   sirc_write(command);
   linee->setFocus();
 }
@@ -829,7 +829,7 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast)
     // that we enter a local event loop (think of the ssfeprompt dialog!)
     // which might trigger a socketnotifier activation which in turn
     // might result in the execution of code that modifies the LineBuffer,
-    // which would tqinvalidate iterators (Simon)
+    // which would invalidate iterators (Simon)
     while ( LineBuffer.begin() != LineBuffer.end() )
     {
         TQString plainText("");
@@ -877,7 +877,7 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast)
   list = pan->sizes();
   it = list.begin();
   while( it != list.end()){
-      values += TQString("%1 ").tqarg(*it);
+      values += TQString("%1 ").arg(*it);
       ++it;
   }
 }
@@ -974,7 +974,7 @@ void KSircTopLevel::sirc_write(const TQString &str)
     return;
   }
   else if ( plain.startsWith( "/away" ) ) {
-    TQString awayEvalCommand = TQString::fromLatin1( "/eval $publicAway = %1\n" ).tqarg( ksopts->publicAway ? '1' : '0' );
+    TQString awayEvalCommand = TQString::fromLatin1( "/eval $publicAway = %1\n" ).arg( ksopts->publicAway ? '1' : '0' );
     emit outputUnicodeLine( awayEvalCommand );
   }
 
@@ -985,7 +985,7 @@ void KSircTopLevel::sirc_write(const TQString &str)
 
   if(!isSpecialWindow()) { // channel or private chat
     if(plain[0].latin1() != '/'){
-      command.prepend(TQString::fromLatin1("/msg %1 ").tqarg(m_channelInfo.channel()));
+      command.prepend(TQString::fromLatin1("/msg %1 ").arg(m_channelInfo.channel()));
     }
     else if(plain.startsWith("/me ")) {
       command.remove(0, 3);
@@ -1147,15 +1147,15 @@ void KSircTopLevel::UserParseMenu(int id)
       return;
 
   TQString s;
-  s = TQString("/eval $dest_nick='%1';\n").tqarg(nicks->text(nicks->currentItem()));
+  s = TQString("/eval $dest_nick='%1';\n").arg(nicks->text(nicks->currentItem()));
   sirc_write(s);
   // set $$dest_chan variable
-  s = TQString("/eval $dest_chan='%1';\n").tqarg(m_channelInfo.channel());
+  s = TQString("/eval $dest_chan='%1';\n").arg(m_channelInfo.channel());
   sirc_write(s);
   TQString action = user_menu->at(id)->action;
   if (action.length() && action[0] == '/')
       action.remove(0, 1);
-  s = TQString("/eval &docommand(eval{\"%1\"});\n").tqarg(action);
+  s = TQString("/eval &docommand(eval{\"%1\"});\n").arg(action);
   s.replace(TQRegExp("\\$\\$"), "$");
   sirc_write(s);
 }
@@ -1233,7 +1233,7 @@ void KSircTopLevel::gotFocus()
     if(isVisible() == TRUE){
         if(have_focus == 0){
 	    if(m_channelInfo.channel()[0] != '!' ){
-		TQString str = TQString("/join %1").tqarg(m_channelInfo.channel());
+		TQString str = TQString("/join %1").arg(m_channelInfo.channel());
 		if(m_channelInfo.key().length() > 0){
 		    str.append(" " + m_channelInfo.key());
 		}
@@ -1247,7 +1247,7 @@ void KSircTopLevel::gotFocus()
     }
     if(m_gotMsgWithoutFocus == true){
         m_gotMsgWithoutFocus = false;
-        servercontroller::self()->decreaseNotificationCount(TQString("%1 -> %2 got message").tqarg(ksircProcess()->serverID()).tqarg(m_channelInfo.channel()));
+        servercontroller::self()->decreaseNotificationCount(TQString("%1 -> %2 got message").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel()));
     }
 
 }
@@ -1293,14 +1293,14 @@ void KSircTopLevel::control_message(int command, TQString str)
       emit currentWindow(this);
 
       if(m_channelInfo.channel()[0] == '#' || m_channelInfo.channel()[0] == '&'){
-	  TQString str = TQString("/join %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(m_channelInfo.key());
+	  TQString str = TQString("/join %1 %2\n").arg(m_channelInfo.channel()).arg(m_channelInfo.key());
 	  kdDebug(5008) << "Doing /join " << m_channelInfo.channel() << " :" << str << endl;
           emit outputUnicodeLine(str);
           emit outputLine("/eval $query=''\n");
       }
       else if (m_channelInfo.channel()[0] != '!')
       {
-          emit outputUnicodeLine(TQString("/eval $query='%1'\n").tqarg(m_channelInfo.channel()));
+          emit outputUnicodeLine(TQString("/eval $query='%1'\n").arg(m_channelInfo.channel()));
       }
 
       bool isPrivate = isPrivateChat();
@@ -1329,7 +1329,7 @@ void KSircTopLevel::control_message(int command, TQString str)
       }
       if(tqlayout()) {
           //kdDebug(5008) << "Redoeing tqlayout" << endl;
-          tqlayout()->tqinvalidate();
+          tqlayout()->invalidate();
           tqlayout()->activate();
       }
       else {
@@ -1574,7 +1574,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text )
      approx_lines = lines;
   if (lines > 4) {
       int result =  KMessageBox::warningContinueCancel(this,
-                i18n("You are about to send %1 lines of text.\nDo you really want to send that much?").tqarg(approx_lines),
+                i18n("You are about to send %1 lines of text.\nDo you really want to send that much?").arg(approx_lines),
                 TQString(), i18n("Send"));
       if (result != KMessageBox::Continue)
       {
@@ -1700,7 +1700,7 @@ void KSircTopLevel::slotDccURLs( const TQStringList& urls, const TQString& nick
         TQString file( *it );
         kdDebug(5008) << "........ " << file << endl;
         if ( !file.isEmpty() )
-            sirc_write(s.tqarg( file ));
+            sirc_write(s.arg( file ));
     }
 }
 
@@ -1727,7 +1727,7 @@ void KSircTopLevel::outputUnicodeLine( const TQString &message )
 
 void KSircTopLevel::setTopicIntern( const TQString &topic )
 {
-    TQString command = TQString::fromLatin1( "/topic %1 %2\n" ).tqarg( m_channelInfo.channel() ).tqarg( topic );
+    TQString command = TQString::fromLatin1( "/topic %1 %2\n" ).arg( m_channelInfo.channel() ).arg( topic );
     sirc_write( command );
     linee->setFocus();
 }
@@ -1742,12 +1742,12 @@ void KSircTopLevel::doChange(bool pers, TQString text)
 		int winId = !ticker ? topLevelWidget()->winId() : ticker->winId();
 		KNotifyClient::event(winId,
 				     TQString::fromLatin1("ChannelPersonal"),
-				     i18n("Your nick appeared on channel %1").tqarg(m_channelInfo.channel()));
+				     i18n("Your nick appeared on channel %1").arg(m_channelInfo.channel()));
 	    } else {
 		int winId = !ticker ? topLevelWidget()->winId() : ticker->winId();
 		KNotifyClient::event(winId,
 				     TQString::fromLatin1("ChannelChanged"),
-				     i18n("Channel %1 changed").tqarg(m_channelInfo.channel()));
+				     i18n("Channel %1 changed").arg(m_channelInfo.channel()));
 	    }
 	    lastBeep = ctime;
         }
@@ -1755,7 +1755,7 @@ void KSircTopLevel::doChange(bool pers, TQString text)
 
     if(have_focus == 0 && pers == true && m_gotMsgWithoutFocus == false){
 	m_gotMsgWithoutFocus = true;
-        servercontroller::self()->increaseNotificationCount(TQString("%1 -> %2").tqarg(ksircProcess()->serverID()).tqarg(m_channelInfo.channel()), text);
+        servercontroller::self()->increaseNotificationCount(TQString("%1 -> %2").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel()), text);
     }
 }
 
diff --git a/ksirc/toplevel.h b/ksirc/toplevel.h
index ba1a25bc..47da2064 100644
--- a/ksirc/toplevel.h
+++ b/ksirc/toplevel.h
@@ -454,7 +454,7 @@ private:
     */
   TQPoint mypoint;
   /**
-    * Ticker's size and tqgeometry
+    * Ticker's size and geometry
     */
   TQRect tickerrect;
   /**