Remove additional unneeded tq method conversions

17 files changed, 174 insertions, 174 deletions

diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
index 9d53055e..270ce82d 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
@@ -636,9 +636,9 @@ breakPointPrint(breakPointPtr breakPtr)
 
     breakStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED];
     if (breakPtr->url)
-	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").tqarg(breakPtr->id).tqarg(i18n(breakStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)).tqarg(xsldbgUrl(breakPtr->url)).tqarg(breakPtr->lineNo));
+	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").arg(breakPtr->id).arg(i18n(breakStatus)).arg(xsldbgText(breakTemplate)).arg(xsldbgText(breakMode)).arg(xsldbgUrl(breakPtr->url)).arg(breakPtr->lineNo));
     else
-	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").tqarg(breakPtr->id).tqarg(i18n(breakStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)));
+	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").arg(breakPtr->id).arg(i18n(breakStatus)).arg(xsldbgText(breakTemplate)).arg(xsldbgText(breakMode)));
     return ++result;
 }
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
index 17cf01a2..a757c143 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
@@ -95,7 +95,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup)
 
     if (!filesGetStylesheet() || !filesGetMainDoc()) {
         xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n"));
-        xsldbgGenericErrorFunc(TQString("Error: %1.\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1.\n").arg(i18n(errorPrompt)));
         return result;
     }
 
@@ -104,13 +104,13 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup)
         xsltGenericError(xsltGenericErrorContext,
                          "Error: NULL argument provided\n");
 #endif
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
         return result;
     }
 
     if (xmlStrLen(arg) > 0) {
         if (!sscanf((char *) arg, "%d", &noOfFrames)) {
-            xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a number of frames.\n").tqarg((char*)arg));
+            xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a number of frames.\n").arg((char*)arg));
 	    noOfFrames = -1;
         }
     } else {
@@ -126,7 +126,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup)
     }
 
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
     return result;
 }
 
@@ -188,7 +188,7 @@ validateSource(xmlChar ** url, long *lineNo)
                     walkChildNodes((xmlHashScanner) scanForNode, searchInf,
                                    searchData->node);
                     if (!searchInf->found) {
-                        xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
+                        xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo));
                     }
 
                     *lineNo = searchData->lineNo;
@@ -210,9 +210,9 @@ validateSource(xmlChar ** url, long *lineNo)
                 result = 1;
             }
         } else{
-            xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name contains %1.\n").tqarg(xsldbgUrl(*url)));
+            xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name contains %1.\n").arg(xsldbgUrl(*url)));
 	    if (lineNo){
-	      xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
+	      xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo));
 	    }
 	}
     }
@@ -299,9 +299,9 @@ validateData(xmlChar ** url, long *lineNo)
 
         if (!searchInf->found) {
 	  if (lineNo){
-             xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
+             xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo));
 	  } else{
-             xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name contains %1.\n").tqarg(xsldbgUrl(*url)));
+             xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name contains %1.\n").arg(xsldbgUrl(*url)));
 	  }
             result = 1;
         } else {
@@ -350,7 +350,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
     if (!style || !filesGetMainDoc()) {
        if (!optionsGetIntOption(OPTIONS_GDB)){
 	    xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n"));
-	    xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+	    xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
 	    return result;
 	}else{
 	    orphanedBreakPoint = 1;
@@ -372,8 +372,8 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
             if (splitString(&arg[2], 2, opts) == 2) {
                 if ((xmlStrlen(opts[1]) == 0) || 
 		       !sscanf((char *) opts[1], "%ld", &lineNo)) {
-                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1]));
-		    xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1]));
+		    xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
                     return result;
                 } else {
                     /* try to guess whether we are looking for source or data 
@@ -422,7 +422,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 		    }
                 }
             } else
-                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("break"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("break"));
         }
     } else {
         /* add breakpoint at specified template names */
@@ -524,7 +524,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 	  break;
 
 	default:	  
-	  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("break"));
+	  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("break"));
 	  return 0;
 	}
 
@@ -593,14 +593,14 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 					searchPtr->id = lastId;
 					result = 1;
 					breakPointCounter = lastCounter;
-					xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").tqarg(searchPtr->id));
+					xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").arg(searchPtr->id));
 					validatedBreakPoints++;
 				    }
 				}
 			    }
 			}else{
 			    if (xsldbgValidateBreakpoints != BREAKPOINTS_BEING_VALIDATED){
-				xsldbgGenericErrorFunc(i18n("Warning: Breakpoint exits for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(tempUrl)).tqarg(templateLineNo));
+				xsldbgGenericErrorFunc(i18n("Warning: Breakpoint exits for file \"%1\" at line %2.\n").arg(xsldbgUrl(tempUrl)).arg(templateLineNo));
 			    }
 			    validatedBreakPoints++;
 			}
@@ -648,7 +648,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 
     if (!result) {
         if (url)
-            xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo));
+            xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo));
         else
             xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint.\n"));
     }
@@ -681,7 +681,7 @@ xslDbgShellDelete(xmlChar * arg)
         xsltGenericError(xsltGenericErrorContext,
                          "Error: NULL argument provided\n");
 #endif
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
         return result;
     }
 
@@ -692,7 +692,7 @@ xslDbgShellDelete(xmlChar * arg)
             if (splitString(&arg[2], 2, opts) == 2) {
                 if ((xmlStrlen(opts[1]) == 0) ||
 		    !sscanf((char *) opts[1], "%ld", &lineNo)) {
-                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1]));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1]));
                 } else {
                     xmlChar *escapedURI;
                     trimString(opts[0]);
@@ -711,7 +711,7 @@ xslDbgShellDelete(xmlChar * arg)
                         } else if (validateData(&url, &lineNo))
                             breakPtr = breakPointGet(url, lineNo);
                         if (!breakPtr || !breakPointDelete(breakPtr)){
-                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo));
+                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo));
                         }else{
                             result = 1;
 			}
@@ -719,7 +719,7 @@ xslDbgShellDelete(xmlChar * arg)
                     }
                 }
             } else{
-		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("delete"));
+		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("delete"));
 	    }
         }
     } else if (xmlStrEqual((xmlChar*)"*", arg)) {
@@ -732,24 +732,24 @@ xslDbgShellDelete(xmlChar * arg)
         if (breakPtr) {
             result = breakPointDelete(breakPtr);
             if (!result) {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint %1.\n").tqarg(breakPointId));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint %1.\n").arg(breakPointId));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").tqarg(breakPointId));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").arg(breakPointId));
         }
     } else {
         breakPtr = findBreakPointByName(arg);
         if (breakPtr) {
             result = breakPointDelete(breakPtr);
             if (!result) {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint at template %1.\n").tqarg(xsldbgText(arg)));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint at template %1.\n").arg(xsldbgText(arg)));
             }
         } else{
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").arg(xsldbgText(arg)));
 	}
     }
     if (!result) 
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
     return result;
 }
 
