From 13feb604f3aa783f927ed47df8e4c561a8d8032a Mon Sep 17 00:00:00 2001 From: dimitri Date: Tue, 11 Jan 2005 19:39:24 +0000 Subject: Release-1.4.1 --- INSTALL | 4 +- README | 4 +- VERSION | 2 +- addon/doxmlparser/include/doxmlintf.h | 2 +- addon/doxmlparser/src/basehandler.h | 2 +- addon/doxmlparser/src/baseiterator.h | 2 +- addon/doxmlparser/src/compoundhandler.cpp | 2 +- addon/doxmlparser/src/compoundhandler.h | 2 +- addon/doxmlparser/src/dochandler.cpp | 2 +- addon/doxmlparser/src/dochandler.h | 2 +- addon/doxmlparser/src/doxmlintf.h | 2 +- addon/doxmlparser/src/graphhandler.h | 2 +- addon/doxmlparser/src/linkedtexthandler.cpp | 2 +- addon/doxmlparser/src/linkedtexthandler.h | 2 +- addon/doxmlparser/src/loamhandler.h | 2 +- addon/doxmlparser/src/mainhandler.cpp | 2 +- addon/doxmlparser/src/mainhandler.h | 2 +- addon/doxmlparser/src/memberhandler.cpp | 2 +- addon/doxmlparser/src/memberhandler.h | 2 +- addon/doxmlparser/src/paramhandler.cpp | 2 +- addon/doxmlparser/src/paramhandler.h | 2 +- addon/doxmlparser/src/sectionhandler.cpp | 2 +- addon/doxmlparser/src/sectionhandler.h | 2 +- addon/doxywizard/Makefile.in | 2 +- addon/doxywizard/Makefile.win_nmake.in | 2 +- addon/doxywizard/doxywizard.cpp | 57 +++++++--- addon/doxywizard/doxywizard.pro.in | 2 +- addon/doxywizard/expert.cpp | 21 ++-- addon/doxywizard/expert.h | 8 +- addon/doxywizard/inputbool.cpp | 2 +- addon/doxywizard/inputbool.h | 2 +- addon/doxywizard/inputint.cpp | 2 +- addon/doxywizard/inputint.h | 2 +- addon/doxywizard/inputstring.cpp | 2 +- addon/doxywizard/inputstring.h | 2 +- addon/doxywizard/inputstrlist.cpp | 2 +- addon/doxywizard/inputstrlist.h | 2 +- addon/doxywizard/qtbc.h | 2 +- addon/doxywizard/version.h | 2 +- configure | 2 +- doc/arch.doc | 2 +- doc/autolink.doc | 2 +- doc/commands.doc | 2 +- doc/config.doc | 2 +- doc/diagrams.doc | 2 +- doc/docblocks.doc | 2 +- doc/doxygen_usage.doc | 2 +- doc/doxytag_usage.doc | 2 +- doc/doxywizard_usage.doc | 2 +- doc/external.doc | 2 +- doc/faq.doc | 2 +- doc/features.doc | 2 +- doc/formulas.doc | 2 +- doc/grouping.doc | 2 +- doc/history.doc | 2 +- doc/htmlcmds.doc | 2 +- doc/index.doc | 4 +- doc/install.doc | 2 +- doc/installdox_usage.doc | 2 +- doc/language.doc | 2 +- doc/output.doc | 2 +- doc/preprocessing.doc | 2 +- doc/starting.doc | 2 +- doc/translator_report.txt | 2 +- doc/trouble.doc | 2 +- packages/rpm/doxygen.spec | 2 +- src/Makefile.in | 2 +- src/bufstr.h | 2 +- src/classdef.cpp | 2 +- src/classdef.h | 2 +- src/classlist.cpp | 2 +- src/classlist.h | 2 +- src/cmdmapper.cpp | 2 +- src/cmdmapper.h | 2 +- src/code.h | 2 +- src/code.l | 2 +- src/commentcnv.h | 2 +- src/commentcnv.l | 2 +- src/config.l | 4 +- src/constexp.h | 2 +- src/constexp.l | 2 +- src/constexp.y | 2 +- src/cppvalue.cpp | 2 +- src/cppvalue.h | 2 +- src/debug.cpp | 2 +- src/debug.h | 2 +- src/declinfo.h | 2 +- src/declinfo.l | 2 +- src/defargs.h | 2 +- src/defargs.l | 2 +- src/defgen.cpp | 2 +- src/defgen.h | 2 +- src/define.cpp | 2 +- src/define.h | 2 +- src/definition.cpp | 2 +- src/definition.h | 2 +- src/diagram.cpp | 2 +- src/diagram.h | 2 +- src/dirdef.h | 2 +- src/docparser.cpp | 2 +- src/docparser.h | 2 +- src/doctokenizer.h | 2 +- src/doctokenizer.l | 2 +- src/docvisitor.h | 2 +- src/dot.cpp | 7 +- src/dot.h | 2 +- src/doxygen.cpp | 16 ++- src/doxygen.h | 2 +- src/doxygen.pro.in | 2 +- src/doxytag.l | 4 +- src/doxytag.pro.in | 2 +- src/doxytag.t | 2 +- src/entry.cpp | 2 +- src/entry.h | 2 +- src/example.h | 2 +- src/filedef.cpp | 2 +- src/filedef.h | 2 +- src/filename.cpp | 2 +- src/filename.h | 2 +- src/formula.cpp | 2 +- src/formula.h | 2 +- src/ftvhelp.cpp | 96 ++++++++-------- src/groupdef.cpp | 2 +- src/groupdef.h | 2 +- src/htmlattrib.h | 2 +- src/htmldocvisitor.cpp | 2 +- src/htmldocvisitor.h | 2 +- src/htmlgen.cpp | 2 +- src/htmlgen.h | 2 +- src/htmlhelp.cpp | 2 +- src/htmlhelp.h | 2 +- src/image.cpp | 2 +- src/image.h | 2 +- src/index.cpp | 2 +- src/index.h | 2 +- src/instdox.cpp | 2 +- src/instdox.h | 2 +- src/language.cpp | 2 +- src/language.h | 2 +- src/latexdocvisitor.cpp | 2 +- src/latexdocvisitor.h | 2 +- src/latexgen.cpp | 10 +- src/latexgen.h | 2 +- src/libdoxycfg.pro.in | 2 +- src/libdoxycfg.t | 2 +- src/libdoxygen.pro.in | 3 +- src/libdoxygen.t | 5 +- src/logos.cpp | 2 +- src/logos.h | 2 +- src/main.cpp | 2 +- src/mandocvisitor.cpp | 2 +- src/mandocvisitor.h | 2 +- src/mangen.cpp | 2 +- src/mangen.h | 2 +- src/memberdef.cpp | 7 +- src/memberdef.h | 2 +- src/membergroup.cpp | 2 +- src/membergroup.h | 2 +- src/memberlist.cpp | 15 +-- src/memberlist.h | 2 +- src/membername.cpp | 2 +- src/membername.h | 2 +- src/message.cpp | 2 +- src/message.h | 2 +- src/namespacedef.cpp | 2 +- src/namespacedef.h | 2 +- src/outputgen.cpp | 2 +- src/outputgen.h | 2 +- src/outputlist.cpp | 2 +- src/outputlist.h | 2 +- src/pagedef.h | 2 +- src/perlmodgen.cpp | 2 +- src/perlmodgen.h | 2 +- src/pngenc.cpp | 2 +- src/pngenc.h | 2 +- src/pre.h | 2 +- src/pre.l | 2 +- src/printdocvisitor.h | 2 +- src/qtbc.h | 2 +- src/reflist.cpp | 2 +- src/reflist.h | 2 +- src/rtfdocvisitor.cpp | 2 +- src/rtfdocvisitor.h | 2 +- src/rtfgen.cpp | 2 +- src/rtfgen.h | 2 +- src/rtfstyle.cpp | 2 +- src/rtfstyle.h | 2 +- src/scanner.h | 2 +- src/scanner.l | 163 ++++++++++++++++------------ src/searchindex.cpp | 2 +- src/searchindex.h | 2 +- src/section.h | 2 +- src/sortdict.h | 2 +- src/tagreader.cpp | 2 +- src/tagreader.h | 2 +- src/translator.h | 2 +- src/translator_br.h | 2 +- src/translator_ca.h | 2 +- src/translator_cn.h | 2 +- src/translator_cz.h | 2 +- src/translator_de.h | 2 +- src/translator_dk.h | 2 +- src/translator_en.h | 2 +- src/translator_es.h | 2 +- src/translator_fi.h | 2 +- src/translator_fr.h | 4 +- src/translator_gr.h | 2 +- src/translator_hr.h | 2 +- src/translator_hu.h | 2 +- src/translator_it.h | 2 +- src/translator_je.h | 2 +- src/translator_jp.h | 2 +- src/translator_ke.h | 2 +- src/translator_kr.h | 2 +- src/translator_lt.h | 2 +- src/translator_nl.h | 2 +- src/translator_no.h | 2 +- src/translator_pl.h | 2 +- src/translator_pt.h | 2 +- src/translator_ro.h | 2 +- src/translator_ru.h | 2 +- src/translator_se.h | 2 +- src/translator_si.h | 2 +- src/translator_sk.h | 2 +- src/translator_sr.h | 2 +- src/translator_tw.h | 2 +- src/translator_ua.h | 2 +- src/translator_za.h | 2 +- src/util.cpp | 2 +- src/util.h | 2 +- src/version.h | 2 +- src/xmldocvisitor.cpp | 2 +- src/xmldocvisitor.h | 2 +- src/xmlgen.cpp | 2 +- src/xmlgen.h | 2 +- 235 files changed, 467 insertions(+), 399 deletions(-) diff --git a/INSTALL b/INSTALL index 051f0cc..4288b15 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.4.0 +DOXYGEN Version 1.4.1 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (31 December 2004) +Dimitri van Heesch (09 January 2005) diff --git a/README b/README index 73fd2a6..9551f30 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.4.0 +DOXYGEN Version 1.4.1 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) (31 December 2004) +Dimitri van Heesch (dimitri@stack.nl) (09 January 2005) diff --git a/VERSION b/VERSION index 88c5fb8..347f583 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.0 +1.4.1 diff --git a/addon/doxmlparser/include/doxmlintf.h b/addon/doxmlparser/include/doxmlintf.h index cd6beba..52db174 100644 --- a/addon/doxmlparser/include/doxmlintf.h +++ b/addon/doxmlparser/include/doxmlintf.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/basehandler.h b/addon/doxmlparser/src/basehandler.h index f442b48..446f777 100644 --- a/addon/doxmlparser/src/basehandler.h +++ b/addon/doxmlparser/src/basehandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/baseiterator.h b/addon/doxmlparser/src/baseiterator.h index ae86f16..06a9a11 100644 --- a/addon/doxmlparser/src/baseiterator.h +++ b/addon/doxmlparser/src/baseiterator.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp index 26f0848..411f114 100644 --- a/addon/doxmlparser/src/compoundhandler.cpp +++ b/addon/doxmlparser/src/compoundhandler.cpp @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/compoundhandler.h b/addon/doxmlparser/src/compoundhandler.h index d3e25e6..59ad7ce 100644 --- a/addon/doxmlparser/src/compoundhandler.h +++ b/addon/doxmlparser/src/compoundhandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp index 517e70c..11af311 100644 --- a/addon/doxmlparser/src/dochandler.cpp +++ b/addon/doxmlparser/src/dochandler.cpp @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/dochandler.h b/addon/doxmlparser/src/dochandler.h index 6977254..25fed50 100644 --- a/addon/doxmlparser/src/dochandler.h +++ b/addon/doxmlparser/src/dochandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/doxmlintf.h b/addon/doxmlparser/src/doxmlintf.h index cd6beba..52db174 100644 --- a/addon/doxmlparser/src/doxmlintf.h +++ b/addon/doxmlparser/src/doxmlintf.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/graphhandler.h b/addon/doxmlparser/src/graphhandler.h index 227681e..24a33d3 100644 --- a/addon/doxmlparser/src/graphhandler.h +++ b/addon/doxmlparser/src/graphhandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/linkedtexthandler.cpp b/addon/doxmlparser/src/linkedtexthandler.cpp index 4caf409..d27adcc 100644 --- a/addon/doxmlparser/src/linkedtexthandler.cpp +++ b/addon/doxmlparser/src/linkedtexthandler.cpp @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/linkedtexthandler.h b/addon/doxmlparser/src/linkedtexthandler.h index 06ed07e..01dbf4a 100644 --- a/addon/doxmlparser/src/linkedtexthandler.h +++ b/addon/doxmlparser/src/linkedtexthandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/loamhandler.h b/addon/doxmlparser/src/loamhandler.h index 2709354..2cff8d4 100644 --- a/addon/doxmlparser/src/loamhandler.h +++ b/addon/doxmlparser/src/loamhandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/mainhandler.cpp b/addon/doxmlparser/src/mainhandler.cpp index d2422ed..a0a1b07 100644 --- a/addon/doxmlparser/src/mainhandler.cpp +++ b/addon/doxmlparser/src/mainhandler.cpp @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/mainhandler.h b/addon/doxmlparser/src/mainhandler.h index 64f36cf..a9f68b0 100644 --- a/addon/doxmlparser/src/mainhandler.h +++ b/addon/doxmlparser/src/mainhandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/memberhandler.cpp b/addon/doxmlparser/src/memberhandler.cpp index dc1f6bc..fe0f5ac 100644 --- a/addon/doxmlparser/src/memberhandler.cpp +++ b/addon/doxmlparser/src/memberhandler.cpp @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/memberhandler.h b/addon/doxmlparser/src/memberhandler.h index f1af61e..750c5e3 100644 --- a/addon/doxmlparser/src/memberhandler.h +++ b/addon/doxmlparser/src/memberhandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/paramhandler.cpp b/addon/doxmlparser/src/paramhandler.cpp index 29d6942..8281265 100644 --- a/addon/doxmlparser/src/paramhandler.cpp +++ b/addon/doxmlparser/src/paramhandler.cpp @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/paramhandler.h b/addon/doxmlparser/src/paramhandler.h index c4c4c10..0148714 100644 --- a/addon/doxmlparser/src/paramhandler.h +++ b/addon/doxmlparser/src/paramhandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/sectionhandler.cpp b/addon/doxmlparser/src/sectionhandler.cpp index 82eb475..18d6b19 100644 --- a/addon/doxmlparser/src/sectionhandler.cpp +++ b/addon/doxmlparser/src/sectionhandler.cpp @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxmlparser/src/sectionhandler.h b/addon/doxmlparser/src/sectionhandler.h index e21a0c5..3be4ee8 100644 --- a/addon/doxmlparser/src/sectionhandler.h +++ b/addon/doxmlparser/src/sectionhandler.h @@ -3,7 +3,7 @@ * $Id$ * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in index c018de7..42d5871 100644 --- a/addon/doxywizard/Makefile.in +++ b/addon/doxywizard/Makefile.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2004 by Dimitri van Heesch. +# Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/Makefile.win_nmake.in b/addon/doxywizard/Makefile.win_nmake.in index ab942a8..7ebcdf8 100644 --- a/addon/doxywizard/Makefile.win_nmake.in +++ b/addon/doxywizard/Makefile.win_nmake.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2004 by Dimitri van Heesch. +# Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index 97ff827..83ae3b6 100644 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -32,7 +32,6 @@ #include "expert.h" #include "config.h" - const int messageTimeout = 5000; //!< status bar message timeout in millisec. #if defined(Q_OS_MACX) @@ -46,6 +45,34 @@ QCString getResourcePath() result+="/Contents/Resources/"; return result; } + +#define GRAPHVIZ_PATH "/Applications/Graphviz.app" +#define DOT_PATH GRAPHVIZ_PATH "/Contents/MacOS" +#define DOT_LOCATION DOT_PATH "/dot" + +bool checkIfDotInstalled() +{ + QFileInfo fi(GRAPHVIZ_PATH); + if (fi.exists() && fi.isDir()) + { + fi.setFile(DOT_LOCATION); + if (fi.exists() && fi.isFile()) + { + return TRUE; + } + } + return FALSE; +} + +void setDotPath() +{ + if (checkIfDotInstalled()) + { + Config_getString("DOT_PATH")=DOT_PATH; + Config_getBool("HAVE_DOT")=TRUE; + } +} + #endif @@ -651,10 +678,7 @@ MainWidget::MainWidget(QWidget *parent) Config::instance()->init(); Config::instance()->check(); #if defined(Q_OS_MACX) - // we bundle dot with doxywizard on the Mac so we can safely enable - // it here - Config_getString("DOT_PATH")=getResourcePath(); - Config_getBool("HAVE_DOT")=TRUE; + setDotPath(); #endif QWidget *w = new QWidget(this); @@ -1079,7 +1103,10 @@ void MainWidget::launchWizard() break; } #if defined(Q_OS_MACX) - Config_getString("DOT_PATH")=getResourcePath(); + if (Config_getBool("HAVE_DOT")) + { + setDotPath(); + } #endif setConfigSaved(FALSE); } @@ -1098,9 +1125,11 @@ void MainWidget::loadConfigFromFile(const QString &fn) { Config::instance()->convertStrToVal(); #if defined(Q_OS_MACX) - if (Config_getString("DOT_PATH")!=getResourcePath()) + if (checkIfDotInstalled() && + qstricmp(Config_getString("DOT_PATH"),DOT_PATH)!=0 + ) { - Config_getString("DOT_PATH")=getResourcePath(); + Config_getString("DOT_PATH")=DOT_PATH; setConfigSaved(FALSE); } else @@ -1134,12 +1163,9 @@ void MainWidget::launchExpert() expert.init(); expert.exec(); #if defined(Q_OS_MACX) - // we bundle dot with doxywizard on the Mac so we can safely enable - // it here - Config_getString("DOT_PATH")=getResourcePath(); - Config_getBool("HAVE_DOT")=TRUE; + setDotPath(); #endif - setConfigSaved(FALSE); + if (expert.hasChanged()) setConfigSaved(FALSE); } void MainWidget::saveDefaults() @@ -1191,10 +1217,7 @@ void MainWidget::resetConfig() // initialize config settings Config::instance()->init(); #if defined(Q_OS_MACX) - // we bundle dot with doxywizard on the Mac so we can safely enable - // it here - Config_getString("DOT_PATH")=getResourcePath(); - Config_getBool("HAVE_DOT")=TRUE; + setDotPath(); #endif m_configFileName = ""; diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in index 6cb1250..ae83cb8 100644 --- a/addon/doxywizard/doxywizard.pro.in +++ b/addon/doxywizard/doxywizard.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2004 by Dimitri van Heesch. +# Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp index 084ad95..a9d4028 100644 --- a/addon/doxywizard/expert.cpp +++ b/addon/doxywizard/expert.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 @@ -48,6 +48,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent ) m_dependencies->setAutoDelete(TRUE); m_inputWidgets = new QDict< IInput >; m_switches = new QDict< QObject >; + m_changed = FALSE; setHelpButton(); @@ -94,7 +95,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent ) pageLayout->addWidget(inputString); QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace() ); QToolTip::add(inputString,option->docs()); - connect(inputString,SIGNAL(changed()),SIGNAL(changed())); + connect(inputString,SIGNAL(changed()),SLOT(changed())); m_inputWidgets->insert(option->name(),inputString); addDependency(m_switches,option->dependsOn(),option->name()); } @@ -117,7 +118,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent ) inputString->init(); QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace() ); QToolTip::add(inputString, option->docs()); - connect(inputString,SIGNAL(changed()),SIGNAL(changed())); + connect(inputString,SIGNAL(changed()),SLOT(changed())); m_inputWidgets->insert(option->name(),inputString); addDependency(m_switches,option->dependsOn(),option->name()); } @@ -142,7 +143,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent ) pageLayout->addWidget(inputStrList); QWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace() ); QToolTip::add(inputStrList, option->docs()); - connect(inputStrList,SIGNAL(changed()),SIGNAL(changed())); + connect(inputStrList,SIGNAL(changed()),SLOT(changed())); m_inputWidgets->insert(option->name(),inputStrList); addDependency(m_switches,option->dependsOn(),option->name()); } @@ -159,7 +160,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent ) pageLayout->addWidget(inputBool); QWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace() ); QToolTip::add(inputBool, option->docs() ); - connect(inputBool,SIGNAL(changed()),SIGNAL(changed())); + connect(inputBool,SIGNAL(changed()),SLOT(changed())); m_inputWidgets->insert(option->name(),inputBool); addDependency(m_switches,option->dependsOn(),option->name()); } @@ -177,7 +178,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent ) pageLayout->addWidget(inputInt); QWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace() ); QToolTip::add(inputInt, option->docs() ); - connect(inputInt,SIGNAL(changed()),SIGNAL(changed())); + connect(inputInt,SIGNAL(changed()),SLOT(changed())); m_inputWidgets->insert(option->name(),inputInt); addDependency(m_switches,option->dependsOn(),option->name()); } @@ -197,8 +198,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent ) emit toggle(di.currentKey(),((InputBool *)obj)->getState()); } - connect(this,SIGNAL(helpButtonPressed()), - this,SLOT(handleHelp())); + connect(this,SIGNAL(helpButtonPressed()),this,SLOT(handleHelp())); } @@ -269,3 +269,8 @@ void Expert::init() } +void Expert::changed() +{ + m_changed=TRUE; +} + diff --git a/addon/doxywizard/expert.h b/addon/doxywizard/expert.h index 7deeb17..4fdaea1 100644 --- a/addon/doxywizard/expert.h +++ b/addon/doxywizard/expert.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 @@ -65,18 +65,18 @@ class Expert : public QTabDialog void init(); void addDependency(QDict *switches, const QCString &dep,const QCString &name); + bool hasChanged() const { return m_changed; } - signals: - void changed(); - private slots: void toggle(const char *,bool); void handleHelp(); + void changed(); private: QDict *m_inputWidgets; QDict< QList > *m_dependencies; QDict *m_switches; + bool m_changed; }; #endif diff --git a/addon/doxywizard/inputbool.cpp b/addon/doxywizard/inputbool.cpp index e1f16a1..554c228 100644 --- a/addon/doxywizard/inputbool.cpp +++ b/addon/doxywizard/inputbool.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/inputbool.h b/addon/doxywizard/inputbool.h index 5a56d83..ee76ba9 100644 --- a/addon/doxywizard/inputbool.h +++ b/addon/doxywizard/inputbool.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/inputint.cpp b/addon/doxywizard/inputint.cpp index c3bd11f..4398f31 100644 --- a/addon/doxywizard/inputint.cpp +++ b/addon/doxywizard/inputint.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/inputint.h b/addon/doxywizard/inputint.h index fbe3813..92435b7 100644 --- a/addon/doxywizard/inputint.h +++ b/addon/doxywizard/inputint.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp index 6450cb9..f301384 100644 --- a/addon/doxywizard/inputstring.cpp +++ b/addon/doxywizard/inputstring.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/inputstring.h b/addon/doxywizard/inputstring.h index cd2ac91..ddcdfea 100644 --- a/addon/doxywizard/inputstring.h +++ b/addon/doxywizard/inputstring.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/inputstrlist.cpp b/addon/doxywizard/inputstrlist.cpp index f8e4888..fc8cf50 100644 --- a/addon/doxywizard/inputstrlist.cpp +++ b/addon/doxywizard/inputstrlist.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/inputstrlist.h b/addon/doxywizard/inputstrlist.h index 6d23910..0156c20 100644 --- a/addon/doxywizard/inputstrlist.h +++ b/addon/doxywizard/inputstrlist.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/qtbc.h b/addon/doxywizard/qtbc.h index ed1ab98..452974c 100644 --- a/addon/doxywizard/qtbc.h +++ b/addon/doxywizard/qtbc.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/addon/doxywizard/version.h b/addon/doxywizard/version.h index 382b523..0cbe12a 100644 --- a/addon/doxywizard/version.h +++ b/addon/doxywizard/version.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/configure b/configure index cbee394..6a53fa3 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # # $Id$ # -# Copyright (C) 1997-2001 by Dimitri van Heesch. +# Copyright (C) 1997-2005 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 diff --git a/doc/arch.doc b/doc/arch.doc index ddae158..d4da06f 100644 --- a/doc/arch.doc +++ b/doc/arch.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/autolink.doc b/doc/autolink.doc index 04e386a..1dbeda7 100644 --- a/doc/autolink.doc +++ b/doc/autolink.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/commands.doc b/doc/commands.doc index e52ad74..cd90f81 100644 --- a/doc/commands.doc +++ b/doc/commands.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/config.doc b/doc/config.doc index ab2934d..a8c80ab 100644 --- a/doc/config.doc +++ b/doc/config.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/diagrams.doc b/doc/diagrams.doc index fe31a4d..7b3c46e 100644 --- a/doc/diagrams.doc +++ b/doc/diagrams.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/docblocks.doc b/doc/docblocks.doc index 17a7cba..b1ad2dc 100644 --- a/doc/docblocks.doc +++ b/doc/docblocks.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/doxygen_usage.doc b/doc/doxygen_usage.doc index 2462fc3..fa57ea4 100644 --- a/doc/doxygen_usage.doc +++ b/doc/doxygen_usage.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/doxytag_usage.doc b/doc/doxytag_usage.doc index d744f35..2d5d5ea 100644 --- a/doc/doxytag_usage.doc +++ b/doc/doxytag_usage.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/doxywizard_usage.doc b/doc/doxywizard_usage.doc index a758b4c..c678c81 100644 --- a/doc/doxywizard_usage.doc +++ b/doc/doxywizard_usage.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/external.doc b/doc/external.doc index ba29fb0..9e156d1 100644 --- a/doc/external.doc +++ b/doc/external.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/faq.doc b/doc/faq.doc index 8cd217d..c7d84e3 100644 --- a/doc/faq.doc +++ b/doc/faq.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/features.doc b/doc/features.doc index 6a2a3d0..7eefca7 100644 --- a/doc/features.doc +++ b/doc/features.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/formulas.doc b/doc/formulas.doc index c62d6cf..be6438c 100644 --- a/doc/formulas.doc +++ b/doc/formulas.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/grouping.doc b/doc/grouping.doc index e87b596..74656a6 100644 --- a/doc/grouping.doc +++ b/doc/grouping.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/history.doc b/doc/history.doc index 095358e..6c241e5 100644 --- a/doc/history.doc +++ b/doc/history.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/htmlcmds.doc b/doc/htmlcmds.doc index 6d297f4..1639a99 100644 --- a/doc/htmlcmds.doc +++ b/doc/htmlcmds.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/index.doc b/doc/index.doc index 91bbce9..e678e1c 100644 --- a/doc/index.doc +++ b/doc/index.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 @@ -113,7 +113,7 @@ The third part provides information for developers: \addindex license \addindex GPL -Copyright © 1997-2004 by +Copyright © 1997-2005 by Dimitri van Heesch.

