TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

diff --git a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
index 261c0ebe..1f0a3663 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
@@ -21,7 +21,7 @@
 #include "files.h"
 #include "utils.h"
 #include "xsldbgmsg.h"
-#include "xsldbgthread.h"       /* for getThreadStatus */
+#include "xsldbgthread.h"       /* for getThreadtqStatus */
 
 static int printCounter;        /* Dangerous name think of a better one */
 
@@ -117,7 +117,7 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose,
       if (templ->match)
 	name = xmlStrdup(templ->match);
       else
-	name = fullQName(templ->nameURI, templ->name);
+	name = fullTQName(templ->nameURI, templ->name);
 
       if (name) {
 	if (templateName &&
@@ -127,14 +127,14 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose,
 	} else {
 	  xmlChar *modeTemp = NULL;
 	  *count = *count + 1;
-	  if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+	  if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
 	    notifyListQueue(templ);
 	  } else {
-	    modeTemp = fullQName(templ->modeURI, templ->mode);
+	    modeTemp = fullTQName(templ->modeURI, templ->mode);
 	    if (verbose)
-	      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)));
+	      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)));
 	    else
-	       xsldbgGenericErrorFunc(TQString("\"%s\" ").arg(xsldbgText(name)));
+	       xsldbgGenericErrorFunc(TQString("\"%s\" ").tqarg(xsldbgText(name)));
 	    if (modeTemp)
 	      xmlFree(modeTemp);
 	  }
@@ -196,7 +196,7 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt,
             curStyle = NULL;
     }
 
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         notifyListStart(XSLDBG_MSG_TEMPLATE_CHANGED);
         while (curStyle) {
             templ = curStyle->templates;
@@ -254,11 +254,11 @@ xslDbgShellPrintStylesheetsHelper(void *payload,
     xsltStylesheetPtr style = (xsltStylesheetPtr) payload;
 
     if (style && style->doc && style->doc->URL) {
-        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
+        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
             notifyListQueue(payload);
         else
 	    /* display the URL of stylesheet  */
-	    xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(style->doc->URL)));
+	    xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(style->doc->URL)));
         printCounter++;
     }
 }
@@ -283,11 +283,11 @@ xslDbgShellPrintStylesheetsHelper2(void *payload,
     xmlNodePtr node = (xmlNodePtr) payload;
 
     if (node && node->doc && node->doc->URL) {
-        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
+        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
             notifyListQueue(payload);
         else
 	    /* display the URL of stylesheet  */
-	     xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(node->doc->URL)));
+	     xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(node->doc->URL)));
         printCounter++;
     }
 }
@@ -307,7 +307,7 @@ xslDbgShellPrintStyleSheets(xmlChar * arg)
 {
     Q_UNUSED(arg);
     printCounter = 0;
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         notifyListStart(XSLDBG_MSG_SOURCE_CHANGED);
         walkStylesheets((xmlHashScanner) xslDbgShellPrintStylesheetsHelper,
                         NULL, filesGetStylesheet());