@@ -798,7 +798,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
 
     if (!filesGetStylesheet() || !filesGetMainDoc()) {
         xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n"));
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
         return result;
     }
 
@@ -807,7 +807,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
         xsltGenericError(xsltGenericErrorContext,
                          "Error: NULL argument provided\n");
 #endif
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
         return result;
     }
 
@@ -818,7 +818,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
             if (splitString(&arg[2], 2, opts) == 2) {
                 if ((xmlStrlen(opts[1]) == 0) ||
 		    !sscanf((char *) opts[1], "%ld", &lineNo)) {
-                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1]));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1]));
                 } else {
                     xmlChar *escapedURI;
                     trimString(opts[0]);
@@ -839,13 +839,13 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
                         if (breakPtr){
                             result = breakPointEnable(breakPtr, enableType);
                         }else{
-                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo));
+                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo));
 			}
                         xmlFree(url);
                     }
                 }
             } else
-                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("enable"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("enable"));
         }
     } else if (xmlStrEqual((xmlChar*)"*", arg)) {
         result = 1;
@@ -858,21 +858,21 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
         if (breakPtr) {
             result = breakPointEnable(breakPtr, enableType);
             if (!result) {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to enable/disable breakpoint %1.\n").tqarg(breakPointId));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to enable/disable breakpoint %1.\n").arg(breakPointId));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").tqarg(breakPointId));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").arg(breakPointId));
         }
     } else {
         breakPtr = findBreakPointByName(arg);
         if (breakPtr) {
             result = breakPointEnable(breakPtr, enableType);
         } else
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").arg(xsldbgText(arg)));
     }
 
     if (!result)
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
     return result;
 }
 
@@ -931,7 +931,7 @@ static int validateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy)
 	breakPtr->flags |= BREAKPOINT_ORPHANED;
 
     if ( breakPtr->flags & BREAKPOINT_ORPHANED){
-	xsldbgGenericErrorFunc(TQString("Warning: Breakpoint %1 is orphaned. Result: %2. Old flags: %3. New flags: %4.\n").tqarg(breakPtr->id).tqarg(result).tqarg(copy->flags).tqarg(breakPtr->flags));
+	xsldbgGenericErrorFunc(TQString("Warning: Breakpoint %1 is orphaned. Result: %2. Old flags: %3. New flags: %4.\n").arg(breakPtr->id).arg(result).arg(copy->flags).arg(breakPtr->flags));
     }
 
     if (!(breakPtr->flags & BREAKPOINT_ORPHANED) && ((copy->lineNo != breakPtr->lineNo ) || 
@@ -949,11 +949,11 @@ static int validateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy)
 		    breakPointCounter = lastCounter; /* compensate for breakPointAdd which always 
 							increments the breakPoint counter */
 		    result = 1;
-		    xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").tqarg(breakPtr->id));
+		    xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").arg(breakPtr->id));
 		}
 	    }
 	    if (!result){
-		xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").tqarg(copy->id));
+		xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").arg(copy->id));
 	    }
 	}
     }
@@ -992,7 +992,7 @@ static int validateTemplateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy
     }
     xmlFree(copy->templateName);
     if (!result){
-	xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").tqarg(copy->id));
+	xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").arg(copy->id));
     }
     return result;
 }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
index ec081ab6..3ce95b0c 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
@@ -529,10 +529,10 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                     templateNode =
                         findTemplateNode(styleCtxt->style, &arg[offset]);
                     if (!templateNode) {
-                        xsldbgGenericErrorFunc(i18n("Error: The XSLT template named \"%1\" was not found.\n").tqarg(xsldbgText(&arg[offset])));
+                        xsldbgGenericErrorFunc(i18n("Error: The XSLT template named \"%1\" was not found.\n").arg(xsldbgText(&arg[offset])));
                         return result;
                     } else {
-                        xsldbgGenericErrorFunc(i18n(" template: \"%1\"\n").tqarg(xsldbgText(&arg[offset])));
+                        xsldbgGenericErrorFunc(i18n(" template: \"%1\"\n").arg(xsldbgText(&arg[offset])));
                         ctxt->node = templateNode;
                         result = 1;
                         return result;
@@ -560,7 +560,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                         xsldbgGenericErrorFunc(i18n("Error: Unable to cd. No stylesheet loaded.\n"));
                     }
                 } else {
-                    xsldbgGenericErrorFunc(i18n("Error: Unknown arguments to the command %1.\n").tqarg("cd"));
+                    xsldbgGenericErrorFunc(i18n("Error: Unknown arguments to the command %1.\n").arg("cd"));
                 }
             } else
                 xsldbgGenericErrorFunc(i18n("Error: Unable to cd. No stylesheet loaded.\n"));
@@ -582,7 +582,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                                        XSLT_NAMESPACE);
                 list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt);
             } else {
-                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to the command %1.\n").tqarg("cd"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to the command %1.\n").arg("cd"));
             }
         }
 
@@ -603,9 +603,9 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                             }
                             result = 1;
                         } else
-                            xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is a Node Set with %n child.", "Warning: XPath %1 is a Node Set with %n tqchildren.", list->nodesetval->nodeNr).tqarg(xsldbgText(arg)) + TQString("\n"));
+                            xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is a Node Set with %n child.", "Warning: XPath %1 is a Node Set with %n children.", list->nodesetval->nodeNr).arg(xsldbgText(arg)) + TQString("\n"));
                     } else {
-                        xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").tqarg(xsldbgText(arg)));
+                        xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").arg(xsldbgText(arg)));
                     }
                     break;
 
@@ -614,7 +614,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
             }
             xmlXPathFreeObject(list);
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").arg(xsldbgText(arg)));
         }
         if (ctxt->pctxt)
           ctxt->pctxt->node = NULL;
@@ -669,12 +669,12 @@ xslDbgPrintCallStack(const xmlChar * arg)
 			    if (rootNameTemp && rootModeTemp){
 			      if (rootCopy->match)
 			        /* display information about the current XSLT template */
-                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth).tqarg(xsldbgText(rootCopy->match)).tqarg(xsldbgText(rootModeTemp)));
+                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth).arg(xsldbgText(rootCopy->match)).arg(xsldbgText(rootModeTemp)));
 			      else
 			        /* display information about the current XSLT template */
-                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth).tqarg(xsldbgText(rootNameTemp)).tqarg(xsldbgText(rootModeTemp)));
+                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth).arg(xsldbgText(rootNameTemp)).arg(xsldbgText(rootModeTemp)));
 			      /* display where we are in the source/document file */	
