From 9445f97b426e97c6ce46de18fba4030da45d56df Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:36:38 -0600 Subject: Rename old tq methods that no longer need a unique name --- kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp | 6 ++-- kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp | 40 +++++++++++------------ kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp | 8 ++--- kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp | 4 +-- kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp | 14 ++++---- kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp | 6 ++-- kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp | 14 ++++---- kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp | 2 +- kxsldbg/kxsldbgpart/libxsldbg/options.cpp | 2 +- kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp | 2 +- kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp | 12 +++---- kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp | 16 ++++----- kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp | 22 ++++++------- kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h | 8 ++--- kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui | 20 ++++++------ kxsldbg/kxsldbgpart/xsldbgcallstack.ui | 4 +-- kxsldbg/kxsldbgpart/xsldbgconfig.ui | 20 ++++++------ kxsldbg/kxsldbgpart/xsldbgdebugger.cpp | 6 ++-- kxsldbg/kxsldbgpart/xsldbgentities.ui | 6 ++-- kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui | 10 +++--- kxsldbg/kxsldbgpart/xsldbglocalvariables.ui | 10 +++--- kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui | 6 ++-- kxsldbg/kxsldbgpart/xsldbgoutputview.cpp | 2 +- kxsldbg/kxsldbgpart/xsldbgsources.ui | 4 +-- kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui | 12 +++---- 25 files changed, 128 insertions(+), 128 deletions(-) (limited to 'kxsldbg/kxsldbgpart') diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp index 98c4ea95..0db9d1f0 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp +++ b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp @@ -27,12 +27,12 @@ XsldbgDebuggerBase *_debugger = 0L; int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data) { int result = 0; - if (::getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED){ + if (::getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED){ return 1; } /* clear the input ready flag as quickly as possible*/ - if ( ::getInputtqStatus() == XSLDBG_MSG_READ_INPUT) + if ( ::getInputStatus() == XSLDBG_MSG_READ_INPUT) ::setInputReady(0); /* state of the thread */ @@ -45,7 +45,7 @@ int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data) } } - if (::getThreadtqStatus() == XSLDBG_MSG_THREAD_STOP) + if (::getThreadStatus() == XSLDBG_MSG_THREAD_STOP) ::xsldbgThreadCleanup(); /* thread has died so cleanup after it */ result++; /* at the moment this function will always work */ diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp index 1f997919..4fe2e02c 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp +++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp @@ -83,7 +83,7 @@ xsldbgThreadInit(void) int result = 0; fprintf(stderr, "mainInit()\n"); xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); - setThreadtqStatus(XSLDBG_MSG_THREAD_INIT); + setThreadStatus(XSLDBG_MSG_THREAD_INIT); xsldbgSetAppFunc(qtNotifyXsldbgApp); xsldbgSetAppStateFunc(qtNotifyStateXsldbgApp); xsldbgSetTextFunc(qtNotifyTextXsldbgApp); @@ -94,12 +94,12 @@ xsldbgThreadInit(void) if (pthread_create(&mythread, NULL, xsldbgThreadMain, NULL) != EAGAIN) { int counter; for (counter = 0; counter < 11; counter++){ - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_INIT) + if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT) break; usleep(250000); /*guess that it will take at most 2.5 seconds to startup */ } /* xsldbg should have started by now if it can */ - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){ + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){ fprintf(stderr, "Created thread\n"); result++; }else @@ -117,13 +117,13 @@ void xsldbgThreadFree(void) { fprintf(stderr, "xsldbgThreadFree()\n"); - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_DEAD) + if (getThreadStatus() != XSLDBG_MSG_THREAD_DEAD) { int counter; fprintf(stderr, "Killing xsldbg thread\n"); - setThreadtqStatus(XSLDBG_MSG_THREAD_STOP); + setThreadStatus(XSLDBG_MSG_THREAD_STOP); for (counter = 0; counter < 11; counter++){ - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_DEAD) + if (getThreadStatus() == XSLDBG_MSG_THREAD_DEAD) break; usleep(250000); /*guess that it will take at most 2.5 seconds to stop */ } @@ -143,7 +143,7 @@ fakeInput(const char *text) { int result = 0; - if (!text || (getInputReady() == 1) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)) + if (!text || (getInputReady() == 1) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)) return result; // fprintf(stderr, "\nFaking input of \"%s\"\n", text); @@ -172,7 +172,7 @@ qtXslDbgShellReadline(xmlChar * prompt) static char last_read[DEBUG_BUFFER_SIZE] = { '\0' }; - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) + if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { #ifdef HAVE_READLINE xmlChar *line_read; @@ -209,20 +209,20 @@ qtXslDbgShellReadline(xmlChar * prompt) } else{ - setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT); + setInputStatus(XSLDBG_MSG_AWAITING_INPUT); notifyXsldbgApp(XSLDBG_MSG_AWAITING_INPUT, NULL); while (getInputReady() == 0){ usleep(10000); /* have we been told to die */ - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_STOP){ + if (getThreadStatus() == XSLDBG_MSG_THREAD_STOP){ fprintf(stderr, "About to stop thread\n"); xslDebugStatus = DEBUG_TQUIT; return NULL; } } - setInputtqStatus(XSLDBG_MSG_READ_INPUT); + setInputStatus(XSLDBG_MSG_READ_INPUT); inputReadBuff = getFakeInput(); if(inputReadBuff){ notifyXsldbgApp(XSLDBG_MSG_READ_INPUT, inputReadBuff); @@ -283,7 +283,7 @@ xsldbgThreadMain(void *) // char *defaultArgv[2]; // int i; - if (getThreadtqStatus() != XSLDBG_MSG_THREAD_INIT){ + if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT){ fprintf(stderr, "xsldbg thread is not ready to be started. Or one is already running.\n"); return NULL; /* we can't start more than one thread of xsldbg */ } @@ -302,8 +302,8 @@ xsldbgThreadMain(void *) } */ xsldbgSetThreadCleanupFunc(xsldbgThreadCleanupTQt); - setThreadtqStatus(XSLDBG_MSG_THREAD_RUN); - setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT); + setThreadStatus(XSLDBG_MSG_THREAD_RUN); + setInputStatus(XSLDBG_MSG_AWAITING_INPUT); fprintf(stderr, "Starting thread\n"); /* call the "main of xsldbg" found in debugXSL.c */ @@ -316,8 +316,8 @@ xsldbgThreadMain(void *) } */ - setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD); - setInputtqStatus(XSLDBG_MSG_PROCESSING_INPUT); + setThreadStatus(XSLDBG_MSG_THREAD_DEAD); + setInputStatus(XSLDBG_MSG_PROCESSING_INPUT); notifyXsldbgApp(XSLDBG_MSG_THREAD_DEAD, NULL); return NULL; } @@ -330,12 +330,12 @@ void xsldbgThreadCleanupTQt(void) { fprintf(stderr, "Thread has finished\n"); - if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) + if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { xsldbgThreadFree(); } - /* its safe to modify threadtqStatus as the thread is now dead */ - setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD); + /* its safe to modify threadStatus as the thread is now dead */ + setThreadStatus(XSLDBG_MSG_THREAD_DEAD); } @@ -346,7 +346,7 @@ xsldbgThreadStdoutReader(void *data) if (!stdoutIO) return data; - while (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){ + while (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){ if (fgets(outputBuffer, sizeof(outputBuffer -1), stdoutIO)){ usleep(10000); strcat(outputBuffer, "\n"); 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 /* needed for xmlSplitQName2 */ #include /* needed for xmlNSLookup */ #include /* 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 #include "xsldbgmsg.h" -#include "xsldbgthread.h" /* for getThreadtqStatus */ +#include "xsldbgthread.h" /* for getThreadStatus */ #ifdef HAVE_READLINE # include # 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); diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui index c24fe29e..d7914768 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui @@ -188,7 +188,7 @@ 0 - + 60 32767 @@ -208,7 +208,7 @@ Expanding - + 20 20 @@ -243,7 +243,7 @@ 0 - + 60 32767 @@ -263,7 +263,7 @@ Expanding - + 20 20 @@ -313,7 +313,7 @@ Fixed - + 81 20 @@ -330,7 +330,7 @@ Expanding - + 20 20 @@ -349,7 +349,7 @@ Fixed - + 20 20 @@ -442,7 +442,7 @@ Fixed - + 20 20 @@ -473,7 +473,7 @@ Expanding - + 20 20 @@ -498,7 +498,7 @@ Expanding - + 20 20 diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui index d4fad88d..d1fdba5c 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui +++ b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui @@ -99,7 +99,7 @@ Expanding - + 20 20 @@ -124,7 +124,7 @@ Expanding - + 20 20 diff --git a/kxsldbg/kxsldbgpart/xsldbgconfig.ui b/kxsldbg/kxsldbgpart/xsldbgconfig.ui index e146a93b..4c27e52b 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfig.ui +++ b/kxsldbg/kxsldbgpart/xsldbgconfig.ui @@ -21,7 +21,7 @@ 0 - + 300 450 @@ -52,7 +52,7 @@ Expanding - + 20 16 @@ -192,7 +192,7 @@ Expanding - + 20 20 @@ -289,7 +289,7 @@ Expanding - + 20 20 @@ -310,7 +310,7 @@ Expanding - + 20 16 @@ -341,7 +341,7 @@ Expanding - + 20 20 @@ -360,7 +360,7 @@ 0 - + 110 0 @@ -382,7 +382,7 @@ 0 - + 110 0 @@ -402,7 +402,7 @@ Expanding - + 20 20 @@ -421,7 +421,7 @@ Expanding - + 20 16 diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp index 7a4f4960..deead4fa 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp @@ -98,14 +98,14 @@ void XsldbgDebugger::timerEvent(TQTimerEvent *e) if (e == 0L || (e->timerId() != updateTimerID)) return; - if ((getInputReady() == 0) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT) && + if ((getInputReady() == 0) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT) && (commandQue.count() > 0)){ TQString msg = commandQue.first(); commandQue.remove(msg); ::fakeInput((const char*)msg.utf8()); } - if ((!updateText.isEmpty()) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT)){ + if ((!updateText.isEmpty()) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT)){ /* flush remainding text to message window */ TQString msgCopy = updateText; updateText = ""; @@ -199,7 +199,7 @@ bool XsldbgDebugger::start() bool XsldbgDebugger::stop() { if (initialized == true){ - setThreadtqStatus(XSLDBG_MSG_THREAD_STOP); + setThreadStatus(XSLDBG_MSG_THREAD_STOP); } /* it always succeeds at the moment */ diff --git a/kxsldbg/kxsldbgpart/xsldbgentities.ui b/kxsldbg/kxsldbgpart/xsldbgentities.ui index 627c56ff..17b847db 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentities.ui +++ b/kxsldbg/kxsldbgpart/xsldbgentities.ui @@ -79,7 +79,7 @@ Fixed - + 20 20 @@ -110,7 +110,7 @@ Expanding - + 20 20 @@ -135,7 +135,7 @@ Expanding - + 20 20 diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui index 3ae22f36..21c7cb19 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui @@ -90,7 +90,7 @@ Fixed - + 20 21 @@ -121,7 +121,7 @@ Fixed - + 20 20 @@ -170,7 +170,7 @@ Fixed - + 20 20 @@ -214,7 +214,7 @@ Expanding - + 20 20 @@ -239,7 +239,7 @@ Expanding - + 20 20 diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui index 31831e7f..aa97d11f 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui @@ -58,7 +58,7 @@ Fixed - + 20 20 @@ -107,7 +107,7 @@ Fixed - + 20 20 @@ -137,7 +137,7 @@ Fixed - + 20 21 @@ -309,7 +309,7 @@ Expanding - + 20 20 @@ -334,7 +334,7 @@ Expanding - + 20 20 diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui index 742c9514..a69244bf 100644 --- a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui +++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui @@ -81,7 +81,7 @@ Expanding - + 20 20 @@ -127,7 +127,7 @@ Expanding - + 20 20 @@ -152,7 +152,7 @@ Expanding - + 20 20 diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp index 03584163..ae3531a5 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp @@ -56,7 +56,7 @@ XsldbgOutputView::XsldbgOutputView(TQWidget * parent) : TQTextEdit(parent, "outputview") { new TQBoxLayout(this, TQBoxLayout::TopToBottom); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); setMinimumSize(TQSize(500, 80)); setCaption(i18n("xsldbg Output")); setText(i18n("\t\txsldbg output capture ready\n\n")); diff --git a/kxsldbg/kxsldbgpart/xsldbgsources.ui b/kxsldbg/kxsldbgpart/xsldbgsources.ui index b2b07d6a..e31f6ea6 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsources.ui +++ b/kxsldbg/kxsldbgpart/xsldbgsources.ui @@ -96,7 +96,7 @@ Expanding - + 20 20 @@ -121,7 +121,7 @@ Expanding - + 20 20 diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui index b93d24ea..60c8a82b 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui @@ -41,7 +41,7 @@ 0 - + 32767 60 @@ -66,7 +66,7 @@ Fixed - + 20 51 @@ -129,7 +129,7 @@ Fixed - + 20 51 @@ -160,7 +160,7 @@ Expanding - + 20 20 @@ -185,7 +185,7 @@ Fixed - + 16 20 @@ -210,7 +210,7 @@ Expanding - + 20 20 -- cgit v1.2.1