From a2bae01d006ea8053e85bc16d09a8cf40a4b0b75 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 17 Jun 2011 03:03:11 +0000 Subject: Fix kdewebdev FTBFS under Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kxsldbg/kxsldbgpart/kxsldbg_part.cpp | 20 ++++++++++---------- kxsldbg/kxsldbgpart/kxsldbg_part.h | 6 +++--- kxsldbg/kxsldbgpart/qxsldbgdoc.cpp | 28 ++++++++++++++-------------- kxsldbg/kxsldbgpart/qxsldbgdoc.h | 6 +++--- kxsldbg/kxsldbgpart/xsldbgdocmap.h | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) (limited to 'kxsldbg/kxsldbgpart') diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index 7ee2e26c..735653c5 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -284,7 +284,7 @@ bool KXsldbgPart::openURL(const KURL &url) { bool result = fetchURL(url); if (result){ - TQXsldbgDoc *docPtr = docDictionary[url.prettyURL()]; + QXsldbgDoc *docPtr = docDictionary[url.prettyURL()]; if (docPtr && docPtr->kateView()){ if (docPtr != currentDoc){ currentDoc = docPtr; @@ -305,9 +305,9 @@ bool KXsldbgPart::openURL(const KURL &url) bool KXsldbgPart::fetchURL(const KURL &url) { TQString docID = url.prettyURL(); - TQXsldbgDoc *docPtr = docDictionary[docID]; + QXsldbgDoc *docPtr = docDictionary[docID]; if (!docPtr){ - docPtr = new TQXsldbgDoc(mainView, url); + docPtr = new QXsldbgDoc(mainView, url); docDictionary.insert(docID, docPtr); if (docPtr->kateView()){ mainView->addWidget(docPtr->kateView()); @@ -582,8 +582,8 @@ void KXsldbgPart::refreshCmd_activated() { if ( !currentFileName.isEmpty() ){ - TQDictIterator it(docDictionary); - TQXsldbgDoc *docPtr; + TQDictIterator it(docDictionary); + QXsldbgDoc *docPtr; while (it.current()){ docPtr = it.current(); docPtr->refresh(); @@ -650,8 +650,8 @@ KXsldbgPart::lineNoChanged(TQString fileName, int lineNumber, bool breakpoint) openURL(fileName); - TQXsldbgDoc *docPtr; - TQDictIterator it(docDictionary); + QXsldbgDoc *docPtr; + TQDictIterator it(docDictionary); while (it.current()){ docPtr = it.current(); // cause all Execution and BreakpointReached marks to be cleared @@ -812,8 +812,8 @@ void KXsldbgPart::breakpointItem(TQString fileName, int lineNumber , if (fileName == 0L){ /* Go through all documents and remove all breakpoints */ - TQDictIterator it(docDictionary); - TQXsldbgDoc *docPtr; + TQDictIterator it(docDictionary); + QXsldbgDoc *docPtr; while (it.current()){ docPtr = it.current(); docPtr->clearMarks(true); @@ -834,7 +834,7 @@ void KXsldbgPart::breakpointItem(TQString fileName, int lineNumber , KURL temp(fileName); fileName = temp.prettyURL(); fetchURL(fileName); - TQXsldbgDoc *docPtr = docDictionary[fileName] ; + QXsldbgDoc *docPtr = docDictionary[fileName] ; if (docPtr){ docPtr->addBreakPoint(lineNumber - 1, enabled); }else { diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h index f33ae05f..d742fb59 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.h +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h @@ -25,7 +25,7 @@ class TQDockWindow; class TQWidgetStack; class XsldbgBrkStatusView; -class TQXsldbgDoc; +class QXsldbgDoc; class XsldbgOutputView; class XsldbgConfigImpl; @@ -35,7 +35,7 @@ class KURL; class TQMultiLineEdit; class KAboutData; -typedef TQDict XsldbgDocDict; +typedef TQDict XsldbgDocDict; /** * This is a "Part". It that does all the real work in a KPart @@ -151,7 +151,7 @@ protected slots: void fileOpen(); private: - TQXsldbgDoc *currentDoc; + QXsldbgDoc *currentDoc; TQWidgetStack *mainView; TQPushButton *xPathBtn, *searchBtn, *evaluateBtn; diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index c57dd521..690847e8 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -14,14 +14,14 @@ #include -TQXsldbgDoc::TQXsldbgDoc(TQWidget *tqparent, KURL url) - : TQObject(0L, "TQXsldbgDoc"), kDoc(0L),kView(0L), locked(false) +QXsldbgDoc::QXsldbgDoc(TQWidget *tqparent, KURL url) + : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); connect(kDoc, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(lockDoc())); connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); if (kDoc){ - kView = kDoc->createView(tqparent, "TQXsldbgDocView"); + kView = kDoc->createView(tqparent, "QXsldbgDocView"); KURL cleanUrl; // convert paths relative to PWD into a absolute path TQString relUrl = url.prettyURL(); @@ -37,7 +37,7 @@ TQXsldbgDoc::TQXsldbgDoc(TQWidget *tqparent, KURL url) } -TQXsldbgDoc::~TQXsldbgDoc() +QXsldbgDoc::~QXsldbgDoc() { if (kDoc){ if (kDoc->views().count() == 1){ @@ -47,7 +47,7 @@ TQXsldbgDoc::~TQXsldbgDoc() } } -void TQXsldbgDoc::slotResult( KIO::Job *job ) +void QXsldbgDoc::slotResult( KIO::Job *job ) { if ( job->error() != 0 ){ }else{ @@ -55,7 +55,7 @@ void TQXsldbgDoc::slotResult( KIO::Job *job ) emit docChanged(); } -KURL TQXsldbgDoc::url() const +KURL QXsldbgDoc::url() const { if (kDoc) return kDoc->url(); @@ -63,7 +63,7 @@ KURL TQXsldbgDoc::url() const return KURL(); } -void TQXsldbgDoc::refresh() +void QXsldbgDoc::refresh() { if (kDoc){ KURL lastUrl = kDoc->url(); @@ -73,7 +73,7 @@ void TQXsldbgDoc::refresh() } -void TQXsldbgDoc::enableBreakPoint(uint lineNumber, bool state) +void QXsldbgDoc::enableBreakPoint(uint lineNumber, bool state) { if (locked) return; @@ -88,7 +88,7 @@ void TQXsldbgDoc::enableBreakPoint(uint lineNumber, bool state) } } -void TQXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled) +void QXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled) { if (locked) return; @@ -102,7 +102,7 @@ void TQXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled) } } -void TQXsldbgDoc::deleteBreakPoint(uint lineNumber) +void QXsldbgDoc::deleteBreakPoint(uint lineNumber) { if (locked) return; @@ -113,7 +113,7 @@ void TQXsldbgDoc::deleteBreakPoint(uint lineNumber) } -void TQXsldbgDoc::clearMarks(bool allMarkTypes) +void QXsldbgDoc::clearMarks(bool allMarkTypes) { if (locked) return; @@ -134,7 +134,7 @@ void TQXsldbgDoc::clearMarks(bool allMarkTypes) } -void TQXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint) +void QXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint) { if (locked) return; @@ -150,12 +150,12 @@ void TQXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint) } } -void TQXsldbgDoc::lockDoc() +void QXsldbgDoc::lockDoc() { locked = true; } -void TQXsldbgDoc::unlockDoc() +void QXsldbgDoc::unlockDoc() { locked = false; } diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index 0f19da1b..07f5e4fc 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -16,14 +16,14 @@ #include #include -class TQXsldbgDoc : public TQObject { +class QXsldbgDoc : public TQObject { Q_OBJECT TQ_OBJECT public: - TQXsldbgDoc(TQWidget *tqparent=0, KURL url=TQString()); - ~TQXsldbgDoc(); + QXsldbgDoc(TQWidget *tqparent=0, KURL url=TQString()); + ~QXsldbgDoc(); void enableBreakPoint(uint lineNumber, bool state); void addBreakPoint(uint lineNumber, bool enabled); diff --git a/kxsldbg/kxsldbgpart/xsldbgdocmap.h b/kxsldbg/kxsldbgpart/xsldbgdocmap.h index 6310b711..22edd94e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdocmap.h +++ b/kxsldbg/kxsldbgpart/xsldbgdocmap.h @@ -2,4 +2,4 @@ #include #include "tqxsldbgdoc.h" -typedef TQMap XsldbgDocMap; +typedef TQMap XsldbgDocMap; -- cgit v1.2.1