-			      xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(curUrl)).tqarg(curLine));
+			      xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(curUrl)).arg(curLine));
 			    }else{
 			      xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n"));
 			      result = 0;
@@ -689,9 +689,9 @@ xslDbgPrintCallStack(const xmlChar * arg)
 			    }
                         } else if (curUrl) {
 			    /* display information about the current XSLT template */
-                            xsldbgGenericErrorFunc(i18n("#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\"").tqarg(depth));
+                            xsldbgGenericErrorFunc(i18n("#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\"").arg(depth));
 			    /* display where we are in the source/document file */	
-                            xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(curUrl)).tqarg(curLine));
+                            xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(curUrl)).arg(curLine));
                         }
                         if (curUrl)
                             xmlFree(curUrl);
@@ -703,10 +703,10 @@ xslDbgPrintCallStack(const xmlChar * arg)
 					 callPointItem->info->modeName);
 		    if (nameTemp && modeTemp){
 		      /* display information about the current XSLT template */
-		      xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth - 1).tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp)));
+		      xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth - 1).arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp)));
 		      if (callPointItem->info->url)
 			/* display where we are in the source/document file */	
-                        xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(callPointItem->info->url)).tqarg(callPointItem->lineNo));
+                        xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(callPointItem->info->url)).arg(callPointItem->lineNo));
 		      else
                         xsldbgGenericErrorFunc("\n");
 		    }else{
@@ -755,11 +755,11 @@ xslDbgPrintCallStack(const xmlChar * arg)
             callPointItem = callStackGet(templateDepth + 1);
             if (callPointItem && callPointItem->info) {
 		/* display information about the current XSLT template */
-                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\"").tqarg(templateDepth).tqarg(xsldbgText(callPointItem->info->templateName)));
+                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\"").arg(templateDepth).arg(xsldbgText(callPointItem->info->templateName)));
                 /* should alays be present but .. */
                 if (callPointItem->info->url)
 		    /* display where we are in the source/document file */	
-                    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(callPointItem->info->url)).tqarg(callPointItem->lineNo));
+                    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(callPointItem->info->url)).arg(callPointItem->lineNo));
                 else
                     xsldbgGenericErrorFunc("\n");
             } else {
@@ -1105,7 +1105,7 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root,
 	  if (terminalIO == NULL) {
 
             if (root->match){
-                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(root->match)).tqarg(xsldbgText(modeTemp)));
+                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp)));
 		if (lastTemplate != root->match && buffer){
 		    xmlBufferCCat(buffer, "\nreached matched template:");
 		    xmlBufferCat(buffer, root->match); 
@@ -1115,7 +1115,7 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root,
 		    lastTemplate = root->match;
 		}
             }else{
-                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp)));
+                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp)));
 		if (lastTemplate != root->name && buffer){
 		    xmlBufferCCat(buffer, "\nreached named template:");
 		    xmlBufferCat(buffer,root->match); 
@@ -1133,9 +1133,9 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root,
                 (xslDebugStatus == DEBUG_WALK)) {
 		TQString message;
                 if (root->match)
-		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(root->match)).tqarg(xsldbgText(modeTemp));
+		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp));
                 else
-		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp));
+		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp));
 		fprintf(terminalIO, "%s", message.local8Bit().data());
             }
 	  }
@@ -1292,9 +1292,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 breakUri = ctxt->node->doc->URL;
 
             if (xmlGetLineNo(ctxt->node) != -1)
-		messageTxt = i18n("Breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(breakUri)).tqarg(xmlGetLineNo(ctxt->node));
+		messageTxt = i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(breakUri)).arg(xmlGetLineNo(ctxt->node));
             else
-                messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").tqarg(xsldbgUrl(breakUri));
+                messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(breakUri));
             if (baseUri != NULL) {
                 xmlFree(baseUri);
                 baseUri = NULL;
@@ -1706,7 +1706,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		  if(tempBaseName){
 		    xsldbgGenericErrorFunc("\n");
 		    xsldbgGenericErrorFunc((char*)dir);
-		    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2").tqarg(xsldbgUrl(tempBaseName)).tqarg(xmlGetLineNo(ctxt->node)));
+		    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2").arg(xsldbgUrl(tempBaseName)).arg(xmlGetLineNo(ctxt->node)));
 		    xmlFree(tempBaseName);
 		    cmdResult = 1;
 		  }
@@ -1885,7 +1885,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		if (splitString(arg, 1, &systemID) == 1){
 		  cmdResult = xslDbgSystem(systemID);
 		}else{
-		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("system"));
+		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("system"));
 		}
 	       }
                 break;
@@ -1898,7 +1898,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		if (splitString(arg, 1, &publicID) == 1){
 		  cmdResult = xslDbgPublic(publicID);
 		}else{
-		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("public"));
+		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("public"));
 		}
 	       }
                 break;
@@ -1908,7 +1908,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             case DEBUG_VALIDATE_CMD:
-                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("validate"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("validate"));
                 cmdResult = 0;
                 /*
                  * xmlShellValidate(ctxt, arg, NULL, NULL);
@@ -1929,7 +1929,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             case DEBUG_WRITE_CMD:
-                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("write"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("write"));
                 cmdResult = 0;
                 /*
                  * xmlShellWrite(ctxt, arg, NULL, NULL);
@@ -1937,7 +1937,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             case DEBUG_FREE_CMD:
-                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("free"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("free"));
                 cmdResult = 0;
                 /*
                  * if (arg[0] == 0) {
@@ -1993,7 +1993,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		  /* gdb does to say anything after redirecting its 
 		     output */
 		  if (optionsGetIntOption(OPTIONS_GDB) < 2)
-                    xsldbgGenericErrorFunc(i18n("Opening terminal %1.\n").tqarg(xsldbgText(arg)));
+                    xsldbgGenericErrorFunc(i18n("Opening terminal %1.\n").arg(xsldbgText(arg)));
                     cmdResult = 1;
                 } else
                     cmdResult = 0;
@@ -2009,11 +2009,11 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		    bindtextdomain("tdewebdev/xsldbg", LOCALE_PREFIX);
 		    cmdResult = 1;
 		}else{
-		    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("lang"));
+		    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("lang"));
 		    cmdResult = 0;
 		}
 #else
-	        xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled\n").tqarg("lang"));
+	        xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled\n").arg("lang"));
 		cmdResult = 1;
 #endif
 		break;
@@ -2058,7 +2058,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 	       break;
 
 	     default:
-	        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("showmatch")); 
+	        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("showmatch")); 
 	     }
            break;
  
@@ -2077,7 +2077,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             default:
-                xsldbgGenericErrorFunc(i18n("Error: Unknown command %1. Try help.\n").tqarg(xsldbgText(command)));
+                xsldbgGenericErrorFunc(i18n("Error: Unknown command %1. Try help.\n").arg(xsldbgText(command)));
                 cmdResult = 0;
         }
 
