From dc6b8e72fed2586239e3514819238c520636c9d9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:54:04 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1157656 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kxsldbg/kxsldbg.cpp | 26 +- kxsldbg/kxsldbg.h | 4 +- kxsldbg/kxsldbgif.h | 4 +- kxsldbg/kxsldbgpart/kxsldbg_part.cpp | 266 ++++++++++----------- kxsldbg/kxsldbgpart/kxsldbg_part.h | 36 +-- kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp | 4 +- .../libqtnotfier/xsldbgdebuggerbase.cpp | 34 +-- .../kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h | 82 +++---- kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp | 56 ++--- kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp | 24 +- kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp | 8 +- kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp | 2 +- kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp | 6 +- kxsldbg/kxsldbgpart/libxsldbg/options.cpp | 38 +-- kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp | 6 +- kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp | 8 +- kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp | 44 ++-- kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h | 12 +- kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h | 144 +++++------ kxsldbg/kxsldbgpart/qxsldbgdoc.cpp | 22 +- kxsldbg/kxsldbgpart/qxsldbgdoc.h | 14 +- kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp | 8 +- kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h | 12 +- kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp | 60 ++--- kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h | 10 +- kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp | 20 +- kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h | 8 +- kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp | 92 +++---- kxsldbg/kxsldbgpart/xsldbgconfigimpl.h | 44 ++-- kxsldbg/kxsldbgpart/xsldbgdebugger.cpp | 118 ++++----- kxsldbg/kxsldbgpart/xsldbgdebugger.h | 34 +-- kxsldbg/kxsldbgpart/xsldbgdialogbase.h | 2 +- kxsldbg/kxsldbgpart/xsldbgdoc.cpp | 10 +- kxsldbg/kxsldbgpart/xsldbgdoc.h | 12 +- kxsldbg/kxsldbgpart/xsldbgdocmap.h | 4 +- kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp | 22 +- kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h | 8 +- kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp | 6 +- kxsldbg/kxsldbgpart/xsldbggloballistitem.h | 8 +- kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp | 18 +- kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h | 8 +- kxsldbg/kxsldbgpart/xsldbginspector.cpp | 76 +++--- kxsldbg/kxsldbgpart/xsldbginspector.h | 14 +- kxsldbg/kxsldbgpart/xsldbglistitem.cpp | 10 +- kxsldbg/kxsldbgpart/xsldbglistitem.h | 12 +- kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp | 10 +- kxsldbg/kxsldbgpart/xsldbglocallistitem.h | 16 +- kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp | 34 +-- kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h | 12 +- kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h | 10 +- kxsldbg/kxsldbgpart/xsldbgoutputview.cpp | 54 ++--- kxsldbg/kxsldbgpart/xsldbgoutputview.h | 12 +- kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp | 18 +- kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h | 8 +- kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h | 12 +- kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp | 18 +- kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h | 8 +- kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h | 2 +- kxsldbg/xsldbgmain.cpp | 10 +- 61 files changed, 844 insertions(+), 844 deletions(-) (limited to 'kxsldbg') diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index c28325a3..e8982fed 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -29,7 +29,7 @@ KXsldbg::KXsldbg() // and a status bar statusBar()->show(); - statusBar()->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)); + statusBar()->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); // this routine will find and load our Part. it finds the Part by // name which is a bad idea usually.. but it's alright in this @@ -52,8 +52,8 @@ KXsldbg::KXsldbg() // connect up signals kapp->dcopClient()->attach(); - connectDCOPSignal(0, 0, "debuggerPositionChanged(QString,int)", "newDebuggerPosition(QString,int)", false ); - connectDCOPSignal(0, 0, "editorPositionChanged(QString,int,int)", "newCursorPosition(QString,int,int)", false ); + connectDCOPSignal(0, 0, "debuggerPositionChanged(TQString,int)", "newDebuggerPosition(TQString,int)", false ); + connectDCOPSignal(0, 0, "editorPositionChanged(TQString,int,int)", "newCursorPosition(TQString,int,int)", false ); } } @@ -90,14 +90,14 @@ bool KXsldbg::closeURL() void KXsldbg::setupActions() { - KAction *act = KStdAction::quit(kapp, SLOT(quit()), actionCollection()); - connect(act, SIGNAL(activated()), this, SLOT(quit())); + KAction *act = KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + connect(act, TQT_SIGNAL(activated()), this, TQT_SLOT(quit())); - m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } void KXsldbg::saveProperties(KConfig* /*config*/) @@ -147,8 +147,8 @@ void KXsldbg::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, SIGNAL(newToolbarConfig()), - this, SLOT(applyNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), + this, TQT_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -158,13 +158,13 @@ void KXsldbg::applyNewToolbarConfig() } -void KXsldbg::newCursorPosition(const QString &file, int lineNumber, int columnNumber) +void KXsldbg::newCursorPosition(const TQString &file, int lineNumber, int columnNumber) { statusBar()->clear(); statusBar()->message( i18n("File: %1 Line: %2 Col: %3").arg(file).arg(lineNumber).arg(columnNumber)); } -void KXsldbg::newDebuggerPosition(const QString &file, int lineNumber) +void KXsldbg::newDebuggerPosition(const TQString &file, int lineNumber) { // maybe do something extra here later newCursorPosition(file, lineNumber); diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h index 7c75629a..2380cb63 100644 --- a/kxsldbg/kxsldbg.h +++ b/kxsldbg/kxsldbg.h @@ -39,8 +39,8 @@ public: /** KxsldbgIf implementation */ - void newCursorPosition(const QString &file, int lineNumber, int columnNumber=0); - void newDebuggerPosition(const QString & file, int lineNumber); + void newCursorPosition(const TQString &file, int lineNumber, int columnNumber=0); + void newDebuggerPosition(const TQString & file, int lineNumber); protected: /** diff --git a/kxsldbg/kxsldbgif.h b/kxsldbg/kxsldbgif.h index a9942bfc..dad1b5ea 100644 --- a/kxsldbg/kxsldbgif.h +++ b/kxsldbg/kxsldbgif.h @@ -8,8 +8,8 @@ class KXsldbgIf : virtual public DCOPObject K_DCOP k_dcop: - virtual void newCursorPosition(const QString & file, int lineNumber, int columnNumber=0) = 0; - virtual void newDebuggerPosition(const QString & file, int lineNumber) = 0; + virtual void newCursorPosition(const TQString & file, int lineNumber, int columnNumber=0) = 0; + virtual void newDebuggerPosition(const TQString & file, int lineNumber) = 0; }; diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index 5c4742ab..c9023d07 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -13,15 +13,15 @@ #include #include -#include -#include +#include +#include #include "../kxsldbg.h" #include #include #include #include -#include +#include #include #include #if KDE_IS_VERSION(3,1,90) @@ -32,33 +32,33 @@ // Qxsldbg specific includes #include "qxsldbgdoc.h" -#include -#include -#include -#include -#include - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "xsldbgoutputview.h" #include "xsldbgconfigimpl.h" #include @@ -67,9 +67,9 @@ typedef KParts::GenericFactory KXsldbgPartFactory; K_EXPORT_COMPONENT_FACTORY( libkxsldbgpart, KXsldbgPartFactory ) -KXsldbgPart::KXsldbgPart( QWidget *parentWidget, const char * /*widgetName*/, - QObject *parent, const char *name, - const QStringList & /*args*/ ) +KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, + TQObject *parent, const char *name, + const TQStringList & /*args*/ ) : DCOPObject("KXsldbgPart"), KParts::ReadOnlyPart(parent, name) { currentLineNo = 0; @@ -81,170 +81,170 @@ KXsldbgPart::KXsldbgPart( QWidget *parentWidget, const char * /*widgetName*/, // we need an instance setInstance( KXsldbgPartFactory::instance() ); - QVBox *frame = new QVBox(parentWidget); - QHBox *h = new QHBox(frame); - newXPath = new QLineEdit(h); - xPathBtn = new QPushButton(i18n("Goto XPath"), h); + TQVBox *frame = new TQVBox(parentWidget); + TQHBox *h = new TQHBox(frame); + newXPath = new TQLineEdit(h); + xPathBtn = new TQPushButton(i18n("Goto XPath"), h); /* Disable searching as searching documentation is not ready - h = new QHBox(frame); - newSearch = new QLineEdit(h); - searchBtn = new QPushButton(i18n("Search"), h); + h = new TQHBox(frame); + newSearch = new TQLineEdit(h); + searchBtn = new TQPushButton(i18n("Search"), h); */ - h = new QHBox(frame); - newEvaluate = new QLineEdit(h); - evaluateBtn = new QPushButton(i18n("Evaluate"), h); + h = new TQHBox(frame); + newEvaluate = new TQLineEdit(h); + evaluateBtn = new TQPushButton(i18n("Evaluate"), h); - QSplitter *splitter = new QSplitter(QSplitter::Vertical, frame); - mainView = new QWidgetStack(splitter); + TQSplitter *splitter = new TQSplitter(TQSplitter::Vertical, frame); + mainView = new TQWidgetStack(splitter); mainView->setMinimumHeight(400); //## TODO don't use a magic number outputview = new XsldbgOutputView(splitter); setWidget(frame); docDictionary.setAutoDelete(true); // create our actions - KStdAction::open(this, SLOT(fileOpen()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); // set our XML-UI resource file setXMLFile("kxsldbg_part.rc"); (void) new KAction( i18n("Configure Editor..."), "configure", 0, - this, SLOT(configureEditorCmd_activated()), + this, TQT_SLOT(configureEditorCmd_activated()), actionCollection(), "configureEditorCmd" ); (void) new KAction( i18n("Configure..."), "configure", Key_C, - this, SLOT(configureCmd_activated()), + this, TQT_SLOT(configureCmd_activated()), actionCollection(), "configureCmd" ); (void) new KAction( i18n("Inspect..."), "find", Key_I, - this, SLOT(inspectorCmd_activated()), + this, TQT_SLOT(inspectorCmd_activated()), actionCollection(), "inspectCmd" ); // Motions commands (void) new KAction( i18n("Run"), "run", Key_F5, - this, SLOT(runCmd_activated()), + this, TQT_SLOT(runCmd_activated()), actionCollection(), "runCmd" ); (void) new KAction( i18n("Continue"), "1downarrow", Key_F4, - this, SLOT(continueCmd_activated()), + this, TQT_SLOT(continueCmd_activated()), actionCollection(), "continueCmd" ); (void) new KAction( i18n("Step"), "step", Key_F8, - this, SLOT(stepCmd_activated()), + this, TQT_SLOT(stepCmd_activated()), actionCollection(), "stepCmd" ); (void) new KAction( i18n("Next"), "next", Key_F10, - this, SLOT(nextCmd_activated()), + this, TQT_SLOT(nextCmd_activated()), actionCollection(), "nextCmd" ); (void) new KAction( i18n("Step Up"), "xsldbg_stepup", Key_F6, - this, SLOT(stepupCmd_activated()), + this, TQT_SLOT(stepupCmd_activated()), actionCollection(), "stepupCmd" ); (void) new KAction( i18n("Step Down"), "xsldbg_stepdown", Key_F7, - this, SLOT(stepCmd_activated()), + this, TQT_SLOT(stepCmd_activated()), actionCollection(), "stepdownCmd" ); // Breakpoint commands (void) new KAction( i18n("Break"), "xsldbg_break", Key_F2, - this, SLOT(breakCmd_activated()), + this, TQT_SLOT(breakCmd_activated()), actionCollection(), "breakCmd" ); (void) new KAction( i18n("Enable/Disable"), "xsldbg_enable", Key_F3, - this, SLOT(enableCmd_activated()), + this, TQT_SLOT(enableCmd_activated()), actionCollection(), "enableCmd" ); (void) new KAction( i18n("Delete"), "xsldbg_delete", Key_Delete, - this, SLOT(deleteCmd_activated()), + this, TQT_SLOT(deleteCmd_activated()), actionCollection(), "deleteCmd" ); (void) new KAction( i18n("&Source"), "xsldbg_source", Key_S, - this, SLOT(sourceCmd_activated()), + this, TQT_SLOT(sourceCmd_activated()), actionCollection(), "sourceCmd" ); (void) new KAction( i18n("&Data"), "xsldbg_data", Key_D, - this, SLOT(dataCmd_activated()), + this, TQT_SLOT(dataCmd_activated()), actionCollection(), "dataCmd" ); (void) new KAction( i18n("&Output"), "xsldbg_output", Key_O, - this, SLOT(outputCmd_activated()), + this, TQT_SLOT(outputCmd_activated()), actionCollection(), "outputCmd" ); (void) new KAction( i18n("Reload Current File From Disk"), "xsldbg_refresh", CTRL + Key_F5, - this, SLOT(refreshCmd_activated()), + this, TQT_SLOT(refreshCmd_activated()), actionCollection(), "refreshCmd" ); /* tracing and walking */ (void) new KAction( i18n("Walk Through Stylesheet..."), Key_W, - this, SLOT(walkCmd_activated()), + this, TQT_SLOT(walkCmd_activated()), actionCollection(), "walkCmd" ); (void) new KAction( i18n("Stop Wal&king Through Stylesheet"), Key_K, - this, SLOT(walkStopCmd_activated()), + this, TQT_SLOT(walkStopCmd_activated()), actionCollection(), "walkStopCmd" ); (void) new KAction( i18n("Tr&ace Execution of Stylesheet"), Key_A, - this, SLOT(traceCmd_activated()), + this, TQT_SLOT(traceCmd_activated()), actionCollection(), "traceCmd" ); (void) new KAction( i18n("Stop Tracing of Stylesheet"), Key_K, - this, SLOT(traceStopCmd_activated()), + this, TQT_SLOT(traceStopCmd_activated()), actionCollection(), "traceStopCmd" ); (void) new KAction( i18n("&Evaluate Expression..."), Key_E, - this, SLOT(evaluateCmd_activated()), + this, TQT_SLOT(evaluateCmd_activated()), actionCollection(), "evaluateCmd" ); (void) new KAction( i18n("Goto &XPath..."), Key_X, - this, SLOT(gotoXPathCmd_activated()), + this, TQT_SLOT(gotoXPathCmd_activated()), actionCollection(), "gotoXPathCmd" ); (void) new KAction( i18n("Lookup SystemID..."), 0, - this, SLOT(slotLookupSystemID()), + this, TQT_SLOT(slotLookupSystemID()), actionCollection(), "lookupSystemID" ); (void) new KAction( i18n("Lookup PublicID..."), 0, - this, SLOT(slotLookupPublicID()), + this, TQT_SLOT(slotLookupPublicID()), actionCollection(), "lookupPublicID" ); (void) new KAction( i18n("Quit"), 0, CTRL + Key_Q, - this, SLOT(quit()), + this, TQT_SLOT(quit()), actionCollection(), "file_quit" ); /* (void) new KAction( i18n("Exit KXsldbg"), "xsldbg_output", CTRL + Key_Q, - this, SLOT(exitCmd_activated()), + this, TQT_SLOT(exitCmd_activated()), actionCollection(), "exitCmd" ); */ - connect( xPathBtn, SIGNAL( clicked() ), - this, SLOT( slotGotoXPath() ) ); - connect( evaluateBtn, SIGNAL( clicked() ), - this, SLOT( slotEvaluate() ) ); + connect( xPathBtn, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotGotoXPath() ) ); + connect( evaluateBtn, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotEvaluate() ) ); /* - connect( searchBtn, SIGNAL( clicked() ), - this, SLOT( slotSearch() ) ); + connect( searchBtn, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotSearch() ) ); */ /* We must have a valid debugger and inspector */ createInspector(); @@ -304,7 +304,7 @@ bool KXsldbgPart::openURL(const KURL &url) /* Don't show the content of URL just loaded it into our data structures */ bool KXsldbgPart::fetchURL(const KURL &url) { - QString docID = url.prettyURL(); + TQString docID = url.prettyURL(); QXsldbgDoc *docPtr = docDictionary[docID]; if (!docPtr){ docPtr = new QXsldbgDoc(mainView, url); @@ -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, SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChanged())); + connect(v, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); } } @@ -336,7 +336,7 @@ void KXsldbgPart::fileOpen() // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked - QString file_name = KFileDialog::getOpenFileName(); + TQString file_name = KFileDialog::getOpenFileName(); if (file_name.isEmpty() == false) openURL(KURL( file_name )); @@ -355,16 +355,16 @@ bool KXsldbgPart::checkDebugger() { bool result = debugger != 0L; if (!result){ - QMessageBox::information(0L, i18n("Debugger Not Ready"), + TQMessageBox::information(0L, i18n("Debugger Not Ready"), i18n("Configure and start the debugger first."), - QMessageBox::Ok); + TQMessageBox::Ok); } return result; } -void KXsldbgPart::lookupSystemID( QString systemID) +void KXsldbgPart::lookupSystemID( TQString systemID) { bool ok = false; if (!checkDebugger()) @@ -375,13 +375,13 @@ void KXsldbgPart::lookupSystemID( QString systemID) systemID = KInputDialog::getText( i18n( "Lookup SystemID" ), i18n( "Please enter SystemID to find:" ), - QString::null, &ok, + TQString::null, &ok, mainView); #else systemID = QInputDialog::getText( i18n( "Lookup SystemID" ), i18n( "Please enter SystemID to find:" ), - QLineEdit::Normal, QString::null, &ok, + TQLineEdit::Normal, TQString::null, &ok, mainView); #endif }else{ @@ -389,14 +389,14 @@ void KXsldbgPart::lookupSystemID( QString systemID) } if ( ok && !systemID.isEmpty() ){ // user entered something and pressed ok - QString msg(QString("system %1").arg(systemID)); // noTr + TQString msg(TQString("system %1").arg(systemID)); // noTr debugger->fakeInput(msg, true); } } -void KXsldbgPart::lookupPublicID(QString publicID) +void KXsldbgPart::lookupPublicID(TQString publicID) { bool ok = false; if (!checkDebugger()) @@ -407,19 +407,19 @@ void KXsldbgPart::lookupPublicID(QString publicID) publicID = KInputDialog::getText( i18n( "Lookup PublicID" ), i18n( "Please enter PublicID to find:" ), - QString::null, &ok, mainView ); + TQString::null, &ok, mainView ); #else publicID = QInputDialog::getText( i18n( "Lookup PublicID" ), i18n( "Please enter PublicID to find:" ), - QLineEdit::Normal, QString::null, &ok, mainView ); + TQLineEdit::Normal, TQString::null, &ok, mainView ); #endif }else{ ok = true; } if ( ok && !publicID.isEmpty()){ // user entered something and pressed ok - QString msg(QString("public %1").arg(publicID)); // noTr + TQString msg(TQString("public %1").arg(publicID)); // noTr debugger->fakeInput(msg, true); } } @@ -470,13 +470,13 @@ void KXsldbgPart::createInspector() debugger = new XsldbgDebugger(); Q_CHECK_PTR( debugger ); if ( debugger != 0L ) { - connect(debugger, SIGNAL( debuggerReady()), - this, SLOT(debuggerStarted())); + connect(debugger, TQT_SIGNAL( debuggerReady()), + this, TQT_SLOT(debuggerStarted())); if (outputview){ connect(debugger, - SIGNAL( showMessage(QString /* msg*/)), + TQT_SIGNAL( showMessage(TQString /* msg*/)), outputview, - SLOT(slotProcShowMessage(QString /* msg*/))); + TQT_SLOT(slotProcShowMessage(TQString /* msg*/))); } inspector = new XsldbgInspector( debugger ); Q_CHECK_PTR( inspector ); @@ -484,42 +484,42 @@ void KXsldbgPart::createInspector() if (inspector != 0L){ /*process line number and/or file name changed */ connect(debugger, - SIGNAL(lineNoChanged - (QString /* fileName */ , + TQT_SIGNAL(lineNoChanged + (TQString /* fileName */ , int /* lineNumber */ , bool /* breakpoint */ ) ), this, - SLOT(lineNoChanged - ( QString /* fileName */ , + TQT_SLOT(lineNoChanged + ( TQString /* fileName */ , int /* lineNumber */ , bool /* breakpoint */ ) ) ); connect(debugger, - SIGNAL(breakpointItem(QString /* fileName*/, + TQT_SIGNAL(breakpointItem(TQString /* fileName*/, int /* lineNumber */, - QString /*templateName*/, - QString /* modeName */, + TQString /*templateName*/, + TQString /* modeName */, bool /* enabled */, int /* id */)), this, - SLOT( breakpointItem(QString /* fileName*/, + TQT_SLOT( breakpointItem(TQString /* fileName*/, int /* lineNumber */, - QString /*templateName*/, - QString /* modeName */, + TQString /*templateName*/, + TQString /* modeName */, bool /* enabled */, int /* id */))); - connect(debugger, SIGNAL(resolveItem(QString /*URI*/)), - this, SLOT(slotProcResolveItem(QString /*URI*/))); + connect(debugger, TQT_SIGNAL(resolveItem(TQString /*URI*/)), + this, TQT_SLOT(slotProcResolveItem(TQString /*URI*/))); } } } } -void KXsldbgPart::emitOpenFile(QString file, int line, int row) +void KXsldbgPart::emitOpenFile(TQString file, int line, int row) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << file << line << row; - emitDCOPSignal("openFile(QString,int,int)", params); + emitDCOPSignal("openFile(TQString,int,int)", params); } void KXsldbgPart::continueCmd_activated() { @@ -582,7 +582,7 @@ void KXsldbgPart::refreshCmd_activated() { if ( !currentFileName.isEmpty() ){ - QDictIterator it(docDictionary); + TQDictIterator it(docDictionary); QXsldbgDoc *docPtr; while (it.current()){ docPtr = it.current(); @@ -619,9 +619,9 @@ void KXsldbgPart::breakCmd_activated() void KXsldbgPart::evaluateCmd_activated() { #if KDE_IS_VERSION(3,1,90) - QString expression = KInputDialog::getText(i18n("Evalute Expression"), i18n("XPath:")); + TQString expression = KInputDialog::getText(i18n("Evalute Expression"), i18n("XPath:")); #else - QString expression = KLineEditDlg::getText(i18n("Evalute Expression"), i18n("XPath:")); + TQString expression = KLineEditDlg::getText(i18n("Evalute Expression"), i18n("XPath:")); #endif if (checkDebugger() && (expression.length() > 0)){ debugger->slotCatCmd( expression); @@ -631,9 +631,9 @@ void KXsldbgPart::evaluateCmd_activated() void KXsldbgPart::gotoXPathCmd_activated() { #if KDE_IS_VERSION(3,1,90) - QString xpath = KInputDialog::getText(i18n("Goto XPath"), i18n("XPath:")); + TQString xpath = KInputDialog::getText(i18n("Goto XPath"), i18n("XPath:")); #else - QString xpath = KLineEditDlg::getText(i18n("Goto XPath"), i18n("XPath:")); + TQString xpath = KLineEditDlg::getText(i18n("Goto XPath"), i18n("XPath:")); #endif if (checkDebugger() && xpath.length() > 0){ debugger->slotCdCmd( xpath ); @@ -641,7 +641,7 @@ void KXsldbgPart::gotoXPathCmd_activated() } void -KXsldbgPart::lineNoChanged(QString fileName, int lineNumber, bool breakpoint) +KXsldbgPart::lineNoChanged(TQString fileName, int lineNumber, bool breakpoint) { if ( fileName.isEmpty() ) { kdDebug() << "Empty file Name" << endl; // noTr @@ -651,7 +651,7 @@ KXsldbgPart::lineNoChanged(QString fileName, int lineNumber, bool breakpoint) openURL(fileName); QXsldbgDoc *docPtr; - QDictIterator it(docDictionary); + TQDictIterator it(docDictionary); while (it.current()){ docPtr = it.current(); // cause all Execution and BreakpointReached marks to be cleared @@ -661,10 +661,10 @@ KXsldbgPart::lineNoChanged(QString fileName, int lineNumber, bool breakpoint) /* Did we stop at a breakpoint if so move the marker */ if (currentDoc) { currentDoc->selectBreakPoint(lineNumber -1, breakpoint); - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << currentFileName << lineNumber; - emitDCOPSignal("debuggerPositionChanged(QString,int)", params); + emitDCOPSignal("debuggerPositionChanged(TQString,int)", params); }else { qWarning("Unable to retrieve document from internal cache"); } @@ -688,10 +688,10 @@ void KXsldbgPart::cursorPositionChanged() viewCurIf->cursorPosition(¤tLineNo, ¤tColumnNo); currentLineNo++; currentColumnNo++; - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << currentFileName << currentLineNo << currentColumnNo; - emitDCOPSignal("editorPositionChanged(QString,int,int)", params); + emitDCOPSignal("editorPositionChanged(TQString,int,int)", params); } } } @@ -708,14 +708,14 @@ void KXsldbgPart::debuggerStarted() KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if (args){ int i=0, result=1, noFilesFound = 0; - QString expandedName; /* contains file name with path expansion if any */ + TQString expandedName; /* contains file name with path expansion if any */ for (i = 0; i < args->count(); i++) { if (!result) break; if (args->arg(i)[0] != '-') { - expandedName = QString::fromUtf8((const char*)filesExpandName((const xmlChar*)args->arg(i))); + expandedName = TQString::fromUtf8((const char*)filesExpandName((const xmlChar*)args->arg(i))); if (expandedName.isEmpty()) { result = 0; break; @@ -774,7 +774,7 @@ void KXsldbgPart::deleteBreakPoint(int lineNumber) void KXsldbgPart::slotSearch() { if ((newSearch != 0L) && checkDebugger() ) { - QString msg(QString("search \"%1\"").arg(newSearch->text())); // noTr + TQString msg(TQString("search \"%1\"").arg(newSearch->text())); // noTr debugger->fakeInput(msg, false); } } @@ -796,23 +796,23 @@ void KXsldbgPart::slotGotoXPath() -void KXsldbgPart::slotProcResolveItem(QString URI) +void KXsldbgPart::slotProcResolveItem(TQString URI) { if (!URI.isEmpty()){ - QMessageBox::information(mainView, i18n("SystemID or PublicID Resolution Result"), + TQMessageBox::information(mainView, i18n("SystemID or PublicID Resolution Result"), i18n("SystemID or PublicID has been resolved to\n.%1").arg(URI), - QMessageBox::Ok); + TQMessageBox::Ok); } } -void KXsldbgPart::breakpointItem(QString fileName, int lineNumber , - QString /*templateName*/, QString /* modeName */, +void KXsldbgPart::breakpointItem(TQString fileName, int lineNumber , + TQString /*templateName*/, TQString /* modeName */, bool enabled , int /* id */) { if (fileName == 0L){ /* Go through all documents and remove all breakpoints */ - QDictIterator it(docDictionary); + TQDictIterator it(docDictionary); QXsldbgDoc *docPtr; while (it.current()){ docPtr = it.current(); diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h index 1da5ceb8..117452ef 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.h +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h @@ -2,9 +2,9 @@ #define KXSLDBGKPART_H #include -#include -#include -#include +#include +#include +#include #include "xsldbgdebugger.h" #include "xsldbginspector.h" #include @@ -35,7 +35,7 @@ class KURL; class QMultiLineEdit; class KAboutData; -typedef QDict XsldbgDocDict; +typedef TQDict XsldbgDocDict; /** * This is a "Part". It that does all the real work in a KPart @@ -53,8 +53,8 @@ public: /** * Default constructor */ - KXsldbgPart(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList &args); + KXsldbgPart(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList &args); /** * Destructor @@ -70,15 +70,15 @@ public: * @returns TRUE if debugger is ready, otherwise FALSE */ bool checkDebugger(); - void lookupSystemID(QString systemID); - void lookupPublicID(QString publicID); + void lookupSystemID(TQString systemID); + void lookupPublicID(TQString publicID); void createInspector(); public slots: virtual bool openURL(const KURL &url); virtual bool closeURL(); void quit(); - void emitOpenFile(QString file, int line, int row); + void emitOpenFile(TQString file, int line, int row); void slotLookupSystemID(); void slotLookupPublicID(); void walkCmd_activated(); @@ -110,7 +110,7 @@ public slots: /** Goto/display file XPath entered */ void gotoXPathCmd_activated(); - virtual void lineNoChanged( QString fileName, int lineNumber, + virtual void lineNoChanged( TQString fileName, int lineNumber, bool breakpoint ); void addBreakPoint(int lineNumber); @@ -127,11 +127,11 @@ public slots: void slotSearch(); /* Process the the URI for SystemID or PublicID requested */ - void slotProcResolveItem(QString URI); + void slotProcResolveItem(TQString URI); /* used to get breakpoint list notfication */ - void breakpointItem(QString fileName, int lineNumber , - QString /*templateName*/, QString /* modeName */, + void breakpointItem(TQString fileName, int lineNumber , + TQString /*templateName*/, TQString /* modeName */, bool enabled , int /* id */); void cursorPositionChanged(); @@ -151,18 +151,18 @@ protected slots: private: QXsldbgDoc *currentDoc; - QWidgetStack *mainView; + TQWidgetStack *mainView; - QPushButton *xPathBtn, *searchBtn, *evaluateBtn; - QLineEdit *newXPath, *newSearch, *newEvaluate; - QGridLayout* qxsldbgLayout; + TQPushButton *xPathBtn, *searchBtn, *evaluateBtn; + TQLineEdit *newXPath, *newSearch, *newEvaluate; + TQGridLayout* qxsldbgLayout; uint currentLineNo, currentColumnNo; XsldbgDocDict docDictionary; XsldbgInspector *inspector; XsldbgDebugger *debugger; XsldbgConfigImpl *configWidget; - QString currentFileName; + TQString currentFileName; XsldbgOutputView *outputview; }; diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp index 6d4b7fcb..0db9d1f0 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp +++ b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include +#include #include "../libxsldbg/xsldbgevent.h" #include "../libxsldbg/qtnotifier2.h" @@ -41,7 +41,7 @@ int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data) if (e != 0L) { /* The application will now have this event in its event queue that all that is needed from here*/ - QApplication::postEvent(_debugger, e); + TQApplication::postEvent(_debugger, e); } } diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.cpp index 930be808..518aca00 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.cpp +++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.cpp @@ -18,15 +18,15 @@ * * ***************************************************************************/ -#include -#include -#include +#include +#include +#include #include #include "xsldbgdebuggerbase.h" XsldbgDebuggerBase::XsldbgDebuggerBase() - : QObject(0L, "XsldbgDebuggerBase") + : TQObject(0L, "XsldbgDebuggerBase") { initialized = false; updateTimerID = -1; @@ -40,31 +40,31 @@ XsldbgDebuggerBase::~XsldbgDebuggerBase() -QString XsldbgDebuggerBase::fromUTF8(const char *text) +TQString XsldbgDebuggerBase::fromUTF8(const char *text) { - QString result; + TQString result; if (text != 0L) result = (const char*)text; return result; } -QString XsldbgDebuggerBase::fromUTF8(const xmlChar *text) +TQString XsldbgDebuggerBase::fromUTF8(const xmlChar *text) { - QString result; + TQString result; if (text != 0L) - result = QString::fromUtf8((const char*)text); + result = TQString::fromUtf8((const char*)text); return result; } -QString XsldbgDebuggerBase::fromUTF8FileName(const char *text) +TQString XsldbgDebuggerBase::fromUTF8FileName(const char *text) { - QString result; + TQString result; if (text != 0L){ KURL url(((const char*)text)); if (url.isLocalFile()) - result = QString("file:") + url.path(); + result = TQString("file:") + url.path(); else result = url.prettyURL(); } @@ -72,13 +72,13 @@ QString XsldbgDebuggerBase::fromUTF8FileName(const char *text) } -QString XsldbgDebuggerBase::fromUTF8FileName(const xmlChar *text) +TQString XsldbgDebuggerBase::fromUTF8FileName(const xmlChar *text) { - QString result; + TQString result; if (text != 0L){ - KURL url(QString::fromUtf8((const char*)text)); + KURL url(TQString::fromUtf8((const char*)text)); if (url.isLocalFile()) - result = QString("file:") + url.path(); + result = TQString("file:") + url.path(); else result = url.prettyURL(); } @@ -86,7 +86,7 @@ QString XsldbgDebuggerBase::fromUTF8FileName(const xmlChar *text) } -void XsldbgDebuggerBase::queueMessage(const QString &text) +void XsldbgDebuggerBase::queueMessage(const TQString &text) { updateText += text; } diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h index ff830495..fddc6034 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h +++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h @@ -30,8 +30,8 @@ # endif #endif -#include -#include +#include +#include #include class XsldbgEvent; @@ -59,85 +59,85 @@ class XsldbgDebuggerBase : public QObject int getUpdateTimerID(void) {return updateTimerID ;}; - /** Convert from libxslt UTF8 to a QString */ - static QString fromUTF8(const char *text); - static QString fromUTF8FileName(const char *text); + /** Convert from libxslt UTF8 to a TQString */ + static TQString fromUTF8(const char *text); + static TQString fromUTF8FileName(const char *text); - /** Convert from libxslt UTF8 to a QString */ - static QString fromUTF8(const xmlChar *text); - static QString fromUTF8FileName(const xmlChar *text); + /** Convert from libxslt UTF8 to a TQString */ + static TQString fromUTF8(const xmlChar *text); + static TQString fromUTF8FileName(const xmlChar *text); /* list of command yet to be processed */ - QStringList commandQueue(void) {return _commandQueue ;}; + TQStringList commandQueue(void) {return _commandQueue ;}; - void queueMessage(const QString &text); + void queueMessage(const TQString &text); protected: - QString updateText; + TQString updateText; private: bool initialized; int updateTimerID; - QStringList _commandQueue; + TQStringList _commandQueue; signals: // Signals /** line number and/or file name changed */ - void lineNoChanged(QString /* fileName */, int /* lineNumber */, bool /* breakpoint */); + void lineNoChanged(TQString /* fileName */, int /* lineNumber */, bool /* breakpoint */); /** Show a message in debugger window */ - void showMessage(QString /* msg*/); + void showMessage(TQString /* msg*/); - /** Add breakpoint to view, First parameter is QString::null + /** Add breakpoint to view, First parameter is TQString::null to indicate start of breakpoint list notfication */ - void breakpointItem(QString /* fileName*/, int /* lineNumber */, - QString /*templateName*/, QString /* modeName */, + void breakpointItem(TQString /* fileName*/, int /* lineNumber */, + TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */); - /** Add global variable to view, First parameter is QString::null + /** Add global variable to view, First parameter is TQString::null to indicate start of global variable list notfication */ - void globalVariableItem(QString /* name */, QString /* fileName */, int /* lineNumber */); + void globalVariableItem(TQString /* name */, TQString /* fileName */, int /* lineNumber */); - /** Add local variable to view, First parameter is QString::null + /** Add local variable to view, First parameter is TQString::null to indicate start of local variable list notfication */ - void localVariableItem(QString /*name */, QString /* templateContext*/, - QString /* fileName */, int /*lineNumber */); + void localVariableItem(TQString /*name */, TQString /* templateContext*/, + TQString /* fileName */, int /*lineNumber */); - /** Add a variable to view, First parameter is QString::null + /** Add a variable to view, First parameter is TQString::null to indicate start of local variable list notfication */ - void variableItem(QString /*name */, QString /* templateContext*/, - QString /* fileName */, int /*lineNumber */, - QString /* select XPath */, int /* is it a local variable */); + void variableItem(TQString /*name */, TQString /* templateContext*/, + TQString /* fileName */, int /*lineNumber */, + TQString /* select XPath */, int /* is it a local variable */); - /** Add template to view, First parameter is QString::null + /** Add template to view, First parameter is TQString::null to indicate start of template list notfication */ - void templateItem(QString /* name*/, QString /*mode*/, QString /* fileName */, int /* lineNumber */); + void templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */); - /** Add source to view, First parameter is QString::null + /** Add source to view, First parameter is TQString::null to indicate start of source list notfication */ - void sourceItem(QString /* fileName */, QString /* parentFileName */, int /*lineNumber */); + void sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */); - /** Add parameter to view, First parameter is QString::null + /** Add parameter to view, First parameter is TQString::null to indicate start of parameter list notfication */ - void parameterItem(QString /* name*/, QString /* value */); + void parameterItem(TQString /* name*/, TQString /* value */); - /** Add callStack to view, First parameter is QString::null + /** Add callStack to view, First parameter is TQString::null to indicate start of callstack list notfication */ - void callStackItem(QString /* tempalteName*/, QString /* fileName */, int /* lineNumber */); + void callStackItem(TQString /* tempalteName*/, TQString /* fileName */, int /* lineNumber */); - /** Add entity to view, First parameter is QString::null + /** Add entity to view, First parameter is TQString::null to indicate start of entity list notfication */ - void entityItem(QString /*SystemID*/, QString /*PublicID*/); + void entityItem(TQString /*SystemID*/, TQString /*PublicID*/); /* Show the URI for SystemID or PublicID requested */ - void resolveItem(QString /*URI*/); + void resolveItem(TQString /*URI*/); - /* Display a integer option value First parameter is QString::null + /* Display a integer option value First parameter is TQString::null to indicate start of option list notification */ - void intOptionItem(QString /* name*/, int /* value */); + void intOptionItem(TQString /* name*/, int /* value */); - /* Display a string option value. First parameter is QString::null + /* Display a string option value. First parameter is TQString::null to indicate start of option list notification */ - void stringOptionItem(QString /* name*/, QString /* value */); + void stringOptionItem(TQString /* name*/, TQString /* value */); /* Cause the names for source, data and output files to be reload from xsldbg */ void fileDetailsChanged(); diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp index a424eaba..35878929 100644 --- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp +++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp @@ -17,11 +17,11 @@ * * ***************************************************************************/ -#include -#include -#include +#include +#include +#include #include -#include +#include #include @@ -34,14 +34,14 @@ #include "../libxsldbg/options.h" #include "../libxsldbg/files.h" -QString updateText; +TQString updateText; XsldbgEventData::XsldbgEventData() { int column; for (column = 0; column < XSLDBGEVENT_COLUMNS; column++){ - textValues[column] = QString::null; + textValues[column] = TQString::null; } for (column = 0; column < XSLDBGEVENT_COLUMNS; column++){ @@ -54,19 +54,19 @@ XsldbgEventData::~XsldbgEventData() { } -void XsldbgEventData::setText(int column, QString text) +void XsldbgEventData::setText(int column, TQString text) { if ((column >= 0) && (column < XSLDBGEVENT_COLUMNS)) textValues[column] = text; } -QString XsldbgEventData::getText(int column) +TQString XsldbgEventData::getText(int column) { if ((column >= 0) && (column < XSLDBGEVENT_COLUMNS)) return textValues[column]; else - return QString::null; + return TQString::null; } @@ -87,7 +87,7 @@ int XsldbgEventData::getInt(int column) XsldbgEvent::XsldbgEvent(XsldbgMessageEnum type, const void *data) - : QEvent(QEvent::User) + : TQEvent(TQEvent::User) { XsldbgEventData *eventData; this->data = data; @@ -205,14 +205,14 @@ XsldbgEventData *XsldbgEvent::createEventData(XsldbgMessageEnum type, const void break; } - QString fileName = url.path(); - QString outputText; + TQString fileName = url.path(); + TQString outputText; if (!fileName.isNull()){ - QFile file (fileName); + TQFile file (fileName); if (file.open(IO_ReadOnly)){ - QTextStream textFile(&file); - QString textIn = ""; - textFile.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream textFile(&file); + TQString textIn = ""; + textFile.setEncoding(TQTextStream::UnicodeUTF8); while (1){ textIn = textFile.readLine(); if (textIn.isNull()) @@ -327,8 +327,8 @@ void XsldbgEvent::emitMessage(XsldbgEventData *eventData) case XSLDBG_MSG_AWAITING_INPUT: /* 5: Waiting for user input */ if ((getInputReady() == 0) && (debugger->commandQueue().count() > 0)){ qDebug("Command queue not empty"); - QTimerEvent *e = new QTimerEvent(debugger->getUpdateTimerID()); - QApplication::postEvent(debugger, e); + TQTimerEvent *e = new TQTimerEvent(debugger->getUpdateTimerID()); + TQApplication::postEvent(debugger, e); } if (!updateText.isEmpty()){ debugger->queueMessage(updateText); @@ -512,7 +512,7 @@ void XsldbgEvent::handleGlobalVariableItem(XsldbgEventData *eventData, const vo /* add our specific data to eventData*/ if (msgData != 0L){ xsltStackElemPtr item = (xsltStackElemPtr)msgData; - QString name, fileName, selectXPath; + TQString name, fileName, selectXPath; int lineNumber = -1; /* variable name*/ @@ -557,7 +557,7 @@ void XsldbgEvent::handleLocalVariableItem(XsldbgEventData *eventData, const voi /* add our specific data to eventData*/ if (msgData != 0L){ xsltStackElemPtr item = (xsltStackElemPtr)msgData; - QString name, templateContext, fileName, selectXPath; + TQString name, templateContext, fileName, selectXPath; int lineNumber = -1; xmlNodePtr varXmlNode; @@ -620,7 +620,7 @@ if (eventData != 0L){ /* add our specific data to eventData*/ if(msgData != 0L){ xsltTemplatePtr item = (xsltTemplatePtr)msgData; - QString name, mode, fileName; + TQString name, mode, fileName; int lineNumber = -1; if (item->nameURI) @@ -661,7 +661,7 @@ void XsldbgEvent::handleIncludedSourceItem(XsldbgEventData *eventData, const vo /* add our specific data to eventData*/ if (msgData != 0L){ xmlNodePtr item = (xmlNodePtr)msgData; - QString name, fileName; + TQString name, fileName; int lineNumber = -1; if (item->doc) @@ -691,7 +691,7 @@ void XsldbgEvent::handleSourceItem(XsldbgEventData *eventData, const void *msgD /* add our specific data to eventData*/ if (msgData != 0L){ xsltStylesheetPtr item = (xsltStylesheetPtr)msgData; - QString name, fileName; + TQString name, fileName; int lineNumber = -1; if (item->doc) @@ -722,7 +722,7 @@ void XsldbgEvent::handleParameterItem(XsldbgEventData *eventData, const void *m /* add our specific data to eventData*/ if (msgData != 0L){ parameterItemPtr paramItem = (parameterItemPtr)msgData; - QString name, value; + TQString name, value; name = XsldbgDebuggerBase::fromUTF8(paramItem->name); value = XsldbgDebuggerBase::fromUTF8(paramItem->value); @@ -746,7 +746,7 @@ void XsldbgEvent::handleCallStackItem(XsldbgEventData *eventData, const void *m /* add our specific data to eventData*/ if (msgData != 0L){ callPointPtr item = (callPointPtr)msgData; - QString templateName, fileName; + TQString templateName, fileName; int lineNumber = -1; /* template name */ @@ -776,7 +776,7 @@ void XsldbgEvent::handleEntityItem(XsldbgEventData *eventData, const void *msgD if (beenCreated == false){ /* add our specific data to eventData*/ if (msgData != 0L){ - QString SystemID, PublicID; + TQString SystemID, PublicID; entityInfoPtr info = (entityInfoPtr)msgData; SystemID = XsldbgDebuggerBase::fromUTF8FileName(info->SystemID); @@ -800,7 +800,7 @@ void XsldbgEvent::handleResolveItem(XsldbgEventData *eventData, const void *msg if (beenCreated == false){ /* add our specific data to eventData*/ if (msgData != 0L){ - QString URI = XsldbgDebuggerBase::fromUTF8FileName((const xmlChar*)msgData); + TQString URI = XsldbgDebuggerBase::fromUTF8FileName((const xmlChar*)msgData); eventData->setText(0, URI); } @@ -851,7 +851,7 @@ void XsldbgEvent::handleStringOptionItem(XsldbgEventData *eventData, const void -void XsldbgEventDataList::deleteItem( QPtrCollection::Item d ) +void XsldbgEventDataList::deleteItem( TQPtrCollection::Item d ) { if ( del_item ) delete (XsldbgEventData *)d; } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp index 7935ea8c..0bab6585 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp @@ -95,7 +95,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup) if (!filesGetStylesheet() || !filesGetMainDoc()) { xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n")); - xsldbgGenericErrorFunc(QString("Error: %1.\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1.\n").arg(i18n(errorPrompt))); return result; } @@ -104,7 +104,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup) xsltGenericError(xsltGenericErrorContext, "Error: NULL argument provided\n"); #endif - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; } @@ -126,7 +126,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup) } if (!result) - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; } @@ -350,7 +350,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if (!style || !filesGetMainDoc()) { if (!optionsGetIntOption(OPTIONS_GDB)){ xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n")); - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; }else{ orphanedBreakPoint = 1; @@ -373,7 +373,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, if ((xmlStrlen(opts[1]) == 0) || !sscanf((char *) opts[1], "%ld", &lineNo)) { xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1])); - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; } else { /* try to guess whether we are looking for source or data @@ -628,7 +628,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style, } else { result = 1; if (newBreakPoints){ - xsldbgGenericErrorFunc(i18n("Information: Added %n new breakpoint.", "Information: Added %n new breakpoints.", newBreakPoints) + QString("\n")); + xsldbgGenericErrorFunc(i18n("Information: Added %n new breakpoint.", "Information: Added %n new breakpoints.", newBreakPoints) + TQString("\n")); } } @@ -681,7 +681,7 @@ xslDbgShellDelete(xmlChar * arg) xsltGenericError(xsltGenericErrorContext, "Error: NULL argument provided\n"); #endif - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; } @@ -749,7 +749,7 @@ xslDbgShellDelete(xmlChar * arg) } } if (!result) - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; } @@ -798,7 +798,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType) if (!filesGetStylesheet() || !filesGetMainDoc()) { xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n")); - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; } @@ -807,7 +807,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType) xsltGenericError(xsltGenericErrorContext, "Error: NULL argument provided\n"); #endif - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; } @@ -872,7 +872,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType) } if (!result) - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); return result; } @@ -931,7 +931,7 @@ static int validateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy) breakPtr->flags |= BREAKPOINT_ORPHANED; if ( breakPtr->flags & BREAKPOINT_ORPHANED){ - xsldbgGenericErrorFunc(QString("Warning: Breakpoint %1 is orphaned. Result: %2. Old flags: %3. New flags: %4.\n").arg(breakPtr->id).arg(result).arg(copy->flags).arg(breakPtr->flags)); + xsldbgGenericErrorFunc(TQString("Warning: Breakpoint %1 is orphaned. Result: %2. Old flags: %3. New flags: %4.\n").arg(breakPtr->id).arg(result).arg(copy->flags).arg(breakPtr->flags)); } if (!(breakPtr->flags & BREAKPOINT_ORPHANED) && ((copy->lineNo != breakPtr->lineNo ) || diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp index 39aea804..7088cf36 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp @@ -603,7 +603,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt, } result = 1; } else - xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is a Node Set with %n child.", "Warning: XPath %1 is a Node Set with %n children.", list->nodesetval->nodeNr).arg(xsldbgText(arg)) + QString("\n")); + xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is a Node Set with %n child.", "Warning: XPath %1 is a Node Set with %n children.", list->nodesetval->nodeNr).arg(xsldbgText(arg)) + TQString("\n")); } else { xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").arg(xsldbgText(arg))); } @@ -1131,7 +1131,7 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root, } else { if ((xslDebugStatus == DEBUG_TRACE) || (xslDebugStatus == DEBUG_WALK)) { - QString message; + TQString message; if (root->match) message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp)); else @@ -1279,7 +1279,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, * send this as the application will see the XSLDBG_MSG_LINE_CHANGED message */ if ((getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED) || (xslDebugStatus == DEBUG_TRACE)) { - QString messageTxt; + TQString messageTxt; if (!nextCommandActive && ctxt->node && ctxt->node && ctxt->node->doc && ctxt->node->doc->URL) { if (!showSource) { @@ -1612,7 +1612,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename, if (printCount == 0) xsldbgGenericErrorFunc(i18n("\nNo breakpoints are set for the file.\n")); else - xsldbgGenericErrorFunc(i18n("\tTotal of %n breakpoint present.","\tTotal of %n breakpoints present.", printCount) + QString("\n")); + xsldbgGenericErrorFunc(i18n("\tTotal of %n breakpoint present.","\tTotal of %n breakpoints present.", printCount) + TQString("\n")); } cmdResult = 1; break; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp index 083b33b2..10abbaf7 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp @@ -77,7 +77,7 @@ xslDbgEntities(void) if (arrayListCount(filesEntityList()) == 0) { xsldbgGenericErrorFunc(i18n("No external General Parsed entities present.\n")); } else { - xsldbgGenericErrorFunc(i18n("\tTotal of %n entity found.", "\tTotal of %n entities found.", arrayListCount(filesEntityList())) + QString("\n")); + xsldbgGenericErrorFunc(i18n("\tTotal of %n entity found.", "\tTotal of %n entities found.", arrayListCount(filesEntityList())) + TQString("\n")); } result = 1; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp index d3e91f92..db06ad2f 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp @@ -53,9 +53,9 @@ helpTop(const xmlChar * args) I18N_NOOP("Help not found for command") }; - QString xsldbgVerTxt(i18n("xsldbg version")); - QString helpDocVerTxt(i18n("Help document version")); - QString helpErrorTxt(i18n("Help not found for command")); + TQString xsldbgVerTxt(i18n("xsldbg version")); + TQString helpDocVerTxt(i18n("Help document version")); + TQString helpErrorTxt(i18n("Help not found for command")); char buff[500], helpParam[100]; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp index 9f667eb3..28b8f44c 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp @@ -25,8 +25,8 @@ #include "utils.h" #include #include -#include -#include +#include +#include /* keep track of our integer/boolean options */ @@ -90,42 +90,42 @@ const char *optionNames[] = { // find the translated help documentation directory // langLookupDir code modified from langLookup function in kdebase/khelpcenter/view.cpp -static QString langLookupDir( const QString &fname ) +static TQString langLookupDir( const TQString &fname ) { - QStringList search; + TQStringList search; // assemble the local search paths - QStringList localDoc = KGlobal::dirs()->resourceDirs("html"); + TQStringList localDoc = KGlobal::dirs()->resourceDirs("html"); // also look in each of the KDEDIR paths - QString kdeDirs = getenv("KDEDIRS"); - QStringList kdeDirsList = QStringList::split(":", kdeDirs); + TQString kdeDirs = getenv("KDEDIRS"); + TQStringList kdeDirsList = TQStringList::split(":", kdeDirs); if (!kdeDirs.isEmpty() && !kdeDirsList.isEmpty()){ - for (QStringList::iterator it = kdeDirsList.begin(); it != kdeDirsList.end(); it++) + for (TQStringList::iterator it = kdeDirsList.begin(); it != kdeDirsList.end(); it++) localDoc.append((*it) + "/share/doc/HTML/") ; } // look up the different languages for (uint id=0; id < localDoc.count(); id++) { - QStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = KGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( "C" ); - QStringList::ConstIterator lang; + TQStringList::ConstIterator lang; for (lang = langs.begin(); lang != langs.end(); ++lang) - search.append(QString("%1%2/%3/%4").arg(localDoc[id]).arg(*lang).arg("xsldbg").arg(fname)); + search.append(TQString("%1%2/%3/%4").arg(localDoc[id]).arg(*lang).arg("xsldbg").arg(fname)); } // try to locate the file - QStringList::Iterator it; + TQStringList::Iterator it; for (it = search.begin(); it != search.end(); ++it) { - QString baseDir = (*it).left((*it).findRev('/')) ; - QFileInfo info(baseDir + "/"+ fname); + TQString baseDir = (*it).left((*it).findRev('/')) ; + TQFileInfo info(baseDir + "/"+ fname); if (info.exists() && info.isFile() && info.isReadable()) return baseDir; } - return QString::null; + return TQString::null; } @@ -296,7 +296,7 @@ optionsSetIntOption(OptionTypeEnum optionType, int value) xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); }else{ #ifdef WITH_XSLDBG_DEBUG_PROCESS - xsldbgGenericErrorFunc(QString("Error: Invalid arguments for the command %1.\n").arg("setoption")); + xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("setoption")); #endif } result = 0; @@ -326,7 +326,7 @@ optionsGetIntOption(OptionTypeEnum optionType) xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); }else{ #ifdef WITH_XSLDBG_DEBUG_PROCESS - xsldbgGenericErrorFunc(QString("Error: Invalid arguments for the command %1.\n").arg("options")); + xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options")); #endif } } @@ -368,7 +368,7 @@ optionsSetStringOption(OptionTypeEnum optionType, const xmlChar * value) xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID]))); }else{ #ifdef WITH_XSLDBG_DEBUG_PROCESS - xsldbgGenericErrorFunc(QString("Error: Invalid arguments for the command %1.\n").arg("setoption")); + xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("setoption")); #endif } } @@ -399,7 +399,7 @@ optionsGetStringOption(OptionTypeEnum optionType) xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID]))); }else{ #ifdef WITH_XSLDBG_DEBUG_PROCESS - xsldbgGenericErrorFunc(QString("Error: Invalid arguments for the command %1.\n").arg("options")); + xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options")); #endif } } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp index e4255797..befa330d 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp @@ -72,7 +72,7 @@ xslDbgShellAddParam(xmlChar * arg) } } if (!result) - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); else { xsldbgGenericErrorFunc("\n"); } @@ -121,7 +121,7 @@ xslDbgShellDelParam(xmlChar * arg) } } if (!result) - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); else xsldbgGenericErrorFunc("\n"); @@ -168,7 +168,7 @@ xslDbgShellShowParam(xmlChar * arg) if (optionsPrintParamList()) result = 1; else - xsldbgGenericErrorFunc(QString("Error: %1\n").arg(i18n(errorPrompt))); + xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt))); xsldbgGenericErrorFunc("\n"); } return result; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp index 10deb686..261c0ebe 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp @@ -134,7 +134,7 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose, if (verbose) xsldbgGenericErrorFunc(i18n(" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n").arg(xsldbgText(name)).arg(xsldbgText(modeTemp)).arg(xsldbgUrl(url)).arg(xmlGetLineNo(templ->elem))); else - xsldbgGenericErrorFunc(QString("\"%s\" ").arg(xsldbgText(name))); + xsldbgGenericErrorFunc(TQString("\"%s\" ").arg(xsldbgText(name))); if (modeTemp) xmlFree(modeTemp); } @@ -225,8 +225,8 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt, if (templateCount == 0) { xsldbgGenericErrorFunc(i18n("\tNo XSLT templates found.\n")); } else { - xsldbgGenericErrorFunc(i18n("\tTotal of %n XSLT template found", "\tTotal of %n XSLT templates found", templateCount) + QString("\n")); - xsldbgGenericErrorFunc(i18n("\tTotal of %n XSLT template printed", "\tTotal of %n XSLT templates printed", printedTemplateCount) + QString("\n")); + xsldbgGenericErrorFunc(i18n("\tTotal of %n XSLT template found", "\tTotal of %n XSLT templates found", templateCount) + TQString("\n")); + xsldbgGenericErrorFunc(i18n("\tTotal of %n XSLT template printed", "\tTotal of %n XSLT templates printed", printedTemplateCount) + TQString("\n")); } } @@ -322,7 +322,7 @@ xslDbgShellPrintStyleSheets(xmlChar * arg) walkIncludes((xmlHashScanner) xslDbgShellPrintStylesheetsHelper2, NULL, filesGetStylesheet()); if (printCounter != 0) - xsldbgGenericErrorFunc(i18n("\tTotal of %n XSLT stylesheet found.", "\tTotal of %n XSLT stylesheets found.", printCounter) + QString("\n")); + xsldbgGenericErrorFunc(i18n("\tTotal of %n XSLT stylesheet found.", "\tTotal of %n XSLT stylesheets found.", printCounter) + TQString("\n")); else /* strange but possible */ xsldbgGenericErrorFunc(i18n("\tNo XSLT stylesheets found.\n")); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 2afdb828..52066acf 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -101,7 +101,7 @@ #include #include -#include +#include #ifdef WIN32 #ifdef _MSC_VER @@ -254,7 +254,7 @@ startTimer(void) * type argument */ static void -endTimer(const QString& message) +endTimer(const TQString& message) { long msec; @@ -284,7 +284,7 @@ startTimer(void) begin = clock(); } static void -endTimer(const QString& message) +endTimer(const TQString& message) { long msec; @@ -310,7 +310,7 @@ startTimer(void) */ } static void -endTimer(const QString& message) +endTimer(const TQString& message) { /* * We can not do anything because we don't have a timing function @@ -539,7 +539,7 @@ xsldbgMain(int argc, char **argv) if (args){ - QString langChoice = args->getOption("lang"); + TQString langChoice = args->getOption("lang"); if (KGlobal::locale() && !langChoice.isEmpty() && result) KGlobal::locale()->setLanguage(langChoice); } @@ -645,11 +645,11 @@ xsldbgMain(int argc, char **argv) if (args->isSet("verbose") && result) xsltSetGenericDebugFunc(stderr, NULL); - QCString outFile = args->getOption("output"); + TQCString outFile = args->getOption("output"); if (!outFile.isEmpty() && result) - result = xslDbgShellOutput((const xmlChar *)QFile::encodeName(outFile).data()); + result = xslDbgShellOutput((const xmlChar *)TQFile::encodeName(outFile).data()); - QCString maxDepth = args->getOption("maxdepth"); + TQCString maxDepth = args->getOption("maxdepth"); if (!maxDepth.isEmpty() && result){ bool OK; int value = maxDepth.toInt(&OK); @@ -666,7 +666,7 @@ xsldbgMain(int argc, char **argv) QCStringList xslParams(args->getOptionList("param")); QCStringList::iterator it; - QCString param, paramName, paramValue; + TQCString param, paramName, paramValue; int separatorIdx; bool paramOK; for ( it = xslParams.begin(); it != xslParams.end(); ++it){ @@ -692,9 +692,9 @@ xsldbgMain(int argc, char **argv) xsldbgGenericErrorFunc(i18n("Error: Argument \"%1\" to --param is not in the format :.\n").arg(param.data())); } - QCString cdPath = args->getOption("cd"); + TQCString cdPath = args->getOption("cd"); if (!cdPath.isEmpty() && result) - result = changeDir((const xmlChar *)QFile::encodeName(cdPath).data()); + result = changeDir((const xmlChar *)TQFile::encodeName(cdPath).data()); } @@ -997,7 +997,7 @@ xsldbgLoadXmlData(void) xslDebugStatus = DEBUG_STOP; } } else if (optionsGetIntOption(OPTIONS_TIMING)) - endTimer(QString("Parsing document %1").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data()); + endTimer(TQString("Parsing document %1").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data()); return doc; } @@ -1037,7 +1037,7 @@ xsldbgLoadXmlTemporary(const xmlChar * path) if (optionsGetIntOption(OPTIONS_TIMING) && (xslDebugStatus != DEBUG_QUIT)) { - endTimer(QString("Parsing document %1").arg(xsldbgUrl(path))); + endTimer(TQString("Parsing document %1").arg(xsldbgUrl(path))); } return doc; } @@ -1328,16 +1328,16 @@ xsldbgGenericErrorFunc(void *ctx, const char *msg, ...) va_end(args); } -void xsldbgGenericErrorFunc(QString const &text) +void xsldbgGenericErrorFunc(TQString const &text) { xsldbgGenericErrorFunc(0, "%s", text.utf8().data()); } -QString xsldbgUrl(const char *utf8fUrl) +TQString xsldbgUrl(const char *utf8fUrl) { - QString tempUrl(utf8fUrl); - QString fixedURI; + TQString tempUrl(utf8fUrl); + TQString fixedURI; KURL url(tempUrl); // May be provided with a URL that only has been encoded and has no protocol prefix ie a local file @@ -1349,19 +1349,19 @@ QString xsldbgUrl(const char *utf8fUrl) return fixedURI; } -QString xsldbgUrl(const xmlChar *utf8Url) +TQString xsldbgUrl(const xmlChar *utf8Url) { return xsldbgUrl((const char*)(utf8Url)); } -QString xsldbgText(const char *utf8Text) +TQString xsldbgText(const char *utf8Text) { - return QString::fromUtf8(utf8Text); + return TQString::fromUtf8(utf8Text); } -QString xsldbgText(const xmlChar *utf8Text) +TQString xsldbgText(const xmlChar *utf8Text) { - return QString::fromUtf8((const char *)utf8Text); + return TQString::fromUtf8((const char *)utf8Text); } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h index 6972fc12..26abeb49 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h @@ -80,7 +80,7 @@ #include #include -#include +#include #include #include "breakpoint.h" @@ -179,10 +179,10 @@ int xsldbgMain(int argc, char **argv); } #endif -void xsldbgGenericErrorFunc(QString const &text); -QString xsldbgUrl(const char *utf8Url); -QString xsldbgUrl(const xmlChar *utf8Url); -QString xsldbgText(const char *utf8Text); -QString xsldbgText(const xmlChar *utf8Text); +void xsldbgGenericErrorFunc(TQString const &text); +TQString xsldbgUrl(const char *utf8Url); +TQString xsldbgUrl(const xmlChar *utf8Url); +TQString xsldbgText(const char *utf8Text); +TQString xsldbgText(const xmlChar *utf8Text); #endif diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h index 85b1827f..86bd2e4f 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h @@ -25,8 +25,8 @@ #include #endif -#include -#include +#include +#include #include "xsldbgmsg.h" @@ -40,50 +40,50 @@ class XsldbgEventDataList : public QGList { public: XsldbgEventDataList(void) {} - XsldbgEventDataList( const XsldbgEventDataList &l ) : QGList(l) {} + XsldbgEventDataList( const XsldbgEventDataList &l ) : TQGList(l) {} ~XsldbgEventDataList(void) { clear(); } XsldbgEventDataList &operator=(const XsldbgEventDataList &l) - { return (XsldbgEventDataList&)QGList::operator=(l); } + { return (XsldbgEventDataList&)TQGList::operator=(l); } bool operator==( const XsldbgEventDataList &list ) const - { return QGList::operator==( list ); } - uint count(void) const { return QGList::count(); } - bool isEmpty(void) const { return QGList::count() == 0; } - bool insert( uint i, const XsldbgEventData *d){ return QGList::insertAt(i,(QPtrCollection::Item)d); } - void inSort( const XsldbgEventData *d ) { QGList::inSort((QPtrCollection::Item)d); } - void prepend( const XsldbgEventData *d ) { QGList::insertAt(0,(QPtrCollection::Item)d); } - void append( const XsldbgEventData *d ) { QGList::append((QPtrCollection::Item)d); } - bool remove( uint i ) { return QGList::removeAt(i); } - bool remove(void) { return QGList::remove((QPtrCollection::Item)0); } - bool remove( const XsldbgEventData *d ) { return QGList::remove((QPtrCollection::Item)d); } - bool removeRef( const XsldbgEventData *d ) { return QGList::removeRef((QPtrCollection::Item)d); } - void removeNode( QLNode *n ) { QGList::removeNode(n); } - bool removeFirst(void) { return QGList::removeFirst(); } - bool removeLast(void) { return QGList::removeLast(); } - XsldbgEventData *take( uint i ) { return (XsldbgEventData *)QGList::takeAt(i); } - XsldbgEventData *take(void) { return (XsldbgEventData *)QGList::take(); } - XsldbgEventData *takeNode( QLNode *n ) { return (XsldbgEventData *)QGList::takeNode(n); } - void clear(void) { QGList::clear(); } - void sort(void) { QGList::sort(); } - int find( const XsldbgEventData *d ) { return QGList::find((QPtrCollection::Item)d); } - int findNext( const XsldbgEventData *d ) { return QGList::find((QPtrCollection::Item)d,FALSE); } - int findRef( const XsldbgEventData *d ) { return QGList::findRef((QPtrCollection::Item)d); } - int findNextRef( const XsldbgEventData *d ){ return QGList::findRef((QPtrCollection::Item)d,FALSE);} - uint contains( const XsldbgEventData *d ) const { return QGList::contains((QPtrCollection::Item)d); } + { return TQGList::operator==( list ); } + uint count(void) const { return TQGList::count(); } + bool isEmpty(void) const { return TQGList::count() == 0; } + bool insert( uint i, const XsldbgEventData *d){ return TQGList::insertAt(i,(TQPtrCollection::Item)d); } + void inSort( const XsldbgEventData *d ) { TQGList::inSort((TQPtrCollection::Item)d); } + void prepend( const XsldbgEventData *d ) { TQGList::insertAt(0,(TQPtrCollection::Item)d); } + void append( const XsldbgEventData *d ) { TQGList::append((TQPtrCollection::Item)d); } + bool remove( uint i ) { return TQGList::removeAt(i); } + bool remove(void) { return TQGList::remove((TQPtrCollection::Item)0); } + bool remove( const XsldbgEventData *d ) { return TQGList::remove((TQPtrCollection::Item)d); } + bool removeRef( const XsldbgEventData *d ) { return TQGList::removeRef((TQPtrCollection::Item)d); } + void removeNode( TQLNode *n ) { TQGList::removeNode(n); } + bool removeFirst(void) { return TQGList::removeFirst(); } + bool removeLast(void) { return TQGList::removeLast(); } + XsldbgEventData *take( uint i ) { return (XsldbgEventData *)TQGList::takeAt(i); } + XsldbgEventData *take(void) { return (XsldbgEventData *)TQGList::take(); } + XsldbgEventData *takeNode( TQLNode *n ) { return (XsldbgEventData *)TQGList::takeNode(n); } + void clear(void) { TQGList::clear(); } + void sort(void) { TQGList::sort(); } + int find( const XsldbgEventData *d ) { return TQGList::find((TQPtrCollection::Item)d); } + int findNext( const XsldbgEventData *d ) { return TQGList::find((TQPtrCollection::Item)d,FALSE); } + int findRef( const XsldbgEventData *d ) { return TQGList::findRef((TQPtrCollection::Item)d); } + int findNextRef( const XsldbgEventData *d ){ return TQGList::findRef((TQPtrCollection::Item)d,FALSE);} + uint contains( const XsldbgEventData *d ) const { return TQGList::contains((TQPtrCollection::Item)d); } uint containsRef( const XsldbgEventData *d ) const - { return QGList::containsRef((QPtrCollection::Item)d); } - XsldbgEventData *at( uint i ) { return (XsldbgEventData *)QGList::at(i); } - int at(void) const { return QGList::at(); } - XsldbgEventData *current(void) const { return (XsldbgEventData *)QGList::get(); } - QLNode *currentNode(void) const { return QGList::currentNode(); } - XsldbgEventData *getFirst(void) const { return (XsldbgEventData *)QGList::cfirst(); } - XsldbgEventData *getLast(void) const { return (XsldbgEventData *)QGList::clast(); } - XsldbgEventData *first(void) { return (XsldbgEventData *)QGList::first(); } - XsldbgEventData *last(void) { return (XsldbgEventData *)QGList::last(); } - XsldbgEventData *next(void) { return (XsldbgEventData *)QGList::next(); } - XsldbgEventData *prev(void) { return (XsldbgEventData *)QGList::prev(); } - void toVector( QGVector *vec )const{ QGList::toVector(vec); } + { return TQGList::containsRef((TQPtrCollection::Item)d); } + XsldbgEventData *at( uint i ) { return (XsldbgEventData *)TQGList::at(i); } + int at(void) const { return TQGList::at(); } + XsldbgEventData *current(void) const { return (XsldbgEventData *)TQGList::get(); } + TQLNode *currentNode(void) const { return TQGList::currentNode(); } + XsldbgEventData *getFirst(void) const { return (XsldbgEventData *)TQGList::cfirst(); } + XsldbgEventData *getLast(void) const { return (XsldbgEventData *)TQGList::clast(); } + XsldbgEventData *first(void) { return (XsldbgEventData *)TQGList::first(); } + XsldbgEventData *last(void) { return (XsldbgEventData *)TQGList::last(); } + XsldbgEventData *next(void) { return (XsldbgEventData *)TQGList::next(); } + XsldbgEventData *prev(void) { return (XsldbgEventData *)TQGList::prev(); } + void toVector( TQGVector *vec )const{ TQGList::toVector(vec); } private: - void deleteItem( QPtrCollection::Item d ); + void deleteItem( TQPtrCollection::Item d ); }; @@ -111,18 +111,18 @@ class XsldbgEventData { * @param column 0 =< @p column < XSLDBGEVENT_COLUMNS * @param text The text value to store in column indicated */ - void setText(int column, QString text); + void setText(int column, TQString text); /** * Get the text from the column specified * - * @returns QString::null if invalid column number + * @returns TQString::null if invalid column number * * @param column 0 =< @p column < XSLDBGEVENT_COLUMNS * */ - QString getText(int column); + TQString getText(int column); /** @@ -146,10 +146,10 @@ class XsldbgEventData { private: /** Below are the messages that this class will support - Values are mapped left to right ie the first QString value maps + Values are mapped left to right ie the first TQString value maps to textValues[0], the second mapps to textValues[1] the third maps to textValues[2] etc.. */ - QString textValues[XSLDBGEVENT_COLUMNS]; + TQString textValues[XSLDBGEVENT_COLUMNS]; /** Both int and bool values are mapped to intValues in the same manner as @@ -158,65 +158,65 @@ class XsldbgEventData { /** - - - - - - The message/signal types supported - - - - - - */ // /** line number and/or file name changed */ - // void lineNoChanged(QString /* fileName */, int /* lineNumber */, bool /* breakpoint */); + // void lineNoChanged(TQString /* fileName */, int /* lineNumber */, bool /* breakpoint */); // These data items are mapped to attributes of this class with the same name // /** Show a message in debugger window */ - // void showMessage(QString /* msg*/); + // void showMessage(TQString /* msg*/); // These data item is mapped to the text attribute - // /** Add breakpoint to view, First parameter is QString::null + // /** Add breakpoint to view, First parameter is TQString::null // to indicate start of breakpoint list notfication */ - // void breakpointItem(QString /* fileName*/, int /* lineNumber */, QString /*templateName*/, + // void breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/, // bool /* enabled */, int /* id */); // These data items are mapped to attributes of this class with the same name - // /** Add global variable to view, First parameter is QString::null + // /** Add global variable to view, First parameter is TQString::null // to indicate start of global variable list notfication */ - // void globalVariableItem(QString /* name */, QString /* fileName */, int /* lineNumber */); + // void globalVariableItem(TQString /* name */, TQString /* fileName */, int /* lineNumber */); // These data items are mapped to attributes of this class with the same name - // /** Add local variable to view, First parameter is QString::null + // /** Add local variable to view, First parameter is TQString::null // to indicate start of local variable list notfication */ - // void localVariableItem(QString /*name */, QString /* templateContext*/, - // QString /* fileName */, int /*lineNumber */); + // void localVariableItem(TQString /*name */, TQString /* templateContext*/, + // TQString /* fileName */, int /*lineNumber */); // These data items are mapped to attributes of this class with the same name - // /** Add template to view, First parameter is QString::null + // /** Add template to view, First parameter is TQString::null // to indicate start of template list notfication */ - // void templateItem(QString /* name*/, QString /*mode*/, QString /* fileName */, int /* lineNumber */); + // void templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */); - // /** Add source to view, First parameter is QString::null + // /** Add source to view, First parameter is TQString::null // to indicate start of source list notfication */ - // void sourceItem(QString /* fileName */, QString /* parentFileName */, int /*lineNumber */); + // void sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */); - // /** Add parameter to view, First parameter is QString::null + // /** Add parameter to view, First parameter is TQString::null // to indicate start of parameter list notfication */ - // void parameterItem(QString /* name*/, QString /* value */); + // void parameterItem(TQString /* name*/, TQString /* value */); - // /** Add callStack to view, First parameter is QString::null + // /** Add callStack to view, First parameter is TQString::null // to indicate start of callstack list notfication */ - // void callStackItem(QString /* tempalteName*/, QString /* fileName */, int /* lineNumber */); + // void callStackItem(TQString /* tempalteName*/, TQString /* fileName */, int /* lineNumber */); - // /** Add entity to view, First parameter is QString::null + // /** Add entity to view, First parameter is TQString::null // to indicate start of entity list notfication */ - // void entityItem(QString /*SystemID*/, QString /*PublicID*/); + // void entityItem(TQString /*SystemID*/, TQString /*PublicID*/); // /* Show the URI for SystemID or PublicID requested */ - // void resolveItem(QString /*URI*/); + // void resolveItem(TQString /*URI*/); - // /* Display a integer option value First parameter is QString::null + // /* Display a integer option value First parameter is TQString::null // to indicate start of option list notification */ - // void intOptionItem(QString /* name*/, int /* value */); + // void intOptionItem(TQString /* name*/, int /* value */); - // /* Display a string option value. First parameter is QString::null + // /* Display a string option value. First parameter is TQString::null // to indicate start of option list notification */ - // void stringOptionItem(QString /* name*/, QString /* value */); + // void stringOptionItem(TQString /* name*/, TQString /* value */); }; @@ -230,7 +230,7 @@ class XsldbgEventData { * * @author Keith Isdale */ -class XsldbgEvent : public QEvent { +class XsldbgEvent : public TQEvent { public: XsldbgEvent(XsldbgMessageEnum type, const void *data); @@ -252,7 +252,7 @@ class XsldbgEvent : public QEvent { /** The following functions are directly related to the eventual signals that will be emitted ie the signal - lineNoChanged(QString, int bool) + lineNoChanged(TQString, int bool) is mapped to handleLineNoChanged(XsldbgEventData *, void *) */ diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index 69105338..1b8d2df3 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -8,26 +8,26 @@ #include "qxsldbgdoc.h" #include #include -#include -#include -#include -#include +#include +#include +#include +#include -QXsldbgDoc::QXsldbgDoc(QWidget *parent, KURL url) - : QObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) +QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) + : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); - connect(kDoc, SIGNAL(started(KIO::Job *)), this, SLOT(lockDoc())); - connect(kDoc, SIGNAL(completed()), this, SLOT(unlockDoc())); + connect(kDoc, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(lockDoc())); + connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); if (kDoc){ kView = kDoc->createView(parent, "QXsldbgDocView"); KURL cleanUrl; // convert paths relative to PWD into a absolute path - QString relUrl = url.prettyURL(); + TQString relUrl = url.prettyURL(); if (!relUrl.contains(":/")){ if (!(relUrl.left(1) == "/")) - relUrl.prepend(QDir::currentDirPath() + "/"); + relUrl.prepend(TQDir::currentDirPath() + "/"); cleanUrl.setFileName(relUrl); }else{ cleanUrl = url; @@ -121,7 +121,7 @@ void QXsldbgDoc::clearMarks(bool allMarkTypes) KTextEditor::MarkInterface *markIf = KTextEditor::markInterface(kDoc); if (markIf){ if (!allMarkTypes){ - QPtrList marks = markIf->marks(); + TQPtrList marks = markIf->marks(); while ( marks.current()) { markIf->removeMark(marks.current()->line, KTextEditor::MarkInterface::Execution); markIf->removeMark(marks.current()->line, KTextEditor::MarkInterface::BreakpointReached); diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index ec126aa6..abc04448 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -10,18 +10,18 @@ #define QXSLDBGDOC_H #include -#include -#include -#include +#include +#include +#include #include #include -class QXsldbgDoc : public QObject { +class QXsldbgDoc : public TQObject { Q_OBJECT public: - QXsldbgDoc(QWidget *parent=0, KURL url=QString::null); + QXsldbgDoc(TQWidget *parent=0, KURL url=TQString::null); ~QXsldbgDoc(); void enableBreakPoint(uint lineNumber, bool state); @@ -48,8 +48,8 @@ private slots: void unlockDoc(); private: - QGuardedPtr kDoc; - QGuardedPtr kView; + TQGuardedPtr kDoc; + TQGuardedPtr kView; bool locked; }; diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp index 9e0c7130..a94e3a0f 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp @@ -18,14 +18,14 @@ #include #include "xsldbgbreakpointlistitem.h" -XsldbgBreakpointListItem::XsldbgBreakpointListItem(QListView *parent, - QString fileName, int lineNumber, - QString templateName, QString modeName, +XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *parent, + TQString fileName, int lineNumber, + TQString templateName, TQString modeName, bool enabled, int id) : XsldbgListItem(parent, 3, fileName, lineNumber) { this->id = id; - setText(0, QString::number(id)); + setText(0, TQString::number(id)); this->templateName = templateName; setText(1, templateName); diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h index 3c25395e..b54d888a 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h @@ -26,9 +26,9 @@ class XsldbgBreakpointListItem : public XsldbgListItem { public: - XsldbgBreakpointListItem(QListView *parent, - QString fileName, int lineNumber, - QString templateName, QString modeName, + XsldbgBreakpointListItem(TQListView *parent, + TQString fileName, int lineNumber, + TQString templateName, TQString modeName, bool enabled, int id); ~XsldbgBreakpointListItem(); @@ -36,14 +36,14 @@ public: bool getEnabled() {return __enabled; }; /** Returns the name of template for this breakpoiint */ - QString getTemplateName() { return templateName;}; - QString getModeName() {return modeName;}; + TQString getTemplateName() { return templateName;}; + TQString getModeName() {return modeName;}; /** Return the breakpoint's id */ int getId() { return id;}; private: - QString templateName, modeName; + TQString templateName, modeName; bool __enabled; /*make sure the name does not clash with QT */ int id; }; diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp index 81e83142..ba14d115 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp @@ -16,9 +16,9 @@ ************************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include "xsldbgdebugger.h" #include "xsldbgbreakpointsimpl.h" #include "xsldbgbreakpointlistitem.h" @@ -26,20 +26,20 @@ XsldbgBreakpointsImpl::XsldbgBreakpointsImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0*/, const char *name /*=0*/) + TQWidget *parent /*=0*/, const char *name /*=0*/) : XsldbgBreakpoints(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, SIGNAL(breakpointItem(QString /* file*/, - int /*line number */, QString /*templateName*/, - QString /* modeName*/, + connect(debugger, TQT_SIGNAL(breakpointItem(TQString /* file*/, + int /*line number */, TQString /*templateName*/, + TQString /* modeName*/, bool /* enabled */, int /* id */)), - this, SLOT(slotProcBreakpointItem(QString /* file*/, - int /*line number */, QString /*templateName*/, - QString /* modeName */, + this, TQT_SLOT(slotProcBreakpointItem(TQString /* file*/, + int /*line number */, TQString /*templateName*/, + TQString /* modeName */, bool /* enabled */, int /* id */))); - connect( breakpointListView, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(selectionChanged(QListViewItem*))); + connect( breakpointListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQT_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); } @@ -80,18 +80,18 @@ void XsldbgBreakpointsImpl::slotAddBreakpoint() if (!sourceFileEdit->text().isEmpty()){ debugger->slotBreakCmd(sourceFileEdit->text(), lineNo); }else { - QMessageBox::information(this, i18n("Operation Failed"), + TQMessageBox::information(this, i18n("Operation Failed"), i18n("A line number was provided without a file name."), - QMessageBox::Ok); + TQMessageBox::Ok); } }else if (!templateNameEdit->text().isEmpty() || !modeNameEdit->text().isEmpty()){ debugger->slotBreakCmd(templateNameEdit->text(), modeNameEdit->text()); }else{ - QMessageBox::information(this, i18n("Operation Failed"), + TQMessageBox::information(this, i18n("Operation Failed"), i18n("No details provided or an invalid line number was supplied."), - QMessageBox::Ok); + TQMessageBox::Ok); } } @@ -112,14 +112,14 @@ void XsldbgBreakpointsImpl::slotDeleteBreakpoint() if (!sourceFileEdit->text().isEmpty()){ debugger->slotDeleteCmd(sourceFileEdit->text(), lineNo); }else { - QMessageBox::information(this, i18n("Operation Failed"), + TQMessageBox::information(this, i18n("Operation Failed"), i18n("A line number was provided without a file name."), - QMessageBox::Ok); + TQMessageBox::Ok); } }else { - QMessageBox::information(this, i18n("Operation Failed"), + TQMessageBox::information(this, i18n("Operation Failed"), i18n("No details provided or an invalid line or ID was supplied."), - QMessageBox::Ok); + TQMessageBox::Ok); } } @@ -140,27 +140,27 @@ void XsldbgBreakpointsImpl::slotEnableBreakpoint() if (!sourceFileEdit->text().isEmpty()){ debugger->slotEnableCmd(sourceFileEdit->text(), lineNo); }else { - QMessageBox::information(this, i18n("Operation Failed"), + TQMessageBox::information(this, i18n("Operation Failed"), i18n("A line number was provided without a file name."), - QMessageBox::Ok); + TQMessageBox::Ok); } }else { - QMessageBox::information(this, i18n("Operation Failed"), + TQMessageBox::information(this, i18n("Operation Failed"), i18n("No details provided."), - QMessageBox::Ok); + TQMessageBox::Ok); } } -void XsldbgBreakpointsImpl::selectionChanged(QListViewItem *item) +void XsldbgBreakpointsImpl::selectionChanged(TQListViewItem *item) { XsldbgBreakpointListItem *breakItem = dynamic_cast(item); if (breakItem){ - idEdit->setText(QString::number(breakItem->getId())); + idEdit->setText(TQString::number(breakItem->getId())); templateNameEdit->setText(breakItem->getTemplateName()); modeNameEdit->setText(breakItem->getModeName()); sourceFileEdit->setText(breakItem->getFileName()); - lineNumberEdit->setText(QString::number(breakItem->getLineNumber())); } + lineNumberEdit->setText(TQString::number(breakItem->getLineNumber())); } } @@ -181,10 +181,10 @@ void XsldbgBreakpointsImpl::slotClear() lineNumberEdit->setText(""); } -void XsldbgBreakpointsImpl::slotProcBreakpointItem(QString fileName, +void XsldbgBreakpointsImpl::slotProcBreakpointItem(TQString fileName, int lineNumber , - QString templateName, - QString modeName, + TQString templateName, + TQString modeName, bool enabled, int id ) { if (fileName.isNull()) diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h index 2dad57ca..5da172e7 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h @@ -32,7 +32,7 @@ class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase Q_OBJECT public: - XsldbgBreakpointsImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgBreakpointsImpl(); /* Return >= 0 if line number entered is valid */ @@ -49,12 +49,12 @@ public slots: void slotDeleteBreakpoint(); void slotDeleteAllBreakpoints(); void slotEnableBreakpoint(); - void selectionChanged(QListViewItem *item); + void selectionChanged(TQListViewItem *item); - /** Recieve notification about breakpoint to add to view, First parameter is QString::null + /** Recieve notification about breakpoint to add to view, First parameter is TQString::null to indicate start of breakpoint list notfication */ - void slotProcBreakpointItem(QString file, int lineNumber, - QString templateName, QString modeName, + void slotProcBreakpointItem(TQString file, int lineNumber, + TQString templateName, TQString modeName, bool enabled, int id ); /** refresh data from source */ diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp index 5592e4e6..9a500b6c 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp @@ -14,23 +14,23 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include +#include +#include #include "xsldbgdebugger.h" #include "xsldbgcallstackimpl.h" #include "xsldbggloballistitem.h" /* reuse global list item variable as a template list item */ XsldbgCallStackImpl::XsldbgCallStackImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0*/, const char *name /*=0*/) + TQWidget *parent /*=0*/, const char *name /*=0*/) : XsldbgCallStack(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, SIGNAL(callStackItem(QString /* templateName*/, QString /* fileName */, int /* lineNumber */)), - this, SLOT(slotProcCallStackItem(QString /* templateName*/, QString /* fileName */, int /* lineNumber */))); - connect( callStackListView, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(selectionChanged(QListViewItem*))); + 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*))); show(); refresh(); @@ -40,7 +40,7 @@ XsldbgCallStackImpl::~XsldbgCallStackImpl(){ debugger = 0L; } -void XsldbgCallStackImpl::slotProcCallStackItem(QString templateName, QString fileName , int lineNumber ) +void XsldbgCallStackImpl::slotProcCallStackItem(TQString templateName, TQString fileName , int lineNumber ) { static int frameNo =0; if (templateName.isNull()){ @@ -49,12 +49,12 @@ void XsldbgCallStackImpl::slotProcCallStackItem(QString templateName, QString }else{ /* each stack entry will have a FRAME# prefix */ callStackListView->insertItem(new XsldbgGlobalListItem(callStackListView, - fileName, lineNumber, templateName.prepend(QString::number(frameNo++)+ "# "))); + fileName, lineNumber, templateName.prepend(TQString::number(frameNo++)+ "# "))); } } -void XsldbgCallStackImpl::selectionChanged(QListViewItem *item) +void XsldbgCallStackImpl::selectionChanged(TQListViewItem *item) { XsldbgGlobalListItem *callStackItem = dynamic_cast(item); if (callStackItem){ diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h index 61200fe8..c105b54c 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h @@ -31,15 +31,15 @@ class XsldbgCallStackImpl : public XsldbgCallStack, public XsldbgDialogBase { Q_OBJECT public: - XsldbgCallStackImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgCallStackImpl(); public slots: - void selectionChanged(QListViewItem *item); + void selectionChanged(TQListViewItem *item); - /** Process request to add callstack to view, First parameter is QString::null + /** Process request to add callstack to view, First parameter is TQString::null to indicate start of callstack list notfication */ - void slotProcCallStackItem(QString templateName, QString fileName , int lineNumber ); + void slotProcCallStackItem(TQString templateName, TQString fileName , int lineNumber ); /** refresh data from source */ void refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp index dd62b1ec..19c6bb66 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp @@ -18,17 +18,17 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "xsldbgconfigimpl.h" #include "xsldbgdebugger.h" #include -LibxsltParam::LibxsltParam(const QString &name, const QString &value) - : QObject(0L, 0L) +LibxsltParam::LibxsltParam(const TQString &name, const TQString &value) + : TQObject(0L, 0L) { _name = name; _value = value; @@ -40,24 +40,24 @@ LibxsltParam::~LibxsltParam() } -QString LibxsltParam::getName() const +TQString LibxsltParam::getName() const { return _name; } -void LibxsltParam::setName(const QString &name) +void LibxsltParam::setName(const TQString &name) { _name = name; } -QString LibxsltParam::getValue() const +TQString LibxsltParam::getValue() const { return _value; } -void LibxsltParam::setValue(const QString & value) +void LibxsltParam::setValue(const TQString & value) { _value = value; } @@ -74,14 +74,14 @@ bool LibxsltParam::isValid() const XsldbgConfigImpl::XsldbgConfigImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0*/, const char *name /*=0*/) + TQWidget *parent /*=0*/, const char *name /*=0*/) : XsldbgConfig(parent, name) { this->debugger = debugger; - connect(debugger, SIGNAL(parameterItem(QString /* name*/, QString /* value */)), - this, SLOT(slotProcParameterItem(QString /* name*/, QString /* value */))); - connect(debugger, SIGNAL(fileDetailsChanged()), - this, SLOT(slotReloadFileNames())); + 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())); paramIndex= 0; catalogs = false; debug = false; @@ -96,30 +96,30 @@ XsldbgConfigImpl::~XsldbgConfigImpl() } -QString XsldbgConfigImpl::getSourceFile() +TQString XsldbgConfigImpl::getSourceFile() { if (xslSourceEdit != 0L) return xslSourceEdit->text(); else - return QString(); + return TQString(); } -QString XsldbgConfigImpl::getDataFile() +TQString XsldbgConfigImpl::getDataFile() { if (xmlDataEdit != 0L) return xmlDataEdit->text(); else - return QString(); + return TQString(); } -QString XsldbgConfigImpl::getOutputFile() +TQString XsldbgConfigImpl::getOutputFile() { if (outputFileEdit != 0L) return outputFileEdit->text(); else - return QString(); + return TQString(); } @@ -128,7 +128,7 @@ LibxsltParam *XsldbgConfigImpl::getParam(int paramNumber) return paramList.at(paramNumber); } -LibxsltParam *XsldbgConfigImpl::getParam(QString name) +LibxsltParam *XsldbgConfigImpl::getParam(TQString name) { LibxsltParam *param = 0L; for (param = paramList.first(); param != 0L; param = paramList.next()) @@ -147,7 +147,7 @@ int XsldbgConfigImpl::getParamCount() } -void XsldbgConfigImpl::addParam(QString name, QString value) +void XsldbgConfigImpl::addParam(TQString name, TQString value) { LibxsltParam *param; if ((name.length() == 0) || (value.length() == 0)) @@ -165,7 +165,7 @@ void XsldbgConfigImpl::addParam(QString name, QString value) } -void XsldbgConfigImpl::deleteParam(QString name) +void XsldbgConfigImpl::deleteParam(TQString name) { bool isOk = false; LibxsltParam *param; @@ -177,13 +177,13 @@ void XsldbgConfigImpl::deleteParam(QString name) isOk = paramList.remove(param); if (isOk == false) - kdDebug() << QString(" Param %1 dosn't exist").arg(name) << endl; + kdDebug() << TQString(" Param %1 dosn't exist").arg(name) << endl; else kdDebug() << "Deleted param " << name << endl; } -bool XsldbgConfigImpl::isValid(QString &errorMsg) +bool XsldbgConfigImpl::isValid(TQString &errorMsg) { bool isOK = true; errorMsg = ""; @@ -205,7 +205,7 @@ bool XsldbgConfigImpl::isValid(QString &errorMsg) // make it a warning when parameters are invalid LibxsltParam *param; - QString emptyParams = ""; + TQString emptyParams = ""; for (param = paramList.first(); param != 0L; param = paramList.next()) { if (!param->isValid()){ @@ -228,7 +228,7 @@ bool XsldbgConfigImpl::isValid(QString &errorMsg) /*we previously said that isValid() == true so we must commit our changes */ void XsldbgConfigImpl::update() { - QString msg; + TQString msg; if (debugger == 0L) return; @@ -325,7 +325,7 @@ void XsldbgConfigImpl::refresh() } -void XsldbgConfigImpl::slotSourceFile(QString xslFile) +void XsldbgConfigImpl::slotSourceFile(TQString xslFile) { if (debugger->start() == false) return ; /* User has killed xsldbg and we can't restart it */ @@ -333,12 +333,12 @@ void XsldbgConfigImpl::slotSourceFile(QString xslFile) if (debugger->sourceFileName() == xslFile) return; - QString msg("source "); + TQString msg("source "); msg.append(XsldbgDebugger::fixLocalPaths(xslFile)); debugger->fakeInput(msg, true); } -void XsldbgConfigImpl::slotDataFile(QString xmlFile) +void XsldbgConfigImpl::slotDataFile(TQString xmlFile) { if (debugger->start() == false) return ; /* User has killed xsldbg and we can't restart it */ @@ -346,12 +346,12 @@ void XsldbgConfigImpl::slotDataFile(QString xmlFile) if (debugger->dataFileName() == xmlFile) return; - QString msg("data "); + TQString msg("data "); msg.append(XsldbgDebugger::fixLocalPaths(xmlFile)); debugger->fakeInput(msg, true); } -void XsldbgConfigImpl::slotOutputFile(QString outputFile) +void XsldbgConfigImpl::slotOutputFile(TQString outputFile) { if (debugger->start() == false) return ; /* User has killed xsldbg and we can't restart it */ @@ -359,16 +359,16 @@ void XsldbgConfigImpl::slotOutputFile(QString outputFile) if (debugger->outputFileName() == outputFile) return; - QString msg("output "); + TQString msg("output "); msg.append(XsldbgDebugger::fixLocalPaths(outputFile)); debugger->fakeInput(msg, true); } void XsldbgConfigImpl::slotChooseSourceFile() { - KURL url = KFileDialog::getOpenURL(QString::null, "*.xsl; *.XSL; *.Xsl ; *.xslt; *.XSLT; *.Xslt \n *.*", this, + KURL url = KFileDialog::getOpenURL(TQString::null, "*.xsl; *.XSL; *.Xsl ; *.xslt; *.XSLT; *.Xslt \n *.*", this, i18n("Choose XSL Source to Debug")); - QString fileName = url.prettyURL(); + TQString fileName = url.prettyURL(); if ((!fileName.isNull()) && (fileName.length() > 0)){ xslSourceEdit->setText(XsldbgDebugger::fixLocalPaths(fileName)); @@ -378,9 +378,9 @@ void XsldbgConfigImpl::slotChooseSourceFile() void XsldbgConfigImpl::slotChooseDataFile() { - KURL url = KFileDialog::getOpenURL(QString::null, "*.xml; *.XML; *.Xml \n*.docbook \n *.html;*.HTML; *.htm ; *HTM \n *.*", this, + KURL url = KFileDialog::getOpenURL(TQString::null, "*.xml; *.XML; *.Xml \n*.docbook \n *.html;*.HTML; *.htm ; *HTM \n *.*", this, i18n("Choose XML Data to Debug")); - QString fileName = url.prettyURL(); + TQString fileName = url.prettyURL(); if ((!fileName.isNull()) && (fileName.length() > 0)) xmlDataEdit->setText(XsldbgDebugger::fixLocalPaths(fileName)); @@ -389,9 +389,9 @@ void XsldbgConfigImpl::slotChooseDataFile() void XsldbgConfigImpl::slotChooseOutputFile() { - KURL url = KFileDialog::getSaveURL(QString::null, "*.xml; *.XML; *.Xml \n*.docbook \n *.txt; *.TXT \n *.htm;*.HTM;*.htm;*.HTML \n*.*", this, + KURL url = KFileDialog::getSaveURL(TQString::null, "*.xml; *.XML; *.Xml \n*.docbook \n *.txt; *.TXT \n *.htm;*.HTM;*.htm;*.HTML \n*.*", this, i18n("Choose Output File for XSL Transformation")); - QString fileName; + TQString fileName; if (url.isLocalFile()){ fileName = url.prettyURL(); @@ -456,7 +456,7 @@ void XsldbgConfigImpl::slotPrevParam() repaintParam(); } -void XsldbgConfigImpl::slotProcParameterItem(QString name, QString value) +void XsldbgConfigImpl::slotProcParameterItem(TQString name, TQString value) { if (name.isNull()){ paramList.clear(); @@ -478,15 +478,15 @@ void XsldbgConfigImpl::slotApply() { // Validate the users choices before applying it - QString msg; + TQString msg; if (isValid(msg)){ if (!msg.isEmpty()) - QMessageBox::information(this, i18n("Suspect Configuration"), - msg, QMessageBox::Ok); + TQMessageBox::information(this, i18n("Suspect Configuration"), + msg, TQMessageBox::Ok); update(); }else{ - QMessageBox::information(this, i18n("Incomplete or Invalid Configuration"), - msg, QMessageBox::Ok); + TQMessageBox::information(this, i18n("Incomplete or Invalid Configuration"), + msg, TQMessageBox::Ok); } } diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h index ad207d7a..1c3aa21e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h @@ -24,24 +24,24 @@ #include "xsldbgconfig.h" #include "xsldbgdialogbase.h" -#include +#include class LibxsltParam : public QObject { public: - LibxsltParam(const QString & name, const QString &value); + LibxsltParam(const TQString & name, const TQString &value); ~LibxsltParam(); - QString getName() const; - void setName(const QString &name); - QString getValue() const; - void setValue(const QString &value); + TQString getName() const; + void setName(const TQString &name); + TQString getValue() const; + void setValue(const TQString &value); bool isValid() const; private: - QString _name; - QString _value; + TQString _name; + TQString _value; }; @@ -51,19 +51,19 @@ class XsldbgConfigImpl : public XsldbgConfig, public XsldbgDialogBase { Q_OBJECT public: - XsldbgConfigImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgConfigImpl(); LibxsltParam *getParam(int paramNumber); - LibxsltParam *getParam(QString name); + LibxsltParam *getParam(TQString name); int getParamCount(); - void addParam(QString name, QString value); - void deleteParam(QString name); + void addParam(TQString name, TQString value); + void deleteParam(TQString name); void repaintParam(); - QString getSourceFile(); - QString getDataFile(); - QString getOutputFile(); + TQString getSourceFile(); + TQString getDataFile(); + TQString getOutputFile(); bool debugEnabled() const {return debug; }; bool catalogsEnabled() const {return catalogs; }; bool htmlEnabled() const {return html; }; @@ -76,7 +76,7 @@ public: /** return true if all data ok */ - bool isValid(QString &errorMsg); + bool isValid(TQString &errorMsg); /** Update changes to xsldbg*/ void update(); @@ -88,13 +88,13 @@ public: public slots: /** Set xsl source file*/ - void slotSourceFile(QString); + void slotSourceFile(TQString); /** Set xml data file*/ - void slotDataFile(QString); + void slotDataFile(TQString); /** Set file name for the default output of transformed data*/ - void slotOutputFile(QString); + void slotOutputFile(TQString); /**Choose the XSL source file */ void slotChooseSourceFile(); @@ -128,13 +128,13 @@ public slots: void slotCancel(); /** Process notification of add parameter to view, First parameter - is QString::null to indicate start of parameter list notfication */ - void slotProcParameterItem(QString name, QString value); + is TQString::null to indicate start of parameter list notfication */ + void slotProcParameterItem(TQString name, TQString value); private: int paramIndex; - QPtrList paramList; + TQPtrList paramList; XsldbgDebugger *debugger; diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp index 69fcaeec..deead4fa 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp @@ -31,7 +31,7 @@ extern int xsldbgStop; #include "xsldbgwalkspeedimpl.h" -#include +#include #include XsldbgDebugger::XsldbgDebugger() @@ -67,13 +67,13 @@ void XsldbgDebugger::setInspector(XsldbgInspector *inspector) this->inspector = inspector; } -bool XsldbgDebugger::event(QEvent *e) +bool XsldbgDebugger::event(TQEvent *e) { if (e == 0L) return false; - if (e->type() != QEvent::User) - return QObject::event(e); + if (e->type() != TQEvent::User) + return TQObject::event(e); else{ static bool waitingFirstmessage = true; if (waitingFirstmessage){ @@ -91,7 +91,7 @@ bool XsldbgDebugger::event(QEvent *e) } -void XsldbgDebugger::timerEvent(QTimerEvent *e) +void XsldbgDebugger::timerEvent(TQTimerEvent *e) { /* This function runs in the application's thread */ @@ -100,14 +100,14 @@ void XsldbgDebugger::timerEvent(QTimerEvent *e) if ((getInputReady() == 0) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT) && (commandQue.count() > 0)){ - QString msg = commandQue.first(); + TQString msg = commandQue.first(); commandQue.remove(msg); ::fakeInput((const char*)msg.utf8()); } if ((!updateText.isEmpty()) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT)){ /* flush remainding text to message window */ - QString msgCopy = updateText; + TQString msgCopy = updateText; updateText = ""; emit showMessage(msgCopy); lastType = XSLDBG_MSG_AWAITING_INPUT; @@ -116,13 +116,13 @@ void XsldbgDebugger::timerEvent(QTimerEvent *e) } -QString XsldbgDebugger::fixLocalPaths(QString & file) +TQString XsldbgDebugger::fixLocalPaths(TQString & file) { - QString result = file; + TQString result = file; if (file.left(6) == "file:/"){ xmlChar * tempResult = filesExpandName((xmlChar *)file.utf8().data()); - result = QString::fromUtf8((char*)tempResult); + result = TQString::fromUtf8((char*)tempResult); xmlFree(tempResult); } @@ -130,37 +130,37 @@ QString XsldbgDebugger::fixLocalPaths(QString & file) } -QString XsldbgDebugger::sourceFileName() +TQString XsldbgDebugger::sourceFileName() { - QString fileName; + TQString fileName; if (optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME) != 0L) - fileName = QString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)); + fileName = TQString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)); return fileName; } -QString XsldbgDebugger::dataFileName() +TQString XsldbgDebugger::dataFileName() { - QString fileName; + TQString fileName; if (optionsGetStringOption(OPTIONS_DATA_FILE_NAME) != 0L) - fileName = QString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); + fileName = TQString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); return fileName; } -QString XsldbgDebugger::outputFileName() +TQString XsldbgDebugger::outputFileName() { - QString fileName; + TQString fileName; if (optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) != 0L) - fileName = QString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)); + fileName = TQString::fromUtf8((const char*)optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)); return fileName; } -void XsldbgDebugger::gotoLine(QString fileName, int lineNo, bool breakpoint /*= false*/) +void XsldbgDebugger::gotoLine(TQString fileName, int lineNo, bool breakpoint /*= false*/) { emit lineNoChanged(fileName, lineNo, breakpoint); } @@ -168,12 +168,12 @@ void XsldbgDebugger::gotoLine(QString fileName, int lineNo, bool breakpoint /*= void XsldbgDebugger::setOption(const char* name, bool value) { - QString msg = "setoption "; - msg.append(name).append(" ").append(QString::number(value)); + TQString msg = "setoption "; + msg.append(name).append(" ").append(TQString::number(value)); fakeInput(msg, true); } -void XsldbgDebugger::fakeInput(QString text, bool wait) +void XsldbgDebugger::fakeInput(TQString text, bool wait) { Q_UNUSED(wait); commandQue.append(text); @@ -213,7 +213,7 @@ void XsldbgDebugger::slotConfigure() if(inspector == 0L ){ inspector = new XsldbgInspector(this); - connect(inspector, SIGNAL(closedWindow()), this, SLOT(slotConfigClosed())); + connect(inspector, TQT_SIGNAL(closedWindow()), this, TQT_SLOT(slotConfigClosed())); } } @@ -258,8 +258,8 @@ void XsldbgDebugger::slotWalkSpeed(int speed) if (start()){ if (optionsGetIntOption(OPTIONS_WALK_SPEED) == WALKSPEED_STOP){ // start walking at speed requested - QString msg("walk "); - msg.append(QString::number(speed)); + TQString msg("walk "); + msg.append(TQString::number(speed)); fakeInput(msg, true); } else // This will take effect imediately @@ -291,17 +291,17 @@ void XsldbgDebugger::slotTraceCmd() fakeInput("trace", false); } -void XsldbgDebugger::slotBreakCmd(QString fileName, int lineNumber) +void XsldbgDebugger::slotBreakCmd(TQString fileName, int lineNumber) { if (outputFileActive == true){ - QMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(0L, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), - QMessageBox::Ok); + TQMessageBox::Ok); return ; } - QString msg("break -l \""); - msg.append(XsldbgDebugger::fixLocalPaths(fileName)).append("\" ").append(QString::number(lineNumber)); + TQString msg("break -l \""); + msg.append(XsldbgDebugger::fixLocalPaths(fileName)).append("\" ").append(TQString::number(lineNumber)); if (start()) fakeInput(msg, true); @@ -310,16 +310,16 @@ void XsldbgDebugger::slotBreakCmd(QString fileName, int lineNumber) inspector->refreshBreakpoints(); } -void XsldbgDebugger::slotBreakCmd(QString templateName, QString modeName) +void XsldbgDebugger::slotBreakCmd(TQString templateName, TQString modeName) { if (outputFileActive == true){ - QMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(0L, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), - QMessageBox::Ok); + TQMessageBox::Ok); return ; } - QString msg("break \""); + TQString msg("break \""); msg.append(templateName).append("\" \"").append(modeName).append("\""); if (start()) fakeInput(msg, true); @@ -328,18 +328,18 @@ void XsldbgDebugger::slotBreakCmd(QString templateName, QString modeName) inspector->refreshBreakpoints(); } -void XsldbgDebugger::slotEnableCmd(QString fileName, int lineNumber) +void XsldbgDebugger::slotEnableCmd(TQString fileName, int lineNumber) { if (outputFileActive == true){ - QMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(0L, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), - QMessageBox::Ok); + TQMessageBox::Ok); return ; } - QString msg("enable -l \""); - msg.append(XsldbgDebugger::fixLocalPaths(fileName)).append("\" ").append(QString::number(lineNumber)); + TQString msg("enable -l \""); + msg.append(XsldbgDebugger::fixLocalPaths(fileName)).append("\" ").append(TQString::number(lineNumber)); if (start()) fakeInput(msg, true); @@ -352,14 +352,14 @@ void XsldbgDebugger::slotEnableCmd(int id) { if (outputFileActive == true){ - QMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(0L, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), - QMessageBox::Ok); + TQMessageBox::Ok); return ; } - QString msg("enable "); - msg.append(QString::number(id)); + TQString msg("enable "); + msg.append(TQString::number(id)); if (start()) fakeInput(msg, true); @@ -368,18 +368,18 @@ void XsldbgDebugger::slotEnableCmd(int id) } -void XsldbgDebugger::slotDeleteCmd(QString fileName, int lineNumber) +void XsldbgDebugger::slotDeleteCmd(TQString fileName, int lineNumber) { if (outputFileActive == true){ - QMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(0L, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), - QMessageBox::Ok); + TQMessageBox::Ok); return ; } - QString msg("delete -l \""); - msg.append(XsldbgDebugger::fixLocalPaths(fileName)).append("\" ").append(QString::number(lineNumber)); + TQString msg("delete -l \""); + msg.append(XsldbgDebugger::fixLocalPaths(fileName)).append("\" ").append(TQString::number(lineNumber)); if (start()) fakeInput(msg, true); if (inspector != 0L) @@ -391,13 +391,13 @@ void XsldbgDebugger::slotDeleteCmd(int id) { if (outputFileActive == true){ - QMessageBox::information(0L, i18n("Operation Failed"), + TQMessageBox::information(0L, i18n("Operation Failed"), i18n("Cannot set/edit breakpoints on the output file."), - QMessageBox::Ok); + TQMessageBox::Ok); return ; } - QString msg("delete "); - msg.append(QString::number(id)); + TQString msg("delete "); + msg.append(TQString::number(id)); if (start()) fakeInput(msg, true); if (inspector != 0L) @@ -439,8 +439,8 @@ void XsldbgDebugger::slotExitCmd() } -void XsldbgDebugger::slotCatCmd(QString xPathExpression){ - QString msg("cat "); +void XsldbgDebugger::slotCatCmd(TQString xPathExpression){ + TQString msg("cat "); msg.append(xPathExpression); if (start()) @@ -449,17 +449,17 @@ void XsldbgDebugger::slotCatCmd(QString xPathExpression){ } -void XsldbgDebugger::slotCdCmd(QString xPathExpression){ - QString msg("cd "); +void XsldbgDebugger::slotCdCmd(TQString xPathExpression){ + TQString msg("cd "); msg.append(xPathExpression); if (start()) fakeInput(msg, true); } -void XsldbgDebugger::slotSetVariableCmd(QString variableName, QString xPathExpression) +void XsldbgDebugger::slotSetVariableCmd(TQString variableName, TQString xPathExpression) { if (!variableName.isEmpty() && !xPathExpression.isEmpty()){ - QString msg("set "); + TQString msg("set "); msg.append(variableName); msg.append(" \""); msg.append(xPathExpression); diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.h b/kxsldbg/kxsldbgpart/xsldbgdebugger.h index 3e9c267f..b4be5b5e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.h +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.h @@ -18,7 +18,7 @@ #ifndef XSLDBGDEBUGGER_H #define XSLDBGDEBUGGER_H -#include +#include #include "libxsldbg/xsldbgmsg.h" /* needed for XsldbgMessageEnum */ #include "libqtnotfier/xsldbgdebuggerbase.h" @@ -44,27 +44,27 @@ public: void setInspector(XsldbgInspector *inspector); /** Get the name of source file from xsldbg*/ - QString sourceFileName(); + TQString sourceFileName(); /** Get the name of data file from xsldbg*/ - QString dataFileName(); + TQString dataFileName(); /** Get the name of output file from xsldbg*/ - QString outputFileName(); + TQString outputFileName(); /** Tell quanta to move its cursor to file and line number supplied */ - void gotoLine(QString fileName, int lineNo, bool breakpoint = false); + void gotoLine(TQString fileName, int lineNo, bool breakpoint = false); /** Set a xsldbg option */ void setOption(const char *name, bool value); - bool event(QEvent *e); - void timerEvent(QTimerEvent *e); + bool event(TQEvent *e); + void timerEvent(TQTimerEvent *e); void setOutputFileActive(bool b) {outputFileActive = b;}; /* helper function to handle differences between URI's in Qt/KDE and libxml2 */ - static QString fixLocalPaths(QString & file); + static TQString fixLocalPaths(TQString & file); private: /** */ @@ -78,7 +78,7 @@ public slots: bool stop(); /** send text to xsldbg, if wait is true then wait for the reply */ - void fakeInput(QString text, bool wait); + void fakeInput(TQString text, bool wait); /** Display configure dialog */ void slotConfigure(); @@ -112,19 +112,19 @@ public slots: void slotTraceCmd(); /** Add breakpoint at given file and line number */ - void slotBreakCmd(QString fileName, int lineNumber); + void slotBreakCmd(TQString fileName, int lineNumber); /** Add breakpoint at given template name*/ - void slotBreakCmd(QString templateName, QString modeName); + void slotBreakCmd(TQString templateName, TQString modeName); /** Toggle the enabling of break point at given file and line number */ - void slotEnableCmd(QString fileName, int lineNumber); + void slotEnableCmd(TQString fileName, int lineNumber); /** Enable break point for given breakpoint id */ void slotEnableCmd(int id); /** Delete break point at given file and line number */ - void slotDeleteCmd(QString fileName, int lineNumber); + void slotDeleteCmd(TQString fileName, int lineNumber); /** Delete break point for given breakpoint id */ void slotDeleteCmd(int id); @@ -142,13 +142,13 @@ public slots: void slotExitCmd(); /** Print the result of evaluating xPathExpression to the message window */ - void slotCatCmd(QString xPathExpression); + void slotCatCmd(TQString xPathExpression); /** Move to line specified by xPathExpression */ - void slotCdCmd(QString xPathExpression); + void slotCdCmd(TQString xPathExpression); /** Set a libxslt variable to xPathExpression */ - void slotSetVariableCmd(QString variableName, QString xPathExpression); + void slotSetVariableCmd(TQString variableName, TQString xPathExpression); signals: // Signals // generated after first message is received from xsldbg void debuggerReady(); @@ -169,7 +169,7 @@ private: int updateTimerID; bool addMsg; - QStringList commandQue; + TQStringList commandQue; }; diff --git a/kxsldbg/kxsldbgpart/xsldbgdialogbase.h b/kxsldbg/kxsldbgpart/xsldbgdialogbase.h index 4582ef3f..41393526 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdialogbase.h +++ b/kxsldbg/kxsldbgpart/xsldbgdialogbase.h @@ -23,7 +23,7 @@ *@author Keith Isdale */ -#include +#include class XsldbgDialogBase { diff --git a/kxsldbg/kxsldbgpart/xsldbgdoc.cpp b/kxsldbg/kxsldbgpart/xsldbgdoc.cpp index 51b27dcb..0579a854 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgdoc.cpp @@ -6,14 +6,14 @@ XsldbgDoc::XsldbgDoc() { - fileName = QString(); - text = QString(); + fileName = TQString(); + text = TQString(); row = 0; column = 0; } -XsldbgDoc::XsldbgDoc(const QString &fileName, const QString &text) +XsldbgDoc::XsldbgDoc(const TQString &fileName, const TQString &text) { this->fileName = fileName; this->text = text; @@ -28,13 +28,13 @@ XsldbgDoc::~XsldbgDoc() } -QString XsldbgDoc::getText() const +TQString XsldbgDoc::getText() const { return text; } -QString XsldbgDoc::getFileName() const +TQString XsldbgDoc::getFileName() const { return fileName; } diff --git a/kxsldbg/kxsldbgpart/xsldbgdoc.h b/kxsldbg/kxsldbgpart/xsldbgdoc.h index 26e4482a..105634a8 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/xsldbgdoc.h @@ -2,16 +2,16 @@ #ifndef XSLDBGDOC #define XSLDBGDOC -#include +#include class XsldbgDoc { public: XsldbgDoc(); - XsldbgDoc(const QString &fileName, const QString &text); + XsldbgDoc(const TQString &fileName, const TQString &text); ~XsldbgDoc(); - QString getText() const; - QString getFileName() const; + TQString getText() const; + TQString getFileName() const; void setRow(int row); int getRow(); @@ -19,8 +19,8 @@ class XsldbgDoc { int getColumn(); private: - QString text; - QString fileName; + TQString text; + TQString fileName; int row, column; }; diff --git a/kxsldbg/kxsldbgpart/xsldbgdocmap.h b/kxsldbg/kxsldbgpart/xsldbgdocmap.h index 189ddc1c..e6c79344 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdocmap.h +++ b/kxsldbg/kxsldbgpart/xsldbgdocmap.h @@ -1,5 +1,5 @@ -#include +#include #include "qxsldbgdoc.h" -typedef QMap XsldbgDocMap; +typedef TQMap XsldbgDocMap; diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp index f24e694f..03f21618 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp @@ -15,8 +15,8 @@ * * ************************************************************************************/ -#include -#include +#include +#include #include "xsldbgentitiesimpl.h" #include "xsldbgdebugger.h" @@ -24,20 +24,20 @@ XsldbgEntitiesImpl::XsldbgEntitiesImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0*/, const char *name /*=0*/) + TQWidget *parent /*=0*/, const char *name /*=0*/) : XsldbgEntities(parent, name), XsldbgDialogBase() { this->debugger = debugger; connect(debugger, - SIGNAL(entityItem(QString /*SystemID*/, - QString /*PublicID*/)), + TQT_SIGNAL(entityItem(TQString /*SystemID*/, + TQString /*PublicID*/)), this, - SLOT(slotProcEntityItem(QString /*SystemID*/, - QString /*PublicID*/))); + TQT_SLOT(slotProcEntityItem(TQString /*SystemID*/, + TQString /*PublicID*/))); connect( entitiesListView, - SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(selectionChanged(QListViewItem*))); + TQT_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQT_SLOT(selectionChanged(TQListViewItem*))); show(); } @@ -46,7 +46,7 @@ XsldbgEntitiesImpl::~XsldbgEntitiesImpl(){ } -void XsldbgEntitiesImpl::slotProcEntityItem(QString SystemID, QString PublicID) +void XsldbgEntitiesImpl::slotProcEntityItem(TQString SystemID, TQString PublicID) { if (SystemID.isNull()) entitiesListView->clear(); @@ -59,7 +59,7 @@ void XsldbgEntitiesImpl::slotProcEntityItem(QString SystemID, QString PublicID) } -void XsldbgEntitiesImpl::selectionChanged(QListViewItem *item) +void XsldbgEntitiesImpl::selectionChanged(TQListViewItem *item) { XsldbgGlobalListItem *globalItem = dynamic_cast(item); if (globalItem){ diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h index 2c744001..220c09cd 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h @@ -31,15 +31,15 @@ class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase { Q_OBJECT public: - XsldbgEntitiesImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgEntitiesImpl(); public slots: - /** Process request to add entity to view, First parameter is QString::null + /** Process request to add entity to view, First parameter is TQString::null to indicate start of entity list notfication */ - void slotProcEntityItem(QString SystemID, QString PublicID); + void slotProcEntityItem(TQString SystemID, TQString PublicID); - void selectionChanged(QListViewItem *item); + void selectionChanged(TQListViewItem *item); /** refresh data from source */ void refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp b/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp index b1fa76d9..3ad3ed81 100644 --- a/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp @@ -17,8 +17,8 @@ #include "xsldbggloballistitem.h" -XsldbgGlobalListItem::XsldbgGlobalListItem(QListView *parent, - QString fileName, int lineNumber, QString globalName) +XsldbgGlobalListItem::XsldbgGlobalListItem(TQListView *parent, + TQString fileName, int lineNumber, TQString globalName) : XsldbgListItem(parent, 1, fileName, lineNumber) { varName = globalName; @@ -31,7 +31,7 @@ XsldbgGlobalListItem::~XsldbgGlobalListItem() } -QString XsldbgGlobalListItem::getVarName() +TQString XsldbgGlobalListItem::getVarName() { return varName; } diff --git a/kxsldbg/kxsldbgpart/xsldbggloballistitem.h b/kxsldbg/kxsldbgpart/xsldbggloballistitem.h index 325df028..fe3cd47f 100644 --- a/kxsldbg/kxsldbgpart/xsldbggloballistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbggloballistitem.h @@ -27,15 +27,15 @@ class XsldbgGlobalListItem : public XsldbgListItem { public: - XsldbgGlobalListItem(QListView *parent, - QString fileName, int lineNumber, QString globalName); + XsldbgGlobalListItem(TQListView *parent, + TQString fileName, int lineNumber, TQString globalName); ~XsldbgGlobalListItem(); /** return the name of this variable */ - QString getVarName(); + TQString getVarName(); private: - QString varName; + TQString varName; }; #endif diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp index 37083068..235c564a 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp @@ -15,8 +15,8 @@ * * ************************************************************************************/ -#include -#include +#include +#include #include "xsldbgglobalvariablesimpl.h" #include "xsldbgdebugger.h" @@ -24,14 +24,14 @@ XsldbgGlobalVariablesImpl::XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0*/, const char *name /*=0*/) + TQWidget *parent /*=0*/, const char *name /*=0*/) : XsldbgGlobalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, SIGNAL(globalVariableItem(QString /*name */, QString /* fileName */, int /*lineNumber */)), - this, SLOT(slotProcGlobalVariableItem(QString /*name */, QString /* fileName */, int /*lineNumber */))); - connect( varsListView, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(selectionChanged(QListViewItem*))); + 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*))); show(); } @@ -40,7 +40,7 @@ XsldbgGlobalVariablesImpl::~XsldbgGlobalVariablesImpl(){ debugger = 0L; } -void XsldbgGlobalVariablesImpl::slotProcGlobalVariableItem(QString name , QString fileName, int lineNumber) +void XsldbgGlobalVariablesImpl::slotProcGlobalVariableItem(TQString name , TQString fileName, int lineNumber) { if (name.isNull()) varsListView->clear(); @@ -52,7 +52,7 @@ void XsldbgGlobalVariablesImpl::slotProcGlobalVariableItem(QString name , QStrin } -void XsldbgGlobalVariablesImpl::selectionChanged(QListViewItem *item) +void XsldbgGlobalVariablesImpl::selectionChanged(TQListViewItem *item) { XsldbgGlobalListItem *globalItem = dynamic_cast(item); if (globalItem != 0 && debugger != 0) { diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h index 57d0c922..42a40968 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h @@ -31,15 +31,15 @@ class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDia Q_OBJECT public: - XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgGlobalVariablesImpl(); public slots: - /** Process request to add global variable to view, First parameter is QString::null + /** Process request to add global variable to view, First parameter is TQString::null to indicate start of global variable list notfication */ - void slotProcGlobalVariableItem(QString name , QString fileName, int lineNumber); + void slotProcGlobalVariableItem(TQString name , TQString fileName, int lineNumber); - void selectionChanged(QListViewItem *item); + void selectionChanged(TQListViewItem *item); /** refresh data from source */ void refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp index c36130c7..b6a8f6df 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp +++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp @@ -10,19 +10,19 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -34,13 +34,13 @@ #include "xsldbgsourcesimpl.h" #include "xsldbgentitiesimpl.h" -static QPixmap uic_load_pixmap_XsldbgInspector( const QString &name ) +static TQPixmap uic_load_pixmap_XsldbgInspector( const TQString &name ) { - const QMimeSource *m = QMimeSourceFactory::defaultFactory()->data( name ); + const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( name ); if ( !m ) - return QPixmap(); - QPixmap pix; - QImageDrag::decode( m, pix ); + return TQPixmap(); + TQPixmap pix; + TQImageDrag::decode( m, pix ); return pix; } /* @@ -50,9 +50,9 @@ static QPixmap uic_load_pixmap_XsldbgInspector( const QString &name ) * The dialog will by default be modeless, unless you set 'modal' to * true to construct a modal dialog. */ -XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, QWidget* parent, +XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) + : TQDialog( parent, name, modal, fl ) { Q_CHECK_PTR(debugger); this->debugger = debugger; @@ -67,10 +67,10 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, QWidget* parent, resize( 597, 364 ); setCaption( i18n( "Xsldbg Inspector" ) ); setSizeGripEnabled( true ); - XsldbgInspectorLayout = new QGridLayout( this, 1, 1, 11, 6, + XsldbgInspectorLayout = new TQGridLayout( this, 1, 1, 11, 6, "XsldbgInspectorLayout"); - tabWidget = new QTabWidget( this, "tabWidget" ); + tabWidget = new TQTabWidget( this, "tabWidget" ); Q_CHECK_PTR( tabWidget ); breakpointWidget = new XsldbgBreakpointsImpl( debugger, tabWidget ); Q_CHECK_PTR( breakpointWidget ); @@ -79,41 +79,41 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, QWidget* parent, localWidget = new XsldbgLocalVariablesImpl( debugger, tabWidget ); Q_CHECK_PTR( localWidget ); tabWidget->insertTab( localWidget, - QIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_source.png" ) ), + TQIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_source.png" ) ), i18n( "Variables" ) ); callStackWidget = new XsldbgCallStackImpl( debugger, tabWidget ); Q_CHECK_PTR( callStackWidget ); tabWidget->insertTab( callStackWidget, - QIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_source.png" ) ), + TQIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_source.png" ) ), i18n( "CallStack" )); templateWidget = new XsldbgTemplatesImpl( debugger, tabWidget ); Q_CHECK_PTR( templateWidget ); tabWidget->insertTab( templateWidget, - QIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_source.png" ) ), + TQIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_source.png" ) ), i18n( "Templates" )); sourceWidget = new XsldbgSourcesImpl( debugger, tabWidget ); Q_CHECK_PTR( sourceWidget ); tabWidget->insertTab( sourceWidget, - QIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_source.png" ) ), + TQIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_source.png" ) ), i18n( "Sources" )); entityWidget = new XsldbgEntitiesImpl( debugger, tabWidget ); Q_CHECK_PTR( entityWidget ); tabWidget->insertTab( entityWidget, - QIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_data.png" ) ), + TQIconSet( uic_load_pixmap_XsldbgInspector( "xsldbg_data.png" ) ), i18n( "Entities" )); XsldbgInspectorLayout->addWidget( tabWidget, 0, 1 ); - Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); + Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); buttonHelp = new KPushButton( KStdGuiItem::help(), this, "buttonHelp" ); buttonHelp->setAccel( 4144 ); buttonHelp->setAutoDefault( true ); Layout1->addWidget( buttonHelp ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); Layout1->addItem( spacer ); buttonOk = new KPushButton( KStdGuiItem::ok(), this, "buttonOk" ); @@ -123,15 +123,15 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, QWidget* parent, Layout1->addWidget( buttonOk ); buttonApply = new KPushButton( KStdGuiItem::apply(), this, "buttonApply" ); - QToolTip::add(buttonApply, i18n("Apply changes to xsldbg after restarting execution")); + TQToolTip::add(buttonApply, i18n("Apply changes to xsldbg after restarting execution")); buttonApply->setAccel( 0 ); buttonApply->setAutoDefault( true ); buttonApply->setDefault( true ); Layout1->addWidget( buttonApply ); - buttonRefresh = new QPushButton( this, "buttonRefresh" ); + buttonRefresh = new TQPushButton( this, "buttonRefresh" ); buttonRefresh->setText( i18n( "&Refresh" ) ); - QToolTip::add(buttonRefresh, i18n("Refresh values in inspectors from xsldbg")); + TQToolTip::add(buttonRefresh, i18n("Refresh values in inspectors from xsldbg")); buttonRefresh->setAccel( 0 ); buttonRefresh->setAutoDefault( true ); buttonRefresh->setDefault( true ); @@ -145,10 +145,10 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, QWidget* parent, XsldbgInspectorLayout->addMultiCellLayout( Layout1, 1, 1, 0, 1 ); // signals and slots connections - connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( buttonApply, SIGNAL ( clicked() ), this, SLOT ( update() ) ); - connect( buttonRefresh, SIGNAL ( clicked() ), this, SLOT ( refresh() ) ); - connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); + 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() ) ); hide(); } @@ -165,12 +165,12 @@ XsldbgInspector::~XsldbgInspector() void XsldbgInspector::accept() { - QDialog::accept(); + TQDialog::accept(); } void XsldbgInspector::reject() { - QDialog::reject(); + TQDialog::reject(); } diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.h b/kxsldbg/kxsldbgpart/xsldbginspector.h index c879af58..3b69a9e0 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.h +++ b/kxsldbg/kxsldbgpart/xsldbginspector.h @@ -8,8 +8,8 @@ #ifndef XSLDBGINSPECTOR_H #define XSLDBGINSPECTOR_H -#include -#include +#include +#include class QVBoxLayout; class QHBoxLayout; class QGridLayout; @@ -33,14 +33,14 @@ class XsldbgInspector : public QDialog Q_OBJECT public: - XsldbgInspector( XsldbgDebugger *debugger, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~XsldbgInspector(); - QTabWidget* tabWidget; + TQTabWidget* tabWidget; KPushButton* buttonHelp; KPushButton* buttonOk; KPushButton* buttonApply; - QPushButton* buttonRefresh; + TQPushButton* buttonRefresh; KPushButton* buttonCancel; @@ -53,8 +53,8 @@ public slots: protected: - QGridLayout* XsldbgInspectorLayout; - QHBoxLayout* Layout1; + TQGridLayout* XsldbgInspectorLayout; + TQHBoxLayout* Layout1; XsldbgDebugger *debugger; XsldbgBreakpointsImpl *breakpointWidget; XsldbgLocalVariablesImpl *localWidget; diff --git a/kxsldbg/kxsldbgpart/xsldbglistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglistitem.cpp index 9242994f..c04bc7b4 100644 --- a/kxsldbg/kxsldbgpart/xsldbglistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglistitem.cpp @@ -17,16 +17,16 @@ #include "xsldbglistitem.h" -XsldbgListItem::XsldbgListItem(QListView *parent, int columnOffset, - const QString & fileName, int lineNumber) - : QListViewItem(parent) +XsldbgListItem::XsldbgListItem(TQListView *parent, int columnOffset, + const TQString & fileName, int lineNumber) + : TQListViewItem(parent) { this->fileName = fileName; this->lineNumber = lineNumber; setText(columnOffset, fileName); /* we may not have a line number column so skip it if needed */ if ((listView()->columns() >= columnOffset + 1) && (lineNumber != -1)) - setText(columnOffset + 1, QString::number(lineNumber)); + setText(columnOffset + 1, TQString::number(lineNumber)); } XsldbgListItem::~XsldbgListItem() @@ -34,7 +34,7 @@ XsldbgListItem::~XsldbgListItem() } -QString XsldbgListItem::getFileName() const +TQString XsldbgListItem::getFileName() const { return fileName; } diff --git a/kxsldbg/kxsldbgpart/xsldbglistitem.h b/kxsldbg/kxsldbgpart/xsldbglistitem.h index 35ad39c7..0d8ac6a7 100644 --- a/kxsldbg/kxsldbgpart/xsldbglistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbglistitem.h @@ -24,21 +24,21 @@ */ -#include +#include -class XsldbgListItem : public QListViewItem { +class XsldbgListItem : public TQListViewItem { public: /** column offset is the index of the fileName column */ - XsldbgListItem(QListView *parent, int columnOffset, - const QString &fileName, int lineNumber); + XsldbgListItem(TQListView *parent, int columnOffset, + const TQString &fileName, int lineNumber); ~XsldbgListItem(); - QString getFileName() const; + TQString getFileName() const; int getLineNumber() const; private: - QString fileName; + TQString fileName; int lineNumber; }; diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp index ccade6ac..0d27f916 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp @@ -18,8 +18,8 @@ #include "xsldbglocallistitem.h" #include -XsldbgLocalListItem::XsldbgLocalListItem(QListView *parent, QString fileName, int lineNumber, - QString localName, QString templateContext, QString selectXPath, bool localVariable) +XsldbgLocalListItem::XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, + TQString localName, TQString templateContext, TQString selectXPath, bool localVariable) : XsldbgListItem(parent, 3, fileName, lineNumber) { varName = localName; @@ -38,17 +38,17 @@ XsldbgLocalListItem::~XsldbgLocalListItem() { } -QString XsldbgLocalListItem::getVarName() +TQString XsldbgLocalListItem::getVarName() { return varName; } -QString XsldbgLocalListItem::getContextName() +TQString XsldbgLocalListItem::getContextName() { return contextName; } -QString XsldbgLocalListItem::getXPath() +TQString XsldbgLocalListItem::getXPath() { return XPath; } diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.h b/kxsldbg/kxsldbgpart/xsldbglocallistitem.h index ee72ab1a..81c815e1 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.h @@ -26,25 +26,25 @@ class XsldbgLocalListItem : public XsldbgListItem { public: - XsldbgLocalListItem(QListView *parent, QString fileName, int lineNumber, - QString localName, QString templateContext, QString selectXPath, bool localVariable); + XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, + TQString localName, TQString templateContext, TQString selectXPath, bool localVariable); ~XsldbgLocalListItem(); /** return the name of this variable */ - QString getVarName(); + TQString getVarName(); /** return the template context for this variable */ - QString getContextName(); + TQString getContextName(); /** return the XPath for this variable */ - QString getXPath(); + TQString getXPath(); bool isLocalVariable(); private: - QString varName; - QString contextName; - QString XPath; + TQString varName; + TQString contextName; + TQString XPath; bool localVar; }; diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp index bd39fcc8..fa8c756b 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #include "xsldbglocalvariablesimpl.h" #include "xsldbglocallistitem.h" @@ -27,18 +27,18 @@ XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0*/, const char *name /*=0*/) + TQWidget *parent /*=0*/, const char *name /*=0*/) : XsldbgLocalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, SIGNAL(variableItem(QString /*name */, QString /* templateContext*/, - QString /* fileName */, int /*lineNumber */, - QString /* select XPath */, int /* is it a local variable */)), - this, SLOT(slotProcVariableItem(QString /*name */, QString /* templateContext*/, - QString /* fileName */, int /*lineNumber */, - QString /* select XPath */, int /* is it a local variable */))); - connect(varsListView, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(selectionChanged(QListViewItem*))); + connect(debugger, TQT_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*/, + TQString /* fileName */, int /*lineNumber */, + TQString /* select XPath */, int /* is it a local variable */))); + connect(varsListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQT_SLOT(selectionChanged(TQListViewItem*))); show(); } @@ -48,9 +48,9 @@ XsldbgLocalVariablesImpl::~XsldbgLocalVariablesImpl() debugger = 0L; } -void XsldbgLocalVariablesImpl::slotProcVariableItem(QString name , QString templateContext, - QString fileName, int lineNumber, - QString selectXPath, int localVariable) +void XsldbgLocalVariablesImpl::slotProcVariableItem(TQString name , TQString templateContext, + TQString fileName, int lineNumber, + TQString selectXPath, int localVariable) { if (!name.isNull()){ @@ -60,7 +60,7 @@ void XsldbgLocalVariablesImpl::slotProcVariableItem(QString name , QString templ } -void XsldbgLocalVariablesImpl::selectionChanged(QListViewItem *item) +void XsldbgLocalVariablesImpl::selectionChanged(TQListViewItem *item) { XsldbgLocalListItem *localItem = dynamic_cast(item); if (localItem){ diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h index 0f05b0ef..aa0156ee 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h @@ -31,18 +31,18 @@ class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialo Q_OBJECT public: - XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgLocalVariablesImpl(); public slots: - /** Process request to add local varaible to view, First parameter is QString::null + /** Process request to add local varaible to view, First parameter is TQString::null to indicate start of local variable list notfication */ - void slotProcVariableItem(QString /*name */, QString /* templateContext*/, - QString /* fileName */, int /*lineNumber */, - QString /* select XPath */, int /* is it a local variable */); + void slotProcVariableItem(TQString /*name */, TQString /* templateContext*/, + TQString /* fileName */, int /*lineNumber */, + TQString /* select XPath */, int /* is it a local variable */); - void selectionChanged(QListViewItem *item); + void selectionChanged(TQListViewItem *item); /** refresh data from source */ void refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h index a801d49b..1c605e7e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h @@ -15,16 +15,16 @@ */ #include "xsldbgmsgdialog.h" -#include +#include class XsldbgMsgDialogImpl : public XsldbgMsgDialog { public: - XsldbgMsgDialogImpl(QWidget *parent, - QMessageBox::Icon icon, - const QString & title, const QString &msg); + XsldbgMsgDialogImpl(TQWidget *parent, + TQMessageBox::Icon icon, + const TQString & title, const TQString &msg); - void append(const QString &text); + void append(const TQString &text); }; #endif diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp index 6284ddec..72e25fb3 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp @@ -21,11 +21,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #if QT_VERSION >= 300 #include "xsldbgmsgdialogimpl.h" @@ -34,9 +34,9 @@ #endif -XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(QWidget *parent, - QMessageBox::Icon icon, - const QString &title, const QString &msg) +XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(TQWidget *parent, + TQMessageBox::Icon icon, + const TQString &title, const TQString &msg) #if QT_VERSION >= 300 : XsldbgMsgDialog(parent, "XsldbgMsgDialogImpl" , TRUE ) #else @@ -45,13 +45,13 @@ XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(QWidget *parent, { setCaption(title); - QMessageBox tmpMsg; + TQMessageBox tmpMsg; tmpMsg.setIcon(icon); msgTextEdit->setText(msg); iconLbl->setPixmap(*tmpMsg.iconPixmap()); } -void XsldbgMsgDialogImpl::append(const QString &text) +void XsldbgMsgDialogImpl::append(const TQString &text) { msgTextEdit->append(text); } @@ -62,12 +62,12 @@ void XsldbgMsgDialogImpl::append(const QString &text) #include "xsldbgoutputview.h" -XsldbgOutputView::XsldbgOutputView(QWidget * parent) - : QTextEdit(parent, "outputview") +XsldbgOutputView::XsldbgOutputView(TQWidget * parent) + : TQTextEdit(parent, "outputview") { - new QBoxLayout(this, QBoxLayout::TopToBottom); - setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)); - setMinimumSize(QSize(500, 80)); + new TQBoxLayout(this, TQBoxLayout::TopToBottom); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); + setMinimumSize(TQSize(500, 80)); setCaption(i18n("xsldbg Output")); setText(i18n("\t\txsldbg output capture ready\n\n")); dlg = 0L; @@ -79,12 +79,12 @@ XsldbgOutputView::XsldbgOutputView(QWidget * parent) #include "xsldbgoutputview2.h" -XsldbgOutputView::XsldbgOutputView(QWidget * parent) - : QTextView(parent, "outputview") +XsldbgOutputView::XsldbgOutputView(TQWidget * parent) + : TQTextView(parent, "outputview") { - new QBoxLayout(this, QBoxLayout::TopToBottom); - setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)); - setMinimumSize(QSize(500,80)); + new TQBoxLayout(this, TQBoxLayout::TopToBottom); + setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); + setMinimumSize(TQSize(500,80)); setCaption(i18n("xsldbg Output")); setText(i18n("\t\txsldbg output capture ready\n\n")); dlg = 0L; @@ -92,15 +92,15 @@ XsldbgOutputView::XsldbgOutputView(QWidget * parent) } #endif // QT_VERSION -void XsldbgOutputView::slotProcShowMessage(QString msg) +void XsldbgOutputView::slotProcShowMessage(TQString msg) { bool processed = FALSE; // Is this a result of an evaluate command - if ((msg[0] == QChar('=')) && (msg[1] == QChar(' '))){ - int endPosition = msg.find(QChar('\n')); + if ((msg[0] == TQChar('=')) && (msg[1] == TQChar(' '))){ + int endPosition = msg.find(TQChar('\n')); if (endPosition >= 0){ processed = TRUE; - showDialog(QMessageBox::Information, i18n("Result of evaluation"), + showDialog(TQMessageBox::Information, i18n("Result of evaluation"), msg.mid(endPosition + 1)); } }else /* Is there some sort of error message in msg */ @@ -117,7 +117,7 @@ void XsldbgOutputView::slotProcShowMessage(QString msg) (msg.find("Error: No XML data file supplied") == -1) && (msg.find("Load of source deferred") == -1) && (msg.find("Load of data deferred") == -1) ) - showDialog(QMessageBox::Warning, i18n("Request Failed "), + showDialog(TQMessageBox::Warning, i18n("Request Failed "), msg); processed = TRUE; } @@ -133,8 +133,8 @@ void XsldbgOutputView::slotClearView() { } -void XsldbgOutputView::showDialog(QMessageBox::Icon icon, QString title, - QString msg) +void XsldbgOutputView::showDialog(TQMessageBox::Icon icon, TQString title, + TQString msg) { if ( dlg ){ diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.h b/kxsldbg/kxsldbgpart/xsldbgoutputview.h index 547ca907..0ae11fec 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.h +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.h @@ -21,23 +21,23 @@ /** *@author Keith Isdale */ -#include -#include +#include +#include class QDialog; class XsldbgMsgDialogImpl; -class XsldbgOutputView : public QTextEdit { +class XsldbgOutputView : public TQTextEdit { Q_OBJECT public : - XsldbgOutputView(QWidget *parent = 0); + XsldbgOutputView(TQWidget *parent = 0); - void showDialog(QMessageBox::Icon icon, QString title, QString msg); + void showDialog(TQMessageBox::Icon icon, TQString title, TQString msg); public slots: /** Process a copy of mesage sent to message window */ - void slotProcShowMessage(QString msg); + void slotProcShowMessage(TQString msg); /** Clear message view window of its text */ void slotClearView(); diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp index 1c0528f0..f291ab6d 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include -#include +#include +#include #include "xsldbgsourcesimpl.h" #include "xsldbgdebugger.h" @@ -24,15 +24,15 @@ XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0*/, const char *name /*=0*/) + TQWidget *parent /*=0*/, const char *name /*=0*/) : XsldbgSources(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, SIGNAL(sourceItem(QString /* fileName */, QString /* parentFileName */, int /*lineNumber */)), - this, SLOT(slotProcSourceItem(QString /* fileName */, QString /* parentFileName */, int /*lineNumber */))); + connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), + this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */))); - connect( sourceListView, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(selectionChanged(QListViewItem*))); + connect( sourceListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQT_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); @@ -42,7 +42,7 @@ XsldbgSourcesImpl::~XsldbgSourcesImpl(){ debugger = 0L; } -void XsldbgSourcesImpl::slotProcSourceItem(QString fileName , QString parentFileName , int lineNumber ) +void XsldbgSourcesImpl::slotProcSourceItem(TQString fileName , TQString parentFileName , int lineNumber ) { if (fileName.isNull()){ sourceListView->clear(); @@ -53,7 +53,7 @@ void XsldbgSourcesImpl::slotProcSourceItem(QString fileName , QString parentFi } -void XsldbgSourcesImpl::selectionChanged(QListViewItem *item) +void XsldbgSourcesImpl::selectionChanged(TQListViewItem *item) { XsldbgGlobalListItem *sourceItem = dynamic_cast(item); if (sourceItem){ diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h index b8afe34e..7b805de4 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h @@ -31,15 +31,15 @@ class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase { Q_OBJECT public: - XsldbgSourcesImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgSourcesImpl(); public slots: - void selectionChanged(QListViewItem *item); + void selectionChanged(TQListViewItem *item); - /** Process request to add source to view, First parameter is QString::null + /** Process request to add source to view, First parameter is TQString::null to indicate start of source list notfication */ - void slotProcSourceItem(QString fileName , QString parentFileName , int lineNumber ); + void slotProcSourceItem(TQString fileName , TQString parentFileName , int lineNumber ); /** refresh data from source */ void refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp index 8c58b9fc..cd07e89e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp @@ -17,8 +17,8 @@ #include "xsldbgtemplatelistitem.h" -XsldbgTemplateListItem::XsldbgTemplateListItem(QListView *parent, - QString fileName, int lineNumber, QString templateName, QString modeName) +XsldbgTemplateListItem::XsldbgTemplateListItem(TQListView *parent, + TQString fileName, int lineNumber, TQString templateName, TQString modeName) : XsldbgListItem(parent, 2, fileName, lineNumber) { this->templateName = templateName; diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h index 5a10a6ff..e1c0a8b6 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h @@ -25,19 +25,19 @@ class XsldbgTemplateListItem : public XsldbgListItem { public: - XsldbgTemplateListItem(QListView *parent, - QString fileName, int lineNumber, QString templateName, QString modeName); + XsldbgTemplateListItem(TQListView *parent, + TQString fileName, int lineNumber, TQString templateName, TQString modeName); ~XsldbgTemplateListItem(); /** return the name of this template */ - QString getTemplateName(); + TQString getTemplateName(); /** return the mode of this template */ - QString getModeName(); + TQString getModeName(); private: - QString templateName; - QString modeName; + TQString templateName; + TQString modeName; }; diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp index ebc25bee..66cb9227 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp @@ -14,23 +14,23 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include +#include +#include #include "xsldbgdebugger.h" #include "xsldbgtemplatesimpl.h" #include "xsldbgtemplatelistitem.h" XsldbgTemplatesImpl::XsldbgTemplatesImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0*/, const char *name /*=0*/) + TQWidget *parent /*=0*/, const char *name /*=0*/) : XsldbgTemplates(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, SIGNAL(templateItem(QString /* name*/, QString /*mode*/, QString /* fileName */, int /* lineNumber */)), - this, SLOT(slotProcTemplateItem(QString /* name*/, QString /*mode*/, QString /* fileName */, int /* lineNumber */))); - connect( templatesListView, SIGNAL(selectionChanged(QListViewItem *)), - this, SLOT(selectionChanged(QListViewItem*))); + 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*))); show(); } @@ -40,7 +40,7 @@ XsldbgTemplatesImpl::~XsldbgTemplatesImpl(){ } -void XsldbgTemplatesImpl::slotProcTemplateItem(QString name, QString mode, QString fileName , int lineNumber ) +void XsldbgTemplatesImpl::slotProcTemplateItem(TQString name, TQString mode, TQString fileName , int lineNumber ) { if (name.isNull()) templatesListView->clear(); @@ -50,7 +50,7 @@ void XsldbgTemplatesImpl::slotProcTemplateItem(QString name, QString mode, QStr } -void XsldbgTemplatesImpl::selectionChanged(QListViewItem *item) +void XsldbgTemplatesImpl::selectionChanged(TQListViewItem *item) { XsldbgTemplateListItem *templateItem = dynamic_cast(item); if (templateItem){ diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h index 1a9705fe..6d06cb6b 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h @@ -33,15 +33,15 @@ class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase { Q_OBJECT public: - XsldbgTemplatesImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgTemplatesImpl(); public slots: - void selectionChanged(QListViewItem *item); + void selectionChanged(TQListViewItem *item); - /** Process request to add template to view, First parameter is QString::null + /** Process request to add template to view, First parameter is TQString::null to indicate start of template list notfication */ - void slotProcTemplateItem(QString name, QString mode, QString fileName , int lineNumber ); + void slotProcTemplateItem(TQString name, TQString mode, TQString fileName , int lineNumber ); /** refresh data from source */ void refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp index 376fbfb7..58497cea 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp @@ -15,13 +15,13 @@ * * ************************************************************************************/ -#include +#include #include "xsldbgdebugger.h" #include "xsldbgwalkspeedimpl.h" XsldbgWalkSpeedImpl::XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, - QWidget *parent /*=0 */, const char *name /*=0*/ ) + TQWidget *parent /*=0 */, const char *name /*=0*/ ) : XsldbgWalkSpeed(parent, name, false) { this->debugger = debugger; diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h index dafe86d7..e0cbe69e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h @@ -30,7 +30,7 @@ class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed { Q_OBJECT public: - XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, QWidget *parent=0, const char *name=0); + XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); ~XsldbgWalkSpeedImpl(); public slots: diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp index 23f6bb0b..bcc1852e 100644 --- a/kxsldbg/xsldbgmain.cpp +++ b/kxsldbg/xsldbgmain.cpp @@ -121,11 +121,11 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("kxsldbg"); // Translations come from KXSLDbg's catalog - QString xsldbgRunTimeInfo(i18n("Using libxml %1, libxslt %2 and libexslt %3\n").arg(xmlParserVersion).arg(xsltEngineVersion).arg(exsltLibraryVersion)); - QString libxmlCompileTimeInfo(i18n("xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n").arg(LIBXML_VERSION).arg(LIBXSLT_VERSION).arg(LIBEXSLT_VERSION)); - QString libxsltCompileTimeInfo(i18n("libxslt %1 was compiled against libxml %2\n").arg(xsltLibxsltVersion).arg(xsltLibxmlVersion)); - QString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").arg(exsltLibexsltVersion).arg(exsltLibxmlVersion)); - QString freeFormText = xsldbgRunTimeInfo + libxmlCompileTimeInfo + libxsltCompileTimeInfo + libexsltCompileTimeInfo; + TQString xsldbgRunTimeInfo(i18n("Using libxml %1, libxslt %2 and libexslt %3\n").arg(xmlParserVersion).arg(xsltEngineVersion).arg(exsltLibraryVersion)); + TQString libxmlCompileTimeInfo(i18n("xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n").arg(LIBXML_VERSION).arg(LIBXSLT_VERSION).arg(LIBEXSLT_VERSION)); + TQString libxsltCompileTimeInfo(i18n("libxslt %1 was compiled against libxml %2\n").arg(xsltLibxsltVersion).arg(xsltLibxmlVersion)); + TQString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").arg(exsltLibexsltVersion).arg(exsltLibxmlVersion)); + TQString freeFormText = xsldbgRunTimeInfo + libxmlCompileTimeInfo + libxsltCompileTimeInfo + libexsltCompileTimeInfo; KAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, KAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText, 0, "k_isdale@tpg.com.au"); about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" ); -- cgit v1.2.3