From a0924f7d469a42ab962763ce34ea5fabc73da9d7 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <dimitri@stack.nl>
Date: Sat, 27 Dec 2008 14:16:50 +0000
Subject: Release-1.5.8

---
 INSTALL                         |  4 ++--
 README                          |  4 ++--
 addon/doxywizard/doxywizard.cpp |  7 ++++++-
 configure                       |  2 +-
 src/doxygen.cpp                 | 25 +++++++++++++++++++++++--
 src/util.cpp                    |  2 +-
 6 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index 1272a3b..1388ba7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
-DOXYGEN Version 1.5.7.1-20081225
+DOXYGEN Version 1.5.8
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (25 December 2008)
+Dimitri van Heesch (27 December 2008)
diff --git a/README b/README
index 8fc1899..69c939b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.5.7.1_20081225
+DOXYGEN Version 1.5.8
 
 Please read INSTALL for compilation instructions.
 
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (25 December 2008)
+Dimitri van Heesch (dimitri@stack.nl) (27 December 2008)
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 6d88624..63d7efe 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -485,7 +485,12 @@ void MainWindow::showHtmlOutput()
 {
   QString indexFile = m_expert->getHtmlOutputIndex(m_workingDir->text());
   QFileInfo fi(indexFile);
-  QString indexUrl(QString::fromAscii("file://")+fi.absoluteFilePath());
+#ifdef WIN32
+  QString indexUrl(QString::fromAscii("file:///"));
+#else
+  QString indexUrl(QString::fromAscii("file://"));
+#endif
+  indexUrl+=fi.absoluteFilePath();
   QDesktopServices::openUrl(QUrl(indexUrl));
 }
 
diff --git a/configure b/configure
index efda7c1..4d33df2 100755
--- a/configure
+++ b/configure
@@ -17,7 +17,7 @@
 
 doxygen_version_major=1
 doxygen_version_minor=5
-doxygen_version_revision=7.1
+doxygen_version_revision=8
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
 doxygen_version_mmn=NO
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 62ca201..5a33891 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -5033,9 +5033,23 @@ static QCString substituteTemplatesInString(
       for (tsali.toFirst();(tsa=tsali.current()) && !found;++tsali)
       {
         tda = tdali.current();
+        //if (tda) printf("tsa=%s|%s tda=%s|%s\n",
+        //    tsa->type.data(),tsa->name.data(),
+        //    tda->type.data(),tda->name.data());
         if (name==tsa->name)
         {
-          if (tda)
+          if (tda && tda->name.isEmpty())
+          {
+            int vc=0;
+            if (tda->type.left(6)=="class ") vc=6;
+            else if (tda->type.left(9)=="typename ") vc=9;
+            if (vc>0) // convert type=="class T" to type=="class" name=="T"
+            {
+              tda->name = tda->type.mid(vc);
+              tda->type = tda->type.left(vc-1);
+            }
+          }
+          if (tda && !tda->name.isEmpty())
           {
             name=tda->name; // substitute
             found=TRUE;
@@ -5051,11 +5065,17 @@ static QCString substituteTemplatesInString(
         else if (fa) 
           fa=funcTempArgList->next();
       }
+      //printf("   srcList='%s' dstList='%s faList='%s'\n",
+      //  argListToString(srclali.current()).data(),
+      //  argListToString(dstlali.current()).data(),
+      //  funcTempArgList ? argListToString(funcTempArgList).data() : "<none>");
     }
     dst+=name; 
     p=i+l;
   }
   dst+=src.right(src.length()-p);
+  //printf("  substituteTemplatesInString(%s)=%s\n",
+  //    src.data(),dst.data());
   return dst;
 }
 
@@ -5098,7 +5118,8 @@ static void substituteTemplatesInArgList(
   dst->volatileSpecifier = src->volatileSpecifier;
   dst->pureSpecifier     = src->pureSpecifier;
   //printf("substituteTemplatesInArgList: replacing %s with %s\n",
-  //    argListToString(src).data(),argListToString(dst).data());
+  //    argListToString(src).data(),argListToString(dst).data()
+  //    );
 }
 
 
diff --git a/src/util.cpp b/src/util.cpp
index 2905439..b1ff12c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3246,7 +3246,7 @@ static QCString extractCanonicalType(Definition *d,FileDef *fs,QCString type)
     pp=p;
   }
   canType += type.right(type.length()-pp);
-  //printf("extractCanonicalType = %s->%s\n",type.data(),canType.data());
+  //printf("extractCanonicalType = '%s'->'%s'\n",type.data(),canType.data());
 
   return removeRedundantWhiteSpace(canType);
 }
-- 
cgit v0.12