@@ -2088,9 +2088,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		ctxt->node->doc && ctxt->node->doc->URL) {
 
                 if (xmlGetLineNo(ctxt->node) != -1)
-                    xsldbgGenericErrorFunc(i18n("Breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(ctxt->node->doc->URL)).tqarg(xmlGetLineNo(ctxt->node)));
+                    xsldbgGenericErrorFunc(i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(ctxt->node->doc->URL)).arg(xmlGetLineNo(ctxt->node)));
                 else
-                    xsldbgGenericErrorFunc(i18n("Breakpoint at text node in file \"%1\".\n").tqarg(xsldbgUrl(ctxt->node->doc->URL)));
+                    xsldbgGenericErrorFunc(i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(ctxt->node->doc->URL)));
             }
         }
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
index 3f8d2e29..10abbaf7 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
@@ -68,7 +68,7 @@ xslDbgEntities(void)
                                                        entityIndex);
                 if (entInfo) {
 		    /* display identifier of an XML entity */
-                    xsldbgGenericErrorFunc(i18n("Entity %1 ").tqarg(xsldbgText(entInfo->SystemID)));
+                    xsldbgGenericErrorFunc(i18n("Entity %1 ").arg(xsldbgText(entInfo->SystemID)));
                     if (entInfo->PublicID)
 			xsldbgGenericErrorFunc(xsldbgText(entInfo->PublicID));
 		    xsldbgGenericErrorFunc("\n");
@@ -118,15 +118,15 @@ xslDbgSystem(const xmlChar * arg)
             xmlFree(name);
         } else {
             notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, "");
-            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
         }
     } else {
         if (name) {
-            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" maps to: \"%2\"\n").tqarg(xsldbgText(arg)).tqarg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" maps to: \"%2\"\n").arg(xsldbgText(arg)).arg(xsldbgText(name)));
             xmlFree(name);
             result = 1;
         } else {
-            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
         }
     }
 
@@ -165,15 +165,15 @@ xslDbgPublic(const xmlChar * arg)
             xmlFree(name);
         } else {
             notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, "");
-	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
+	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
         }
     } else {
         if (name) {
-            xsldbgGenericErrorFunc(i18n("PublicID \"%1\" maps to: \"%2\"\n").tqarg(xsldbgText(arg)).tqarg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("PublicID \"%1\" maps to: \"%2\"\n").arg(xsldbgText(arg)).arg(xsldbgText(name)));
             xmlFree(name);
             result = 1;
         } else {
-	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
+	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
         }
         xsltGenericError(xsltGenericErrorContext, "%s", buffer);
     }
@@ -210,7 +210,7 @@ xslDbgEncoding(xmlChar * arg)
             result = 1;
         }
     } else
-        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("encoding"));
+        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("encoding"));
     return result;
 }
 
@@ -245,7 +245,7 @@ int xslDbgShellOutput(const xmlChar *arg)
       notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L);
       result = 1;
     } else if (!xmlStrnCmp(arg, "ftp://", 6) || !xmlStrnCmp(arg, "http://", 7)){
-	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("output"));
+	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("output"));
 	return 0;
     } else {
       /* assume that we were provided a local file name
@@ -262,11 +262,11 @@ int xslDbgShellOutput(const xmlChar *arg)
 	   xmlFree(expandedName);
 	   result = 1;
       }else{
-	   xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("output"));
+	   xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("output"));
       }
     }
    } else {
-    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("output"));
+    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("output"));
   }
 
   return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp
index e803b1a4..73d3713b 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp
@@ -189,7 +189,7 @@ openTerminal(xmlChar * device)
                     termName = xmlMemStrdup((char *) device);
                     result = 1;
                 } else {
-                    xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").tqarg(xsldbgText(termName)));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").arg(xsldbgText(termName)));
                 }
             } else {
                 xsldbgGenericErrorFunc(i18n("Error: Did not previously open terminal.\n"));
@@ -212,7 +212,7 @@ openTerminal(xmlChar * device)
                 termName = xmlMemStrdup((char *) device);
                 result = 1;
             } else {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").tqarg(xsldbgText(device)));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").arg(xsldbgText(device)));
             }
 
     }
@@ -494,7 +494,7 @@ changeDir(const xmlChar * path)
         return result;          /* out of memory ? */
 
     if (xmlStrLen(expandedName) + 1 > sizeof(filesBuffer)) {
-        xsldbgGenericErrorFunc(i18n("Error: The file name \"%1\" is too long.\n").tqarg(xsldbgText(path)));
+        xsldbgGenericErrorFunc(i18n("Error: The file name \"%1\" is too long.\n").arg(xsldbgText(path)));
         return result;
     }
 
@@ -518,10 +518,10 @@ changeDir(const xmlChar * path)
     }
     xmlFree(expandedName);      /* this will always be valid time */
     if (!result) {
-        xsldbgGenericErrorFunc(i18n("Error: Unable to change to directory %1.\n").tqarg(xsldbgText(path)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to change to directory %1.\n").arg(xsldbgText(path)));
     } else {
 	if (xslDebugStatus != DEBUG_NONE)
-	    xsldbgGenericErrorFunc(i18n("Changed to directory %1.\n").tqarg(xsldbgText(path)));
+	    xsldbgGenericErrorFunc(i18n("Changed to directory %1.\n").arg(xsldbgText(path)));
     }
     return result;
 }
@@ -549,7 +549,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType)
         case FILES_XMLFILE_TYPE:
             if (path && xmlStrLen(path)) {
                 if (optionsGetIntOption(OPTIONS_SHELL)) {
-                    xsldbgGenericErrorFunc(i18n("Setting XML Data file name to %1.\n").tqarg(xsldbgText(path)));
+                    xsldbgGenericErrorFunc(i18n("Setting XML Data file name to %1.\n").arg(xsldbgText(path)));
                 }
                 optionsSetStringOption(OPTIONS_DATA_FILE_NAME, path);
             }
@@ -561,7 +561,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType)
         case FILES_SOURCEFILE_TYPE:
             if (path && xmlStrLen(path)) {
                 if (optionsGetIntOption(OPTIONS_SHELL)) {
-                    xsldbgGenericErrorFunc(i18n("Setting stylesheet file name to %1.\n").tqarg(xsldbgText(path)));
+                    xsldbgGenericErrorFunc(i18n("Setting stylesheet file name to %1.\n").arg(xsldbgText(path)));
                 }
                 optionsSetStringOption(OPTIONS_SOURCE_FILE_NAME, path);
             }
