From 25b9a0f723f946fedcefbddedca3d56b9a970123 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 01:31:42 -0500 Subject: Fix inadvertent "TQ" changes. (cherry picked from commit 9c988982374089f3b1d01ce87ffc230372ebc414) --- kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h | 4 ++-- kxsldbg/kxsldbgpart/libxsldbg/cmds.h | 4 ++-- kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp | 12 ++++++------ kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp | 12 ++++++------ kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp | 12 ++++++------ kxsldbg/kxsldbgpart/libxsldbg/utils.h | 4 ++-- kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp | 24 ++++++++++++------------ kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp | 2 +- 8 files changed, 37 insertions(+), 37 deletions(-) (limited to 'kxsldbg/kxsldbgpart/libxsldbg') diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h index 040af24e..83f2e712 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h @@ -61,7 +61,7 @@ extern "C" { DEBUG_CONT, DEBUG_RUN, DEBUG_RUN_RESTART, - DEBUG_TQUIT, + DEBUG_QUIT, DEBUG_TRACE, DEBUG_WALK } DebugStatusEnum; @@ -107,7 +107,7 @@ extern "C" { DEBUG_CONT, DEBUG_RUN, DEBUG_RUN_RESTART, - DEBUG_TQUIT, + DEBUG_QUIT, DEBUG_TRACE, DEBUG_WALK }; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h index 08a7635b..f12648c7 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h @@ -26,7 +26,7 @@ typedef enum { /* id's for commands of xslDbgShell */ DEBUG_HELP_CMD = 100, DEBUG_BYE_CMD, DEBUG_EXIT_CMD, - DEBUG_TQUIT_CMD, + DEBUG_QUIT_CMD, DEBUG_STEP_CMD, DEBUG_STEPUP_CMD, @@ -113,7 +113,7 @@ enum CommandsEnum { /* id's for commands of xslDbgShell */ DEBUG_HELP_CMD = 100, DEBUG_BYE_CMD, DEBUG_EXIT_CMD, - DEBUG_TQUIT_CMD, + DEBUG_QUIT_CMD, DEBUG_STEP_CMD, DEBUG_STEPUP_CMD, diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp index b7a82adc..50107247 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp @@ -545,7 +545,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, pctxt = xmlXPathNewContext(source->doc); if (pctxt == NULL) { xmlFree(ctxt); - /* xslDebugStatus = DEBUG_TQUIT; */ + /* xslDebugStatus = DEBUG_QUIT; */ return result; } if (!xmlXPathNsLookup(pctxt, (xmlChar *) "xsl")) @@ -1346,7 +1346,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, xsldbgGenericErrorFunc("\n"); } - while (!exitShell && (xslDebugStatus != DEBUG_TQUIT)) { + while (!exitShell && (xslDebugStatus != DEBUG_QUIT)) { if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { if (ctxt->node == (xmlNodePtr) ctxt->doc) snprintf((char *) prompt, DEBUG_BUFFER_SIZE - 1, @@ -1464,9 +1464,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, /* --- Running related commands --- */ case DEBUG_BYE_CMD: case DEBUG_EXIT_CMD: - case DEBUG_TQUIT_CMD: + case DEBUG_QUIT_CMD: /* allow the stylesheet to exit */ - xslDebugStatus = DEBUG_TQUIT; + xslDebugStatus = DEBUG_QUIT; exitShell++; cmdResult = 1; break; @@ -1782,7 +1782,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, NULL); if (ctxt->pctxt == NULL) { xmlFree(ctxt); - xslDebugStatus = DEBUG_TQUIT; + xslDebugStatus = DEBUG_QUIT; return; } else break; @@ -1822,7 +1822,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, NULL); if (ctxt->pctxt == NULL) { xmlFree(ctxt); - xslDebugStatus = DEBUG_TQUIT; + xslDebugStatus = DEBUG_QUIT; return; } else break; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp index be5ec1d1..db06ad2f 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp @@ -65,8 +65,8 @@ helpTop(const xmlChar * args) int result = 0; if (xmlStrLen(args) > 0) { - snprintf(helpParam, 100, "--param help:%c'%s'%c", TQUOTECHAR, args, - TQUOTECHAR); + snprintf(helpParam, 100, "--param help:%c'%s'%c", QUOTECHAR, args, + QUOTECHAR); } else xmlStrCpy(helpParam, ""); if (docsDirPath && filesTempFileName(0)) { @@ -79,10 +79,10 @@ helpTop(const xmlChar * args) " --cd %s " "xsldbghelp.xsl xsldbghelp.xml", XSLDBG_BIN, helpParam, - TQUOTECHAR, VERSION, TQUOTECHAR, - TQUOTECHAR, xsldbgVerTxt.utf8().data(), TQUOTECHAR, - TQUOTECHAR, helpDocVerTxt.utf8().data(), TQUOTECHAR, - TQUOTECHAR, helpErrorTxt.utf8().data(), TQUOTECHAR, + QUOTECHAR, VERSION, QUOTECHAR, + QUOTECHAR, xsldbgVerTxt.utf8().data(), QUOTECHAR, + QUOTECHAR, helpDocVerTxt.utf8().data(), QUOTECHAR, + QUOTECHAR, helpErrorTxt.utf8().data(), QUOTECHAR, filesTempFileName(0), docsDirPath); if (xslDbgShellExecute((xmlChar *) buff, optionsGetIntOption(OPTIONS_VERBOSE)) == 0) { diff --git a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp index a3fffd41..5fcbef00 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp @@ -338,16 +338,16 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, { xmlXPathObjectPtr list; int result = 0; - static const char * TQUIET_STR = "-q"; + static const char * QUIET_STR = "-q"; bool silenceCtxtErrors = false; if ((arg == NULL) || (xmlStrLen(arg) == 0)) arg = (xmlChar *) "."; /* Do we quietly ingore style context errors */ - if (strncasecmp((char*)arg, TQUIET_STR, strlen(TQUIET_STR))== 0){ + if (strncasecmp((char*)arg, QUIET_STR, strlen(QUIET_STR))== 0){ silenceCtxtErrors = true; - arg = arg + strlen(TQUIET_STR); + arg = arg + strlen(QUIET_STR); while (isspace(*arg)){ arg++; } @@ -457,7 +457,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, /* command argument to include both name and its value */ static const char * FULLNAME_STR = "-f"; /* Quietly exit if an invalid stylesheet is provided */ - static const char * TQUIET_STR = "-q"; + static const char * QUIET_STR = "-q"; bool silenceCtxtErrors = false; if (!arg) { @@ -470,9 +470,9 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, varCount = 0; /* Do we quietly ingore style context errors */ - if (strncasecmp((char*)arg, TQUIET_STR, strlen(TQUIET_STR))== 0){ + if (strncasecmp((char*)arg, QUIET_STR, strlen(QUIET_STR))== 0){ silenceCtxtErrors = true; - arg = arg + strlen(TQUIET_STR); + arg = arg + strlen(QUIET_STR); while (isspace(*arg)){ arg++; } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/utils.h b/kxsldbg/kxsldbgpart/libxsldbg/utils.h index 7791923b..28b297b0 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/utils.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/utils.h @@ -61,10 +61,10 @@ extern "C" { /* Handle the differences in path and quote character between * win32 and *nix systems */ #ifdef WIN32 -#define TQUOTECHAR ' ' +#define QUOTECHAR ' ' #define PATHCHAR '\\' #else -#define TQUOTECHAR '\"' +#define QUOTECHAR '\"' #define PATHCHAR '/' #endif diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 1b1a6407..52066acf 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -455,7 +455,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) if (cur->methodURI == NULL) { if (optionsGetIntOption(OPTIONS_TIMING)) startTimer(); - if (xslDebugStatus != DEBUG_TQUIT) { + if (xslDebugStatus != DEBUG_QUIT) { if (terminalIO != NULL) bytesWritten = xsltSaveResultToFile(terminalIO, res, cur); else if (optionsGetStringOption @@ -719,7 +719,7 @@ xsldbgMain(int argc, char **argv) debugGotControl(0); - while (xslDebugStatus != DEBUG_TQUIT) { + while (xslDebugStatus != DEBUG_QUIT) { xsldbgReachedFirstTemplate = false; /* don't force xsldbg to show command prompt */ showPrompt = 0; @@ -765,7 +765,7 @@ xsldbgMain(int argc, char **argv) /*goto a xsldbg command prompt */ showPrompt = 1; if (xslDebugStatus == DEBUG_NONE) { - xslDebugStatus = DEBUG_TQUIT; /* panic !! */ + xslDebugStatus = DEBUG_QUIT; /* panic !! */ result = 0; } } @@ -776,21 +776,21 @@ xsldbgMain(int argc, char **argv) doc = filesGetMainDoc(); if (doc == NULL) { if (xslDebugStatus == DEBUG_NONE) { - xslDebugStatus = DEBUG_TQUIT; /* panic !! */ + xslDebugStatus = DEBUG_QUIT; /* panic !! */ result = 0; } else { /*goto a xsldbg command prompt */ showPrompt = 1; } } else { - if (xslDebugStatus != DEBUG_TQUIT) { + if (xslDebugStatus != DEBUG_QUIT) { xsltProcess(doc, cur); result = 1; } } if (optionsGetIntOption(OPTIONS_SHELL) && (showPrompt == 0)) { - if ((xslDebugStatus != DEBUG_TQUIT) + if ((xslDebugStatus != DEBUG_QUIT) && !debugGotControl(-1)) { xsldbgGenericErrorFunc(i18n("\nDebugger never received control.\n")); /*goto a xsldbg command prompt */ @@ -831,12 +831,12 @@ xsldbgMain(int argc, char **argv) } } else { /* request to execute stylesheet only so we're done */ - xslDebugStatus = DEBUG_TQUIT; + xslDebugStatus = DEBUG_QUIT; } } else { /* Some sort of problem loading source file has occured. Quit? */ if (xslDebugStatus == DEBUG_NONE) { - xslDebugStatus = DEBUG_TQUIT; /* Panic!! */ + xslDebugStatus = DEBUG_QUIT; /* Panic!! */ result = 0; } else { /*goto a xsldbg command prompt */ @@ -872,7 +872,7 @@ xsldbgMain(int argc, char **argv) } xmlFreeDoc(tempDoc); } else if (showPrompt && !optionsGetIntOption(OPTIONS_SHELL)) { - xslDebugStatus = DEBUG_TQUIT; + xslDebugStatus = DEBUG_QUIT; result = 0; /* panic */ } @@ -917,7 +917,7 @@ xsldbgLoadStylesheet() cur = NULL; if (!optionsGetIntOption(OPTIONS_SHELL)) { xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n")); - xslDebugStatus = DEBUG_TQUIT; + xslDebugStatus = DEBUG_QUIT; } else { xsltGenericError(xsltGenericErrorContext, "\n"); xslDebugStatus = DEBUG_STOP; @@ -991,7 +991,7 @@ xsldbgLoadXmlData(void) 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; + xslDebugStatus = DEBUG_QUIT; } else { xsltGenericError(xsltGenericErrorContext, "\n"); xslDebugStatus = DEBUG_STOP; @@ -1036,7 +1036,7 @@ xsldbgLoadXmlTemporary(const xmlChar * path) } if (optionsGetIntOption(OPTIONS_TIMING) - && (xslDebugStatus != DEBUG_TQUIT)) { + && (xslDebugStatus != DEBUG_QUIT)) { endTimer(TQString("Parsing document %1").arg(xsldbgUrl(path))); } return doc; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp index c95ad640..ecb94052 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp @@ -94,7 +94,7 @@ setThreadStatus(XsldbgMessageEnum type) case XSLDBG_MSG_THREAD_STOP: case XSLDBG_MSG_THREAD_DEAD: - xslDebugStatus = DEBUG_TQUIT; + xslDebugStatus = DEBUG_QUIT; threadStatus = type; break; -- cgit v1.2.1