Skip to content

D
doxverilog
Commit 583cc329 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files
Options

Release-1.2.4-20010107

parent 0c9bfb1e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1520 additions and 697 deletions
INSTALL
View file @ 583cc329
DOXYGEN Version 1.2.4
DOXYGEN Version 1.2.4-20010107
Please read the installation section of the manual for instructions.
--------
Dimitri van Heesch (24 December 2000)
Dimitri van Heesch (07 January 2001)
LICENSE
View file @ 583cc329
......@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) yyyy <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) yyyy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......
README
View file @ 583cc329
DOXYGEN Version 1.2.4
DOXYGEN Version 1.2.4-20010107
Please read INSTALL for compilation instructions.
......@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at
Enjoy,
Dimitri van Heesch (24 December 2000)
Dimitri van Heesch (07 January 2001)
VERSION
View file @ 583cc329
1.2.4
1.2.4-20010107
addon/configgen/Makefile.in
View file @ 583cc329
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
addon/configgen/config_templ.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/configgen/config_templ.l
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/configgen/configgen.pro.in
View file @ 583cc329
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
addon/configgen/qtbc.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/Makefile.in
View file @ 583cc329
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
addon/doxywizard/doxywizard.pro.in
View file @ 583cc329
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
addon/doxywizard/doxywizard_templ.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/doxywizard_templ.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/inputbool.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/inputbool.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/inputint.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/inputint.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/inputstring.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/inputstring.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/inputstrlist.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/inputstrlist.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/pagewidget.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/pagewidget.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/pixmaps.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/doxywizard/pixmaps.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
addon/xmlread/qtbc.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
configure
View file @ 583cc329
......@@ -2,7 +2,7 @@
#
# $Id$
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
doc/Makefile.in
View file @ 583cc329
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
doc/Makefile.latex
View file @ 583cc329
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
doc/Makefile.win_make.in
View file @ 583cc329
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
doc/Makefile.win_nmake.in
View file @ 583cc329
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
doc/autolink.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/commands.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/config.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -1002,9 +1002,10 @@ TAGFILES = file1=loc1 "file2 = loc2" ... </pre>
have to be run to correct the links.
\par Note:
Each tag file most have a unique name and if a tag file is not located
in the directory in which doxygen is run, you must also specify the
path to the tagfile here.
Each tag file must have a unique name
(where the name does \e not include the path)
If a tag file is not located in the directory in which doxygen
is run, you must also specify the path to the tagfile here.
\anchor cfg_generate_tagfile
<dt>\c GENERATE_TAGFILE <dd>
......
doc/diagrams.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/docblocks.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/doxygen.sty
View file @ 583cc329
%
%
%
% Copyright (C) 1997-2000 by Dimitri van Heesch.
% Copyright (C) 1997-2001 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
......@@ -24,8 +24,8 @@
{\fancyplain{}{\bfseries\rightmark}}
\rhead[\fancyplain{}{\bfseries\leftmark}]
{\fancyplain{}{\bfseries\thepage}}
\rfoot[\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2000}]{}
\lfoot[]{\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2000}}
\rfoot[\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2001}]{}
\lfoot[]{\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2001}}
\cfoot{}
\newenvironment{CompactList}
{\begin{list}{}{
......
doc/doxygen_manual.tex
View file @ 583cc329
%
%
%
% Copyright (C) 1997-2000 by Dimitri van Heesch.
% Copyright (C) 1997-2001 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
......@@ -35,7 +35,7 @@
\begin{center}
Manual for version $VERSION\\[2ex]
Written by Dimitri van Heesch\\[2ex]
\copyright 1997-2000
\copyright 1997-2001
\end{center}
\end{titlepage}
\clearemptydoublepage
......
doc/doxygen_usage.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/doxysearch_usage.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/doxytag_usage.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/doxywizard_usage.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/external.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/faq.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/features.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/formulas.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/grouping.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/history.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/htmlcmds.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/index.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -29,7 +29,7 @@ Version: $(VERSION)
\addindex license
\addindex GPL
Copyright &copy; 1997-2000 by
Copyright &copy; 1997-2001 by
<a href="mailto:dimitri@stack.nl">Dimitri van Heesch</a>.<p>
Permission to use, copy, modify, and distribute this software and its
......
doc/install.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -455,6 +455,10 @@ Compilation is now done by performing the following steps:
<code>doxysearch.exe</code> using Microsoft's Visual C++ compiler
(The compiler should not produce any serious warnings or errors).
You can use also the <code>bcc</code> argument to build
executables using the Borland C++ compiler, or
<code>mingw</code> argument to compile using GNU gcc.
<li>To build the examples, go to the <code>examples</code> subdirectory
and type:
......
doc/installdox_usage.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/language.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/output.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/preprocessing.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/starting.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/todo.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
doc/trouble.doc
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
packages/rpm/doxygen.spec
View file @ 583cc329
Name: doxygen
Version: 1.2.4
Version: 1.2.4-20010107
Summary: documentation system for C, C++ and IDL
Release: 1
Source0: doxygen-%{version}.src.tar.gz
......
qtools/qdir.cpp
View file @ 583cc329
......@@ -1012,14 +1012,10 @@ QStringList qt_makeFilterList( const QString &filter )
if ( filter.isEmpty() )
return QStringList();
int i = filter.find( ' ', 0 );
QChar sep( ' ' );
if ( i == -1 ) {
if ( filter.find( ';', 0 ) != -1 ) {
sep = QChar( ';' );
i = filter.find( sep, 0 );
}
}
QChar sep( ';' );
int i = filter.find( sep, 0 );
if ( i == -1 && filter.find( ' ', 0 ) != -1 )
sep = QChar( ' ' );
QStringList lst = QStringList::split( sep, filter );
QStringList lst2;
......@@ -1027,22 +1023,7 @@ QStringList qt_makeFilterList( const QString &filter )
for ( ; it != lst.end(); ++it ) {
QString s = *it;
if ( s[ (int)s.length() - 1 ] == ';' )
s.remove( s.length() - 1, 1 );
if ( s[0] == '\"' ) {
s.remove( 0, 1 );
while( ++it != lst.end() ) {
QString s2 = *it;
s += " "+s2;
if ( s2[(int)s2.length() -1] == '\"' ) {
s.remove( s.length() -1, 1 );
break;
}
}
}
lst2 << s;
if ( it == lst.end() )
break;
lst2 << s.stripWhiteSpace();
}
return lst2;
}
......
qtools/qdir_win32.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
qtools/qfeatures.h
View file @ 583cc329
......@@ -52,8 +52,6 @@
//
#if defined(QCONFIG_LOCAL)
#include <qconfig-local.h>
#elif defined(QCONFIG_QPE)
#include <qconfig-qpe.h>
#elif defined(QCONFIG_MINIMAL)
#include <qconfig-minimal.h>
#elif defined(QCONFIG_SMALL)
......@@ -367,14 +365,22 @@
Transformed frame buffer
*/
//#define QT_NO_QWS_TRANSFORMED
#if defined(QT_NO_NETWORK)
/*!
Remote frame buffer (VNC)
*/
#define QT_NO_QWS_VNC
# ifndef QT_NO_QWS_VNC
# define QT_NO_QWS_VNC
# endif
#endif
/*!
1-bit monochrome
*/
//#define QT_NO_QWS_DEPTH_1
/*!
4-bit greyscale
*/
//#define QT_NO_QWS_DEPTH_4
/*!
4-bit VGA
*/
......@@ -396,16 +402,32 @@
15 or 16-bit color (define QT_QWS_DEPTH16_RGB as 555 for 15-bit)
*/
//#define QT_NO_QWS_DEPTH_16
/*!
24-bit color
*/
//#define QT_NO_QWS_DEPTH_24
/*!
32-bit color
*/
//#define QT_NO_QWS_DEPTH_32
/*!
Window manager
Window Manager
*/
//#define QT_NO_QWS_MANAGER
/*!
Window Manager Styles
*/
#define QT_NO_QWS_KDE2_WM_STYLE
#if defined( QT_NO_QWS_MANAGER ) || defined( QT_NO_IMAGEIO_XPM )
# define QT_NO_QWS_AQUA_WM_STYLE
# define QT_NO_QWS_BEOS_WM_STYLE
# define QT_NO_QWS_KDE_WM_STYLE
# define QT_NO_QWS_QPE_WM_STYLE
# define QT_NO_QWS_WINDOWS_WM_STYLE
#endif
/*!
Saving of fonts
*/
......
qtools/qfile_win32.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
qtools/qfileinfo_win32.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
qtools/qglobal.cpp
View file @ 583cc329
......@@ -589,8 +589,12 @@ void qObsolete( const char *obj, const char *oldfunc, const char *newfunc )
return;
if ( !firstObsoleteWarning(obj, oldfunc) )
return;
qDebug( "%s::%s: This function is obsolete, use %s instead",
obj, oldfunc, newfunc );
if ( obj )
qDebug( "%s::%s: This function is obsolete, use %s instead.",
obj, oldfunc, newfunc );
else
qDebug( "%s: This function is obsolete, use %s instead.",
oldfunc, newfunc );
}
void qObsolete( const char *obj, const char *oldfunc )
......@@ -599,7 +603,10 @@ void qObsolete( const char *obj, const char *oldfunc )
return;
if ( !firstObsoleteWarning(obj, oldfunc) )
return;
qDebug( "%s::%s: This function is obsolete.", obj, oldfunc );
if ( obj )
qDebug( "%s::%s: This function is obsolete.", obj, oldfunc );
else
qDebug( "%s: This function is obsolete.", oldfunc );
}
void qObsolete( const char *message )
......
qtools/qglobal.h
View file @ 583cc329
......@@ -39,8 +39,8 @@
#define QGLOBAL_H
#define QT_VERSION 222
#define QT_VERSION_STR "2.2.2"
#define QT_VERSION 223
#define QT_VERSION_STR "2.2.3"
//
......@@ -198,10 +198,6 @@
#if __GNUC__ == 2 && __GNUC_MINOR__ >= 95
#define Q_DELETING_VOID_UNDEFINED
#endif
#if __GNUC__ == 2 && __GNUC_MINOR__ >= 96
#define Q_DELETING_VOID_UNDEFINED
#define Q_FP_CCAST_BROKEN
#endif
#if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
#define Q_PACKED __attribute__ ((packed))
#endif
......@@ -224,6 +220,11 @@
#ifdef __EDG__ // UnixWare7
#define Q_HAS_BOOL_TYPE
#endif
#elif defined(__DECCXX)
#define _CC_DEC_
#if __DECCXX_VER >= 60060005
#define Q_HAS_BOOL_TYPE
#endif
#elif defined(__EDG) || defined(__EDG__)
// one observed on SGI DCC, the other documented
#define _CC_EDG_
......@@ -236,14 +237,8 @@
#define _CC_SUN_
#if __SUNPRO_CC >= 0x500
#define Q_HAS_BOOL_TYPE
#define Q_FP_CCAST_BROKEN
#define Q_C_CALLBACKS
#endif
#elif defined(__DECCXX)
#define _CC_DEC_
#if __DECCXX_VER >= 60060005
#define Q_HAS_BOOL_TYPE
#endif
#elif defined(__CDS__)
#define _CC_CDS_
#define Q_HAS_BOOL_TYPE
......
qtools/qstring.cpp
View file @ 583cc329
......@@ -13928,8 +13928,14 @@ uint QString::toUInt( bool *ok, int base ) const
double QString::toDouble( bool *ok ) const
{
char *end;
const char *a = latin1();
double val = strtod( a ? a : "", &end );
QCString a = latin1();
// Just latin1() is not sufficient, since U0131 would look like '1'.
for (uint i=0; i<d->len; i++)
if ( d->unicode[i].row() )
a[(int)i]='z';
double val = strtod( a.data() ? a.data() : "", &end );
if ( ok )
*ok = ( a && *a && ( end == 0 || *end == '\0' ) );
return val;
......
qtools/qtextcodec.cpp
View file @ 583cc329
......@@ -802,7 +802,10 @@ QCString QTextCodec::fromUnicode(const QString& uc) const
*/
QString QTextCodec::toUnicode(const QByteArray& a, int len) const
{
return toUnicode(a.data(),len);
int l = a.size();
if( l > 0 && a.data()[l - 1] == '\0' ) l--;
l = QMIN( l, len );
return toUnicode( a.data(), l );
}
/*!
......@@ -810,7 +813,9 @@ QString QTextCodec::toUnicode(const QByteArray& a, int len) const
*/
QString QTextCodec::toUnicode(const QByteArray& a) const
{
return toUnicode(a.data(),a.size());
int l = a.size();
if( l > 0 && a.data()[l - 1] == '\0' ) l--;
return toUnicode( a.data(), l );
}
/*!
......@@ -976,13 +981,16 @@ public:
const int maxlen=100;
char line[maxlen];
char esc='\\';
char comm='%';
bool incmap = FALSE;
while (iod->readLine(line,maxlen) > 0) {
if (0==qstrnicmp(line,"<code_set_name>",15))
n = line+15;
else if (0==qstrnicmp(line,"<escape_char>",13))
else if (0==qstrnicmp(line,"<escape_char> ",14))
esc = line[14];
else if (0==qstrnicmp(line,"% alias ",8)) {
else if (0==qstrnicmp(line,"<comment_char> ",15))
comm = line[15];
else if (line[0]==comm && 0==qstrnicmp(line+1," alias ",7)) {
aliases.append(line+8);
} else if (0==qstrnicmp(line,"CHARMAP",7)) {
if (!from_unicode_page) {
......@@ -1004,45 +1012,54 @@ public:
char mb[maxmb+1];
int nmb=0;
while (*cursor && *cursor!=' ')
cursor++;
while (*cursor && *cursor!=esc)
cursor++;
byte = getByte(cursor);
if ( *cursor == esc ) {
if ( !to_unicode_multibyte ) {
to_unicode_multibyte = new QMultiByteUnicodeTable[256];
for (int i=0; i<256; i++) {
to_unicode_multibyte[i].unicode = to_unicode[i];
to_unicode_multibyte[i].multibyte = 0;
}
delete [] to_unicode;
to_unicode = 0;
}
QMultiByteUnicodeTable* mbut = to_unicode_multibyte+byte;
mb[nmb++] = byte;
while ( nmb < maxmb && *cursor == esc ) {
// Always at least once
while (*cursor) {
if (cursor[0]=='<' && cursor[1]=='U' &&
cursor[2]>='0' && cursor[2]<='9' &&
cursor[3]>='0' && cursor[3]<='9') {
unicode = strtol(cursor+2,&cursor,16);
} else if (*cursor==esc) {
mbut->unicode = CHAINED;
byte = getByte(cursor);
mb[nmb++] = byte;
if (!mbut->multibyte) {
mbut->multibyte =
new QMultiByteUnicodeTable[256];
if ( *cursor == esc ) {
if ( !to_unicode_multibyte ) {
to_unicode_multibyte =
new QMultiByteUnicodeTable[256];
for (int i=0; i<256; i++) {
to_unicode_multibyte[i].unicode =
to_unicode[i];
to_unicode_multibyte[i].multibyte = 0;
}
delete [] to_unicode;
to_unicode = 0;
}
QMultiByteUnicodeTable* mbut =
to_unicode_multibyte+byte;
mb[nmb++] = byte;
while ( nmb < maxmb && *cursor == esc ) {
// Always at least once
mbut->unicode = CHAINED;
byte = getByte(cursor);
mb[nmb++] = byte;
if (!mbut->multibyte) {
mbut->multibyte =
new QMultiByteUnicodeTable[256];
}
mbut = mbut->multibyte+byte;
mb_unicode = & mbut->unicode;
}
if ( nmb > max_bytes_per_char )
max_bytes_per_char = nmb;
}
mbut = mbut->multibyte+byte;
mb_unicode = & mbut->unicode;
} else {
cursor++;
}
if ( nmb > max_bytes_per_char )
max_bytes_per_char = nmb;
}
while (*cursor && (*cursor!='<' || cursor[1]!='U'))
cursor++;
if ( *cursor )
unicode = strtol(cursor+2,&cursor,16);
if (unicode >= 0 && unicode <= 0xffff)
{
QChar ch((ushort)unicode);
......
qtools/qxml.cpp
View file @ 583cc329
This diff is collapsed.
qtools/qxml.h
View file @ 583cc329
......@@ -322,7 +322,7 @@ private:
// used by parseReference() and parsePEReference()
enum EntityRecognitionContext { InContent, InAttributeValue, InEntityValue, InDTD };
// private methods
// private functions
void eat_ws();
void next_eat_ws();
......@@ -331,6 +331,8 @@ private:
void init( const QXmlInputSource& i );
bool entityExist( const QString& ) const;
bool parseProlog();
bool parseElement();
bool parseElementEmptyTag( bool &t, QString &uri, QString &lname );
......@@ -347,6 +349,7 @@ private:
bool parseNmtoken();
bool parseAttribute();
bool parseReference( bool &charDataRead, EntityRecognitionContext context );
bool processReference( bool &charDataRead, EntityRecognitionContext context );
bool parseExternalID( bool allowPublicID = FALSE );
bool parsePEReference( EntityRecognitionContext context );
......@@ -504,7 +507,15 @@ private:
QXmlDefaultHandlerPrivate *d;
};
#ifdef _WS_QWS_
#ifdef QT_XML_CPP
#define inline
#else
#define QT_NO_XML_INLINE
#endif
#endif
#ifndef QT_NO_XML_INLINE
//
// inlines
//
......@@ -640,6 +651,14 @@ inline void QXmlSimpleReader::refAddC(const QChar& ch)
}
refArray[refPos++] = ch;
}
#endif
#ifdef _WS_QWS_
#ifdef QT_XML_CPP
#undef inline
#endif
#endif
#endif //QT_NO_XML
#endif
src/Makefile.in
View file @ 583cc329
......@@ -2,7 +2,7 @@
#
#
#
# Copyright (C) 1997-2000 by Dimitri van Heesch.
# Copyright (C) 1997-2001 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
......
src/bufstr.h 0 → 100644
View file @ 583cc329
/******************************************************************************
*
*
*
*
* Copyright (C) 1997-2001 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
* granted. No representations are made about the suitability of this software
* for any purpose. It is provided "as is" without express or implied warranty.
* See the GNU General Public License for more details.
*
* Documents produced by Doxygen are derivative works derived from the
* input used in their production; they are not affected by this license.
*
*/
#ifndef _BUFSTR_H
#define _BUFSTR_H
#include "qtbc.h"
/*! String that can deal more efficiently with large large numbers
* of resizing.
*/
class BufStr : public QCString
{
public:
BufStr(int size) : QCString(size), offset(0), spareRoom(10240) {}
void addChar(char c)
{
if (offset>=size())
{
resize(size()+spareRoom);
}
data()[offset++]=c;
}
void addArray(const char *a,int len)
{
if (offset+len>=size())
{
resize(size()+len+spareRoom);
}
memcpy(data()+offset,a,len);
offset+=len;
}
uint curPos() { return offset; }
void skip(uint s)
{
if (offset+s>=size())
{
resize(size()+s+spareRoom);
}
offset+=s;
}
private:
uint offset;
const int spareRoom; // 10Kb extra room to avoid frequent resizing
};
#endif
src/classdef.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -51,15 +51,8 @@ ClassDef::ClassDef(
{
//name=n;
QCString compoundName;
switch(ct)
{
case Class: compoundName="class"; break;
case Struct: compoundName="struct"; break;
case Union: compoundName="union"; break;
case Interface: compoundName="interface"; break;
case Exception: compoundName="exception"; break;
}
compType=ct;
QCString compoundName=compoundTypeString();
if (fName)
fileName=stripExtension(fName);
else
......@@ -86,7 +79,6 @@ ClassDef::ClassDef(
allMemberNameInfoDict = new MemberNameInfoDict(1009);
visited=FALSE;
setReference(lref);
compType=ct;
incInfo=0;
tempArgs=0;
prot=Public;
......@@ -654,13 +646,10 @@ void ClassDef::writeDocumentation(OutputList &ol)
QCString pageTitle=name().copy();
QCString pageType;
ArgumentList *outerTempArgList = outerTemplateArguments();
switch(compType)
{
case Class: pageType+=" Class"; break;
case Struct: pageType+=" Struct"; break;
case Union: pageType+=" Union"; break;
default: pageType+=" Interface"; break;
}
QCString cType=compoundTypeString();
toupper(cType.at(0));
pageType+=" ";
pageType+=cType;
pageTitle+=pageType+" Reference";
if (outerTempArgList) pageTitle.prepend(" Template");
startFile(ol,fileName,pageTitle);
......@@ -732,15 +721,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
if (!Config::genTagFile.isEmpty())
{
tagFile << " <compound kind=\"";
switch(compType)
{
case Class: tagFile << "class"; break;
case Struct: tagFile << "struct"; break;
case Union: tagFile << "union"; break;
case Interface: tagFile << "interface"; break;
case Exception: tagFile << "exception"; break;
}
tagFile << " <compound kind=\"" << compoundTypeString();
tagFile << "\">" << endl;
tagFile << " <name>" << convertToXML(name()) << "</name>" << endl;
tagFile << " <filename>" << convertToXML(fileName) << ".html</filename>" << endl;
......@@ -1891,15 +1872,8 @@ void ClassDef::generateXML(QTextStream &t)
{
if (name().find('@')!=-1) return; // skip anonymous compounds
t << " <compounddef id=\""
<< getOutputFileBase() << "\" type=\"";
switch(compType)
{
case Class: t << "class"; break;
case Struct: t << "struct"; break;
case Union: t << "union"; break;
default: t << "interface"; break;
}
t << "\">" << endl;
<< getOutputFileBase() << "\" type=\""
<< compoundTypeString() << "\">" << endl;
t << " <compoundname>";
writeXMLString(t,name());
t << "</compoundname>" << endl;
......@@ -1996,3 +1970,22 @@ void ClassDef::generateXML(QTextStream &t)
}
t << " </compounddef>" << endl;
}
PackageDef *ClassDef::packageDef() const
{
return fileDef ? fileDef->packageDef() : 0;
}
QCString ClassDef::compoundTypeString() const
{
switch (compType)
{
case Class: return "class";
case Struct: return "struct";
case Union: return "union";
case Interface: return "interface";
case Exception: return "exception";
}
return "unknown";
}
src/classdef.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -43,6 +43,7 @@ class UsesClassDict;
class MemberGroupList;
class MemberGroupDict;
class QTextStream;
class PackageDef;
struct IncludeInfo;
class ClassDef : public Definition
......@@ -62,6 +63,7 @@ class ClassDef : public Definition
QCString getOutputFileBase() const { return fileName; }
QCString displayName() const;
CompoundType compoundType() const { return compType; }
QCString compoundTypeString() const;
void insertBaseClass(ClassDef *,Protection p,Specifier s,const char *t=0);
BaseClassList *baseClasses() { return inherits; }
void insertSuperClass(ClassDef *,Protection p,Specifier s,const char *t=0);
......@@ -126,6 +128,8 @@ class ClassDef : public Definition
void generateXML(QTextStream &t);
void generateXMLSection(QTextStream &t,MemberList *ml,const char *type);
PackageDef *packageDef() const;
protected:
void addUsedInterfaceClasses(MemberDef *md,const char *typeStr);
......
src/classlist.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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,7 +48,7 @@ ClassListIterator::ClassListIterator(const ClassList &cllist) :
{
}
void ClassList::writeDeclaration(OutputList &ol)
void ClassList::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *filter,const char *header)
{
if (count()>0)
{
......@@ -56,7 +56,9 @@ void ClassList::writeDeclaration(OutputList &ol)
bool found=FALSE;
while (cd)
{
if (cd->name().find('@')==-1)
if (cd->name().find('@')==-1 &&
(filter==0 || *filter==cd->compoundType())
)
{
bool isLink = cd->isLinkable();
if (isLink || !Config::hideClassFlag)
......@@ -64,24 +66,25 @@ void ClassList::writeDeclaration(OutputList &ol)
if (!found)
{
ol.startMemberHeader();
parseText(ol,theTranslator->trCompounds());
if (header)
{
parseText(ol,header);
}
else
{
parseText(ol,theTranslator->trCompounds());
}
ol.endMemberHeader();
ol.startMemberList();
found=TRUE;
}
if (!Config::genTagFile.isEmpty())
{
tagFile << " <class>" << convertToXML(cd->name()) << "</class>" << endl;
tagFile << " <class kind=\"" << cd->compoundTypeString()
<< "\">" << convertToXML(cd->name()) << "</class>" << endl;
}
ol.startMemberItem(FALSE);
switch (cd->compoundType())
{
case ClassDef::Class: ol.writeString("class"); break;
case ClassDef::Struct: ol.writeString("struct"); break;
case ClassDef::Union: ol.writeString("union"); break;
case ClassDef::Interface: ol.writeString("interface"); break;
case ClassDef::Exception: ol.writeString("exception"); break;
}
ol.writeString(cd->compoundTypeString());
ol.writeString(" ");
ol.insertMemberAlign();
if (isLink)
......
src/classlist.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -30,7 +30,8 @@ class ClassList : public QList<ClassDef>
~ClassList();
int compareItems(GCI item1,GCI item2);
void writeDeclaration(OutputList &ol);
void writeDeclaration(OutputList &ol,const ClassDef::CompoundType *filter=0,
const char *header=0);
};
class ClassListIterator : public QListIterator<ClassDef>
......
src/code.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/code.l
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -1009,7 +1009,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
addType();
g_name+=yytext;
}
<Body>{SCOPENAME}{B}*"<"[^\n\"\>]*">"/{B}* { // A<T> *pt;
<Body>{SCOPENAME}{B}*"<"[^\n\/\{\"\>]*">"/{B}* { // A<T> *pt;
generateClassLink(*g_code,yytext);
addType();
g_name+=yytext;
......@@ -1129,6 +1129,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
g_name.resize(0);
}
if (*yytext!=',') g_type.resize(0);
if (*yytext==';') g_name.resize(0);
g_args.resize(0);
}
<Body>"]" {
......
src/config.h
View file @ 583cc329
......@@ -8,7 +8,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/config.l
View file @ 583cc329
......@@ -8,7 +8,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/constexp.h
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/constexp.l
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/cppvalue.cpp
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/cppvalue.h
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/debug.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/debug.h
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/declinfo.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/declinfo.l
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -114,7 +114,7 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+)
name += yytext;
BEGIN(Operator);
}
<Start>(~{B}*)?{ID} {
<Start>(~{B}*)?{ID}({B}*"["{B}*"]")* { // the []'s are for Java
addTypeName();
name += yytext;
}
......@@ -228,6 +228,13 @@ void parseFuncDecl(const QCString &decl,QCString &cl,QCString &ctl,QCString &t,
//printf("type=`%s' class=`%s' name=`%s' args=`%s'\n",
// type.data(),scope.data(),name.data(),args.data());
int nb = name.findRev('[');
if (nb!=-1) // correct for [] in name ambigity (due to Java return type allowing [])
{
args.prepend(name.right(name.length()-nb));
name=name.left(nb);
}
cl=scope.copy();
//printf("scope=`%s'\n",scope.data());
int il=0,ir=0;
......
src/defargs.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/defargs.l
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/define.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/define.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/definition.cpp
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/definition.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -33,7 +33,10 @@ class Definition
{
public:
/*! Types of derived classes */
enum DefType { TypeClass, TypeMember, TypeFile, TypeGroup, TypeNamespace };
enum DefType
{
TypeClass, TypeMember, TypeFile, TypeGroup, TypeNamespace, TypePackage
};
/*! Use this for dynamic inspection of the derived class */
virtual DefType definitionType() = 0;
......
src/diagram.cpp
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/diagram.h
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/doc.h
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/doc.l
View file @ 583cc329
......@@ -2,7 +2,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......@@ -804,6 +804,7 @@ TR [tT][rR]
TT [tT][tT]
UL [uU][lL]
VAR [vV][aA][rR]
BLOCKQUOTE [bB][lL][oO][cC][kK][qQ][uU][oO][tT][eE]
DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"")
%option noyywrap
......@@ -821,6 +822,7 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"")
%x DocCodeBlock
%x DocInternal
%x DocLink
%x DocJavaLink
%x DocLinkText
%x DocSkipWord
%x DocInclude
......@@ -959,12 +961,25 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"")
scanString(theTranslator->trReimplementedForInternalReasons()+"\n");
}
<DocScan>{CMD}"link"/{BN} { BEGIN( DocLink ); }
<DocScan>"{"{CMD}"link"{BN}+ { BEGIN( DocJavaLink ); }
<DocSkipWord>[a-z_A-Z0-9.:()]+ { BEGIN( DocScan ); }
<DocLink>[a-z_A-Z0-9:#.,~&*/<>()\-\+]+ { // TODO: support operators as well!
<DocLink>[a-z_A-Z0-9:#.,~&*/\[\]<>()\-\+]+ { // TODO: support operators as well!
linkRef = stripKnownExtensions(yytext);
linkText = "";
BEGIN( DocLinkText );
}
<DocJavaLink>([a-z_A-Z0-9]+".")+ { /* Skip scope prefix (TODO: fix) */ }
<DocJavaLink>([a-z_A-Z0-9]+"#")?[a-z_A-Z0-9]+("("[a-z_A-Z0-9.,~&*()\[\]]*")")? { // TODO: support operators as well!
linkRef = yytext;
}
<DocJavaLink>"}" {
//printf("Trying to link `%s'\n",linkRef.data());
if (!generateLink(*outDoc,className,linkRef,inSeeBlock,0))
{
warn(yyFileName,yyLineNr,"Warning: link to unknown entity `%s' in the documentation of this entity!",linkRef.data());
}
BEGIN( DocScan );
}
<DocLinkText>. { linkText += *yytext; }
<DocLinkText>"\n" { linkText += " "; }
<DocLink,DocLinkText>{CMD}"endlink" { // <- needed for things like \endlink.
......@@ -972,7 +987,7 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"")
// className.data(),linkRef.data(),linkText.data());
if (!generateLink(*outDoc,className,linkRef,inSeeBlock,linkText.stripWhiteSpace()))
{
warn(yyFileName,yyLineNr,"Warning: link to unknown section %s in the documentation of this entity!",linkRef.data());
warn(yyFileName,yyLineNr,"Warning: link to unknown entity `%s' in the documentation of this entity!",linkRef.data());
}
BEGIN( DocScan );
}
......@@ -1718,13 +1733,13 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"")
generateRef(*outDoc,className,yytext,inSeeBlock);
BEGIN(DocScan);
}
<DocScan,DocRefName>({SCOPEMASK}"::")?"operator()("[a-z_A-Z0-9,\<\> \t\*\&]*")" {
<DocScan,DocRefName>({SCOPEMASK}"::")?"operator()"("("[a-z_A-Z0-9,\<\> \t\*\&]*")")? {
QCString oName=yytext;
generateRef(*outDoc,className,
removeRedundantWhiteSpace(oName),inSeeBlock);
BEGIN(DocScan);
}
<DocScan,DocRefName>({SCOPEMASK}"::")?"operator"[^(\r\n.,]+"("[a-z_A-Z0-9,\<\> \t\*\&]*")" {
<DocScan,DocRefName>({SCOPEMASK}"::")?"operator"[^(\r\n.,]+("("[a-z_A-Z0-9,\<\> \t\*\&]*")")? {
QCString oName=yytext;
generateRef(*outDoc,className,
removeRedundantWhiteSpace(oName),inSeeBlock);
......@@ -1827,6 +1842,8 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"")
<DocScan>"</"{HEAD}{ATTR}">"
<DocScan>"<"{BODY}{ATTR}">"
<DocScan>"</"{BODY}{ATTR}">"
<DocScan>"<"{BLOCKQUOTE}{ATTR}">"
<DocScan>"</"{BLOCKQUOTE}{ATTR}">"
<DocScan>"<"{CODE}{ATTR}">" { outDoc->startTypewriter(); }
<DocScan>"</"{CODE}{ATTR}">" { outDoc->endTypewriter(); }
<DocScan>"<"{DFN}{ATTR}">" { outDoc->startTypewriter(); }
......
src/dot.cpp
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/dot.h
View file @ 583cc329
......@@ -3,7 +3,7 @@
*
*
*
* Copyright (C) 1997-2000 by Dimitri van Heesch.
* Copyright (C) 1997-2001 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
......
src/doxygen.cpp
View file @ 583cc329
This diff is collapsed.
src/doxygen.h
View file @ 583cc329
This diff is collapsed.
src/doxygen.pro.in
View file @ 583cc329
This diff is collapsed.
src/doxygen.t
View file @ 583cc329
This diff is collapsed.
src/doxysearch.cpp
View file @ 583cc329
This diff is collapsed.
src/doxytag.l
View file @ 583cc329
This diff is collapsed.
src/entry.cpp
View file @ 583cc329
This diff is collapsed.
src/entry.h
View file @ 583cc329
This diff is collapsed.
src/example.h
View file @ 583cc329
This diff is collapsed.
src/filedef.cpp
View file @ 583cc329
This diff is collapsed.
src/filedef.h
View file @ 583cc329
This diff is collapsed.
src/filename.cpp
View file @ 583cc329
This diff is collapsed.
src/filename.h
View file @ 583cc329
This diff is collapsed.
src/formula.cpp
View file @ 583cc329
This diff is collapsed.
src/formula.h
View file @ 583cc329
This diff is collapsed.
src/gifenc.cpp
View file @ 583cc329
This diff is collapsed.
src/gifenc.h
View file @ 583cc329
This diff is collapsed.
src/groupdef.cpp
View file @ 583cc329
This diff is collapsed.
src/groupdef.h
View file @ 583cc329
This diff is collapsed.
src/htmlgen.cpp
View file @ 583cc329
This diff is collapsed.
src/htmlgen.h
View file @ 583cc329
This diff is collapsed.
src/htmlhelp.cpp
View file @ 583cc329
This diff is collapsed.
src/htmlhelp.h
View file @ 583cc329
This diff is collapsed.
src/image.cpp
View file @ 583cc329
This diff is collapsed.
src/image.h
View file @ 583cc329
This diff is collapsed.
src/index.cpp
View file @ 583cc329
This diff is collapsed.
src/index.h
View file @ 583cc329
This diff is collapsed.
src/instdox.cpp
View file @ 583cc329
This diff is collapsed.
src/instdox.h
View file @ 583cc329
This diff is collapsed.
src/language.cpp
View file @ 583cc329
This diff is collapsed.
src/language.h
View file @ 583cc329
This diff is collapsed.
src/latexgen.cpp
View file @ 583cc329
This diff is collapsed.
src/latexgen.h
View file @ 583cc329
This diff is collapsed.
src/logos.cpp
View file @ 583cc329
This diff is collapsed.
src/logos.h
View file @ 583cc329
This diff is collapsed.
src/mangen.cpp
View file @ 583cc329
This diff is collapsed.
src/mangen.h
View file @ 583cc329
This diff is collapsed.
src/memberdef.cpp
View file @ 583cc329
This diff is collapsed.
src/memberdef.h
View file @ 583cc329
This diff is collapsed.
src/membergroup.cpp
View file @ 583cc329
This diff is collapsed.
src/membergroup.h
View file @ 583cc329
This diff is collapsed.
src/memberlist.cpp
View file @ 583cc329
This diff is collapsed.
src/memberlist.h
View file @ 583cc329
This diff is collapsed.
src/membername.cpp
View file @ 583cc329
This diff is collapsed.
src/membername.h
View file @ 583cc329
This diff is collapsed.
src/message.cpp
View file @ 583cc329
This diff is collapsed.
src/message.h
View file @ 583cc329
This diff is collapsed.
src/namespacedef.cpp
View file @ 583cc329
This diff is collapsed.
src/namespacedef.h
View file @ 583cc329
This diff is collapsed.
src/outputgen.cpp
View file @ 583cc329
This diff is collapsed.
src/outputgen.h
View file @ 583cc329
This diff is collapsed.
src/outputlist.cpp
View file @ 583cc329
This diff is collapsed.
src/outputlist.h
View file @ 583cc329
This diff is collapsed.
src/packagedef.cpp 0 → 100644
View file @ 583cc329
This diff is collapsed.
src/packagedef.h 0 → 100644
View file @ 583cc329
This diff is collapsed.
src/page.h
View file @ 583cc329
This diff is collapsed.
src/pre.h
View file @ 583cc329
This diff is collapsed.
src/pre.l
View file @ 583cc329
This diff is collapsed.
src/qtbc.h
View file @ 583cc329
This diff is collapsed.
src/reflist.cpp
View file @ 583cc329
This diff is collapsed.
src/reflist.h
View file @ 583cc329
This diff is collapsed.
src/rtfgen.cpp
View file @ 583cc329
This diff is collapsed.
src/rtfgen.h
View file @ 583cc329
This diff is collapsed.
src/scanner.h
View file @ 583cc329
This diff is collapsed.
src/scanner.l
View file @ 583cc329
This diff is collapsed.
src/searchindex.cpp
View file @ 583cc329
This diff is collapsed.
src/searchindex.h
View file @ 583cc329
This diff is collapsed.
src/section.h
View file @ 583cc329
This diff is collapsed.
src/sortdict.h
View file @ 583cc329
This diff is collapsed.
src/suffixtree.cpp
View file @ 583cc329
This diff is collapsed.
src/suffixtree.h
View file @ 583cc329
This diff is collapsed.
src/tagreader.cpp
View file @ 583cc329
This diff is collapsed.
src/tagreader.h
View file @ 583cc329
This diff is collapsed.
src/translator.h
View file @ 583cc329
This diff is collapsed.
src/translator_cn.h
View file @ 583cc329
This diff is collapsed.
src/translator_cz.h
View file @ 583cc329
This diff is collapsed.
src/translator_de.h
View file @ 583cc329
This diff is collapsed.
src/translator_es.h
View file @ 583cc329
This diff is collapsed.
src/translator_fi.h
View file @ 583cc329
This diff is collapsed.
src/translator_fr.h
View file @ 583cc329
This diff is collapsed.
src/translator_hr.h
View file @ 583cc329
This diff is collapsed.
src/translator_hu.h
View file @ 583cc329
This diff is collapsed.
src/translator_it.h
View file @ 583cc329
This diff is collapsed.
src/translator_jp.h
View file @ 583cc329
This diff is collapsed.
src/translator_kr.h
View file @ 583cc329
This diff is collapsed.
src/translator_nl.h
View file @ 583cc329
This diff is collapsed.
src/translator_no.h
View file @ 583cc329
This diff is collapsed.
src/translator_pl.h
View file @ 583cc329
This diff is collapsed.
src/translator_pt.h
View file @ 583cc329
This diff is collapsed.
src/translator_ro.h
View file @ 583cc329
This diff is collapsed.
src/translator_se.h
View file @ 583cc329
This diff is collapsed.
src/translator_si.h
View file @ 583cc329
This diff is collapsed.
src/util.cpp
View file @ 583cc329
This diff is collapsed.
src/util.h
View file @ 583cc329
This diff is collapsed.
src/version.h
View file @ 583cc329
This diff is collapsed.
src/xml.cpp
View file @ 583cc329
This diff is collapsed.
src/xml.h
View file @ 583cc329
This diff is collapsed.
wintools/make.pl
View file @ 583cc329
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment