branches/KDE/3.5/kdevelop/parts/documentation/plugins/doxygen

[Andras Mantia]

SVN commit 451274 by amantia:

Search recursively for doxygen tag files (now also for the Index view). The index cache ($KDEHOME/share/apps/kdevdocumentation/index) must be removed otherwise it doesn't find the new entries...

CCMAIL: kdevelop-devel at kdevelop.org

 M  +21 -15    docdoxygenplugin.cpp  


--- branches/KDE/3.5/kdevelop/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp #451273:451274
@@ -384,25 +384,31 @@
     kdDebug() << tagfile << endl;
     if (!QFile::exists(tagName))
         return;
+    QString prefix = baseHtmlUrl.isEmpty() ? KURL(tagfile).directory(false) + "html/" : baseHtmlUrl;
     
-    QFile f(tagName);
-    if (!f.open(IO_ReadOnly))
-    {
-        kdDebug(9002) << "Could not open tag file: " << f.name() << endl;
-        return;
-    }
+    QStringList tagFileList = tagFiles(QFileInfo(tagName).dirPath() + "/");
 
-    QDomDocument dom;
-    if (!dom.setContent(&f) || dom.documentElement().nodeName() != "tagfile")
+    QStringList::ConstIterator end = tagFileList.constEnd();
+    for (QStringList::ConstIterator it = tagFileList.constBegin(); it != end; ++it)
     {
-        kdDebug(9002) << "No valid tag file" << endl;
-        return;
-    }
-    f.close();
+        QFile f(*it);
+        if (!f.open(IO_ReadOnly))
+        {
+            kdDebug(9002) << "Could not open tag file: " << f.name() << endl;
+            return;
+        }
 
-    QDomElement docEl = dom.documentElement();
-    QString prefix = baseHtmlUrl.isEmpty() ? KURL(tagfile).directory(false) + "html/" : baseHtmlUrl;
-    createIndexFromTag(dom, index, item, docEl, prefix);
+        QDomDocument dom;
+        if (!dom.setContent(&f) || dom.documentElement().nodeName() != "tagfile")
+        {
+            kdDebug(9002) << "No valid tag file" << endl;
+            return;
+        }
+        f.close();
+
+        QDomElement docEl = dom.documentElement();
+        createIndexFromTag(dom, index, item, docEl, prefix);
+  }
 }
 
 void DocDoxygenPlugin::createIndexFromTag(QDomDocument &dom, IndexBox *index,