Permission to use, copy, modify, and distribute this software and its diff --git a/doc/install.doc b/doc/install.doc index 950fe02..c86ced5 100644 --- a/doc/install.doc +++ b/doc/install.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/installdox_usage.doc b/doc/installdox_usage.doc index 9b352e0..4f05d45 100644 --- a/doc/installdox_usage.doc +++ b/doc/installdox_usage.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/language.doc b/doc/language.doc index 3737086..a94e35a 100644 --- a/doc/language.doc +++ b/doc/language.doc @@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other than English (the default). The output language is chosen through the configuration file (with default name and known as Doxyfile). -Currently (version 1.3.9.1-20041221), 30 languages +Currently (version 1.4.0), 30 languages are supported (sorted alphabetically): Afrikaans, Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French, diff --git a/doc/output.doc b/doc/output.doc index a1f89aa..1e9b51b 100644 --- a/doc/output.doc +++ b/doc/output.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/preprocessing.doc b/doc/preprocessing.doc index 883f8d2..e514ca7 100644 --- a/doc/preprocessing.doc +++ b/doc/preprocessing.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/starting.doc b/doc/starting.doc index 1d9d434..7410208 100644 --- a/doc/starting.doc +++ b/doc/starting.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/doc/translator_report.txt b/doc/translator_report.txt index 9a80657..cfc0a49 100644 --- a/doc/translator_report.txt +++ b/doc/translator_report.txt @@ -1,4 +1,4 @@ -(1.3.9.1-20041221) +(1.4.0) Doxygen supports the following 30 languages (sorted alphabetically): diff --git a/doc/trouble.doc b/doc/trouble.doc index c8c1c0e..e8880b3 100644 --- a/doc/trouble.doc +++ b/doc/trouble.doc @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec index 0bb2dc6..69bc961 100644 --- a/packages/rpm/doxygen.spec +++ b/packages/rpm/doxygen.spec @@ -1,6 +1,6 @@ Summary: A documentation system for C/C++. Name: doxygen -Version: 1.4.0 +Version: 1.4.1 Release: 1 Epoch: 1 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz diff --git a/src/Makefile.in b/src/Makefile.in index 8c5b655..cdbf22e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -2,7 +2,7 @@ # # # -# Copyright (C) 1997-2004 by Dimitri van Heesch. +# Copyright (C) 1997-2005 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 diff --git a/src/bufstr.h b/src/bufstr.h index ec372b9..7d3c284 100644 --- a/src/bufstr.h +++ b/src/bufstr.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/classdef.cpp b/src/classdef.cpp index da83484..5d7da7c 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/classdef.h b/src/classdef.h index 0cbc49d..1da2d90 100644 --- a/src/classdef.h +++ b/src/classdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/classlist.cpp b/src/classlist.cpp index 383d9b7..fa93a73 100644 --- a/src/classlist.cpp +++ b/src/classlist.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/classlist.h b/src/classlist.h index f3f40bf..5a6c4a0 100644 --- a/src/classlist.h +++ b/src/classlist.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/cmdmapper.cpp b/src/cmdmapper.cpp index d955f97..f01fad4 100644 --- a/src/cmdmapper.cpp +++ b/src/cmdmapper.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/cmdmapper.h b/src/cmdmapper.h index 2e3f2c2..c215d6f 100644 --- a/src/cmdmapper.h +++ b/src/cmdmapper.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/code.h b/src/code.h index 54a4e82..5dd0c7c 100644 --- a/src/code.h +++ b/src/code.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/code.l b/src/code.l index 9dc4e05..249e180 100644 --- a/src/code.l +++ b/src/code.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/commentcnv.h b/src/commentcnv.h index 6b17ccd..86d1f52 100644 --- a/src/commentcnv.h +++ b/src/commentcnv.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/commentcnv.l b/src/commentcnv.l index d129ff3..cf38954 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/config.l b/src/config.l index 972f3d3..b09e47b 100644 --- a/src/config.l +++ b/src/config.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 @@ -2642,7 +2642,7 @@ void Config::create() cs = addString( "DOT_PATH", "The tag DOT_PATH can be used to specify the path where the dot tool can be \n" - "found. If left blank, it is assumed the dot tool can be found on the path. \n" + "found. If left blank, it is assumed the dot tool can be found in the path. \n" ); cs->setWidgetType(ConfigString::Dir); cs->addDependency("HAVE_DOT"); diff --git a/src/constexp.h b/src/constexp.h index 2173191..5631907 100644 --- a/src/constexp.h +++ b/src/constexp.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/constexp.l b/src/constexp.l index 938710a..ed2d945 100644 --- a/src/constexp.l +++ b/src/constexp.l @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/constexp.y b/src/constexp.y index fad1649..a473345 100644 --- a/src/constexp.y +++ b/src/constexp.y @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/cppvalue.cpp b/src/cppvalue.cpp index 94218bf..fbc61f9 100644 --- a/src/cppvalue.cpp +++ b/src/cppvalue.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/cppvalue.h b/src/cppvalue.h index e97cd92..2e09aff 100644 --- a/src/cppvalue.h +++ b/src/cppvalue.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/debug.cpp b/src/debug.cpp index ef79ee5..8d5e53a 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/debug.h b/src/debug.h index 40d4c5a..b52d916 100644 --- a/src/debug.h +++ b/src/debug.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/declinfo.h b/src/declinfo.h index b04fd26..2527efc 100644 --- a/src/declinfo.h +++ b/src/declinfo.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/declinfo.l b/src/declinfo.l index 50924d7..b3a296e 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/defargs.h b/src/defargs.h index e13867d..3dc6893 100644 --- a/src/defargs.h +++ b/src/defargs.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/defargs.l b/src/defargs.l index da76d9c..c452c47 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/defgen.cpp b/src/defgen.cpp index 88d7f41..b2776d8 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/defgen.h b/src/defgen.h index d510177..a66bdcf 100644 --- a/src/defgen.h +++ b/src/defgen.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/define.cpp b/src/define.cpp index 4befdeb..ea9fee3 100644 --- a/src/define.cpp +++ b/src/define.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/define.h b/src/define.h index 9aec19d..d456ac0 100644 --- a/src/define.h +++ b/src/define.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/definition.cpp b/src/definition.cpp index 6b42428..53968b2 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/definition.h b/src/definition.h index 0000cc2..a357f12 100644 --- a/src/definition.h +++ b/src/definition.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/diagram.cpp b/src/diagram.cpp index c483e04..6e5b233 100644 --- a/src/diagram.cpp +++ b/src/diagram.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/diagram.h b/src/diagram.h index df9759a..35766a6 100644 --- a/src/diagram.h +++ b/src/diagram.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/dirdef.h b/src/dirdef.h index 2bc725d..3eb9a68 100644 --- a/src/dirdef.h +++ b/src/dirdef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/docparser.cpp b/src/docparser.cpp index 497f595..38ed3ce 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/docparser.h b/src/docparser.h index 8d2f5b4..6e24b4d 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/doctokenizer.h b/src/doctokenizer.h index 6b5fac8..a867c5c 100644 --- a/src/doctokenizer.h +++ b/src/doctokenizer.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/doctokenizer.l b/src/doctokenizer.l index ff0beef..5b14d35 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/docvisitor.h b/src/docvisitor.h index 924a562..b3a1551 100644 --- a/src/docvisitor.h +++ b/src/docvisitor.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/dot.cpp b/src/dot.cpp index 3ae2c58..c2eb310 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 @@ -617,7 +617,8 @@ void DotNode::writeBox(QTextStream &t, ); t << " Node" << reNumberNode(m_number,reNumber) << " [label=\""; - if (Config_getBool("UML_LOOK") && (gt==Inheritance || gt==Collaboration)) + if (m_classDef && Config_getBool("UML_LOOK") && + (gt==Inheritance || gt==Collaboration)) { t << "{" << convertLabel(m_label); t << "\\n|"; @@ -3081,7 +3082,7 @@ QCString DotGroupCollaboration::writeGraph( QTextStream &t, GraphOutputFormat fo QCString imgName = baseName+"."+imgExt; QCString mapName=baseName+".map"; - DotRunner dotRun(baseName); + DotRunner dotRun(baseName+".dot"); dotRun.addJob(imgExt,imgName); if (writeImageMap) dotRun.addJob("imap",mapName); if (!dotRun.run()) diff --git a/src/dot.h b/src/dot.h index 5b5346c..ad5e380 100644 --- a/src/dot.h +++ b/src/dot.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/doxygen.cpp b/src/doxygen.cpp index d785ef1..03fdbfe 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 @@ -5541,6 +5541,8 @@ static void findEnums(Entry *root) md->setMemberGroupId(root->mGrpId); md->enableCallGraph(root->callGraph); md->setRefItems(root->sli); + //printf("found enum %s nd=%p\n",name.data(),nd); + bool defSet=FALSE; if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@') { if (isRelated || Config_getBool("HIDE_SCOPE_NAMES")) @@ -5551,6 +5553,8 @@ static void findEnums(Entry *root) { md->setDefinition(nd->name()+"::"+name); } + //printf("definition=%s\n",md->definition()); + defSet=TRUE; nd->insertMember(md); md->setNamespace(nd); } @@ -5560,7 +5564,7 @@ static void findEnums(Entry *root) // or class. if (isGlobal) { - md->setDefinition(name); + if (!defSet) md->setDefinition(name); if (fd==0 && root->parent) { bool ambig; @@ -7797,7 +7801,7 @@ static void readAliases() static void usage(const char *name) { - msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2004\n\n",versionString); + msg("Doxygen version %s\nCopyright Dimitri van Heesch 1997-2005\n\n",versionString); msg("You can use doxygen in a number of ways:\n\n"); msg("1) Use doxygen to generate a template configuration file:\n"); msg(" %s [-s] -g [configName]\n\n",name); @@ -7835,6 +7839,8 @@ static const char *getArg(int argc,char **argv,int &optind) //---------------------------------------------------------------------------- +//extern void commentScanTest(); + void initDoxygen() { #if QT_VERSION >= 200 @@ -7862,6 +7868,8 @@ void initDoxygen() Doxygen::lookupCache.setAutoDelete(TRUE); Doxygen::directories.setAutoDelete(TRUE); Doxygen::dirRelations.setAutoDelete(TRUE); + + // commentScanTest(); } void cleanUpDoxygen() @@ -8196,10 +8204,10 @@ void readConfiguration(int argc, char **argv) void parseInput() { - Doxygen::inputNameDict = new FileNameDict(10007); Doxygen::includeNameDict = new FileNameDict(10007); Doxygen::exampleNameDict = new FileNameDict(1009); + Doxygen::exampleNameDict->setAutoDelete(TRUE); Doxygen::imageNameDict = new FileNameDict(257); Doxygen::dotFileNameDict = new FileNameDict(257); diff --git a/src/doxygen.h b/src/doxygen.h index 9a16cc6..418a680 100644 --- a/src/doxygen.h +++ b/src/doxygen.h @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in index 8e8d273..9ba5c44 100644 --- a/src/doxygen.pro.in +++ b/src/doxygen.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2004 by Dimitri van Heesch. +# Copyright (C) 1997-2005 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 diff --git a/src/doxytag.l b/src/doxytag.l index aa8115f..2b326f5 100644 --- a/src/doxytag.l +++ b/src/doxytag.l @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 @@ -504,7 +504,7 @@ void parseFileOrDir(const char *fileName) void usage(const char *name) { - fprintf(stderr,"Doxytag version %s\nCopyright Dimitri van Heesch 1997-2004\n\n", + fprintf(stderr,"Doxytag version %s\nCopyright Dimitri van Heesch 1997-2005\n\n", versionString); fprintf(stderr," Generates a tag file and/or a search index for a set of HTML files\n\n"); fprintf(stderr,"Usage: %s [-t tag_file] [ html_file [html_file...] ]\n",name); diff --git a/src/doxytag.pro.in b/src/doxytag.pro.in index 6fd676f..73fab9c 100644 --- a/src/doxytag.pro.in +++ b/src/doxytag.pro.in @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2004 by Dimitri van Heesch. +# Copyright (C) 1997-2005 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 diff --git a/src/doxytag.t b/src/doxytag.t index 9c521a9..27bd150 100644 --- a/src/doxytag.t +++ b/src/doxytag.t @@ -1,7 +1,7 @@ # # # -# Copyright (C) 1997-2004 by Dimitri van Heesch. +# Copyright (C) 1997-2005 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 diff --git a/src/entry.cpp b/src/entry.cpp index 02fa578..f2ef0c7 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/entry.h b/src/entry.h index 16aef94..fdb56a6 100644 --- a/src/entry.h +++ b/src/entry.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/example.h b/src/example.h index 466816f..984e4bf 100644 --- a/src/example.h +++ b/src/example.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/filedef.cpp b/src/filedef.cpp index 762eca0..ce8a38d 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/filedef.h b/src/filedef.h index a5719ee..6815117 100644 --- a/src/filedef.h +++ b/src/filedef.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/filename.cpp b/src/filename.cpp index c255a6c..76bffe7 100644 --- a/src/filename.cpp +++ b/src/filename.cpp @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/filename.h b/src/filename.h index 336d813..87975d5 100644 --- a/src/filename.h +++ b/src/filename.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/formula.cpp b/src/formula.cpp index 648f250..ac05dc7 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -2,7 +2,7 @@ i * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/formula.h b/src/formula.h index 70c9ca6..f90f0c6 100644 --- a/src/formula.h +++ b/src/formula.h @@ -2,7 +2,7 @@ * * * - * Copyright (C) 1997-2004 by Dimitri van Heesch. + * Copyright (C) 1997-2005 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 diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp index da38392..27310ca 100644 --- a/src/ftvhelp.cpp +++ b/src/ftvhelp.cpp @@ -663,54 +663,64 @@ void FTVHelp::generateTreeView() t << "