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

1 files changed, 19 insertions, 19 deletions

diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp
index b2bdc93c..32f2d670 100644
--- a/ksirc/chanparser.cpp
+++ b/ksirc/chanparser.cpp
@@ -38,7 +38,7 @@ ChannelParser::ChannelParser(KSircTopLevel *_top)
   if(parserTable.isEmpty() == TRUE){
     parserTable.setAutoDelete(TRUE);
     parserTable.insert("`l`", new parseFunc(&ChannelParser::parseSSFEClear));
-    parserTable.insert("`s`", new parseFunc(&ChannelParser::parseSSFEtqStatus));
+    parserTable.insert("`s`", new parseFunc(&ChannelParser::parseSSFEStatus));
     parserTable.insert("`i`", new parseFunc(&ChannelParser::parseSSFEInit));
     parserTable.insert("`t`", new parseFunc(&ChannelParser::parseSSFEMsg));
     parserTable.insert("`o`", new parseFunc(&ChannelParser::parseSSFEOut));
@@ -118,12 +118,12 @@ 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
 }
 
-parseResult * ChannelParser::parseSSFEtqStatus(TQString string)
+parseResult * ChannelParser::parseSSFEStatus(TQString string)
 {
   string.remove(0, 12); // strip off the first 12 characters "<junk> [sirc] "
   if(string.length() == 0)
@@ -159,7 +159,7 @@ parseResult * ChannelParser::parseSSFEtqStatus(TQString string)
   if ( nickItem ) {
     if(nickItem->away() != away){
       nickItem->setAway( away );
-      top->nicks->viewport()->tqrepaint( top->nicks->tqitemRect( nickItem ), false );
+      top->nicks->viewport()->repaint( top->nicks->itemRect( nickItem ), false );
     }
     nickItem->forceColour(&ksopts->ownNickColor);
   }
@@ -191,7 +191,7 @@ parseResult * ChannelParser::parseSSFEtqStatus(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::parseSSFEtqStatus(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::parseSSFEtqStatus(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] == '$'){
@@ -417,7 +417,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string)
     uint i;
 
     for(i = 0; i < nick.length();i++){
-      switch(nick[0].tqunicode()){
+      switch(nick[0].unicode()){
       case '@':
 	irc->setOp(TRUE);
         nick.remove(0,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).unicode()){
     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;
@@ -858,7 +858,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string)
     /*
      * Look at the second character, it's uniq, check for +,- latter
      */
-    if(mi->mode().tqunicode() == 'o'){
+    if(mi->mode().unicode() == 'o'){
       mode_o_plus = mi->op();
       mode_o_minus = !mi->op();
 
@@ -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");
 }