diff options
Diffstat (limited to 'kxsldbg/kxsldbgpart')
67 files changed, 421 insertions, 154 deletions
diff --git a/kxsldbg/kxsldbgpart/CMakeLists.txt b/kxsldbg/kxsldbgpart/CMakeLists.txt new file mode 100644 index 00000000..da1a74e3 --- /dev/null +++ b/kxsldbg/kxsldbgpart/CMakeLists.txt @@ -0,0 +1,112 @@ +add_subdirectory( libtqtnotfier ) +add_subdirectory( libxsldbg ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${LIBXML_INCLUDE_DIRS} + ${LIBXSLT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +add_compile_options( ${ICU_CXXFLAGS} ) + + +##### kxsldbgcommon (static) + +tde_add_library( kxsldbgcommon STATIC_PIC AUTOMOC + + SOURCES + kxsldbg_partif.skel + xsldbgwalkspeed.ui + xsldbgtemplates.ui + xsldbgsources.ui + xsldbgmsgdialog.ui + xsldbglocalvariables.ui + xsldbgglobalvariables.ui + xsldbgentities.ui + xsldbgconfig.ui + xsldbgcallstack.ui + xsldbgbreakpoints.ui + xsldbgwalkspeedimpl.cpp + xsldbgtemplatesimpl.cpp + xsldbgtemplatelistitem.cpp + xsldbgsourcesimpl.cpp + xsldbgoutputview.cpp + xsldbglocalvariablesimpl.cpp + xsldbglocallistitem.cpp + xsldbglistitem.cpp + xsldbginspector.cpp + xsldbgglobalvariablesimpl.cpp + xsldbggloballistitem.cpp + xsldbgentitiesimpl.cpp + xsldbgdoc.cpp + xsldbgdialogbase.cpp + xsldbgdebugger.cpp + xsldbgconfigimpl.cpp + xsldbgcallstackimpl.cpp + xsldbgbreakpointsimpl.cpp + xsldbgbreakpointlistitem.cpp + qxsldbgdoc.cpp + kxsldbg_part.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeparts-shared + kjs-shared + xsldbg-static + tqtnotfier-static +) + + +##### libkxsldbgpart (kpart) + +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) + +tde_add_kpart( libkxsldbgpart AUTOMOC + + SOURCES + dummy.cpp + EMBED + kxsldbgcommon-static + LINK + tdecore-shared + tdeui-shared + kjs-shared + tdeio-shared + tdeparts-shared + katepartinterfaces-shared + ${READLINE_LIBRARIES} + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### icons + +tde_install_icons( ) + + +##### other data + +tde_create_translated_desktop( + SOURCE kxsldbg_part.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kxsldbg-desktops +) + +install( + FILES kxsldbg_part.rc + DESTINATION ${DATA_INSTALL_DIR}/kxsldbgpart +) diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am index d04553b4..2861ca20 100644 --- a/kxsldbg/kxsldbgpart/Makefile.am +++ b/kxsldbg/kxsldbgpart/Makefile.am @@ -8,6 +8,7 @@ noinst_HEADERS = kxsldbg_part.h qxsldbgdoc.h xsldbgbreakpointlistitem.h xsldbgbr kde_module_LTLIBRARIES = libkxsldbgpart.la +CLEANFILES = dummy.cpp libkxsldbgpart_la_SOURCES = dummy.cpp SUBDIRS = libtqtnotfier libxsldbg @@ -29,3 +30,5 @@ partrc_DATA = kxsldbg_part.rc KDE_ICON = AUTO +dummy.cpp: + echo > dummy.cpp diff --git a/kxsldbg/kxsldbgpart/dummy.cpp b/kxsldbg/kxsldbgpart/dummy.cpp deleted file mode 100644 index e69de29b..00000000 --- a/kxsldbg/kxsldbgpart/dummy.cpp +++ /dev/null diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index d1dee273..d83b6be4 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -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(Qt::Vertical, frame); + TQSplitter *splitter = new TQSplitter(TQt::Vertical, frame); mainView = new TQWidgetStack(splitter); mainView->setMinimumHeight(400); //## TODO don't use a magic number outputview = new XsldbgOutputView(splitter); @@ -102,149 +102,149 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, docDictionary.setAutoDelete(true); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); // set our XML-UI resource file setXMLFile("kxsldbg_part.rc"); (void) new TDEAction( i18n("Configure Editor..."), "configure", 0, - this, TQT_SLOT(configureEditorCmd_activated()), + this, TQ_SLOT(configureEditorCmd_activated()), actionCollection(), "configureEditorCmd" ); (void) new TDEAction( i18n("Configure..."), "configure", Key_C, - this, TQT_SLOT(configureCmd_activated()), + this, TQ_SLOT(configureCmd_activated()), actionCollection(), "configureCmd" ); (void) new TDEAction( i18n("Inspect..."), "edit-find", Key_I, - this, TQT_SLOT(inspectorCmd_activated()), + this, TQ_SLOT(inspectorCmd_activated()), actionCollection(), "inspectCmd" ); // Motions commands (void) new TDEAction( i18n("Run"), "system-run", Key_F5, - this, TQT_SLOT(runCmd_activated()), + this, TQ_SLOT(runCmd_activated()), actionCollection(), "runCmd" ); (void) new TDEAction( i18n("Continue"), "1downarrow", Key_F4, - this, TQT_SLOT(continueCmd_activated()), + this, TQ_SLOT(continueCmd_activated()), actionCollection(), "continueCmd" ); (void) new TDEAction( i18n("Step"), "step", Key_F8, - this, TQT_SLOT(stepCmd_activated()), + this, TQ_SLOT(stepCmd_activated()), actionCollection(), "stepCmd" ); (void) new TDEAction( i18n("Next"), "next", Key_F10, - this, TQT_SLOT(nextCmd_activated()), + this, TQ_SLOT(nextCmd_activated()), actionCollection(), "nextCmd" ); (void) new TDEAction( i18n("Step Up"), "xsldbg_stepup", Key_F6, - this, TQT_SLOT(stepupCmd_activated()), + this, TQ_SLOT(stepupCmd_activated()), actionCollection(), "stepupCmd" ); (void) new TDEAction( i18n("Step Down"), "xsldbg_stepdown", Key_F7, - this, TQT_SLOT(stepCmd_activated()), + this, TQ_SLOT(stepCmd_activated()), actionCollection(), "stepdownCmd" ); // Breakpoint commands (void) new TDEAction( i18n("Break"), "xsldbg_break", Key_F2, - this, TQT_SLOT(breakCmd_activated()), + this, TQ_SLOT(breakCmd_activated()), actionCollection(), "breakCmd" ); (void) new TDEAction( i18n("Enable/Disable"), "xsldbg_enable", Key_F3, - this, TQT_SLOT(enableCmd_activated()), + this, TQ_SLOT(enableCmd_activated()), actionCollection(), "enableCmd" ); (void) new TDEAction( i18n("Delete"), "xsldbg_delete", Key_Delete, - this, TQT_SLOT(deleteCmd_activated()), + this, TQ_SLOT(deleteCmd_activated()), actionCollection(), "deleteCmd" ); (void) new TDEAction( i18n("&Source"), "xsldbg_source", Key_S, - this, TQT_SLOT(sourceCmd_activated()), + this, TQ_SLOT(sourceCmd_activated()), actionCollection(), "sourceCmd" ); (void) new TDEAction( i18n("&Data"), "xsldbg_data", Key_D, - this, TQT_SLOT(dataCmd_activated()), + this, TQ_SLOT(dataCmd_activated()), actionCollection(), "dataCmd" ); (void) new TDEAction( i18n("&Output"), "xsldbg_output", Key_O, - this, TQT_SLOT(outputCmd_activated()), + this, TQ_SLOT(outputCmd_activated()), actionCollection(), "outputCmd" ); (void) new TDEAction( i18n("Reload Current File From Disk"), "xsldbg_refresh", CTRL + Key_F5, - this, TQT_SLOT(refreshCmd_activated()), + this, TQ_SLOT(refreshCmd_activated()), actionCollection(), "refreshCmd" ); /* tracing and walking */ (void) new TDEAction( i18n("Walk Through Stylesheet..."), Key_W, - this, TQT_SLOT(walkCmd_activated()), + this, TQ_SLOT(walkCmd_activated()), actionCollection(), "walkCmd" ); (void) new TDEAction( i18n("Stop Wal&king Through Stylesheet"), Key_K, - this, TQT_SLOT(walkStopCmd_activated()), + this, TQ_SLOT(walkStopCmd_activated()), actionCollection(), "walkStopCmd" ); (void) new TDEAction( i18n("Tr&ace Execution of Stylesheet"), Key_A, - this, TQT_SLOT(traceCmd_activated()), + this, TQ_SLOT(traceCmd_activated()), actionCollection(), "traceCmd" ); (void) new TDEAction( i18n("Stop Tracing of Stylesheet"), Key_K, - this, TQT_SLOT(traceStopCmd_activated()), + this, TQ_SLOT(traceStopCmd_activated()), actionCollection(), "traceStopCmd" ); (void) new TDEAction( i18n("&Evaluate Expression..."), Key_E, - this, TQT_SLOT(evaluateCmd_activated()), + this, TQ_SLOT(evaluateCmd_activated()), actionCollection(), "evaluateCmd" ); (void) new TDEAction( i18n("Goto &XPath..."), Key_X, - this, TQT_SLOT(gotoXPathCmd_activated()), + this, TQ_SLOT(gotoXPathCmd_activated()), actionCollection(), "gotoXPathCmd" ); (void) new TDEAction( i18n("Lookup SystemID..."), 0, - this, TQT_SLOT(slotLookupSystemID()), + this, TQ_SLOT(slotLookupSystemID()), actionCollection(), "lookupSystemID" ); (void) new TDEAction( i18n("Lookup PublicID..."), 0, - this, TQT_SLOT(slotLookupPublicID()), + this, TQ_SLOT(slotLookupPublicID()), actionCollection(), "lookupPublicID" ); (void) new TDEAction( i18n("Quit"), 0, CTRL + Key_Q, - this, TQT_SLOT(quit()), + this, TQ_SLOT(quit()), actionCollection(), "file_quit" ); /* (void) new TDEAction( i18n("Exit KXsldbg"), "xsldbg_output", CTRL + Key_Q, - this, TQT_SLOT(exitCmd_activated()), + this, TQ_SLOT(exitCmd_activated()), actionCollection(), "exitCmd" ); */ - connect( xPathBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotGotoXPath() ) ); - connect( evaluateBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotEvaluate() ) ); + connect( xPathBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotGotoXPath() ) ); + connect( evaluateBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotEvaluate() ) ); /* - connect( searchBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSearch() ) ); + connect( searchBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSearch() ) ); */ /* We must have a valid debugger and inspector */ createInspector(); @@ -312,7 +312,7 @@ bool KXsldbgPart::fetchURL(const KURL &url) if (docPtr->kateView()){ mainView->addWidget(docPtr->kateView()); Kate::View *v = Kate::view((docPtr->kateView())); - connect(v, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(v, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); } } @@ -470,13 +470,13 @@ void KXsldbgPart::createInspector() debugger = new XsldbgDebugger(); TQ_CHECK_PTR( debugger ); if ( debugger != 0L ) { - connect(debugger, TQT_SIGNAL( debuggerReady()), - this, TQT_SLOT(debuggerStarted())); + connect(debugger, TQ_SIGNAL( debuggerReady()), + this, TQ_SLOT(debuggerStarted())); if (outputview){ connect(debugger, - TQT_SIGNAL( showMessage(TQString /* msg*/)), + TQ_SIGNAL( showMessage(TQString /* msg*/)), outputview, - TQT_SLOT(slotProcShowMessage(TQString /* msg*/))); + TQ_SLOT(slotProcShowMessage(TQString /* msg*/))); } inspector = new XsldbgInspector( debugger ); TQ_CHECK_PTR( inspector ); @@ -484,31 +484,31 @@ void KXsldbgPart::createInspector() if (inspector != 0L){ /*process line number and/or file name changed */ connect(debugger, - TQT_SIGNAL(lineNoChanged + TQ_SIGNAL(lineNoChanged (TQString /* fileName */ , int /* lineNumber */ , bool /* breakpoint */ ) ), this, - TQT_SLOT(lineNoChanged + TQ_SLOT(lineNoChanged ( TQString /* fileName */ , int /* lineNumber */ , bool /* breakpoint */ ) ) ); connect(debugger, - TQT_SIGNAL(breakpointItem(TQString /* fileName*/, + TQ_SIGNAL(breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */)), this, - TQT_SLOT( breakpointItem(TQString /* fileName*/, + TQ_SLOT( breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */))); - connect(debugger, TQT_SIGNAL(resolveItem(TQString /*URI*/)), - this, TQT_SLOT(slotProcResolveItem(TQString /*URI*/))); + connect(debugger, TQ_SIGNAL(resolveItem(TQString /*URI*/)), + this, TQ_SLOT(slotProcResolveItem(TQString /*URI*/))); } } } diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.desktop b/kxsldbg/kxsldbgpart/kxsldbg_part.desktop index 7a13356f..81eca2be 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.desktop +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.desktop @@ -1,15 +1,7 @@ [Desktop Entry] Name=KXsldbgPart -Name[de]=KXsldbg-Komponente -Name[fr]=Module externe KXsldbg -Name[ja]=KXsldbgPort -Name[nds]=KXsldbg-Komponent -Name[pl]=Osadzalny program KPart KXsldbg -Name[pt_BR]=KXSsldbgPart -Name[sv]=Kxsldbg-delprogram -Name[ta]=KXsldbg பகுதி -Name[tg]=Қисми KXsldbg + +Type=Service MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; X-TDE-ServiceTypes=KParts/ReadOnlyPart X-TDE-Library=libkxsldbgpart -Type=Service diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h index 173d22cf..35328993 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.h +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h @@ -47,7 +47,7 @@ typedef TQDict<QXsldbgDoc> XsldbgDocDict; */ class KXsldbgPart : public KParts::ReadOnlyPart, public KXsldbgPartIf { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt b/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt new file mode 100644 index 00000000..e8416c7d --- /dev/null +++ b/kxsldbg/kxsldbgpart/libtqtnotfier/CMakeLists.txt @@ -0,0 +1,37 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${LIBXML_INCLUDE_DIRS} + ${LIBXSLT_INCLUDE_DIRS} + ${READLINE_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +add_compile_options( ${ICU_CXXFLAGS} ) + + +##### tqtnotfier (static) + +tde_add_library( tqtnotfier STATIC_PIC AUTOMOC + + SOURCES + xsldbgthread.cpp + xsldbgnotifier.cpp + xsldbgevent.cpp + xsldbgdebuggerbase.cpp + qtnotifier2.cpp + LINK + ${LIBXSLT_LIBRARIES} + ${READLINE_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} +) diff --git a/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.h b/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.h index 78dcbf3c..b82dbac7 100644 --- a/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.h +++ b/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.h @@ -44,7 +44,7 @@ class TQStringList; */ class XsldbgDebuggerBase : public TQObject { - Q_OBJECT + TQ_OBJECT friend class XsldbgEvent; diff --git a/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp index 29ff227e..d717a1f9 100644 --- a/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp +++ b/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgthread.cpp @@ -15,8 +15,10 @@ * * ***************************************************************************/ - +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + #include <pthread.h> /* need to create/work with process thread */ #include <errno.h> /* need for EAGAIN */ #include <stdlib.h> diff --git a/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt b/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt new file mode 100644 index 00000000..79160bc0 --- /dev/null +++ b/kxsldbg/kxsldbgpart/libxsldbg/CMakeLists.txt @@ -0,0 +1,57 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${LIBXML_INCLUDE_DIRS} + ${LIBXSLT_INCLUDE_DIRS} + ${READLINE_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + +add_compile_options( ${ICU_CXXFLAGS} ) + +##### xsldbg (static) + +tde_add_library( xsldbg STATIC_PIC AUTOMOC + + SOURCES + allmoc.cpp + xsldbgthread.cpp + xsldbg.cpp + xsldbgmsg.cpp + variable_cmds.cpp + utils.cpp + trace_cmds.cpp + template_cmds.cpp + search_cmds.cpp + search.cpp + param_cmds.cpp + os_cmds.cpp + options_unix.cpp + options.cpp + option_cmds.cpp + nodeview_cmds.cpp + help_unix.cpp + files_unix.cpp + files.cpp + file_cmds.cpp + debug.cpp + callstack.cpp + breakpoint_cmds.cpp + breakpoint.cpp + arraylist.cpp + debugXSL.cpp + LINK + ${LIBXSLT_LIBRARIES} + ${LIBEXSLT_LIBRARIES} + ${READLINE_LIBRARIES} +) diff --git a/kxsldbg/kxsldbgpart/libxsldbg/arraylist.h b/kxsldbg/kxsldbgpart/libxsldbg/arraylist.h index 81398459..f6256429 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/arraylist.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/arraylist.h @@ -20,6 +20,10 @@ #ifndef ARRAYLIST_H #define ARRAYLIST_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef USE_KDE_DOCS /** diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h index fd410366..09002c9c 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h @@ -21,6 +21,10 @@ #ifndef XSLBREAKPOINT_H #define XSLBREAKPOINT_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef USE_KDE_DOCS /** diff --git a/kxsldbg/kxsldbgpart/libxsldbg/callstack.h b/kxsldbg/kxsldbgpart/libxsldbg/callstack.h index fd87b9bd..60bf4652 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/callstack.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/callstack.h @@ -20,6 +20,10 @@ #ifndef XSLCALLSTACK_H #define XSLCALLSTACK_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /** * Provide a call stack support * diff --git a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h index f12648c7..ff15bdc7 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h @@ -20,6 +20,10 @@ #ifndef CMDS_H #define CMDS_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* See the top of debugXSL.c for a list of command names and thier shortcuts */ #ifndef USE_KDE_DOCS typedef enum { /* id's for commands of xslDbgShell */ diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debug.h b/kxsldbg/kxsldbgpart/libxsldbg/debug.h index c38f37eb..f05c50e4 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/debug.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/debug.h @@ -19,6 +19,10 @@ #ifndef XSL_DEBUG_H #define XSL_DEBUG_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h index df50a53b..479448a3 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.h @@ -34,6 +34,10 @@ #ifndef __DEBUG_XSL__ #define __DEBUG_XSL__ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef USE_XSLDBG_AS_THREAD #include "xsldbgmsg.h" #include "xsldbgthread.h" diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp index 73d3713b..00540e6d 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp @@ -34,9 +34,12 @@ #include "xsldbgthread.h" #ifdef WIN32 #include <direct.h> +#else +#include <unistd.h> #endif #endif /* BUILD_DOCS */ +#include <cstdlib> /* top xml document */ @@ -743,9 +746,6 @@ filesInit(void) tempDocument = NULL; topStylesheet = NULL; entityNameList = arrayListNew(4, (freeItemFunc) filesFreeEntityInfo); -#if defined(HAVE_INCLUDE_FIX) && (LIBXML_VERSION < 20508) - xmlSetEntityReferenceFunc(filesEntityRef); -#endif /* setup the encoding */ encodeInBuff = xmlBufferCreate(); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.h b/kxsldbg/kxsldbgpart/libxsldbg/files.h index 05e49828..89557e28 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/files.h @@ -19,6 +19,10 @@ #ifndef FILES_H #define FILES_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifndef BUILD_DOCS #include "search.h" diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp index 5c1bcbff..992b0149 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp @@ -21,6 +21,7 @@ #include "files.h" #include "utils.h" #include "options.h" +#include <cstdlib> static char *tempNames[2] = { NULL, NULL }; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help.h b/kxsldbg/kxsldbgpart/libxsldbg/help.h index de77a71d..9c1c9a0a 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/help.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/help.h @@ -19,6 +19,10 @@ #ifndef XSLDBG_HELP_H #define XSLDBG_HELP_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef USE_KDE_DOCS /** diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp index 8593ab6b..0bcd8edb 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp @@ -20,6 +20,14 @@ * Uses docs/xsldoc.xsl docs/xsldoc.xml and xslproc to generate text */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef XSLDBG_BIN +#define XSLDBG_BIN "xsldbg" +#endif + #include "xsldbg.h" #include "options.h" #include "utils.h" @@ -28,7 +36,7 @@ #include "files.h" #include <stdlib.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <kstandarddirs.h> /** * helpTop: diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp index 196f2ba9..cb916f51 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp @@ -27,6 +27,7 @@ #include <kstandarddirs.h> #include <tqfileinfo.h> #include <tqstringlist.h> +#include <cstdlib> /* keep track of our integer/boolean options */ diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.h b/kxsldbg/kxsldbgpart/libxsldbg/options.h index 60ab69d3..4ce99f42 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.h @@ -19,6 +19,10 @@ #ifndef OPTIONS_H #define OPTIONS_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "arraylist.h" /** diff --git a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp index dac5bb0f..8c5e26e8 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp @@ -19,6 +19,7 @@ #include "xsldbg.h" #include "debugXSL.h" #include "files.h" +#include <cstdlib> /* ----------------------------------------- diff --git a/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h b/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h index 6fd7a9f3..e8840234 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h @@ -18,6 +18,10 @@ #ifndef TQTNOTIFIER_H #define TQTNOTIFIER_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if defined WIN32 #include <libxsldbg/xsldbgwin32config.h> #endif diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp index 68fcd7e1..6d30193d 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp @@ -7,6 +7,13 @@ email : k_isdale@tpg.com.au ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef XSLDBG_BIN +#define XSLDBG_BIN "xsldbg" +#endif #include "xsldbg.h" #include "debugXSL.h" diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.h b/kxsldbg/kxsldbgpart/libxsldbg/search.h index 20fc82b4..bc7d082c 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/search.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/search.h @@ -20,6 +20,10 @@ #ifndef XSLSEARCH_H #define XSLSEARCH_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef USE_KDE_DOCS /** diff --git a/kxsldbg/kxsldbgpart/libxsldbg/utils.h b/kxsldbg/kxsldbgpart/libxsldbg/utils.h index 28b297b0..ada7b693 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/utils.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/utils.h @@ -23,6 +23,10 @@ #ifndef XSLDBG_UTILS_H #define XSLDBG_UTILS_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifndef BUILD_DOCS #include <stdio.h> #include <string.h> diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 08de69d7..d05281f5 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -39,6 +39,7 @@ #include "files.h" #include "breakpoint.h" #include "debugXSL.h" +#include <cstdlib> #include <libxml/xmlerror.h> #include "xsldbgmsg.h" @@ -82,9 +83,6 @@ #include <libxml/xmlerror.h> #include <libxml/HTMLtree.h> #include <libxml/xmlIO.h> -#ifdef LIBXML_DOCB_ENABLED -#include <libxml/DOCBparser.h> -#endif #ifdef LIBXML_XINCLUDE_ENABLED #include <libxml/xinclude.h> #endif @@ -975,22 +973,11 @@ xsldbgLoadXmlData(void) #endif #ifdef LIBXML_DOCB_ENABLED if (optionsGetIntOption(OPTIONS_DOCBOOK)) -# if LIBXML_VERSION >= 20600 doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); -# else - doc = docbParseFile((char *) - optionsGetStringOption(OPTIONS_DATA_FILE_NAME), - NULL); -# endif else #endif - -#if LIBXML_VERSION >= 20600 doc = xmlSAXParseFile(&mySAXHandler, (char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME), 0); -#else - 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)))); if (!optionsGetIntOption(OPTIONS_SHELL)) { @@ -1031,11 +1018,7 @@ xsldbgLoadXmlTemporary(const xmlChar * path) #endif #ifdef LIBXML_DOCB_ENABLED if (optionsGetIntOption(OPTIONS_DOCBOOK)) -# if LIBXML_VERSION >= 20600 doc = xmlParseFile((char *) path); -# else - doc = docbParseFile((char *) path, NULL); -# endif else #endif doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0); @@ -1100,7 +1083,7 @@ handler_routine(DWORD dwCtrlType) #endif -#if LIBXML_VERSION >= 2006000 +#if 0 /* libxml/ handlers */ void xsldbgStructErrorHandler(void * userData, xmlErrorPtr error) { @@ -1230,16 +1213,11 @@ xsldbgInit() /* set up the parser */ xmlInitParser(); #if 0 -#if LIBXML_VERSION >= 20600 xmlSetGenericErrorFunc(NULL, NULL); xmlSetStructuredErrorFunc(NULL , (xmlStructuredErrorFunc)xsldbgStructErrorHandler); #else xmlSetGenericErrorFunc(0, xsldbgGenericErrorFunc); xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); -#endif -#else - xmlSetGenericErrorFunc(0, xsldbgGenericErrorFunc); - xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); #endif /* diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h index 27250e31..dd9a067e 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h @@ -20,6 +20,10 @@ #ifndef XSLDEBUGGER_H #define XSLDEBUGGER_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef USE_KDE_DOCS /** diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgconfig.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgconfig.h deleted file mode 100644 index e69de29b..00000000 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgconfig.h +++ /dev/null diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h index e75c8419..2b4486e3 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h @@ -21,6 +21,10 @@ #ifndef XSLDBGEVENT_H #define XSLDBGEVENT_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if defined WIN32 #include <libxsldbg/xsldbgwin32config.h> #endif diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h index 0e164f0e..81ced500 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgio.h @@ -19,6 +19,10 @@ #ifndef XSLDBGIO_H #define XSLDBGIO_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifndef BUILD_DOCS #include <libxml/tree.h> /* needed for definition of xmlChar */ #endif diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h index 12b16a3c..9d953d87 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgmsg.h @@ -19,6 +19,10 @@ #ifndef XSLDBGMSG_H #define XSLDBGMSG_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef WIN32 # include <libxsldbg/xsldbgwin32config.h> #else diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h index d83e71f3..f0c4a56b 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h @@ -19,6 +19,10 @@ #ifndef XSLDBGTHREAD_H #define XSLDBGTHREAD_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if defined WIN32 #include <libxsldbg/xsldbgwin32config.h> #endif diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index e4fafe5d..1b7580ca 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -18,8 +18,8 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); - connect(kDoc, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(lockDoc())); - connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); + connect(kDoc, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(lockDoc())); + connect(kDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(unlockDoc())); if (kDoc){ kView = kDoc->createView(parent, "QXsldbgDocView"); KURL cleanUrl; diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index c7c50174..8ddd8e3d 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -18,7 +18,7 @@ class QXsldbgDoc : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui index b367d6a5..eadfbb05 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui @@ -568,7 +568,7 @@ <tabstop>deleteButton</tabstop> <tabstop>enableButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotClear()</slot> <slot>refresh()</slot> <slot>selectionChanged(TQListViewItem*)</slot> @@ -577,6 +577,6 @@ <slot>slotEnableBreakpoint()</slot> <slot>slotAddAllTemplateBreakpoints()</slot> <slot>slotDeleteAllBreakpoints()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp index 453b4f60..e7716a0b 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp @@ -30,16 +30,16 @@ XsldbgBreakpointsImpl::XsldbgBreakpointsImpl(XsldbgDebugger *debugger, : XsldbgBreakpoints(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(breakpointItem(TQString /* file*/, + connect(debugger, TQ_SIGNAL(breakpointItem(TQString /* file*/, int /*line number */, TQString /*templateName*/, TQString /* modeName*/, bool /* enabled */, int /* id */)), - this, TQT_SLOT(slotProcBreakpointItem(TQString /* file*/, + this, TQ_SLOT(slotProcBreakpointItem(TQString /* file*/, int /*line number */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */))); - connect( breakpointListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect( breakpointListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h index 4a567f6a..58f442c0 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h @@ -29,7 +29,7 @@ class XsldbgDebugger; class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui index d1fdba5c..f5739f1d 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui +++ b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui @@ -149,9 +149,9 @@ <slot>refresh()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> <slot>selectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp index 9a500b6c..85a2b012 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp @@ -27,10 +27,10 @@ XsldbgCallStackImpl::XsldbgCallStackImpl(XsldbgDebugger *debugger, { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(callStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */)), - this, TQT_SLOT(slotProcCallStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */))); - connect( callStackListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(callStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */)), + this, TQ_SLOT(slotProcCallStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */))); + connect( callStackListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h index 66ebd983..ee7b9e4c 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgCallStackImpl : public XsldbgCallStack, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgconfig.ui b/kxsldbg/kxsldbgpart/xsldbgconfig.ui index 57a979bb..181bc7c3 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfig.ui +++ b/kxsldbg/kxsldbgpart/xsldbgconfig.ui @@ -799,7 +799,7 @@ <tabstop>xmlDataEdit</tabstop> <tabstop>xslSourceEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotCancel()</slot> <slot>slotAddParam()</slot> <slot>slotApply()</slot> @@ -812,6 +812,6 @@ <slot>slotPrevParam()</slot> <slot>slotSourcefile(TQString)</slot> <slot>slotoutputfile(TQString)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp index ade07c6e..18fa6f29 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp @@ -78,10 +78,10 @@ XsldbgConfigImpl::XsldbgConfigImpl(XsldbgDebugger *debugger, : XsldbgConfig(parent, name) { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)), - this, TQT_SLOT(slotProcParameterItem(TQString /* name*/, TQString /* value */))); - connect(debugger, TQT_SIGNAL(fileDetailsChanged()), - this, TQT_SLOT(slotReloadFileNames())); + connect(debugger, TQ_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)), + this, TQ_SLOT(slotProcParameterItem(TQString /* name*/, TQString /* value */))); + connect(debugger, TQ_SIGNAL(fileDetailsChanged()), + this, TQ_SLOT(slotReloadFileNames())); paramIndex= 0; catalogs = false; debug = false; diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h index 5a550a94..1ea50c64 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h @@ -48,7 +48,7 @@ private: class XsldbgDebugger; class XsldbgConfigImpl : public XsldbgConfig, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp index a9521964..c926eca1 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp @@ -213,7 +213,7 @@ void XsldbgDebugger::slotConfigure() if(inspector == 0L ){ inspector = new XsldbgInspector(this); - connect(inspector, TQT_SIGNAL(closedWindow()), this, TQT_SLOT(slotConfigClosed())); + connect(inspector, TQ_SIGNAL(closedWindow()), this, TQ_SLOT(slotConfigClosed())); } } diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.h b/kxsldbg/kxsldbgpart/xsldbgdebugger.h index 7c98b8f2..886f1635 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.h +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.h @@ -34,7 +34,7 @@ class TQStringList; class XsldbgWalkSpeedImpl; class XsldbgDebugger : public XsldbgDebuggerBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgentities.ui b/kxsldbg/kxsldbgpart/xsldbgentities.ui index 17b847db..47a9ea2f 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentities.ui +++ b/kxsldbg/kxsldbgpart/xsldbgentities.ui @@ -154,8 +154,8 @@ <slot>refresh()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp index 03f21618..576696db 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp @@ -29,15 +29,15 @@ XsldbgEntitiesImpl::XsldbgEntitiesImpl(XsldbgDebugger *debugger, { this->debugger = debugger; connect(debugger, - TQT_SIGNAL(entityItem(TQString /*SystemID*/, + TQ_SIGNAL(entityItem(TQString /*SystemID*/, TQString /*PublicID*/)), this, - TQT_SLOT(slotProcEntityItem(TQString /*SystemID*/, + TQ_SLOT(slotProcEntityItem(TQString /*SystemID*/, TQString /*PublicID*/))); connect( entitiesListView, - TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h index 0918b566..8c8cc8b7 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui index 21c7cb19..ce674743 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui @@ -264,9 +264,9 @@ <slot>refresh()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> <slot>slotEvaluate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp index 235c564a..69affd1e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp @@ -28,10 +28,10 @@ XsldbgGlobalVariablesImpl::XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, : XsldbgGlobalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), - this, TQT_SLOT(slotProcGlobalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */))); - connect( varsListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), + this, TQ_SLOT(slotProcGlobalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */))); + connect( varsListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h index c3c84e12..eca498b8 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp index 8b1a2734..7db6ce20 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp +++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp @@ -145,10 +145,10 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, XsldbgInspectorLayout->addMultiCellLayout( Layout1, 1, 1, 0, 1 ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonApply, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( update() ) ); - connect( buttonRefresh, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( refresh() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonApply, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( update() ) ); + connect( buttonRefresh, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( refresh() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); hide(); } diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.h b/kxsldbg/kxsldbgpart/xsldbginspector.h index ea84eda1..70e51604 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.h +++ b/kxsldbg/kxsldbgpart/xsldbginspector.h @@ -30,7 +30,7 @@ class XsldbgEntitiesImpl; class XsldbgInspector : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui index 04872236..45a8eb1d 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui @@ -365,10 +365,10 @@ <slot>slotSetExpression()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> <slot>slotEvaluate()</slot> <slot>slotSetExpression()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp index 7f3e857d..5926734e 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp @@ -31,14 +31,14 @@ XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, : XsldbgLocalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/, + connect(debugger, TQ_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/, TQString /* fileName */, int /*lineNumber */, TQString /* select XPath */, int /* is it a local variable */)), - this, TQT_SLOT(slotProcVariableItem(TQString /*name */, TQString /* templateContext*/, + this, TQ_SLOT(slotProcVariableItem(TQString /*name */, TQString /* templateContext*/, TQString /* fileName */, int /*lineNumber */, TQString /* select XPath */, int /* is it a local variable */))); - connect(varsListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(varsListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h index fd6af97c..805c41e4 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.h b/kxsldbg/kxsldbgpart/xsldbgoutputview.h index b4d89db3..3d1cd1d0 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.h +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.h @@ -28,7 +28,7 @@ class TQDialog; class XsldbgMsgDialogImpl; class XsldbgOutputView : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public : diff --git a/kxsldbg/kxsldbgpart/xsldbgsources.ui b/kxsldbg/kxsldbgpart/xsldbgsources.ui index e31f6ea6..ab4cf756 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsources.ui +++ b/kxsldbg/kxsldbgpart/xsldbgsources.ui @@ -146,9 +146,9 @@ <slot>refresh()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> <slot>selectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp index f291ab6d..3bad8a51 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp @@ -28,11 +28,11 @@ XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger, : XsldbgSources(parent, 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, TQ_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), + this, TQ_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */))); - connect( sourceListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect( sourceListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h index cf2af37e..9915b9c0 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplates.ui b/kxsldbg/kxsldbgpart/xsldbgtemplates.ui index eb6528c8..a575f462 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplates.ui +++ b/kxsldbg/kxsldbgpart/xsldbgtemplates.ui @@ -93,8 +93,8 @@ <slot>selectionChanged(TQListViewItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>selectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp index 66cb9227..2c0de0e9 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp @@ -27,10 +27,10 @@ XsldbgTemplatesImpl::XsldbgTemplatesImpl(XsldbgDebugger *debugger, { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */)), - this, TQT_SLOT(slotProcTemplateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */))); - connect( templatesListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */)), + this, TQ_SLOT(slotProcTemplateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */))); + connect( templatesListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h index 7584860d..c7fa5b72 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h @@ -30,7 +30,7 @@ class XsldbgDebugger; class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h index 290819aa..ec80d4e3 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h @@ -27,7 +27,7 @@ class XsldbgDebugger; class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed { - Q_OBJECT + TQ_OBJECT public: |