diff options
Diffstat (limited to 'kxsldbg/kxsldbgpart/libxsldbg')
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp | 8 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp | 4 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp | 14 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp | 6 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp | 14 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp | 2 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/options.cpp | 2 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp | 2 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp | 12 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp | 16 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp | 22 | ||||
-rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h | 8 |
12 files changed, 55 insertions, 55 deletions
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp index 1e403aa6..9d53055e 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp @@ -621,7 +621,7 @@ breakPointPrint(breakPointPtr breakPtr) }; const char *breakTemplate=""; const char *breakMode = ""; - const char *breaktqStatus; + const char *breakStatus; if (!breakPtr) @@ -634,11 +634,11 @@ breakPointPrint(breakPointPtr breakPtr) } - breaktqStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED]; + breakStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED]; if (breakPtr->url) - xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").tqarg(breakPtr->id).tqarg(i18n(breaktqStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)).tqarg(xsldbgUrl(breakPtr->url)).tqarg(breakPtr->lineNo)); + xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").tqarg(breakPtr->id).tqarg(i18n(breakStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)).tqarg(xsldbgUrl(breakPtr->url)).tqarg(breakPtr->lineNo)); else - xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").tqarg(breakPtr->id).tqarg(i18n(breaktqStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode))); + xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").tqarg(breakPtr->id).tqarg(i18n(breakStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode))); return ++result; } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp index a301aa8a..17cf01a2 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp @@ -23,7 +23,7 @@ #include <libxml/valid.h> /* needed for xmlSplitQName2 */ #include <libxml/xpathInternals.h> /* needed for xmlNSLookup */ #include <libxml/uri.h> /* needed for xmlURIEscapeStr */ -#include "xsldbgthread.h" /* for getThreadtqStatus() */ +#include "xsldbgthread.h" /* for getThreadStatus() */ #include "xsldbgmsg.h" #include "options.h" @@ -893,7 +893,7 @@ xslDbgShellPrintBreakPoint(void *payload, void *data, Q_UNUSED(name); if (payload) { - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListQueue(payload); } else { printCount++; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp index 54790e2c..ec081ab6 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp @@ -594,7 +594,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, ctxt->node = list->nodesetval->nodeTab[0]; /* tell the application about the new line * number we are looking at */ - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { int breakpoint = 0; xsldbgUpdateFileDetails(ctxt->node); @@ -640,7 +640,7 @@ xslDbgPrintCallStack(const xmlChar * arg) callPointPtr callPointItem; if (arg == NULL) { - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_CALLSTACK_CHANGED); /* we send the oldest frame stack first */ for (depth = 1; depth <= callStackGetDepth(); depth++) { @@ -740,7 +740,7 @@ xslDbgPrintCallStack(const xmlChar * arg) long templateDepth = atol((char *) arg); - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { /* should never happen but just in case, when running as a * thread always provide NO params to the where command */ #ifdef WITH_XSLDBG_DEBUG_PROCESS @@ -1277,7 +1277,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, /* If using a thread and the thread is running then we don't need to * send this as the application will see the XSLDBG_MSG_LINE_CHANGED message */ - if ((getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED) || + if ((getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED) || (xslDebugStatus == DEBUG_TRACE)) { TQString messageTxt; if (!nextCommandActive && ctxt->node && ctxt->node && ctxt->node->doc @@ -1347,7 +1347,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, } while (!exitShell && (xslDebugStatus != DEBUG_TQUIT)) { - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { if (ctxt->node == (xmlNodePtr) ctxt->doc) snprintf((char *) prompt, DEBUG_BUFFER_SIZE - 1, "(xsldbg) %s > ", "/"); @@ -1548,7 +1548,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, case DEBUG_WHERE_CMD: /* Print the current working directory as well */ xslDbgPrintCallStack(NULL); - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { if (!xmlShellPwd(ctxt, (char *) dir, ctxt->node, NULL)){ xsldbgGenericErrorFunc((const char*)dir); xsldbgGenericErrorFunc("\n"); @@ -1597,7 +1597,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; case DEBUG_SHOWBREAK_CMD: - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_BREAKPOINT_CHANGED); walkBreakPoints((xmlHashScanner) xslDbgShellPrintBreakPoint, NULL); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp index a58d0168..3f8d2e29 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; @@ -111,7 +111,7 @@ 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; @@ -158,7 +158,7 @@ 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; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp index 67dbcbe8..759ed2ac 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 getThreadtqStatus */ +#include "xsldbgthread.h" /* for getThreadStatus */ #include "files.h" #include "options.h" @@ -268,7 +268,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){ fprintf(file,"\n"); } /* inner switch statement */ - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { fclose(file); file = NULL; /* send the data to application */ @@ -403,7 +403,7 @@ xslDbgShellPrintNames(void *payload, { Q_UNUSED(payload); Q_UNUSED(data); - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListQueue(payload); } else if (payload && name) { xmlChar * fullQualifiedName = nodeViewBuffer; @@ -496,7 +496,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, /* list variables of type requested */ if (type == DEBUG_GLOBAL_VAR) { if (styleCtxt->globalVars) { - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == 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 (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() != 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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_LOCALVAR_CHANGED); for (int i = styleCtxt->varsNr; i > styleCtxt->varsBase; i--) { xsltStackElemPtr item = styleCtxt->varsTab[i-1]; @@ -577,7 +577,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, result = 1; xsltGenericError(xsltGenericErrorContext, "\n"); } else { - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() != 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")); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp index 05ca9a4c..6f269143 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp @@ -137,7 +137,7 @@ 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 */ diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp index d2d51fe5..84aa7f88 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp @@ -530,7 +530,7 @@ optionsPrintParamList(void) int paramIndex = 0; int itemCount = arrayListCount(optionsGetParamItemList()); - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { if (itemCount > 0) { while (result && (paramIndex < itemCount)) { result = optionsPrintParam(paramIndex++); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp index 52563725..85c17d59 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp @@ -145,7 +145,7 @@ xslDbgShellShowParam(xmlChar * arg) int result = 0; static const char *errorPrompt = I18N_NOOP("Unable to print parameters"); - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { int paramIndex = 0; int itemCount = arrayListCount(optionsGetParamItemList()); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp index 1f0a3663..7283fca5 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 getThreadtqStatus */ +#include "xsldbgthread.h" /* for getThreadStatus */ static int printCounter; /* Dangerous name think of a better one */ @@ -127,7 +127,7 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose, } else { xmlChar *modeTemp = NULL; *count = *count + 1; - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListQueue(templ); } else { modeTemp = fullTQName(templ->modeURI, templ->mode); @@ -196,7 +196,7 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt, curStyle = NULL; } - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_TEMPLATE_CHANGED); while (curStyle) { templ = curStyle->templates; @@ -254,7 +254,7 @@ xslDbgShellPrintStylesheetsHelper(void *payload, xsltStylesheetPtr style = (xsltStylesheetPtr) payload; if (style && style->doc && style->doc->URL) { - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) notifyListQueue(payload); else /* display the URL of stylesheet */ @@ -283,7 +283,7 @@ xslDbgShellPrintStylesheetsHelper2(void *payload, xmlNodePtr node = (xmlNodePtr) payload; if (node && node->doc && node->doc->URL) { - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) notifyListQueue(payload); else /* display the URL of stylesheet */ @@ -307,7 +307,7 @@ xslDbgShellPrintStyleSheets(xmlChar * arg) { Q_UNUSED(arg); printCounter = 0; - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_SOURCE_CHANGED); walkStylesheets((xmlHashScanner) xslDbgShellPrintStylesheetsHelper, NULL, filesGetStylesheet()); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 241d9730..76981f5a 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -42,7 +42,7 @@ #include <libxml/xmlerror.h> #include "xsldbgmsg.h" -#include "xsldbgthread.h" /* for getThreadtqStatus */ +#include "xsldbgthread.h" /* for getThreadStatus */ #ifdef HAVE_READLINE # include <readline/readline.h> # ifdef HAVE_HISTORY @@ -380,7 +380,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) if (terminalIO != NULL) res = xsltProfileStylesheet(cur, doc, params, terminalIO); else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) == - NULL) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) + NULL) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) || (filesTempFileName(1) == NULL)) res = xsltProfileStylesheet(cur, doc, params, stderr); else { @@ -429,7 +429,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) if (terminalIO != NULL) xmlDebugDumpDocument(terminalIO, res); else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) == - NULL) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) + NULL) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) || (filesTempFileName(1) == NULL)) xmlDebugDumpDocument(stdout, res); else { @@ -532,7 +532,7 @@ xsldbgMain(int argc, char **argv) xmlDocPtr doc; KCmdLineArgs *args = 0; - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED) + if (getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED) args = KCmdLineArgs::parsedArgs(); errorFile = stderr; @@ -619,7 +619,7 @@ xsldbgMain(int argc, char **argv) } } - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED){ + if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED){ result = optionsSetIntOption(OPTIONS_SHELL, 1); } /* copy the volitile options over to xsldbg */ @@ -1097,7 +1097,7 @@ handler_routine(DWORD dwCtrlType) void xsldbgStructErrorHandler(void * userData, xmlErrorPtr error) { if (error && error->message && (error->level >= 0) && (error->level <= 4)){ - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN){ + if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN){ static const char *msgPrefix[4 + 1] = {"", "warning :", "error:", "fatal:"}; if (error->file) xsltGenericError(xsltGenericErrorContext, "%s%s in file \"%s\" line %d", msgPrefix[error->level], error->message, error->file, error->line); @@ -1240,7 +1240,7 @@ xsldbgInit() xmlDefaultSAXHandlerInit(); xmlDefaultSAXHandler.cdataBlock = NULL; - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED) { + if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED) { initialized = 1; return 1; /* this is all we need to do when running as a thread */ } @@ -1310,7 +1310,7 @@ xsldbgGenericErrorFunc(void *ctx, const char *msg, ...) Q_UNUSED(ctx); va_start(args, msg); - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { vsnprintf(msgBuffer, sizeof(msgBuffer), msg, args); notifyTextXsldbgApp(XSLDBG_MSG_TEXTOUT, msgBuffer); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp index 4fb4a6c9..c95ad640 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp @@ -25,8 +25,8 @@ #include "xsldbgthread.h" static void (*cleanupFuncPtr)(void) = 0; -static int threadtqStatus = XSLDBG_MSG_THREAD_NOTUSED; -static int inputtqStatus = XSLDBG_MSG_AWAITING_INPUT; +static int threadStatus = XSLDBG_MSG_THREAD_NOTUSED; +static int inputStatus = XSLDBG_MSG_AWAITING_INPUT; /* is xsldbg ready for input from the application */ static int inputReady = 0; @@ -53,19 +53,19 @@ setAppReady(int ready) /* the compiler will optimize this function to inline and to keep variable private*/ int -getInputtqStatus(void) +getInputStatus(void) { - return inputtqStatus; + return inputStatus; } void -setInputtqStatus(XsldbgMessageEnum type) +setInputStatus(XsldbgMessageEnum type) { switch (type) { case XSLDBG_MSG_AWAITING_INPUT: /* Waiting for user input */ case XSLDBG_MSG_READ_INPUT: /* Read user input */ case XSLDBG_MSG_PROCESSING_INPUT: /* Processing user's request */ - inputtqStatus = type; + inputStatus = type; break; default: @@ -76,26 +76,26 @@ setInputtqStatus(XsldbgMessageEnum type) /* the compiler will optimize this function to inline and to keep variable private*/ int -getThreadtqStatus(void) +getThreadStatus(void) { - return threadtqStatus; + return threadStatus; } /* reset the status to @p type */ void -setThreadtqStatus(XsldbgMessageEnum type) +setThreadStatus(XsldbgMessageEnum type) { switch (type) { case XSLDBG_MSG_THREAD_NOTUSED: case XSLDBG_MSG_THREAD_INIT: case XSLDBG_MSG_THREAD_RUN: - threadtqStatus = type; + threadStatus = type; break; case XSLDBG_MSG_THREAD_STOP: case XSLDBG_MSG_THREAD_DEAD: xslDebugStatus = DEBUG_TQUIT; - threadtqStatus = type; + threadStatus = type; break; default: diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h index 00802843..d83e71f3 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h @@ -40,13 +40,13 @@ extern "C" { void setAppReady(int ready); - int getInputtqStatus(void); + int getInputStatus(void); - void setInputtqStatus(XsldbgMessageEnum type); + void setInputStatus(XsldbgMessageEnum type); - int getThreadtqStatus(void); + int getThreadStatus(void); - void setThreadtqStatus(XsldbgMessageEnum type); + void setThreadStatus(XsldbgMessageEnum type); void *xsldbgThreadMain(void *data); |