Release-1.4.2-20050508

1 files changed, 36 insertions, 1 deletions

diff --git a/src/classdef.cpp b/src/classdef.cpp
index 35b976a..4aed1ee 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1034,6 +1034,30 @@ void ClassDef::writeDocumentation(OutputList &ol)
   addGroupListToTitle(ol,this);
   endTitle(ol,getOutputFileBase(),name());
 
+  {
+    ol.pushGeneratorState();
+    ol.disableAllBut(OutputGenerator::Html);
+    ol.writeString("<!-- doxytag: class=<");
+    ol.docify(name());
+    ol.writeString("> -->");
+    if (m_inherits->count()>0)
+    {
+      BaseClassListIterator bli(*m_inherits);
+      ol.writeString("<!-- doxytag: inherits=<");
+      BaseClassDef *bcd=0;
+      bool first=TRUE;
+      for (bli.toFirst();(bcd=bli.current());++bli)
+      {
+        if (!first) ol.writeString(",");
+        ol.docify(bcd->classDef->name());
+        first=FALSE;
+      }
+      ol.writeString("> -->");
+    }
+    ol.popGeneratorState();
+  }
+
+
   if (Config_getBool("SEARCHENGINE"))
   {
     Doxygen::searchIndex->setCurrentDoc(pageTitle,getOutputFileBase());
@@ -1543,6 +1567,8 @@ void ClassDef::writeMemberPages(OutputList &ol)
 
 void ClassDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const
 {
+  static bool createSubDirs=Config_getBool("CREATE_SUBDIRS");
+
   ol.writeString("      <div class=\"navtab\">\n");
   ol.writeString("        <table>\n");
 
@@ -1569,6 +1595,7 @@ void ClassDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const
             ol.writeString("<a class=\"qindex\" ");
           }
           ol.writeString("href=\"");
+          if (createSubDirs) ol.writeString("../../");
           ol.writeString(md->getOutputFileBase()+Doxygen::htmlFileExtension+"#"+md->anchor());
           ol.writeString("\">");
           ol.writeString(md->name());
@@ -2141,8 +2168,16 @@ void ClassDef::mergeMembers()
               if (srcCd==dstCd || dstCd->isBaseClass(srcCd,TRUE)) 
                 // member is in the same or a base class
               {
+#ifdef NEWMATCH
+                found=matchArguments2(
+                    srcMd->getOuterScope(),srcMd->getFileDef(),srcMd->argumentList(),
+                    dstMd->getOuterScope(),dstMd->getFileDef(),dstMd->argumentList(),
+                    TRUE
+                   );
+#else
                 found=matchArguments(srcMd->argumentList(),
-                    dstMd->argumentList());
+                                     dstMd->argumentList());
+#endif
                 //printf("  Yes, matching (%s<->%s): %d\n",
                 //    argListToString(srcMd->argumentList()).data(),
                 //    argListToString(dstMd->argumentList()).data(),