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 --- parts/documentation/plugins/chm/docchmplugin.cpp | 30 ++++---- parts/documentation/plugins/chm/docchmplugin.h | 5 +- .../plugins/custom/doccustomplugin.cpp | 10 +-- .../documentation/plugins/custom/doccustomplugin.h | 4 +- .../plugins/devhelp/docdevhelpplugin.cpp | 40 +++++----- .../plugins/devhelp/docdevhelpplugin.h | 7 +- parts/documentation/plugins/djvu/docdjvuplugin.cpp | 10 +-- parts/documentation/plugins/djvu/docdjvuplugin.h | 4 +- .../plugins/doxygen/docdoxygenplugin.cpp | 36 ++++----- .../plugins/doxygen/docdoxygenplugin.h | 13 ++-- .../plugins/kdevtoc/dockdevtocplugin.cpp | 36 ++++----- .../plugins/kdevtoc/dockdevtocplugin.h | 7 +- parts/documentation/plugins/pdb/docpdbplugin.cpp | 10 +-- parts/documentation/plugins/pdb/docpdbplugin.h | 4 +- parts/documentation/plugins/pdf/docpdfplugin.cpp | 10 +-- parts/documentation/plugins/pdf/docpdfplugin.h | 4 +- parts/documentation/plugins/qt/docqtplugin.cpp | 86 +++++++++++----------- parts/documentation/plugins/qt/docqtplugin.h | 13 ++-- 18 files changed, 167 insertions(+), 162 deletions(-) (limited to 'parts/documentation/plugins') diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index e0b19de9..fb033a7f 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -38,9 +38,9 @@ static const KDevPluginInfo data("docchmplugin"); typedef KDevGenericFactory DocCHMPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) ) -DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args +DocCHMPlugin::DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList // args ) - :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles); // | Index | FullTextSearch | ProjectDocumentation autoSetup(); @@ -59,15 +59,15 @@ DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const return item; } -QPair DocCHMPlugin::catalogLocatorProps() +TQPair DocCHMPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.chm"); + return TQPair(KFile::File, "*.chm"); } TQString DocCHMPlugin::catalogTitle(const TQString& // url ) { - return TQString::null; + return TQString(); } TQString DocCHMPlugin::pluginName() const @@ -127,9 +127,9 @@ void DocCHMPlugin::createIndex(IndexBox* // index } -static KListViewItem* chainEnd(KListViewItem *parent) { - if(parent == 0) return 0; - KListViewItem* ret = dynamic_cast(parent->firstChild()); +static KListViewItem* chainEnd(KListViewItem *tqparent) { + if(tqparent == 0) return 0; + KListViewItem* ret = dynamic_cast(tqparent->firstChild()); if(ret == 0) return 0; while(ret->nextSibling() != 0) { ret = dynamic_cast(ret->nextSibling()); @@ -138,15 +138,15 @@ static KListViewItem* chainEnd(KListViewItem *parent) { } static TQString decodeHTML(const TQString& s) { - TQRegExp rx(TQString::fromLatin1("&#(\\d+);| ")); + TQRegExp rx(TQString::tqfromLatin1("&#(\\d+);| ")); TQString out = s; int pos = rx.search(out); while(pos > -1) { TQString found = rx.cap(0); if(found != " ") { - out.replace(pos, found.length(), static_cast(rx.cap(1).toInt())); + out.tqreplace(pos, found.length(), static_cast(rx.cap(1).toInt())); }else{ - out.replace(pos, found.length(), " "); + out.tqreplace(pos, found.length(), " "); } pos = rx.search(out, pos+1); } @@ -163,11 +163,11 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) items.push_back(item); for(TQStringList::Iterator it = lines.begin(); it != lines.end();) { bool ok1 = true, ok2 = true; - int parent = (*it).toInt(&ok1); + int tqparent = (*it).toInt(&ok1); ++it; int current = (*it).toInt(&ok2); ++it; - if(int(items.size()) != current || !ok1 || !ok2 || parent < 0 || parent >= int(items.size()) || current < 0 || current != int(items.size())) { + if(int(items.size()) != current || !ok1 || !ok2 || tqparent < 0 || tqparent >= int(items.size()) || current < 0 || current != int(items.size())) { kdDebug(9002) << "DocCHMPlugin::createTOC error while parsing output of ioslave" << endl; break; } @@ -178,9 +178,9 @@ void DocCHMPlugin::createTOC(DocumentationCatalogItem* item) ++it; items.push_back(new DocumentationItem( - DocumentationItem::Document, items[parent], chainEnd(items[parent]), decodeHTML(name))); + DocumentationItem::Document, items[tqparent], chainEnd(items[tqparent]), decodeHTML(name))); items[current]->setURL(url); - if(parent != 0) items[parent]->setType(DocumentationItem::Book); + if(tqparent != 0) items[tqparent]->setType(DocumentationItem::Book); } diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index ca90a978..3f069faf 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -25,15 +25,16 @@ class DocCHMPlugin :public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocCHMPlugin(TQObject* parent, const char* name, TQStringList args = TQStringList()); + DocCHMPlugin(TQObject* tqparent, const char* name, TQStringList args = TQStringList()); ~DocCHMPlugin(); virtual TQString pluginName() const; virtual void setCatalogURL(DocumentationCatalogItem* item); virtual TQString catalogTitle(const TQString& url); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index ae95aff1..47012a2b 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -32,9 +32,9 @@ static const KDevPluginInfo data("doccustomplugin"); typedef KDevGenericFactory DocCustomPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) ) -DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args +DocCustomPlugin::DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList // args ) - :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -62,14 +62,14 @@ DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, co return item; } -QPair DocCustomPlugin::catalogLocatorProps() +TQPair DocCustomPlugin::catalogLocatorProps() { - return QPair(KFile::File, "all/allfiles"); + return TQPair(KFile::File, "all/allfiles"); } TQString DocCustomPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocCustomPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h index 77bc9750..33efec8f 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.h +++ b/parts/documentation/plugins/custom/doccustomplugin.h @@ -24,7 +24,7 @@ class DocCustomPlugin : public DocumentationPlugin { public: - DocCustomPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocCustomPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocCustomPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 11c2b6a7..79106157 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -41,13 +41,13 @@ class DevHelpDocumentationCatalogItem: public DocumentationCatalogItem { public: DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile) { } DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_devHelpFile(devHelpFile) { } TQString devHelpFile() const { return m_devHelpFile; } @@ -73,9 +73,9 @@ static const KDevPluginInfo data("docdevhelpplugin"); typedef KDevGenericFactory DocDevHelpPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) ) -DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name, +DocDevHelpPlugin::DocDevHelpPlugin(TQObject* tqparent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocDevHelpPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | ProjectDocumentation); autoSetup(); @@ -90,29 +90,29 @@ DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, c return new DevHelpDocumentationCatalogItem(url, this, contents, title); } -QPair DocDevHelpPlugin::catalogLocatorProps() +TQPair DocDevHelpPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.devhelp"); + return TQPair(KFile::File, "*.devhelp"); } TQString DocDevHelpPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f)) - return TQString::null; + return TQString(); f.close(); TQDomElement docEl = doc.documentElement(); - return docEl.attribute("title", TQString::null); + return docEl.attribute("title", TQString()); } TQString DocDevHelpPlugin::pluginName() const @@ -194,7 +194,7 @@ void DocDevHelpPlugin::autoSetupPlugin() continue; scanList << dir.path(); - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; TQPtrListIterator it(*dirEntries); for (; it.current(); ++it) @@ -224,8 +224,8 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) d.setFilter(TQDir::Files); //scan for *.devhelp files - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -240,7 +240,7 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) void DocDevHelpPlugin::pushToScanStack(TQValueStack &stack, const TQString &value) { - if ( (!value.isEmpty()) && (!stack.contains(value)) ) + if ( (!value.isEmpty()) && (!stack.tqcontains(value)) ) { stack << value; kdDebug() << "Devhelp scan stack: +: " << value << endl; @@ -320,7 +320,7 @@ void DocDevHelpPlugin::createTOC(DocumentationCatalogItem* item) addTocSect(dhItem, childEl, baseUrl, true); } -void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, +void DocDevHelpPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, TQString baseUrl, bool book) { while (!childEl.isNull()) @@ -330,11 +330,11 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE TQString name = childEl.attribute("name"); TQString url = childEl.attribute("link"); - if (name.isEmpty() && url.contains("ix")) + if (name.isEmpty() && url.tqcontains("ix")) name = "Index"; DocumentationItem *item = new DocumentationItem( - book ? DocumentationItem::Book : DocumentationItem::Document, parent, name); + book ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name); item->setURL(KURL(baseUrl+"/"+url)); TQDomElement grandchildEl = childEl.lastChild().toElement(); @@ -371,7 +371,7 @@ void DocDevHelpPlugin::setCatalogURL(DocumentationCatalogItem* item) if (item->url().isEmpty()) { - KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString::null)); + KURL url(fi.dirPath(true) + "/" + docEl.attribute("link", TQString())); item->setURL(url); } } diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index 9e4df5c2..dde545d3 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -28,8 +28,9 @@ class DocDevHelpPlugin: public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocDevHelpPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDevHelpPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDevHelpPlugin(); virtual TQString pluginName() const; @@ -47,14 +48,14 @@ public: virtual TQStringList fullTextSearchLocations(); virtual void autoSetupPlugin(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual ProjectDocumentationPlugin *projectDocumentationPlugin(ProjectDocType type); protected: void pushToScanStack(TQValueStack &stack, const TQString &value); void scanDevHelpDir(const TQString &path); - void addTocSect(DocumentationItem *parent, TQDomElement childEl, TQString baseUrl, bool book=false); + void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, TQString baseUrl, bool book=false); }; #endif diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index f9761155..77997d6b 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plug typedef KDevGenericFactory DocDjvuPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) -DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), parent, name) +DocDjvuPlugin::DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocDjvuPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, cons return item; } -QPair DocDjvuPlugin::catalogLocatorProps() +TQPair DocDjvuPlugin::catalogLocatorProps() { - return QPair(KFile::File, "all/allfiles"); + return TQPair(KFile::File, "all/allfiles"); } TQString DocDjvuPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocDjvuPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h index 05689bd8..ec99e024 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.h +++ b/parts/documentation/plugins/djvu/docdjvuplugin.h @@ -24,7 +24,7 @@ class DocDjvuPlugin : public DocumentationPlugin { public: - DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocDjvuPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocDjvuPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); 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); diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index 6dd73707..5829b0bb 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -43,13 +43,13 @@ class TOCDocumentationCatalogItem: public DocumentationCatalogItem { public: TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile) { } TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_tocFile(tocFile) { } TQString tocFile() const { return m_tocFile; } @@ -63,9 +63,9 @@ static const KDevPluginInfo data("dockdevtocplugin"); typedef KDevGenericFactory DocKDevTOCPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) ) -DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name, +DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* tqparent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index); autoSetup(); @@ -85,24 +85,24 @@ DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, c return new TOCDocumentationCatalogItem(url, this, contents, title); } -QPair DocKDevTOCPlugin::catalogLocatorProps() +TQPair DocKDevTOCPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.toc"); + return TQPair(KFile::File, "*.toc"); } TQString DocKDevTOCPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f) || (doc.doctype().name() != "kdeveloptoc")) - return TQString::null; + return TQString(); f.close(); TQDomElement titleEl = doc.documentElement().namedItem("title").toElement(); @@ -159,7 +159,7 @@ void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it TQString base; if (!baseEl.isNull()) - base = baseEl.attribute("href", TQString::null); + base = baseEl.attribute("href", TQString()); TQDomElement indexEl = docEl.namedItem("index").toElement(); TQDomElement childEl = indexEl.firstChild().toElement(); @@ -204,22 +204,22 @@ void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item) TQString base; if (!baseEl.isNull()) - base = baseEl.attribute("href", TQString::null); + base = baseEl.attribute("href", TQString()); TQDomElement childEl = docEl.lastChild().toElement(); addTocSect(tocItem, childEl, base, 1); } -void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level) +void DocKDevTOCPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level) { while (!childEl.isNull()) { - if (childEl.tagName() == TQString("tocsect%1").arg(level)) + if (childEl.tagName() == TQString("tocsect%1").tqarg(level)) { TQString name = childEl.attribute("name"); TQString url = childEl.attribute("url"); - DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, parent, name); + DocumentationItem *item = new DocumentationItem(level == 1 ? DocumentationItem::Book : DocumentationItem::Document, tqparent, name); item->setURL(KURL(constructURL(base, url))); TQDomElement grandchildEl = childEl.lastChild().toElement(); @@ -259,8 +259,8 @@ void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item) if (baseEl.isNull()) item->setURL(KURL()); else - item->setURL(KURL(constructURL(baseEl.attribute("href", TQString::null), - baseEl.attribute("url", TQString::null)))); + item->setURL(KURL(constructURL(baseEl.attribute("href", TQString()), + baseEl.attribute("url", TQString())))); } } diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index 626848b9..fc980247 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -27,8 +27,9 @@ class DocKDevTOCPlugin : public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocKDevTOCPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocKDevTOCPlugin(); virtual TQString pluginName() const; @@ -43,11 +44,11 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual void autoSetupPlugin(); protected: - void addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level); + void addTocSect(DocumentationItem *tqparent, TQDomElement childEl, const TQString &base, uint level); static TQString constructURL(const TQString &base, const TQString &url) ; }; diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index 8fdc4643..17089c89 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation pl typedef KDevGenericFactory DocPDBPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) -DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), parent, name) +DocPDBPlugin::DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocPDBPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const return item; } -QPair DocPDBPlugin::catalogLocatorProps() +TQPair DocPDBPlugin::catalogLocatorProps() { - return QPair(KFile::File, "all/allfiles"); + return TQPair(KFile::File, "all/allfiles"); } TQString DocPDBPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocPDBPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h index b9544a7b..33bb5ded 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.h +++ b/parts/documentation/plugins/pdb/docpdbplugin.h @@ -24,7 +24,7 @@ class DocPDBPlugin : public DocumentationPlugin { public: - DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocPDBPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocPDBPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 79dab511..8fa76deb 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -31,8 +31,8 @@ static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin typedef KDevGenericFactory DocPDFPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) -DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args) - :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), parent, name) +DocPDFPlugin::DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args) + :DocumentationPlugin(DocPDFPluginFactory::instance()->config(), tqparent, name) { setCapabilities(CustomDocumentationTitles | ProjectUserManual); autoSetup(); @@ -59,14 +59,14 @@ DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const return item; } -QPair DocPDFPlugin::catalogLocatorProps() +TQPair DocPDFPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.pdf"); + return TQPair(KFile::File, "*.pdf"); } TQString DocPDFPlugin::catalogTitle(const TQString& /*url*/) { - return TQString::null; + return TQString(); } TQStringList DocPDFPlugin::fullTextSearchLocations() diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h index b7e8b26b..e3a9c099 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.h +++ b/parts/documentation/plugins/pdf/docpdfplugin.h @@ -24,7 +24,7 @@ class DocPDFPlugin : public DocumentationPlugin { public: - DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + DocPDFPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); ~DocPDFPlugin(); virtual TQString pluginName() const; @@ -39,7 +39,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual TQString catalogTitle(const TQString& url); virtual void autoSetupPlugin(); diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index b4118f97..5efe880f 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -37,17 +37,17 @@ #include "../../../../config.h" -class QtDocumentationCatalogItem: public DocumentationCatalogItem +class TQtDocumentationCatalogItem: public DocumentationCatalogItem { public: - QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) + TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, + KListView *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile) { } - QtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - DocumentationItem *parent, const TQString &name) - :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) + TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, + DocumentationItem *tqparent, const TQString &name) + :DocumentationCatalogItem(plugin, tqparent, name), m_dcfFile(dcfFile) { } TQString dcfFile() const { return m_dcfFile; } @@ -57,23 +57,23 @@ private: }; static const KDevPluginInfo data("docqtplugin"); -typedef KDevGenericFactory DocQtPluginFactory; -K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) ) +typedef KDevGenericFactory DocTQtPluginFactory; +K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocTQtPluginFactory(data) ) -DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList) - :DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name) +DocTQtPlugin::DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList) + :DocumentationPlugin(DocTQtPluginFactory::instance()->config(), tqparent, name) { setCapabilities(Index | FullTextSearch | CustomDocumentationTitles); autoSetup(); } -DocQtPlugin::~DocQtPlugin() +DocTQtPlugin::~DocTQtPlugin() { } -void DocQtPlugin::createTOC(DocumentationCatalogItem *item) +void DocTQtPlugin::createTOC(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast(item); if (!qtItem) return; @@ -135,32 +135,32 @@ void DocQtPlugin::createTOC(DocumentationCatalogItem *item) } } -void DocQtPlugin::autoSetupPlugin() +void DocTQtPlugin::autoSetupPlugin() { TQString qtDocDir(QT_DOCDIR); qtDocDir = URLUtil::envExpand(qtDocDir); if (qtDocDir.isEmpty()) { - qtDocDir = getenv("QTDIR"); + qtDocDir = getenv("TQTDIR"); } if (!qtDocDir.isEmpty()) { config->setGroup("Search Settings"); - config->writeEntry("Qt Reference Documentation", true); + config->writeEntry("TQt Reference Documentation", true); config->setGroup("Index Settings"); - config->writeEntry("Qt Reference Documentation", true); + config->writeEntry("TQt Reference Documentation", true); config->setGroup("Locations"); - config->writePathEntry("Qt Reference Documentation", qtDocDir + TQString("/qt.dcf")); - config->writePathEntry("Qt Assistant Manual", qtDocDir + TQString("/assistant.dcf")); - config->writePathEntry("Qt Designer Manual", qtDocDir + TQString("/designer.dcf")); - config->writePathEntry("Guide to the Qt Translation Tools", qtDocDir + TQString("/linguist.dcf")); + config->writePathEntry("TQt Reference Documentation", qtDocDir + TQString("/qt.dcf")); + config->writePathEntry("TQt Assistant Manual", qtDocDir + TQString("/assistant.dcf")); + config->writePathEntry("TQt Designer Manual", qtDocDir + TQString("/designer.dcf")); + config->writePathEntry("Guide to the TQt Translation Tools", qtDocDir + TQString("/linguist.dcf")); config->writePathEntry("qmake User Guide", qtDocDir + TQString("/qmake.dcf")); } } -void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item) +void DocTQtPlugin::setCatalogURL(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast(item); if (!qtItem) return; @@ -185,19 +185,19 @@ void DocQtPlugin::setCatalogURL(DocumentationCatalogItem *item) if (item->url().isEmpty()) { - KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString::null)); + KURL url(fi.dirPath(true) + "/" + docEl.attribute("ref", TQString())); item->setURL(url); } } -TQString DocQtPlugin::pluginName() const +TQString DocTQtPlugin::pluginName() const { - return i18n("Qt Documentation Collection"); + return i18n("TQt Documentation Collection"); } -bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) +bool DocTQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast(item); if (!qtItem) return false; @@ -213,9 +213,9 @@ bool DocQtPlugin::needRefreshIndex(DocumentationCatalogItem *item) return false; } -void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) +void DocTQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) { - QtDocumentationCatalogItem *qtItem = dynamic_cast(item); + TQtDocumentationCatalogItem *qtItem = dynamic_cast(item); if (!qtItem) return; @@ -249,10 +249,10 @@ void DocQtPlugin::createIndex(IndexBox *index, DocumentationCatalogItem *item) } } -void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, +void DocTQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, DocumentationCatalogItem *item, TQDomElement section) { - //adymo: do not load section to index for Qt reference documentation + //adymo: do not load section to index for TQt reference documentation TQString title = section.attribute("title"); if (fi.fileName() != "qt.dcf") { @@ -285,7 +285,7 @@ void DocQtPlugin::createSectionIndex(TQFileInfo &fi, IndexBox *index, Documentat } } -TQStringList DocQtPlugin::fullTextSearchLocations() +TQStringList DocTQtPlugin::fullTextSearchLocations() { TQStringList locs; @@ -306,34 +306,34 @@ TQStringList DocQtPlugin::fullTextSearchLocations() return locs; } -QPair DocQtPlugin::catalogLocatorProps() +TQPair DocTQtPlugin::catalogLocatorProps() { - return QPair(KFile::File, "*.xml *.dcf"); + return TQPair(KFile::File, "*.xml *.dcf"); } -TQString DocQtPlugin::catalogTitle(const TQString &url) +TQString DocTQtPlugin::catalogTitle(const TQString &url) { TQFileInfo fi(url); if (!fi.exists()) - return TQString::null; + return TQString(); TQFile f(url); if (!f.open(IO_ReadOnly)) - return TQString::null; + return TQString(); TQDomDocument doc; if (!doc.setContent(&f) || (doc.doctype().name() != "DCF")) - return TQString::null; + return TQString(); f.close(); TQDomElement docEl = doc.documentElement(); - return docEl.attribute("title", TQString::null); + return docEl.attribute("title", TQString()); } -DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) +DocumentationCatalogItem *DocTQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) { - return new QtDocumentationCatalogItem(url, this, contents, title); + return new TQtDocumentationCatalogItem(url, this, contents, title); } #include "docqtplugin.moc" diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index e09ce7a5..1bc1e865 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -17,20 +17,21 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef DOCQTPLUGIN_H -#define DOCQTPLUGIN_H +#ifndef DOCTQTPLUGIN_H +#define DOCTQTPLUGIN_H #include #include class KConfig; -class DocQtPlugin : public DocumentationPlugin +class DocTQtPlugin : public DocumentationPlugin { Q_OBJECT + TQ_OBJECT public: - DocQtPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); - ~DocQtPlugin(); + DocTQtPlugin(TQObject* tqparent, const char* name, const TQStringList args = TQStringList()); + ~DocTQtPlugin(); virtual TQString pluginName() const; @@ -46,7 +47,7 @@ public: virtual TQStringList fullTextSearchLocations(); - virtual QPair catalogLocatorProps(); + virtual TQPair catalogLocatorProps(); virtual TQString catalogTitle(const TQString &url); virtual void autoSetupPlugin(); -- cgit v1.2.1