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

This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.

1 files changed, 20 insertions, 20 deletions

diff --git a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
index a3fffd41..67dbcbe8 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
@@ -25,7 +25,7 @@
 #include "arraylist.h"
 #include "breakpoint.h"
 #include "xsldbgmsg.h"
-#include "xsldbgthread.h"       /* for getThreadStatus */
+#include "xsldbgthread.h"       /* for getThreadtqStatus */
 #include "files.h"
 #include "options.h"
 
@@ -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").arg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(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").arg(xsldbgText(encoding)));
+            xsldbgGenericErrorFunc(i18n("Information: Temporarily setting document's encoding to UTF-8. Previously was %1.\n").tqarg(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").arg(xsldbgText(fileName)));
+	   xsldbgGenericErrorFunc(i18n("Error: Unable to save temporary results to %1.\n").tqarg(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").arg(xsldbgText(xPath)));
+	      xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(xPath)));
 	    }
 	    break;
 			     
@@ -268,7 +268,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){
 	    fprintf(file,"\n");	    
 
 	  } /* inner switch statement  */
-	  if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+	  if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
 	    fclose(file);
 	    file = NULL;
 	    /* send the data to application */
@@ -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").arg(xsldbgText(arg)));
+        xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(arg)));
     }
     ctxt->pctxt->node = NULL;
     return result;
@@ -403,7 +403,7 @@ xslDbgShellPrintNames(void *payload,
 {
     Q_UNUSED(payload);
     Q_UNUSED(data);
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         notifyListQueue(payload);
     } else if (payload && name) {
         xmlChar * fullQualifiedName = nodeViewBuffer;
@@ -415,19 +415,19 @@ xslDbgShellPrintNames(void *payload,
 		     item->nameURI, item->name);
 	}
         if (printVariableValue == 0){
-	    xsldbgGenericErrorFunc(i18n(" Global %1\n").arg(xsldbgText(fullQualifiedName)));
+	    xsldbgGenericErrorFunc(i18n(" Global %1\n").tqarg(xsldbgText(fullQualifiedName)));
         }else{
 	      if (item->computed == 1){
 	         xsldbgGenericErrorFunc(i18n(" Global "));
 		 printXPathObject(item->value, fullQualifiedName);
 	      }else if (item->tree){
-	         xsldbgGenericErrorFunc(i18n(" Global = %1\n").arg(xsldbgText(fullQualifiedName)));
+	         xsldbgGenericErrorFunc(i18n(" Global = %1\n").tqarg(xsldbgText(fullQualifiedName)));
 		 xslDbgCatToFile(item->tree, stderr);
 	      }else if (item->select){
-	         xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select)));
+	         xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select)));
 	      }else{
 		/* can't find a value give only a variable name an error message */
-		xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n")));
+		xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n")));
 	      }
 	    xsltGenericError(xsltGenericErrorContext, "\n\032\032\n");
         }
@@ -496,7 +496,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
         /* list variables of type requested */
         if (type == DEBUG_GLOBAL_VAR) {
             if (styleCtxt->globalVars) {
-                if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
                     notifyListStart(XSLDBG_MSG_GLOBALVAR_CHANGED);
                     /* list global variables */
                     xmlHashScan(styleCtxt->globalVars,
@@ -514,7 +514,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
                 if (optionsGetIntOption(OPTIONS_GDB) == 0)
                     xsltGenericError(xsltGenericErrorContext, "\n");
             } else {
-                if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
                     /* Don't show this message when running as a thread as it 
                      * is annoying */
                     xsldbgGenericErrorFunc(i18n("Error: Libxslt has not initialized variables yet; try stepping to a template.\n"));
@@ -528,7 +528,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
         } else {
             /* list local variables */
             if (styleCtxt->varsNr &&  styleCtxt->varsTab) {
-		if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+		if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
 		    notifyListStart(XSLDBG_MSG_LOCALVAR_CHANGED);
 		    for (int i = styleCtxt->varsNr; i > styleCtxt->varsBase; i--) {
 			    xsltStackElemPtr item = styleCtxt->varsTab[i-1];
@@ -553,19 +553,19 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
 								    item->nameURI, item->name);
 					    }
 					    if (printVariableValue == 0){
-						    xsldbgGenericErrorFunc(i18n(" Local %1").arg(xsldbgText(fullQualifiedName)));
+						    xsldbgGenericErrorFunc(i18n(" Local %1").tqarg(xsldbgText(fullQualifiedName)));
 					    }else{
 						    if (item->computed == 1){
 							    xsldbgGenericErrorFunc(i18n(" Local "));
 							    printXPathObject(item->value, fullQualifiedName);
 						    }else if (item->tree){
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n").arg(xsldbgText(fullQualifiedName)));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n").tqarg(xsldbgText(fullQualifiedName)));
 							    xslDbgCatToFile(item->tree, stderr);
 						    }else if (item->select){
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select)));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select)));
 						    }else{
 							    /* can't find a value give only a variable name and an error */
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n")));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n")));
 						    }
 					    }
 					    xsltGenericError(xsltGenericErrorContext, "\n\032\032\n");
@@ -577,7 +577,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
                 result = 1;
                 xsltGenericError(xsltGenericErrorContext, "\n");
             } else {
-                if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
                     /* Don't show this message when running as a thread as it 
                      * is annoying */
                     xsldbgGenericErrorFunc(i18n("Error: Libxslt has not initialized variables yet; try stepping past the xsl:param elements in the template.\n"));