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/option_cmds.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
index 05ca9a4c..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;
@@ -137,13 +137,13 @@ xslDbgShellOptions(void)
     const xmlChar *optionName, *optionValue;
 
     /* Print out the integer options and thier values */
-    if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
         for (optionIndex = OPTIONS_XINCLUDE;
              optionIndex <= OPTIONS_VERBOSE; optionIndex++) {
             /* 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;
-- 
cgit v1.2.1