@@ -578,7 +578,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType)
                     stylePathName = (xmlChar *) xmlMemStrdup(docUrl);
                     stylePathName[lastSlash - docUrl + 1] = '\0';
                     if (optionsGetIntOption(OPTIONS_SHELL)) {
-                        xsldbgGenericErrorFunc(i18n("Setting stylesheet base path to %1.\n").tqarg(xsldbgText(stylePathName)));
+                        xsldbgGenericErrorFunc(i18n("Setting stylesheet base path to %1.\n").arg(xsldbgText(stylePathName)));
                     }
                 } else {
                     const char cwd[4] = { '.', PATHCHAR, '\0' };
@@ -1176,12 +1176,12 @@ filesSetEncoding(const char *encoding)
             if (!result) {
                 xmlCharEncCloseFunc(stdoutEncoding);
                 stdoutEncoding = NULL;
-                xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").tqarg(xsldbgText(encoding)));
+                xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").arg(xsldbgText(encoding)));
             } else
                 optionsSetStringOption(OPTIONS_ENCODING,
                                        (xmlChar *) encoding);
         } else {
-            xsldbgGenericErrorFunc(i18n("Invalid encoding %1.\n").tqarg(xsldbgText(encoding)));
+            xsldbgGenericErrorFunc(i18n("Invalid encoding %1.\n").arg(xsldbgText(encoding)));
         }
     } else {
         /* close encoding and use UTF-8 */
@@ -1360,7 +1360,7 @@ xmlChar *filesURItoFileName(const xmlChar* uri)
 	result = NULL;
       }
     }else{
-        xsldbgGenericErrorFunc(i18n("Error: Unable to convert %1 to local file name.\n").tqarg(xsldbgText(uri)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to convert %1 to local file name.\n").arg(xsldbgText(uri)));
     }
 
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
index 340e9869..a4a583c7 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
@@ -87,7 +87,7 @@ helpTop(const xmlChar * args)
 		 docsDirPath);
         if (xslDbgShellExecute((xmlChar *) buff, optionsGetIntOption(OPTIONS_VERBOSE)) == 0) {
             if (docsDirPath)
-                xsldbgGenericErrorFunc(i18n("Error: Unable to display help. Help files not found in %1 or xsldbg not found in path.\n").tqarg(docsDirPath)); /* FIXME: Comments not correct - the command is that invoked  */
+                xsldbgGenericErrorFunc(i18n("Error: Unable to display help. Help files not found in %1 or xsldbg not found in path.\n").arg(docsDirPath)); /* FIXME: Comments not correct - the command is that invoked  */
             else
                 xsldbgGenericErrorFunc(i18n("Error: Unable to find xsldbg or help files.\n"));
         } else {
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
index 759ed2ac..a3fffd41 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
@@ -137,7 +137,7 @@ xslDbgShellPrintList(xmlShellCtxtPtr ctxt, xmlChar * arg, int dir)
             }
             xmlXPathFreeObject(list);
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg)));
         }
         ctxt->pctxt->node = NULL;
     }
@@ -172,7 +172,7 @@ xslDbgCatToFile(xmlNodePtr node, FILE * file)
         const xmlChar *encoding = doc->encoding;
 
         if (encoding) {
-            xsldbgGenericErrorFunc(i18n("Information: Temporarily setting document's encoding to UTF-8. Previously was %1.\n").tqarg(xsldbgText(encoding)));
+            xsldbgGenericErrorFunc(i18n("Information: Temporarily setting document's encoding to UTF-8. Previously was %1.\n").arg(xsldbgText(encoding)));
         }
         doc->encoding = (xmlChar *) "UTF-8";
         xmlDocDump(file, (xmlDocPtr) node);
@@ -226,7 +226,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){
 	  break;
 	file = fopen(fileName, "w+");
 	if (!file) {
-	   xsldbgGenericErrorFunc(i18n("Error: Unable to save temporary results to %1.\n").tqarg(xsldbgText(fileName)));
+	   xsldbgGenericErrorFunc(i18n("Error: Unable to save temporary results to %1.\n").arg(xsldbgText(fileName)));
 	  break;
 	} else {
 	  fprintf(file, "= %s\n", xPath);
@@ -240,7 +240,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){
 						nodeTab[indx], file);
 	      }
 	    } else {
-	      xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(xPath)));
+	      xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(xPath)));
 	    }
 	    break;
 			     
@@ -380,7 +380,7 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
         result = printXPathObject(list, arg);
         xmlXPathFreeObject(list);
     } else {
-        xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(arg)));
+        xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg)));
     }
     ctxt->pctxt->node = NULL;
     return result;
@@ -415,19 +415,19 @@ xslDbgShellPrintNames(void *payload,
 		     item->nameURI, item->name);
 	}
         if (printVariableValue == 0){
-	    xsldbgGenericErrorFunc(i18n(" Global %1\n").tqarg(xsldbgText(fullQualifiedName)));
+	    xsldbgGenericErrorFunc(i18n(" Global %1\n").arg(xsldbgText(fullQualifiedName)));
         }else{
 	      if (item->computed == 1){
 	         xsldbgGenericErrorFunc(i18n(" Global "));
 		 printXPathObject(item->value, fullQualifiedName);
 	      }else if (item->tree){
-	         xsldbgGenericErrorFunc(i18n(" Global = %1\n").tqarg(xsldbgText(fullQualifiedName)));
+	         xsldbgGenericErrorFunc(i18n(" Global = %1\n").arg(xsldbgText(fullQualifiedName)));
 		 xslDbgCatToFile(item->tree, stderr);
 	      }else if (item->select){
-	         xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select)));
+	         xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select)));
 	      }else{
 		/* can't find a value give only a variable name an error message */
-		xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n")));
+		xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n")));
 	      }
 	    xsltGenericError(xsltGenericErrorContext, "\n\032\032\n");
         }
@@ -553,19 +553,19 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
 								    item->nameURI, item->name);
 					    }
 					    if (printVariableValue == 0){
-						    xsldbgGenericErrorFunc(i18n(" Local %1").tqarg(xsldbgText(fullQualifiedName)));
+						    xsldbgGenericErrorFunc(i18n(" Local %1").arg(xsldbgText(fullQualifiedName)));
 					    }else{
 						    if (item->computed == 1){
 							    xsldbgGenericErrorFunc(i18n(" Local "));
 							    printXPathObject(item->value, fullQualifiedName);
 						    }else if (item->tree){
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n").tqarg(xsldbgText(fullQualifiedName)));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n").arg(xsldbgText(fullQualifiedName)));
 							    xslDbgCatToFile(item->tree, stderr);
 						    }else if (item->select){
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select)));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select)));
 						    }else{
 							    /* can't find a value give only a variable name and an error */
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n")));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n")));
 						    }
 					    }
 					    xsltGenericError(xsltGenericErrorContext, "\n\032\032\n");
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
index 6f269143..0bc54364 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
@@ -70,7 +70,7 @@ xslDbgShellSetOption(xmlChar * arg)
                     /* handle setting integer option */
                     if ((xmlStrlen(opts[1]) == 0) ||
 			!sscanf((char *) opts[1], "%ld", &optValue)) {
-			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").tqarg(xsldbgText(opts[1])));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").arg(xsldbgText(opts[1])));
                     } else {
 			if (invertOption)
 			    optValue = !optValue;
@@ -104,16 +104,16 @@ xslDbgShellSetOption(xmlChar * arg)
 			else
 			    xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader);
 		    }else{
-			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").tqarg(xsldbgText(opts[1])));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").arg(xsldbgText(opts[1])));
 		    }
 		} else 
