diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2008-01-17 18:56:38 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2008-01-17 18:56:38 (GMT) |
commit | f000dd870b772ed6bc26ea383a8657301eb5ef17 (patch) | |
tree | 05e55417a750c1275c9139b7952de6941db168dd /src/htmlhelp.cpp | |
parent | b00ec8923dcf911a38323429f1744048b20a35a7 (diff) | |
download | Doxygen-f000dd870b772ed6bc26ea383a8657301eb5ef17.zip Doxygen-f000dd870b772ed6bc26ea383a8657301eb5ef17.tar.gz Doxygen-f000dd870b772ed6bc26ea383a8657301eb5ef17.tar.bz2 |
Release-1.5.4-20080101
Diffstat (limited to 'src/htmlhelp.cpp')
-rw-r--r-- | src/htmlhelp.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp index 1ff3101..d77fe1c 100644 --- a/src/htmlhelp.cpp +++ b/src/htmlhelp.cpp @@ -1,8 +1,8 @@ /****************************************************************************** * - * $Id$ + * * - * Copyright (C) 1997-2007 by Dimitri van Heesch. + * Copyright (C) 1997-2008 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -299,9 +299,7 @@ void HtmlHelp::initialize() } /* Write the header of the contents file */ cts.setDevice(cf); -#if QT_VERSION >= 200 - cts.setEncoding(QTextStream::Latin1); -#endif + cts.setEncoding(QTextStream::UnicodeUTF8); cts << "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n" "<HTML><HEAD></HEAD><BODY>\n" "<OBJECT type=\"text/site properties\">\n" @@ -319,9 +317,7 @@ void HtmlHelp::initialize() } /* Write the header of the contents file */ kts.setDevice(kf); -#if QT_VERSION >= 200 - kts.setEncoding(QTextStream::Latin1); -#endif + kts.setEncoding(QTextStream::UnicodeUTF8); kts << "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n" "<HTML><HEAD></HEAD><BODY>\n" "<OBJECT type=\"text/site properties\">\n" @@ -413,7 +409,7 @@ void HtmlHelp::createProjectFile() { QTextStream t(&f); #if QT_VERSION >= 200 - t.setEncoding(QTextStream::Latin1); + t.setEncoding(QTextStream::UnicodeUTF8); #endif @@ -572,12 +568,14 @@ void HtmlHelp::addContentsItem(bool isDir, * \param contRef the output file refering to the container. * \param memRef the output file containing to the member documentation. * \param anchor the anchor of the item. + * \param md the member definition corresponding to this item. * \sa HtmlHelpIndex */ void HtmlHelp::addIndexItem(const char *level1, const char *level2, const char *contRef, const char *memRef, - const char *anchor) + const char *anchor,const MemberDef *md) { + (void)md; index->addItem(level1,level2,contRef,anchor,TRUE,FALSE); index->addItem(level2,level1,memRef,anchor,TRUE,TRUE); } |