From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../plugins/doxygen/docdoxygenplugin.cpp | 36 +++++++++++----------- .../plugins/doxygen/docdoxygenplugin.h | 13 ++++---- 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'parts/documentation/plugins/doxygen') diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index a92eb60f..f50ceb3d 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -44,13 +44,13 @@ class DoxyDocumentationCatalogItem: public DocumentationCatalogItem { public: DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl) { } DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_origUrl(origUrl) { } TQString origUrl() const { return m_origUrl; } @@ -64,8 +64,8 @@ static const KDevPluginInfo data("docdoxygenplugin"); typedef KDevGenericFactory DocDoxygenPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) ) -DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList) - :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name) +DocDoxygenPlugin::DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList) + :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles ); autoSetup(); @@ -75,22 +75,22 @@ DocDoxygenPlugin::~DocDoxygenPlugin() { } -QPair DocDoxygenPlugin::catalogLocatorProps() +TQPair DocDoxygenPlugin::catalogLocatorProps() { - return QPair(KFile::File, "index.html *.tag"); + return TQPair(KFile::File, "index.html *.tag"); } TQString DocDoxygenPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); if (fi.extension(false) == "html") { TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQTextStream ts(&f); TQString contents = ts.read(); @@ -118,7 +118,7 @@ TQString DocDoxygenPlugin::catalogTitle(const TQString& url) return re.cap(1); } } - return TQString::null; + return TQString(); } TQString DocDoxygenPlugin::pluginName() const @@ -256,7 +256,7 @@ void DocDoxygenPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it if (!d.exists()) continue; - const QFileInfoList *dirEntries = d.entryInfoList(); + const TQFileInfoList *dirEntries = d.entryInfoList(); if (!dirEntries) continue; TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) @@ -306,7 +306,7 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) if (!d.exists()) continue; - const QFileInfoList *dirEntries = d.entryInfoList(); + const TQFileInfoList *dirEntries = d.entryInfoList(); if (!dirEntries) continue; TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) @@ -434,9 +434,9 @@ void DocDoxygenPlugin::createBookIndex(const TQString &tagfile, IndexBox* index, } void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, - DocumentationCatalogItem *item, TQDomElement &parentEl, const TQString &prefix) + DocumentationCatalogItem *item, TQDomElement &tqparentEl, const TQString &prefix) { - TQDomElement docEl = parentEl; + TQDomElement docEl = tqparentEl; TQDomElement childEl = docEl.firstChild().toElement(); while (!childEl.isNull()) @@ -450,7 +450,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, TQString filename = childEl.namedItem("filename").firstChild().toText().data(); IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname, - i18n("%1 Class Reference").arg(classname)); + i18n("%1 Class Reference").tqarg(classname)); indexItem->addURL(KURL(prefix + filename)); createIndexFromTag(dom, index, item, childEl, prefix + filename); @@ -460,14 +460,14 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index, || (childEl.attribute("kind") == "slot") || (childEl.attribute("kind") == "signal") )) { - TQString classname = parentEl.namedItem("name").firstChild().toText().data(); + TQString classname = tqparentEl.namedItem("name").firstChild().toText().data(); TQString membername = childEl.namedItem("name").firstChild().toText().data(); TQString anchor = childEl.namedItem("anchor").firstChild().toText().data(); TQString arglist = childEl.namedItem("arglist").firstChild().toText().data(); if (classname != membername) { - IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").arg(classname).arg(membername).arg(arglist)); + IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").tqarg(classname).tqarg(membername).tqarg(arglist)); indexItem->addURL(KURL(prefix + "#" + anchor)); } } diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index 8cf9ec45..d24cedb9 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -28,8 +28,9 @@ class TQDomElement; class DocDoxygenPlugin: public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDoxygenPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDoxygenPlugin(); virtual TQString pluginName() const; @@ -44,7 +45,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); @@ -52,12 +53,12 @@ public: virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type); protected: - void createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString::null, - const TQString &baseHtmlUrl = TQString::null); - void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString::null); + void createBookTOC(DocumentationItem* item, const TQString &tagUrl = TQString(), + const TQString &baseHtmlUrl = TQString()); + void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString()); void createIndexFromTag(TQDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item, - TQDomElement &parentEl, const TQString &prefix); + TQDomElement &tqparentEl, const TQString &prefix); void autoSetupDocs(const TQString &defaultDir, const TQString &searchDir, const TQString &name); -- cgit v1.2.1