-                xsldbgGenericErrorFunc(i18n("Error: Unknown option name %1.\n").tqarg(xsldbgText(opts[0])));
+                xsldbgGenericErrorFunc(i18n("Error: Unknown option name %1.\n").arg(xsldbgText(opts[0])));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("setoption"));
+            xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("setoption"));
         }
     } else {
-	xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("setoption"));
+	xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("setoption"));
     }
 
     return result;
@@ -143,7 +143,7 @@ xslDbgShellOptions(void)
             /* skip any non-user options */
             optionName = optionsGetOptionName(OptionTypeEnum(optionIndex));
             if (optionName && (optionName[0] != '*')) {
-                xsldbgGenericErrorFunc(i18n("Option %1 = %2\n").tqarg(xsldbgText(optionName)).tqarg(optionsGetIntOption(OptionTypeEnum(optionIndex))));
+                xsldbgGenericErrorFunc(i18n("Option %1 = %2\n").arg(xsldbgText(optionName)).arg(optionsGetIntOption(OptionTypeEnum(optionIndex))));
 
             }
         }
@@ -154,9 +154,9 @@ xslDbgShellOptions(void)
             if (optionName && (optionName[0] != '*')) {
                 optionValue = optionsGetStringOption(OptionTypeEnum(optionIndex));
                 if (optionValue) {
-                    xsldbgGenericErrorFunc(i18n("Option %1 = \"%2\"\n").tqarg(xsldbgText(optionName)).tqarg((char*)optionValue));
+                    xsldbgGenericErrorFunc(i18n("Option %1 = \"%2\"\n").arg(xsldbgText(optionName)).arg((char*)optionValue));
                 } else {
-                    xsldbgGenericErrorFunc(i18n("Option %1 = \"\"\n").tqarg(xsldbgText(optionName)));
+                    xsldbgGenericErrorFunc(i18n("Option %1 = \"\"\n").arg(xsldbgText(optionName)));
 
                 }
             }
@@ -234,7 +234,7 @@ xslDbgShellOptions(void)
 	counter++){
     watchExpression = (xmlChar*)arrayListGet(optionsGetWatchList(), counter);
     if (watchExpression){
-      xsldbgGenericErrorFunc(i18n(" WatchExpression %1 ").tqarg(counter + 1));
+      xsldbgGenericErrorFunc(i18n(" WatchExpression %1 ").arg(counter + 1));
       result = xslDbgShellCat(styleCtxt, ctx, watchExpression);
     }else
       break;
@@ -260,7 +260,7 @@ xslDbgShellOptions(void)
     trimString(arg);
     result = optionsAddWatch(arg);
     if (!result)
-      xsldbgGenericErrorFunc(i18n("Error: Unable to add watch expression \"%1\". It already has been added or it cannot be watched.\n").tqarg(xsldbgText(arg)));
+      xsldbgGenericErrorFunc(i18n("Error: Unable to add watch expression \"%1\". It already has been added or it cannot be watched.\n").arg(xsldbgText(arg)));
   }
   return result;
 }
@@ -284,12 +284,12 @@ xslDbgShellOptions(void)
       arrayListEmpty(optionsGetWatchList());
     }else if ((xmlStrlen(arg) == 0) || 
 	      !sscanf((char *) arg, "%ld", &watchID)) {
-      xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a watchID.\n").tqarg(xsldbgText(arg)));
+      xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a watchID.\n").arg(xsldbgText(arg)));
       return result;
     } else {
       result = optionsRemoveWatch(watchID);
       if (!result)
-	xsldbgGenericErrorFunc(i18n("Error: Watch expression %1 does not exist.\n").tqarg(watchID));
+	xsldbgGenericErrorFunc(i18n("Error: Watch expression %1 does not exist.\n").arg(watchID));
     }
   }
   return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
index 84aa7f88..97195108 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
@@ -112,7 +112,7 @@ static TQString langLookupDir( const TQString &fname )
         langs.remove( "C" );
         TQStringList::ConstIterator lang;
         for (lang = langs.begin(); lang != langs.end(); ++lang)
-            search.append(TQString("%1%2/%3/%4").tqarg(localDoc[id]).tqarg(*lang).tqarg("xsldbg").tqarg(fname));
+            search.append(TQString("%1%2/%3/%4").arg(localDoc[id]).arg(*lang).arg("xsldbg").arg(fname));
     }
 
     // try to locate the file
@@ -293,10 +293,10 @@ optionsSetIntOption(OptionTypeEnum optionType, int value)
         }
     } else {
 	if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){
-	     xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	     xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("setoption"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("setoption"));
 #endif
 	}
         result = 0;
@@ -323,10 +323,10 @@ optionsGetIntOption(OptionTypeEnum optionType)
         result = intOptions[type - OPTIONS_FIRST_INT_OPTIONID];
     } else {
 	if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){
-	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("options"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options"));
 #endif
 	}
     }
@@ -365,10 +365,10 @@ optionsSetStringOption(OptionTypeEnum optionType, const xmlChar * value)
         result = 1;
     } else{
 	if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){
-	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("setoption"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("setoption"));
 #endif
 	}
     }
@@ -396,10 +396,10 @@ optionsGetStringOption(OptionTypeEnum optionType)
         result = stringOptions[optionId];
     } else{
 	if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){
-	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("options"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options"));
 #endif
 	}
     }
@@ -508,7 +508,7 @@ optionsPrintParam(int paramId)
                                         paramId);
 
     if (paramItem && paramItem->name && paramItem->value) {
-        xsldbgGenericErrorFunc(i18n(" Parameter %1 %2=\"%3\"\n").tqarg(paramId).tqarg(xsldbgText(paramItem->name)).tqarg(xsldbgText(paramItem->value)));
+        xsldbgGenericErrorFunc(i18n(" Parameter %1 %2=\"%3\"\n").arg(paramId).arg(xsldbgText(paramItem->name)).arg(xsldbgText(paramItem->value)));
         result = 1;
     }
     return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp
index 16e1ccf6..dac5bb0f 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp
@@ -45,7 +45,7 @@ xslDbgShellChangeWd(xmlChar * path)
         /* call function in files.c to do the work */
         result = changeDir(path);
     } else
-        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("chdir"));
+        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("chdir"));
     return result;
 }
 
