1 files changed, 18 insertions, 12 deletions

diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 1d6abc9..aec995f 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -46,7 +46,6 @@ static const char *defaultStyleSheet =
       "A.codeRef { font-weight: normal; color: #4444ee }\n"
       "DL.el { margin-left: -1cm }\n"
       "DIV.fragment { width: 100%; border: none; background-color: #eeeeee }\n"
-      //"DIV.in { margin-left: 16 }\n"
       "DIV.ah { background-color: black; margin-bottom: 3; margin-top: 3 }\n"
       "TD.md { background-color: #f2f2ff }\n"
       "DIV.groupHeader { margin-left: 16; margin-top: 12; margin-bottom: 6; font-weight: bold }\n"
@@ -59,17 +58,18 @@ static const char *defaultStyleSheet =
       "FONT.stringliteral { color: #002080 }\n"
       "FONT.charliteral   { color: #008080 }\n";
 
+static QCString g_header;
+static QCString g_footer;
 
 HtmlGenerator::HtmlGenerator() : OutputGenerator()
 {
-  if (!Config::headerFile.isEmpty()) header=fileToString(Config::headerFile);
-  if (!Config::footerFile.isEmpty()) footer=fileToString(Config::footerFile);
   dir=Config::htmlOutputDir;
   col=0;  
 }
 
 HtmlGenerator::~HtmlGenerator()
 {
+  //printf("HtmlGenerator::~HtmlGenerator()\n");
 }
 
 void HtmlGenerator::append(const OutputGenerator *g)
@@ -87,7 +87,8 @@ void HtmlGenerator::init()
     exit(1);
   }
   writeLogo(Config::htmlOutputDir);
-  //writeNullImage(Config::htmlOutputDir);
+  if (!Config::headerFile.isEmpty()) g_header=fileToString(Config::headerFile);
+  if (!Config::footerFile.isEmpty()) g_footer=fileToString(Config::footerFile);
 }
 
 void HtmlGenerator::writeStyleSheetFile(QFile &file)
@@ -139,7 +140,7 @@ void HtmlGenerator::writeFooterFile(QFile &file)
   QTextStream t(&file);
   t << "<hr><address><small>\n";
   t << "Generated at $datetime for $projectname ";
-  t << " by <a href=\"http://www.stack.nl/~dimitri/doxygen/index.html\">\n"
+  t << " by <a href=\"http://www.doxygen.org/index.html\">\n"
     << "<img src=\"doxygen.gif\" alt=\"doxygen\" " 
     << "align=\"middle\" border=0 width=110 height=53>\n"
     << "</a> $doxygenversion written by"
@@ -162,13 +163,13 @@ void HtmlGenerator::startFile(const char *name,const char *title,bool external)
   }
  
   lastFile = fileName;
-  if (header.isEmpty()) 
+  if (g_header.isEmpty()) 
   {
     writeDefaultHeaderFile(t,title,external);
   }
   else
   {
-    t << substituteKeywords(header,lastTitle);
+    t << substituteKeywords(g_header,lastTitle);
   }
   t << "<!-- Generated by Doxygen " << versionString << " on " 
     << dateToString(TRUE) << " -->" << endl;
@@ -208,15 +209,15 @@ void HtmlGenerator::writeFooter(int part,bool external)
   switch (part)
   {
     case 0:
-      if (footer.isEmpty())
+      if (g_footer.isEmpty())
         t << "<hr><address><small>";
       else
-        t << substituteKeywords(footer,lastTitle);
+        t << substituteKeywords(g_footer,lastTitle);
       break;
     case 1:
-      if (footer.isEmpty())
+      if (g_footer.isEmpty())
       {
-        t << endl << "<a href=\"http://www.stack.nl/~dimitri/doxygen/index.html\">";
+        t << endl << "<a href=\"http://www.doxygen.org/index.html\">";
         t << endl << "<img ";
         if (external)
         {
@@ -233,7 +234,7 @@ void HtmlGenerator::writeFooter(int part,bool external)
       }
       break;
     default:
-      if (footer.isEmpty())
+      if (g_footer.isEmpty())
         t << " <a href=\"mailto:dimitri@stack.nl\">Dimitri van Heesch</a>,\n &copy;&nbsp;"
              "1997-2001</small></address>\n</body>\n</html>\n";
       break;
@@ -987,6 +988,7 @@ void HtmlGenerator::startIndent()
        "    </td>\n"
        "    <td>\n";
 }
+
 void HtmlGenerator::endIndent()          
 { 
   t << "    </td>\n"
@@ -994,3 +996,7 @@ void HtmlGenerator::endIndent()
        "</table>\n";
   //t << "</div>" << endl; 
 }
+
+void HtmlGenerator::addIndexItem(const char *,const char *)
+{
+}