From e985f7e545f4739493965aad69bbecb136dc9346 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 16 Jun 2011 19:02:47 +0000 Subject: TQt4 port kdewebdev This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp | 6 +-- .../kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h | 27 ++++++------ kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp | 12 +++--- kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp | 48 +++++++++++----------- 4 files changed, 47 insertions(+), 46 deletions(-) (limited to 'kxsldbg/kxsldbgpart/libqtnotfier') diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp index 0db9d1f0..98c4ea95 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 (::getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED){ + if (::getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED){ return 1; } /* clear the input ready flag as quickly as possible*/ - if ( ::getInputStatus() == XSLDBG_MSG_READ_INPUT) + if ( ::getInputtqStatus() == XSLDBG_MSG_READ_INPUT) ::setInputReady(0); /* state of the thread */ @@ -45,7 +45,7 @@ int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data) } } - if (::getThreadStatus() == XSLDBG_MSG_THREAD_STOP) + if (::getThreadtqStatus() == 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/xsldbgdebuggerbase.h b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h index df4f17fa..5f07d0bb 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h +++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h @@ -42,9 +42,10 @@ class TQStringList; We delegate the task of emitting our signals to XsldbgEvent , so Xsldbg must become our friend */ -class XsldbgDebuggerBase : public QObject +class XsldbgDebuggerBase : public TQObject { Q_OBJECT + TQ_OBJECT friend class XsldbgEvent; @@ -87,55 +88,55 @@ protected: /** Show a message in debugger window */ void showMessage(TQString /* msg*/); - /** Add breakpoint to view, First parameter is TQString::null + /** Add breakpoint to view, First parameter is TQString() to indicate start of breakpoint list notfication */ void breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */); - /** Add global variable to view, First parameter is TQString::null + /** Add global variable to view, First parameter is TQString() to indicate start of global variable list notfication */ void globalVariableItem(TQString /* name */, TQString /* fileName */, int /* lineNumber */); - /** Add local variable to view, First parameter is TQString::null + /** Add local variable to view, First parameter is TQString() to indicate start of local variable list notfication */ void localVariableItem(TQString /*name */, TQString /* templateContext*/, TQString /* fileName */, int /*lineNumber */); - /** Add a variable to view, First parameter is TQString::null + /** Add a variable to view, First parameter is TQString() to indicate start of local variable list notfication */ void variableItem(TQString /*name */, TQString /* templateContext*/, TQString /* fileName */, int /*lineNumber */, TQString /* select XPath */, int /* is it a local variable */); - /** Add template to view, First parameter is TQString::null + /** Add template to view, First parameter is TQString() to indicate start of template list notfication */ void templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */); - /** Add source to view, First parameter is TQString::null + /** Add source to view, First parameter is TQString() to indicate start of source list notfication */ - void sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */); + void sourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */); - /** Add parameter to view, First parameter is TQString::null + /** Add parameter to view, First parameter is TQString() to indicate start of parameter list notfication */ void parameterItem(TQString /* name*/, TQString /* value */); - /** Add callStack to view, First parameter is TQString::null + /** Add callStack to view, First parameter is TQString() to indicate start of callstack list notfication */ void callStackItem(TQString /* tempalteName*/, TQString /* fileName */, int /* lineNumber */); - /** Add entity to view, First parameter is TQString::null + /** Add entity to view, First parameter is TQString() to indicate start of entity list notfication */ void entityItem(TQString /*SystemID*/, TQString /*PublicID*/); /* Show the URI for SystemID or PublicID requested */ void resolveItem(TQString /*URI*/); - /* Display a integer option value First parameter is TQString::null + /* Display a integer option value First parameter is TQString() to indicate start of option list notification */ void intOptionItem(TQString /* name*/, int /* value */); - /* Display a string option value. First parameter is TQString::null + /* Display a string option value. First parameter is TQString() to indicate start of option list notification */ void stringOptionItem(TQString /* name*/, TQString /* value */); diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp index 35878929..857848c3 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp +++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp @@ -41,7 +41,7 @@ XsldbgEventData::XsldbgEventData() int column; for (column = 0; column < XSLDBGEVENT_COLUMNS; column++){ - textValues[column] = TQString::null; + textValues[column] = TQString(); } for (column = 0; column < XSLDBGEVENT_COLUMNS; column++){ @@ -66,7 +66,7 @@ TQString XsldbgEventData::getText(int column) if ((column >= 0) && (column < XSLDBGEVENT_COLUMNS)) return textValues[column]; else - return TQString::null; + return TQString(); } @@ -678,8 +678,8 @@ void XsldbgEvent::handleIncludedSourceItem(XsldbgEventData *eventData, const vo }else{ /* emit the event data via debugger*/ emit debugger->sourceItem(eventData->getText(0), /* file name*/ - eventData->getText(1), /* parent file name*/ - eventData->getInt(0) /* parent line number*/); + eventData->getText(1), /* tqparent file name*/ + eventData->getInt(0) /* tqparent line number*/); } } } @@ -709,8 +709,8 @@ void XsldbgEvent::handleSourceItem(XsldbgEventData *eventData, const void *msgD }else{ /* emit the event data via debugger*/ emit debugger->sourceItem(eventData->getText(0), /* name*/ - eventData->getText(1), /* parent file name*/ - eventData->getInt(0) /* parent line number*/); + eventData->getText(1), /* tqparent file name*/ + eventData->getInt(0) /* tqparent line number*/); } } } diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp index 1f428bb5..1f997919 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); - setThreadStatus(XSLDBG_MSG_THREAD_INIT); + setThreadtqStatus(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 (getThreadStatus() != XSLDBG_MSG_THREAD_INIT) + if (getThreadtqStatus() != 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 (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){ + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){ fprintf(stderr, "Created thread\n"); result++; }else @@ -117,13 +117,13 @@ void xsldbgThreadFree(void) { fprintf(stderr, "xsldbgThreadFree()\n"); - if (getThreadStatus() != XSLDBG_MSG_THREAD_DEAD) + if (getThreadtqStatus() != XSLDBG_MSG_THREAD_DEAD) { int counter; fprintf(stderr, "Killing xsldbg thread\n"); - setThreadStatus(XSLDBG_MSG_THREAD_STOP); + setThreadtqStatus(XSLDBG_MSG_THREAD_STOP); for (counter = 0; counter < 11; counter++){ - if (getThreadStatus() == XSLDBG_MSG_THREAD_DEAD) + if (getThreadtqStatus() == 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) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)) + if (!text || (getInputReady() == 1) || (getThreadtqStatus() != 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 (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) + if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) { #ifdef HAVE_READLINE xmlChar *line_read; @@ -209,20 +209,20 @@ qtXslDbgShellReadline(xmlChar * prompt) } else{ - setInputStatus(XSLDBG_MSG_AWAITING_INPUT); + setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT); notifyXsldbgApp(XSLDBG_MSG_AWAITING_INPUT, NULL); while (getInputReady() == 0){ usleep(10000); /* have we been told to die */ - if (getThreadStatus() == XSLDBG_MSG_THREAD_STOP){ + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_STOP){ fprintf(stderr, "About to stop thread\n"); - xslDebugStatus = DEBUG_QUIT; + xslDebugStatus = DEBUG_TQUIT; return NULL; } } - setInputStatus(XSLDBG_MSG_READ_INPUT); + setInputtqStatus(XSLDBG_MSG_READ_INPUT); inputReadBuff = getFakeInput(); if(inputReadBuff){ notifyXsldbgApp(XSLDBG_MSG_READ_INPUT, inputReadBuff); @@ -272,7 +272,7 @@ int qtNotifyTextXsldbgApp(XsldbgMessageEnum type, const char *text) } char mainBuffer[DEBUG_BUFFER_SIZE]; -static void xsldbgThreadCleanupQt(void); +static void xsldbgThreadCleanupTQt(void); /* this is where the thread get to do all its work */ @@ -283,7 +283,7 @@ xsldbgThreadMain(void *) // char *defaultArgv[2]; // int i; - if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT){ + if (getThreadtqStatus() != 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 */ } @@ -301,9 +301,9 @@ xsldbgThreadMain(void *) } } */ - xsldbgSetThreadCleanupFunc(xsldbgThreadCleanupQt); - setThreadStatus(XSLDBG_MSG_THREAD_RUN); - setInputStatus(XSLDBG_MSG_AWAITING_INPUT); + xsldbgSetThreadCleanupFunc(xsldbgThreadCleanupTQt); + setThreadtqStatus(XSLDBG_MSG_THREAD_RUN); + setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT); fprintf(stderr, "Starting thread\n"); /* call the "main of xsldbg" found in debugXSL.c */ @@ -316,8 +316,8 @@ xsldbgThreadMain(void *) } */ - setThreadStatus(XSLDBG_MSG_THREAD_DEAD); - setInputStatus(XSLDBG_MSG_PROCESSING_INPUT); + setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD); + setInputtqStatus(XSLDBG_MSG_PROCESSING_INPUT); notifyXsldbgApp(XSLDBG_MSG_THREAD_DEAD, NULL); return NULL; } @@ -327,15 +327,15 @@ xsldbgThreadMain(void *) /* thread has died so cleanup after it not called directly but via notifyXsldbgApp*/ void -xsldbgThreadCleanupQt(void) +xsldbgThreadCleanupTQt(void) { fprintf(stderr, "Thread has finished\n"); - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { xsldbgThreadFree(); } - /* its safe to modify threadStatus as the thread is now dead */ - setThreadStatus(XSLDBG_MSG_THREAD_DEAD); + /* its safe to modify threadtqStatus as the thread is now dead */ + setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD); } @@ -346,7 +346,7 @@ xsldbgThreadStdoutReader(void *data) if (!stdoutIO) return data; - while (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){ + while (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){ if (fgets(outputBuffer, sizeof(outputBuffer -1), stdoutIO)){ usleep(10000); strcat(outputBuffer, "\n"); -- cgit v1.2.1