From ac3986430fc0191a5bd1ebb00b5415c99183f27c Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:49:39 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/kxsldbg.cpp | 2 +- src/kxsldbgpart/kxsldbg_part.cpp | 42 ++++---- src/kxsldbgpart/libtqtnotfier/qtnotifier2.cpp | 6 +- .../libtqtnotfier/xsldbgdebuggerbase.cpp | 10 +- src/kxsldbgpart/libtqtnotfier/xsldbgevent.cpp | 106 ++++++++++----------- src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp | 4 +- src/kxsldbgpart/libxsldbg/debugXSL.cpp | 4 +- src/kxsldbgpart/libxsldbg/file_cmds.cpp | 6 +- src/kxsldbgpart/libxsldbg/option_cmds.cpp | 4 +- src/kxsldbgpart/libxsldbg/options.cpp | 2 +- src/kxsldbgpart/libxsldbg/xsldbg.cpp | 8 +- src/kxsldbgpart/libxsldbg/xsldbgmsg.cpp | 10 +- src/kxsldbgpart/libxsldbg/xsldbgthread.cpp | 4 +- src/kxsldbgpart/qxsldbgdoc.cpp | 4 +- src/kxsldbgpart/qxsldbgdoc.h | 2 +- src/kxsldbgpart/xsldbgbreakpointsimpl.cpp | 6 +- src/kxsldbgpart/xsldbgbreakpointsimpl.h | 2 +- src/kxsldbgpart/xsldbgcallstackimpl.cpp | 2 +- src/kxsldbgpart/xsldbgcallstackimpl.h | 2 +- src/kxsldbgpart/xsldbgconfigimpl.cpp | 28 +++--- src/kxsldbgpart/xsldbgconfigimpl.h | 2 +- src/kxsldbgpart/xsldbgdebugger.cpp | 54 +++++------ src/kxsldbgpart/xsldbgentitiesimpl.h | 2 +- src/kxsldbgpart/xsldbgglobalvariablesimpl.cpp | 8 +- src/kxsldbgpart/xsldbgglobalvariablesimpl.h | 2 +- src/kxsldbgpart/xsldbginspector.cpp | 28 +++--- src/kxsldbgpart/xsldbginspector.h | 2 +- src/kxsldbgpart/xsldbglocalvariablesimpl.cpp | 6 +- src/kxsldbgpart/xsldbglocalvariablesimpl.h | 2 +- src/kxsldbgpart/xsldbgoutputview.cpp | 4 +- src/kxsldbgpart/xsldbgoutputview.h | 2 +- src/kxsldbgpart/xsldbgsourcesimpl.cpp | 2 +- src/kxsldbgpart/xsldbgsourcesimpl.h | 2 +- src/kxsldbgpart/xsldbgtemplatesimpl.cpp | 2 +- src/kxsldbgpart/xsldbgtemplatesimpl.h | 2 +- src/kxsldbgpart/xsldbgwalkspeedimpl.h | 2 +- src/main.cpp | 10 +- src/xsldbgmain.cpp | 58 +++++------ 38 files changed, 222 insertions(+), 222 deletions(-) diff --git a/src/kxsldbg.cpp b/src/kxsldbg.cpp index 1bd2ae0..7b78e5c 100644 --- a/src/kxsldbg.cpp +++ b/src/kxsldbg.cpp @@ -22,7 +22,7 @@ #include KXsldbg::KXsldbg() - : DCOPObject("KXsldbg"), KParts::MainWindow( 0L, "kxsldbg" ) + : DCOPObject("KXsldbg"), KParts::MainWindow( nullptr, "kxsldbg" ) { // set the shell's ui resource file setXMLFile("kxsldbg_shell.rc"); diff --git a/src/kxsldbgpart/kxsldbg_part.cpp b/src/kxsldbgpart/kxsldbg_part.cpp index d0008db..8bbd4bc 100644 --- a/src/kxsldbgpart/kxsldbg_part.cpp +++ b/src/kxsldbgpart/kxsldbg_part.cpp @@ -70,10 +70,10 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, { currentLineNo = 0; currentColumnNo = 0; - inspector = 0L; - debugger = 0L; - configWidget = 0L; - currentDoc = 0L; + inspector = nullptr; + debugger = nullptr; + configWidget = nullptr; + currentDoc = nullptr; // we need an instance setInstance( KXsldbgPartFactory::instance() ); @@ -223,7 +223,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, actionCollection(), "lookupPublicID" ); (void) new TDEAction( i18n("Quit"), - 0, CTRL + Key_Q, + nullptr, CTRL + Key_Q, this, TQ_SLOT(quit()), actionCollection(), "file_quit" ); @@ -245,7 +245,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, /* We must have a valid debugger and inspector */ createInspector(); if (checkDebugger()){ - configWidget = new XsldbgConfigImpl( debugger, 0L ); + configWidget = new XsldbgConfigImpl( debugger, nullptr ); TQ_CHECK_PTR( configWidget ); debugger->start(); }else{ @@ -271,7 +271,7 @@ TDEAboutData *KXsldbgPart::createAboutData() // which the part's rc file is installed ('partrcdir' in the // Makefile) TDEAboutData *aboutData = new TDEAboutData("kxsldbgpart", I18N_NOOP("KXsldbgPart"), "0.1"); - aboutData->addAuthor("Keith Isdale", 0L, "k_isdale@tpg.com.au"); + aboutData->addAuthor("Keith Isdale", nullptr, "k_isdale@tpg.com.au"); return aboutData; } @@ -349,9 +349,9 @@ void KXsldbgPart::configureEditorCmd_activated() bool KXsldbgPart::checkDebugger() { - bool result = debugger != 0L; + bool result = debugger != nullptr; if (!result){ - TQMessageBox::information(0L, i18n("Debugger Not Ready"), + TQMessageBox::information(nullptr, i18n("Debugger Not Ready"), i18n("Configure and start the debugger first."), TQMessageBox::Ok); } @@ -421,7 +421,7 @@ void KXsldbgPart::configureCmd_activated() if (!checkDebugger()) return; - if (configWidget != 0L){ + if (configWidget){ configWidget->refresh(); configWidget->show(); } @@ -436,10 +436,10 @@ KXsldbgPart::runCmd_activated() void KXsldbgPart::inspectorCmd_activated() { - if (inspector == 0L) + if (!inspector) createInspector(); - if (checkDebugger() && (inspector != 0L)){ + if (checkDebugger() && inspector){ inspector->show(); } } @@ -447,10 +447,10 @@ void KXsldbgPart::inspectorCmd_activated() void KXsldbgPart::createInspector() { - if ( inspector == 0L ) { + if ( !inspector ) { debugger = new XsldbgDebugger(); TQ_CHECK_PTR( debugger ); - if ( debugger != 0L ) { + if ( debugger ) { connect(debugger, TQ_SIGNAL( debuggerReady()), this, TQ_SLOT(debuggerStarted())); if (outputview){ @@ -462,7 +462,7 @@ void KXsldbgPart::createInspector() inspector = new XsldbgInspector( debugger ); TQ_CHECK_PTR( inspector ); debugger->setInspector( inspector ); - if (inspector != 0L){ + if (inspector){ /*process line number and/or file name changed */ connect(debugger, TQ_SIGNAL(lineNoChanged @@ -552,7 +552,7 @@ KXsldbgPart::sourceCmd_activated() void KXsldbgPart::outputCmd_activated() { - if ( ( inspector != 0L ) && checkDebugger() && ( configWidget != 0L ) ){ + if (inspector && checkDebugger() && configWidget){ debugger->setOutputFileActive(true); lineNoChanged( configWidget->getOutputFile(), 1, false ); refreshCmd_activated(); @@ -677,7 +677,7 @@ void KXsldbgPart::docChanged() void KXsldbgPart::debuggerStarted() { - if (configWidget != 0L){ + if (configWidget){ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args){ int i=0, result=1, noFilesFound = 0; @@ -746,7 +746,7 @@ void KXsldbgPart::deleteBreakPoint(int lineNumber) void KXsldbgPart::slotSearch() { - if ((newSearch != 0L) && checkDebugger() ) { + if (newSearch && checkDebugger() ) { TQString msg(TQString("search \"%1\"").arg(newSearch->text())); // noTr debugger->fakeInput(msg, false); } @@ -755,14 +755,14 @@ void KXsldbgPart::slotSearch() void KXsldbgPart::slotEvaluate() { - if ((newEvaluate != 0L) && checkDebugger() ){ + if (newEvaluate && checkDebugger() ){ debugger->slotCatCmd( newEvaluate->text() ); } } void KXsldbgPart::slotGotoXPath() { - if ((newXPath != 0L) && checkDebugger() ){ + if (newXPath && checkDebugger() ){ debugger->slotCdCmd( newXPath->text() ); } } @@ -783,7 +783,7 @@ void KXsldbgPart::breakpointItem(TQString fileName, int lineNumber , bool enabled , int /* id */) { - if (fileName == 0L){ + if (!fileName){ /* Go through all documents and remove all breakpoints */ TQDictIterator it(docDictionary); QXsldbgDoc *docPtr; diff --git a/src/kxsldbgpart/libtqtnotfier/qtnotifier2.cpp b/src/kxsldbgpart/libtqtnotfier/qtnotifier2.cpp index 0db9d1f..d540ac5 100644 --- a/src/kxsldbgpart/libtqtnotfier/qtnotifier2.cpp +++ b/src/kxsldbgpart/libtqtnotfier/qtnotifier2.cpp @@ -22,7 +22,7 @@ #include "xsldbgdebuggerbase.h" #include "../libxsldbg/xsldbgthread.h" -XsldbgDebuggerBase *_debugger = 0L; +XsldbgDebuggerBase *_debugger = nullptr; int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data) { @@ -36,9 +36,9 @@ int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data) ::setInputReady(0); /* state of the thread */ - if (_debugger != 0L){ + if (_debugger){ XsldbgEvent *e = new XsldbgEvent(type, data); - if (e != 0L) { + if (e) { /* The application will now have this event in its event queue that all that is needed from here*/ TQApplication::postEvent(_debugger, e); diff --git a/src/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.cpp b/src/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.cpp index 518aca0..f6f15e9 100644 --- a/src/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.cpp +++ b/src/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.cpp @@ -26,7 +26,7 @@ #include "xsldbgdebuggerbase.h" XsldbgDebuggerBase::XsldbgDebuggerBase() - : TQObject(0L, "XsldbgDebuggerBase") + : TQObject(nullptr, "XsldbgDebuggerBase") { initialized = false; updateTimerID = -1; @@ -43,7 +43,7 @@ XsldbgDebuggerBase::~XsldbgDebuggerBase() TQString XsldbgDebuggerBase::fromUTF8(const char *text) { TQString result; - if (text != 0L) + if (text) result = (const char*)text; return result; } @@ -52,7 +52,7 @@ TQString XsldbgDebuggerBase::fromUTF8(const char *text) TQString XsldbgDebuggerBase::fromUTF8(const xmlChar *text) { TQString result; - if (text != 0L) + if (text) result = TQString::fromUtf8((const char*)text); return result; } @@ -61,7 +61,7 @@ TQString XsldbgDebuggerBase::fromUTF8(const xmlChar *text) TQString XsldbgDebuggerBase::fromUTF8FileName(const char *text) { TQString result; - if (text != 0L){ + if (text){ KURL url(((const char*)text)); if (url.isLocalFile()) result = TQString("file:") + url.path(); @@ -75,7 +75,7 @@ TQString XsldbgDebuggerBase::fromUTF8FileName(const char *text) TQString XsldbgDebuggerBase::fromUTF8FileName(const xmlChar *text) { TQString result; - if (text != 0L){ + if (text){ KURL url(TQString::fromUtf8((const char*)text)); if (url.isLocalFile()) result = TQString("file:") + url.path(); diff --git a/src/kxsldbgpart/libtqtnotfier/xsldbgevent.cpp b/src/kxsldbgpart/libtqtnotfier/xsldbgevent.cpp index c96bf22..3ecd4b6 100644 --- a/src/kxsldbgpart/libtqtnotfier/xsldbgevent.cpp +++ b/src/kxsldbgpart/libtqtnotfier/xsldbgevent.cpp @@ -91,7 +91,7 @@ XsldbgEvent::XsldbgEvent(XsldbgMessageEnum type, const void *data) { XsldbgEventData *eventData; this->data = data; - debugger = 0L; + debugger = nullptr; beenCreated = false; if (type == XSLDBG_MSG_LIST){ /* 23 : As list of messages */ @@ -102,28 +102,28 @@ XsldbgEvent::XsldbgEvent(XsldbgMessageEnum type, const void *data) if (msgList->type != XSLDBG_MSG_INCLUDED_SOURCE_CHANGED){ /* add an empty event data item which indicates the start of a list */ eventData = new XsldbgEventData(); - if (eventData != 0L) + if (eventData) list.append(eventData); } for (int index = 0; index < arrayListCount(msgList->list); index++){ msgData = ::arrayListGet(msgList->list, index); eventData = createEventData(msgList->type, msgData); - if (eventData != 0L) + if (eventData) list.append(eventData); } ::arrayListFree(msgList->list); - msgList->list = 0L; + msgList->list = nullptr; itemType = msgList->type; }else{ eventData = createEventData(type, data); - if (eventData != 0L) + if (eventData) list.append(eventData); itemType = type; } beenCreated = true; /* remove any knowledge of orginal data */ - this->data = 0L; + this->data = nullptr; } @@ -136,7 +136,7 @@ XsldbgEventData *XsldbgEvent::createEventData(XsldbgMessageEnum type, const void { XsldbgEventData *result = new XsldbgEventData(); - if (result == 0L) + if (!result) return result; switch (type){ @@ -165,7 +165,7 @@ XsldbgEventData *XsldbgEvent::createEventData(XsldbgMessageEnum type, const void /* provide more informatiom about state of xsldbg (optional) */ case XSLDBG_MSG_PROCESSING_RESULT: /* 8: An error occured performing command * requested command */ - if (msgData != 0L){ + if (msgData){ xsldbgErrorMsgPtr msg = (xsldbgErrorMsgPtr)msgData; if (msg->text) result->setText(0, XsldbgDebuggerBase::fromUTF8(msg->text)); @@ -281,23 +281,23 @@ void XsldbgEvent::emitMessage(XsldbgDebuggerBase *debugger) this->debugger = debugger; - for (eventData = list.first(); eventData != 0L; eventData = list.next()){ + for (eventData = list.first(); eventData; eventData = list.next()){ emitMessage(eventData); } /* make sure that we only temporarily set the value for debugger*/ - this->debugger = 0L; + this->debugger = nullptr; } void XsldbgEvent::emitMessage(XsldbgEventData *eventData) { - if ((eventData == 0L) || (debugger == 0L)){ + if (!eventData || !debugger){ tqDebug("emitMessage failed"); - if (eventData == 0L) + if (!eventData) tqDebug("Event data == NULL"); - if (debugger == 0L) + if (!debugger) tqDebug("Debugger == NULL"); return; } @@ -353,7 +353,7 @@ void XsldbgEvent::emitMessage(XsldbgEventData *eventData) case XSLDBG_MSG_LINE_CHANGED: /* 9: Changed to new line number * ie a step */ - handleLineNoChanged(eventData, 0L); + handleLineNoChanged(eventData, nullptr); break; case XSLDBG_MSG_FILE_CHANGED: /* 10: Loaded source/data file */ @@ -365,11 +365,11 @@ void XsldbgEvent::emitMessage(XsldbgEventData *eventData) break; case XSLDBG_MSG_BREAKPOINT_CHANGED: /* 11: Response to a showbreak command */ - handleBreakpointItem(eventData, 0L); + handleBreakpointItem(eventData, nullptr); break; case XSLDBG_MSG_PARAMETER_CHANGED: /* 12: Response to showparam command */ - handleParameterItem(eventData, 0L); + handleParameterItem(eventData, nullptr); break; case XSLDBG_MSG_TEXTOUT: /* 13 : Free form text from xsldg */ @@ -389,43 +389,43 @@ void XsldbgEvent::emitMessage(XsldbgEventData *eventData) case XSLDBG_MSG_LOCALVAR_CHANGED: /* 15 : Response to locals command ie a * local variable */ - handleLocalVariableItem(eventData, 0L); + handleLocalVariableItem(eventData, nullptr); break; case XSLDBG_MSG_GLOBALVAR_CHANGED: /* 16 : Response to globals command * ie a global variable */ - handleGlobalVariableItem(eventData, 0L); + handleGlobalVariableItem(eventData, nullptr); break; case XSLDBG_MSG_TEMPLATE_CHANGED: /* 17 : Response to templates commmand * ie template details */ - handleTemplateItem(eventData, 0L); + handleTemplateItem(eventData, nullptr); break; case XSLDBG_MSG_SOURCE_CHANGED: /* 18 : Response to stylesheets command, * a normal stylesheet */ - handleSourceItem(eventData, 0L); + handleSourceItem(eventData, nullptr); break; case XSLDBG_MSG_INCLUDED_SOURCE_CHANGED: /* 19: Response to stylesheets * command, a xmlNodeptr of * a included stylesheet */ - handleIncludedSourceItem(eventData, 0L); + handleIncludedSourceItem(eventData, nullptr); break; case XSLDBG_MSG_CALLSTACK_CHANGED: /* 20: Response to where command, * ie a item on the call stack */ - handleCallStackItem(eventData, 0L); + handleCallStackItem(eventData, nullptr); break; case XSLDBG_MSG_ENTITIY_CHANGED: /* 21: Response to entities * command */ - handleEntityItem(eventData, 0L); + handleEntityItem(eventData, nullptr); break; case XSLDBG_MSG_RESOLVE_CHANGE: /* 22: Response to system or * public command */ - handleResolveItem(eventData, 0L); + handleResolveItem(eventData, nullptr); break; default: @@ -436,13 +436,13 @@ void XsldbgEvent::emitMessage(XsldbgEventData *eventData) void XsldbgEvent::handleLineNoChanged(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (xsldbgUrl() != 0L){ + if (xsldbgUrl()){ eventData->setText(0, XsldbgDebuggerBase::fromUTF8FileName(xsldbgUrl())); eventData->setInt(0, xsldbgLineNo()); - eventData->setInt(1, msgData != 0L); + eventData->setInt(1, msgData != nullptr); } }else{ /* emit the event data via debugger*/ @@ -455,10 +455,10 @@ void XsldbgEvent::handleLineNoChanged(XsldbgEventData *eventData, const void *m void XsldbgEvent::handleShowMessage(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ eventData->setText(0, XsldbgDebuggerBase::fromUTF8((xmlChar*)msgData)); } }else{ @@ -471,10 +471,10 @@ void XsldbgEvent::handleShowMessage(XsldbgEventData *eventData, const void *msg void XsldbgEvent::handleBreakpointItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ breakPointPtr breakItem = (breakPointPtr)msgData; /* set the file name*/ eventData->setText(0, XsldbgDebuggerBase::fromUTF8FileName(breakItem->url)); @@ -507,10 +507,10 @@ void XsldbgEvent::handleBreakpointItem(XsldbgEventData *eventData, const void * void XsldbgEvent::handleGlobalVariableItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ xsltStackElemPtr item = (xsltStackElemPtr)msgData; TQString name, fileName, selectXPath; int lineNumber = -1; @@ -552,10 +552,10 @@ void XsldbgEvent::handleGlobalVariableItem(XsldbgEventData *eventData, const vo void XsldbgEvent::handleLocalVariableItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ xsltStackElemPtr item = (xsltStackElemPtr)msgData; TQString name, templateContext, fileName, selectXPath; int lineNumber = -1; @@ -615,10 +615,10 @@ void XsldbgEvent::handleLocalVariableItem(XsldbgEventData *eventData, const voi void XsldbgEvent::handleTemplateItem(XsldbgEventData *eventData, const void *msgData) { -if (eventData != 0L){ +if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if(msgData != 0L){ + if(msgData){ xsltTemplatePtr item = (xsltTemplatePtr)msgData; TQString name, mode, fileName; int lineNumber = -1; @@ -656,10 +656,10 @@ if (eventData != 0L){ void XsldbgEvent::handleIncludedSourceItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ xmlNodePtr item = (xmlNodePtr)msgData; TQString name, fileName; int lineNumber = -1; @@ -686,10 +686,10 @@ void XsldbgEvent::handleIncludedSourceItem(XsldbgEventData *eventData, const vo void XsldbgEvent::handleSourceItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ xsltStylesheetPtr item = (xsltStylesheetPtr)msgData; TQString name, fileName; int lineNumber = -1; @@ -717,10 +717,10 @@ void XsldbgEvent::handleSourceItem(XsldbgEventData *eventData, const void *msgD void XsldbgEvent::handleParameterItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ parameterItemPtr paramItem = (parameterItemPtr)msgData; TQString name, value; @@ -741,10 +741,10 @@ void XsldbgEvent::handleParameterItem(XsldbgEventData *eventData, const void *m void XsldbgEvent::handleCallStackItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ callPointPtr item = (callPointPtr)msgData; TQString templateName, fileName; int lineNumber = -1; @@ -772,10 +772,10 @@ void XsldbgEvent::handleCallStackItem(XsldbgEventData *eventData, const void *m void XsldbgEvent::handleEntityItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ TQString SystemID, PublicID; entityInfoPtr info = (entityInfoPtr)msgData; @@ -796,10 +796,10 @@ void XsldbgEvent::handleEntityItem(XsldbgEventData *eventData, const void *msgD void XsldbgEvent::handleResolveItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ TQString URI = XsldbgDebuggerBase::fromUTF8FileName((const xmlChar*)msgData); eventData->setText(0, URI); @@ -814,10 +814,10 @@ void XsldbgEvent::handleResolveItem(XsldbgEventData *eventData, const void *msg void XsldbgEvent::handleIntOptionItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ parameterItemPtr paramItem = (parameterItemPtr)msgData; eventData->setText(0, XsldbgDebuggerBase::fromUTF8(paramItem->name)); eventData->setInt(0, paramItem->intValue); @@ -833,10 +833,10 @@ void XsldbgEvent::handleIntOptionItem(XsldbgEventData *eventData, const void *m void XsldbgEvent::handleStringOptionItem(XsldbgEventData *eventData, const void *msgData) { - if (eventData != 0L){ + if (eventData){ if (beenCreated == false){ /* add our specific data to eventData*/ - if (msgData != 0L){ + if (msgData){ parameterItemPtr paramItem = (parameterItemPtr)msgData; eventData->setText(0, XsldbgDebuggerBase::fromUTF8(paramItem->name)); eventData->setText(1, XsldbgDebuggerBase::fromUTF8(paramItem->value)); diff --git a/src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp b/src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp index 58b1614..4d99100 100644 --- a/src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp +++ b/src/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp @@ -84,7 +84,7 @@ xsldbgThreadInit(void) { int result = 0; fprintf(stderr, "mainInit()\n"); - xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); + xsltSetGenericErrorFunc(nullptr, xsldbgGenericErrorFunc); setThreadStatus(XSLDBG_MSG_THREAD_INIT); xsldbgSetAppFunc(qtNotifyXsldbgApp); xsldbgSetAppStateFunc(qtNotifyStateXsldbgApp); @@ -310,7 +310,7 @@ xsldbgThreadMain(void *) /* call the "main of xsldbg" found in debugXSL.c */ // xsldbgMain(defaultArgc, defaultArgv); - xsldbgMain(0,0); + xsldbgMain(0,nullptr); fprintf(stderr, "Stopping thread\n"); /* for (i = 0; i < defaultArgc; i++){ diff --git a/src/kxsldbgpart/libxsldbg/debugXSL.cpp b/src/kxsldbgpart/libxsldbg/debugXSL.cpp index 58dca3a..b41d550 100644 --- a/src/kxsldbgpart/libxsldbg/debugXSL.cpp +++ b/src/kxsldbgpart/libxsldbg/debugXSL.cpp @@ -1793,7 +1793,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, optionsSetStringOption(OPTIONS_SOURCE_FILE_NAME, expandedName); - notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L); + notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, nullptr); loadedFiles = 1; xmlFree(expandedName); cmdResult = 1; @@ -1833,7 +1833,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, optionsSetStringOption(OPTIONS_DATA_FILE_NAME, expandedName); - notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L); + notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, nullptr); loadedFiles = 1; xmlFree(expandedName); cmdResult = 1; diff --git a/src/kxsldbgpart/libxsldbg/file_cmds.cpp b/src/kxsldbgpart/libxsldbg/file_cmds.cpp index 1bd2973..580ebcb 100644 --- a/src/kxsldbgpart/libxsldbg/file_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/file_cmds.cpp @@ -235,14 +235,14 @@ int xslDbgShellOutput(const xmlChar *arg) if (outputFileName){ optionsSetStringOption(OPTIONS_OUTPUT_FILE_NAME, outputFileName); - notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L); + notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, nullptr); xmlFree(outputFileName); result = 1; } } else if (xmlStrEqual(arg, (xmlChar*)"-")) { optionsSetStringOption(OPTIONS_OUTPUT_FILE_NAME, nullptr); - notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L); + notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, nullptr); result = 1; } else if (!xmlStrnCmp(arg, "ftp://", 6) || !xmlStrnCmp(arg, "http://", 7)){ xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("output")); @@ -258,7 +258,7 @@ int xslDbgShellOutput(const xmlChar *arg) (!xmlStrEqual(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME), expandedName)) && (!xmlStrEqual(optionsGetStringOption(OPTIONS_DATA_FILE_NAME), expandedName)) ){ optionsSetStringOption(OPTIONS_OUTPUT_FILE_NAME, expandedName); - notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L); + notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, nullptr); xmlFree(expandedName); result = 1; }else{ diff --git a/src/kxsldbgpart/libxsldbg/option_cmds.cpp b/src/kxsldbgpart/libxsldbg/option_cmds.cpp index 5f46172..95b1ed8 100644 --- a/src/kxsldbgpart/libxsldbg/option_cmds.cpp +++ b/src/kxsldbgpart/libxsldbg/option_cmds.cpp @@ -82,7 +82,7 @@ xslDbgShellSetOption(xmlChar * arg) } } else { - static xmlExternalEntityLoader xsldbgDefaultEntLoader = 0; + static xmlExternalEntityLoader xsldbgDefaultEntLoader = nullptr; bool invertOption = false; bool enableNet = false; @@ -174,7 +174,7 @@ xslDbgShellOptions(void) /* skip any non-user options */ optionName = optionsGetOptionName(OptionTypeEnum(optionIndex)); if (optionName && (optionName[0] != '*')) { - paramItem = optionsParamItemNew(optionName, 0L); + paramItem = optionsParamItemNew(optionName, nullptr); if (!paramItem) { notifyListSend(); /* send what ever we've got so far */ return 0; /* out of memory */ diff --git a/src/kxsldbgpart/libxsldbg/options.cpp b/src/kxsldbgpart/libxsldbg/options.cpp index 8ac4e10..787c816 100644 --- a/src/kxsldbgpart/libxsldbg/options.cpp +++ b/src/kxsldbgpart/libxsldbg/options.cpp @@ -248,7 +248,7 @@ optionsGetOptionID(xmlChar * optionName) const xmlChar * optionsGetOptionName(OptionTypeEnum ID) { - const xmlChar *result = 0; + const xmlChar *result = nullptr; if ( (ID >= OPTIONS_FIRST_OPTIONID) && (ID <= OPTIONS_LAST_OPTIONID)){ /* An option ID is always valid at the moment */ result = (const xmlChar *) optionNames[ID - OPTIONS_FIRST_OPTIONID]; diff --git a/src/kxsldbgpart/libxsldbg/xsldbg.cpp b/src/kxsldbgpart/libxsldbg/xsldbg.cpp index 5a7a16e..81e3f8e 100644 --- a/src/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/src/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -524,7 +524,7 @@ xsldbgMain(int argc, char **argv) /* the xml document we're processing */ xmlDocPtr doc; - TDECmdLineArgs *args = 0; + TDECmdLineArgs *args = nullptr; if (getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED) args = TDECmdLineArgs::parsedArgs(); @@ -1209,8 +1209,8 @@ xsldbgInit() xmlSetGenericErrorFunc(nullptr, nullptr); xmlSetStructuredErrorFunc(nullptr , (xmlStructuredErrorFunc)xsldbgStructErrorHandler); #else - xmlSetGenericErrorFunc(0, xsldbgGenericErrorFunc); - xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); + xmlSetGenericErrorFunc(nullptr, xsldbgGenericErrorFunc); + xsltSetGenericErrorFunc(nullptr, xsldbgGenericErrorFunc); #endif if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED) { @@ -1303,7 +1303,7 @@ xsldbgGenericErrorFunc(void *ctx, const char *msg, ...) void xsldbgGenericErrorFunc(TQString const &text) { - xsldbgGenericErrorFunc(0, "%s", text.utf8().data()); + xsldbgGenericErrorFunc(nullptr, "%s", text.utf8().data()); } diff --git a/src/kxsldbgpart/libxsldbg/xsldbgmsg.cpp b/src/kxsldbgpart/libxsldbg/xsldbgmsg.cpp index 9f95d35..2318fe3 100644 --- a/src/kxsldbgpart/libxsldbg/xsldbgmsg.cpp +++ b/src/kxsldbgpart/libxsldbg/xsldbgmsg.cpp @@ -31,14 +31,14 @@ #include "xsldbgio.h" #include "options.h" -static int (*notifyXsldbgAppFuncPtr) (XsldbgMessageEnum type, const void *data) = 0; +static int (*notifyXsldbgAppFuncPtr) (XsldbgMessageEnum type, const void *data) = nullptr; static int (*notifyStateXsldbgAppFuncPtr)(XsldbgMessageEnum type, int commandId, XsldbgCommandStateEnum commandState, - const char *text) = 0; + const char *text) = nullptr; -static int (*notifyTextXsldbgAppFuncPtr)(XsldbgMessageEnum type, const char *text) = 0; -static xmlChar * (*xslDbgShellReadlineFuncPtr)(xmlChar * prompt) = 0; +static int (*notifyTextXsldbgAppFuncPtr)(XsldbgMessageEnum type, const char *text) = nullptr; +static xmlChar * (*xslDbgShellReadlineFuncPtr)(xmlChar * prompt) = nullptr; #ifdef __cplusplus @@ -109,7 +109,7 @@ xslDbgShellReadline(xmlChar * prompt) { if (!xslDbgShellReadlineFuncPtr) - return 0; + return nullptr; else return (xslDbgShellReadlineFuncPtr)(prompt); } diff --git a/src/kxsldbgpart/libxsldbg/xsldbgthread.cpp b/src/kxsldbgpart/libxsldbg/xsldbgthread.cpp index 237753d..4857739 100644 --- a/src/kxsldbgpart/libxsldbg/xsldbgthread.cpp +++ b/src/kxsldbgpart/libxsldbg/xsldbgthread.cpp @@ -24,7 +24,7 @@ #include "xsldbgmsg.h" #include "xsldbgthread.h" -static void (*cleanupFuncPtr)(void) = 0; +static void (*cleanupFuncPtr)(void) = nullptr; static int threadStatus = XSLDBG_MSG_THREAD_NOTUSED; static int inputStatus = XSLDBG_MSG_AWAITING_INPUT; @@ -179,6 +179,6 @@ void xsldbgSetThreadCleanupFunc(void (*cleanupFunc)(void)) void xsldbgThreadCleanup(void) { - if (cleanupFuncPtr != 0) + if (cleanupFuncPtr) (cleanupFuncPtr)(); } diff --git a/src/kxsldbgpart/qxsldbgdoc.cpp b/src/kxsldbgpart/qxsldbgdoc.cpp index 1b7580c..2fa89d6 100644 --- a/src/kxsldbgpart/qxsldbgdoc.cpp +++ b/src/kxsldbgpart/qxsldbgdoc.cpp @@ -15,9 +15,9 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) - : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) + : TQObject(nullptr, "QXsldbgDoc"), kDoc(nullptr),kView(nullptr), locked(false) { - kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); + kDoc = KTextEditor::createDocument("libkatepart", nullptr,"KTextEditor::Document"); connect(kDoc, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(lockDoc())); connect(kDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(unlockDoc())); if (kDoc){ diff --git a/src/kxsldbgpart/qxsldbgdoc.h b/src/kxsldbgpart/qxsldbgdoc.h index 8ddd8e3..4fc96e4 100644 --- a/src/kxsldbgpart/qxsldbgdoc.h +++ b/src/kxsldbgpart/qxsldbgdoc.h @@ -22,7 +22,7 @@ TQ_OBJECT public: - QXsldbgDoc(TQWidget *parent=0, KURL url=TQString()); + QXsldbgDoc(TQWidget *parent=nullptr, KURL url=TQString()); ~QXsldbgDoc(); void enableBreakPoint(uint lineNumber, bool state); diff --git a/src/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/src/kxsldbgpart/xsldbgbreakpointsimpl.cpp index e7716a0..974683d 100644 --- a/src/kxsldbgpart/xsldbgbreakpointsimpl.cpp +++ b/src/kxsldbgpart/xsldbgbreakpointsimpl.cpp @@ -46,7 +46,7 @@ XsldbgBreakpointsImpl::XsldbgBreakpointsImpl(XsldbgDebugger *debugger, XsldbgBreakpointsImpl::~XsldbgBreakpointsImpl() { - debugger = 0L; + debugger = nullptr; } int XsldbgBreakpointsImpl::getLineNumber() @@ -97,7 +97,7 @@ void XsldbgBreakpointsImpl::slotAddBreakpoint() void XsldbgBreakpointsImpl::slotAddAllTemplateBreakpoints() { - if (debugger != 0L){ + if (debugger){ debugger->fakeInput("break *", true); debugger->fakeInput("show", true); } @@ -125,7 +125,7 @@ void XsldbgBreakpointsImpl::slotDeleteBreakpoint() void XsldbgBreakpointsImpl::slotDeleteAllBreakpoints() { - if (debugger != 0L){ + if (debugger){ debugger->fakeInput("delete *", true); debugger->fakeInput("show", true); } diff --git a/src/kxsldbgpart/xsldbgbreakpointsimpl.h b/src/kxsldbgpart/xsldbgbreakpointsimpl.h index 58f442c..7fdc1c7 100644 --- a/src/kxsldbgpart/xsldbgbreakpointsimpl.h +++ b/src/kxsldbgpart/xsldbgbreakpointsimpl.h @@ -33,7 +33,7 @@ class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase public: - XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgBreakpointsImpl(); /* Return >= 0 if line number entered is valid */ diff --git a/src/kxsldbgpart/xsldbgcallstackimpl.cpp b/src/kxsldbgpart/xsldbgcallstackimpl.cpp index 85a2b01..5475114 100644 --- a/src/kxsldbgpart/xsldbgcallstackimpl.cpp +++ b/src/kxsldbgpart/xsldbgcallstackimpl.cpp @@ -37,7 +37,7 @@ XsldbgCallStackImpl::XsldbgCallStackImpl(XsldbgDebugger *debugger, } XsldbgCallStackImpl::~XsldbgCallStackImpl(){ - debugger = 0L; + debugger = nullptr; } void XsldbgCallStackImpl::slotProcCallStackItem(TQString templateName, TQString fileName , int lineNumber ) diff --git a/src/kxsldbgpart/xsldbgcallstackimpl.h b/src/kxsldbgpart/xsldbgcallstackimpl.h index ee7b9e4..de8a52a 100644 --- a/src/kxsldbgpart/xsldbgcallstackimpl.h +++ b/src/kxsldbgpart/xsldbgcallstackimpl.h @@ -32,7 +32,7 @@ class XsldbgCallStackImpl : public XsldbgCallStack, public XsldbgDialogBase { public: - XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgCallStackImpl(); public slots: diff --git a/src/kxsldbgpart/xsldbgconfigimpl.cpp b/src/kxsldbgpart/xsldbgconfigimpl.cpp index 18fa6f2..bbfc2d0 100644 --- a/src/kxsldbgpart/xsldbgconfigimpl.cpp +++ b/src/kxsldbgpart/xsldbgconfigimpl.cpp @@ -28,7 +28,7 @@ #include LibxsltParam::LibxsltParam(const TQString &name, const TQString &value) - : TQObject(0L, 0L) + : TQObject(nullptr, nullptr) { _name = name; _value = value; @@ -92,13 +92,13 @@ XsldbgConfigImpl::XsldbgConfigImpl(XsldbgDebugger *debugger, XsldbgConfigImpl::~XsldbgConfigImpl() { - debugger = 0L; + debugger = nullptr; } TQString XsldbgConfigImpl::getSourceFile() { - if (xslSourceEdit != 0L) + if (xslSourceEdit) return xslSourceEdit->text(); else return TQString(); @@ -107,7 +107,7 @@ TQString XsldbgConfigImpl::getSourceFile() TQString XsldbgConfigImpl::getDataFile() { - if (xmlDataEdit != 0L) + if (xmlDataEdit) return xmlDataEdit->text(); else return TQString(); @@ -116,7 +116,7 @@ TQString XsldbgConfigImpl::getDataFile() TQString XsldbgConfigImpl::getOutputFile() { - if (outputFileEdit != 0L) + if (outputFileEdit) return outputFileEdit->text(); else return TQString(); @@ -130,8 +130,8 @@ LibxsltParam *XsldbgConfigImpl::getParam(int paramNumber) LibxsltParam *XsldbgConfigImpl::getParam(TQString name) { - LibxsltParam *param = 0L; - for (param = paramList.first(); param != 0L; param = paramList.next()) + LibxsltParam *param = nullptr; + for (param = paramList.first(); param; param = paramList.next()) { if (param->getName() == name) break; @@ -154,10 +154,10 @@ void XsldbgConfigImpl::addParam(TQString name, TQString value) return; param = getParam(name); - if (param == 0L) + if (!param) { param = new LibxsltParam(name, value); - if (param != 0L) + if (param) paramList.append(param); }else @@ -173,7 +173,7 @@ void XsldbgConfigImpl::deleteParam(TQString name) return; param = getParam(name); - if (param != 0L) + if (param) isOk = paramList.remove(param); if (isOk == false) @@ -206,7 +206,7 @@ bool XsldbgConfigImpl::isValid(TQString &errorMsg) // make it a warning when parameters are invalid LibxsltParam *param; TQString emptyParams = ""; - for (param = paramList.first(); param != 0L; param = paramList.next()) + for (param = paramList.first(); param; param = paramList.next()) { if (!param->isValid()){ if (emptyParams.isEmpty()) @@ -229,7 +229,7 @@ bool XsldbgConfigImpl::isValid(TQString &errorMsg) void XsldbgConfigImpl::update() { TQString msg; - if (debugger == 0L) + if (!debugger) return; /* update source, data, output file name if needed */ @@ -249,7 +249,7 @@ void XsldbgConfigImpl::update() LibxsltParam *param; - for (param = paramList.first(); param != 0L; param = paramList.next()) + for (param = paramList.first(); param; param = paramList.next()) { if (debugger->start() == false) return ; /* User has killed xsldbg and we can't restart it */ @@ -402,7 +402,7 @@ void XsldbgConfigImpl::slotChooseOutputFile() void XsldbgConfigImpl::slotReloadFileNames() { - if (debugger != 0){ + if (debugger){ xslSourceEdit->setText(debugger->sourceFileName()); xmlDataEdit->setText(debugger->dataFileName()); outputFileEdit->setText(debugger->outputFileName()); diff --git a/src/kxsldbgpart/xsldbgconfigimpl.h b/src/kxsldbgpart/xsldbgconfigimpl.h index 1ea50c6..6786322 100644 --- a/src/kxsldbgpart/xsldbgconfigimpl.h +++ b/src/kxsldbgpart/xsldbgconfigimpl.h @@ -52,7 +52,7 @@ class XsldbgConfigImpl : public XsldbgConfig, public XsldbgDialogBase { public: - XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgConfigImpl(); LibxsltParam *getParam(int paramNumber); diff --git a/src/kxsldbgpart/xsldbgdebugger.cpp b/src/kxsldbgpart/xsldbgdebugger.cpp index c926eca..04691bb 100644 --- a/src/kxsldbgpart/xsldbgdebugger.cpp +++ b/src/kxsldbgpart/xsldbgdebugger.cpp @@ -37,8 +37,8 @@ extern int xsldbgStop; XsldbgDebugger::XsldbgDebugger() { initialized = false; - inspector = 0L; - walkDialog = 0L; + inspector = nullptr; + walkDialog = nullptr; outputFileActive = false; updateText = ""; @@ -56,7 +56,7 @@ XsldbgDebugger::~XsldbgDebugger(){ if (initialized == true) xsldbgThreadFree(); - if (walkDialog != 0L) + if (walkDialog) walkDialog->close(true); } @@ -69,7 +69,7 @@ void XsldbgDebugger::setInspector(XsldbgInspector *inspector) bool XsldbgDebugger::event(TQEvent *e) { - if (e == 0L) + if (!e) return false; if (e->type() != TQEvent::User) @@ -95,7 +95,7 @@ void XsldbgDebugger::timerEvent(TQTimerEvent *e) { /* This function runs in the application's thread */ - if (e == 0L || (e->timerId() != updateTimerID)) + if (!e || (e->timerId() != updateTimerID)) return; if ((getInputReady() == 0) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT) && @@ -134,7 +134,7 @@ TQString XsldbgDebugger::sourceFileName() { TQString fileName; - if (optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME) != 0L) + if (optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)) fileName = TQString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)); return fileName; @@ -144,7 +144,7 @@ TQString XsldbgDebugger::dataFileName() { TQString fileName; - if (optionsGetStringOption(OPTIONS_DATA_FILE_NAME) != 0L) + if (optionsGetStringOption(OPTIONS_DATA_FILE_NAME)) fileName = TQString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); return fileName; @@ -154,7 +154,7 @@ TQString XsldbgDebugger::outputFileName() { TQString fileName; - if (optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) != 0L) + if (optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)) fileName = TQString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)); return fileName; @@ -211,7 +211,7 @@ void XsldbgDebugger::slotConfigure() if (start() == false) return; - if(inspector == 0L ){ + if(!inspector ){ inspector = new XsldbgInspector(this); connect(inspector, TQ_SIGNAL(closedWindow()), this, TQ_SLOT(slotConfigClosed())); } @@ -220,14 +220,14 @@ void XsldbgDebugger::slotConfigure() void XsldbgDebugger::slotConfigClosed() { - inspector = 0L; + inspector = nullptr; } void XsldbgDebugger::slotStepCmd() { if (start()) fakeInput("step", true); - if (inspector != 0L) + if (inspector) inspector->refreshVariables(); } @@ -236,7 +236,7 @@ void XsldbgDebugger::slotContinueCmd() if (start()) /*this can take a while so don't wait for xsldbg to finish */ fakeInput("continue", false); - if (inspector != 0L) + if (inspector) inspector->refreshVariables(); } @@ -247,7 +247,7 @@ void XsldbgDebugger::slotRunCmd() /*this can take a while so don't wait for xsldbg to finish */ fakeInput("run", false); - if (inspector != 0L) + if (inspector) inspector->refresh(); } @@ -271,10 +271,10 @@ void XsldbgDebugger::slotWalkSpeed(int speed) void XsldbgDebugger::slotWalkCmd() { - if (walkDialog == 0L ) + if (!walkDialog ) walkDialog = new XsldbgWalkSpeedImpl (this); - if (walkDialog != 0L) + if (walkDialog) /* if the user changes the speed the dialog will call back slotWalkSpeed(int) */ walkDialog->show(); } @@ -294,7 +294,7 @@ void XsldbgDebugger::slotTraceCmd() void XsldbgDebugger::slotBreakCmd(TQString fileName, int lineNumber) { if (outputFileActive == true){ - TQMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(nullptr, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), TQMessageBox::Ok); return ; @@ -306,7 +306,7 @@ void XsldbgDebugger::slotBreakCmd(TQString fileName, int lineNumber) if (start()) fakeInput(msg, true); - if (inspector != 0L) + if (inspector) inspector->refreshBreakpoints(); } @@ -314,7 +314,7 @@ void XsldbgDebugger::slotBreakCmd(TQString templateName, TQString modeName) { if (outputFileActive == true){ - TQMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(nullptr, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), TQMessageBox::Ok); return ; @@ -324,7 +324,7 @@ void XsldbgDebugger::slotBreakCmd(TQString templateName, TQString modeName) if (start()) fakeInput(msg, true); - if (inspector != 0L) + if (inspector) inspector->refreshBreakpoints(); } @@ -332,7 +332,7 @@ void XsldbgDebugger::slotEnableCmd(TQString fileName, int lineNumber) { if (outputFileActive == true){ - TQMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(nullptr, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), TQMessageBox::Ok); return ; @@ -343,7 +343,7 @@ void XsldbgDebugger::slotEnableCmd(TQString fileName, int lineNumber) if (start()) fakeInput(msg, true); - if (inspector != 0L) + if (inspector) inspector->refreshBreakpoints(); } @@ -352,7 +352,7 @@ void XsldbgDebugger::slotEnableCmd(int id) { if (outputFileActive == true){ - TQMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(nullptr, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), TQMessageBox::Ok); return ; @@ -363,7 +363,7 @@ void XsldbgDebugger::slotEnableCmd(int id) if (start()) fakeInput(msg, true); - if (inspector != 0L) + if (inspector) inspector->refreshBreakpoints(); } @@ -372,7 +372,7 @@ void XsldbgDebugger::slotDeleteCmd(TQString fileName, int lineNumber) { if (outputFileActive == true){ - TQMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(nullptr, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), TQMessageBox::Ok); return ; @@ -382,7 +382,7 @@ void XsldbgDebugger::slotDeleteCmd(TQString fileName, int lineNumber) msg.append(XsldbgDebugger::fixLocalPaths(fileName)).append("\" ").append(TQString::number(lineNumber)); if (start()) fakeInput(msg, true); - if (inspector != 0L) + if (inspector) inspector->refreshBreakpoints(); } @@ -391,7 +391,7 @@ void XsldbgDebugger::slotDeleteCmd(int id) { if (outputFileActive == true){ - TQMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(nullptr, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), TQMessageBox::Ok); return ; @@ -400,7 +400,7 @@ void XsldbgDebugger::slotDeleteCmd(int id) msg.append(TQString::number(id)); if (start()) fakeInput(msg, true); - if (inspector != 0L) + if (inspector) inspector->refreshBreakpoints(); } diff --git a/src/kxsldbgpart/xsldbgentitiesimpl.h b/src/kxsldbgpart/xsldbgentitiesimpl.h index 8c8cc8b..e7f65be 100644 --- a/src/kxsldbgpart/xsldbgentitiesimpl.h +++ b/src/kxsldbgpart/xsldbgentitiesimpl.h @@ -32,7 +32,7 @@ class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase { public: - XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgEntitiesImpl(); public slots: diff --git a/src/kxsldbgpart/xsldbgglobalvariablesimpl.cpp b/src/kxsldbgpart/xsldbgglobalvariablesimpl.cpp index 69affd1..baa05e8 100644 --- a/src/kxsldbgpart/xsldbgglobalvariablesimpl.cpp +++ b/src/kxsldbgpart/xsldbgglobalvariablesimpl.cpp @@ -37,7 +37,7 @@ XsldbgGlobalVariablesImpl::XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, XsldbgGlobalVariablesImpl::~XsldbgGlobalVariablesImpl(){ - debugger = 0L; + debugger = nullptr; } void XsldbgGlobalVariablesImpl::slotProcGlobalVariableItem(TQString name , TQString fileName, int lineNumber) @@ -55,20 +55,20 @@ void XsldbgGlobalVariablesImpl::slotProcGlobalVariableItem(TQString name , TQStr void XsldbgGlobalVariablesImpl::selectionChanged(TQListViewItem *item) { XsldbgGlobalListItem *globalItem = dynamic_cast(item); - if (globalItem != 0 && debugger != 0) { + if (globalItem && debugger) { debugger->gotoLine(globalItem->getFileName(), globalItem->getLineNumber()); } } void XsldbgGlobalVariablesImpl::refresh() { - if (debugger != 0) + if (debugger) debugger->fakeInput("globals -q", true) ; } void XsldbgGlobalVariablesImpl::slotEvaluate() { - if (debugger != 0L) + if (debugger) debugger->slotCatCmd( expressionEdit->text() ); } diff --git a/src/kxsldbgpart/xsldbgglobalvariablesimpl.h b/src/kxsldbgpart/xsldbgglobalvariablesimpl.h index eca498b..4f1f6a6 100644 --- a/src/kxsldbgpart/xsldbgglobalvariablesimpl.h +++ b/src/kxsldbgpart/xsldbgglobalvariablesimpl.h @@ -32,7 +32,7 @@ class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDia public: - XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgGlobalVariablesImpl(); public slots: diff --git a/src/kxsldbgpart/xsldbginspector.cpp b/src/kxsldbgpart/xsldbginspector.cpp index 7db6ce2..a0e0da4 100644 --- a/src/kxsldbgpart/xsldbginspector.cpp +++ b/src/kxsldbgpart/xsldbginspector.cpp @@ -56,12 +56,12 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, { TQ_CHECK_PTR(debugger); this->debugger = debugger; - breakpointWidget = 0L; - localWidget = 0L; - callStackWidget = 0L; - templateWidget = 0L; - sourceWidget = 0L; - entityWidget = 0L; + breakpointWidget = nullptr; + localWidget = nullptr; + callStackWidget = nullptr; + templateWidget = nullptr; + sourceWidget = nullptr; + entityWidget = nullptr; if ( !name ) setName( "XsldbgInspector" ); resize( 597, 364 ); @@ -107,7 +107,7 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, i18n( "Entities" )); XsldbgInspectorLayout->addWidget( tabWidget, 0, 1 ); - Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); + Layout1 = new TQHBoxLayout( nullptr, 0, 6, "Layout1"); buttonHelp = new KPushButton( KStdGuiItem::help(), this, "buttonHelp" ); buttonHelp->setAccel( 4144 ); @@ -158,7 +158,7 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, */ XsldbgInspector::~XsldbgInspector() { - debugger = 0L; + debugger = nullptr; // no need to delete child widgets, TQt does it all for us } @@ -180,30 +180,30 @@ void XsldbgInspector::refresh() refreshBreakpoints(); refreshVariables(); - if ( templateWidget != 0L) + if ( templateWidget) templateWidget->refresh(); - if ( sourceWidget != 0L) + if ( sourceWidget) sourceWidget->refresh(); - if ( entityWidget != 0L) + if ( entityWidget) entityWidget->refresh(); } void XsldbgInspector::refreshBreakpoints() { - if ( breakpointWidget != 0L ) + if ( breakpointWidget ) breakpointWidget->refresh(); } void XsldbgInspector::refreshVariables() { - if ( localWidget != 0L ) + if ( localWidget ) localWidget->refresh(); - if (callStackWidget != 0L) + if (callStackWidget) callStackWidget->refresh(); } diff --git a/src/kxsldbgpart/xsldbginspector.h b/src/kxsldbgpart/xsldbginspector.h index 1663dcb..c9efc7a 100644 --- a/src/kxsldbgpart/xsldbginspector.h +++ b/src/kxsldbgpart/xsldbginspector.h @@ -34,7 +34,7 @@ class XsldbgInspector : public TQDialog public: - XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); + XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent = nullptr, const char* name = nullptr, bool modal = false, WFlags fl = 0 ); ~XsldbgInspector(); TQTabWidget* tabWidget; diff --git a/src/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/src/kxsldbgpart/xsldbglocalvariablesimpl.cpp index 5926734..5851927 100644 --- a/src/kxsldbgpart/xsldbglocalvariablesimpl.cpp +++ b/src/kxsldbgpart/xsldbglocalvariablesimpl.cpp @@ -45,7 +45,7 @@ XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, XsldbgLocalVariablesImpl::~XsldbgLocalVariablesImpl() { - debugger = 0L; + debugger = nullptr; } void XsldbgLocalVariablesImpl::slotProcVariableItem(TQString name , TQString templateContext, @@ -102,13 +102,13 @@ void XsldbgLocalVariablesImpl::refresh() void XsldbgLocalVariablesImpl::slotEvaluate() { - if (debugger != 0L) + if (debugger) debugger->slotCatCmd( expressionEdit->text() ); } void XsldbgLocalVariablesImpl::slotSetExpression() { - if (debugger != 0L){ + if (debugger){ debugger->slotSetVariableCmd( variableName->text(), xPathEdit->text() ); refresh(); } diff --git a/src/kxsldbgpart/xsldbglocalvariablesimpl.h b/src/kxsldbgpart/xsldbglocalvariablesimpl.h index 805c41e..dda2f36 100644 --- a/src/kxsldbgpart/xsldbglocalvariablesimpl.h +++ b/src/kxsldbgpart/xsldbglocalvariablesimpl.h @@ -32,7 +32,7 @@ class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialo public: - XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgLocalVariablesImpl(); public slots: diff --git a/src/kxsldbgpart/xsldbgoutputview.cpp b/src/kxsldbgpart/xsldbgoutputview.cpp index c07d928..3b72b0e 100644 --- a/src/kxsldbgpart/xsldbgoutputview.cpp +++ b/src/kxsldbgpart/xsldbgoutputview.cpp @@ -60,7 +60,7 @@ XsldbgOutputView::XsldbgOutputView(TQWidget * parent) setMinimumSize(TQSize(500, 80)); setCaption(i18n("xsldbg Output")); setText(i18n("\t\txsldbg output capture ready\n\n")); - dlg = 0L; + dlg = nullptr; show(); setReadOnly(true); } @@ -119,7 +119,7 @@ void XsldbgOutputView::showDialog(TQMessageBox::Icon icon, TQString title, if ( dlg ){ dlg->exec(); delete dlg; - dlg = 0L; + dlg = nullptr; } } } diff --git a/src/kxsldbgpart/xsldbgoutputview.h b/src/kxsldbgpart/xsldbgoutputview.h index 3d1cd1d..cbf8702 100644 --- a/src/kxsldbgpart/xsldbgoutputview.h +++ b/src/kxsldbgpart/xsldbgoutputview.h @@ -32,7 +32,7 @@ class XsldbgOutputView : public TQTextEdit { public : - XsldbgOutputView(TQWidget *parent = 0); + XsldbgOutputView(TQWidget *parent = nullptr); void showDialog(TQMessageBox::Icon icon, TQString title, TQString msg); diff --git a/src/kxsldbgpart/xsldbgsourcesimpl.cpp b/src/kxsldbgpart/xsldbgsourcesimpl.cpp index 3bad8a5..5d77c22 100644 --- a/src/kxsldbgpart/xsldbgsourcesimpl.cpp +++ b/src/kxsldbgpart/xsldbgsourcesimpl.cpp @@ -39,7 +39,7 @@ XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger, } XsldbgSourcesImpl::~XsldbgSourcesImpl(){ - debugger = 0L; + debugger = nullptr; } void XsldbgSourcesImpl::slotProcSourceItem(TQString fileName , TQString parentFileName , int lineNumber ) diff --git a/src/kxsldbgpart/xsldbgsourcesimpl.h b/src/kxsldbgpart/xsldbgsourcesimpl.h index 9915b9c..0998e40 100644 --- a/src/kxsldbgpart/xsldbgsourcesimpl.h +++ b/src/kxsldbgpart/xsldbgsourcesimpl.h @@ -32,7 +32,7 @@ class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase { public: - XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgSourcesImpl(); public slots: diff --git a/src/kxsldbgpart/xsldbgtemplatesimpl.cpp b/src/kxsldbgpart/xsldbgtemplatesimpl.cpp index 2c0de0e..b92feac 100644 --- a/src/kxsldbgpart/xsldbgtemplatesimpl.cpp +++ b/src/kxsldbgpart/xsldbgtemplatesimpl.cpp @@ -36,7 +36,7 @@ XsldbgTemplatesImpl::XsldbgTemplatesImpl(XsldbgDebugger *debugger, } XsldbgTemplatesImpl::~XsldbgTemplatesImpl(){ - debugger = 0L; + debugger = nullptr; } diff --git a/src/kxsldbgpart/xsldbgtemplatesimpl.h b/src/kxsldbgpart/xsldbgtemplatesimpl.h index c7fa5b7..c8dfbbd 100644 --- a/src/kxsldbgpart/xsldbgtemplatesimpl.h +++ b/src/kxsldbgpart/xsldbgtemplatesimpl.h @@ -34,7 +34,7 @@ class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase { public: - XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgTemplatesImpl(); public slots: diff --git a/src/kxsldbgpart/xsldbgwalkspeedimpl.h b/src/kxsldbgpart/xsldbgwalkspeedimpl.h index ec80d4e..85f1c77 100644 --- a/src/kxsldbgpart/xsldbgwalkspeedimpl.h +++ b/src/kxsldbgpart/xsldbgwalkspeedimpl.h @@ -31,7 +31,7 @@ class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed { public: - XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); + XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *parent=nullptr, const char *name=nullptr); ~XsldbgWalkSpeedImpl(); public slots: diff --git a/src/main.cpp b/src/main.cpp index f90cfb7..71687e2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,16 +11,16 @@ static const char *description = static const char *version = VERSION; static const TDECmdLineOptions options[] = { - { "+XSLSource", I18N_NOOP("XSL script to run"), 0}, - { "+XMLData", I18N_NOOP("XML data to be transformed"), 0}, - { "+OutputFile", I18N_NOOP("File to save results to"), 0}, + { "+XSLSource", I18N_NOOP("XSL script to run"), nullptr}, + { "+XMLData", I18N_NOOP("XML data to be transformed"), nullptr}, + { "+OutputFile", I18N_NOOP("File to save results to"), nullptr}, TDECmdLineLastOption // End of options. }; int main(int argc, char **argv) { - TDEAboutData about("kxsldbg", I18N_NOOP("KXSLDbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", 0, 0, "k_isdale@tpg.com.au"); - about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" ); + TDEAboutData about("kxsldbg", I18N_NOOP("KXSLDbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", nullptr, nullptr, "k_isdale@tpg.com.au"); + about.addAuthor( "Keith Isdale", nullptr, "k_isdale@tpg.com.au" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication app; diff --git a/src/xsldbgmain.cpp b/src/xsldbgmain.cpp index bc4aade..9faef9c 100644 --- a/src/xsldbgmain.cpp +++ b/src/xsldbgmain.cpp @@ -54,48 +54,48 @@ static const char *version = VERSION; static const TDECmdLineOptions options[] = { - { "shell", I18N_NOOP("Start a shell"), 0}, - { "cd ", I18N_NOOP("Path to change into before loading files"), 0}, - { "param :",I18N_NOOP("Add a parameter named and value to XSL environment"), 0}, - { "lang ", I18N_NOOP("Use ISO 639 language code specified; for example en_US"), 0}, { "output file", I18N_NOOP("Save to a given file. See output command documentation"), 0}, - { "version", I18N_NOOP("Show the version of libxml and libxslt used"), 0}, - { "verbose", I18N_NOOP("Show logs of what is happening"), 0}, - { "timing", I18N_NOOP("Display the time used"), 0}, - { "repeat", I18N_NOOP("Run the transformation 20 times"), 0}, + { "shell", I18N_NOOP("Start a shell"), nullptr}, + { "cd ", I18N_NOOP("Path to change into before loading files"), nullptr}, + { "param :",I18N_NOOP("Add a parameter named and value to XSL environment"), nullptr}, + { "lang ", I18N_NOOP("Use ISO 639 language code specified; for example en_US"), nullptr}, { "output file", I18N_NOOP("Save to a given file. See output command documentation"), nullptr}, + { "version", I18N_NOOP("Show the version of libxml and libxslt used"), nullptr}, + { "verbose", I18N_NOOP("Show logs of what is happening"), nullptr}, + { "timing", I18N_NOOP("Display the time used"), nullptr}, + { "repeat", I18N_NOOP("Run the transformation 20 times"), nullptr}, #ifdef LIBXML_DEBUG_ENABLED - { "debug", I18N_NOOP("Dump the tree of the result instead"), 0}, + { "debug", I18N_NOOP("Dump the tree of the result instead"), nullptr}, #endif - { "novalid", I18N_NOOP("Disable the DTD loading phase"), 0}, - { "noout", I18N_NOOP("Disable the output of the result"), 0}, - { "maxdepth val", I18N_NOOP("Increase the maximum depth"), 0}, + { "novalid", I18N_NOOP("Disable the DTD loading phase"), nullptr}, + { "noout", I18N_NOOP("Disable the output of the result"), nullptr}, + { "maxdepth val", I18N_NOOP("Increase the maximum depth"), nullptr}, #ifdef LIBXML_HTML_ENABLED - { "html", I18N_NOOP("The input document is(are) an HTML file(s)"), 0}, + { "html", I18N_NOOP("The input document is(are) an HTML file(s)"), nullptr}, #endif #ifdef LIBXML_DOCB_ENABLED - { "docbook", I18N_NOOP("The input document is SGML docbook"), 0}, + { "docbook", I18N_NOOP("The input document is SGML docbook"), nullptr}, #endif - { "nonet", I18N_NOOP("Disable the fetching DTDs or entities over network"), 0}, + { "nonet", I18N_NOOP("Disable the fetching DTDs or entities over network"), nullptr}, #ifdef LIBXML_CATALOG_ENABLED - { "catalogs", I18N_NOOP("Use the catalogs from $SGML_CATALOG_FILES"), 0}, + { "catalogs", I18N_NOOP("Use the catalogs from $SGML_CATALOG_FILES"), nullptr}, #endif #ifdef LIBXML_XINCLUDE_ENABLED - { "noxinclude", I18N_NOOP("Disable XInclude processing on document input"), 0}, + { "noxinclude", I18N_NOOP("Disable XInclude processing on document input"), nullptr}, #endif - { "profile", I18N_NOOP("Print profiling informations"), 0}, - { "nogdb", I18N_NOOP("Do not run gdb compatability mode and print less information"), 0}, - { "autoencode", I18N_NOOP("Detect and use encodings in the stylesheet"), 0}, - { "utf8input", I18N_NOOP("Treat command line input as encoded in UTF-8"), 0}, - { "preferhtml", I18N_NOOP("Use HTML output when generating search reports"), 0}, - { "stdout", I18N_NOOP("Print all error messages to stdout, normally error messages go to stderr"), 0}, - { "noautorestart", I18N_NOOP("Disable the automatic restarting of execution when current processing pass is complete"), 0}, - { "+XSLSource", I18N_NOOP("XSL script to run"), 0}, - { "+XMLData", I18N_NOOP("XML data to be transformed"), 0}, + { "profile", I18N_NOOP("Print profiling informations"), nullptr}, + { "nogdb", I18N_NOOP("Do not run gdb compatability mode and print less information"), nullptr}, + { "autoencode", I18N_NOOP("Detect and use encodings in the stylesheet"), nullptr}, + { "utf8input", I18N_NOOP("Treat command line input as encoded in UTF-8"), nullptr}, + { "preferhtml", I18N_NOOP("Use HTML output when generating search reports"), nullptr}, + { "stdout", I18N_NOOP("Print all error messages to stdout, normally error messages go to stderr"), nullptr}, + { "noautorestart", I18N_NOOP("Disable the automatic restarting of execution when current processing pass is complete"), nullptr}, + { "+XSLSource", I18N_NOOP("XSL script to run"), nullptr}, + { "+XMLData", I18N_NOOP("XML data to be transformed"), nullptr}, TDECmdLineLastOption // End of options. }; @@ -112,7 +112,7 @@ class XsldbgApp : public TDEApplication } int exec(){ - return xsldbgMain(0, 0); + return xsldbgMain(0, nullptr); } }; @@ -127,8 +127,8 @@ int main(int argc, char **argv) TQString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").arg(exsltLibexsltVersion).arg(exsltLibxmlVersion)); TQString freeFormText = xsldbgRunTimeInfo + libxmlCompileTimeInfo + libxsltCompileTimeInfo + libexsltCompileTimeInfo; - TDEAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText.utf8(), 0, "k_isdale@tpg.com.au"); - about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" ); + TDEAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText.utf8(), nullptr, "k_isdale@tpg.com.au"); + about.addAuthor( "Keith Isdale", nullptr, "k_isdale@tpg.com.au" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); XsldbgApp app; -- cgit v1.2.3