Skip to content

D
doxverilog
Commit 46361b70 authored by dimitri's avatar dimitri
Browse files
Options

Release-1.3.7-20040718

parent e6e861e8
Hide whitespace changes
Inline Side-by-side
Showing with 2213 additions and 174 deletions
.cvsignore 0 → 100644
View file @ 46361b70
Makefile
.makeconfig
.tmakeconfig
INSTALL
View file @ 46361b70
DOXYGEN Version 1.3.7-20040704 DOXYGEN Version 1.3.7-20040718
Please read the installation section of the manual Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions. (http://www.doxygen.org/install.html) for instructions.
-------- --------
Dimitri van Heesch (04 July 2004) Dimitri van Heesch (18 July 2004)
README
View file @ 46361b70
DOXYGEN Version 1.3.7_20040704 DOXYGEN Version 1.3.7_20040718
Please read INSTALL for compilation instructions. Please read INSTALL for compilation instructions.
...@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. ...@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
Enjoy, Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (04 July 2004) Dimitri van Heesch (dimitri@stack.nl) (18 July 2004)
VERSION
View file @ 46361b70
1.3.7-20040704 1.3.7-20040718
addon/doxmlparser/src/.cvsignore 0 → 100644
View file @ 46361b70
Makefile
doxmlparser.pro
addon/doxywizard/.cvsignore 0 → 100644
View file @ 46361b70
Makefile
doxywizard.pro
\ No newline at end of file
addon/doxywizard/doxywizard.cpp
View file @ 46361b70
...@@ -308,24 +308,6 @@ Step3::Step3(QWidget *parent) : QWidget(parent,"Step3") ...@@ -308,24 +308,6 @@ Step3::Step3(QWidget *parent) : QWidget(parent,"Step3")
bg->setButton(0); bg->setButton(0);
layout->addWidget(bg); layout->addWidget(bg);
//w = new QWidget( this );
//bl = new QHBoxLayout(w);
//bl->addWidget(new QLabel("Select the output language:",w));
//m_outputLang = new QComboBox(w);
//m_outputLang->setMinimumSize(m_outputLang->sizeHint());
//bl->setSpacing(10);
//bl->addWidget(m_outputLang);
//bl->addStretch(1);
//m_outputLang->insertItem("English");
//m_outputLang->insertItem("Dutch");
//m_outputLang->insertItem("German");
//m_outputLang->insertItem("Spanish");
//m_outputLang->insertItem("French");
//m_outputLang->insertItem("Chinese");
//m_outputLang->insertItem("Japanese");
//m_outputLang->insertItem("Korean");
//layout->addWidget(w);
layout->addStretch(1); layout->addStretch(1);
connect(m_latexEnabled,SIGNAL(stateChanged(int)), connect(m_latexEnabled,SIGNAL(stateChanged(int)),
...@@ -558,9 +540,9 @@ void Step4::setDiagramMode(DiagramMode mode) ...@@ -558,9 +540,9 @@ void Step4::setDiagramMode(DiagramMode mode)
{ {
switch(mode) switch(mode)
{ {
case DM_None: m_diagramMode->setButton(0); break; case DM_None: m_diagramMode->setButton(0); diagramModeChanged(0); break;
case DM_Builtin: m_diagramMode->setButton(1); break; case DM_Builtin: m_diagramMode->setButton(1); diagramModeChanged(1); break;
case DM_Dot: m_diagramMode->setButton(2); break; case DM_Dot: m_diagramMode->setButton(2); diagramModeChanged(2); break;
} }
} }
...@@ -654,6 +636,12 @@ MainWidget::MainWidget(QWidget *parent) ...@@ -654,6 +636,12 @@ MainWidget::MainWidget(QWidget *parent)
// initialize config settings // initialize config settings
Config::instance()->init(); Config::instance()->init();
Config::instance()->check(); 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;
#endif
QWidget *w = new QWidget(this); QWidget *w = new QWidget(this);
setCentralWidget(w); setCentralWidget(w);
...@@ -1130,7 +1118,10 @@ void MainWidget::launchExpert() ...@@ -1130,7 +1118,10 @@ void MainWidget::launchExpert()
expert.init(); expert.init();
expert.exec(); expert.exec();
#if defined(Q_OS_MACX) #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_getString("DOT_PATH")=getResourcePath();
Config_getBool("HAVE_DOT")=TRUE;
#endif #endif
setConfigSaved(FALSE); setConfigSaved(FALSE);
} }
...@@ -1183,6 +1174,13 @@ void MainWidget::resetConfig() ...@@ -1183,6 +1174,13 @@ void MainWidget::resetConfig()
{ {
// initialize config settings // initialize config settings
Config::instance()->init(); 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;
#endif
m_configFileName = ""; m_configFileName = "";
setConfigSaved(FALSE); setConfigSaved(FALSE);
statusBar()->message("Configuration settings reset to their defaults",messageTimeout); statusBar()->message("Configuration settings reset to their defaults",messageTimeout);
......
addon/doxywizard/doxywizard.pro.in
View file @ 46361b70
...@@ -53,7 +53,7 @@ win32:INCLUDEPATH += . ...@@ -53,7 +53,7 @@ win32:INCLUDEPATH += .
macosx-c++:LIBS+=-framework CoreFoundation -framework ApplicationServices macosx-c++:LIBS+=-framework CoreFoundation -framework ApplicationServices
# extra link options # extra link options
win32:TMAKE_LFLAGS = /NODEFAULTLIB:msvcrt.lib win32:TMAKE_LFLAGS = /NODEFAULTLIB:msvcrt.lib doxywizard.res
win32:TMAKE_LIBS = $(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\qt-mt332.lib user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib win32:TMAKE_LIBS = $(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\qt-mt332.lib user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib
win32:TMAKE_LIBS_QT = win32:TMAKE_LIBS_QT =
configure
View file @ 46361b70
...@@ -28,7 +28,7 @@ f_insttool=NO ...@@ -28,7 +28,7 @@ f_insttool=NO
f_english=NO f_english=NO
f_wizard=NO f_wizard=NO
f_thread=NO f_thread=NO
f_langs=nl,se,cz,fr,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt f_langs=nl,se,cz,fr,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt,za
while test -n "$1"; do while test -n "$1"; do
case $1 in case $1 in
...@@ -111,7 +111,7 @@ Options: ...@@ -111,7 +111,7 @@ Options:
See PLATFORMS for a list of possibilities See PLATFORMS for a list of possibilities
--prefix dir Installation prefix directory (doxygen will be --prefix dir Installation prefix directory (doxygen will be
put in PREFIX/bin/doxygen) put in PREFIX/bin/doxygen)
[default: /usr] [default: $f_prefix]
--docdir dir Documentation is installed in DOCDIR/doxygen/ --docdir dir Documentation is installed in DOCDIR/doxygen/
[default: PREFIX/share/doc/packages] [default: PREFIX/share/doc/packages]
--install name Use \`name' as the name of the GNU install tool --install name Use \`name' as the name of the GNU install tool
...@@ -527,7 +527,7 @@ echo -n " Generating src/lang_cfg.h..." ...@@ -527,7 +527,7 @@ echo -n " Generating src/lang_cfg.h..."
echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>); echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>);
chomp @l; chomp @l;
@allowed=(NL,SE,CZ,FR,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,BR, @allowed=(NL,SE,CZ,FR,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,BR,
DK,SK,UA,GR,TW,SR,CA,LT); DK,SK,UA,GR,TW,SR,CA,LT,ZA);
foreach my $elem (@l){ foreach my $elem (@l){
$elem =~ tr/a-z/A-Z/; $elem =~ tr/a-z/A-Z/;
$r=0; $r=0;
......
doc/commands.doc
View file @ 46361b70
...@@ -108,11 +108,18 @@ documentation: ...@@ -108,11 +108,18 @@ documentation:
\refitem cmdpackage \\package \refitem cmdpackage \\package
\refitem cmdpage \\page \refitem cmdpage \\page
\refitem cmdpar \\par \refitem cmdpar \\par
\refitem cmdparagraph \\paragraph
\refitem cmdparam \\param \refitem cmdparam \\param
\refitem cmdpost \\post \refitem cmdpost \\post
\refitem cmdpre \\pre \refitem cmdpre \\pre
\refitem cmd_php_only \\private (PHP only)
\refitem cmd_php_only \\privatesection (PHP only)
\refitem cmdproperty \\property \refitem cmdproperty \\property
\refitem cmd_php_only \\protected (PHP only)
\refitem cmd_php_only \\protectedsection (PHP only)
\refitem cmdprotocol \\protocol \refitem cmdprotocol \\protocol
\refitem cmd_php_only \\public (PHP only)
\refitem cmd_php_only \\publicsection (PHP only)
\refitem cmdref \\ref \refitem cmdref \\ref
\refitem cmdrelates \\relates \refitem cmdrelates \\relates
\refitem cmdrelatesalso \\relatesalso \refitem cmdrelatesalso \\relatesalso
...@@ -2010,10 +2017,21 @@ class C {}; ...@@ -2010,10 +2017,21 @@ class C {};
prevent auto-linking to word that is also a documented class or struct. prevent auto-linking to word that is also a documented class or struct.
<hr> <hr>
<hr> \section cmd_php_only PHP only commands
For PHP files there are a number of additional commands, that can be
used inside classes to make members public, private, or protected even
though the language itself doesn't support this notion.
To mark a single item use one of \\private, \\protected, \\public.
For starting a section with a certain protection level use one of:
\\privatesection, \\protectedsection, \\publicsection.
The latter commands are similar to
"private:", "protected:", and "public:" in C++.
<h2>\htmlonly <center> --- \endhtmlonly <h2>\htmlonly <center> --- \endhtmlonly
Commands included for Qt compatibility Commands included for Qt compatibility
\htmlonly --- </center>\endhtmlonly</h2> \htmlonly --- </center>\endhtmlonly</h2>
<hr>
The following commands are supported to remain compatible to the Qt class The following commands are supported to remain compatible to the Qt class
browser generator. Do \e not use these commands in your own documentation. browser generator. Do \e not use these commands in your own documentation.
...@@ -2028,16 +2046,7 @@ browser generator. Do \e not use these commands in your own documentation. ...@@ -2028,16 +2046,7 @@ browser generator. Do \e not use these commands in your own documentation.
<li>\\l <li>\\l
<li>\\postheader <li>\\postheader
</ul> </ul>
<hr>
For PHP files there are a number of additional commands, that can be
used inside classes to make members public, private, or protected even
though the language itself doesn't support this notion.
To mark a single item use one of \\private, \\protected, \\public.
For starting a section with a certain protection level use one of:
\\privatesection, \\protectedsection, \\publicsection.
The latter commands are similar to
"private:", "protected:", and "public:" in C++.
*/ */
doc/config.doc
View file @ 46361b70
...@@ -97,6 +97,7 @@ followed by the descriptions of the tags grouped by category. ...@@ -97,6 +97,7 @@ followed by the descriptions of the tags grouped by category.
\refitem cfg_extract_private EXTRACT_PRIVATE \refitem cfg_extract_private EXTRACT_PRIVATE
\refitem cfg_extract_static EXTRACT_STATIC \refitem cfg_extract_static EXTRACT_STATIC
\refitem cfg_file_patterns FILE_PATTERNS \refitem cfg_file_patterns FILE_PATTERNS
\refitem cfg_filter_patterns FILTER_PATTERNS
\refitem cfg_filter_source_files FILTER_SOURCE_FILES \refitem cfg_filter_source_files FILTER_SOURCE_FILES
\refitem cfg_full_path_names FULL_PATH_NAMES \refitem cfg_full_path_names FULL_PATH_NAMES
\refitem cfg_generate_autogen_def GENERATE_AUTOGEN_DEF \refitem cfg_generate_autogen_def GENERATE_AUTOGEN_DEF
...@@ -777,6 +778,16 @@ function's detailed documentation block. ...@@ -777,6 +778,16 @@ function's detailed documentation block.
input file. Doxygen will then use the output that the filter program writes input file. Doxygen will then use the output that the filter program writes
to standard output. to standard output.
\anchor cfg_filter_patterns
<dt>\c FILTER_PATTERNS <dd>
\addindex FILTER_PATTERNS
The \c FILTER_PATTERNS tag can be used to specify filters on a per file pattern
basis. Doxygen will compare the file name with each pattern and apply the
filter if there is a match. The filters are a list of the form:
pattern=filter (like <code>*.cpp=my_cpp_filter</code>). See \c INPUT_FILTER for further
info on how filters are used. If \c FILTER_PATTERNS is empty, \c INPUT_FILTER
is applied to all files.
\anchor cfg_filter_source_files \anchor cfg_filter_source_files
<dt>\c FILTER_SOURCE_FILES <dd> <dt>\c FILTER_SOURCE_FILES <dd>
\addindex FILTER_SOURCE_FILES \addindex FILTER_SOURCE_FILES
......
doc/doxywizard_usage.doc
View file @ 46361b70
...@@ -16,13 +16,77 @@ ...@@ -16,13 +16,77 @@
*/ */
/*! \page doxywizard_usage Doxywizard usage /*! \page doxywizard_usage Doxywizard usage
Doxywizard is a GUI front-end for creating and editing Doxywizard is a GUI front-end for configuring and running doxygen.
configuration files that are used by doxygen.
Doxywizard consists of a single executable that, when started, When you start doxywizard it will display the main window
pops up a window. (the actual look depends on the OS used).
The main window has a number of tab field, one \image html doxywizard_main.png "Main window"
The windows shows the steps to take to configure and run doxygen.
The first step is to choose one of the ways to configure doxygen.
<dl>
<dt>Wizard<dd>Click this button to quickly configure the most important
settings and leave the rest of the options to their defaults.
<dt>Expert<dd>Click this button to to gain access to the
\ref config "full range of configuration options".
<dt>Load<dd>Click this button to load an existing configuration file
from disk.
</dl>
Note that you can select multiple buttons in a row, for instance to first
configure doxygen using the Wizard and then fine tune the settings via
the Expert.
After doxygen is configured you need to save the configuration as a file
to disk. This second step allows doxygen to use the configuration
and has the additional advantage that the configuration can be reused
to run doxygen with the same settings at a later point in time.
Since some configuration options may use relative paths, the next step is
to select a directory from which to run doxygen. This is typically the root
of the source tree and will most of the time already be filled in correctly.
Once the configuration file is saved and the working directory is set, you
can run doxygen based on the selected settings. Do this by pressing the
"Start" button. Once doxygen runs you can cancel it by clicking the same
button again. The output produced by doxygen is captured and shown in a log
window. Once doxygen finishes, the log can be saved as a text file.
<h3>The Wizard Dialog</h3>
If you select the Wizard button in step 1, then a dialog with
a number of tabs will appear.
\image html doxywizard_page1.png "Wizard dialog: Project settings"
The fields in the project tab speak for themselves. Once doxygen has finished
the Destination directory is where to look for the results. Doxygen will
put each output format in a separate sub-directory.
\image html doxywizard_page2.png "Wizard dialog: Mode of operating"
The mode tab allows you to select how doxygen will look at your sources.
The default is to only look for things that have been documented.
You can also select how doxygen should present the results.
The latter does not affect the way doxygen parses your source code.
\image html doxywizard_page3.png "Wizard dialog: Output to produce"
You can select one or more of the output formats that doxygen should
produce. For HTML and LaTeX there are additional options.
\image html doxywizard_page4.png "Wizard dialog: Diagrams to generate"
Doxygen can produce a number of diagrams. Using the diagrams tab you
can select which ones to generate. For most diagrams the
dot tool of the <a href="http://www.graphviz.org">GraphViz</a> package
is needed (if you use the binary packages for Mac or Windows this
tool is already included).
<h3>Expert dialog</h3>
The Expert dialog has a number of tab fields, one
for each section in the configuration file. Each tab-field for each section in the configuration file. Each tab-field
contains a number of lines, one for each configuration option in contains a number of lines, one for each configuration option in
that section. that section.
...@@ -38,13 +102,37 @@ The kind of input widget depends on the type of the configuration option. ...@@ -38,13 +102,37 @@ The kind of input widget depends on the type of the configuration option.
<li>For options taking a lists of strings, a one line edit field is <li>For options taking a lists of strings, a one line edit field is
available, with a `+' button to add this string to the list and available, with a `+' button to add this string to the list and
a `-' button to remove the selected string from the list. There a `-' button to remove the selected string from the list. There
is also a button with a circular "refresh" arrow that, when pressed, is also a `*' button that, when pressed,
replaces the selected item in the list with the string entered in the replaces the selected item in the list with the string entered in the
edit field. edit field.
<li>For file and folder entries, there are special buttons <li>For file and folder entries, there are special buttons
that start a file dialog. that start a file selection dialog.
</ul> </ul>
\image html doxywizard.gif \image html doxywizard_expert.png "Some options from the Expert dialog"
The get additional information about the meaning of an option, click
on the "Help" button at the bottom right of the dialog and then on the
item. A tooltip with additional information will appear.
<h3>Menu options</h3>
The GUI front-end has a menu with a couple of useful items
\image html doxywizard_menu.png "File menu"
<dl>
<dt>Open...<dd>This is the same as the "Load" button in the main window
and allows to open a configuration file from disk.
<dt>Save as..<dd>This is the same as the "Save" button in the main window
and can be used to save the current configuration settings to disk.
<dt>Recent configurations<dd>Allow to quickly load a recently saved
configuration.
<dt>Set as default...<dd>Stores the current configuration settings as the
default to use next time the GUI is started. You will be asked to
confirm the action.
<dt>Reset...<dd>Restores the factory defaults as the default settings to use.
You will be asked to confirm the action.
</dl>
*/ */
doc/language.doc
View file @ 46361b70
...@@ -23,12 +23,13 @@ text fragments, generated by doxygen, can be produced in languages other ...@@ -23,12 +23,13 @@ text fragments, generated by doxygen, can be produced in languages other
than English (the default). The output language is chosen through the than English (the default). The output language is chosen through the
configuration file (with default name and known as Doxyfile). configuration file (with default name and known as Doxyfile).
Currently (version 1.3.7), 29 languages Currently (version 1.3.8), 30 languages
are supported (sorted alphabetically): are supported (sorted alphabetically):
Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian, Afrikaans, Brazilian Portuguese, Catalan, Chinese, Chinese
Czech, Danish, Dutch, English, Finnish, French, German, Greek, Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
Hungarian, Italian, Japanese (+En), Korean (+En), Lithuanian, German, Greek, Hungarian, Italian, Japanese (+En), Korean (+En),
Norwegian, Polish, Portuguese, Romanian, Russian, Serbian, Slovak,. Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, Serbian,
Slovak, Slovene, Spanish, Swedish, and Ukrainian..
The table of information related to the supported languages follows. The table of information related to the supported languages follows.
It is sorted by language alphabetically. The <b>Status</b> column It is sorted by language alphabetically. The <b>Status</b> column
...@@ -49,11 +50,17 @@ when the translator was updated. ...@@ -49,11 +50,17 @@ when the translator was updated.
</tr> </tr>
<!-- table content begin --> <!-- table content begin -->
<tr bgcolor="#ffffff">
<td>Afrikaans</td>
<td>Johan Prinsloo</td>
<td>johan@NOSPAM.zippysnoek.com</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Brazilian Portuguese</td> <td>Brazilian Portuguese</td>
<td>Fabio "FJTC" Jun Takada Chino</td> <td>Fabio "FJTC" Jun Takada Chino</td>
<td>chino@NOSPAM.icmc.sc.usp.br</td> <td>chino@NOSPAM.icmc.sc.usp.br</td>
<td>1.3.8</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Catalan</td> <td>Catalan</td>
...@@ -63,9 +70,9 @@ when the translator was updated. ...@@ -63,9 +70,9 @@ when the translator was updated.
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Chinese</td> <td>Chinese</td>
<td>Wei Liu<br>Wang Weihan</td> <td>Li Daobing<br>Wei Liu</td>
<td>liuwei@NOSPAM.asiainfo.com<br>wangweihan@NOSPAM.capinfo.com.cn</td> <td>lidaobing@NOSPAM.gmail.com<br>liuwei@NOSPAM.asiainfo.com</td>
<td>1.2.13</td> <td>1.3.08</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Chinese Traditional</td> <td>Chinese Traditional</td>
...@@ -77,13 +84,13 @@ when the translator was updated. ...@@ -77,13 +84,13 @@ when the translator was updated.
<td>Croatian</td> <td>Croatian</td>
<td>Boris Bralo</td> <td>Boris Bralo</td>
<td>boris.bralo@NOSPAM.zg.tel.hr</td> <td>boris.bralo@NOSPAM.zg.tel.hr</td>
<td>1.3.8</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Czech</td> <td>Czech</td>
<td>Petr P&#x0159;ikryl</td> <td>Petr P&#x0159;ikryl</td>
<td>prikrylp@NOSPAM.skil.cz</td> <td>prikrylp@NOSPAM.skil.cz</td>
<td>1.3.8</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Danish</td> <td>Danish</td>
...@@ -95,7 +102,7 @@ when the translator was updated. ...@@ -95,7 +102,7 @@ when the translator was updated.
<td>Dutch</td> <td>Dutch</td>
<td>Dimitri van Heesch</td> <td>Dimitri van Heesch</td>
<td>dimitri@NOSPAM.stack.nl</td> <td>dimitri@NOSPAM.stack.nl</td>
<td>1.3.8</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>English</td> <td>English</td>
...@@ -137,7 +144,7 @@ when the translator was updated. ...@@ -137,7 +144,7 @@ when the translator was updated.
<td>Italian</td> <td>Italian</td>
<td>Alessandro Falappa<br>Ahmed Aldo Faisal</td> <td>Alessandro Falappa<br>Ahmed Aldo Faisal</td>
<td>alessandro@NOSPAM.falappa.net<br>aaf23@NOSPAM.cam.ac.uk</td> <td>alessandro@NOSPAM.falappa.net<br>aaf23@NOSPAM.cam.ac.uk</td>
<td>1.3.8</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Japanese</td> <td>Japanese</td>
...@@ -221,7 +228,7 @@ when the translator was updated. ...@@ -221,7 +228,7 @@ when the translator was updated.
<td>Spanish</td> <td>Spanish</td>
<td>Francisco Oltra Thennet</td> <td>Francisco Oltra Thennet</td>
<td>foltra@NOSPAM.puc.cl</td> <td>foltra@NOSPAM.puc.cl</td>
<td>1.3.08</td> <td>1.3.8</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Swedish</td> <td>Swedish</td>
...@@ -250,23 +257,25 @@ when the translator was updated. ...@@ -250,23 +257,25 @@ when the translator was updated.
\hline \hline
\hline \hline
Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny chino@icmc.sc.usp.br} & 1.3.8 \\ Afrikaans & Johan Prinsloo & {\tt\tiny johan@zippysnoek.com} & up-to-date \\
\hline
Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny chino@icmc.sc.usp.br} & up-to-date \\
\hline \hline
Catalan & Albert Mora & {\tt\tiny amora@iua.upf.es} & 1.2.17 \\ Catalan & Albert Mora & {\tt\tiny amora@iua.upf.es} & 1.2.17 \\
\hline \hline
Chinese & Wei Liu & {\tt\tiny liuwei@asiainfo.com} & 1.2.13 \\ Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & 1.3.08 \\
~ & Wang Weihan & {\tt\tiny wangweihan@capinfo.com.cn} & ~ \\ ~ & Wei Liu & {\tt\tiny liuwei@asiainfo.com} & ~ \\
\hline \hline
Chinese Traditional & Daniel YC Lin & {\tt\tiny daniel@twpda.com} & 1.3.8 \\ Chinese Traditional & Daniel YC Lin & {\tt\tiny daniel@twpda.com} & 1.3.8 \\
~ & Gary Lee & {\tt\tiny garylee@ecosine.com.tw} & ~ \\ ~ & Gary Lee & {\tt\tiny garylee@ecosine.com.tw} & ~ \\
\hline \hline
Croatian & Boris Bralo & {\tt\tiny boris.bralo@zg.tel.hr} & 1.3.8 \\ Croatian & Boris Bralo & {\tt\tiny boris.bralo@zg.tel.hr} & up-to-date \\
\hline \hline
Czech & Petr P\v{r}ikryl & {\tt\tiny prikrylp@skil.cz} & 1.3.8 \\ Czech & Petr P\v{r}ikryl & {\tt\tiny prikrylp@skil.cz} & up-to-date \\
\hline \hline
Danish & Erik S\o{}e S\o{}rensen & {\tt\tiny erik@mail.nu} & 1.3.8 \\ Danish & Erik S\o{}e S\o{}rensen & {\tt\tiny erik@mail.nu} & 1.3.8 \\
\hline \hline
Dutch & Dimitri van Heesch & {\tt\tiny dimitri@stack.nl} & 1.3.8 \\ Dutch & Dimitri van Heesch & {\tt\tiny dimitri@stack.nl} & up-to-date \\
\hline \hline
English & Dimitri van Heesch & {\tt\tiny dimitri@stack.nl} & up-to-date \\ English & Dimitri van Heesch & {\tt\tiny dimitri@stack.nl} & up-to-date \\
\hline \hline
...@@ -281,7 +290,7 @@ when the translator was updated. ...@@ -281,7 +290,7 @@ when the translator was updated.
Hungarian & F\"{o}ldv\'{a}ri Gy\"{o}rgy & {\tt\tiny foldvari@diatronltd.com} & 1.3.8 \\ Hungarian & F\"{o}ldv\'{a}ri Gy\"{o}rgy & {\tt\tiny foldvari@diatronltd.com} & 1.3.8 \\
~ & \'{A}kos Kiss & {\tt\tiny akiss@users.sourceforge.net} & ~ \\ ~ & \'{A}kos Kiss & {\tt\tiny akiss@users.sourceforge.net} & ~ \\
\hline \hline
Italian & Alessandro Falappa & {\tt\tiny alessandro@falappa.net} & 1.3.8 \\ Italian & Alessandro Falappa & {\tt\tiny alessandro@falappa.net} & up-to-date \\
~ & Ahmed Aldo Faisal & {\tt\tiny aaf23@cam.ac.uk} & ~ \\ ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23@cam.ac.uk} & ~ \\
\hline \hline
Japanese & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & 1.3.3 \\ Japanese & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & 1.3.3 \\
...@@ -314,7 +323,7 @@ when the translator was updated. ...@@ -314,7 +323,7 @@ when the translator was updated.
\hline \hline
Slovene & Matjaz Ostroversnik & {\tt\tiny matjaz.ostroversnik@zrs-tk.si} & 1.2.16 \\ Slovene & Matjaz Ostroversnik & {\tt\tiny matjaz.ostroversnik@zrs-tk.si} & 1.2.16 \\
\hline \hline
Spanish & Francisco Oltra Thennet & {\tt\tiny foltra@puc.cl} & 1.3.08 \\ Spanish & Francisco Oltra Thennet & {\tt\tiny foltra@puc.cl} & 1.3.8 \\
\hline \hline
Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & 1.3.3 \\ Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & 1.3.3 \\
\hline \hline
......
doc/maintainers.txt
View file @ 46361b70
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
% the maintainer(s) for the language (one line, one maintainer) % the maintainer(s) for the language (one line, one maintainer)
% in the form: <readable name><colon><e-mail> % in the form: <readable name><colon><e-mail>
TranslatorAfrikaans
Johan Prinsloo: johan@zippysnoek.com
TranslatorBrazilian TranslatorBrazilian
Fabio "FJTC" Jun Takada Chino: chino@icmc.sc.usp.br Fabio "FJTC" Jun Takada Chino: chino@icmc.sc.usp.br
...@@ -16,8 +19,8 @@ TranslatorCatalan ...@@ -16,8 +19,8 @@ TranslatorCatalan
Albert Mora: amora@iua.upf.es Albert Mora: amora@iua.upf.es
TranslatorChinese TranslatorChinese
Li Daobing: lidaobing@gmail.com
Wei Liu: liuwei@asiainfo.com Wei Liu: liuwei@asiainfo.com
Wang Weihan: wangweihan@capinfo.com.cn
TranslatorChinesetraditional TranslatorChinesetraditional
Daniel YC Lin: daniel@twpda.com Daniel YC Lin: daniel@twpda.com
......
doc/translator.py
View file @ 46361b70
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
2004/04/16 - Added new tokens to the tokenizer (to remove some warnings). 2004/04/16 - Added new tokens to the tokenizer (to remove some warnings).
2004/05/25 - Added from __future__ import generators not to force Python 2.3. 2004/05/25 - Added from __future__ import generators not to force Python 2.3.
2004/06/03 - Removed dependency on textwrap module. 2004/06/03 - Removed dependency on textwrap module.
2004/07/07 - Fixed the bug in the fill() function.
""" """
from __future__ import generators from __future__ import generators
...@@ -70,7 +71,7 @@ def fill(s): ...@@ -70,7 +71,7 @@ def fill(s):
else: else:
lines.append(line) # another full line formed lines.append(line) # another full line formed
line = word # next line started line = word # next line started
lines.append(line) # the last line
return '\n'.join(lines) return '\n'.join(lines)
...@@ -1390,7 +1391,7 @@ class TrManager: ...@@ -1390,7 +1391,7 @@ class TrManager:
alphabetically). This means that they derive from the alphabetically). This means that they derive from the
Translator class and they implement all %d of the required Translator class and they implement all %d of the required
methods. Anyway, there still may be some details listed even methods. Anyway, there still may be some details listed even
for them. Please, see the details for them:''' for them:'''
s = s % len(self.requiredMethodsDic) s = s % len(self.requiredMethodsDic)
f.write('-' * 70 + '\n') f.write('-' * 70 + '\n')
f.write(fill(s) + '\n\n') f.write(fill(s) + '\n\n')
......
libmd5/.cvsignore 0 → 100644
View file @ 46361b70
Makefile
libmd5.pro
libpng/.cvsignore 0 → 100644
View file @ 46361b70
Makefile
libpng.pro
packages/rpm/doxygen.spec
View file @ 46361b70
Summary: A documentation system for C/C++. Summary: A documentation system for C/C++.
Name: doxygen Name: doxygen
Version: 1.3.7_20040704 Version: 1.3.7_20040718
Release: 1 Release: 1
Epoch: 1 Epoch: 1
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
......
qtools/.cvsignore 0 → 100644
View file @ 46361b70
Makefile
qtools.pro
src/.cvsignore 0 → 100644
View file @ 46361b70
Makefile
doxygen.pro
doxytag.pro
libdoxycfg.pro
libdoxygen.pro
src/classdef.h
View file @ 46361b70
...@@ -75,6 +75,7 @@ class ClassDef : public Definition ...@@ -75,6 +75,7 @@ class ClassDef : public Definition
QCString getReference() const; QCString getReference() const;
bool isReference() const; bool isReference() const;
bool isLocal() const { return m_isLocal; } bool isLocal() const { return m_isLocal; }
bool isArtificial() const { return m_artificial; }
bool hasDocumentation() const; bool hasDocumentation() const;
......
src/code.l
View file @ 46361b70
...@@ -2017,7 +2017,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'")) ...@@ -2017,7 +2017,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
g_name+=yytext; g_name+=yytext;
BEGIN( FuncCall ); BEGIN( FuncCall );
} }
<FuncCall,Body,MemberCall,MemberCall2>\" { <FuncCall,Body,MemberCall,MemberCall2,SkipInits>\" {
startFontClass("stringliteral"); startFontClass("stringliteral");
g_code->codify(yytext); g_code->codify(yytext);
g_lastStringContext=YY_START; g_lastStringContext=YY_START;
......
src/config.l
View file @ 46361b70
...@@ -1943,7 +1943,17 @@ void Config::create() ...@@ -1943,7 +1943,17 @@ void Config::create()
"by executing (via popen()) the command <filter> <input-file>, where <filter> \n" "by executing (via popen()) the command <filter> <input-file>, where <filter> \n"
"is the value of the INPUT_FILTER tag, and <input-file> is the name of an \n" "is the value of the INPUT_FILTER tag, and <input-file> is the name of an \n"
"input file. Doxygen will then use the output that the filter program writes \n" "input file. Doxygen will then use the output that the filter program writes \n"
"to standard output. \n" "to standard output. If FILTER_PATTERNS is specified, this tag will be \n"
"ignored. \n"
);
cl = addList(
"FILTER_PATTERNS",
"The FILTER_PATTERNS tag can be used to specify filters on a per file pattern \n"
"basis. Doxygen will compare the file name with each pattern and apply the \n"
"filter if there is a match. The filters are a list of the form: \n"
"pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further \n"
"info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER \n"
"is applied to all files. \n"
); );
cl->setWidgetType(ConfigList::File); cl->setWidgetType(ConfigList::File);
cb = addBool( cb = addBool(
......
src/definition.cpp
View file @ 46361b70
...@@ -246,7 +246,7 @@ static bool readCodeFragment(const char *fileName, ...@@ -246,7 +246,7 @@ static bool readCodeFragment(const char *fileName,
{ {
//printf("readCodeFragment(%s,%d,%d)\n",fileName,startLine,endLine); //printf("readCodeFragment(%s,%d,%d)\n",fileName,startLine,endLine);
if (fileName==0 || fileName[0]==0) return FALSE; // not a valid file name if (fileName==0 || fileName[0]==0) return FALSE; // not a valid file name
QCString cmd=Config_getString("INPUT_FILTER")+" \""+fileName+"\""; QCString cmd=getFileFilter(fileName)+" \""+fileName+"\"";
FILE *f = Config_getBool("FILTER_SOURCE_FILES") ? popen(cmd,"r") : fopen(fileName,"r"); FILE *f = Config_getBool("FILTER_SOURCE_FILES") ? popen(cmd,"r") : fopen(fileName,"r");
bool found=FALSE; bool found=FALSE;
if (f) if (f)
......
src/docparser.cpp
View file @ 46361b70
...@@ -1249,6 +1249,17 @@ DocAnchor::DocAnchor(DocNode *parent,const QString &id,bool newAnchor) ...@@ -1249,6 +1249,17 @@ DocAnchor::DocAnchor(DocNode *parent,const QString &id,bool newAnchor)
} }
} }
//---------------------------------------------------------------------------
DocVerbatim::DocVerbatim(DocNode *parent,const QString &context,
const QString &text, Type t,bool isExample,
const QString &exampleFile)
: m_parent(parent), m_context(context), m_text(text), m_type(t),
m_isExample(isExample), m_exampleFile(exampleFile), m_relPath(g_relPath)
{
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void DocInclude::parse() void DocInclude::parse()
...@@ -1480,7 +1491,7 @@ bool DocXRefItem::parse() ...@@ -1480,7 +1491,7 @@ bool DocXRefItem::parse()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
DocFormula::DocFormula(DocNode *parent,int id) : DocFormula::DocFormula(DocNode *parent,int id) :
m_parent(parent) m_parent(parent), m_relPath(g_relPath)
{ {
QString formCmd; QString formCmd;
formCmd.sprintf("\\form#%d",id); formCmd.sprintf("\\form#%d",id);
...@@ -4117,7 +4128,7 @@ int DocPara::handleHtmlStartTag(const QString &tagName,const HtmlAttribList &tag ...@@ -4117,7 +4128,7 @@ int DocPara::handleHtmlStartTag(const QString &tagName,const HtmlAttribList &tag
break; break;
case HTML_UNKNOWN: case HTML_UNKNOWN:
warn_doc_error(g_fileName,doctokenizerYYlineno,"Warning: Unsupported html tag <%s> found", tagName.data()); warn_doc_error(g_fileName,doctokenizerYYlineno,"Warning: Unsupported html tag <%s> found", tagName.data());
m_children.append(new DocWord(this, "<"+tagName+">")); m_children.append(new DocWord(this, "<"+tagName+tagHtmlAttribs.toString()+">"));
break; break;
break; break;
default: default:
...@@ -4257,8 +4268,8 @@ int DocPara::handleHtmlEndTag(const QString &tagName) ...@@ -4257,8 +4268,8 @@ int DocPara::handleHtmlEndTag(const QString &tagName)
// ignore </a> tag (can be part of <a name=...></a> // ignore </a> tag (can be part of <a name=...></a>
break; break;
case HTML_UNKNOWN: case HTML_UNKNOWN:
warn_doc_error(g_fileName,doctokenizerYYlineno,"Warning: Unsupported html tag </%s> found", warn_doc_error(g_fileName,doctokenizerYYlineno,"Warning: Unsupported html tag </%s> found", tagName.data());
tagName.data()); m_children.append(new DocWord(this,"</"+tagName+">"));
break; break;
default: default:
// we should not get here! // we should not get here!
......
src/docparser.h
View file @ 46361b70
...@@ -357,9 +357,7 @@ class DocVerbatim : public DocNode ...@@ -357,9 +357,7 @@ class DocVerbatim : public DocNode
enum Type { Code, HtmlOnly, ManOnly, LatexOnly, XmlOnly, Verbatim, Dot }; enum Type { Code, HtmlOnly, ManOnly, LatexOnly, XmlOnly, Verbatim, Dot };
DocVerbatim(DocNode *parent,const QString &context, DocVerbatim(DocNode *parent,const QString &context,
const QString &text, Type t,bool isExample, const QString &text, Type t,bool isExample,
const QString &exampleFile) : const QString &exampleFile);
m_parent(parent), m_context(context), m_text(text), m_type(t),
m_isExample(isExample), m_exampleFile(exampleFile) {}
Kind kind() const { return Kind_Verbatim; } Kind kind() const { return Kind_Verbatim; }
Type type() const { return m_type; } Type type() const { return m_type; }
QString text() const { return m_text; } QString text() const { return m_text; }
...@@ -368,6 +366,7 @@ class DocVerbatim : public DocNode ...@@ -368,6 +366,7 @@ class DocVerbatim : public DocNode
void accept(DocVisitor *v) { v->visit(this); } void accept(DocVisitor *v) { v->visit(this); }
bool isExample() const { return m_isExample; } bool isExample() const { return m_isExample; }
QString exampleFile() const { return m_exampleFile; } QString exampleFile() const { return m_exampleFile; }
QString relPath() const { return m_relPath; }
private: private:
DocNode *m_parent; DocNode *m_parent;
...@@ -376,6 +375,7 @@ class DocVerbatim : public DocNode ...@@ -376,6 +375,7 @@ class DocVerbatim : public DocNode
Type m_type; Type m_type;
bool m_isExample; bool m_isExample;
QString m_exampleFile; QString m_exampleFile;
QString m_relPath;
}; };
...@@ -455,6 +455,7 @@ class DocFormula : public DocNode ...@@ -455,6 +455,7 @@ class DocFormula : public DocNode
Kind kind() const { return Kind_Formula; } Kind kind() const { return Kind_Formula; }
QString name() const { return m_name; } QString name() const { return m_name; }
QString text() const { return m_text; } QString text() const { return m_text; }
QString relPath() const { return m_relPath; }
int id() const { return m_id; } int id() const { return m_id; }
DocNode *parent() const { return m_parent; } DocNode *parent() const { return m_parent; }
void accept(DocVisitor *v) { v->visit(this); } void accept(DocVisitor *v) { v->visit(this); }
...@@ -463,6 +464,7 @@ class DocFormula : public DocNode ...@@ -463,6 +464,7 @@ class DocFormula : public DocNode
DocNode *m_parent; DocNode *m_parent;
QString m_name; QString m_name;
QString m_text; QString m_text;
QString m_relPath;
int m_id; int m_id;
}; };
......
src/dot.cpp
View file @ 46361b70
...@@ -2433,9 +2433,11 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir, ...@@ -2433,9 +2433,11 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir,
* dotfiles to generate image maps. * dotfiles to generate image maps.
* \param inFile just the basename part of the filename * \param inFile just the basename part of the filename
* \param outDir output directory * \param outDir output directory
* \param relPath relative path the to root of the output dir
* \returns a string which is the HTML image map (without the \<map\>\</map\>) * \returns a string which is the HTML image map (without the \<map\>\</map\>)
*/ */
QString getDotImageMapFromFile(const QString& inFile, const QString& outDir) QString getDotImageMapFromFile(const QString& inFile, const QString& outDir,
const QCString &relPath)
{ {
QString outFile = inFile + ".map"; QString outFile = inFile + ".map";
...@@ -2458,7 +2460,7 @@ QString getDotImageMapFromFile(const QString& inFile, const QString& outDir) ...@@ -2458,7 +2460,7 @@ QString getDotImageMapFromFile(const QString& inFile, const QString& outDir)
} }
QString result; QString result;
QTextOStream tmpout(&result); QTextOStream tmpout(&result);
convertMapFile(tmpout, outFile, "",TRUE); convertMapFile(tmpout, outFile, relPath ,TRUE);
QDir().remove(outFile); QDir().remove(outFile);
// printf("result=%s\n",result.data()); // printf("result=%s\n",result.data());
......
src/dot.h
View file @ 46361b70
...@@ -202,7 +202,8 @@ class DotCallGraph ...@@ -202,7 +202,8 @@ class DotCallGraph
void generateGraphLegend(const char *path); void generateGraphLegend(const char *path);
void writeDotGraphFromFile(const char *inFile,const char *outDir, void writeDotGraphFromFile(const char *inFile,const char *outDir,
const char *outFile,GraphOutputFormat format); const char *outFile,GraphOutputFormat format);
QString getDotImageMapFromFile(const QString& inFile, const QString& outDir); QString getDotImageMapFromFile(const QString& inFile, const QString& outDir,
const QCString& relPath);
#endif #endif
src/doxygen.cpp
View file @ 46361b70
...@@ -119,6 +119,8 @@ SearchIndex * Doxygen::searchIndex=0; ...@@ -119,6 +119,8 @@ SearchIndex * Doxygen::searchIndex=0;
SDict<DefinitionList> *Doxygen::symbolMap; SDict<DefinitionList> *Doxygen::symbolMap;
bool Doxygen::outputToWizard=FALSE; bool Doxygen::outputToWizard=FALSE;
QDict<int> * Doxygen::htmlDirMap = 0; QDict<int> * Doxygen::htmlDirMap = 0;
QCache<LookupInfo> Doxygen::lookupCache(20000,20000);
bool Doxygen::lookupCacheEnabled=FALSE;
static StringList inputFiles; static StringList inputFiles;
static StringDict excludeNameDict(1009); // sections static StringDict excludeNameDict(1009); // sections
...@@ -149,7 +151,6 @@ void clearAll() ...@@ -149,7 +151,6 @@ void clearAll()
Doxygen::formulaNameDict.clear(); Doxygen::formulaNameDict.clear();
Doxygen::tagDestinationDict.clear(); Doxygen::tagDestinationDict.clear();
delete Doxygen::mainPage; Doxygen::mainPage=0; delete Doxygen::mainPage; Doxygen::mainPage=0;
} }
void statistics() void statistics()
...@@ -3387,7 +3388,7 @@ static bool findClassRelation( ...@@ -3387,7 +3388,7 @@ static bool findClassRelation(
} }
baseClassName=stripTemplateSpecifiersFromScope baseClassName=stripTemplateSpecifiersFromScope
(removeRedundantWhiteSpace(baseClassName)); (removeRedundantWhiteSpace(baseClassName));
MemberDef *baseClassTypeDef; MemberDef *baseClassTypeDef=0;
QCString templSpec; QCString templSpec;
ClassDef *baseClass=getResolvedClass(explicitGlobalScope ? 0 : cd, ClassDef *baseClass=getResolvedClass(explicitGlobalScope ? 0 : cd,
cd->getFileDef(), // todo: is this ok? cd->getFileDef(), // todo: is this ok?
...@@ -3417,7 +3418,9 @@ static bool findClassRelation( ...@@ -3417,7 +3418,9 @@ static bool findClassRelation(
); );
int i; int i;
if (baseClass==0 && (i=baseClassName.find('<'))!=-1) int si=baseClassName.findRev("::");
if (si==-1) si=0;
if (baseClass==0 && (i=baseClassName.find('<',si))!=-1)
// base class has template specifiers // base class has template specifiers
{ {
// TODO: here we should try to find the correct template specialization // TODO: here we should try to find the correct template specialization
...@@ -3450,10 +3453,10 @@ static bool findClassRelation( ...@@ -3450,10 +3453,10 @@ static bool findClassRelation(
//printf("cd=%p baseClass=%p\n",cd,baseClass); //printf("cd=%p baseClass=%p\n",cd,baseClass);
bool found=baseClass!=0 && (baseClass!=cd || mode==TemplateInstances); bool found=baseClass!=0 && (baseClass!=cd || mode==TemplateInstances);
if (!found && (i=baseClassName.findRev("::"))!=-1) if (!found && si!=-1)
{ {
// replace any namespace aliases // replace any namespace aliases
replaceNamespaceAliases(baseClassName,i); replaceNamespaceAliases(baseClassName,si);
baseClass=getResolvedClass(cd,cd->getFileDef(),baseClassName); baseClass=getResolvedClass(cd,cd->getFileDef(),baseClassName);
found=baseClass!=0 && baseClass!=cd; found=baseClass!=0 && baseClass!=cd;
} }
...@@ -3493,7 +3496,11 @@ static bool findClassRelation( ...@@ -3493,7 +3496,11 @@ static bool findClassRelation(
else if (mode==DocumentedOnly) else if (mode==DocumentedOnly)
{ {
QCString usedName; QCString usedName;
if (baseClassTypeDef) usedName=biName; if (baseClassTypeDef)
{
usedName=biName;
//printf("***** usedName=%s templSpec=%s\n",usedName.data(),templSpec.data());
}
cd->insertBaseClass(baseClass,usedName,bi->prot,bi->virt,templSpec); cd->insertBaseClass(baseClass,usedName,bi->prot,bi->virt,templSpec);
// add this class as super class to the base class // add this class as super class to the base class
baseClass->insertSubClass(cd,bi->prot,bi->virt,templSpec); baseClass->insertSubClass(cd,bi->prot,bi->virt,templSpec);
...@@ -6975,7 +6982,8 @@ static void copyAndFilterFile(const char *fileName,BufStr &dest) ...@@ -6975,7 +6982,8 @@ static void copyAndFilterFile(const char *fileName,BufStr &dest)
QFileInfo fi(fileName); QFileInfo fi(fileName);
if (!fi.exists()) return; if (!fi.exists()) return;
if (Config_getString("INPUT_FILTER").isEmpty()) QCString filterName = getFileFilter(fileName);
if (filterName.isEmpty())
{ {
QFile f(fileName); QFile f(fileName);
if (!f.open(IO_ReadOnly)) if (!f.open(IO_ReadOnly))
...@@ -6994,11 +7002,11 @@ static void copyAndFilterFile(const char *fileName,BufStr &dest) ...@@ -6994,11 +7002,11 @@ static void copyAndFilterFile(const char *fileName,BufStr &dest)
} }
else else
{ {
QCString cmd=Config_getString("INPUT_FILTER")+" "+fileName; QCString cmd=filterName+" "+fileName;
FILE *f=popen(cmd,"r"); FILE *f=popen(cmd,"r");
if (!f) if (!f)
{ {
err("Error: could not execute filter %s\n",Config_getString("INPUT_FILTER").data()); err("Error: could not execute filter %s\n",filterName.data());
return; return;
} }
const int bufSize=1024; const int bufSize=1024;
...@@ -7428,6 +7436,8 @@ void initDoxygen() ...@@ -7428,6 +7436,8 @@ void initDoxygen()
excludeNameDict.setAutoDelete(TRUE); excludeNameDict.setAutoDelete(TRUE);
Doxygen::memGrpInfoDict.setAutoDelete(TRUE); Doxygen::memGrpInfoDict.setAutoDelete(TRUE);
Doxygen::tagDestinationDict.setAutoDelete(TRUE); Doxygen::tagDestinationDict.setAutoDelete(TRUE);
Doxygen::lookupCache.setAutoDelete(TRUE);
Doxygen::lookupCacheEnabled=FALSE;
} }
void cleanUpDoxygen() void cleanUpDoxygen()
...@@ -8225,6 +8235,10 @@ void parseInput() ...@@ -8225,6 +8235,10 @@ void parseInput()
computeClassRelations(); computeClassRelations();
classEntries.clear(); classEntries.clear();
// from now on the class relations are fixed and we can
// start to cache them to improve performance
Doxygen::lookupCacheEnabled=TRUE;
msg("Searching for enumerations...\n"); msg("Searching for enumerations...\n");
findEnums(root); findEnums(root);
findEnumDocumentation(root); findEnumDocumentation(root);
......
src/doxygen.h
View file @ 46361b70
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "qtbc.h" #include "qtbc.h"
#include <qtextstream.h> #include <qtextstream.h>
#include <qdatetime.h> #include <qdatetime.h>
#include <qcache.h>
#include "groupdef.h" #include "groupdef.h"
#include "filedef.h" #include "filedef.h"
#include "classdef.h" #include "classdef.h"
...@@ -51,6 +52,15 @@ class StringDict : public QDict<QCString> ...@@ -51,6 +52,15 @@ class StringDict : public QDict<QCString>
virtual ~StringDict() {} virtual ~StringDict() {}
}; };
struct LookupInfo
{
LookupInfo(ClassDef *cd=0,MemberDef *td=0,QCString ts="")
: classDef(cd), typeDef(td), templSpec(ts) {}
ClassDef *classDef;
MemberDef *typeDef;
QCString templSpec;
};
extern QCString spaces; extern QCString spaces;
...@@ -101,6 +111,8 @@ class Doxygen ...@@ -101,6 +111,8 @@ class Doxygen
static SDict<DefinitionList> *symbolMap; static SDict<DefinitionList> *symbolMap;
static bool outputToWizard; static bool outputToWizard;
static QDict<int> *htmlDirMap; static QDict<int> *htmlDirMap;
static QCache<LookupInfo> lookupCache;
static bool lookupCacheEnabled;
}; };
void initDoxygen(); void initDoxygen();
......
src/htmlattrib.h
View file @ 46361b70
...@@ -35,6 +35,18 @@ class HtmlAttribList : public QList<HtmlAttrib> ...@@ -35,6 +35,18 @@ class HtmlAttribList : public QList<HtmlAttrib>
{ operator=(l); } { operator=(l); }
HtmlAttribList &operator=(const HtmlAttribList &l) HtmlAttribList &operator=(const HtmlAttribList &l)
{ clear(); QList<HtmlAttrib>::operator=(l); return *this; } { clear(); QList<HtmlAttrib>::operator=(l); return *this; }
QString toString() const
{
HtmlAttribList *that = (HtmlAttribList *)this;
QString result;
HtmlAttrib *attr=that->first();
while (attr)
{
result+=" "+attr->name+"=\""+attr->value+"\"";
attr=that->next();
}
return result;
}
private: private:
QCollection::Item newItem( QCollection::Item d ) QCollection::Item newItem( QCollection::Item d )
{ return (QCollection::Item)new HtmlAttrib(*(HtmlAttrib *)d); } { return (QCollection::Item)new HtmlAttrib(*(HtmlAttrib *)d); }
......
src/htmldocvisitor.cpp
View file @ 46361b70
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "config.h" #include "config.h"
#define PREFRAG_START "<div class=\"fragment\"><pre>" #define PREFRAG_START "<div class=\"fragment\"><pre>"
#define PREFRAG_END "</pre></div" #define PREFRAG_END "</pre></div>"
static QString htmlAttribsToString(const HtmlAttribList &attribs) static QString htmlAttribsToString(const HtmlAttribList &attribs)
{ {
...@@ -228,7 +228,7 @@ void HtmlDocVisitor::visit(DocVerbatim *s) ...@@ -228,7 +228,7 @@ void HtmlDocVisitor::visit(DocVerbatim *s)
file.close(); file.close();
m_t << "<div align=\"center\">" << endl; m_t << "<div align=\"center\">" << endl;
writeDotFile(fileName); writeDotFile(fileName,s->relPath());
m_t << "</div>" << endl; m_t << "</div>" << endl;
file.remove(); file.remove();
...@@ -308,13 +308,14 @@ void HtmlDocVisitor::visit(DocFormula *f) ...@@ -308,13 +308,14 @@ void HtmlDocVisitor::visit(DocFormula *f)
if (m_hide) return; if (m_hide) return;
bool bDisplay = f->text().at(0)=='\\'; bool bDisplay = f->text().at(0)=='\\';
if (bDisplay) m_t << "<p class=\"formulaDsp\">" << endl; if (bDisplay) m_t << "<p class=\"formulaDsp\">" << endl;
m_t << "<img class=\"formula" << (bDisplay ? "Dsp" : "Inl"); m_t << "<img class=\"formula"
<< (bDisplay ? "Dsp" : "Inl");
m_t << "\" alt=\""; m_t << "\" alt=\"";
filterQuotedCdataAttr(f->text()); filterQuotedCdataAttr(f->text());
m_t << "\""; m_t << "\"";
/// @todo cache image dimensions on formula generation and give height/width /// @todo cache image dimensions on formula generation and give height/width
/// for faster preloading and better rendering of the page /// for faster preloading and better rendering of the page
m_t << " src=\"" << f->name() << ".png\">"; m_t << " src=\"" << f->relPath() << f->name() << ".png\">";
if (bDisplay) if (bDisplay)
m_t << endl << "<p>" << endl; m_t << endl << "<p>" << endl;
} }
...@@ -742,7 +743,7 @@ void HtmlDocVisitor::visitPost(DocImage *img) ...@@ -742,7 +743,7 @@ void HtmlDocVisitor::visitPost(DocImage *img)
void HtmlDocVisitor::visitPre(DocDotFile *df) void HtmlDocVisitor::visitPre(DocDotFile *df)
{ {
if (m_hide) return; if (m_hide) return;
writeDotFile(df->file()); writeDotFile(df->file(),"");
m_t << "<div align=\"center\">" << endl; m_t << "<div align=\"center\">" << endl;
if (df->hasCaption()) if (df->hasCaption())
{ {
...@@ -1053,7 +1054,7 @@ void HtmlDocVisitor::popEnabled() ...@@ -1053,7 +1054,7 @@ void HtmlDocVisitor::popEnabled()
delete v; delete v;
} }
void HtmlDocVisitor::writeDotFile(const QString &fileName) void HtmlDocVisitor::writeDotFile(const QString &fileName,const QString &relPath)
{ {
QString baseName=fileName; QString baseName=fileName;
int i; int i;
...@@ -1065,10 +1066,10 @@ void HtmlDocVisitor::writeDotFile(const QString &fileName) ...@@ -1065,10 +1066,10 @@ void HtmlDocVisitor::writeDotFile(const QString &fileName)
writeDotGraphFromFile(fileName,outDir,baseName,BITMAP); writeDotGraphFromFile(fileName,outDir,baseName,BITMAP);
QString mapName = baseName+".map"; QString mapName = baseName+".map";
QString mapFile = fileName+".map"; QString mapFile = fileName+".map";
m_t << "<img src=\"" << baseName << "." m_t << "<img src=\"" << relPath << baseName << "."
<< Config_getEnum("DOT_IMAGE_FORMAT") << "\" alt=\"" << Config_getEnum("DOT_IMAGE_FORMAT") << "\" alt=\""
<< baseName << "\" border=\"0\" usemap=\"#" << mapName << "\">" << endl; << baseName << "\" border=\"0\" usemap=\"#" << mapName << "\">" << endl;
QString imap = getDotImageMapFromFile(fileName,outDir); QString imap = getDotImageMapFromFile(fileName,outDir,relPath.data());
m_t << "<map name=\"" << mapName << "\">" << imap << "</map>" << endl; m_t << "<map name=\"" << mapName << "\">" << imap << "</map>" << endl;
} }
src/htmldocvisitor.h
View file @ 46361b70
...@@ -137,7 +137,7 @@ class HtmlDocVisitor : public DocVisitor ...@@ -137,7 +137,7 @@ class HtmlDocVisitor : public DocVisitor
void startLink(const QString &ref,const QString &file, void startLink(const QString &ref,const QString &file,
const QString &relPath,const QString &anchor); const QString &relPath,const QString &anchor);
void endLink(); void endLink();
void writeDotFile(const QString &fileName); void writeDotFile(const QString &fileName,const QString &relPath);
void pushEnabled(); void pushEnabled();
void popEnabled(); void popEnabled();
......
src/lang_cfg.h
View file @ 46361b70
...@@ -28,3 +28,4 @@ ...@@ -28,3 +28,4 @@
#define LANG_SR #define LANG_SR
#define LANG_CA #define LANG_CA
#define LANG_LT #define LANG_LT
#define LANG_ZA
src/language.cpp
View file @ 46361b70
...@@ -115,6 +115,9 @@ ...@@ -115,6 +115,9 @@
#ifdef LANG_LT #ifdef LANG_LT
#include "translator_lt.h" #include "translator_lt.h"
#endif #endif
#ifdef LANG_ZA
#include "translator_za.h"
#endif
#endif #endif
#define L_EQUAL(a) !stricmp(langName,a) #define L_EQUAL(a) !stricmp(langName,a)
......
src/libdoxygen.pro.in
View file @ 46361b70
...@@ -115,6 +115,7 @@ HEADERS = bufstr.h \ ...@@ -115,6 +115,7 @@ HEADERS = bufstr.h \
translator_sr.h \ translator_sr.h \
translator_tw.h \ translator_tw.h \
translator_ua.h \ translator_ua.h \
translator_za.h \
unistd.h \ unistd.h \
util.h \ util.h \
version.h \ version.h \
......
src/memberdef.cpp
View file @ 46361b70
...@@ -578,10 +578,10 @@ bool MemberDef::isLinkableInProject() const ...@@ -578,10 +578,10 @@ bool MemberDef::isLinkableInProject() const
//printf("in a namespace but namespace not linkable!\n"); //printf("in a namespace but namespace not linkable!\n");
return FALSE; // in namespace but namespace not linkable return FALSE; // in namespace but namespace not linkable
} }
if (!group && fileDef && !fileDef->isLinkableInProject()) if (!group && !nspace && fileDef && !fileDef->isLinkableInProject())
{ {
//printf("in a file but file not linkable!\n"); //printf("in a file but file not linkable!\n");
return FALSE; // in file but file not linkable return FALSE; // in file (and not in namespace) but file not linkable
} }
if (prot==Private && !Config_getBool("EXTRACT_PRIVATE") && mtype!=Friend) if (prot==Private && !Config_getBool("EXTRACT_PRIVATE") && mtype!=Friend)
{ {
......
src/memberdef.h
View file @ 46361b70
...@@ -270,7 +270,9 @@ class MemberDef : public Definition ...@@ -270,7 +270,9 @@ class MemberDef : public Definition
// cached typedef functions // cached typedef functions
bool isTypedefValCached() const { return m_isTypedefValCached; } bool isTypedefValCached() const { return m_isTypedefValCached; }
ClassDef *getCachedTypedefVal() const { return m_cachedTypedefValue; } ClassDef *getCachedTypedefVal() const { return m_cachedTypedefValue; }
void cacheTypedefVal(ClassDef *val) { m_isTypedefValCached=TRUE; m_cachedTypedefValue=val; } QCString getCachedTypedefTemplSpec() const { return m_cachedTypedefTemplSpec; }
void cacheTypedefVal(ClassDef *val,const QCString &templSpec)
{ m_isTypedefValCached=TRUE; m_cachedTypedefValue=val; m_cachedTypedefTemplSpec=templSpec; }
// declaration <-> definition relation // declaration <-> definition relation
void setMemberDefinition(MemberDef *md) { memDef=md; } void setMemberDefinition(MemberDef *md) { memDef=md; }
...@@ -360,6 +362,7 @@ class MemberDef : public Definition ...@@ -360,6 +362,7 @@ class MemberDef : public Definition
bool m_isTypedefValCached; bool m_isTypedefValCached;
ClassDef *m_cachedTypedefValue; ClassDef *m_cachedTypedefValue;
QCString m_cachedTypedefTemplSpec;
// inbody documentation // inbody documentation
int m_inbodyLine; int m_inbodyLine;
......
src/pre.l
View file @ 46361b70
...@@ -190,9 +190,10 @@ static FILE *checkAndOpenFile(const QCString &absName) ...@@ -190,9 +190,10 @@ static FILE *checkAndOpenFile(const QCString &absName)
if (alreadyIncluded) return 0; if (alreadyIncluded) return 0;
if (!Config_getString("INPUT_FILTER").isEmpty()) QCString filterName = getFileFilter(absName);
if (!filterName.isEmpty())
{ {
QCString cmd = Config_getString("INPUT_FILTER")+" "+absName; QCString cmd = filterName+" "+absName;
f=popen(cmd,"r"); f=popen(cmd,"r");
if (!f) err("Error: could not execute filter %s\n",cmd.data()); if (!f) err("Error: could not execute filter %s\n",cmd.data());
} }
...@@ -1480,7 +1481,9 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) ...@@ -1480,7 +1481,9 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
<Command>. <Command>.
<UndefName>{ID} { <UndefName>{ID} {
Define *def; Define *def;
if ((def=isDefined(yytext)) && !def->isPredefined) if ((def=isDefined(yytext))
/*&& !def->isPredefined*/
)
{ {
//printf("undefining %s\n",yytext); //printf("undefining %s\n",yytext);
def->undef=TRUE; def->undef=TRUE;
...@@ -1955,7 +1958,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) ...@@ -1955,7 +1958,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
{ {
FileState *fs=g_includeStack.pop(); FileState *fs=g_includeStack.pop();
//fileDefineCache->merge(g_yyFileName,fs->fileName); //fileDefineCache->merge(g_yyFileName,fs->fileName);
if (Config_getString("INPUT_FILTER").isEmpty()) if (getFileFilter(fs->fileName.data()).isEmpty())
fclose(fs->filePtr); fclose(fs->filePtr);
else else
pclose(fs->filePtr); pclose(fs->filePtr);
...@@ -2203,7 +2206,7 @@ void preprocessFile(const char *fileName,BufStr &output) ...@@ -2203,7 +2206,7 @@ void preprocessFile(const char *fileName,BufStr &output)
} }
QCString &inputFilter = Config_getString("INPUT_FILTER"); QCString inputFilter = getFileFilter(fileName);
if (inputFilter.isEmpty()) if (inputFilter.isEmpty())
{ {
preYYin = fopen(fileName,"r"); preYYin = fopen(fileName,"r");
......
src/translator_cn.h
View file @ 46361b70
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
*/ */
#define CN_SPC #define CN_SPC
class TranslatorChinese : public TranslatorAdapter_1_2_13 class TranslatorChinese : public TranslatorAdapter_1_3_3
{ {
public: public:
/*! Used for identification of the language. The identification /*! Used for identification of the language. The identification
...@@ -36,24 +36,24 @@ class TranslatorChinese : public TranslatorAdapter_1_2_13 ...@@ -36,24 +36,24 @@ class TranslatorChinese : public TranslatorAdapter_1_2_13
virtual QCString idLanguage() virtual QCString idLanguage()
{ return "chinese"; } { return "chinese"; }
/*! Used to get the LaTeX command(s) for the language support. /*! Used to get the LaTeX command(s) for the language support.
* This method should return string with commands that switch * This method should return string with commands that switch
* LaTeX to the desired language. For example * LaTeX to the desired language. For example
* <pre>"\\usepackage[german]{babel}\n" * <pre>"\\usepackage[german]{babel}\n"
* </pre> * </pre>
* or * or
* <pre>"\\usepackage{polski}\n" * <pre>"\\usepackage{polski}\n"
* "\\usepackage[latin2]{inputenc}\n" * "\\usepackage[latin2]{inputenc}\n"
* "\\usepackage[T1]{fontenc}\n" * "\\usepackage[T1]{fontenc}\n"
* </pre> * </pre>
* *
* The English LaTeX does not use such commands. Because of this * The English LaTeX does not use such commands. Because of this
* the empty string is returned in this implementation. * the empty string is returned in this implementation.
*/ */
virtual QCString latexLanguageSupportCommand() virtual QCString latexLanguageSupportCommand()
{ {
return ""; return "";
} }
/*! return the language charset. This will be used for the HTML output */ /*! return the language charset. This will be used for the HTML output */
...@@ -495,8 +495,8 @@ class TranslatorChinese : public TranslatorAdapter_1_2_13 ...@@ -495,8 +495,8 @@ class TranslatorChinese : public TranslatorAdapter_1_2_13
case ClassDef::Struct: result+="结构"; break; case ClassDef::Struct: result+="结构"; break;
case ClassDef::Union: result+="联合"; break; case ClassDef::Union: result+="联合"; break;
case ClassDef::Interface: result+="接口"; break; case ClassDef::Interface: result+="接口"; break;
case ClassDef::Protocol: result+="protocol"; break; // translate me! case ClassDef::Protocol: result+="协议"; break; // translate me!
case ClassDef::Category: result+="category"; break; // translate me! case ClassDef::Category: result+="分类"; break; // translate me!
case ClassDef::Exception: result+="异常"; break; case ClassDef::Exception: result+="异常"; break;
} }
result+="参考"; result+="参考";
...@@ -661,8 +661,8 @@ class TranslatorChinese : public TranslatorAdapter_1_2_13 ...@@ -661,8 +661,8 @@ class TranslatorChinese : public TranslatorAdapter_1_2_13
case ClassDef::Struct: result+="结构"; break; case ClassDef::Struct: result+="结构"; break;
case ClassDef::Union: result+="联合"; break; case ClassDef::Union: result+="联合"; break;
case ClassDef::Interface: result+="接口"; break; case ClassDef::Interface: result+="接口"; break;
case ClassDef::Protocol: result+="protocol"; break; // translate me! case ClassDef::Protocol: result+="协议"; break; // translate me!
case ClassDef::Category: result+="category"; break; // translate me! case ClassDef::Category: result+="分类"; break; // translate me!
case ClassDef::Exception: result+="异常"; break; case ClassDef::Exception: result+="异常"; break;
} }
result+="的文档由以下文件生成："; result+="的文档由以下文件生成：";
...@@ -1282,6 +1282,194 @@ class TranslatorChinese : public TranslatorAdapter_1_2_13 ...@@ -1282,6 +1282,194 @@ class TranslatorChinese : public TranslatorAdapter_1_2_13
{ {
return "参考"; return "参考";
} }
//////////////////////////////////////////////////////////////////////////
// new since 1.2.13
//////////////////////////////////////////////////////////////////////////
/*! used in member documentation blocks to produce a list of
* members that are implemented by this one.
*/
virtual QCString trImplementedFromList(int numEntries)
{
/* return "Implements "+trWriteList(numEntries)+"."; */
return "实现了"CN_SPC+trWriteList(numEntries)+"。";
}
/*! used in member documentation blocks to produce a list of
* all members that implement this abstract member.
*/
virtual QCString trImplementedInList(int numEntries)
{
/* return "Implemented in "+trWriteList(numEntries)+"."; */
return "在"CN_SPC+trWriteList(numEntries)+CN_SPC"内被实现。";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.16
//////////////////////////////////////////////////////////////////////////
/*! used in RTF documentation as a heading for the Table
* of Contents.
*/
virtual QCString trRTFTableOfContents()
{
/* return "Table of Contents"; */
return "目录";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.17
//////////////////////////////////////////////////////////////////////////
/*! Used as the header of the list of item that have been
* flagged deprecated
*/
virtual QCString trDeprecatedList()
{
/* return "Deprecated List"; */
return "过时列表";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.18
//////////////////////////////////////////////////////////////////////////
/*! Used as a header for declaration section of the events found in
* a C# program
*/
virtual QCString trEvents()
{
/* return "Events"; */
return "事件";
}
/*! Header used for the documentation section of a class' events. */
virtual QCString trEventDocumentation()
{
/* return "Event Documentation"; */
return "事件文档";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3
//////////////////////////////////////////////////////////////////////////
/*! Used as a heading for a list of Java class types with package scope.
*/
virtual QCString trPackageTypes()
{
/* return "Package Types"; */
return "模块类型";
}
/*! Used as a heading for a list of Java class functions with package
* scope.
*/
virtual QCString trPackageMembers()
{
/* return "Package Functions"; */
return "模块函数";
}
/*! Used as a heading for a list of static Java class functions with
* package scope.
*/
virtual QCString trStaticPackageMembers()
{
/* return "Static Package Functions"; */
return "静态模块函数";
}
/*! Used as a heading for a list of Java class variables with package
* scope.
*/
virtual QCString trPackageAttribs()
{
/* return "Package Attributes"; */
return "模块属性";
}
/*! Used as a heading for a list of static Java class variables with
* package scope.
*/
virtual QCString trStaticPackageAttribs()
{
/* return "Static Package Attributes"; */
return "静态模块属性";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3.1
//////////////////////////////////////////////////////////////////////////
/*! Used in the quick index of a class/file/namespace member list page
* to link to the unfiltered list of all members.
*/
virtual QCString trAll()
{
/* return "All"; */
return "全部";
}
/*! Put in front of the call graph for a function. */
virtual QCString trCallGraph()
{
/* return "Here is the call graph for this function:"; */
return "函数调用图:";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3.3
//////////////////////////////////////////////////////////////////////////
/*! When the search engine is enabled this text is put in the header
* of each page before the field where one can enter the text to search
* for.
*/
virtual QCString trSearchForIndex()
{
/* return "Search for"; */
return "搜索";
}
/*! This string is used as the title for the page listing the search
* results.
*/
virtual QCString trSearchResultsTitle()
{
/* return "Search Results"; */
return "搜索结果";
}
/*! This string is put just before listing the search results. The
* text can be different depending on the number of documents found.
* Inside the text you can put the special marker $num to insert
* the number representing the actual number of search results.
* The @a numDocuments parameter can be either 0, 1 or 2, where the
* value 2 represents 2 or more matches. HTML markup is allowed inside
* the returned string.
*/
virtual QCString trSearchResults(int numDocuments)
{
if (numDocuments==0)
{
/* return "Sorry, no documents matching your query."; */
return "对不起，找不到与你的查询相符的文档。";
}
else if (numDocuments==1)
{
/* return "Found <b>1</b> document matching your query."; */
return "找到<b>1</b>篇与你的查询相符的文档。";
}
else
{
/* return "Found <b>$num</b> documents matching your query. "
"Showing best matches first."; */
return "找到<b>$num</b>篇与你的查询相符的文档。"
"先显示最吻合的文档。";
}
}
/*! This string is put before the list of matched words, for each search
* result. What follows is the list of words that matched the query.
*/
virtual QCString trSearchMatches()
{
return "Matches:";
return "符合的结果:";
}
}; };
#endif #endif
src/translator_za.h 0 → 100644
View file @ 46361b70
/******************************************************************************
*
*
*
* Copyright (C) 1997-2004 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.
*
*/
/*
* Bronne vir hierdie vertaling (Sources for this translation):
* Die Stigting vir Afrikaans se rekenaartermelys:
* - http://www.afrikaans.com/rekenaarterme.html
* Werkgroep vir Afrikaanse IT-terme:
* - http://www.vertaal.org/index.html
*/
#ifndef TRANSLATOR_ZA_H
#define TRANSLATOR_ZA_H
class TranslatorAfrikaans : public Translator
{
public:
// --- Language control methods -------------------
/*! Used for identification of the language. The identification
* should not be translated. It should be replaced by the name
* of the language in English using lower-case characters only
* (e.g. "czech", "japanese", "russian", etc.). It should be equal to
* the identification used in language.cpp.
*/
virtual QCString idLanguage()
{ return "afrikaans"; }
/*! Used to get the LaTeX command(s) for the language support.
* This method should return string with commands that switch
* LaTeX to the desired language. For example
* <pre>"\\usepackage[german]{babel}\n"
* </pre>
* or
* <pre>"\\usepackage{polski}\n"
* "\\usepackage[latin2]{inputenc}\n"
* "\\usepackage[T1]{fontenc}\n"
* </pre>
*
* The Afrikaans LaTeX does not use such commands. Because of this
* the empty string is returned in this implementation.
*/
virtual QCString latexLanguageSupportCommand()
{
//should we use return "\\usepackage[afrikaans]{babel}\n";
// not sure - for now return an empty string
return "";
}
/*! return the language charset. This will be used for the HTML output */
virtual QCString idLanguageCharset()
{
return "iso-8859-1";
}
// --- Language translation methods -------------------
/*! used in the compound documentation before a list of related functions. */
virtual QCString trRelatedFunctions()
{ return "Verwante Funksies"; }
/*! subscript for the related functions. */
virtual QCString trRelatedSubscript()
{ return "(Let daarop dat hierdie nie lede funksies is nie.)"; }
/*! header that is put before the detailed description of files, classes and namespaces. */
virtual QCString trDetailedDescription()
{ return "Detail Beskrywing"; }
/*! header that is put before the list of typedefs. */
virtual QCString trMemberTypedefDocumentation()
{ return "Lede Typedef Dokumentasie"; }
/*! header that is put before the list of enumerations. */
virtual QCString trMemberEnumerationDocumentation()
{ return "Lede Enumerasie Dokumentasie"; }
/*! header that is put before the list of member functions. */
virtual QCString trMemberFunctionDocumentation()
{ return "Lede Funksie Dokumentasie"; }
/*! header that is put before the list of member attributes. */
virtual QCString trMemberDataDocumentation()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Veld Dokumentasie";
}
else
{
return "Lede Data Dokumentasie";
}
}
/*! this is the text of a link put after brief descriptions. */
virtual QCString trMore()
{ return "Meer detail..."; }
/*! put in the class documentation */
virtual QCString trListOfAllMembers()
{ return "Lys van alle lede."; }
/*! used as the title of the "list of all members" page of a class */
virtual QCString trMemberList()
{ return "Lede Lys"; }
/*! this is the first part of a sentence that is followed by a class name */
virtual QCString trThisIsTheListOfAllMembers()
{ return "Hierdie is 'n volledige lys van lede vir "; }
/*! this is the remainder of the sentence after the class name */
virtual QCString trIncludingInheritedMembers()
{ return ", insluitend alle afgeleide lede."; }
/*! this is put at the author sections at the bottom of man pages.
* parameter s is name of the project name.
*/
virtual QCString trGeneratedAutomatically(const char *s)
{ QCString result="Automaties gegenereer deur Doxygen";
if (s) result+=(QCString)" vir "+s;
result+=" van die bron kode af.";
return result;
}
/*! put after an enum name in the list of all members */
virtual QCString trEnumName()
{ return "enum naam"; }
/*! put after an enum value in the list of all members */
virtual QCString trEnumValue()
{ return "enum waarde"; }
/*! put after an undocumented member in the list of all members */
virtual QCString trDefinedIn()
{ return "gedefinie&euml;r in"; }
// quick reference sections
/*! This is put above each page as a link to the list of all groups of
* compounds or files (see the \\group command).
*/
virtual QCString trModules()
{ return "Modules"; }
/*! This is put above each page as a link to the class hierarchy */
virtual QCString trClassHierarchy()
{ return "Klas Hierargie"; }
/*! This is put above each page as a link to the list of annotated classes */
virtual QCString trCompoundList()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Data Strukture";
}
else
{
return "Klas Lys";
}
}
/*! This is put above each page as a link to the list of documented files */
virtual QCString trFileList()
{ return "Le&euml;r Lys"; }
/*! This is put above each page as a link to the list of all verbatim headers */
virtual QCString trHeaderFiles()
{ return "Kop Le&euml;r"; }
/*! This is put above each page as a link to all members of compounds. */
virtual QCString trCompoundMembers()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Data Velde";
}
else
{
return "Klas Lede";
}
}
/*! This is put above each page as a link to all members of files. */
virtual QCString trFileMembers()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Globals";
}
else
{
return "Le&euml;r Lede";
}
}
/*! This is put above each page as a link to all related pages. */
virtual QCString trRelatedPages()
{ return "Verwante Bladsye"; }
/*! This is put above each page as a link to all examples. */
virtual QCString trExamples()
{ return "Voorbeelde"; }
/*! This is put above each page as a link to the search engine. */
virtual QCString trSearch()
{ return "Soek"; }
/*! This is an introduction to the class hierarchy. */
virtual QCString trClassHierarchyDescription()
{
return "Hierdie afgeleide lys word rofweg gesorteer: ";
}
/*! This is an introduction to the list with all files. */
virtual QCString trFileListDescription(bool extractAll)
{
QCString result="Hier is 'n lys van alle ";
if (!extractAll) result+="gedokumenteerde ";
result+="le&euml;rs met kort beskrywings:";
return result;
}
/*! This is an introduction to the annotated compound list. */
virtual QCString trCompoundListDescription()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return " Data strukture met kort beskrywings:";
}
else
{
return "Klasse, structs, "
"unions en intervlakke met kort beskrywings:";
}
}
/*! This is an introduction to the page with all class members. */
virtual QCString trCompoundMembersDescription(bool extractAll)
{
QCString result="'n Lys van alle ";
if (!extractAll)
{
result+="gedokumenteerde ";
}
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="struct en union velde";
}
else
{
result+="klas lede";
}
result+=" met skakels na ";
if (!extractAll)
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="die struct/union dokumentasie vir elke veld:";
}
else
{
result+="die klas dokumentasie vir elke lid:";
}
}
else
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="die structures/unions waaraan hulle behoort:";
}
else
{
result+="die klasse waaraan hulle behoort:";
}
}
return result;
}
/*! This is an introduction to the page with all file members. */
virtual QCString trFileMembersDescription(bool extractAll)
{
QCString result="'n Lys van alle ";
if (!extractAll) result+="gedokumenteerde ";
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="funksies, veranderlikes, defines, enums, en typedefs";
}
else
{
result+="le&euml;r lede";
}
result+=" met skakels na ";
if (extractAll)
result+="die le&euml;rs waaraan hulle behoort:";
else
result+="die dokumentasie:";
return result;
}
/*! This is an introduction to the page with the list of all header files. */
virtual QCString trHeaderFilesDescription()
{ return "Die kop leers waaruit die API bestaan:"; }
/*! This is an introduction to the page with the list of all examples */
virtual QCString trExamplesDescription()
{ return "'n Lys van alle voorbeelde:"; }
/*! This is an introduction to the page with the list of related pages */
virtual QCString trRelatedPagesDescription()
{ return "'n Lys van alle verwante dokumentasie:"; }
/*! This is an introduction to the page with the list of class/file groups */
virtual QCString trModulesDescription()
{ return "'n Lys van alle modules:"; }
/*! This sentences is used in the annotated class/file lists if no brief
* description is given.
*/
virtual QCString trNoDescriptionAvailable()
{ return "Geen beskrywings beskikbaar"; }
// index titles (the project name is prepended for these)
/*! This is used in HTML as the title of index.html. */
virtual QCString trDocumentation()
{ return "Dokumentasie"; }
/*! This is used in LaTeX as the title of the chapter with the
* index of all groups.
*/
virtual QCString trModuleIndex()
{ return "Module Indeks"; }
/*! This is used in LaTeX as the title of the chapter with the
* class hierarchy.
*/
virtual QCString trHierarchicalIndex()
{ return "Hierargiese Indeks"; }
/*! This is used in LaTeX as the title of the chapter with the
* annotated compound index.
*/
virtual QCString trCompoundIndex()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Data Strukture Indeks";
}
else
{
return "Klas Indeks";
}
}
/*! This is used in LaTeX as the title of the chapter with the
* list of all files.
*/
virtual QCString trFileIndex()
{ return "Le&euml;r Indeks"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all groups.
*/
virtual QCString trModuleDocumentation()
{ return "Module Dokumentasie"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all classes, structs and unions.
*/
virtual QCString trClassDocumentation()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Data Strukture Dokumentasie";
}
else
{
return "Klas Dokumentasie";
}
}
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all files.
*/
virtual QCString trFileDocumentation()
{ return "Le&euml;r Dokumentasie"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all examples.
*/
virtual QCString trExampleDocumentation()
{ return "Voorbeeld Dokumentasie"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all related pages.
*/
virtual QCString trPageDocumentation()
{ return "Bladsy Dokumentasie"; }
/*! This is used in LaTeX as the title of the document */
virtual QCString trReferenceManual()
{ return "Verwysings Handleiding"; }
/*! This is used in the documentation of a file as a header before the
* list of defines
*/
virtual QCString trDefines()
{ return "Definiesies"; }
/*! This is used in the documentation of a file as a header before the
* list of function prototypes
*/
virtual QCString trFuncProtos()
{ return "Funksie Prototipes"; }
/*! This is used in the documentation of a file as a header before the
* list of typedefs
*/
virtual QCString trTypedefs()
{ return "Typedefs"; }
/*! This is used in the documentation of a file as a header before the
* list of enumerations
*/
virtual QCString trEnumerations()
{ return "Enumerations"; }
/*! This is used in the documentation of a file as a header before the
* list of (global) functions
*/
virtual QCString trFunctions()
{ return "Funksies"; }
/*! This is used in the documentation of a file as a header before the
* list of (global) variables
*/
virtual QCString trVariables()
{ return "Veranderlikes"; }
/*! This is used in the documentation of a file as a header before the
* list of (global) variables
*/
virtual QCString trEnumerationValues()
{ return "Enumeration waardes"; }
/*! This is used in the documentation of a file before the list of
* documentation blocks for defines
*/
virtual QCString trDefineDocumentation()
{ return "Define Documentation"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for function prototypes
*/
virtual QCString trFunctionPrototypeDocumentation()
{ return "Funksie Prototipe Dokumentasie"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for typedefs
*/
virtual QCString trTypedefDocumentation()
{ return "Typedef Dokumentasie"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for enumeration types
*/
virtual QCString trEnumerationTypeDocumentation()
{ return "Enumeration Type Dokumentasie"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for enumeration values
*/
virtual QCString trEnumerationValueDocumentation()
{ return "Enumeration Waarde Dokumentasie"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for functions
*/
virtual QCString trFunctionDocumentation()
{ return "Funksie Dokumentasie"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for variables
*/
virtual QCString trVariableDocumentation()
{ return "Veranderlike Dokumentasie"; }
/*! This is used in the documentation of a file/namespace/group before
* the list of links to documented compounds
*/
virtual QCString trCompounds()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Data Strukture";
}
else
{
return "Klasse";
}
}
/*! This is used in the standard footer of each page and indicates when
* the page was generated
*/
virtual QCString trGeneratedAt(const char *date,const char *projName)
{
QCString result=(QCString)"Gegenereer op "+date;
if (projName) result+=(QCString)" vir "+projName;
result+=(QCString)" deur";
return result;
}
/*! This is part of the sentence used in the standard footer of each page.
*/
virtual QCString trWrittenBy()
{
return "geskryf deur";
}
/*! this text is put before a class diagram */
virtual QCString trClassDiagram(const char *clName)
{
return (QCString)"Afleidings diagram vir "+clName+":";
}
/*! this text is generated when the \\internal command is used. */
virtual QCString trForInternalUseOnly()
{ return "Slegs vir interne gebruik."; }
/*! this text is generated when the \\reimp command is used. */
virtual QCString trReimplementedForInternalReasons()
{ return "Hergeimplimenteer vir interne redes; die API word nie beinvloed nie."; }
/*! this text is generated when the \\warning command is used. */
virtual QCString trWarning()
{ return "Waarskuwing"; }
/*! this text is generated when the \\bug command is used. */
virtual QCString trBugsAndLimitations()
{ return "Bugs and beperkings"; }
/*! this text is generated when the \\version command is used. */
virtual QCString trVersion()
{ return "Weergawe"; }
/*! this text is generated when the \\date command is used. */
virtual QCString trDate()
{ return "Datum"; }
/*! this text is generated when the \\return command is used. */
virtual QCString trReturns()
{ return "Returns"; }
/*! this text is generated when the \\sa command is used. */
virtual QCString trSeeAlso()
{ return "Sien ook"; }
/*! this text is generated when the \\param command is used. */
virtual QCString trParameters()
{ return "Parameters"; }
/*! this text is generated when the \\exception command is used. */
virtual QCString trExceptions()
{ return "Exceptions"; }
/*! this text is used in the title page of a LaTeX document. */
virtual QCString trGeneratedBy()
{ return "Gegenereer deur"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990307
//////////////////////////////////////////////////////////////////////////
/*! used as the title of page containing all the index of all namespaces. */
virtual QCString trNamespaceList()
{ return "Namespace Lys"; }
/*! used as an introduction to the namespace list */
virtual QCString trNamespaceListDescription(bool extractAll)
{
QCString result="'n Lys van alle ";
if (!extractAll) result+="gedokumenteerde ";
result+="namespaces met kort beskrywings:";
return result;
}
/*! used in the class documentation as a header before the list of all
* friends of a class
*/
virtual QCString trFriends()
{ return "Friends"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990405
//////////////////////////////////////////////////////////////////////////
/*! used in the class documentation as a header before the list of all
* related classes
*/
virtual QCString trRelatedFunctionDocumentation()
{ return "Friends En Verwante Funksie Dokumentasie"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990425
//////////////////////////////////////////////////////////////////////////
/*! used as the title of the HTML page of a class/struct/union */
virtual QCString trCompoundReference(const char *clName,
ClassDef::CompoundType compType,
bool isTemplate)
{
QCString result=(QCString)clName;
switch(compType)
{
case ClassDef::Class: result+=" klas"; break;
case ClassDef::Struct: result+=" Struct"; break;
case ClassDef::Union: result+=" Union"; break;
case ClassDef::Interface: result+=" Intervlak"; break;
case ClassDef::Protocol: result+=" Protocol"; break;
case ClassDef::Category: result+=" Kategorie"; break;
case ClassDef::Exception: result+=" Exception"; break;
}
if (isTemplate) result+=" Template";
result+=" Verwysing";
return result;
}
/*! used as the title of the HTML page of a file */
virtual QCString trFileReference(const char *fileName)
{
QCString result=fileName;
result+=" Le&euml;r Verwysing";
return result;
}
/*! used as the title of the HTML page of a namespace */
virtual QCString trNamespaceReference(const char *namespaceName)
{
QCString result=namespaceName;
result+=" Namespace Verwysing";
return result;
}
virtual QCString trPublicMembers()
{ return "Publieke Lede Funksies"; }
virtual QCString trPublicSlots()
{ return "Publieke Slots"; }
virtual QCString trSignals()
{ return "Signals"; }
virtual QCString trStaticPublicMembers()
{ return "Statiese Publieke Lede Funksies"; }
virtual QCString trProtectedMembers()
{ return "Beskermde Lede Funksies"; }
virtual QCString trProtectedSlots()
{ return "Beskermde Slots"; }
virtual QCString trStaticProtectedMembers()
{ return "Statiese Beskermde Lede Funksies"; }
virtual QCString trPrivateMembers()
{ return "Private Lede Funksies"; }
virtual QCString trPrivateSlots()
{ return "Private Slots"; }
virtual QCString trStaticPrivateMembers()
{ return "Statiese Private Lede Funksies"; }
/*! this function is used to produce a comma-separated list of items.
* use generateMarker(i) to indicate where item i should be put.
*/
virtual QCString trWriteList(int numEntries)
{
QCString result;
int i;
// the inherits list contain `numEntries' classes
for (i=0;i<numEntries;i++)
{
// use generateMarker to generate placeholders for the class links!
result+=generateMarker(i); // generate marker for entry i in the list
// (order is left to right)
if (i!=numEntries-1) // not the last entry, so we need a separator
{
if (i<numEntries-2) // not the fore last entry
result+=", ";
else // the fore last entry
result+=", en ";
}
}
return result;
}
/*! used in class documentation to produce a list of base classes,
* if class diagrams are disabled.
*/
virtual QCString trInheritsList(int numEntries)
{
return "Afgelei van"+trWriteList(numEntries)+".";
}
/*! used in class documentation to produce a list of super classes,
* if class diagrams are disabled.
*/
virtual QCString trInheritedByList(int numEntries)
{
return "Afgelei van"+trWriteList(numEntries)+".";
}
/*! used in member documentation blocks to produce a list of
* members that are hidden by this one.
*/
virtual QCString trReimplementedFromList(int numEntries)
{
return "Hergeimplimenteer van "+trWriteList(numEntries)+".";
}
/*! used in member documentation blocks to produce a list of
* all member that overwrite the implementation of this member.
*/
virtual QCString trReimplementedInList(int numEntries)
{
return "Hergeimplimenter in "+trWriteList(numEntries)+".";
}
/*! This is put above each page as a link to all members of namespaces. */
virtual QCString trNamespaceMembers()
{ return "Namespace Lede"; }
/*! This is an introduction to the page with all namespace members */
virtual QCString trNamespaceMemberDescription(bool extractAll)
{
QCString result="'n Lys van alle ";
if (!extractAll) result+="gedokumenteerde ";
result+="namespace lede met skakels na ";
if (extractAll)
result+="die namespace dokumentasie vir elke lid:";
else
result+="die namespaces waaraan hulle behoort:";
return result;
}
/*! This is used in LaTeX as the title of the chapter with the
* index of all namespaces.
*/
virtual QCString trNamespaceIndex()
{ return "Namespace Indeks"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all namespaces.
*/
virtual QCString trNamespaceDocumentation()
{ return "Namespace Dokumentasie"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990522
//////////////////////////////////////////////////////////////////////////
/*! This is used in the documentation before the list of all
* namespaces in a file.
*/
virtual QCString trNamespaces()
{ return "Namespaces"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990728
//////////////////////////////////////////////////////////////////////////
/*! This is put at the bottom of a class documentation page and is
* followed by a list of files that were used to generate the page.
*/
virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
bool single)
{ // here s is one of " Class", " Struct" or " Union"
// single is true implies a single file
QCString result=(QCString)"Die dokumentasie vir hierdie ";
switch(compType)
{
case ClassDef::Class: result+="klas"; break;
case ClassDef::Struct: result+="struct"; break;
case ClassDef::Union: result+="union"; break;
case ClassDef::Interface: result+="intervlak"; break;
case ClassDef::Protocol: result+="protokol"; break;
case ClassDef::Category: result+="category"; break;
case ClassDef::Exception: result+="exception"; break;
}
result+=" is gegenereer vanaf die volgende le&euml;r";
if (single) result+=":"; else result+="s:";
return result;
}
/*! This is in the (quick) index as a link to the alphabetical compound
* list.
*/
virtual QCString trAlphabeticalList()
{ return "Alfabetiese Lys"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990901
//////////////////////////////////////////////////////////////////////////
/*! This is used as the heading text for the retval command. */
virtual QCString trReturnValues()
{ return "Return waardes"; }
/*! This is in the (quick) index as a link to the main page (index.html)
*/
virtual QCString trMainPage()
{ return "Hoof Bladsy"; }
/*! This is used in references to page that are put in the LaTeX
* documentation. It should be an abbreviation of the word page.
*/
virtual QCString trPageAbbreviation()
{ return "p."; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-991003
//////////////////////////////////////////////////////////////////////////
virtual QCString trSources()
{
return "Bronne";
}
virtual QCString trDefinedAtLineInSourceFile()
{
return "Gedefinie&euml;r by lyn @0 van le&euml;r @1.";
}
virtual QCString trDefinedInSourceFile()
{
return "Definisie in le&euml;r @0.";
}
//////////////////////////////////////////////////////////////////////////
// new since 0.49-991205
//////////////////////////////////////////////////////////////////////////
virtual QCString trDeprecated()
{
return "Verouderd";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.0.0
//////////////////////////////////////////////////////////////////////////
/*! this text is put before a collaboration diagram */
virtual QCString trCollaborationDiagram(const char *clName)
{
return (QCString)"Samewerkings diagram vir "+clName+":";
}
/*! this text is put before an include dependency graph */
virtual QCString trInclDepGraph(const char *fName)
{
return (QCString)"Insluitings afhanklikheid diagram vir "+fName+":";
}
/*! header that is put before the list of constructor/destructors. */
virtual QCString trConstructorDocumentation()
{
return "Konstruktor & Destruktor Dokumentasie";
}
/*! Used in the file documentation to point to the corresponding sources. */
virtual QCString trGotoSourceCode()
{
return "Skakel na die bron kode van hierdie le&euml;r.";
}
/*! Used in the file sources to point to the corresponding documentation. */
virtual QCString trGotoDocumentation()
{
return "Skakel na die dokumentasie van hierdie le&euml;r.";
}
/*! Text for the \\pre command */
virtual QCString trPrecondition()
{
return "Prekondisie";
}
/*! Text for the \\post command */
virtual QCString trPostcondition()
{
return "Postkondisie";
}
/*! Text for the \\invariant command */
virtual QCString trInvariant()
{
return "Invariant";
}
/*! Text shown before a multi-line variable/enum initialization */
virtual QCString trInitialValue()
{
return "Oorspronklike waarde:";
}
/*! Text used the source code in the file index */
virtual QCString trCode()
{
return "kode";
}
virtual QCString trGraphicalHierarchy()
{
return "Grafiese Klasse Hierargie";
}
virtual QCString trGotoGraphicalHierarchy()
{
return "Skakel na die grafiese klasse hierargie";
}
virtual QCString trGotoTextualHierarchy()
{
return "Skakel na die teks klasse hierargie";
}
virtual QCString trPageIndex()
{
return "Bladsy Indeks";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.1.0
//////////////////////////////////////////////////////////////////////////
virtual QCString trNote()
{
return "Nota";
}
virtual QCString trPublicTypes()
{
return "Publieke Tipes";
}
virtual QCString trPublicAttribs()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Data Velde";
}
else
{
return "Publieke Public Attributes";
}
}
virtual QCString trStaticPublicAttribs()
{
return "Statiese Publieke Attribute";
}
virtual QCString trProtectedTypes()
{
return "Beskermde Tipes";
}
virtual QCString trProtectedAttribs()
{
return "Beskermde Attribute";
}
virtual QCString trStaticProtectedAttribs()
{
return "Statiese Beskermde Attribute";
}
virtual QCString trPrivateTypes()
{
return "Private Tipes";
}
virtual QCString trPrivateAttribs()
{
return "Private Attribute";
}
virtual QCString trStaticPrivateAttribs()
{
return "Statiese Private Attribute";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.1.3
//////////////////////////////////////////////////////////////////////////
/*! Used as a marker that is put before a \\todo item */
virtual QCString trTodo()
{
return "Aksies";
}
/*! Used as the header of the todo list */
virtual QCString trTodoList()
{
return "Aksie Lys";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.1.4
//////////////////////////////////////////////////////////////////////////
virtual QCString trReferencedBy()
{
return "Verwysing van";
}
virtual QCString trRemarks()
{
return "Opmerkings";
}
virtual QCString trAttention()
{
return "Aandag";
}
virtual QCString trInclByDepGraph()
{
return "Hierdie diagram verduidelik watter le&euml;rs direk of"
"indirek hierdie le&euml;r insluit:";
}
virtual QCString trSince()
{
return "Sederd";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.1.5
//////////////////////////////////////////////////////////////////////////
/*! title of the graph legend page */
virtual QCString trLegendTitle()
{
return "Diagram beskrywing";
}
/*! page explaining how the dot graph's should be interpreted
* The %A in the text below are to prevent link to classes called "A".
*/
virtual QCString trLegendDocs()
{
return
"Hierdie bladsy beskryf die diagram konvensies wat gebruik word "
"deur doxygen.<p>\n"
"in hierdie voorbeeld:\n"
"\\code\n"
"/*! Onsigbare klas weens afkorting */\n"
"class Invisible { };\n\n"
"/*! Afgekorte klas, afgeleide verwantskap word versteek */\n"
"class Truncated : public Invisible { };\n\n"
"/* Ongedokumenteerde Klas, geen doxygen kommentaar nie */\n"
"class Undocumented{ };\n\n"
"/*! 'n Klas wat afgelei is met 'n publieke verwantskap */\n"
"class PublicBase : public Truncated { };\n\n"
"/*! 'n template klas */\n"
"template<class T> class Templ { };\n\n"
"/*! 'n Klas wat afgelei is met 'n beskermde verwantskap */\n"
"class ProtectedBase { };\n\n"
"/*! 'n Klas wat afgelei is met 'n private verwantskap */\n"
"class PrivateBase { };\n\n"
"/*! 'n Klas wat gebrui word deur die Afgeleide klas */\n"
"class GebruikMy { };\n\n"
"/*! 'n Super klas wat afgelei word van 'n aantal basis klasse */\n"
"class Inherited : public PublicBase,\n"
" protected ProtectedBase,\n"
" private PrivateBase,\n"
" public Ongedokumenteer\n"
" public Templ<int>\n"
"{\n"
" private:\n"
" Used *m_usedClass;\n"
"};\n"
"\\endcode\n"
"As die \\c MAX_DOT_GRAPH_HEIGHT merker in die konfigurasie le&euml;r "
"aan 240 gelyk gestel is, word die volgende diagram geproduseer:"
"<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
"<p>\n"
"Die reghoeke in die diagram het die volgende betekenis:\n"
"<ul>\n"
"<li>%'n Soliede swart reghoek verteenwoordig die klas waarvoor "
"die diagram gegenereer is.\n"
"<li>%'n Reghoek met 'n swart omlyning verteenwoordig 'n gedokumenteerde klas.\n"
"<li>%'n Reghoek met 'n grys omlyning verteenwoordig 'n ongedokumenteerde klas.\n"
"<li>%'n Reghoek met 'n rooi omlyning verteenwoordig 'n gedokumenteerde klas waarvoor"
"alle verwante klasse (afgeleide of gebruik) nie getoon word nie. %'n Diagram word "
"op hierie manier afgekort as dit nie in die gespesifiseerde raam pas nie.\n"
"</ul>\n"
"Die pyltjies het die volgende betekenis:\n"
"<ul>\n"
"<li>%'n Donker blou pyltjie verteenwoordig 'n publieke afgeleide "
"verwantskap tussen twee klasse.\n"
"<li>%'n Donker groen pyltjie word gebruik vir 'n beskermde verwantskap.\n"
"<li>%'n Donker rooi pyltjie verteenwoordig private verwantskappe.\n"
"<li>%'n Pers pyltjie word gebruik as 'n klas gebruik of bevat word "
"deur 'n ander klas. Die pyltjie word gemerk met die veranderlike(s) waar deur "
"die verwysde klass verkrygbaar is.\n"
"<li>%'n Geel stippel pyl verteenwoordig die verwantslap tussen 'n template instansie en "
"die template waarvan die klas vervaardig is. Die pyltjie word gemerk met die "
"template parameters van die instansie.\n"
"</ul>\n";
}
/*! text for the link to the legend page */
virtual QCString trLegend()
{
return "beskrywing";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.0
//////////////////////////////////////////////////////////////////////////
/*! Used as a marker that is put before a test item */
virtual QCString trTest()
{
return "Toets";
}
/*! Used as the header of the test list */
virtual QCString trTestList()
{
return "Toets Lys";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.1
//////////////////////////////////////////////////////////////////////////
/*! Used as a section header for KDE-2 IDL methods */
virtual QCString trDCOPMethods()
{
return "DCOP Lede Funksies";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.2
//////////////////////////////////////////////////////////////////////////
/*! Used as a section header for IDL properties */
virtual QCString trProperties()
{
return "Eienskappe";
}
/*! Used as a section header for IDL property documentation */
virtual QCString trPropertyDocumentation()
{
return "Eienskap Dokumentasie";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.4
//////////////////////////////////////////////////////////////////////////
/*! Used for Java interfaces in the summary section of Java packages */
virtual QCString trInterfaces()
{
return "Intervlake";
}
/*! Used for Java classes in the summary section of Java packages */
virtual QCString trClasses()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Data Strukture";
}
else
{
return "Klasse";
}
}
/*! Used as the title of a Java package */
virtual QCString trPackage(const char *name)
{
return (QCString)"Pakket "+name;
}
/*! Title of the package index page */
virtual QCString trPackageList()
{
return "Pakket Lys";
}
/*! The description of the package index page */
virtual QCString trPackageListDescription()
{
return "Die pakkette met kort beskrywings (indien beskikbaar):";
}
/*! The link name in the Quick links header for each page */
virtual QCString trPackages()
{
return "Pakkette";
}
/*! Used as a chapter title for Latex & RTF output */
virtual QCString trPackageDocumentation()
{
return "Pakket Dokumentasie";
}
/*! Text shown before a multi-line define */
virtual QCString trDefineValue()
{
return "Waarde:";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.5
//////////////////////////////////////////////////////////////////////////
/*! Used as a marker that is put before a \\bug item */
virtual QCString trBug()
{
return "Bug";
}
/*! Used as the header of the bug list */
virtual QCString trBugList()
{
return "Bug Lys";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.6
//////////////////////////////////////////////////////////////////////////
/*! Used as ansicpg for RTF file
*
* The following table shows the correlation of Charset name, Charset Value and
* <pre>
* Codepage number:
* Charset Name Charset Value(hex) Codepage number
* ------------------------------------------------------
* DEFAULT_CHARSET 1 (x01)
* SYMBOL_CHARSET 2 (x02)
* OEM_CHARSET 255 (xFF)
* ANSI_CHARSET 0 (x00) 1252
* RUSSIAN_CHARSET 204 (xCC) 1251
* EE_CHARSET 238 (xEE) 1250
* GREEK_CHARSET 161 (xA1) 1253
* TURKISH_CHARSET 162 (xA2) 1254
* BALTIC_CHARSET 186 (xBA) 1257
* HEBREW_CHARSET 177 (xB1) 1255
* ARABIC _CHARSET 178 (xB2) 1256
* SHIFTJIS_CHARSET 128 (x80) 932
* HANGEUL_CHARSET 129 (x81) 949
* GB2313_CHARSET 134 (x86) 936
* CHINESEBIG5_CHARSET 136 (x88) 950
* </pre>
*
*/
virtual QCString trRTFansicp()
{
return "1252";
}
/*! Used as ansicpg for RTF fcharset
* \see trRTFansicp() for a table of possible values.
*/
virtual QCString trRTFCharSet()
{
return "0";
}
/*! Used as header RTF general index */
virtual QCString trRTFGeneralIndex()
{
return "Indeks";
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trClass(bool first_capital, bool singular)
{
QCString result((first_capital ? "Klas" : "klas"));
if (!singular) result+="se";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trFile(bool first_capital, bool singular)
{
QCString result((first_capital ? "Le&euml;r" : "le&euml;r"));
if (!singular) result+="s";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trNamespace(bool first_capital, bool singular)
{
QCString result((first_capital ? "Namespace" : "namespace"));
if (!singular) result+="s";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trGroup(bool first_capital, bool singular)
{
QCString result((first_capital ? "Groep" : "groep"));
if (!singular) result+="e";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trPage(bool first_capital, bool singular)
{
QCString result((first_capital ? "Bladsy" : "bladsy"));
if (!singular) result+="e";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trMember(bool first_capital, bool singular)
{
QCString result((first_capital ? "Lid" : "lid"));
if (!singular) result = (first_capital ? "Lede" : "lede");
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trField(bool first_capital, bool singular)
{
QCString result((first_capital ? "Veld" : "veld"));
if (!singular) result+="e";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trGlobal(bool first_capital, bool singular)
{
QCString result((first_capital ? "Global" : "global"));
if (!singular) result+="s";
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.7
//////////////////////////////////////////////////////////////////////////
/*! This text is generated when the \\author command is used and
* for the author section in man pages. */
virtual QCString trAuthor(bool first_capital, bool singular)
{
QCString result((first_capital ? "Outeur" : "outeur"));
if (!singular) result+="s";
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.11
//////////////////////////////////////////////////////////////////////////
/*! This text is put before the list of members referenced by a member
*/
virtual QCString trReferences()
{
return "Verwysings";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.13
//////////////////////////////////////////////////////////////////////////
/*! used in member documentation blocks to produce a list of
* members that are implemented by this one.
*/
virtual QCString trImplementedFromList(int numEntries)
{
return "Implimenteer "+trWriteList(numEntries)+".";
}
/*! used in member documentation blocks to produce a list of
* all members that implement this abstract member.
*/
virtual QCString trImplementedInList(int numEntries)
{
return "Geimplimenteer in "+trWriteList(numEntries)+".";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.16
//////////////////////////////////////////////////////////////////////////
/*! used in RTF documentation as a heading for the Table
* of Contents.
*/
virtual QCString trRTFTableOfContents()
{
return "Inhoudsopgawe";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.17
//////////////////////////////////////////////////////////////////////////
/*! Used as the header of the list of item that have been
* flagged deprecated
*/
virtual QCString trDeprecatedList()
{
return "Verouderde Lys";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.18
//////////////////////////////////////////////////////////////////////////
/*! Used as a header for declaration section of the events found in
* a C# program
*/
virtual QCString trEvents()
{
return "Events";
}
/*! Header used for the documentation section of a class' events. */
virtual QCString trEventDocumentation()
{
return "Event Dokumentasie";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3
//////////////////////////////////////////////////////////////////////////
/*! Used as a heading for a list of Java class types with package scope.
*/
virtual QCString trPackageTypes()
{
return "Pakket Tipes";
}
/*! Used as a heading for a list of Java class functions with package
* scope.
*/
virtual QCString trPackageMembers()
{
return "Pakket Funksies";
}
/*! Used as a heading for a list of static Java class functions with
* package scope.
*/
virtual QCString trStaticPackageMembers()
{
return "Statiese Pakket Funksies";
}
/*! Used as a heading for a list of Java class variables with package
* scope.
*/
virtual QCString trPackageAttribs()
{
return "Pakket Eienskappe";
}
/*! Used as a heading for a list of static Java class variables with
* package scope.
*/
virtual QCString trStaticPackageAttribs()
{
return "Statiese Pakket Eienskappe";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3.1
//////////////////////////////////////////////////////////////////////////
/*! Used in the quick index of a class/file/namespace member list page
* to link to the unfiltered list of all members.
*/
virtual QCString trAll()
{
return "Alle Lede";
}
/*! Put in front of the call graph for a function. */
virtual QCString trCallGraph()
{
return "'n gebruiks diagram vir hierdie funksie:";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3.3
//////////////////////////////////////////////////////////////////////////
/*! When the search engine is enabled this text is put in the header
* of each page before the field where one can enter the text to search
* for.
*/
virtual QCString trSearchForIndex()
{
return "Soek vir";
}
/*! This string is used as the title for the page listing the search
* results.
*/
virtual QCString trSearchResultsTitle()
{
return "Soektog Resultate";
}
/*! This string is put just before listing the search results. The
* text can be different depending on the number of documents found.
* Inside the text you can put the special marker $num to insert
* the number representing the actual number of search results.
* The @a numDocuments parameter can be either 0, 1 or 2, where the
* value 2 represents 2 or more matches. HTML markup is allowed inside
* the returned string.
*/
virtual QCString trSearchResults(int numDocuments)
{
if (numDocuments==0)
{
return "Geen dokumente na gelang van jou navraag nie.";
}
else if (numDocuments==1)
{
return "Die soektog het <b>1</b> dokument gevind na gelang van jou navraag.";
}
else
{
return "Die soektog het <b>$num</b> documente gevind na gelang van jou navraag. "
"Begin met beste resultate.";
}
}
/*! This string is put before the list of matched words, for each search
* result. What follows is the list of words that matched the query.
*/
virtual QCString trSearchMatches()
{
return "Teikens:";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3.8
//////////////////////////////////////////////////////////////////////////
/*! This is used in HTML as the title of page with source code for file filename
*/
virtual QCString trSourceFile(QCString& filename)
{
return filename + " Bron kode Le&euml;r";
}
};
#endif
src/util.cpp
View file @ 46361b70
...@@ -72,27 +72,6 @@ extern char **environ; ...@@ -72,27 +72,6 @@ extern char **environ;
//#define MAP_ALGO ALGO_COUNT //#define MAP_ALGO ALGO_COUNT
//#define MAP_ALGO ALGO_CRC16 //#define MAP_ALGO ALGO_CRC16
#define MAP_ALGO ALGO_MD5 #define MAP_ALGO ALGO_MD5
//------------------------------------------------------------------------
struct LookupInfo
{
LookupInfo(ClassDef *cd=0,MemberDef *td=0,QCString ts="")
: classDef(cd), typeDef(td), templSpec(ts) {}
ClassDef *classDef;
MemberDef *typeDef;
QCString templSpec;
};
static QCache<LookupInfo> g_lookupCache(20000,20000);
// object that automatically initializes the cache at startup
class CacheInitializer
{
public:
CacheInitializer() { g_lookupCache.setAutoDelete(TRUE); }
} g_cacheInitializer;
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// TextGeneratorOLImpl implementation // TextGeneratorOLImpl implementation
...@@ -618,6 +597,10 @@ ClassDef *newResolveTypedef(FileDef *fileScope,MemberDef *md,QCString *pTemplSpe ...@@ -618,6 +597,10 @@ ClassDef *newResolveTypedef(FileDef *fileScope,MemberDef *md,QCString *pTemplSpe
bool isCached = md->isTypedefValCached(); // value already cached bool isCached = md->isTypedefValCached(); // value already cached
if (isCached) if (isCached)
{ {
//printf("Already cached %s->%s\n",
// md->name().data(),
// md->getCachedTypedefVal()?md->getCachedTypedefVal()->name().data():"<none>");
if (pTemplSpec) *pTemplSpec = md->getCachedTypedefTemplSpec();
return md->getCachedTypedefVal(); return md->getCachedTypedefVal();
} }
QCString qname = md->qualifiedName(); QCString qname = md->qualifiedName();
...@@ -638,32 +621,61 @@ ClassDef *newResolveTypedef(FileDef *fileScope,MemberDef *md,QCString *pTemplSpe ...@@ -638,32 +621,61 @@ ClassDef *newResolveTypedef(FileDef *fileScope,MemberDef *md,QCString *pTemplSpe
} }
if (type.left(7)=="struct ") // strip leading "struct" if (type.left(7)=="struct ") // strip leading "struct"
{ {
type=type.mid(7);
} }
else if (type.left(6)=="union ") // or strip leading "union" else if (type.left(6)=="union ") // or strip leading "union"
{ {
type=type.mid(6);
} }
type=type.stripWhiteSpace(); // strip leading and trailing whitespace type=type.stripWhiteSpace(); // strip leading and trailing whitespace
ClassDef *result = getResolvedClassRec(md->getOuterScope(),fileScope,type,0,0); MemberDef *memTypeDef = 0;
ClassDef *result = getResolvedClassRec(md->getOuterScope(),
fileScope,type,&memTypeDef,0);
// if type is a typedef than return what it resolves to.
if (memTypeDef) return newResolveTypedef(fileScope,memTypeDef,pTemplSpec);
//printf("type=%s result=%p\n",type.data(),result); //printf("type=%s result=%p\n",type.data(),result);
if (result==0) if (result==0)
{ {
// try unspecialized version if type is template // try unspecialized version if type is template
int si=type.findRev("::");
int i=type.find('<'); int i=type.find('<');
if (i!=-1) // typedef of a template => try the unspecialized version if (si==-1 && i!=-1) // typedef of a template => try the unspecialized version
{ {
*pTemplSpec = type.mid(i); *pTemplSpec = type.mid(i);
result = getResolvedClassRec(md->getOuterScope(),fileScope,type.left(i),0,0); result = getResolvedClassRec(md->getOuterScope(),fileScope,type.left(i),0,0);
} }
else if (si!=-1) // A::B
{
i=type.find('<',si);
if (i==-1) // Something like A<T>::B => lookup A::B
{
i=type.length();
}
else // Something like A<T>::B<S> => lookup A::B, spec=<S>
{
*pTemplSpec = type.mid(i);
}
result = getResolvedClassRec(md->getOuterScope(),fileScope,
stripTemplateSpecifiersFromScope(type.left(i),FALSE),0,0);
}
} }
// remember computed value for next time // remember computed value for next time
if (result && result->getDefFileName()!="<code>") if (Doxygen::lookupCacheEnabled && result && result->getDefFileName()!="<code>")
// this check is needed to prevent that temporary classes that are // this check is needed to prevent that temporary classes that are
// introduced while parsing code fragments are being cached here. // introduced while parsing code fragments are being cached here.
{ {
//printf("setting cached typedef %p in result %p\n",md,result); //printf("setting cached typedef %p in result %p\n",md,result);
//printf("==> %s (%s,%d)\n",result->name().data(),result->getDefFileName().data(),result->getDefLine()); //printf("==> %s (%s,%d)\n",result->name().data(),result->getDefFileName().data(),result->getDefLine());
md->cacheTypedefVal(result); if (pTemplSpec)
{
md->cacheTypedefVal(result,*pTemplSpec);
}
else
{
md->cacheTypedefVal(result,"");
}
} }
g_resolvedTypedefs.remove(qname); // remove from the trace list g_resolvedTypedefs.remove(qname); // remove from the trace list
...@@ -839,7 +851,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item) ...@@ -839,7 +851,7 @@ int isAccessibleFrom(Definition *scope,FileDef *fileScope,Definition *item)
result= (i==-1) ? -1 : i+1; result= (i==-1) ? -1 : i+1;
} }
done: done:
//g_lookupCache.insert(key,new int(result)); //Doxygen::lookupCache.insert(key,new int(result));
return result; return result;
} }
...@@ -971,7 +983,7 @@ int isAccessibleFromWithExpScope(Definition *scope,FileDef *fileScope,Definition ...@@ -971,7 +983,7 @@ int isAccessibleFromWithExpScope(Definition *scope,FileDef *fileScope,Definition
} }
} }
done: done:
//g_lookupCache.insert(key,new int(result)); //Doxygen::lookupCache.insert(key,new int(result));
return result; return result;
} }
...@@ -1031,9 +1043,9 @@ ClassDef *getResolvedClassRec(Definition *scope, ...@@ -1031,9 +1043,9 @@ ClassDef *getResolvedClassRec(Definition *scope,
// scope, the name to search for and the explicit scope prefix. The speedup // scope, the name to search for and the explicit scope prefix. The speedup
// achieved by this simple cache can be enormous. // achieved by this simple cache can be enormous.
QCString key=scope->name()+"+"+name+"+"+explicitScopePart; QCString key=scope->name()+"+"+name+"+"+explicitScopePart;
LookupInfo *pval=g_lookupCache.find(key); LookupInfo *pval=Doxygen::lookupCache.find(key);
//printf("Searching for %s result=%p\n",key.data(),pval); //printf("Searching for %s result=%p\n",key.data(),pval);
if (pval) if (Doxygen::lookupCacheEnabled && pval)
{ {
if (pTemplSpec) *pTemplSpec=pval->templSpec; if (pTemplSpec) *pTemplSpec=pval->templSpec;
if (pTypeDef) *pTypeDef=pval->typeDef; if (pTypeDef) *pTypeDef=pval->typeDef;
...@@ -1045,7 +1057,7 @@ ClassDef *getResolvedClassRec(Definition *scope, ...@@ -1045,7 +1057,7 @@ ClassDef *getResolvedClassRec(Definition *scope,
else // not found yet; we already add a 0 to avoid the possibility of else // not found yet; we already add a 0 to avoid the possibility of
// endless recursion. // endless recursion.
{ {
g_lookupCache.insert(key,new LookupInfo); Doxygen::lookupCache.insert(key,new LookupInfo);
} }
ClassDef *bestMatch=0; ClassDef *bestMatch=0;
...@@ -1100,7 +1112,7 @@ ClassDef *getResolvedClassRec(Definition *scope, ...@@ -1100,7 +1112,7 @@ ClassDef *getResolvedClassRec(Definition *scope,
QCString spec; QCString spec;
minDistance=distance; minDistance=distance;
bestMatch = newResolveTypedef(fileScope,md,&spec); bestMatch = newResolveTypedef(fileScope,md,&spec);
//printf(" bestTypeDef=%p\n",md); //printf(" bestTypeDef=%p spec=%s\n",md,spec.data());
bestTypedef = md; bestTypedef = md;
bestTemplSpec = spec; bestTemplSpec = spec;
} }
...@@ -1122,7 +1134,7 @@ ClassDef *getResolvedClassRec(Definition *scope, ...@@ -1122,7 +1134,7 @@ ClassDef *getResolvedClassRec(Definition *scope,
*pTemplSpec = bestTemplSpec; *pTemplSpec = bestTemplSpec;
} }
pval=g_lookupCache.find(key); pval=Doxygen::lookupCache.find(key);
if (pval) if (pval)
{ {
pval->classDef = bestMatch; pval->classDef = bestMatch;
...@@ -1131,7 +1143,14 @@ ClassDef *getResolvedClassRec(Definition *scope, ...@@ -1131,7 +1143,14 @@ ClassDef *getResolvedClassRec(Definition *scope,
} }
else else
{ {
g_lookupCache.insert(key,new LookupInfo(bestMatch,bestTypedef,bestTemplSpec)); if (Doxygen::lookupCacheEnabled)
{
Doxygen::lookupCache.insert(key,new LookupInfo(bestMatch,bestTypedef,bestTemplSpec));
}
else // remove the 0 key from the cache
{
Doxygen::lookupCache.remove(key);
}
} }
//printf("] bestMatch=%s distance=%d\n", //printf("] bestMatch=%s distance=%d\n",
// bestMatch?bestMatch->name().data():"<none>",minDistance); // bestMatch?bestMatch->name().data():"<none>",minDistance);
...@@ -1602,6 +1621,55 @@ int filterCRLF(char *buf,int len) ...@@ -1602,6 +1621,55 @@ int filterCRLF(char *buf,int len)
return dest; // length of the valid part of the buf return dest; // length of the valid part of the buf
} }
/*! looks for a filter for the file \a name. Returns the name of the filter
* if there is a match for the file name, otherwise an empty string.
*/
QCString getFileFilter(const char* name)
{
// sanity check
if (name==0) return "";
// first look for filter pattern list
QStrList& filterList = Config_getList("FILTER_PATTERNS");
if (filterList.isEmpty())
{
// use INPUT_FILTER instead (For all files)
return Config_getString("INPUT_FILTER");
}
// compare the file name to the filter pattern list
QStrListIterator sli(filterList);
char* filterStr;
for(sli.toFirst(); (filterStr = sli.current()); ++sli)
{
QCString fs = filterStr;
int i_equals=fs.find('=');
if (i_equals!=-1)
{
QCString filterPattern = fs.left(i_equals);
#if defined(_WIN32) || defined(_OS_MAC_) // windows or mac
QRegExp fpat(filterPattern,FALSE,TRUE); // case insensitive match
#else // unix
QRegExp fpat(filterPattern,TRUE,TRUE); // case sensitive match
#endif
if (fpat.match(name)!=-1)
{
// found a match!
QCString filterName = fs.mid(i_equals+1);
return filterName;
}
}
}
// no match
return "";
}
/*! reads a file with name \a name and returns it as a string. If \a filter /*! reads a file with name \a name and returns it as a string. If \a filter
* is TRUE the file will be filtered by any user specified input filter. * is TRUE the file will be filtered by any user specified input filter.
* If \a name is "-" the string will be read from standard input. * If \a name is "-" the string will be read from standard input.
...@@ -1641,7 +1709,8 @@ QCString fileToString(const char *name,bool filter) ...@@ -1641,7 +1709,8 @@ QCString fileToString(const char *name,bool filter)
err("Error: file `%s' not found\n",name); err("Error: file `%s' not found\n",name);
return ""; return "";
} }
if (Config_getString("INPUT_FILTER").isEmpty() || !filter) QCString filterName = getFileFilter(name);
if (filterName.isEmpty() || !filter)
{ {
f.setName(name); f.setName(name);
fileOpened=f.open(IO_ReadOnly); fileOpened=f.open(IO_ReadOnly);
...@@ -1666,11 +1735,11 @@ QCString fileToString(const char *name,bool filter) ...@@ -1666,11 +1735,11 @@ QCString fileToString(const char *name,bool filter)
} }
else // filter the input else // filter the input
{ {
QCString cmd=Config_getString("INPUT_FILTER")+" \""+name+"\""; QCString cmd=filterName+" \""+name+"\"";
FILE *f=popen(cmd,"r"); FILE *f=popen(cmd,"r");
if (!f) if (!f)
{ {
err("Error: could not execute filter %s\n",Config_getString("INPUT_FILTER").data()); err("Error: could not execute filter %s\n",filterName.data());
return ""; return "";
} }
const int bSize=4096; const int bSize=4096;
......
src/util.h
View file @ 46361b70
...@@ -104,6 +104,7 @@ bool getDefs(const QCString &scopeName, ...@@ -104,6 +104,7 @@ bool getDefs(const QCString &scopeName,
bool checkCV=FALSE bool checkCV=FALSE
); );
QCString getFileFilter(const char* name);
bool resolveRef(/* in */ const char *scName, bool resolveRef(/* in */ const char *scName,
/* in */ const char *name, /* in */ const char *name,
......
src/xmlgen.cpp
View file @ 46361b70
...@@ -955,8 +955,19 @@ static void generateXMLForClass(ClassDef *cd,QTextStream &ti) ...@@ -955,8 +955,19 @@ static void generateXMLForClass(ClassDef *cd,QTextStream &ti)
case Virtual: t << "virtual"; break; case Virtual: t << "virtual"; break;
case Pure: t <<"pure-virtual"; break; case Pure: t <<"pure-virtual"; break;
} }
t << "\">" << convertToXML(bcd->classDef->displayName()) t << "\">";
<< "</basecompoundref>" << endl; if (!bcd->templSpecifiers.isEmpty())
{
convertToXML(
insertTemplateSpecifierInScope(
bcd->classDef->displayName(),bcd->templSpecifiers)
);
}
else
{
convertToXML(bcd->classDef->displayName());
}
t << "</basecompoundref>" << endl;
} }
} }
if (cd->subClasses()->count()>0) if (cd->subClasses()->count()>0)
......
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