From 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:51:43 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp')

diff --git a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
index a58d0168..10abbaf7 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
@@ -46,7 +46,7 @@ xslDbgEntities(void)
         int entityIndex;
         entityInfoPtr entInfo;
 
-        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
             /* notify that we are starting new list of entity names */
             notifyListStart(XSLDBG_MSG_ENTITIY_CHANGED);
             for (entityIndex = 0;
@@ -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");
@@ -111,22 +111,22 @@ xslDbgSystem(const xmlChar * arg)
     }
 
     name = xmlCatalogResolveSystem(arg);
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
         if (name) {
             notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, name);
             result = 1;
             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)));
         }
     }
 
@@ -158,22 +158,22 @@ xslDbgPublic(const xmlChar * arg)
     }
 
     name = xmlCatalogResolvePublic(arg);
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
         if (name) {
             notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, name);
             result = 1;
             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;
-- 
cgit v1.2.1