@@ -69,12 +69,12 @@ xslDbgShellExecute(xmlChar * name, int verbose)
     /* Quick check to see if we have a command processor; embedded systems
      * may not have such a thing */
     if (system(NULL) == 0) {
-        xsldbgGenericErrorFunc(i18n("Error: No command processor available for shell command \"%1\".\n").tqarg(xsldbgText(name)));
+        xsldbgGenericErrorFunc(i18n("Error: No command processor available for shell command \"%1\".\n").arg(xsldbgText(name)));
     } else {
         int return_code;
 
         if (verbose)
-            xsldbgGenericErrorFunc(i18n("Information: Starting shell command \"%1\".\n").tqarg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("Information: Starting shell command \"%1\".\n").arg(xsldbgText(name)));
 
         return_code = system((char *) name);
         /* JRF: Strictly system returns an implementation defined value -
@@ -93,7 +93,7 @@ xslDbgShellExecute(xmlChar * name, int verbose)
             result = 1;
         } else {
             if (verbose)
-                xsldbgGenericErrorFunc(i18n("Error: Unable to run command. System error %1.\n").tqarg(return_code));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to run command. System error %1.\n").arg(return_code));
         }
     }
     return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
index 85c17d59..befa330d 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
@@ -49,7 +49,7 @@ xslDbgShellAddParam(xmlChar * arg)
     xmlChar *opts[2];
 
     if (!arg) {
-        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("addparam"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("addparam"));
     }else{
 	if ((xmlStrLen(arg) > 1) && splitString(arg, 2, opts) == 2) {
 	    int count;
@@ -68,11 +68,11 @@ xslDbgShellAddParam(xmlChar * arg)
 	    paramItem = optionsParamItemNew(opts[0], opts[1]);
 	    result = arrayListAdd(optionsGetParamItemList(), paramItem);
 	} else {
-	    xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("addparam"));
+	    xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("addparam"));
 	}
     }
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
     else {
 	xsldbgGenericErrorFunc("\n");
     }
@@ -98,21 +98,21 @@ xslDbgShellDelParam(xmlChar * arg)
     xmlChar *opts[2];
 
     if (!arg) {
-	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("delparam"));
+	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("delparam"));
     }else{
 	if (xmlStrLen(arg) > 0) {
 	    if (splitString(arg, 1, opts) == 1) {
 		if ((xmlStrlen(opts[0]) == 0) ||
 			!sscanf((char *) opts[0], "%ld", &paramId)) {
-		    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg(xsldbgText(opts[0])));
+		    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg(xsldbgText(opts[0])));
 		} else {
 		    result =
 			arrayListDelete(optionsGetParamItemList(), paramId);
 		    if (!result)
-			xsldbgGenericErrorFunc(i18n("Error: Unable to find parameter %1.\n").tqarg(paramId));
+			xsldbgGenericErrorFunc(i18n("Error: Unable to find parameter %1.\n").arg(paramId));
 		}
 	    } else {
-		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("delparam"));
+		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("delparam"));
 	    }
 	} else {
 	    /* Delete all parameters */
@@ -121,7 +121,7 @@ xslDbgShellDelParam(xmlChar * arg)
 	}
     }
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
     else
          xsldbgGenericErrorFunc("\n");
 
@@ -168,7 +168,7 @@ xslDbgShellShowParam(xmlChar * arg)
         if (optionsPrintParamList())
             result = 1;
         else
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
         xsldbgGenericErrorFunc("\n");
     }
     return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
index dabf1d7e..68fcd7e1 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
@@ -404,7 +404,7 @@ searchSave(const xmlChar * fileName)
     if (xmlSaveFormatFile((char *) searchInput, searchDataBase, 1) != -1){
         result = 1;
     }else{
-        xsldbgGenericErrorFunc(i18n("Error: Unable to write search Database to file %1. Try setting the \"searchresultspath\" option to a writable path.\n").tqarg(xsldbgText(searchInput)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to write search Database to file %1. Try setting the \"searchresultspath\" option to a writable path.\n").arg(xsldbgText(searchInput)));
     }
 
     if (searchInput)
@@ -479,9 +479,9 @@ searchQuery(const xmlChar * tempFile, const xmlChar * outputFile,
             result = filesMoreFile(searchOutput, NULL);
         }
 
-        xsldbgGenericErrorFunc(i18n("Information: Transformed %1 using %2 and saved to %3.\n").tqarg(xsldbgText(searchInput)).tqarg(xsldbgText(searchXSL)).tqarg(xsldbgText(searchOutput)));
+        xsldbgGenericErrorFunc(i18n("Information: Transformed %1 using %2 and saved to %3.\n").arg(xsldbgText(searchInput)).arg(xsldbgText(searchXSL)).arg(xsldbgText(searchOutput)));
     } else {
-        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("search"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("search"));
     }
 
     if (searchInput)
@@ -720,7 +720,7 @@ findTemplateNode(xsltStylesheetPtr style, const xmlChar * name)
     }
 
     if (!result)
-        xsldbgGenericErrorFunc(i18n("Error: XSLT template named \"%1\" was not found.\n").tqarg(xsldbgText(name)));
+        xsldbgGenericErrorFunc(i18n("Error: XSLT template named \"%1\" was not found.\n").arg(xsldbgText(name)));
     return result;
 }
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp
index d4bf51b1..1dc65190 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp
@@ -53,7 +53,7 @@ xslDbgShellSearch(xsltTransformContextPtr styleCtxt,
 #ifdef USE_DOCS_MACRO
 	xsldbgGenericErrorFunc(i18n("Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n"));
 #else
-        xsldbgGenericErrorFunc(i18n("Error: Required environment variable %1 not set to the directory of xsldbg documentation.\n").tqarg((const char*)XSLDBG_DOCS_DIR_VARIABLE));
+        xsldbgGenericErrorFunc(i18n("Error: Required environment variable %1 not set to the directory of xsldbg documentation.\n").arg((const char*)XSLDBG_DOCS_DIR_VARIABLE));
 #endif
         return result;          /* failed */
     }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
index 7283fca5..bd4e297b 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
@@ -132,9 +132,9 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose,
 	  } else {
 	    modeTemp = fullTQName(templ->modeURI, templ->mode);
 	    if (verbose)
-	      xsldbgGenericErrorFunc(i18n(" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n").tqarg(xsldbgText(name)).tqarg(xsldbgText(modeTemp)).tqarg(xsldbgUrl(url)).tqarg(xmlGetLineNo(templ->elem)));
+	      xsldbgGenericErrorFunc(i18n(" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n").arg(xsldbgText(name)).arg(xsldbgText(modeTemp)).arg(xsldbgUrl(url)).arg(xmlGetLineNo(templ->elem)));
 	    else
-	       xsldbgGenericErrorFunc(TQString("\"%s\" ").tqarg(xsldbgText(name)));
+	       xsldbgGenericErrorFunc(TQString("\"%s\" ").arg(xsldbgText(name)));
 	    if (modeTemp)
 	      xmlFree(modeTemp);
 	  }
