diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
| commit | e985f7e545f4739493965aad69bbecb136dc9346 (patch) | |
| tree | 54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /kxsldbg/kxsldbgpart | |
| parent | f7670c198945adc3b95ad69a959fe5f8ae55b493 (diff) | |
| download | tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip | |
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
Diffstat (limited to 'kxsldbg/kxsldbgpart')
81 files changed, 768 insertions, 780 deletions
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index c9023d07..7ee2e26c 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -67,10 +67,10 @@ typedef KParts::GenericFactory<KXsldbgPart> KXsldbgPartFactory; K_EXPORT_COMPONENT_FACTORY( libkxsldbgpart, KXsldbgPartFactory ) -KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, - TQObject *parent, const char *name, +KXsldbgPart::KXsldbgPart( TQWidget *tqparentWidget, const char * /*widgetName*/, + TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) - : DCOPObject("KXsldbgPart"), KParts::ReadOnlyPart(parent, name) + : DCOPObject("KXsldbgPart"), KParts::ReadOnlyPart(tqparent, name) { currentLineNo = 0; currentColumnNo = 0; @@ -81,7 +81,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, // we need an instance setInstance( KXsldbgPartFactory::instance() ); - TQVBox *frame = new TQVBox(parentWidget); + TQVBox *frame = new TQVBox(tqparentWidget); TQHBox *h = new TQHBox(frame); newXPath = new TQLineEdit(h); xPathBtn = new TQPushButton(i18n("Goto XPath"), h); @@ -94,7 +94,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, newEvaluate = new TQLineEdit(h); evaluateBtn = new TQPushButton(i18n("Evaluate"), h); - TQSplitter *splitter = new TQSplitter(TQSplitter::Vertical, frame); + TQSplitter *splitter = new TQSplitter(Qt::Vertical, frame); mainView = new TQWidgetStack(splitter); mainView->setMinimumHeight(400); //## TODO don't use a magic number outputview = new XsldbgOutputView(splitter); @@ -116,7 +116,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, actionCollection(), "configureCmd" ); (void) new KAction( i18n("Inspect..."), - "find", Key_I, + "tqfind", Key_I, this, TQT_SLOT(inspectorCmd_activated()), actionCollection(), "inspectCmd" ); @@ -284,7 +284,7 @@ bool KXsldbgPart::openURL(const KURL &url) { bool result = fetchURL(url); if (result){ - QXsldbgDoc *docPtr = docDictionary[url.prettyURL()]; + TQXsldbgDoc *docPtr = docDictionary[url.prettyURL()]; if (docPtr && docPtr->kateView()){ if (docPtr != currentDoc){ currentDoc = docPtr; @@ -305,9 +305,9 @@ bool KXsldbgPart::openURL(const KURL &url) bool KXsldbgPart::fetchURL(const KURL &url) { TQString docID = url.prettyURL(); - QXsldbgDoc *docPtr = docDictionary[docID]; + TQXsldbgDoc *docPtr = docDictionary[docID]; if (!docPtr){ - docPtr = new QXsldbgDoc(mainView, url); + docPtr = new TQXsldbgDoc(mainView, url); docDictionary.insert(docID, docPtr); if (docPtr->kateView()){ mainView->addWidget(docPtr->kateView()); @@ -374,14 +374,14 @@ void KXsldbgPart::lookupSystemID( TQString systemID) #if KDE_IS_VERSION(3, 1, 90) systemID = KInputDialog::getText( i18n( "Lookup SystemID" ), - i18n( "Please enter SystemID to find:" ), - TQString::null, &ok, + i18n( "Please enter SystemID to tqfind:" ), + TQString(), &ok, mainView); #else - systemID = QInputDialog::getText( + systemID = TQInputDialog::getText( i18n( "Lookup SystemID" ), - i18n( "Please enter SystemID to find:" ), - TQLineEdit::Normal, TQString::null, &ok, + i18n( "Please enter SystemID to tqfind:" ), + TQLineEdit::Normal, TQString(), &ok, mainView); #endif }else{ @@ -389,7 +389,7 @@ void KXsldbgPart::lookupSystemID( TQString systemID) } if ( ok && !systemID.isEmpty() ){ // user entered something and pressed ok - TQString msg(TQString("system %1").arg(systemID)); // noTr + TQString msg(TQString("system %1").tqarg(systemID)); // noTr debugger->fakeInput(msg, true); } @@ -406,20 +406,20 @@ void KXsldbgPart::lookupPublicID(TQString publicID) #if KDE_IS_VERSION(3, 1, 90) publicID = KInputDialog::getText( i18n( "Lookup PublicID" ), - i18n( "Please enter PublicID to find:" ), - TQString::null, &ok, mainView ); + i18n( "Please enter PublicID to tqfind:" ), + TQString(), &ok, mainView ); #else - publicID = QInputDialog::getText( + publicID = TQInputDialog::getText( i18n( "Lookup PublicID" ), - i18n( "Please enter PublicID to find:" ), - TQLineEdit::Normal, TQString::null, &ok, mainView ); + i18n( "Please enter PublicID to tqfind:" ), + TQLineEdit::Normal, TQString(), &ok, mainView ); #endif }else{ ok = true; } if ( ok && !publicID.isEmpty()){ // user entered something and pressed ok - TQString msg(TQString("public %1").arg(publicID)); // noTr + TQString msg(TQString("public %1").tqarg(publicID)); // noTr debugger->fakeInput(msg, true); } } @@ -582,8 +582,8 @@ void KXsldbgPart::refreshCmd_activated() { if ( !currentFileName.isEmpty() ){ - TQDictIterator<QXsldbgDoc> it(docDictionary); - QXsldbgDoc *docPtr; + TQDictIterator<TQXsldbgDoc> it(docDictionary); + TQXsldbgDoc *docPtr; while (it.current()){ docPtr = it.current(); docPtr->refresh(); @@ -650,8 +650,8 @@ KXsldbgPart::lineNoChanged(TQString fileName, int lineNumber, bool breakpoint) openURL(fileName); - QXsldbgDoc *docPtr; - TQDictIterator<QXsldbgDoc> it(docDictionary); + TQXsldbgDoc *docPtr; + TQDictIterator<TQXsldbgDoc> it(docDictionary); while (it.current()){ docPtr = it.current(); // cause all Execution and BreakpointReached marks to be cleared @@ -774,7 +774,7 @@ void KXsldbgPart::deleteBreakPoint(int lineNumber) void KXsldbgPart::slotSearch() { if ((newSearch != 0L) && checkDebugger() ) { - TQString msg(TQString("search \"%1\"").arg(newSearch->text())); // noTr + TQString msg(TQString("search \"%1\"").tqarg(newSearch->text())); // noTr debugger->fakeInput(msg, false); } } @@ -800,7 +800,7 @@ void KXsldbgPart::slotProcResolveItem(TQString URI) { if (!URI.isEmpty()){ TQMessageBox::information(mainView, i18n("SystemID or PublicID Resolution Result"), - i18n("SystemID or PublicID has been resolved to\n.%1").arg(URI), + i18n("SystemID or PublicID has been resolved to\n.%1").tqarg(URI), TQMessageBox::Ok); } } @@ -812,8 +812,8 @@ void KXsldbgPart::breakpointItem(TQString fileName, int lineNumber , if (fileName == 0L){ /* Go through all documents and remove all breakpoints */ - TQDictIterator<QXsldbgDoc> it(docDictionary); - QXsldbgDoc *docPtr; + TQDictIterator<TQXsldbgDoc> it(docDictionary); + TQXsldbgDoc *docPtr; while (it.current()){ docPtr = it.current(); docPtr->clearMarks(true); @@ -821,7 +821,7 @@ void KXsldbgPart::breakpointItem(TQString fileName, int lineNumber , } }else{ /* - if (!fileName.contains("://")){ + if (!fileName.tqcontains("://")){ // relative path ? must handle this special case KURL url; url.setFileName(fileName); @@ -834,7 +834,7 @@ void KXsldbgPart::breakpointItem(TQString fileName, int lineNumber , KURL temp(fileName); fileName = temp.prettyURL(); fetchURL(fileName); - QXsldbgDoc *docPtr = docDictionary[fileName] ; + TQXsldbgDoc *docPtr = docDictionary[fileName] ; if (docPtr){ docPtr->addBreakPoint(lineNumber - 1, enabled); }else { diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h index 0b57ee75..f33ae05f 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.h +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h @@ -25,7 +25,7 @@ class TQDockWindow; class TQWidgetStack; class XsldbgBrkStatusView; -class QXsldbgDoc; +class TQXsldbgDoc; class XsldbgOutputView; class XsldbgConfigImpl; @@ -35,7 +35,7 @@ class KURL; class TQMultiLineEdit; class KAboutData; -typedef TQDict<QXsldbgDoc> XsldbgDocDict; +typedef TQDict<TQXsldbgDoc> XsldbgDocDict; /** * This is a "Part". It that does all the real work in a KPart @@ -48,13 +48,14 @@ typedef TQDict<QXsldbgDoc> XsldbgDocDict; class KXsldbgPart : public KParts::ReadOnlyPart, public KXsldbgPartIf { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - KXsldbgPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &args); + KXsldbgPart(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList &args); /** * Destructor @@ -150,7 +151,7 @@ protected slots: void fileOpen(); private: - QXsldbgDoc *currentDoc; + TQXsldbgDoc *currentDoc; TQWidgetStack *mainView; TQPushButton *xPathBtn, *searchBtn, *evaluateBtn; 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"); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp index 270ce82d..1e403aa6 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 *breakStatus; + const char *breaktqStatus; if (!breakPtr) @@ -634,11 +634,11 @@ breakPointPrint(breakPointPtr breakPtr) } - breakStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED]; + breaktqStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED]; if (breakPtr->url) - xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").arg(breakPtr->id).arg(i18n(breakStatus)).arg(xsldbgText(breakTemplate)).arg(xsldbgText(breakMode)).arg(xsldbgUrl(breakPtr->url)).arg(breakPtr->lineNo)); + 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)); else - xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").arg(breakPtr->id).arg(i18n(breakStatus)).arg(xsldbgText(breakTemplate)).arg(xsldbgText(breakMode))); + xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").tqarg(breakPtr->id).tqarg(i18n(breaktqStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode))); return ++result; } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h index 83f2e712..040af24e 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_QUIT, + DEBUG_TQUIT, DEBUG_TRACE, DEBUG_WALK } DebugStatusEnum; @@ -107,7 +107,7 @@ extern "C" { DEBUG_CONT, DEBUG_RUN, DEBUG_RUN_RESTART, - DEBUG_QUIT, + DEBUG_TQUIT, DEBUG_TRACE, DEBUG_WALK }; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp index 0bab6585..ff3fd47c 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 getThreadStatus() */ +#include "xsldbgthread.h" /* for getThreadtqStatus() */ #include "xsldbgmsg.h" #include "options.h" @@ -95,7 +95,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup) if (!filesGetStylesheet() || !filesGetMainDoc()) { xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n")); - xsldbgGenericErrorFunc(TQString("Error: %1.\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1.\n").tqarg(i18n(errorPrompt))); return result; } @@ -104,13 +104,13 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup) xsltGenericError(xsltGenericErrorContext, "Error: NULL argument provided\n"); #endif - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; } if (xmlStrLen(arg) > 0) { if (!sscanf((char *) arg, "%d", &noOfFrames)) { - xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a number of frames.\n").arg((char*)arg)); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a number of frames.\n").tqarg((char*)arg)); noOfFrames = -1; } } else { @@ -126,7 +126,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup) } if (!result) - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; } @@ -188,7 +188,7 @@ validateSource(xmlChar ** url, long *lineNo) walkChildNodes((xmlHashScanner) scanForNode, searchInf, searchData->node); if (!searchInf->found) { - xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo)); + xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo)); } *lineNo = searchData->lineNo; @@ -210,9 +210,9 @@ validateSource(xmlChar ** url, long *lineNo) result = 1; } } else{ - xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name contains %1.\n").arg(xsldbgUrl(*url))); + xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name tqcontains %1.\n").tqarg(xsldbgUrl(*url))); if (lineNo){ - xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo)); + xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo)); } } } @@ -299,9 +299,9 @@ validateData(xmlChar ** url, long *lineNo) if (!searchInf->found) { if (lineNo){ - xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo)); + xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo)); } else{ - xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name contains %1.\n").arg(xsldbgUrl(*url))); + xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name tqcontains %1.\n").tqarg(xsldbgUrl(*url))); } result = 1; } else { @@ -350,7 +350,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if (!style || !filesGetMainDoc()) { if (!optionsGetIntOption(OPTIONS_GDB)){ xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n")); - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; }else{ orphanedBreakPoint = 1; @@ -372,8 +372,8 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if (splitString(&arg[2], 2, opts) == 2) { if ((xmlStrlen(opts[1]) == 0) || !sscanf((char *) opts[1], "%ld", &lineNo)) { - xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1])); - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1])); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; } else { /* try to guess whether we are looking for source or data @@ -422,7 +422,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, } } } else - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("break")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("break")); } } else { /* add breakpoint at specified template names */ @@ -524,7 +524,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, break; default: - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("break")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("break")); return 0; } @@ -542,7 +542,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if (templ->match) templateName = xmlStrdup(templ->match); else - templateName = fullQName(templ->nameURI, templ->name); + templateName = fullTQName(templ->nameURI, templ->name); if (allTemplates) found = 1; @@ -571,7 +571,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if (templ->mode) modeName = - fullQName(templ->modeURI, templ->mode); + fullTQName(templ->modeURI, templ->mode); if (!searchPtr){ @@ -593,14 +593,14 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, searchPtr->id = lastId; result = 1; breakPointCounter = lastCounter; - xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").arg(searchPtr->id)); + xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").tqarg(searchPtr->id)); validatedBreakPoints++; } } } }else{ if (xsldbgValidateBreakpoints != BREAKPOINTS_BEING_VALIDATED){ - xsldbgGenericErrorFunc(i18n("Warning: Breakpoint exits for file \"%1\" at line %2.\n").arg(xsldbgUrl(tempUrl)).arg(templateLineNo)); + xsldbgGenericErrorFunc(i18n("Warning: Breakpoint exits for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(tempUrl)).tqarg(templateLineNo)); } validatedBreakPoints++; } @@ -648,7 +648,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if (!result) { if (url) - xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo)); + xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo)); else xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint.\n")); } @@ -681,7 +681,7 @@ xslDbgShellDelete(xmlChar * arg) xsltGenericError(xsltGenericErrorContext, "Error: NULL argument provided\n"); #endif - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; } @@ -692,7 +692,7 @@ xslDbgShellDelete(xmlChar * arg) if (splitString(&arg[2], 2, opts) == 2) { if ((xmlStrlen(opts[1]) == 0) || !sscanf((char *) opts[1], "%ld", &lineNo)) { - xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1])); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1])); } else { xmlChar *escapedURI; trimString(opts[0]); @@ -711,7 +711,7 @@ xslDbgShellDelete(xmlChar * arg) } else if (validateData(&url, &lineNo)) breakPtr = breakPointGet(url, lineNo); if (!breakPtr || !breakPointDelete(breakPtr)){ - xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo)); + xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo)); }else{ result = 1; } @@ -719,7 +719,7 @@ xslDbgShellDelete(xmlChar * arg) } } } else{ - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("delete")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("delete")); } } } else if (xmlStrEqual((xmlChar*)"*", arg)) { @@ -732,24 +732,24 @@ xslDbgShellDelete(xmlChar * arg) if (breakPtr) { result = breakPointDelete(breakPtr); if (!result) { - xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint %1.\n").arg(breakPointId)); + xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint %1.\n").tqarg(breakPointId)); } } else { - xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").arg(breakPointId)); + xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").tqarg(breakPointId)); } } else { breakPtr = findBreakPointByName(arg); if (breakPtr) { result = breakPointDelete(breakPtr); if (!result) { - xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint at template %1.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint at template %1.\n").tqarg(xsldbgText(arg))); } } else{ - xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").tqarg(xsldbgText(arg))); } } if (!result) - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; } @@ -798,7 +798,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType) if (!filesGetStylesheet() || !filesGetMainDoc()) { xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n")); - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; } @@ -807,7 +807,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType) xsltGenericError(xsltGenericErrorContext, "Error: NULL argument provided\n"); #endif - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; } @@ -818,7 +818,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType) if (splitString(&arg[2], 2, opts) == 2) { if ((xmlStrlen(opts[1]) == 0) || !sscanf((char *) opts[1], "%ld", &lineNo)) { - xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1])); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1])); } else { xmlChar *escapedURI; trimString(opts[0]); @@ -839,13 +839,13 @@ xslDbgShellEnable(xmlChar * arg, int enableType) if (breakPtr){ result = breakPointEnable(breakPtr, enableType); }else{ - xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo)); + xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo)); } xmlFree(url); } } } else - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("enable")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("enable")); } } else if (xmlStrEqual((xmlChar*)"*", arg)) { result = 1; @@ -858,21 +858,21 @@ xslDbgShellEnable(xmlChar * arg, int enableType) if (breakPtr) { result = breakPointEnable(breakPtr, enableType); if (!result) { - xsldbgGenericErrorFunc(i18n("Error: Unable to enable/disable breakpoint %1.\n").arg(breakPointId)); + xsldbgGenericErrorFunc(i18n("Error: Unable to enable/disable breakpoint %1.\n").tqarg(breakPointId)); } } else { - xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").arg(breakPointId)); + xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").tqarg(breakPointId)); } } else { breakPtr = findBreakPointByName(arg); if (breakPtr) { result = breakPointEnable(breakPtr, enableType); } else - xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").tqarg(xsldbgText(arg))); } if (!result) - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); return result; } @@ -893,7 +893,7 @@ xslDbgShellPrintBreakPoint(void *payload, void *data, Q_UNUSED(name); if (payload) { - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListQueue(payload); } else { printCount++; @@ -931,7 +931,7 @@ static int validateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy) breakPtr->flags |= BREAKPOINT_ORPHANED; if ( breakPtr->flags & BREAKPOINT_ORPHANED){ - xsldbgGenericErrorFunc(TQString("Warning: Breakpoint %1 is orphaned. Result: %2. Old flags: %3. New flags: %4.\n").arg(breakPtr->id).arg(result).arg(copy->flags).arg(breakPtr->flags)); + xsldbgGenericErrorFunc(TQString("Warning: Breakpoint %1 is orphaned. Result: %2. Old flags: %3. New flags: %4.\n").tqarg(breakPtr->id).tqarg(result).tqarg(copy->flags).tqarg(breakPtr->flags)); } if (!(breakPtr->flags & BREAKPOINT_ORPHANED) && ((copy->lineNo != breakPtr->lineNo ) || @@ -949,11 +949,11 @@ static int validateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy) breakPointCounter = lastCounter; /* compensate for breakPointAdd which always increments the breakPoint counter */ result = 1; - xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").arg(breakPtr->id)); + xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").tqarg(breakPtr->id)); } } if (!result){ - xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").arg(copy->id)); + xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").tqarg(copy->id)); } } } @@ -992,7 +992,7 @@ static int validateTemplateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy } xmlFree(copy->templateName); if (!result){ - xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").arg(copy->id)); + xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").tqarg(copy->id)); } return result; } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/callstack.cpp b/kxsldbg/kxsldbgpart/libxsldbg/callstack.cpp index 585a70d1..cd9e320a 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/callstack.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/callstack.cpp @@ -22,9 +22,9 @@ /** * addCallInfo: * @templateName: Template name to add - * @templateURI: QName part of template name to add + * @templateURI: TQName part of template name to add * @modeName: Mode of template - * @modeURI: QName part of node of template + * @modeURI: TQName part of node of template * @url: The url for the template * * Add template "call" to call stack @@ -137,9 +137,9 @@ callStackFree(void) /** * addCallInfo: * @templateName: Template name to add - * @templateURI: QName part of template name to add + * @templateURI: TQName part of template name to add * @modeName: Mode of template - * @modeURI: QName part of node of template + * @modeURI: TQName part of node of template * @url: The url for the template * * Add template "call" to call stack diff --git a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h index f12648c7..08a7635b 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_QUIT_CMD, + DEBUG_TQUIT_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_QUIT_CMD, + DEBUG_TQUIT_CMD, DEBUG_STEP_CMD, DEBUG_STEPUP_CMD, diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp index 7088cf36..c758ceb1 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp @@ -529,10 +529,10 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, templateNode = findTemplateNode(styleCtxt->style, &arg[offset]); if (!templateNode) { - xsldbgGenericErrorFunc(i18n("Error: The XSLT template named \"%1\" was not found.\n").arg(xsldbgText(&arg[offset]))); + xsldbgGenericErrorFunc(i18n("Error: The XSLT template named \"%1\" was not found.\n").tqarg(xsldbgText(&arg[offset]))); return result; } else { - xsldbgGenericErrorFunc(i18n(" template: \"%1\"\n").arg(xsldbgText(&arg[offset]))); + xsldbgGenericErrorFunc(i18n(" template: \"%1\"\n").tqarg(xsldbgText(&arg[offset]))); ctxt->node = templateNode; result = 1; return result; @@ -545,7 +545,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, pctxt = xmlXPathNewContext(source->doc); if (pctxt == NULL) { xmlFree(ctxt); - /* xslDebugStatus = DEBUG_QUIT; */ + /* xslDebugStatus = DEBUG_TQUIT; */ return result; } if (!xmlXPathNsLookup(pctxt, (xmlChar *) "xsl")) @@ -560,7 +560,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, xsldbgGenericErrorFunc(i18n("Error: Unable to cd. No stylesheet loaded.\n")); } } else { - xsldbgGenericErrorFunc(i18n("Error: Unknown arguments to the command %1.\n").arg("cd")); + xsldbgGenericErrorFunc(i18n("Error: Unknown arguments to the command %1.\n").tqarg("cd")); } } else xsldbgGenericErrorFunc(i18n("Error: Unable to cd. No stylesheet loaded.\n")); @@ -582,7 +582,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, XSLT_NAMESPACE); list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt); } else { - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to the command %1.\n").arg("cd")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to the command %1.\n").tqarg("cd")); } } @@ -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 (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { int breakpoint = 0; xsldbgUpdateFileDetails(ctxt->node); @@ -603,9 +603,9 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, } result = 1; } else - xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is a Node Set with %n child.", "Warning: XPath %1 is a Node Set with %n children.", list->nodesetval->nodeNr).arg(xsldbgText(arg)) + TQString("\n")); + xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is a Node Set with %n child.", "Warning: XPath %1 is a Node Set with %n tqchildren.", list->nodesetval->nodeNr).tqarg(xsldbgText(arg)) + TQString("\n")); } else { - xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").tqarg(xsldbgText(arg))); } break; @@ -614,7 +614,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, } xmlXPathFreeObject(list); } else { - xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").tqarg(xsldbgText(arg))); } if (ctxt->pctxt) ctxt->pctxt->node = NULL; @@ -640,7 +640,7 @@ xslDbgPrintCallStack(const xmlChar * arg) callPointPtr callPointItem; if (arg == NULL) { - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_CALLSTACK_CHANGED); /* we send the oldest frame stack first */ for (depth = 1; depth <= callStackGetDepth(); depth++) { @@ -664,17 +664,17 @@ xslDbgPrintCallStack(const xmlChar * arg) if (rootCopy && (rootCopy->match || rootCopy->name) && curUrl) { xmlChar *rootNameTemp, *rootModeTemp; - rootNameTemp = fullQName(rootCopy->nameURI, rootCopy->name); - rootModeTemp = fullQName(rootCopy->modeURI, rootCopy->mode); + rootNameTemp = fullTQName(rootCopy->nameURI, rootCopy->name); + rootModeTemp = fullTQName(rootCopy->modeURI, rootCopy->mode); if (rootNameTemp && rootModeTemp){ if (rootCopy->match) /* display information about the current XSLT template */ - xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth).arg(xsldbgText(rootCopy->match)).arg(xsldbgText(rootModeTemp))); + xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth).tqarg(xsldbgText(rootCopy->match)).tqarg(xsldbgText(rootModeTemp))); else /* display information about the current XSLT template */ - xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth).arg(xsldbgText(rootNameTemp)).arg(xsldbgText(rootModeTemp))); + xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth).tqarg(xsldbgText(rootNameTemp)).tqarg(xsldbgText(rootModeTemp))); /* display where we are in the source/document file */ - xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(curUrl)).arg(curLine)); + xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(curUrl)).tqarg(curLine)); }else{ xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n")); result = 0; @@ -689,24 +689,24 @@ xslDbgPrintCallStack(const xmlChar * arg) } } else if (curUrl) { /* display information about the current XSLT template */ - xsldbgGenericErrorFunc(i18n("#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\"").arg(depth)); + xsldbgGenericErrorFunc(i18n("#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\"").tqarg(depth)); /* display where we are in the source/document file */ - xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(curUrl)).arg(curLine)); + xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(curUrl)).tqarg(curLine)); } if (curUrl) xmlFree(curUrl); } - nameTemp = fullQName(callPointItem->info->templateURI, + nameTemp = fullTQName(callPointItem->info->templateURI, callPointItem->info->templateName); - modeTemp = fullQName(callPointItem->info->modeURI, + modeTemp = fullTQName(callPointItem->info->modeURI, callPointItem->info->modeName); if (nameTemp && modeTemp){ /* display information about the current XSLT template */ - xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth - 1).arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp))); + xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth - 1).tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp))); if (callPointItem->info->url) /* display where we are in the source/document file */ - xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(callPointItem->info->url)).arg(callPointItem->lineNo)); + xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(callPointItem->info->url)).tqarg(callPointItem->lineNo)); else xsldbgGenericErrorFunc("\n"); }else{ @@ -740,7 +740,7 @@ xslDbgPrintCallStack(const xmlChar * arg) long templateDepth = atol((char *) arg); - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == 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 @@ -755,11 +755,11 @@ xslDbgPrintCallStack(const xmlChar * arg) callPointItem = callStackGet(templateDepth + 1); if (callPointItem && callPointItem->info) { /* display information about the current XSLT template */ - xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\"").arg(templateDepth).arg(xsldbgText(callPointItem->info->templateName))); + xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\"").tqarg(templateDepth).tqarg(xsldbgText(callPointItem->info->templateName))); /* should alays be present but .. */ if (callPointItem->info->url) /* display where we are in the source/document file */ - xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(callPointItem->info->url)).arg(callPointItem->lineNo)); + xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(callPointItem->info->url)).tqarg(callPointItem->lineNo)); else xsldbgGenericErrorFunc("\n"); } else { @@ -1097,15 +1097,15 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, } if (root) { xmlChar *nameTemp = NULL, *modeTemp = NULL; - nameTemp = fullQName(root->nameURI, root->name); - modeTemp = fullQName(root->modeURI, root->mode); + nameTemp = fullTQName(root->nameURI, root->name); + modeTemp = fullTQName(root->modeURI, root->mode); if (!nextCommandActive){ /* we only want messages if we are not in the process of completing the next command */ if (terminalIO == NULL) { if (root->match){ - xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp))); + xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(root->match)).tqarg(xsldbgText(modeTemp))); if (lastTemplate != root->match && buffer){ xmlBufferCCat(buffer, "\nreached matched template:"); xmlBufferCat(buffer, root->match); @@ -1115,7 +1115,7 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, lastTemplate = root->match; } }else{ - xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp))); + xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp))); if (lastTemplate != root->name && buffer){ xmlBufferCCat(buffer, "\nreached named template:"); xmlBufferCat(buffer,root->match); @@ -1133,9 +1133,9 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, (xslDebugStatus == DEBUG_WALK)) { TQString message; if (root->match) - message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp)); + message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(root->match)).tqarg(xsldbgText(modeTemp)); else - message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp)); + message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp)); fprintf(terminalIO, "%s", message.local8Bit().data()); } } @@ -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 ((getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED) || + if ((getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED) || (xslDebugStatus == DEBUG_TRACE)) { TQString messageTxt; if (!nextCommandActive && ctxt->node && ctxt->node && ctxt->node->doc @@ -1292,9 +1292,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, breakUri = ctxt->node->doc->URL; if (xmlGetLineNo(ctxt->node) != -1) - messageTxt = i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(breakUri)).arg(xmlGetLineNo(ctxt->node)); + messageTxt = i18n("Breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(breakUri)).tqarg(xmlGetLineNo(ctxt->node)); else - messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(breakUri)); + messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").tqarg(xsldbgUrl(breakUri)); if (baseUri != NULL) { xmlFree(baseUri); baseUri = NULL; @@ -1346,8 +1346,8 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, xsldbgGenericErrorFunc("\n"); } - while (!exitShell && (xslDebugStatus != DEBUG_QUIT)) { - if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { + while (!exitShell && (xslDebugStatus != DEBUG_TQUIT)) { + if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) { if (ctxt->node == (xmlNodePtr) ctxt->doc) snprintf((char *) prompt, DEBUG_BUFFER_SIZE - 1, "(xsldbg) %s > ", "/"); @@ -1464,9 +1464,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, /* --- Running related commands --- */ case DEBUG_BYE_CMD: case DEBUG_EXIT_CMD: - case DEBUG_QUIT_CMD: + case DEBUG_TQUIT_CMD: /* allow the stylesheet to exit */ - xslDebugStatus = DEBUG_QUIT; + xslDebugStatus = DEBUG_TQUIT; exitShell++; cmdResult = 1; break; @@ -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 (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() != 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 (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_BREAKPOINT_CHANGED); walkBreakPoints((xmlHashScanner) xslDbgShellPrintBreakPoint, NULL); @@ -1706,7 +1706,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, if(tempBaseName){ xsldbgGenericErrorFunc("\n"); xsldbgGenericErrorFunc((char*)dir); - xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2").arg(xsldbgUrl(tempBaseName)).arg(xmlGetLineNo(ctxt->node))); + xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2").tqarg(xsldbgUrl(tempBaseName)).tqarg(xmlGetLineNo(ctxt->node))); xmlFree(tempBaseName); cmdResult = 1; } @@ -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_QUIT; + xslDebugStatus = DEBUG_TQUIT; 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_QUIT; + xslDebugStatus = DEBUG_TQUIT; return; } else break; @@ -1885,7 +1885,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, if (splitString(arg, 1, &systemID) == 1){ cmdResult = xslDbgSystem(systemID); }else{ - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("system")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("system")); } } break; @@ -1898,7 +1898,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, if (splitString(arg, 1, &publicID) == 1){ cmdResult = xslDbgPublic(publicID); }else{ - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("public")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("public")); } } break; @@ -1908,7 +1908,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; case DEBUG_VALIDATE_CMD: - xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("validate")); + xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("validate")); cmdResult = 0; /* * xmlShellValidate(ctxt, arg, NULL, NULL); @@ -1929,7 +1929,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; case DEBUG_WRITE_CMD: - xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("write")); + xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("write")); cmdResult = 0; /* * xmlShellWrite(ctxt, arg, NULL, NULL); @@ -1937,7 +1937,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; case DEBUG_FREE_CMD: - xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("free")); + xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("free")); cmdResult = 0; /* * if (arg[0] == 0) { @@ -1993,7 +1993,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, /* gdb does to say anything after redirecting its output */ if (optionsGetIntOption(OPTIONS_GDB) < 2) - xsldbgGenericErrorFunc(i18n("Opening terminal %1.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Opening terminal %1.\n").tqarg(xsldbgText(arg))); cmdResult = 1; } else cmdResult = 0; @@ -2009,11 +2009,11 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, bindtextdomain("kdewebdev/xsldbg", LOCALE_PREFIX); cmdResult = 1; }else{ - xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("lang")); + xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("lang")); cmdResult = 0; } #else - xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled\n").arg("lang")); + xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled\n").tqarg("lang")); cmdResult = 1; #endif break; @@ -2058,7 +2058,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; default: - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("showmatch")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("showmatch")); } break; @@ -2077,7 +2077,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, break; default: - xsldbgGenericErrorFunc(i18n("Error: Unknown command %1. Try help.\n").arg(xsldbgText(command))); + xsldbgGenericErrorFunc(i18n("Error: Unknown command %1. Try help.\n").tqarg(xsldbgText(command))); cmdResult = 0; } @@ -2088,9 +2088,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, ctxt->node->doc && ctxt->node->doc->URL) { if (xmlGetLineNo(ctxt->node) != -1) - xsldbgGenericErrorFunc(i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(ctxt->node->doc->URL)).arg(xmlGetLineNo(ctxt->node))); + xsldbgGenericErrorFunc(i18n("Breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(ctxt->node->doc->URL)).tqarg(xmlGetLineNo(ctxt->node))); else - xsldbgGenericErrorFunc(i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(ctxt->node->doc->URL))); + xsldbgGenericErrorFunc(i18n("Breakpoint at text node in file \"%1\".\n").tqarg(xsldbgUrl(ctxt->node->doc->URL))); } } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp index 10abbaf7..a58d0168 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 (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { /* notify that we are starting new list of entity names */ notifyListStart(XSLDBG_MSG_ENTITIY_CHANGED); for (entityIndex = 0; @@ -68,7 +68,7 @@ xslDbgEntities(void) entityIndex); if (entInfo) { /* display identifier of an XML entity */ - xsldbgGenericErrorFunc(i18n("Entity %1 ").arg(xsldbgText(entInfo->SystemID))); + xsldbgGenericErrorFunc(i18n("Entity %1 ").tqarg(xsldbgText(entInfo->SystemID))); if (entInfo->PublicID) xsldbgGenericErrorFunc(xsldbgText(entInfo->PublicID)); xsldbgGenericErrorFunc("\n"); @@ -111,22 +111,22 @@ xslDbgSystem(const xmlChar * arg) } name = xmlCatalogResolveSystem(arg); - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { if (name) { notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, name); result = 1; xmlFree(name); } else { notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, ""); - xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg))); } } else { if (name) { - xsldbgGenericErrorFunc(i18n("SystemID \"%1\" maps to: \"%2\"\n").arg(xsldbgText(arg)).arg(xsldbgText(name))); + xsldbgGenericErrorFunc(i18n("SystemID \"%1\" maps to: \"%2\"\n").tqarg(xsldbgText(arg)).tqarg(xsldbgText(name))); xmlFree(name); result = 1; } else { - xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg))); } } @@ -158,22 +158,22 @@ xslDbgPublic(const xmlChar * arg) } name = xmlCatalogResolvePublic(arg); - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { if (name) { notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, name); result = 1; xmlFree(name); } else { notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, ""); - xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg))); } } else { if (name) { - xsldbgGenericErrorFunc(i18n("PublicID \"%1\" maps to: \"%2\"\n").arg(xsldbgText(arg)).arg(xsldbgText(name))); + xsldbgGenericErrorFunc(i18n("PublicID \"%1\" maps to: \"%2\"\n").tqarg(xsldbgText(arg)).tqarg(xsldbgText(name))); xmlFree(name); result = 1; } else { - xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg))); } xsltGenericError(xsltGenericErrorContext, "%s", buffer); } @@ -210,7 +210,7 @@ xslDbgEncoding(xmlChar * arg) result = 1; } } else - xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("encoding")); + xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("encoding")); return result; } @@ -245,7 +245,7 @@ int xslDbgShellOutput(const xmlChar *arg) notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L); result = 1; } else if (!xmlStrnCmp(arg, "ftp://", 6) || !xmlStrnCmp(arg, "http://", 7)){ - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("output")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("output")); return 0; } else { /* assume that we were provided a local file name @@ -262,11 +262,11 @@ int xslDbgShellOutput(const xmlChar *arg) xmlFree(expandedName); result = 1; }else{ - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("output")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("output")); } } } else { - xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("output")); + xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("output")); } return result; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp index 73d3713b..df764b0b 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp @@ -189,7 +189,7 @@ openTerminal(xmlChar * device) termName = xmlMemStrdup((char *) device); result = 1; } else { - xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").arg(xsldbgText(termName))); + xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").tqarg(xsldbgText(termName))); } } else { xsldbgGenericErrorFunc(i18n("Error: Did not previously open terminal.\n")); @@ -212,7 +212,7 @@ openTerminal(xmlChar * device) termName = xmlMemStrdup((char *) device); result = 1; } else { - xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").arg(xsldbgText(device))); + xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").tqarg(xsldbgText(device))); } } @@ -494,7 +494,7 @@ changeDir(const xmlChar * path) return result; /* out of memory ? */ if (xmlStrLen(expandedName) + 1 > sizeof(filesBuffer)) { - xsldbgGenericErrorFunc(i18n("Error: The file name \"%1\" is too long.\n").arg(xsldbgText(path))); + xsldbgGenericErrorFunc(i18n("Error: The file name \"%1\" is too long.\n").tqarg(xsldbgText(path))); return result; } @@ -518,10 +518,10 @@ changeDir(const xmlChar * path) } xmlFree(expandedName); /* this will always be valid time */ if (!result) { - xsldbgGenericErrorFunc(i18n("Error: Unable to change to directory %1.\n").arg(xsldbgText(path))); + xsldbgGenericErrorFunc(i18n("Error: Unable to change to directory %1.\n").tqarg(xsldbgText(path))); } else { if (xslDebugStatus != DEBUG_NONE) - xsldbgGenericErrorFunc(i18n("Changed to directory %1.\n").arg(xsldbgText(path))); + xsldbgGenericErrorFunc(i18n("Changed to directory %1.\n").tqarg(xsldbgText(path))); } return result; } @@ -549,7 +549,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType) case FILES_XMLFILE_TYPE: if (path && xmlStrLen(path)) { if (optionsGetIntOption(OPTIONS_SHELL)) { - xsldbgGenericErrorFunc(i18n("Setting XML Data file name to %1.\n").arg(xsldbgText(path))); + xsldbgGenericErrorFunc(i18n("Setting XML Data file name to %1.\n").tqarg(xsldbgText(path))); } optionsSetStringOption(OPTIONS_DATA_FILE_NAME, path); } @@ -561,7 +561,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType) case FILES_SOURCEFILE_TYPE: if (path && xmlStrLen(path)) { if (optionsGetIntOption(OPTIONS_SHELL)) { - xsldbgGenericErrorFunc(i18n("Setting stylesheet file name to %1.\n").arg(xsldbgText(path))); + xsldbgGenericErrorFunc(i18n("Setting stylesheet file name to %1.\n").tqarg(xsldbgText(path))); } optionsSetStringOption(OPTIONS_SOURCE_FILE_NAME, path); } @@ -578,7 +578,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType) stylePathName = (xmlChar *) xmlMemStrdup(docUrl); stylePathName[lastSlash - docUrl + 1] = '\0'; if (optionsGetIntOption(OPTIONS_SHELL)) { - xsldbgGenericErrorFunc(i18n("Setting stylesheet base path to %1.\n").arg(xsldbgText(stylePathName))); + xsldbgGenericErrorFunc(i18n("Setting stylesheet base path to %1.\n").tqarg(xsldbgText(stylePathName))); } } else { const char cwd[4] = { '.', PATHCHAR, '\0' }; @@ -939,7 +939,7 @@ filesEntityRef(xmlEntityPtr ent, xmlNodePtr firstNode, xmlNodePtr lastNode) /** * filesSetBaseUri: - * @node : Is valid and has a doc parent + * @node : Is valid and has a doc tqparent * @uri : Is Valid * * Set the base uri for this node. Function is used when xml file @@ -972,7 +972,7 @@ filesSetBaseUri(xmlNodePtr node, const xmlChar * uri) /** * filesGetBaseUri: - * @node : Is valid and has a doc parent + * @node : Is valid and has a doc tqparent * * Get a copy of the base uri for this node. Function is most usefull * used when xml file has external entities in its DTD @@ -1176,12 +1176,12 @@ filesSetEncoding(const char *encoding) if (!result) { xmlCharEncCloseFunc(stdoutEncoding); stdoutEncoding = NULL; - xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").arg(xsldbgText(encoding))); + xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").tqarg(xsldbgText(encoding))); } else optionsSetStringOption(OPTIONS_ENCODING, (xmlChar *) encoding); } else { - xsldbgGenericErrorFunc(i18n("Invalid encoding %1.\n").arg(xsldbgText(encoding))); + xsldbgGenericErrorFunc(i18n("Invalid encoding %1.\n").tqarg(xsldbgText(encoding))); } } else { /* close encoding and use UTF-8 */ @@ -1360,7 +1360,7 @@ xmlChar *filesURItoFileName(const xmlChar* uri) result = NULL; } }else{ - xsldbgGenericErrorFunc(i18n("Error: Unable to convert %1 to local file name.\n").arg(xsldbgText(uri))); + xsldbgGenericErrorFunc(i18n("Error: Unable to convert %1 to local file name.\n").tqarg(xsldbgText(uri))); } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.h b/kxsldbg/kxsldbgpart/libxsldbg/files.h index 05e49828..0dd9a3e1 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/files.h @@ -138,7 +138,7 @@ extern "C" { /** * filesSetBaseUri: - * @node : Is valid and has a doc parent + * @node : Is valid and has a doc tqparent * @uri : Is Valid * * Set the base uri for this node. Function is used when xml file @@ -154,7 +154,7 @@ extern "C" { * Set the base uri for this node. Function is used when xml file * has external entities in its DTD * - * @param node Is valid and has a doc parent + * @param node Is valid and has a doc tqparent * @param uri Is Valid * * @returns 1 if successful, @@ -169,7 +169,7 @@ extern "C" { /** * filesGetBaseUri: - * @node : Is valid and has a doc parent + * @node : Is valid and has a doc tqparent * * Get a copy of the base uri for this node. Function is most usefull * used when xml file has external entities in its DTD @@ -184,7 +184,7 @@ extern "C" { * Get a copy of the base uri for this node. Function is most usefull * used when xml file has external entities in its DTD * - * @param node : Is valid and has a doc parent + * @param node : Is valid and has a doc tqparent * * @returns The a copy of the base uri for this node, * NULL otherwise diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp index db06ad2f..ec49e7e9 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", QUOTECHAR, args, - QUOTECHAR); + snprintf(helpParam, 100, "--param help:%c'%s'%c", TQUOTECHAR, args, + TQUOTECHAR); } else xmlStrCpy(helpParam, ""); if (docsDirPath && filesTempFileName(0)) { @@ -79,15 +79,15 @@ helpTop(const xmlChar * args) " --cd %s " "xsldbghelp.xsl xsldbghelp.xml", XSLDBG_BIN, helpParam, - QUOTECHAR, VERSION, QUOTECHAR, - QUOTECHAR, xsldbgVerTxt.utf8().data(), QUOTECHAR, - QUOTECHAR, helpDocVerTxt.utf8().data(), QUOTECHAR, - QUOTECHAR, helpErrorTxt.utf8().data(), QUOTECHAR, + TQUOTECHAR, VERSION, TQUOTECHAR, + TQUOTECHAR, xsldbgVerTxt.utf8().data(), TQUOTECHAR, + TQUOTECHAR, helpDocVerTxt.utf8().data(), TQUOTECHAR, + TQUOTECHAR, helpErrorTxt.utf8().data(), TQUOTECHAR, filesTempFileName(0), docsDirPath); if (xslDbgShellExecute((xmlChar *) buff, optionsGetIntOption(OPTIONS_VERBOSE)) == 0) { if (docsDirPath) - xsldbgGenericErrorFunc(i18n("Error: Unable to display help. Help files not found in %1 or xsldbg not found in path.\n").arg(docsDirPath)); /* FIXME: Comments not correct - the command is that invoked */ + xsldbgGenericErrorFunc(i18n("Error: Unable to display help. Help files not found in %1 or xsldbg not found in path.\n").tqarg(docsDirPath)); /* FIXME: Comments not correct - the command is that invoked */ else xsldbgGenericErrorFunc(i18n("Error: Unable to find xsldbg or help files.\n")); } else { diff --git a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp index 5fcbef00..67dbcbe8 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 getThreadStatus */ +#include "xsldbgthread.h" /* for getThreadtqStatus */ #include "files.h" #include "options.h" @@ -137,7 +137,7 @@ xslDbgShellPrintList(xmlShellCtxtPtr ctxt, xmlChar * arg, int dir) } xmlXPathFreeObject(list); } else { - xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(arg))); } ctxt->pctxt->node = NULL; } @@ -172,7 +172,7 @@ xslDbgCatToFile(xmlNodePtr node, FILE * file) const xmlChar *encoding = doc->encoding; if (encoding) { - xsldbgGenericErrorFunc(i18n("Information: Temporarily setting document's encoding to UTF-8. Previously was %1.\n").arg(xsldbgText(encoding))); + xsldbgGenericErrorFunc(i18n("Information: Temporarily setting document's encoding to UTF-8. Previously was %1.\n").tqarg(xsldbgText(encoding))); } doc->encoding = (xmlChar *) "UTF-8"; xmlDocDump(file, (xmlDocPtr) node); @@ -226,7 +226,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){ break; file = fopen(fileName, "w+"); if (!file) { - xsldbgGenericErrorFunc(i18n("Error: Unable to save temporary results to %1.\n").arg(xsldbgText(fileName))); + xsldbgGenericErrorFunc(i18n("Error: Unable to save temporary results to %1.\n").tqarg(xsldbgText(fileName))); break; } else { fprintf(file, "= %s\n", xPath); @@ -240,7 +240,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){ nodeTab[indx], file); } } else { - xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(xPath))); + xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(xPath))); } break; @@ -268,7 +268,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){ fprintf(file,"\n"); } /* inner switch statement */ - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { fclose(file); file = NULL; /* send the data to application */ @@ -338,16 +338,16 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, { xmlXPathObjectPtr list; int result = 0; - static const char * QUIET_STR = "-q"; + static const char * TQUIET_STR = "-q"; bool silenceCtxtErrors = false; if ((arg == NULL) || (xmlStrLen(arg) == 0)) arg = (xmlChar *) "."; /* Do we quietly ingore style context errors */ - if (strncasecmp((char*)arg, QUIET_STR, strlen(QUIET_STR))== 0){ + if (strncasecmp((char*)arg, TQUIET_STR, strlen(TQUIET_STR))== 0){ silenceCtxtErrors = true; - arg = arg + strlen(QUIET_STR); + arg = arg + strlen(TQUIET_STR); while (isspace(*arg)){ arg++; } @@ -380,7 +380,7 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, result = printXPathObject(list, arg); xmlXPathFreeObject(list); } else { - xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(arg))); } ctxt->pctxt->node = NULL; return result; @@ -403,7 +403,7 @@ xslDbgShellPrintNames(void *payload, { Q_UNUSED(payload); Q_UNUSED(data); - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListQueue(payload); } else if (payload && name) { xmlChar * fullQualifiedName = nodeViewBuffer; @@ -415,19 +415,19 @@ xslDbgShellPrintNames(void *payload, item->nameURI, item->name); } if (printVariableValue == 0){ - xsldbgGenericErrorFunc(i18n(" Global %1\n").arg(xsldbgText(fullQualifiedName))); + xsldbgGenericErrorFunc(i18n(" Global %1\n").tqarg(xsldbgText(fullQualifiedName))); }else{ if (item->computed == 1){ xsldbgGenericErrorFunc(i18n(" Global ")); printXPathObject(item->value, fullQualifiedName); }else if (item->tree){ - xsldbgGenericErrorFunc(i18n(" Global = %1\n").arg(xsldbgText(fullQualifiedName))); + xsldbgGenericErrorFunc(i18n(" Global = %1\n").tqarg(xsldbgText(fullQualifiedName))); xslDbgCatToFile(item->tree, stderr); }else if (item->select){ - xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select))); + xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select))); }else{ /* can't find a value give only a variable name an error message */ - xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n"))); + xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n"))); } xsltGenericError(xsltGenericErrorContext, "\n\032\032\n"); } @@ -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 * QUIET_STR = "-q"; + static const char * TQUIET_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, QUIET_STR, strlen(QUIET_STR))== 0){ + if (strncasecmp((char*)arg, TQUIET_STR, strlen(TQUIET_STR))== 0){ silenceCtxtErrors = true; - arg = arg + strlen(QUIET_STR); + arg = arg + strlen(TQUIET_STR); while (isspace(*arg)){ arg++; } @@ -496,7 +496,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, /* list variables of type requested */ if (type == DEBUG_GLOBAL_VAR) { if (styleCtxt->globalVars) { - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == 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 (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() != 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 (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_LOCALVAR_CHANGED); for (int i = styleCtxt->varsNr; i > styleCtxt->varsBase; i--) { xsltStackElemPtr item = styleCtxt->varsTab[i-1]; @@ -553,19 +553,19 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, item->nameURI, item->name); } if (printVariableValue == 0){ - xsldbgGenericErrorFunc(i18n(" Local %1").arg(xsldbgText(fullQualifiedName))); + xsldbgGenericErrorFunc(i18n(" Local %1").tqarg(xsldbgText(fullQualifiedName))); }else{ if (item->computed == 1){ xsldbgGenericErrorFunc(i18n(" Local ")); printXPathObject(item->value, fullQualifiedName); }else if (item->tree){ - xsldbgGenericErrorFunc(i18n(" Local = %1\n").arg(xsldbgText(fullQualifiedName))); + xsldbgGenericErrorFunc(i18n(" Local = %1\n").tqarg(xsldbgText(fullQualifiedName))); xslDbgCatToFile(item->tree, stderr); }else if (item->select){ - xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select))); + xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select))); }else{ /* can't find a value give only a variable name and an error */ - xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n"))); + xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n"))); } } xsltGenericError(xsltGenericErrorContext, "\n\032\032\n"); @@ -577,7 +577,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg, result = 1; xsltGenericError(xsltGenericErrorContext, "\n"); } else { - if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() != 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 0bc54364..05ca9a4c 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").arg(xsldbgText(opts[1]))); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").tqarg(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").arg(xsldbgText(opts[1]))); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").tqarg(xsldbgText(opts[1]))); } } else - xsldbgGenericErrorFunc(i18n("Error: Unknown option name %1.\n").arg(xsldbgText(opts[0]))); + xsldbgGenericErrorFunc(i18n("Error: Unknown option name %1.\n").tqarg(xsldbgText(opts[0]))); } } else { - xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("setoption")); + xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("setoption")); } } else { - xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("setoption")); + xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("setoption")); } return result; @@ -137,13 +137,13 @@ xslDbgShellOptions(void) const xmlChar *optionName, *optionValue; /* Print out the integer options and thier values */ - if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() != 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").arg(xsldbgText(optionName)).arg(optionsGetIntOption(OptionTypeEnum(optionIndex)))); + xsldbgGenericErrorFunc(i18n("Option %1 = %2\n").tqarg(xsldbgText(optionName)).tqarg(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").arg(xsldbgText(optionName)).arg((char*)optionValue)); + xsldbgGenericErrorFunc(i18n("Option %1 = \"%2\"\n").tqarg(xsldbgText(optionName)).tqarg((char*)optionValue)); } else { - xsldbgGenericErrorFunc(i18n("Option %1 = \"\"\n").arg(xsldbgText(optionName))); + xsldbgGenericErrorFunc(i18n("Option %1 = \"\"\n").tqarg(xsldbgText(optionName))); } } @@ -234,7 +234,7 @@ xslDbgShellOptions(void) counter++){ watchExpression = (xmlChar*)arrayListGet(optionsGetWatchList(), counter); if (watchExpression){ - xsldbgGenericErrorFunc(i18n(" WatchExpression %1 ").arg(counter + 1)); + xsldbgGenericErrorFunc(i18n(" WatchExpression %1 ").tqarg(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").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Error: Unable to add watch expression \"%1\". It already has been added or it cannot be watched.\n").tqarg(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").arg(xsldbgText(arg))); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a watchID.\n").tqarg(xsldbgText(arg))); return result; } else { result = optionsRemoveWatch(watchID); if (!result) - xsldbgGenericErrorFunc(i18n("Error: Watch expression %1 does not exist.\n").arg(watchID)); + xsldbgGenericErrorFunc(i18n("Error: Watch expression %1 does not exist.\n").tqarg(watchID)); } } return result; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp index 28b8f44c..9d6bd217 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp @@ -112,20 +112,20 @@ static TQString langLookupDir( const TQString &fname ) langs.remove( "C" ); TQStringList::ConstIterator lang; for (lang = langs.begin(); lang != langs.end(); ++lang) - search.append(TQString("%1%2/%3/%4").arg(localDoc[id]).arg(*lang).arg("xsldbg").arg(fname)); + search.append(TQString("%1%2/%3/%4").tqarg(localDoc[id]).tqarg(*lang).tqarg("xsldbg").tqarg(fname)); } // try to locate the file TQStringList::Iterator it; for (it = search.begin(); it != search.end(); ++it) { - TQString baseDir = (*it).left((*it).findRev('/')) ; + TQString baseDir = (*it).left((*it).tqfindRev('/')) ; TQFileInfo info(baseDir + "/"+ fname); if (info.exists() && info.isFile() && info.isReadable()) return baseDir; } - return TQString::null; + return TQString(); } @@ -293,10 +293,10 @@ optionsSetIntOption(OptionTypeEnum optionType, int value) } } else { if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){ - xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); + xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); }else{ #ifdef WITH_XSLDBG_DEBUG_PROCESS - xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("setoption")); + xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("setoption")); #endif } result = 0; @@ -323,10 +323,10 @@ optionsGetIntOption(OptionTypeEnum optionType) result = intOptions[type - OPTIONS_FIRST_INT_OPTIONID]; } else { if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){ - xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); + xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); }else{ #ifdef WITH_XSLDBG_DEBUG_PROCESS - xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options")); + xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("options")); #endif } } @@ -365,10 +365,10 @@ optionsSetStringOption(OptionTypeEnum optionType, const xmlChar * value) result = 1; } else{ if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){ - xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID]))); + xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID]))); }else{ #ifdef WITH_XSLDBG_DEBUG_PROCESS - xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("setoption")); + xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("setoption")); #endif } } @@ -396,10 +396,10 @@ optionsGetStringOption(OptionTypeEnum optionType) result = stringOptions[optionId]; } else{ if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){ - xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); + xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); }else{ #ifdef WITH_XSLDBG_DEBUG_PROCESS - xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options")); + xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("options")); #endif } } @@ -508,7 +508,7 @@ optionsPrintParam(int paramId) paramId); if (paramItem && paramItem->name && paramItem->value) { - xsldbgGenericErrorFunc(i18n(" Parameter %1 %2=\"%3\"\n").arg(paramId).arg(xsldbgText(paramItem->name)).arg(xsldbgText(paramItem->value))); + xsldbgGenericErrorFunc(i18n(" Parameter %1 %2=\"%3\"\n").tqarg(paramId).tqarg(xsldbgText(paramItem->name)).tqarg(xsldbgText(paramItem->value))); result = 1; } return result; @@ -530,7 +530,7 @@ optionsPrintParamList(void) int paramIndex = 0; int itemCount = arrayListCount(optionsGetParamItemList()); - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { if (itemCount > 0) { while (result && (paramIndex < itemCount)) { result = optionsPrintParam(paramIndex++); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp index dac5bb0f..16e1ccf6 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp @@ -45,7 +45,7 @@ xslDbgShellChangeWd(xmlChar * path) /* call function in files.c to do the work */ result = changeDir(path); } else - xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("chdir")); + xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("chdir")); return result; } @@ -69,12 +69,12 @@ xslDbgShellExecute(xmlChar * name, int verbose) /* Quick check to see if we have a command processor; embedded systems * may not have such a thing */ if (system(NULL) == 0) { - xsldbgGenericErrorFunc(i18n("Error: No command processor available for shell command \"%1\".\n").arg(xsldbgText(name))); + xsldbgGenericErrorFunc(i18n("Error: No command processor available for shell command \"%1\".\n").tqarg(xsldbgText(name))); } else { int return_code; if (verbose) - xsldbgGenericErrorFunc(i18n("Information: Starting shell command \"%1\".\n").arg(xsldbgText(name))); + xsldbgGenericErrorFunc(i18n("Information: Starting shell command \"%1\".\n").tqarg(xsldbgText(name))); return_code = system((char *) name); /* JRF: Strictly system returns an implementation defined value - @@ -93,7 +93,7 @@ xslDbgShellExecute(xmlChar * name, int verbose) result = 1; } else { if (verbose) - xsldbgGenericErrorFunc(i18n("Error: Unable to run command. System error %1.\n").arg(return_code)); + xsldbgGenericErrorFunc(i18n("Error: Unable to run command. System error %1.\n").tqarg(return_code)); } } return result; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp index befa330d..52563725 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp @@ -49,7 +49,7 @@ xslDbgShellAddParam(xmlChar * arg) xmlChar *opts[2]; if (!arg) { - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("addparam")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("addparam")); }else{ if ((xmlStrLen(arg) > 1) && splitString(arg, 2, opts) == 2) { int count; @@ -68,11 +68,11 @@ xslDbgShellAddParam(xmlChar * arg) paramItem = optionsParamItemNew(opts[0], opts[1]); result = arrayListAdd(optionsGetParamItemList(), paramItem); } else { - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("addparam")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("addparam")); } } if (!result) - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); else { xsldbgGenericErrorFunc("\n"); } @@ -98,21 +98,21 @@ xslDbgShellDelParam(xmlChar * arg) xmlChar *opts[2]; if (!arg) { - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("delparam")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("delparam")); }else{ if (xmlStrLen(arg) > 0) { if (splitString(arg, 1, opts) == 1) { if ((xmlStrlen(opts[0]) == 0) || !sscanf((char *) opts[0], "%ld", ¶mId)) { - xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg(xsldbgText(opts[0]))); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg(xsldbgText(opts[0]))); } else { result = arrayListDelete(optionsGetParamItemList(), paramId); if (!result) - xsldbgGenericErrorFunc(i18n("Error: Unable to find parameter %1.\n").arg(paramId)); + xsldbgGenericErrorFunc(i18n("Error: Unable to find parameter %1.\n").tqarg(paramId)); } } else { - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("delparam")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("delparam")); } } else { /* Delete all parameters */ @@ -121,7 +121,7 @@ xslDbgShellDelParam(xmlChar * arg) } } if (!result) - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); else xsldbgGenericErrorFunc("\n"); @@ -145,7 +145,7 @@ xslDbgShellShowParam(xmlChar * arg) int result = 0; static const char *errorPrompt = I18N_NOOP("Unable to print parameters"); - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { int paramIndex = 0; int itemCount = arrayListCount(optionsGetParamItemList()); @@ -168,7 +168,7 @@ xslDbgShellShowParam(xmlChar * arg) if (optionsPrintParamList()) result = 1; else - xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt))); xsldbgGenericErrorFunc("\n"); } return result; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h b/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h index dfe57f0c..6fd7a9f3 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef QTNOTIFIER_H -#define QTNOTIFIER_H +#ifndef TQTNOTIFIER_H +#define TQTNOTIFIER_H #if defined WIN32 #include <libxsldbg/xsldbgwin32config.h> diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp index 68fcd7e1..90cc9a10 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp @@ -404,7 +404,7 @@ searchSave(const xmlChar * fileName) if (xmlSaveFormatFile((char *) searchInput, searchDataBase, 1) != -1){ result = 1; }else{ - xsldbgGenericErrorFunc(i18n("Error: Unable to write search Database to file %1. Try setting the \"searchresultspath\" option to a writable path.\n").arg(xsldbgText(searchInput))); + xsldbgGenericErrorFunc(i18n("Error: Unable to write search Database to file %1. Try setting the \"searchresultspath\" option to a writable path.\n").tqarg(xsldbgText(searchInput))); } if (searchInput) @@ -479,9 +479,9 @@ searchQuery(const xmlChar * tempFile, const xmlChar * outputFile, result = filesMoreFile(searchOutput, NULL); } - xsldbgGenericErrorFunc(i18n("Information: Transformed %1 using %2 and saved to %3.\n").arg(xsldbgText(searchInput)).arg(xsldbgText(searchXSL)).arg(xsldbgText(searchOutput))); + xsldbgGenericErrorFunc(i18n("Information: Transformed %1 using %2 and saved to %3.\n").tqarg(xsldbgText(searchInput)).tqarg(xsldbgText(searchXSL)).tqarg(xsldbgText(searchOutput))); } else { - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("search")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("search")); } if (searchInput) @@ -720,7 +720,7 @@ findTemplateNode(xsltStylesheetPtr style, const xmlChar * name) } if (!result) - xsldbgGenericErrorFunc(i18n("Error: XSLT template named \"%1\" was not found.\n").arg(xsldbgText(name))); + xsldbgGenericErrorFunc(i18n("Error: XSLT template named \"%1\" was not found.\n").tqarg(xsldbgText(name))); return result; } @@ -1334,16 +1334,16 @@ searchLocalNode(xmlNodePtr variable) xmlNodePtr node = NULL; int result = 1; xmlChar *value; - xmlNodePtr parent; + xmlNodePtr tqparent; if (variable) { node = searchGlobalNode(variable); if (node) { /* if unable to create any property failed then result will be equal to 0 */ - parent = variable->parent; + tqparent = variable->parent; /* try to find out what template this variable belongs to */ - if (parent && IS_XSLT_NAME(parent, "template")) { - value = xmlGetProp(parent, (xmlChar *) "name"); + if (tqparent && IS_XSLT_NAME(tqparent, "template")) { + value = xmlGetProp(tqparent, (xmlChar *) "name"); if (value) { result = result && @@ -1351,7 +1351,7 @@ searchLocalNode(xmlNodePtr variable) != NULL); xmlFree(value); } - value = xmlGetProp(parent, (xmlChar *) "match"); + value = xmlGetProp(tqparent, (xmlChar *) "match"); if (value) { result = result && @@ -1398,7 +1398,7 @@ searchSourceNode(xsltStylesheetPtr style) != NULL); if (style->parent && style->parent->doc) { result = result && - (xmlNewProp(node, (xmlChar *) "parent", + (xmlNewProp(node, (xmlChar *) "tqparent", style->parent->doc->URL) != NULL); } if (result) { diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp index 1dc65190..d4bf51b1 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp @@ -53,7 +53,7 @@ xslDbgShellSearch(xsltTransformContextPtr styleCtxt, #ifdef USE_DOCS_MACRO xsldbgGenericErrorFunc(i18n("Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n")); #else - xsldbgGenericErrorFunc(i18n("Error: Required environment variable %1 not set to the directory of xsldbg documentation.\n").arg((const char*)XSLDBG_DOCS_DIR_VARIABLE)); + xsldbgGenericErrorFunc(i18n("Error: Required environment variable %1 not set to the directory of xsldbg documentation.\n").tqarg((const char*)XSLDBG_DOCS_DIR_VARIABLE)); #endif return result; /* failed */ } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp index 261c0ebe..1f0a3663 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 getThreadStatus */ +#include "xsldbgthread.h" /* for getThreadtqStatus */ static int printCounter; /* Dangerous name think of a better one */ @@ -117,7 +117,7 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose, if (templ->match) name = xmlStrdup(templ->match); else - name = fullQName(templ->nameURI, templ->name); + name = fullTQName(templ->nameURI, templ->name); if (name) { if (templateName && @@ -127,14 +127,14 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose, } else { xmlChar *modeTemp = NULL; *count = *count + 1; - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListQueue(templ); } else { - modeTemp = fullQName(templ->modeURI, templ->mode); + modeTemp = fullTQName(templ->modeURI, templ->mode); if (verbose) - xsldbgGenericErrorFunc(i18n(" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n").arg(xsldbgText(name)).arg(xsldbgText(modeTemp)).arg(xsldbgUrl(url)).arg(xmlGetLineNo(templ->elem))); + xsldbgGenericErrorFunc(i18n(" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n").tqarg(xsldbgText(name)).tqarg(xsldbgText(modeTemp)).tqarg(xsldbgUrl(url)).tqarg(xmlGetLineNo(templ->elem))); else - xsldbgGenericErrorFunc(TQString("\"%s\" ").arg(xsldbgText(name))); + xsldbgGenericErrorFunc(TQString("\"%s\" ").tqarg(xsldbgText(name))); if (modeTemp) xmlFree(modeTemp); } @@ -196,7 +196,7 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt, curStyle = NULL; } - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_TEMPLATE_CHANGED); while (curStyle) { templ = curStyle->templates; @@ -254,11 +254,11 @@ xslDbgShellPrintStylesheetsHelper(void *payload, xsltStylesheetPtr style = (xsltStylesheetPtr) payload; if (style && style->doc && style->doc->URL) { - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) notifyListQueue(payload); else /* display the URL of stylesheet */ - xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(style->doc->URL))); + xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(style->doc->URL))); printCounter++; } } @@ -283,11 +283,11 @@ xslDbgShellPrintStylesheetsHelper2(void *payload, xmlNodePtr node = (xmlNodePtr) payload; if (node && node->doc && node->doc->URL) { - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) notifyListQueue(payload); else /* display the URL of stylesheet */ - xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(node->doc->URL))); + xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(node->doc->URL))); printCounter++; } } @@ -307,7 +307,7 @@ xslDbgShellPrintStyleSheets(xmlChar * arg) { Q_UNUSED(arg); printCounter = 0; - if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { notifyListStart(XSLDBG_MSG_SOURCE_CHANGED); walkStylesheets((xmlHashScanner) xslDbgShellPrintStylesheetsHelper, NULL, filesGetStylesheet()); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp index 3893be67..bfce530e 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp @@ -65,7 +65,7 @@ xslDbgShellWalk(xmlChar * arg) if (xmlStrLen(arg) && (!sscanf((char *) arg, "%ld", &speed) || ((speed < 0) || (speed > 9)))) { - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("walk")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("walk")); xsldbgGenericErrorFunc(i18n("Warning: Assuming normal speed.\n")); speed = WALKSPEED_NORMAL; } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/utils.cpp b/kxsldbg/kxsldbgpart/libxsldbg/utils.cpp index c63c07fc..d1005fdd 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/utils.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/utils.cpp @@ -156,8 +156,8 @@ lookupName(xmlChar * name, xmlChar ** matchList) } /** - * fullQName: - * @nameURI : QName part of name + * fullTQName: + * @nameURI : TQName part of name * @name : Local part of name * * Join nameURI to name @@ -166,7 +166,7 @@ lookupName(xmlChar * name, xmlChar ** matchList) * */ -xmlChar * fullQName(const xmlChar* nameURI, const xmlChar * name) +xmlChar * fullTQName(const xmlChar* nameURI, const xmlChar * name) { xmlChar *result = NULL; if (!nameURI && !name) diff --git a/kxsldbg/kxsldbgpart/libxsldbg/utils.h b/kxsldbg/kxsldbgpart/libxsldbg/utils.h index e5cd4bfc..7791923b 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 QUOTECHAR ' ' +#define TQUOTECHAR ' ' #define PATHCHAR '\\' #else -#define QUOTECHAR '\"' +#define TQUOTECHAR '\"' #define PATHCHAR '/' #endif @@ -182,8 +182,8 @@ extern "C" { #ifdef USE_GNOME_DOCS /** - * fullQName: - * @nameURI : QName part of name + * fullTQName: + * @nameURI : TQName part of name * @name : Local part of name * * Join nameURI to name @@ -200,8 +200,8 @@ extern "C" { * * @returns a copy of "nameURI:name" - * fullQName: - * @param nameURI : QName part of name + * fullTQName: + * @param nameURI : TQName part of name * @param name : Local part of name * * @@ -209,7 +209,7 @@ extern "C" { #endif #endif - xmlChar * fullQName(const xmlChar* nameURI, const xmlChar * name); + xmlChar * fullTQName(const xmlChar* nameURI, const xmlChar * name); #ifdef __cplusplus } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp index a00769f4..90987949 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp @@ -19,7 +19,7 @@ #include <libxml/xpath.h> #include <libxslt/xsltInternals.h> #include <libxslt/variables.h> /* needed for xsltVariablesComp */ -#include <libxml/valid.h> /* needed for xmlSplitQName2 */ +#include <libxml/valid.h> /* needed for xmlSplitTQName2 */ #include "xsldbg.h" #include "debugXSL.h" #include "search.h" @@ -99,7 +99,7 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg) xsldbgGenericErrorFunc(i18n("Error: Cannot change a variable that does not use the select attribute.\n")); } } else - xsldbgGenericErrorFunc(i18n("Error: Variable %1 was not found.\n").arg(xsldbgText(name))); + xsldbgGenericErrorFunc(i18n("Error: Variable %1 was not found.\n").tqarg(xsldbgText(name))); xmlFree(name); } else xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n")); @@ -108,7 +108,7 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg) } if (showUsage == 1) - xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("set")); + xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("set")); } return result; } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 52066acf..70a68570 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 getThreadStatus */ +#include "xsldbgthread.h" /* for getThreadtqStatus */ #ifdef HAVE_READLINE # include <readline/readline.h> # ifdef HAVE_HISTORY @@ -267,7 +267,7 @@ endTimer(const TQString& message) #error "endTimer required stdarg functions" #endif /* Display the time taken to complete this task */ - xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").arg(message).arg(msec)); + xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").tqarg(message).tqarg(msec)); } #elif defined(HAVE_TIME_H) @@ -295,7 +295,7 @@ endTimer(const TQString& message) #error "endTimer required stdarg functions" #endif /* Display the time taken to complete this task */ - xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").arg(message).arg(msec)); + xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").tqarg(message).tqarg(msec)); } #else @@ -317,7 +317,7 @@ endTimer(const TQString& message) */ #ifdef HAVE_STDARG_H /* Display the time taken to complete this task */ - xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n"),arg(message).arg(msec)); + xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n"),arg(message).tqarg(msec)); #else /* We don't have gettimeofday, time or stdarg.h, what crazy world is * this ?! @@ -358,7 +358,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) xmlXIncludeProcess(doc); if (optionsGetIntOption(OPTIONS_TIMING)) { /* Display the time taken to do XInclude processing */ - endTimer(i18n("XInclude processing %1.").arg((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME))); + endTimer(i18n("XInclude processing %1.").tqarg((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME))); } } #endif @@ -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) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) + NULL) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) || (filesTempFileName(1) == NULL)) res = xsltProfileStylesheet(cur, doc, params, stderr); else { @@ -396,7 +396,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) notifyXsldbgApp(XSLDBG_MSG_FILEOUT, filesTempFileName(1)); } else { - xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").arg(filesTempFileName(1))); + xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").tqarg(filesTempFileName(1))); res = xsltProfileStylesheet(cur, doc, params, stderr); } } @@ -429,7 +429,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) if (terminalIO != NULL) xmlDebugDumpDocument(terminalIO, res); else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) == - NULL) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) + NULL) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) || (filesTempFileName(1) == NULL)) xmlDebugDumpDocument(stdout, res); else { @@ -443,7 +443,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) notifyXsldbgApp(XSLDBG_MSG_FILEOUT, filesTempFileName(1)); } else { - xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").arg(filesTempFileName(1))); + xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").tqarg(filesTempFileName(1))); xmlDebugDumpDocument(stdout, res); } @@ -455,7 +455,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) if (cur->methodURI == NULL) { if (optionsGetIntOption(OPTIONS_TIMING)) startTimer(); - if (xslDebugStatus != DEBUG_QUIT) { + if (xslDebugStatus != DEBUG_TQUIT) { if (terminalIO != NULL) bytesWritten = xsltSaveResultToFile(terminalIO, res, cur); else if (optionsGetStringOption @@ -490,7 +490,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) /* Indicate how long it took to save to file */ endTimer(i18n("Saving result")); } else { - xsldbgGenericErrorFunc(i18n("Warning: Unsupported, non-standard output method %1.\n").arg(xsldbgText(cur->method))); + xsldbgGenericErrorFunc(i18n("Warning: Unsupported, non-standard output method %1.\n").tqarg(xsldbgText(cur->method))); } } } @@ -513,7 +513,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur) } } if ((xslDebugStatus != DEBUG_RUN_RESTART) && (bytesWritten == -1)) - xsldbgGenericErrorFunc(i18n("Error: Unable to save results of transformation to file %1.\n").arg(xsldbgText(optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)))); + xsldbgGenericErrorFunc(i18n("Error: Unable to save results of transformation to file %1.\n").tqarg(xsldbgText(optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)))); } int @@ -532,7 +532,7 @@ xsldbgMain(int argc, char **argv) xmlDocPtr doc; KCmdLineArgs *args = 0; - if (getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED) + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED) args = KCmdLineArgs::parsedArgs(); errorFile = stderr; @@ -619,7 +619,7 @@ xsldbgMain(int argc, char **argv) } } - if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED){ + if (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED){ result = optionsSetIntOption(OPTIONS_SHELL, 1); } /* copy the volitile options over to xsldbg */ @@ -672,7 +672,7 @@ xsldbgMain(int argc, char **argv) for ( it = xslParams.begin(); it != xslParams.end(); ++it){ param = (*it); paramOK = true; - separatorIdx = param.find(':'); + separatorIdx = param.tqfind(':'); if (separatorIdx > 0){ paramName = param.left((uint)separatorIdx); paramValue = param.mid((uint)separatorIdx + 1); @@ -689,7 +689,7 @@ xsldbgMain(int argc, char **argv) paramOK = false; } if (!paramOK) - xsldbgGenericErrorFunc(i18n("Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n").arg(param.data())); + xsldbgGenericErrorFunc(i18n("Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n").tqarg(param.data())); } TQCString cdPath = args->getOption("cd"); @@ -719,7 +719,7 @@ xsldbgMain(int argc, char **argv) debugGotControl(0); - while (xslDebugStatus != DEBUG_QUIT) { + while (xslDebugStatus != DEBUG_TQUIT) { 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_QUIT; /* panic !! */ + xslDebugStatus = DEBUG_TQUIT; /* panic !! */ result = 0; } } @@ -776,21 +776,21 @@ xsldbgMain(int argc, char **argv) doc = filesGetMainDoc(); if (doc == NULL) { if (xslDebugStatus == DEBUG_NONE) { - xslDebugStatus = DEBUG_QUIT; /* panic !! */ + xslDebugStatus = DEBUG_TQUIT; /* panic !! */ result = 0; } else { /*goto a xsldbg command prompt */ showPrompt = 1; } } else { - if (xslDebugStatus != DEBUG_QUIT) { + if (xslDebugStatus != DEBUG_TQUIT) { xsltProcess(doc, cur); result = 1; } } if (optionsGetIntOption(OPTIONS_SHELL) && (showPrompt == 0)) { - if ((xslDebugStatus != DEBUG_QUIT) + if ((xslDebugStatus != DEBUG_TQUIT) && !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_QUIT; + xslDebugStatus = DEBUG_TQUIT; } } else { /* Some sort of problem loading source file has occured. Quit? */ if (xslDebugStatus == DEBUG_NONE) { - xslDebugStatus = DEBUG_QUIT; /* Panic!! */ + xslDebugStatus = DEBUG_TQUIT; /* 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_QUIT; + xslDebugStatus = DEBUG_TQUIT; result = 0; /* panic */ } @@ -911,13 +911,13 @@ xsldbgLoadStylesheet() startTimer(); style = xmlParseFile((const char *) optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)); if (optionsGetIntOption(OPTIONS_TIMING)) - endTimer(i18n("Parsing stylesheet %1").arg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))); + endTimer(i18n("Parsing stylesheet %1").tqarg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))); if (style == NULL) { - xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)))); + xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)))); cur = NULL; if (!optionsGetIntOption(OPTIONS_SHELL)) { xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n")); - xslDebugStatus = DEBUG_QUIT; + xslDebugStatus = DEBUG_TQUIT; } else { xsltGenericError(xsltGenericErrorContext, "\n"); xslDebugStatus = DEBUG_STOP; @@ -988,16 +988,16 @@ xsldbgLoadXmlData(void) doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); #endif if (doc == NULL) { - xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME)))); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME)))); if (!optionsGetIntOption(OPTIONS_SHELL)) { xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n")); - xslDebugStatus = DEBUG_QUIT; + xslDebugStatus = DEBUG_TQUIT; } else { xsltGenericError(xsltGenericErrorContext, "\n"); xslDebugStatus = DEBUG_STOP; } } else if (optionsGetIntOption(OPTIONS_TIMING)) - endTimer(TQString("Parsing document %1").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data()); + endTimer(TQString("Parsing document %1").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data()); return doc; } @@ -1032,12 +1032,12 @@ xsldbgLoadXmlTemporary(const xmlChar * path) #endif doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0); if (doc == NULL) { - xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(path))); + xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").tqarg(xsldbgUrl(path))); } if (optionsGetIntOption(OPTIONS_TIMING) - && (xslDebugStatus != DEBUG_QUIT)) { - endTimer(TQString("Parsing document %1").arg(xsldbgUrl(path))); + && (xslDebugStatus != DEBUG_TQUIT)) { + endTimer(TQString("Parsing document %1").tqarg(xsldbgUrl(path))); } return doc; } @@ -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 (getThreadStatus() != XSLDBG_MSG_THREAD_RUN){ + if (getThreadtqStatus() != 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 (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED) { + if (getThreadtqStatus() != 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 (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) { + if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) { vsnprintf(msgBuffer, sizeof(msgBuffer), msg, args); notifyTextXsldbgApp(XSLDBG_MSG_TEXTOUT, msgBuffer); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h index 86bd2e4f..57de00b8 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h @@ -36,7 +36,7 @@ class XsldbgDebuggerBase; class XsldbgEventData; -class XsldbgEventDataList : public QGList +class XsldbgEventDataList : public TQGList { public: XsldbgEventDataList(void) {} @@ -64,13 +64,13 @@ public: XsldbgEventData *takeNode( TQLNode *n ) { return (XsldbgEventData *)TQGList::takeNode(n); } void clear(void) { TQGList::clear(); } void sort(void) { TQGList::sort(); } - int find( const XsldbgEventData *d ) { return TQGList::find((TQPtrCollection::Item)d); } - int findNext( const XsldbgEventData *d ) { return TQGList::find((TQPtrCollection::Item)d,FALSE); } - int findRef( const XsldbgEventData *d ) { return TQGList::findRef((TQPtrCollection::Item)d); } - int findNextRef( const XsldbgEventData *d ){ return TQGList::findRef((TQPtrCollection::Item)d,FALSE);} - uint contains( const XsldbgEventData *d ) const { return TQGList::contains((TQPtrCollection::Item)d); } + int tqfind( const XsldbgEventData *d ) { return TQGList::tqfind((TQPtrCollection::Item)d); } + int findNext( const XsldbgEventData *d ) { return TQGList::tqfind((TQPtrCollection::Item)d,FALSE); } + int tqfindRef( const XsldbgEventData *d ) { return TQGList::tqfindRef((TQPtrCollection::Item)d); } + int findNextRef( const XsldbgEventData *d ){ return TQGList::tqfindRef((TQPtrCollection::Item)d,FALSE);} + uint tqcontains( const XsldbgEventData *d ) const { return TQGList::tqcontains((TQPtrCollection::Item)d); } uint containsRef( const XsldbgEventData *d ) const - { return TQGList::containsRef((TQPtrCollection::Item)d); } + { return TQGList::tqcontainsRef((TQPtrCollection::Item)d); } XsldbgEventData *at( uint i ) { return (XsldbgEventData *)TQGList::at(i); } int at(void) const { return TQGList::at(); } XsldbgEventData *current(void) const { return (XsldbgEventData *)TQGList::get(); } @@ -117,7 +117,7 @@ class XsldbgEventData { /** * Get the text from the column specified * - * @returns TQString::null if invalid column number + * @returns TQString() if invalid column number * * @param column 0 =< @p column < XSLDBGEVENT_COLUMNS * @@ -167,54 +167,54 @@ class XsldbgEventData { // These data item is mapped to the text attribute - // /** 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*/, // bool /* enabled */, int /* id */); // These data items are mapped to attributes of this class with the same name - // /** 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 */); // These data items are mapped to attributes of this class with the same name - // /** 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 */); // These data items are mapped to attributes of this class with the same name - // /** 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/libxsldbg/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp index ecb94052..4fb4a6c9 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 threadStatus = XSLDBG_MSG_THREAD_NOTUSED; -static int inputStatus = XSLDBG_MSG_AWAITING_INPUT; +static int threadtqStatus = XSLDBG_MSG_THREAD_NOTUSED; +static int inputtqStatus = 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 -getInputStatus(void) +getInputtqStatus(void) { - return inputStatus; + return inputtqStatus; } void -setInputStatus(XsldbgMessageEnum type) +setInputtqStatus(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 */ - inputStatus = type; + inputtqStatus = type; break; default: @@ -76,26 +76,26 @@ setInputStatus(XsldbgMessageEnum type) /* the compiler will optimize this function to inline and to keep variable private*/ int -getThreadStatus(void) +getThreadtqStatus(void) { - return threadStatus; + return threadtqStatus; } /* reset the status to @p type */ void -setThreadStatus(XsldbgMessageEnum type) +setThreadtqStatus(XsldbgMessageEnum type) { switch (type) { case XSLDBG_MSG_THREAD_NOTUSED: case XSLDBG_MSG_THREAD_INIT: case XSLDBG_MSG_THREAD_RUN: - threadStatus = type; + threadtqStatus = type; break; case XSLDBG_MSG_THREAD_STOP: case XSLDBG_MSG_THREAD_DEAD: - xslDebugStatus = DEBUG_QUIT; - threadStatus = type; + xslDebugStatus = DEBUG_TQUIT; + threadtqStatus = type; break; default: diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h index d83e71f3..00802843 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h @@ -40,13 +40,13 @@ extern "C" { void setAppReady(int ready); - int getInputStatus(void); + int getInputtqStatus(void); - void setInputStatus(XsldbgMessageEnum type); + void setInputtqStatus(XsldbgMessageEnum type); - int getThreadStatus(void); + int getThreadtqStatus(void); - void setThreadStatus(XsldbgMessageEnum type); + void setThreadtqStatus(XsldbgMessageEnum type); void *xsldbgThreadMain(void *data); diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index 1b8d2df3..c57dd521 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -14,18 +14,18 @@ #include <tqptrlist.h> -QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) - : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) +TQXsldbgDoc::TQXsldbgDoc(TQWidget *tqparent, KURL url) + : TQObject(0L, "TQXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); connect(kDoc, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(lockDoc())); connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); if (kDoc){ - kView = kDoc->createView(parent, "QXsldbgDocView"); + kView = kDoc->createView(tqparent, "TQXsldbgDocView"); KURL cleanUrl; // convert paths relative to PWD into a absolute path TQString relUrl = url.prettyURL(); - if (!relUrl.contains(":/")){ + if (!relUrl.tqcontains(":/")){ if (!(relUrl.left(1) == "/")) relUrl.prepend(TQDir::currentDirPath() + "/"); cleanUrl.setFileName(relUrl); @@ -37,7 +37,7 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) } -QXsldbgDoc::~QXsldbgDoc() +TQXsldbgDoc::~TQXsldbgDoc() { if (kDoc){ if (kDoc->views().count() == 1){ @@ -47,7 +47,7 @@ QXsldbgDoc::~QXsldbgDoc() } } -void QXsldbgDoc::slotResult( KIO::Job *job ) +void TQXsldbgDoc::slotResult( KIO::Job *job ) { if ( job->error() != 0 ){ }else{ @@ -55,7 +55,7 @@ void QXsldbgDoc::slotResult( KIO::Job *job ) emit docChanged(); } -KURL QXsldbgDoc::url() const +KURL TQXsldbgDoc::url() const { if (kDoc) return kDoc->url(); @@ -63,7 +63,7 @@ KURL QXsldbgDoc::url() const return KURL(); } -void QXsldbgDoc::refresh() +void TQXsldbgDoc::refresh() { if (kDoc){ KURL lastUrl = kDoc->url(); @@ -73,7 +73,7 @@ void QXsldbgDoc::refresh() } -void QXsldbgDoc::enableBreakPoint(uint lineNumber, bool state) +void TQXsldbgDoc::enableBreakPoint(uint lineNumber, bool state) { if (locked) return; @@ -88,7 +88,7 @@ void QXsldbgDoc::enableBreakPoint(uint lineNumber, bool state) } } -void QXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled) +void TQXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled) { if (locked) return; @@ -102,7 +102,7 @@ void QXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled) } } -void QXsldbgDoc::deleteBreakPoint(uint lineNumber) +void TQXsldbgDoc::deleteBreakPoint(uint lineNumber) { if (locked) return; @@ -113,7 +113,7 @@ void QXsldbgDoc::deleteBreakPoint(uint lineNumber) } -void QXsldbgDoc::clearMarks(bool allMarkTypes) +void TQXsldbgDoc::clearMarks(bool allMarkTypes) { if (locked) return; @@ -134,7 +134,7 @@ void QXsldbgDoc::clearMarks(bool allMarkTypes) } -void QXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint) +void TQXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint) { if (locked) return; @@ -150,12 +150,12 @@ void QXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint) } } -void QXsldbgDoc::lockDoc() +void TQXsldbgDoc::lockDoc() { locked = true; } -void QXsldbgDoc::unlockDoc() +void TQXsldbgDoc::unlockDoc() { locked = false; } diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index abc04448..0f19da1b 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -6,8 +6,8 @@ */ -#ifndef QXSLDBGDOC_H -#define QXSLDBGDOC_H +#ifndef TQXSLDBGDOC_H +#define TQXSLDBGDOC_H #include <kio/job.h> #include <tqptrlist.h> @@ -16,13 +16,14 @@ #include <ktexteditor/document.h> #include <ktexteditor/view.h> -class QXsldbgDoc : public TQObject { +class TQXsldbgDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: - QXsldbgDoc(TQWidget *parent=0, KURL url=TQString::null); - ~QXsldbgDoc(); + TQXsldbgDoc(TQWidget *tqparent=0, KURL url=TQString()); + ~TQXsldbgDoc(); void enableBreakPoint(uint lineNumber, bool state); void addBreakPoint(uint lineNumber, bool enabled); diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp index a94e3a0f..80acb012 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp @@ -18,11 +18,11 @@ #include <klocale.h> #include "xsldbgbreakpointlistitem.h" -XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *parent, +XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *tqparent, TQString fileName, int lineNumber, TQString templateName, TQString modeName, bool enabled, int id) - : XsldbgListItem(parent, 3, fileName, lineNumber) + : XsldbgListItem(tqparent, 3, fileName, lineNumber) { this->id = id; setText(0, TQString::number(id)); diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h index b54d888a..c74cd3dc 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h @@ -26,7 +26,7 @@ class XsldbgBreakpointListItem : public XsldbgListItem { public: - XsldbgBreakpointListItem(TQListView *parent, + XsldbgBreakpointListItem(TQListView *tqparent, TQString fileName, int lineNumber, TQString templateName, TQString modeName, bool enabled, int id); diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui index a5af9c36..98a7e9a7 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgBreakpoints</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XsldbgBreakpoints</cstring> </property> @@ -20,7 +20,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>ID</string> @@ -102,7 +102,7 @@ <string>Click breakpoint in list to modify or delete it</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -116,7 +116,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -130,7 +130,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>idLabel</cstring> </property> @@ -138,7 +138,7 @@ <string>ID:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lineNumberLabel</cstring> </property> @@ -146,7 +146,7 @@ <string>Line number:</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>sourceFileEdit</cstring> </property> @@ -154,7 +154,7 @@ <string>You don't need to specify directory for file name</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>templateNameEdit</cstring> </property> @@ -162,7 +162,7 @@ <string>Template name or match name to look for</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -176,7 +176,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lineNumberEdit</cstring> </property> @@ -188,7 +188,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -217,7 +217,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -231,7 +231,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>idEdit</cstring> </property> @@ -243,7 +243,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -272,12 +272,12 @@ </spacer> </hbox> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>modeNameEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -285,7 +285,7 @@ <string>Mode:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -293,7 +293,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>sourceFileLabel</cstring> </property> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -330,7 +330,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -349,22 +349,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>deleteButton</cstring> </property> @@ -375,7 +375,7 @@ <string>Delete breakpoint using ID</string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>PushButton5</cstring> </property> @@ -386,7 +386,7 @@ <string>Clear entered text</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>addAllButton</cstring> </property> @@ -397,7 +397,7 @@ <string>Add breakpoint on all templates found</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>deleteAllButton</cstring> </property> @@ -408,7 +408,7 @@ <string>Delete all breakpoints</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>enableButton</cstring> </property> @@ -419,7 +419,7 @@ <string>Enable breakpoint using ID</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>addButton</cstring> </property> @@ -442,14 +442,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -473,14 +473,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>refreshBtn</cstring> </property> @@ -498,7 +498,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -512,9 +512,9 @@ <connections> <connection> <sender>breakpointListView</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>XsldbgBreakpoints</receiver> - <slot>selectionChanged(QListViewItem*)</slot> + <slot>selectionChanged(TQListViewItem*)</slot> </connection> <connection> <sender>addButton</sender> @@ -568,15 +568,15 @@ <tabstop>deleteButton</tabstop> <tabstop>enableButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotClear()</slot> <slot>refresh()</slot> - <slot>selectionChanged(QListViewItem*)</slot> + <slot>selectionChanged(TQListViewItem*)</slot> <slot>slotAddBreakpoint()</slot> <slot>slotDeleteBreakpoint()</slot> <slot>slotEnableBreakpoint()</slot> <slot>slotAddAllTemplateBreakpoints()</slot> <slot>slotDeleteAllBreakpoints()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp index ba14d115..f38f1480 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp @@ -26,8 +26,8 @@ XsldbgBreakpointsImpl::XsldbgBreakpointsImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0*/, const char *name /*=0*/) - : XsldbgBreakpoints(parent, name), XsldbgDialogBase() + TQWidget *tqparent /*=0*/, const char *name /*=0*/) + : XsldbgBreakpoints(tqparent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, TQT_SIGNAL(breakpointItem(TQString /* file*/, diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h index 5da172e7..52bbaf6c 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h @@ -28,11 +28,12 @@ class XsldbgDebugger; -class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase { - Q_OBJECT +class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase { + Q_OBJECT + TQ_OBJECT public: - XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgBreakpointsImpl(); /* Return >= 0 if line number entered is valid */ @@ -51,7 +52,7 @@ public slots: void slotEnableBreakpoint(); void selectionChanged(TQListViewItem *item); - /** Recieve notification about breakpoint to add to view, First parameter is TQString::null + /** Recieve notification about breakpoint to add to view, First parameter is TQString() to indicate start of breakpoint list notfication */ void slotProcBreakpointItem(TQString file, int lineNumber, TQString templateName, TQString modeName, diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui index 6203e764..148d3f82 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui +++ b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgCallStack</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XsldbgCallStack</cstring> </property> @@ -26,7 +26,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Frame# Template Name</string> @@ -75,7 +75,7 @@ <string>Oldest Frame # is 0, Frame # has been added to the first column</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -99,14 +99,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>refreshBtn</cstring> </property> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -138,9 +138,9 @@ <connections> <connection> <sender>callStackListView</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>XsldbgCallStack</receiver> - <slot>selectionChanged(QListViewItem*)</slot> + <slot>selectionChanged(TQListViewItem*)</slot> </connection> <connection> <sender>refreshBtn</sender> @@ -149,9 +149,9 @@ <slot>refresh()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>refresh()</slot> - <slot>selectionChanged(QListViewItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>selectionChanged(TQListViewItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp index 9a500b6c..ceadc76e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp @@ -22,8 +22,8 @@ #include "xsldbggloballistitem.h" /* reuse global list item variable as a template list item */ XsldbgCallStackImpl::XsldbgCallStackImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0*/, const char *name /*=0*/) - : XsldbgCallStack(parent, name), XsldbgDialogBase() + TQWidget *tqparent /*=0*/, const char *name /*=0*/) + : XsldbgCallStack(tqparent, name), XsldbgDialogBase() { this->debugger = debugger; diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h index c105b54c..94e5eed6 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h @@ -27,17 +27,18 @@ class XsldbgDebugger; -class XsldbgCallStackImpl : public XsldbgCallStack, public XsldbgDialogBase { - Q_OBJECT +class XsldbgCallStackImpl : public XsldbgCallStack, public XsldbgDialogBase { + Q_OBJECT + TQ_OBJECT public: - XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgCallStackImpl(); public slots: void selectionChanged(TQListViewItem *item); - /** Process request to add callstack to view, First parameter is TQString::null + /** Process request to add callstack to view, First parameter is TQString() to indicate start of callstack list notfication */ void slotProcCallStackItem(TQString templateName, TQString fileName , int lineNumber ); diff --git a/kxsldbg/kxsldbgpart/xsldbgconfig.ui b/kxsldbg/kxsldbgpart/xsldbgconfig.ui index 660d9890..19e64a49 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfig.ui +++ b/kxsldbg/kxsldbgpart/xsldbgconfig.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgConfig</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XsldbgConfig</cstring> </property> @@ -21,7 +21,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>450</height> @@ -34,9 +34,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> @@ -52,14 +52,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox" row="4" column="0"> + <widget class="TQGroupBox" row="4" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -78,15 +78,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout10_2</cstring> </property> @@ -100,7 +100,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>paramValueLabel</cstring> </property> @@ -108,7 +108,7 @@ <string>Parameter value:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>parameterValueEdit</cstring> </property> @@ -126,7 +126,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -140,7 +140,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>paramNameLabel</cstring> </property> @@ -148,7 +148,7 @@ <string>Parameter name:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>parameterNameEdit</cstring> </property> @@ -168,7 +168,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -192,14 +192,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -213,7 +213,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>prevButton</cstring> </property> @@ -229,7 +229,7 @@ <string>Prev</string> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>deleteButton</cstring> </property> @@ -245,7 +245,7 @@ <string>Delete</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>nextButton</cstring> </property> @@ -261,7 +261,7 @@ <string>Next</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>addButton</cstring> </property> @@ -289,7 +289,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -310,14 +310,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="6" column="0"> + <widget class="TQLayoutWidget" row="6" column="0"> <property name="name"> <cstring>Layout18</cstring> </property> @@ -341,14 +341,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton13</cstring> </property> @@ -360,7 +360,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>110</width> <height>0</height> @@ -370,7 +370,7 @@ <string>&Apply</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton14</cstring> </property> @@ -382,7 +382,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>110</width> <height>0</height> @@ -402,7 +402,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -421,14 +421,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -442,7 +442,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -456,7 +456,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>outputFileLabel</cstring> </property> @@ -464,7 +464,7 @@ <string>Output file:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>outputFileEdit</cstring> </property> @@ -472,7 +472,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>outputFileButton</cstring> </property> @@ -490,7 +490,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -504,7 +504,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>xmlSourceLabel</cstring> </property> @@ -512,7 +512,7 @@ <string>XML data:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>xmlDataEdit</cstring> </property> @@ -520,7 +520,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>xmlDataButton</cstring> </property> @@ -538,7 +538,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -552,7 +552,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>xslSourceLabel</cstring> </property> @@ -560,7 +560,7 @@ <string>XSL source:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>xslSourceEdit</cstring> </property> @@ -568,7 +568,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>xslSourceButton</cstring> </property> @@ -588,7 +588,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -613,7 +613,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>catalogsChkBox</cstring> </property> @@ -624,7 +624,7 @@ <string>use catalogs from $SGML_CATALOGS_FILES</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>novalidChkBox</cstring> </property> @@ -635,7 +635,7 @@ <string>skip the DTD loading phase</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>htmlChkBox</cstring> </property> @@ -646,7 +646,7 @@ <string>the input document is(are) an HTML file(s)</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>docbookChkBox</cstring> </property> @@ -657,7 +657,7 @@ <string>the input document is SGML docbook</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>debugChkBox</cstring> </property> @@ -668,7 +668,7 @@ <string>dump the tree of the result instead</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>nooutChkBox</cstring> </property> @@ -679,7 +679,7 @@ <string>do not dump the result</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>profileChkBox</cstring> </property> @@ -690,7 +690,7 @@ <string>print profiling information</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>timingChkBox</cstring> </property> @@ -701,7 +701,7 @@ <string>display the time used</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>nonetChkBox</cstring> </property> @@ -799,7 +799,7 @@ <tabstop>xmlDataEdit</tabstop> <tabstop>xslSourceEdit</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotCancel()</slot> <slot>slotAddParam()</slot> <slot>slotApply()</slot> @@ -812,6 +812,6 @@ <slot>slotPrevParam()</slot> <slot>slotSourcefile(QString)</slot> <slot>slotoutputfile(QString)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp index 19c6bb66..73c76ef8 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp @@ -74,8 +74,8 @@ bool LibxsltParam::isValid() const XsldbgConfigImpl::XsldbgConfigImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0*/, const char *name /*=0*/) - : XsldbgConfig(parent, name) + TQWidget *tqparent /*=0*/, const char *name /*=0*/) + : XsldbgConfig(tqparent, name) { this->debugger = debugger; connect(debugger, TQT_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)), @@ -177,7 +177,7 @@ void XsldbgConfigImpl::deleteParam(TQString name) isOk = paramList.remove(param); if (isOk == false) - kdDebug() << TQString(" Param %1 dosn't exist").arg(name) << endl; + kdDebug() << TQString(" Param %1 dosn't exist").tqarg(name) << endl; else kdDebug() << "Deleted param " << name << endl; } @@ -308,7 +308,7 @@ void XsldbgConfigImpl::update() void XsldbgConfigImpl::refresh() { paramIndex = 0; - repaintParam(); + tqrepaintParam(); xslSourceEdit->setText(debugger->sourceFileName()); xmlDataEdit->setText(debugger->dataFileName()); outputFileEdit->setText(debugger->outputFileName()); @@ -366,7 +366,7 @@ void XsldbgConfigImpl::slotOutputFile(TQString outputFile) void XsldbgConfigImpl::slotChooseSourceFile() { - KURL url = KFileDialog::getOpenURL(TQString::null, "*.xsl; *.XSL; *.Xsl ; *.xslt; *.XSLT; *.Xslt \n *.*", this, + KURL url = KFileDialog::getOpenURL(TQString(), "*.xsl; *.XSL; *.Xsl ; *.xslt; *.XSLT; *.Xslt \n *.*", this, i18n("Choose XSL Source to Debug")); TQString fileName = url.prettyURL(); @@ -378,7 +378,7 @@ void XsldbgConfigImpl::slotChooseSourceFile() void XsldbgConfigImpl::slotChooseDataFile() { - KURL url = KFileDialog::getOpenURL(TQString::null, "*.xml; *.XML; *.Xml \n*.docbook \n *.html;*.HTML; *.htm ; *HTM \n *.*", this, + KURL url = KFileDialog::getOpenURL(TQString(), "*.xml; *.XML; *.Xml \n*.docbook \n *.html;*.HTML; *.htm ; *HTM \n *.*", this, i18n("Choose XML Data to Debug")); TQString fileName = url.prettyURL(); @@ -389,7 +389,7 @@ void XsldbgConfigImpl::slotChooseDataFile() void XsldbgConfigImpl::slotChooseOutputFile() { - KURL url = KFileDialog::getSaveURL(TQString::null, "*.xml; *.XML; *.Xml \n*.docbook \n *.txt; *.TXT \n *.htm;*.HTM;*.htm;*.HTML \n*.*", this, + KURL url = KFileDialog::getSaveURL(TQString(), "*.xml; *.XML; *.Xml \n*.docbook \n *.txt; *.TXT \n *.htm;*.HTM;*.htm;*.HTML \n*.*", this, i18n("Choose Output File for XSL Transformation")); TQString fileName; @@ -410,7 +410,7 @@ void XsldbgConfigImpl::slotReloadFileNames() } -void XsldbgConfigImpl::repaintParam() +void XsldbgConfigImpl::tqrepaintParam() { if (paramIndex < getParamCount()){ LibxsltParam *param = getParam(paramIndex); @@ -428,13 +428,13 @@ void XsldbgConfigImpl::slotAddParam() if (paramIndex < getParamCount()) paramIndex++; - repaintParam(); + tqrepaintParam(); } void XsldbgConfigImpl::slotDeleteParam() { deleteParam(parameterNameEdit->text()); - repaintParam(); + tqrepaintParam(); } @@ -444,7 +444,7 @@ void XsldbgConfigImpl::slotNextParam() if (paramIndex < getParamCount()) paramIndex++; - repaintParam(); + tqrepaintParam(); } void XsldbgConfigImpl::slotPrevParam() @@ -453,7 +453,7 @@ void XsldbgConfigImpl::slotPrevParam() if (paramIndex > 0) paramIndex--; - repaintParam(); + tqrepaintParam(); } void XsldbgConfigImpl::slotProcParameterItem(TQString name, TQString value) diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h index 1c3aa21e..b11357a7 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h @@ -27,7 +27,7 @@ #include <tqptrlist.h> -class LibxsltParam : public QObject +class LibxsltParam : public TQObject { public: LibxsltParam(const TQString & name, const TQString &value); @@ -49,9 +49,10 @@ class XsldbgDebugger; class XsldbgConfigImpl : public XsldbgConfig, public XsldbgDialogBase { Q_OBJECT + TQ_OBJECT public: - XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgConfigImpl(); LibxsltParam *getParam(int paramNumber); @@ -59,7 +60,7 @@ public: int getParamCount(); void addParam(TQString name, TQString value); void deleteParam(TQString name); - void repaintParam(); + void tqrepaintParam(); TQString getSourceFile(); TQString getDataFile(); @@ -128,7 +129,7 @@ public slots: void slotCancel(); /** Process notification of add parameter to view, First parameter - is TQString::null to indicate start of parameter list notfication */ + is TQString() to indicate start of parameter list notfication */ void slotProcParameterItem(TQString name, TQString value); diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp index deead4fa..7a4f4960 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) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT) && + if ((getInputReady() == 0) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT) && (commandQue.count() > 0)){ TQString msg = commandQue.first(); commandQue.remove(msg); ::fakeInput((const char*)msg.utf8()); } - if ((!updateText.isEmpty()) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT)){ + if ((!updateText.isEmpty()) && (getInputtqStatus() == 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){ - setThreadStatus(XSLDBG_MSG_THREAD_STOP); + setThreadtqStatus(XSLDBG_MSG_THREAD_STOP); } /* it always succeeds at the moment */ diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.h b/kxsldbg/kxsldbgpart/xsldbgdebugger.h index 7cc64845..5eac3d89 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.h +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.h @@ -35,6 +35,7 @@ class XsldbgWalkSpeedImpl; class XsldbgDebugger : public XsldbgDebuggerBase { Q_OBJECT + TQ_OBJECT public: XsldbgDebugger(); @@ -63,7 +64,7 @@ public: void setOutputFileActive(bool b) {outputFileActive = b;}; - /* helper function to handle differences between URI's in Qt/KDE and libxml2 */ + /* helper function to handle differences between URI's in TQt/KDE and libxml2 */ static TQString fixLocalPaths(TQString & file); private: diff --git a/kxsldbg/kxsldbgpart/xsldbgdocmap.h b/kxsldbg/kxsldbgpart/xsldbgdocmap.h index e6c79344..6310b711 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdocmap.h +++ b/kxsldbg/kxsldbgpart/xsldbgdocmap.h @@ -1,5 +1,5 @@ #include <tqmap.h> -#include "qxsldbgdoc.h" +#include "tqxsldbgdoc.h" -typedef TQMap<TQString, QXsldbgDoc> XsldbgDocMap; +typedef TQMap<TQString, TQXsldbgDoc> XsldbgDocMap; diff --git a/kxsldbg/kxsldbgpart/xsldbgentities.ui b/kxsldbg/kxsldbgpart/xsldbgentities.ui index 3f3d1339..3369090a 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentities.ui +++ b/kxsldbg/kxsldbgpart/xsldbgentities.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgEntities</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XsldbgEntities</cstring> </property> @@ -34,7 +34,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>PublicID</string> @@ -79,14 +79,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -110,14 +110,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>refreshBtn</cstring> </property> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -154,8 +154,8 @@ <slot>refresh()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>refresh()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp index 03f21618..627db58b 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp @@ -24,8 +24,8 @@ XsldbgEntitiesImpl::XsldbgEntitiesImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0*/, const char *name /*=0*/) - : XsldbgEntities(parent, name), XsldbgDialogBase() + TQWidget *tqparent /*=0*/, const char *name /*=0*/) + : XsldbgEntities(tqparent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h index 220c09cd..4000dc0c 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h @@ -27,15 +27,16 @@ class XsldbgDebugger; -class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase { - Q_OBJECT +class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase { + Q_OBJECT + TQ_OBJECT public: - XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgEntitiesImpl(); public slots: - /** Process request to add entity to view, First parameter is TQString::null + /** Process request to add entity to view, First parameter is TQString() to indicate start of entity list notfication */ void slotProcEntityItem(TQString SystemID, TQString PublicID); diff --git a/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp b/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp index 3ad3ed81..8628f8d0 100644 --- a/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp @@ -17,9 +17,9 @@ #include "xsldbggloballistitem.h" -XsldbgGlobalListItem::XsldbgGlobalListItem(TQListView *parent, +XsldbgGlobalListItem::XsldbgGlobalListItem(TQListView *tqparent, TQString fileName, int lineNumber, TQString globalName) - : XsldbgListItem(parent, 1, fileName, lineNumber) + : XsldbgListItem(tqparent, 1, fileName, lineNumber) { varName = globalName; setText(0, globalName); diff --git a/kxsldbg/kxsldbgpart/xsldbggloballistitem.h b/kxsldbg/kxsldbgpart/xsldbggloballistitem.h index fe3cd47f..9488d50e 100644 --- a/kxsldbg/kxsldbgpart/xsldbggloballistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbggloballistitem.h @@ -27,7 +27,7 @@ class XsldbgGlobalListItem : public XsldbgListItem { public: - XsldbgGlobalListItem(TQListView *parent, + XsldbgGlobalListItem(TQListView *tqparent, TQString fileName, int lineNumber, TQString globalName); ~XsldbgGlobalListItem(); diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui index 513e3079..ab7a4dc3 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgGlobalVariables</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XsldbgGlobalVariables</cstring> </property> @@ -34,7 +34,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListView" row="2" column="0"> + <widget class="TQListView" row="2" column="0"> <column> <property name="text"> <string>Name</string> @@ -90,14 +90,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -121,14 +121,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -142,7 +142,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -150,7 +150,7 @@ <string>Expression:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>expressionEdit</cstring> </property> @@ -170,14 +170,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>expressionButton</cstring> </property> @@ -190,7 +190,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -214,14 +214,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>refreshBtn</cstring> </property> @@ -239,7 +239,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -264,9 +264,9 @@ <slot>refresh()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>refresh()</slot> <slot>slotEvaluate()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp index 235c564a..b860d358 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp @@ -24,8 +24,8 @@ XsldbgGlobalVariablesImpl::XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0*/, const char *name /*=0*/) - : XsldbgGlobalVariables(parent, name), XsldbgDialogBase() + TQWidget *tqparent /*=0*/, const char *name /*=0*/) + : XsldbgGlobalVariables(tqparent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, TQT_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h index 42a40968..f0e3b2c0 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h @@ -27,15 +27,16 @@ class XsldbgDebugger; -class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDialogBase { - Q_OBJECT +class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDialogBase { + Q_OBJECT + TQ_OBJECT -public: - XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); +public: + XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgGlobalVariablesImpl(); public slots: - /** Process request to add global variable to view, First parameter is TQString::null + /** Process request to add global variable to view, First parameter is TQString() to indicate start of global variable list notfication */ void slotProcGlobalVariableItem(TQString name , TQString fileName, int lineNumber); diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp index b6a8f6df..db6fcb58 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp +++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp @@ -44,15 +44,15 @@ static TQPixmap uic_load_pixmap_XsldbgInspector( const TQString &name ) return pix; } /* - * Constructs a XsldbgInspector which is a child of 'parent', with the + * Constructs a XsldbgInspector which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * true to construct a modal dialog. */ -XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, +XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( parent, name, modal, fl ) + : TQDialog( tqparent, name, modal, fl ) { Q_CHECK_PTR(debugger); this->debugger = debugger; @@ -159,7 +159,7 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, XsldbgInspector::~XsldbgInspector() { debugger = 0L; - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.h b/kxsldbg/kxsldbgpart/xsldbginspector.h index 60e4a59f..c96e1091 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.h +++ b/kxsldbg/kxsldbgpart/xsldbginspector.h @@ -28,12 +28,13 @@ class XsldbgTemplatesImpl; class XsldbgSourcesImpl; class XsldbgEntitiesImpl; -class XsldbgInspector : public QDialog +class XsldbgInspector : public TQDialog { Q_OBJECT + TQ_OBJECT public: - XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + XsldbgInspector( XsldbgDebugger *debugger, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~XsldbgInspector(); TQTabWidget* tabWidget; diff --git a/kxsldbg/kxsldbgpart/xsldbglistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglistitem.cpp index c04bc7b4..9c4d0ea4 100644 --- a/kxsldbg/kxsldbgpart/xsldbglistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglistitem.cpp @@ -17,9 +17,9 @@ #include "xsldbglistitem.h" -XsldbgListItem::XsldbgListItem(TQListView *parent, int columnOffset, +XsldbgListItem::XsldbgListItem(TQListView *tqparent, int columnOffset, const TQString & fileName, int lineNumber) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { this->fileName = fileName; this->lineNumber = lineNumber; diff --git a/kxsldbg/kxsldbgpart/xsldbglistitem.h b/kxsldbg/kxsldbgpart/xsldbglistitem.h index 0d8ac6a7..0eb72f85 100644 --- a/kxsldbg/kxsldbgpart/xsldbglistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbglistitem.h @@ -29,7 +29,7 @@ class XsldbgListItem : public TQListViewItem { public: /** column offset is the index of the fileName column */ - XsldbgListItem(TQListView *parent, int columnOffset, + XsldbgListItem(TQListView *tqparent, int columnOffset, const TQString &fileName, int lineNumber); ~XsldbgListItem(); diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp index 0d27f916..0b8125bd 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp @@ -18,9 +18,9 @@ #include "xsldbglocallistitem.h" #include <klocale.h> -XsldbgLocalListItem::XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, +XsldbgLocalListItem::XsldbgLocalListItem(TQListView *tqparent, TQString fileName, int lineNumber, TQString localName, TQString templateContext, TQString selectXPath, bool localVariable) -: XsldbgListItem(parent, 3, fileName, lineNumber) +: XsldbgListItem(tqparent, 3, fileName, lineNumber) { varName = localName; contextName = templateContext; diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.h b/kxsldbg/kxsldbgpart/xsldbglocallistitem.h index 81c815e1..15401887 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.h @@ -26,7 +26,7 @@ class XsldbgLocalListItem : public XsldbgListItem { public: - XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, + XsldbgLocalListItem(TQListView *tqparent, TQString fileName, int lineNumber, TQString localName, TQString templateContext, TQString selectXPath, bool localVariable); ~XsldbgLocalListItem(); diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui index 2d31320c..5574a95d 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgLocalVariables</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XsldbgLocalVaraibles</cstring> </property> @@ -34,7 +34,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -58,14 +58,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -79,7 +79,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -87,7 +87,7 @@ <string>Expression:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>expressionEdit</cstring> </property> @@ -107,14 +107,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>expressionButton</cstring> </property> @@ -137,14 +137,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Name</string> @@ -212,15 +212,15 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -228,12 +228,12 @@ <string>Variable expression:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>variableName</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>variableType</cstring> </property> @@ -241,7 +241,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -249,20 +249,20 @@ <string>Variable type:</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>xPathEdit</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>setExpressionButton</cstring> </property> @@ -275,7 +275,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -285,7 +285,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -309,14 +309,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>refreshBtn</cstring> </property> @@ -334,7 +334,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -365,10 +365,10 @@ <slot>slotSetExpression()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>refresh()</slot> <slot>slotEvaluate()</slot> <slot>slotSetExpression()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp index fa8c756b..3a1f68d3 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp @@ -27,8 +27,8 @@ XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0*/, const char *name /*=0*/) - : XsldbgLocalVariables(parent, name), XsldbgDialogBase() + TQWidget *tqparent /*=0*/, const char *name /*=0*/) + : XsldbgLocalVariables(tqparent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, TQT_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/, diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h index aa0156ee..b8456226 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h @@ -27,15 +27,16 @@ class XsldbgDebugger; -class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialogBase { - Q_OBJECT +class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialogBase { + Q_OBJECT + TQ_OBJECT public: - XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgLocalVariablesImpl(); public slots: - /** Process request to add local varaible to view, First parameter is TQString::null + /** Process request to add local varaible to view, First parameter is TQString() to indicate start of local variable list notfication */ void slotProcVariableItem(TQString /*name */, TQString /* templateContext*/, diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui index 8ba1cac3..15f1a341 100644 --- a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui +++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui @@ -2,7 +2,7 @@ <class>XsldbgMsgDialog</class> <comment>Used with QT3 or greater</comment> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>XsldbgMsgDialog</cstring> </property> @@ -35,7 +35,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -49,7 +49,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -63,7 +63,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>iconLbl</cstring> </property> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -90,7 +90,7 @@ </spacer> </vbox> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>msgTextEdit</cstring> </property> @@ -103,7 +103,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -127,14 +127,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -171,5 +171,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h index 1c605e7e..7d5f5f92 100644 --- a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h @@ -21,7 +21,7 @@ class XsldbgMsgDialogImpl : public XsldbgMsgDialog { public: - XsldbgMsgDialogImpl(TQWidget *parent, + XsldbgMsgDialogImpl(TQWidget *tqparent, TQMessageBox::Icon icon, const TQString & title, const TQString &msg); diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp index 72e25fb3..0292e282 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp @@ -27,21 +27,13 @@ #include <tqpushbutton.h> #include <tqlabel.h> -#if QT_VERSION >= 300 #include "xsldbgmsgdialogimpl.h" -#else -#include "xsldbgmsgdialogimpl2.h" -#endif -XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(TQWidget *parent, +XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(TQWidget *tqparent, TQMessageBox::Icon icon, const TQString &title, const TQString &msg) -#if QT_VERSION >= 300 - : XsldbgMsgDialog(parent, "XsldbgMsgDialogImpl" , TRUE ) -#else - : XsldbgMsgDialog2(parent, "XsldbgMsgDialogImpl" , TRUE ) -#endif + : XsldbgMsgDialog(tqparent, "XsldbgMsgDialogImpl" , TRUE ) { setCaption(title); @@ -58,15 +50,13 @@ void XsldbgMsgDialogImpl::append(const TQString &text) -#if QT_VERSION >= 300 - #include "xsldbgoutputview.h" -XsldbgOutputView::XsldbgOutputView(TQWidget * parent) - : TQTextEdit(parent, "outputview") +XsldbgOutputView::XsldbgOutputView(TQWidget * tqparent) + : TQTextEdit(tqparent, "outputview") { new TQBoxLayout(this, TQBoxLayout::TopToBottom); - setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); setMinimumSize(TQSize(500, 80)); setCaption(i18n("xsldbg Output")); setText(i18n("\t\txsldbg output capture ready\n\n")); @@ -75,48 +65,31 @@ XsldbgOutputView::XsldbgOutputView(TQWidget * parent) setReadOnly(TRUE); } -#else - -#include "xsldbgoutputview2.h" - -XsldbgOutputView::XsldbgOutputView(TQWidget * parent) - : TQTextView(parent, "outputview") -{ - new TQBoxLayout(this, TQBoxLayout::TopToBottom); - setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); - setMinimumSize(TQSize(500,80)); - setCaption(i18n("xsldbg Output")); - setText(i18n("\t\txsldbg output capture ready\n\n")); - dlg = 0L; - show(); -} -#endif // QT_VERSION - void XsldbgOutputView::slotProcShowMessage(TQString msg) { bool processed = FALSE; // Is this a result of an evaluate command if ((msg[0] == TQChar('=')) && (msg[1] == TQChar(' '))){ - int endPosition = msg.find(TQChar('\n')); + int endPosition = msg.tqfind(TQChar('\n')); if (endPosition >= 0){ processed = TRUE; showDialog(TQMessageBox::Information, i18n("Result of evaluation"), msg.mid(endPosition + 1)); } }else /* Is there some sort of error message in msg */ - if ((msg.find("Error:") != -1) || - (msg.find("Warning:") != -1) || - (msg.find("Request to xsldbg failed") != -1) || + if ((msg.tqfind("Error:") != -1) || + (msg.tqfind("Warning:") != -1) || + (msg.tqfind("Request to xsldbg failed") != -1) || /* the following errors are libxml or libxslt generated */ - (msg.find("error:") != -1) || - (msg.find("xmlXPathEval:") != -1) || - (msg.find("runtime error") != -1)) { + (msg.tqfind("error:") != -1) || + (msg.tqfind("xmlXPathEval:") != -1) || + (msg.tqfind("runtime error") != -1)) { /* OK we've found an error but ingore any errors about data or source files */ - if ((msg.find("Error: No XSL source file supplied") == -1) && - (msg.find("Error: No XML data file supplied") == -1) && - (msg.find("Load of source deferred") == -1) && - (msg.find("Load of data deferred") == -1) ) + if ((msg.tqfind("Error: No XSL source file supplied") == -1) && + (msg.tqfind("Error: No XML data file supplied") == -1) && + (msg.tqfind("Load of source deferred") == -1) && + (msg.tqfind("Load of data deferred") == -1) ) showDialog(TQMessageBox::Warning, i18n("Request Failed "), msg); processed = TRUE; diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.h b/kxsldbg/kxsldbgpart/xsldbgoutputview.h index 3c4c453a..20fafdd5 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.h +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.h @@ -29,9 +29,10 @@ class XsldbgMsgDialogImpl; class XsldbgOutputView : public TQTextEdit { Q_OBJECT + TQ_OBJECT public : - XsldbgOutputView(TQWidget *parent = 0); + XsldbgOutputView(TQWidget *tqparent = 0); void showDialog(TQMessageBox::Icon icon, TQString title, TQString msg); diff --git a/kxsldbg/kxsldbgpart/xsldbgsources.ui b/kxsldbg/kxsldbgpart/xsldbgsources.ui index b6073eb6..f16fc183 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsources.ui +++ b/kxsldbg/kxsldbgpart/xsldbgsources.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgSources</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XsldbgSources</cstring> </property> @@ -26,7 +26,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Source File</string> @@ -72,7 +72,7 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -96,14 +96,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>refreshBtn</cstring> </property> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -135,9 +135,9 @@ <connections> <connection> <sender>sourceListView</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>XsldbgSources</receiver> - <slot>selectionChanged(QListViewItem*)</slot> + <slot>selectionChanged(TQListViewItem*)</slot> </connection> <connection> <sender>refreshBtn</sender> @@ -146,9 +146,9 @@ <slot>refresh()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>refresh()</slot> - <slot>selectionChanged(QListViewItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>selectionChanged(TQListViewItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp index f291ab6d..a4bbcc94 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp @@ -24,12 +24,12 @@ XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0*/, const char *name /*=0*/) - : XsldbgSources(parent, name), XsldbgDialogBase() + TQWidget *tqparent /*=0*/, const char *name /*=0*/) + : XsldbgSources(tqparent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), - this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */))); + connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */)), + this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */))); connect( sourceListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(selectionChanged(TQListViewItem*))); @@ -42,13 +42,13 @@ XsldbgSourcesImpl::~XsldbgSourcesImpl(){ debugger = 0L; } -void XsldbgSourcesImpl::slotProcSourceItem(TQString fileName , TQString parentFileName , int lineNumber ) +void XsldbgSourcesImpl::slotProcSourceItem(TQString fileName , TQString tqparentFileName , int lineNumber ) { if (fileName.isNull()){ sourceListView->clear(); }else{ sourceListView->insertItem(new XsldbgGlobalListItem(sourceListView, - parentFileName, lineNumber, fileName)); + tqparentFileName, lineNumber, fileName)); } } diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h index 7b805de4..51893559 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h @@ -27,19 +27,20 @@ class XsldbgDebugger; -class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase { - Q_OBJECT +class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase { + Q_OBJECT + TQ_OBJECT public: - XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgSourcesImpl(); public slots: void selectionChanged(TQListViewItem *item); - /** Process request to add source to view, First parameter is TQString::null + /** Process request to add source to view, First parameter is TQString() to indicate start of source list notfication */ - void slotProcSourceItem(TQString fileName , TQString parentFileName , int lineNumber ); + void slotProcSourceItem(TQString fileName , TQString tqparentFileName , int lineNumber ); /** refresh data from source */ void refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp index cd07e89e..3df077c1 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp @@ -17,9 +17,9 @@ #include "xsldbgtemplatelistitem.h" -XsldbgTemplateListItem::XsldbgTemplateListItem(TQListView *parent, +XsldbgTemplateListItem::XsldbgTemplateListItem(TQListView *tqparent, TQString fileName, int lineNumber, TQString templateName, TQString modeName) - : XsldbgListItem(parent, 2, fileName, lineNumber) + : XsldbgListItem(tqparent, 2, fileName, lineNumber) { this->templateName = templateName; setText(0, templateName); diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h index e1c0a8b6..e9f6637a 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h @@ -25,7 +25,7 @@ class XsldbgTemplateListItem : public XsldbgListItem { public: - XsldbgTemplateListItem(TQListView *parent, + XsldbgTemplateListItem(TQListView *tqparent, TQString fileName, int lineNumber, TQString templateName, TQString modeName); ~XsldbgTemplateListItem(); diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplates.ui b/kxsldbg/kxsldbgpart/xsldbgtemplates.ui index 9804bcef..672a93e2 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplates.ui +++ b/kxsldbg/kxsldbgpart/xsldbgtemplates.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgTemplates</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XsldbgTemplates</cstring> </property> @@ -26,7 +26,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Name</string> @@ -88,13 +88,13 @@ <connections> <connection> <sender>templatesListView</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>XsldbgTemplates</receiver> - <slot>selectionChanged(QListViewItem*)</slot> + <slot>selectionChanged(TQListViewItem*)</slot> </connection> </connections> -<slots> - <slot>selectionChanged(QListViewItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +<Q_SLOTS> + <slot>selectionChanged(TQListViewItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp index 66cb9227..6b467baf 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp @@ -22,8 +22,8 @@ #include "xsldbgtemplatelistitem.h" XsldbgTemplatesImpl::XsldbgTemplatesImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0*/, const char *name /*=0*/) - : XsldbgTemplates(parent, name), XsldbgDialogBase() + TQWidget *tqparent /*=0*/, const char *name /*=0*/) + : XsldbgTemplates(tqparent, name), XsldbgDialogBase() { this->debugger = debugger; diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h index 6d06cb6b..acf60c25 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h @@ -29,17 +29,18 @@ class XsldbgDebugger; -class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase { - Q_OBJECT +class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase { + Q_OBJECT + TQ_OBJECT public: - XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgTemplatesImpl(); public slots: void selectionChanged(TQListViewItem *item); - /** Process request to add template to view, First parameter is TQString::null + /** Process request to add template to view, First parameter is TQString() to indicate start of template list notfication */ void slotProcTemplateItem(TQString name, TQString mode, TQString fileName , int lineNumber ); diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui index 2088d97f..db5c3c8e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>XsldbgWalkSpeed</class> <author>Keith Isdale <k_isdale@tpg.com.au></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>XsldbgWalkSpeed</cstring> </property> @@ -29,7 +29,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -41,7 +41,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>60</height> @@ -50,7 +50,7 @@ <property name="text"> <string>Change the speed at which xsldbg walks through execution of the stylesheet.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -66,14 +66,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -87,7 +87,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -95,7 +95,7 @@ <string>Slow</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>walkSpeedSlider</cstring> </property> @@ -109,7 +109,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -129,14 +129,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -160,14 +160,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -185,14 +185,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -235,5 +235,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp index 58497cea..1c8a18e1 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp @@ -21,8 +21,8 @@ #include "xsldbgwalkspeedimpl.h" XsldbgWalkSpeedImpl::XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, - TQWidget *parent /*=0 */, const char *name /*=0*/ ) - : XsldbgWalkSpeed(parent, name, false) + TQWidget *tqparent /*=0 */, const char *name /*=0*/ ) + : XsldbgWalkSpeed(tqparent, name, false) { this->debugger = debugger; } diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h index e0cbe69e..f8a2e3f5 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h @@ -26,11 +26,12 @@ class XsldbgDebugger; -class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed { - Q_OBJECT +class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed { + Q_OBJECT + TQ_OBJECT public: - XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); ~XsldbgWalkSpeedImpl(); public slots: |