@@ -258,7 +258,7 @@ xslDbgShellPrintStylesheetsHelper(void *payload,
             notifyListQueue(payload);
         else
 	    /* display the URL of stylesheet  */
-	    xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(style->doc->URL)));
+	    xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(style->doc->URL)));
         printCounter++;
     }
 }
@@ -287,7 +287,7 @@ xslDbgShellPrintStylesheetsHelper2(void *payload,
             notifyListQueue(payload);
         else
 	    /* display the URL of stylesheet  */
-	     xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(node->doc->URL)));
+	     xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(node->doc->URL)));
         printCounter++;
     }
 }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp
index bfce530e..3893be67 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp
@@ -65,7 +65,7 @@ xslDbgShellWalk(xmlChar * arg)
 
     if (xmlStrLen(arg)
         && (!sscanf((char *) arg, "%ld", &speed) || ((speed < 0) || (speed > 9)))) {
-        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("walk"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("walk"));
         xsldbgGenericErrorFunc(i18n("Warning: Assuming normal speed.\n"));
         speed = WALKSPEED_NORMAL;
     }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
index 90987949..a3a4df53 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
@@ -99,7 +99,7 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg)
                         xsldbgGenericErrorFunc(i18n("Error: Cannot change a variable that does not use the select attribute.\n"));
                     }
                 } else
-                    xsldbgGenericErrorFunc(i18n("Error: Variable %1 was not found.\n").tqarg(xsldbgText(name)));
+                    xsldbgGenericErrorFunc(i18n("Error: Variable %1 was not found.\n").arg(xsldbgText(name)));
                 xmlFree(name);
             } else
                 xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n"));
@@ -108,7 +108,7 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg)
         }
 
         if (showUsage == 1)
-            xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("set"));
+            xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("set"));
     }
     return result;
 }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 76981f5a..1b1a6407 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -267,7 +267,7 @@ endTimer(const TQString& message)
 #error "endTimer required stdarg functions"
 #endif
     /* Display the time taken to complete this task */
-    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").tqarg(message).tqarg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").arg(message).arg(msec));
 }
 #elif defined(HAVE_TIME_H)
 
@@ -295,7 +295,7 @@ endTimer(const TQString& message)
 #error "endTimer required stdarg functions"
 #endif
     /* Display the time taken to complete this task */
-    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").tqarg(message).tqarg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").arg(message).arg(msec));
 }
 #else
 
@@ -317,7 +317,7 @@ endTimer(const TQString& message)
      */
 #ifdef HAVE_STDARG_H
     /* Display the time taken to complete this task */
-    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n"),arg(message).tqarg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n"),arg(message).arg(msec));
 #else
     /* We don't have gettimeofday, time or stdarg.h, what crazy world is
      * this ?!
@@ -358,7 +358,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
         xmlXIncludeProcess(doc);
         if (optionsGetIntOption(OPTIONS_TIMING)) {
 	    /* Display the time taken to do XInclude processing */
-            endTimer(i18n("XInclude processing %1.").tqarg((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME)));
+            endTimer(i18n("XInclude processing %1.").arg((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME)));
         }
     }
 #endif
@@ -396,7 +396,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
                     notifyXsldbgApp(XSLDBG_MSG_FILEOUT,
                                     filesTempFileName(1));
                 } else {
-		     xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").tqarg(filesTempFileName(1)));
+		     xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").arg(filesTempFileName(1)));
                     res = xsltProfileStylesheet(cur, doc, params, stderr);
                 }
             }
@@ -443,7 +443,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
 			notifyXsldbgApp(XSLDBG_MSG_FILEOUT,
 				filesTempFileName(1));
 		    } else {
-			 xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").tqarg(filesTempFileName(1)));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").arg(filesTempFileName(1)));
 			xmlDebugDumpDocument(stdout, res);
 		    }
 
@@ -490,7 +490,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
 			    /* Indicate how long it took to save to file */
 			    endTimer(i18n("Saving result"));
 		    } else {
-			xsldbgGenericErrorFunc(i18n("Warning: Unsupported, non-standard output method %1.\n").tqarg(xsldbgText(cur->method)));
+			xsldbgGenericErrorFunc(i18n("Warning: Unsupported, non-standard output method %1.\n").arg(xsldbgText(cur->method)));
 		    }
 		}
 	    }
@@ -513,7 +513,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
         }
     }
     if ((xslDebugStatus != DEBUG_RUN_RESTART) && (bytesWritten == -1))
-	xsldbgGenericErrorFunc(i18n("Error: Unable to save results of transformation to file %1.\n").tqarg(xsldbgText(optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)))); 
+	xsldbgGenericErrorFunc(i18n("Error: Unable to save results of transformation to file %1.\n").arg(xsldbgText(optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)))); 
 }
 
 int
@@ -689,7 +689,7 @@ xsldbgMain(int argc, char **argv)
 		paramOK = false;
 	    }
 	    if (!paramOK)
-		xsldbgGenericErrorFunc(i18n("Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n").tqarg(param.data()));
+		xsldbgGenericErrorFunc(i18n("Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n").arg(param.data()));
 	}
 
 	TQCString cdPath = args->getOption("cd");
@@ -911,9 +911,9 @@ xsldbgLoadStylesheet()
         startTimer();
     style = xmlParseFile((const char *) optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME));
     if (optionsGetIntOption(OPTIONS_TIMING))
-        endTimer(i18n("Parsing stylesheet %1").tqarg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)));
+        endTimer(i18n("Parsing stylesheet %1").arg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)));
     if (style == NULL) {
-        xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))));
+        xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))));
         cur = NULL;
         if (!optionsGetIntOption(OPTIONS_SHELL)) {
             xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n"));
@@ -988,7 +988,7 @@ xsldbgLoadXmlData(void)
         doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME));
 #endif
     if (doc == NULL) {
-        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))));
         if (!optionsGetIntOption(OPTIONS_SHELL)) {
             xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n"));
             xslDebugStatus = DEBUG_TQUIT;
@@ -997,7 +997,7 @@ xsldbgLoadXmlData(void)
             xslDebugStatus = DEBUG_STOP;
         }
     } else if (optionsGetIntOption(OPTIONS_TIMING))
-        endTimer(TQString("Parsing document %1").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data());
+        endTimer(TQString("Parsing document %1").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data());
 
     return doc;
 }
@@ -1032,12 +1032,12 @@ xsldbgLoadXmlTemporary(const xmlChar * path)
 #endif
         doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0);
     if (doc == NULL) {
-        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").tqarg(xsldbgUrl(path)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(path)));
     }
 
     if (optionsGetIntOption(OPTIONS_TIMING)
         && (xslDebugStatus != DEBUG_TQUIT)) {
-        endTimer(TQString("Parsing document %1").tqarg(xsldbgUrl(path)));
+        endTimer(TQString("Parsing document %1").arg(xsldbgUrl(path)));
     }
     return doc;
 }