Skip to content

D
doxverilog
Commit 2ddfaa1d authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files
Options

Release-1.5.5-20080307

parent b8ff6878
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 605 additions and 535 deletions
INSTALL
View file @ 2ddfaa1d
DOXYGEN Version 1.5.5
DOXYGEN Version 1.5.5-20080307
Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions.
--------
Dimitri van Heesch (10 February 2008)
Dimitri van Heesch (07 March 2008)
README
View file @ 2ddfaa1d
DOXYGEN Version 1.5.5
DOXYGEN Version 1.5.5_20080307
Please read INSTALL for compilation instructions.
......@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (10 February 2008)
Dimitri van Heesch (dimitri@stack.nl) (07 March 2008)
addon/doxywizard/doxywizard.cpp
View file @ 2ddfaa1d
......@@ -506,8 +506,8 @@ Step4::Step4(QWidget *parent) : QWidget(parent,"Step4")
connect(m_diagramMode,SIGNAL(clicked(int)),
this,SLOT(diagramModeChanged(int)));
connect(m_dotCall,SIGNAL(stateChanged(int)),
parent,SLOT(changeCallGraphState(int)));
//connect(m_dotCall,SIGNAL(stateChanged(int)),
// parent,SLOT(changeCallGraphState(int)));
}
void Step4::diagramModeChanged(int buttonId)
......@@ -515,15 +515,15 @@ void Step4::diagramModeChanged(int buttonId)
m_dotOptions->setEnabled(buttonId==2);
}
void Step4::disableCallGraphs()
{
m_dotCall->setChecked(FALSE);
}
//void Step4::disableCallGraphs()
//{
// m_dotCall->setChecked(FALSE);
//}
bool Step4::callGraphEnabled() const
{
return m_dotCall->isOn();
}
//bool Step4::callGraphEnabled() const
//{
// return m_dotCall->isOn();
//}
DiagramMode Step4::diagramMode() const
{
......@@ -880,7 +880,7 @@ void MainWidget::launchWizard()
{
wizard.setHtmlStyle(HS_CHM);
}
else if (Config_getBool("GENERATE_TREEVIEW"))
else if (Config_getEnum("GENERATE_TREEVIEW")!="NONE")
{
wizard.setHtmlStyle(HS_TreeView);
}
......@@ -1008,15 +1008,15 @@ void MainWidget::launchWizard()
{
case HS_Plain:
Config_getBool("GENERATE_HTMLHELP")=FALSE;
Config_getBool("GENERATE_TREEVIEW")=FALSE;
Config_getEnum("GENERATE_TREEVIEW")="NONE";
break;
case HS_TreeView:
Config_getBool("GENERATE_HTMLHELP")=FALSE;
Config_getBool("GENERATE_TREEVIEW")=TRUE;
Config_getEnum("GENERATE_TREEVIEW")="ALL";
break;
case HS_CHM:
Config_getBool("GENERATE_HTMLHELP")=TRUE;
Config_getBool("GENERATE_TREEVIEW")=FALSE;
Config_getEnum("GENERATE_TREEVIEW")="NONE";
break;
}
}
......
addon/doxywizard/doxywizard.h
View file @ 2ddfaa1d
......@@ -126,8 +126,8 @@ class Step4 : public QWidget
public:
Step4(QWidget *parent);
void disableCallGraphs();
bool callGraphEnabled() const;
//void disableCallGraphs();
//bool callGraphEnabled() const;
DiagramMode diagramMode() const;
bool classDiagram() const;
......@@ -165,7 +165,7 @@ class Wizard : public QTabDialog
public:
Wizard(QWidget *parent);
void disableCallGraphs();
//void disableCallGraphs();
// step1
QString getProjectName() const { return m_step1->getProjectName(); }
......
addon/doxywizard/inputstring.cpp
View file @ 2ddfaa1d
......@@ -170,14 +170,17 @@ void InputString::init()
{
if (sm==StringFixed)
{
int *itemIndex = m_values->find(str);
if (itemIndex)
if (m_values)
{
com->setCurrentItem(*itemIndex);
}
else
{
com->setCurrentItem(0);
int *itemIndex = m_values->find(str);
if (itemIndex)
{
com->setCurrentItem(*itemIndex);
}
else
{
com->setCurrentItem(0);
}
}
}
else
......
configure
View file @ 2ddfaa1d
......@@ -20,7 +20,7 @@ doxygen_version_minor=5
doxygen_version_revision=5
#NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
doxygen_version_mmn=NO
doxygen_version_mmn=20080307
bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
......@@ -36,6 +36,8 @@ f_english=NO
f_wizard=NO
f_app=NO
f_thread=NO
f_flex=NO
f_bison=NO
f_langs=nl,se,cz,fr,id,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,ar,fa
while test -n "$1"; do
......@@ -76,6 +78,12 @@ while test -n "$1"; do
--perl | -perl)
shift; f_perl=$1
;;
--flex | -flex)
shift; f_flex=$1
;;
--bison | -bison)
shift; f_bison=$1
;;
--install | -install)
shift; f_insttool=$1
;;
......@@ -100,9 +108,10 @@ done
if test "$f_help" = y; then
cat <<EOF
Usage: $0 [--help] [--shared] [--static] [--release] [--debug]
[--perl name] [--make name] [--dot name] [--platform target]
[--prefix dir] [--docdir dir] [--install name] [--english-only]
[----enable-langs list] [--with-doxywizard]
[--perl name] [--flex name] [--bison name] [--make name]
[--dot name] [--platform target] [--prefix dir] [--docdir dir]
[--install name] [--english-only] [----enable-langs list]
[--with-doxywizard]
Options:
......@@ -113,6 +122,10 @@ Options:
[default: release]
--perl name Use \`name' as the name of the perl interpreter
[default: autodetect]
--flex name Use \`name' as the name of the GNU lexical scanner
[default: autodetect]
--bison name Use \`name' as the name of the GNU compiler generator
[default: autodetect]
--make name Use \`name' as the name of the GNU make tool
[default: autodetect]
--dot name Use \`name' as the name of the dot tool that
......@@ -299,7 +312,7 @@ fi
echo -n " Checking for GNU make tool... "
if test "$f_make" = NO; then
make_names="gmake make"
make_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs"
make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
make_prog=NO
for i in $make_names; do
for j in $make_dirs; do
......@@ -326,7 +339,7 @@ echo "using $f_make"
echo -n " Checking for GNU install tool... "
if test "$f_insttool" = NO; then
install_names="ginstall install"
install_dirs="/usr/bin /usr/local/bin /bin /sbin /usr/ucb $bin_dirs"
install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb"
install_prog=NO
install_found=NO
for i in $install_names; do
......@@ -362,7 +375,7 @@ echo "using $f_insttool";
echo -n " Checking for dot (part of GraphViz)... "
if test "$f_dot" = NO; then
dot_dirs="$bin_dirs"
dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
dot_prog=NO
for j in $dot_dirs; do
if test -x "$j/dot"; then
......@@ -384,7 +397,7 @@ fi
echo -n " Checking for perl... "
if test "$f_perl" = NO; then
perl_names="perl perl5"
perl_dirs="/usr/bin /usr/local/bin /bin /sbin $bin_dirs"
perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
perl_prog=NO
perl_found=NO
for i in $perl_names; do
......@@ -412,6 +425,53 @@ if test "$f_perl" = NO; then
fi
echo "using $f_perl";
# - check for flex ------------------------------------------------------------
echo -n " Checking for flex... "
if test "$f_flex" = NO; then
flex_dirs="$bin_dirs /usr/bin /usr/local/bin /bin"
flex_prog=NO
flex_found=NO
for j in $flex_dirs; do
if test -x "$j/flex"; then
flex_found=YES
flex_prog="$j/flex"
break
fi
done
f_flex="$flex_prog"
fi
if test "$f_flex" = NO; then
echo "not found!";
exit 2
else
echo "using $f_flex"
fi
# - check for bison ------------------------------------------------------------
echo -n " Checking for bison... "
if test "$f_bison" = NO; then
bison_dirs="$bin_dirs /usr/bin /usr/local/bin /bin"
bison_prog=NO
bison_found=NO
for j in $bison_dirs; do
if test -x "$j/bison"; then
bison_found=YES
bison_prog="$j/bison"
break
fi
done
f_bison="$bison_prog"
fi
if test "$f_bison" = NO; then
echo "not found!";
exit 2
else
echo "using $f_bison"
fi
# -----------------------------------------------------------------------------
......@@ -514,10 +574,10 @@ if test "$f_platform" = "hpux-g++"; then
EOF
fi
if test "$f_platform" = "macosx-uni-c++"; then
if test -n "`ls /Developer/SDKs/MacOSX10.*.sdk`"; then
if test -n "`ls /Developer/SDKs/MacOSX10.*.sdk 2>/dev/null`"; then
mac_sdk=MacOSX10.4u.sdk
fi
if test -n "`ls /Developer/SDKs/MacOSX10.5*.sdk`"; then
if test -n "`ls /Developer/SDKs/MacOSX10.5*.sdk 2>/dev/null`"; then
mac_sdk=MacOSX10.5.sdk
fi
if test -n $mac_sdk; then
......
doc/config.doc
View file @ 2ddfaa1d
......@@ -1313,11 +1313,20 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
\anchor cfg_generate_treeview
<dt>\c GENERATE_TREEVIEW <dd>
\addindex GENERATE_TREEVIEW
If the \c GENERATE_TREEVIEW tag is set to YES, a side panel will be
generated containing a tree-like index structure (just like the one that
The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
structure should be generated to display hierarchical information.
If the tag value is set to FRAME, a side panel will be generated
containing a tree-like index structure (just like the one that
is generated for HTML Help). For this to work a browser that supports
JavaScript and frames is required (for instance Mozilla 1.0+, Netscape 6.0+
or Internet explorer 5.0+ or Konqueror).
JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
probably better off using the HTML help feature. Other possible values
for this tag are: \c HIERARCHIES, which will generate the Groups, Directories,
and Class Hiererachy pages using a tree view instead of an ordered list;
ALL, which combines the behavior of \c FRAME and \c HIERARCHIES, and \c NONE,
which disables this behavior completely. For backwards compatibility
with previous releases of Doxygen, the values YES and NO are equivalent
to FRAME and NONE respectively.
\anchor cfg_treeview_width
<dt>\c TREEVIEW_WIDTH <dd>
......
doc/index.doc
View file @ 2ddfaa1d
......@@ -27,7 +27,7 @@ Version: $(VERSION)
<h2>Introduction</h2>
Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL
(Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extend D.
(Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D.
It can help you in three ways:
<ol>
......
doc/install.doc
View file @ 2ddfaa1d
......@@ -302,9 +302,10 @@ ce_parse.cpp:
<b>Sun compiler problems</b>
It appears that doxygen doesn't work properly if it is compiled
with Sun's C++ WorkShop Compiler. I cannot verify this myself as I do
with Sun's C++ WorkShop 6 Compiler. I cannot verify this myself as I do
not have access to a Solaris machine with this compiler. With GNU compiler
it does work.
it does work and installing Sun patch 111679-13 has also been reported
as a way to fix the problem.
when configuring with <code>--static</code> I got:
......
doc/language.doc
View file @ 2ddfaa1d
......@@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other
than English (the default). The output language is chosen through the
configuration file (with default name and known as Doxyfile).
Currently (version 1.5.4), 34 languages
Currently (version 1.5.5), 34 languages
are supported (sorted alphabetically):
Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese
Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
......@@ -67,7 +67,7 @@ when the translator was updated.
<td>Brazilian Portuguese</td>
<td>Fabio "FJTC" Jun Takada Chino</td>
<td>jun-chino at uol dot com dot br</td>
<td>1.5.4</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Catalan</td>
......@@ -79,13 +79,13 @@ when the translator was updated.
<td>Chinese</td>
<td>Li Daobing<br>Wei Liu</td>
<td>lidaobing at gmail dot com<br>liuwei at asiainfo dot com</td>
<td>1.5.4</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Chinese Traditional</td>
<td>Daniel YC Lin<br>Gary Lee</td>
<td>dlin at taifex dot com dot tw<br>garywlee at gmail dot com</td>
<td>1.4.6</td>
<td>dlin.tw at gmail dot com<br>garywlee at gmail dot com</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Croatian</td>
......@@ -133,7 +133,7 @@ when the translator was updated.
<td>German</td>
<td>Jens Seidel</td>
<td>jensseidel at users dot sf dot net</td>
<td>1.5.4</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Greek</td>
......@@ -204,8 +204,8 @@ when the translator was updated.
<tr bgcolor="#ffffff">
<td>Persian</td>
<td>Ali Nadalizadeh</td>
<td>nadalisoft at yahoo dot com</td>
<td>1.4.6</td>
<td>nadalizadeh at gmail dot com</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Polish</td>
......@@ -253,7 +253,7 @@ when the translator was updated.
<td>Spanish</td>
<td>Bartomeu<br>Francisco Oltra Thennet</td>
<td>bartomeu at loteria3cornella dot com<br>foltra at puc dot cl</td>
<td>1.5.4</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Swedish</td>
......@@ -286,15 +286,15 @@ when the translator was updated.
\hline
Arabic & Moaz Reyad & {\tt\tiny moazreyad@yahoo.com} & 1.4.6 \\
\hline
Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny jun-chino@uol.com.br} & 1.5.4 \\
Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny jun-chino@uol.com.br} & up-to-date \\
\hline
Catalan & Maximiliano Pin & {\tt\tiny mcpin@emtesistemas.com} & 1.5.4 \\
~ & Albert Mora & {\tt\tiny amora@iua.upf.es} & ~ \\
\hline
Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & 1.5.4 \\
Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & up-to-date \\
~ & Wei Liu & {\tt\tiny liuwei@asiainfo.com} & ~ \\
\hline
Chinese Traditional & Daniel YC Lin & {\tt\tiny dlin@taifex.com.tw} & 1.4.6 \\
Chinese Traditional & Daniel YC Lin & {\tt\tiny dlin.tw@gmail.com} & up-to-date \\
~ & Gary Lee & {\tt\tiny garywlee@gmail.com} & ~ \\
\hline
Croatian & Boris Bralo & {\tt\tiny boris.bralo@zg.htnet.hr} & up-to-date \\
......@@ -311,7 +311,7 @@ when the translator was updated.
\hline
French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & 1.5.4 \\
\hline
German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & 1.5.4 \\
German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & up-to-date \\
\hline
Greek & Paul Gessos & {\tt\tiny nickreserved@yahoo.com} & 1.5.4 \\
\hline
......@@ -343,7 +343,7 @@ when the translator was updated.
\hline
Norwegian & Lars Erik Jordet & {\tt\tiny lejordet@gmail.com} & 1.4.6 \\
\hline
Persian & Ali Nadalizadeh & {\tt\tiny nadalisoft@yahoo.com} & 1.4.6 \\
Persian & Ali Nadalizadeh & {\tt\tiny nadalizadeh@gmail.com} & up-to-date \\
\hline
Polish & Piotr Kaminski & {\tt\tiny Piotr.Kaminski@ctm.gdynia.pl} & 1.4.6 \\
~ & Grzegorz Kowal & {\tt\tiny g\_kowal@poczta.onet.pl} & ~ \\
......@@ -360,7 +360,7 @@ when the translator was updated.
\hline
Slovene & Matja\v{z} Ostrover\v{s}nik & {\tt\tiny matjaz.ostroversnik@ostri.org} & 1.4.6 \\
\hline
Spanish & Bartomeu & {\tt\tiny bartomeu@loteria3cornella.com} & 1.5.4 \\
Spanish & Bartomeu & {\tt\tiny bartomeu@loteria3cornella.com} & up-to-date \\
~ & Francisco Oltra Thennet & {\tt\tiny foltra@puc.cl} & ~ \\
\hline
Swedish & Mikael Hallin & {\tt\tiny mikaelhallin@yahoo.se} & 1.4.6 \\
......
doc/translator_report.txt
View file @ 2ddfaa1d
This diff is collapsed.
qtools/qfiledefs_p.h
View file @ 2ddfaa1d
......@@ -55,8 +55,7 @@
#elif !defined(_OS_MAC_)
# include <sys/types.h>
# include <sys/stat.h>
#elif defined(_OS_MAC_) \
&& (MAC_OS_X_VERSION_MAX_ALLOWED==MAC_OS_X_VERSION_10_5)
#elif defined(_OS_MAC_)
# include <sys/types.h>
# include <sys/stat.h>
# define _OS_UNIX_
......
src/config.l
View file @ 2ddfaa1d
......@@ -1326,7 +1326,7 @@ void Config::check()
bool b2 = Config_getBool("INHERIT_DOCS");
bool b3 = Config_getBool("HIDE_SCOPE_NAMES");
bool b4 = Config_getBool("EXTRACT_PRIVATE");
char *s1,*s2,*s3,*s4;
const char *s1,*s2,*s3,*s4;
if (b1) s1=" INLINDE_INHERITED_MEMB = NO (was YES)\n"; else s1="";
if (b2) s2=" INHERIT_DOCS = NO (was YES)\n"; else s2="";
if (!b3) s3=" HIDE_SCOPE_NAMES = YES (was NO)\n"; else s3="";
......@@ -2415,16 +2415,28 @@ void Config::create()
1,20,4
);
ci->addDependency("GENERATE_HTML");
cb = addBool(
ce = addEnum(
"GENERATE_TREEVIEW",
"If the GENERATE_TREEVIEW tag is set to YES, a side panel will be\n"
"generated containing a tree-like index structure (just like the one that \n"
"The GENERATE_TREEVIEW tag is used to specify whether a tree-like index\n"
"structure should be generated to display hierarchical information.\n"
"If the tag value is set to FRAME, a side panel will be generated\n"
"containing a tree-like index structure (just like the one that \n"
"is generated for HTML Help). For this to work a browser that supports \n"
"JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, \n"
"Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are \n"
"probably better off using the HTML help feature. \n",
FALSE
);
"probably better off using the HTML help feature. Other possible values \n"
"for this tag are: HIERARCHIES, which will generate the Groups, Directories,\n"
"and Class Hiererachy pages using a tree view instead of an ordered list;\n"
"ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which\n"
"disables this behavior completely. For backwards compatibility with previous\n"
"releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE\n"
"respectively.\n",
"NONE"
);
ce->addValue("NONE");
ce->addValue("FRAME");
ce->addValue("HIERARCHIES");
ce->addValue("ALL");
cb->addDependency("GENERATE_HTML");
ci = addInt(
"TREEVIEW_WIDTH",
......
src/docparser.cpp
View file @ 2ddfaa1d
......@@ -320,6 +320,7 @@ static void checkArgumentName(const QString &name,bool isParam)
LockingPtr<ArgumentList> al=g_memberDef->isDocsForDefinition() ?
g_memberDef->argumentList() :
g_memberDef->declArgumentList();
//printf("isDocsForDefinition()=%d\n",g_memberDef->isDocsForDefinition());
if (al==0) return; // no argument list
static QRegExp re("[a-zA-Z0-9_]+\\.*");
......
src/docsets.cpp
View file @ 2ddfaa1d
......@@ -129,8 +129,7 @@ void DocSets::initialize()
err("Could not open file %s for writing\n",notes.data());
exit(1);
}
QCString indexName="index";
if (Config_getBool("GENERATE_TREEVIEW")) indexName="main";
QCString indexName=usingTreeIndex()?"main":"index";
m_nts.setDevice(m_nf);
m_nts.setEncoding(QTextStream::UnicodeUTF8);
m_nts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
......
src/doctokenizer.l
View file @ 2ddfaa1d
......@@ -326,7 +326,7 @@ OPMASK ({BLANK}*{OPNORM}{FUNCARG})
OPMASKOPT ({BLANK}*{OPNORM}{FUNCARG}?)|({OPCAST}{FUNCARG})
LNKWORD1 ("::"|"#")?{SCOPEMASK}
CVSPEC {BLANK}*("const"|"volatile")
LNKWORD2 ({SCOPEPRE}*"operator"{OPMASK})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOPT})
LNKWORD2 ({SCOPEPRE}*"operator"{OPMASK})|({SCOPEPRE}"operator"{OPMASKOPT})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOPT})
LNKWORD3 ([0-9a-z_A-Z\-]+("/"|"\\"))*[0-9a-z_A-Z\-]+("."[0-9a-z_A-Z]+)+
CHARWORD [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,.]
CHARWORDQ [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,."]
......
src/doxygen.cpp
View file @ 2ddfaa1d
......@@ -241,7 +241,6 @@ struct STLInfo
static STLInfo g_stlinfo[] =
{
// className baseClass1 baseClass2 templType1 templName1 templType2 templName2 virtInheritance // iterators
#if 0
{ "allocator", 0, 0, "T", "elements", 0, 0, FALSE, FALSE },
{ "auto_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE },
{ "ios_base", 0, 0, 0, 0, 0, 0, FALSE, FALSE },
......@@ -284,9 +283,7 @@ static STLInfo g_stlinfo[] =
{ "multimap", 0, 0, "K", "keys", "T", "elements", FALSE, TRUE },
{ "set", 0, 0, "K", "keys", 0, 0, FALSE, TRUE },
{ "multiset", 0, 0, "K", "keys", 0, 0, FALSE, TRUE },
#endif
{ "vector", 0, 0, "T", "elements", 0, 0, FALSE, TRUE },
#if 0
{ "queue", 0, 0, "T", "elements", 0, 0, FALSE, FALSE },
{ "priority_queue", 0, 0, "T", "elements", 0, 0, FALSE, FALSE },
{ "stack", 0, 0, "T", "elements", 0, 0, FALSE, FALSE },
......@@ -306,7 +303,6 @@ static STLInfo g_stlinfo[] =
{ "range_error", "runtime_error", 0, 0, 0, 0, 0, FALSE, FALSE },
{ "overflow_error", "runtime_error", 0, 0, 0, 0, 0, FALSE, FALSE },
{ "underflow_error", "runtime_error", 0, 0, 0, 0, 0, FALSE, FALSE },
#endif
{ 0, 0, 0, 0, 0, 0, 0, FALSE, FALSE }
};
......@@ -2237,8 +2233,8 @@ static bool isVarWithConstructor(EntryNav *rootNav)
goto done;
}
else if ((fd = rootNav->fileDef()) &&
fd->name().right(2)==".c"
)
(fd->name().right(2)==".c" || fd->name().right(2)==".h")
)
{ // inside a .c file
result=FALSE;
goto done;
......@@ -2333,9 +2329,9 @@ static bool isVarWithConstructor(EntryNav *rootNav)
}
done:
//printf("isVarWithConstructor(%s,%s)=%d\n",rootNav->parent()->name().data(),
// root->type.data(),result);
rootNav->releaseEntry();
//printf("isVarWithConstructor(%s,%s)=%d\n",root->parent->name.data(),
// root->type.data(),result);
return result;
}
......@@ -6828,53 +6824,56 @@ static void computeMemberRelations()
{
MemberNameIterator mdi(*mn);
MemberDef *md;
for ( ; (md=mdi.current()) ; ++mdi ) // for each member with a specific arg list
for ( ; (md=mdi.current()) ; ++mdi ) // for each member with a specific name
{
MemberNameIterator bmdi(*mn);
MemberDef *bmd;
for ( ; (bmd=bmdi.current()) ; ++bmdi ) // for each other member with that signature
MemberDef *bmd = mn->first(); // for each other member with the same name
while (bmd)
{
ClassDef *bmcd = bmd->getClassDef();
ClassDef *mcd = md->getClassDef();
//printf("Check relation between `%s'::`%s' (%p) and `%s'::`%s' (%p)\n",
// mcd->name().data(),md->name().data(),md,
// bmcd->name().data(),bmd->name().data(),bmd
// );
if (md!=bmd && bmcd && mcd && bmcd!=mcd && mcd->isBaseClass(bmcd,TRUE))
if (mcd && mcd->baseClasses())
{
//printf(" Base argList=`%s'\n Super argList=`%s'\n",
// argListToString(bmd->argumentList()).data(),
// argListToString(md->argumentList()).data()
ClassDef *bmcd = bmd->getClassDef();
//printf("Check relation between `%s'::`%s' (%p) and `%s'::`%s' (%p)\n",
// mcd->name().data(),md->name().data(),md,
// bmcd->name().data(),bmd->name().data(),bmd
// );
LockingPtr<ArgumentList> bmdAl = bmd->argumentList();
LockingPtr<ArgumentList> mdAl = md->argumentList();
if (
matchArguments2(bmd->getOuterScope(),bmd->getFileDef(),bmdAl.pointer(),
md->getOuterScope(), md->getFileDef(), mdAl.pointer(),
TRUE
)
)
if (md!=bmd && bmcd && mcd && bmcd!=mcd && mcd->isBaseClass(bmcd,TRUE))
{
//printf(" match found!\n");
if (mcd && bmcd &&
mcd->isLinkable() && bmcd->isLinkable()
//printf(" Base argList=`%s'\n Super argList=`%s'\n",
// argListToString(bmd->argumentList()).data(),
// argListToString(md->argumentList()).data()
// );
LockingPtr<ArgumentList> bmdAl = bmd->argumentList();
LockingPtr<ArgumentList> mdAl = md->argumentList();
if (
matchArguments2(bmd->getOuterScope(),bmd->getFileDef(),bmdAl.pointer(),
md->getOuterScope(), md->getFileDef(), mdAl.pointer(),
TRUE
)
)
{
MemberDef *rmd;
if ((rmd=md->reimplements())==0 ||
minClassDistance(mcd,bmcd)<minClassDistance(mcd,rmd->getClassDef())
//printf(" match found!\n");
if (mcd && bmcd &&
mcd->isLinkable() && bmcd->isLinkable()
)
{
//printf("setting (new) reimplements member\n");
md->setReimplements(bmd);
MemberDef *rmd;
if ((rmd=md->reimplements())==0 ||
minClassDistance(mcd,bmcd)<minClassDistance(mcd,rmd->getClassDef())
)
{
//printf("setting (new) reimplements member\n");
md->setReimplements(bmd);
}
//printf("%s: add reimplements member %s\n",mcd->name().data(),bmcd->name().data());
//md->setImplements(bmd);
//printf("%s: add reimplementedBy member %s\n",bmcd->name().data(),mcd->name().data());
bmd->insertReimplementedBy(md);
}
//printf("%s: add reimplements member %s\n",mcd->name().data(),bmcd->name().data());
//md->setImplements(bmd);
//printf("%s: add reimplementedBy member %s\n",bmcd->name().data(),mcd->name().data());
bmd->insertReimplementedBy(md);
}
}
}
}
}
bmd = mn->next();
}
}
}
......@@ -7671,9 +7670,9 @@ static void buildPageList(EntryNav *rootNav)
QCString title=root->args.stripWhiteSpace();
if (title.isEmpty()) title=theTranslator->trMainPage();
addRefItem(root->sli,"page",
Config_getBool("GENERATE_TREEVIEW")?"main":"index",
usingTreeIndex()?"main":"index",
title
);
);
rootNav->releaseEntry();
}
......@@ -7691,7 +7690,7 @@ static void findMainPage(EntryNav *rootNav)
{
//printf("Found main page! \n======\n%s\n=======\n",root->doc.data());
QCString title=root->args.stripWhiteSpace();
QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index";
QCString indexName=usingTreeIndex()?"main":"index";
Doxygen::mainPage = new PageDef(root->fileName,root->startLine,
indexName, root->brief+root->doc,title);
//setFileNameForSections(root->anchors,"index",Doxygen::mainPage);
......@@ -9963,7 +9962,7 @@ void generateOutput()
outputList->add(new HtmlGenerator);
HtmlGenerator::init();
if (Config_getBool("GENERATE_HTMLHELP")) Doxygen::indexList.addIndex(new HtmlHelp);
if (Config_getBool("GENERATE_TREEVIEW")) Doxygen::indexList.addIndex(new FTVHelp);
if (usingTreeIndex()) Doxygen::indexList.addIndex(new FTVHelp);
if (Config_getBool("GENERATE_DOCSET")) Doxygen::indexList.addIndex(new DocSets);
Doxygen::indexList.initialize();
if (Config_getBool("HTML_DYNAMIC_SECTIONS")) HtmlGenerator::generateSectionImages();
......
src/doxygen_css.h
View file @ 2ddfaa1d
......@@ -407,6 +407,7 @@
" font-family: sans-serif;\n"
" margin:0.5em;\n"
"}\n"
"/* these are for tree view when used as main index */\n"
".directory { \n"
" font-size: 9pt; \n"
" font-weight: bold; \n"
......@@ -430,4 +431,28 @@
".directory img { \n"
" vertical-align: -30%; \n"
"}\n"
"/* these are for tree view when not used as main index */\n"
".directory-alt { \n"
" font-size: 100%; \n"
" font-weight: bold; \n"
"}\n"
".directory-alt h3 { \n"
" margin: 0px; \n"
" margin-top: 1em; \n"
" font-size: 11pt; \n"
"}\n"
".directory-alt > h3 { \n"
" margin-top: 0; \n"
"}\n"
".directory-alt p { \n"
" margin: 0px; \n"
" white-space: nowrap; \n"
"}\n"
".directory-alt div { \n"
" display: none; \n"
" margin: 0px; \n"
"}\n"
".directory-alt img { \n"
" vertical-align: -30%; \n"
"}\n"
"\n"
src/fortranscanner.l
View file @ 2ddfaa1d
......@@ -325,7 +325,7 @@ ATTR_STMT {ATTR_SPEC}|DIMENSION|{ACCESS_SPEC}
yy_push_state(InterfaceBody);
startScope(last_entry);
}
<InterfaceBody>"end"({BS_}"interface")?.* {
<InterfaceBody>^{BS}"end"({BS_}"interface")? {
if (!endScope(current_root))
yyterminate();
yy_pop_state();
......@@ -349,7 +349,7 @@ ATTR_STMT {ATTR_SPEC}|DIMENSION|{ACCESS_SPEC}
BEGIN(Module);
defaultProtection = Public;
}
<Start,ModuleBody>"end"({BS_}(module|program))?.* { // end module
<Start,ModuleBody>^{BS}"end"({BS_}(module|program))?{BS} { // end module
resolveModuleProcedures(moduleProcedures, current_root);
if (!endScope(current_root))
yyterminate();
......@@ -415,7 +415,7 @@ ATTR_STMT {ATTR_SPEC}|DIMENSION|{ACCESS_SPEC}
/*------- module/global/typedef variable ---------------------------------------------------*/
<SubprogBody>"end"({BS_}{SUBPROG})?.* {
<SubprogBody>^{BS}"end"({BS_}{SUBPROG})?{BS} {
//cout << "1e=========> got end subprog: " << yytext << endl;
/* args is used for parameters in list of functions, argList for
......
src/ftvhelp.cpp
View file @ 2ddfaa1d
This diff is collapsed.
src/ftvhelp.h
View file @ 2ddfaa1d
/******************************************************************************
*
* Copyright (C) 1997-2008 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
* 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.
*
*/
/******************************************************************************
* ftvhelp.h,v 1.0 2000/09/06 16:09:00
*
* Kenney Wong <kwong@ea.com>
*
* Folder Tree View for offline help on browsers that do not support HTML Help.
* Uses the FTV structure from:
* http://www.geocities.com/Paris/LeftBank/2178/ftexample.html
*/
#ifndef FTVHELP_H
......@@ -58,8 +71,8 @@ extern FTVImageInfo image_info[];
class FTVHelp : public IndexIntf
{
public:
FTVHelp();
//static FTVHelp *getInstance();
FTVHelp(bool topLevelIndex = true);
~FTVHelp();
void initialize();
void finalize();
void incContentsDepth();
......@@ -73,17 +86,15 @@ class FTVHelp : public IndexIntf
const char *, const char *,
const char *, const MemberDef *) {}
void addIndexFile(const char *) {}
void generateTreeView(QString* = NULL);
private:
void generateTreeViewImages();
void generateTreeView();
void generateTree(QTextStream &t,const QList<FTVNode> &nl,int level);
void generateIndent(QTextStream &t,FTVNode *n,int level);
void generateLink(QTextStream &t,FTVNode *n);
~FTVHelp();
static FTVHelp *m_theInstance;
QList<FTVNode> *m_indentNodes;
int m_indent;
bool m_topLevelIndex;
};
......
src/groupdef.h
View file @ 2ddfaa1d
......@@ -39,6 +39,7 @@ class PageSDict;
class PageDef;
class DirDef;
class DirList;
class FTVHelp;
class GroupDef : public Definition
{
......@@ -86,7 +87,7 @@ class GroupDef : public Definition
bool visited; // number of times accessed for output - KPW
friend void writeGroupTreeNode(OutputList&, GroupDef*, int);
friend void writeGroupTreeNode(OutputList&, GroupDef*, int, FTVHelp*);
// make accessible for writing tree view of group in index.cpp - KPW
void setGroupScope(Definition *d) { groupScope = d; }
......
src/htmlgen.cpp
View file @ 2ddfaa1d
......@@ -978,7 +978,7 @@ void HtmlGenerator::endTextLink()
void HtmlGenerator::startHtmlLink(const char *url)
{
t << "<a ";
if (Config_getBool("GENERATE_TREEVIEW")) t << "target=\"top\" ";
if (usingTreeIndex()) t << "target=\"top\" ";
t << "href=\"";
if (url) t << url;
t << "\">";
......@@ -1618,17 +1618,17 @@ void HtmlGenerator::writeNonBreakableSpace(int n)
}
}
void HtmlGenerator::writeLineNumber(const char *ref,const char *file,
void HtmlGenerator::writeLineNumber(const char *ref,const char *filename,
const char *anchor,int l)
{
QCString lineNumber,lineAnchor;
lineNumber.sprintf("%05d",l);
lineAnchor.sprintf("l%05d",l);
if (file)
if (filename)
{
startCodeAnchor(lineAnchor);
writeCodeLink(ref,file,anchor,lineNumber,0);
writeCodeLink(ref,filename,anchor,lineNumber,0);
endCodeAnchor();
}
else
......@@ -1641,13 +1641,13 @@ void HtmlGenerator::writeLineNumber(const char *ref,const char *file,
}
void HtmlGenerator::startSimpleSect(SectionTypes,
const char *file,const char *anchor,
const char *filename,const char *anchor,
const char *title)
{
t << "<dl compact><dt><b>";
if (file)
if (filename)
{
writeObjectLink(0,file,anchor,title);
writeObjectLink(0,filename,anchor,title);
}
else
{
......@@ -1867,7 +1867,7 @@ static void writeDefaultQuickLinks(QTextStream &t,bool compact,
bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
startQuickIndexList(t,compact);
if (Config_getBool("GENERATE_TREEVIEW"))
if (usingTreeIndex())
{
startQuickIndexItem(t,"main"+Doxygen::htmlFileExtension,
hli==HLI_Main,compact,relPath);
......
src/htmlhelp.cpp
View file @ 2ddfaa1d
......@@ -415,7 +415,7 @@ void HtmlHelp::createProjectFile()
QCString indexName="index"+Doxygen::htmlFileExtension;
if (Config_getBool("GENERATE_TREEVIEW")) indexName="main"+Doxygen::htmlFileExtension;
if (usingTreeIndex()) indexName="main"+Doxygen::htmlFileExtension;
t << "[OPTIONS]\n";
if (!Config_getString("CHM_FILE").isEmpty())
{
......@@ -433,9 +433,16 @@ void HtmlHelp::createProjectFile()
t << "Title=" << Config_getString("PROJECT_NAME") << endl << endl;
t << "[WINDOWS]" << endl;
// NOTE: the 0x10387e number is a set of bits specifying the buttons
// which should appear in the CHM viewer; that specific value
// means "show all buttons including the font-size one";
// the font-size one is not normally settable by the HTML Help Workshop
// utility but the way to set it is described here:
// http://support.microsoft.com/?scid=kb%3Ben-us%3B240062&x=17&y=18
t << "main=\"" << Config_getString("PROJECT_NAME") << "\",\"index.hhc\","
"\"index.hhk\",\"" << indexName << "\",\"" <<
indexName << "\",,,,,0x23520,,0x387e,,,,,,,,0" << endl << endl;
indexName << "\",,,,,0x23520,,0x10387e,,,,,,,,0" << endl << endl;
t << "[FILES]" << endl;
char *s = indexFiles.first();
......
src/index.cpp
View file @ 2ddfaa1d
This diff is collapsed.
src/latexgen.cpp
View file @ 2ddfaa1d
......@@ -606,8 +606,7 @@ void LatexGenerator::endIndexSection(IndexSections is)
break;
case isMainPage:
{
QCString indexName="index";
if (Config_getBool("GENERATE_TREEVIEW")) indexName="main";
QCString indexName=usingTreeIndex()?"main":"index";
t << "}\n\\label{index}";
if (Config_getBool("PDF_HYPERLINKS")) t << "\\hypertarget{index}{}";
t << "\\input{" << indexName << "}\n";
......
src/libdoxygen.t
View file @ 2ddfaa1d
......@@ -73,22 +73,22 @@ sub GenerateDep {
$(LEX) -PpreYY -t pre.l | $(INCBUFSIZE) >pre.cpp
#$ GenerateDep("declinfo.cpp","declinfo.l");
$(LEX) -PdeclinfoYY -t declinfo.l >declinfo.cpp
$(LEX) -PdeclinfoYY -t declinfo.l | $(INCBUFSIZE) >declinfo.cpp
#$ GenerateDep("defargs.cpp","defargs.l");
$(LEX) -PdefargsYY -t defargs.l >defargs.cpp
$(LEX) -PdefargsYY -t defargs.l | $(INCBUFSIZE) >defargs.cpp
#$ GenerateDep("doctokenizer.cpp","doctokenizer.l");
$(LEX) -PdoctokenizerYY -t doctokenizer.l >doctokenizer.cpp
$(LEX) -PdoctokenizerYY -t doctokenizer.l | $(INCBUFSIZE) >doctokenizer.cpp
#$ GenerateDep("commentcnv.cpp","commentcnv.l");
$(LEX) -PcommentcnvYY -t commentcnv.l >commentcnv.cpp
$(LEX) -PcommentcnvYY -t commentcnv.l | $(INCBUFSIZE) >commentcnv.cpp
#$GenerateDep("commentscan.cpp","commentscan.l");
$(LEX) -PcommentScanYY -t commentscan.l >commentscan.cpp
$(LEX) -PcommentScanYY -t commentscan.l | $(INCBUFSIZE) >commentscan.cpp
#$ GenerateDep("ce_lex.cpp","constexp.l","ce_parse.h");
$(LEX) -PcppExpYY -t constexp.l >ce_lex.cpp
$(LEX) -PcppExpYY -t constexp.l | $(INCBUFSIZE) >ce_lex.cpp
#$ GenerateDep("ce_parse.cpp","constexp.y");
$(YACC) -l -p cppExpYY constexp.y -o ce_parse.cpp
......
src/memberdef.cpp
View file @ 2ddfaa1d
......@@ -833,7 +833,7 @@ bool MemberDef::isLinkableInProject() const
//printf("private and invisible!\n");
return FALSE; // hidden due to protection
}
if (isStatic() && m_impl->classDef==0 && !extractStatic)
if (m_impl->stat && m_impl->classDef==0 && !extractStatic)
{
//printf("static and invisible!\n");
return FALSE; // hidden due to staticness
......
src/memberlist.cpp
View file @ 2ddfaa1d
......@@ -320,6 +320,11 @@ void MemberList::writeDeclarations(OutputList &ol,
{
//printf("----- writeDeclaration() this=%p ----\n",this);
countDecMembers(showEnumValues); // count member not in group
Definition *ctx = cd;
if (ctx==0 && nd) ctx = nd;
if (ctx==0 && gd) ctx = gd;
if (ctx==0 && fd) ctx = fd;
if (numDecMembers()==0) return;
//printf("%p: MemberList::writeDeclaration(title=`%s',subtitle=`%s')=%d\n",
// this,title,subtitle,numDecMembers());
......@@ -333,7 +338,7 @@ void MemberList::writeDeclarations(OutputList &ol,
{
//printf("subtitle=`%s'\n",subtitle);
ol.startMemberSubtitle();
ol.parseDoc("[generated]",-1,0,0,subtitle,FALSE,FALSE);
ol.parseDoc("[generated]",-1,ctx,0,subtitle,FALSE,FALSE);
ol.endMemberSubtitle();
}
......@@ -358,7 +363,7 @@ void MemberList::writeDeclarations(OutputList &ol,
{
//printf("Member group has docs!\n");
ol.startMemberGroupDocs();
ol.parseDoc("[generated]",-1,0,0,mg->documentation()+"\n",FALSE,FALSE);
ol.parseDoc("[generated]",-1,ctx,0,mg->documentation()+"\n",FALSE,FALSE);
ol.endMemberGroupDocs();
}
ol.startMemberGroup();
......
src/rtfdocvisitor.cpp
View file @ 2ddfaa1d
......@@ -895,7 +895,7 @@ void RTFDocVisitor::visitPre(DocHtmlRow *r)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocHtmlRow)}\n");
uint i,columnWidth=rtf_pageWidth/r->numCells();
uint i,columnWidth=r->numCells()>0 ? rtf_pageWidth/r->numCells() : 10;
m_t << "\\trowd \\trgaph108\\trleft-108"
"\\trbrdrt\\brdrs\\brdrw10 "
"\\trbrdrl\\brdrs\\brdrw10 "
......
src/rtfgen.cpp
View file @ 2ddfaa1d
......@@ -607,7 +607,7 @@ void RTFGenerator::endIndexSection(IndexSections is)
t << "{\\tc \\v " << substitute(Doxygen::mainPage->title(),"%","") << "}"<< endl;
}
t << "{\\field\\fldedit{\\*\\fldinst INCLUDETEXT \"";
if (Config_getBool("GENERATE_TREEVIEW")) t << "main"; else t << "index";
if (usingTreeIndex()) t << "main"; else t << "index";
t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n";
break;
//case isPackageIndex:
......
src/scanner.l
View file @ 2ddfaa1d
......@@ -170,6 +170,7 @@ static QCString idlAttr;
static QCString idlProp;
static bool g_lexInit = FALSE;
static bool externC;
//-----------------------------------------------------------------------------
......@@ -902,6 +903,12 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
curlyCount=0;
BEGIN( CliPropertyType );
}
else if (insideCS)
{
lineCount() ;
current->mtype = Event;
current->bodyLine = yyLineNr;
}
else
{
REJECT;
......@@ -3006,8 +3013,8 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
}
else
{
current->doc.resize(0);
current->brief.resize(0);
//current->doc.resize(0);
//current->brief.resize(0);
BEGIN( MemberSpec ) ;
}
}
......@@ -4324,7 +4331,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
{
current->name += "-p";
}
if ((current->section & Entry::Protocol) ||
if ((current->spec & Entry::Protocol) ||
current->section == Entry::OBJCIMPL_SEC)
{
unput('{'); // fake start of body
......@@ -4453,6 +4460,11 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
unput('{');
BEGIN( lastCSConstraint );
}
<CSConstraintType,CSConstraintName>";" {
handleParametersCommentBlocks(current->typeConstr);
unput(';');
BEGIN( lastCSConstraint );
}
<CSConstraintName>":" {
BEGIN( CSConstraintType );
}
......@@ -4719,6 +4731,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
if (*yytext=='>')
{ // end of a ObjC protocol list
insideProtocolList=FALSE;
unput('{'); // dummy start body
}
else
{
......@@ -4831,6 +4844,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
<FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>("//"{B}*)?"/**"/[^/*] {
removeSlashes=(yytext[1]=='/');
lastDocContext = YY_START;
//printf("Found comment block at %s:%d\n",yyFileName,yyLineNr);
if (current_root->section & Entry::SCOPE_MASK)
{
......@@ -4918,9 +4932,14 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
}
<FindMembers>"extern"{BN}*"\"C"("++")?"\""{BN}*("{")? {
lineCount();
externC=TRUE;
}
<FindMembers>"{" {
if (insideCS &&
if (externC)
{
externC=FALSE;
}
else if (insideCS &&
!current->name.isEmpty() &&
!current->type.isEmpty())
{
......
src/translator_de.h
View file @ 2ddfaa1d
......@@ -672,8 +672,8 @@ class TranslatorGerman : public Translator
case ClassDef::Struct: result+="Struktur"; break;
case ClassDef::Union: result+="Varianten"; break;
case ClassDef::Interface: result+="Schnittstellen"; break;
case ClassDef::Protocol: result+="Protocol"; break; // translate me!
case ClassDef::Category: result+="Category"; break; // translate me!
case ClassDef::Protocol: result+="Protokoll"; break;
case ClassDef::Category: result+="Kategorie"; break;
case ClassDef::Exception: result+="Ausnahmen"; break;
}
result+="referenz";
......@@ -840,8 +840,8 @@ class TranslatorGerman : public Translator
case ClassDef::Struct: result+=" Struktur"; break;
case ClassDef::Union: result+=" Variante"; break;
case ClassDef::Interface: result+=" Schnittstelle"; break;
case ClassDef::Protocol: result+=" Protocol"; break; // translate me!
case ClassDef::Category: result+=" Category"; break; // translate me!
case ClassDef::Protocol: result+="s Protokoll"; break;
case ClassDef::Category: result+=" Kategorie"; break;
case ClassDef::Exception: result+=" Ausnahme"; break;
}
result+=" wurde erzeugt aufgrund der Datei";
......
src/util.cpp
View file @ 2ddfaa1d
......@@ -3069,8 +3069,8 @@ static QCString getCanonicalTypeForIdentifier(
//printf(" >>>> word '%s' => '%s' templSpec=%s ts=%s tSpec=%s isTemplate=%d resolvedType=%s\n",
// (word+templSpec).data(),
// cd?cd->qualifiedName().data():"<none>",
// templSpec.data(),ts.data(),
// tSpec?tSpec->data():"<null>",
// templSpec.data(),ts.data(),
// tSpec?tSpec->data():"<null>",
// cd?cd->isTemplate():FALSE,
// resolvedType.data());
......@@ -3400,6 +3400,7 @@ void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl,bool forceNameOverwr
if (srcA->type==dstA->type)
{
//printf("1. merging %s:%s <-> %s:%s\n",srcA->type.data(),srcA->name.data(),dstA->type.data(),dstA->name.data());
if (srcA->name.isEmpty() && !dstA->name.isEmpty())
{
//printf("type: `%s':=`%s'\n",srcA->type.data(),dstA->type.data());
......@@ -3436,7 +3437,9 @@ void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl,bool forceNameOverwr
}
else
{
//printf("merging %s:%s <-> %s:%s\n",srcA->type.data(),srcA->name.data(),dstA->type.data(),dstA->name.data());
//printf("2. merging '%s':'%s' <-> '%s':'%s'\n",srcA->type.data(),srcA->name.data(),dstA->type.data(),dstA->name.data());
srcA->type=srcA->type.stripWhiteSpace();
dstA->type=dstA->type.stripWhiteSpace();
if (srcA->type+" "+srcA->name==dstA->type) // "unsigned long:int" <-> "unsigned long int:bla"
{
srcA->type+=" "+srcA->name;
......@@ -3833,7 +3836,7 @@ bool getDefs(const QCString &scName,const QCString &memberName,
// md->name().data(),args,fd,gd);
if (
((gd && gd->isLinkable()) || (fd && fd->isLinkable())) &&
md->getNamespaceDef()==0
md->getNamespaceDef()==0 && md->isLinkable()
)
{
//printf(" fd=%p gd=%p args=`%s'\n",fd,gd,args);
......@@ -3905,7 +3908,6 @@ bool getDefs(const QCString &scName,const QCString &memberName,
}
if (bmd) md=bmd;
}
if (md && !md->isLinkable()) md=0; // ignore things we cannot link to
if (md) // found a matching global member
{
fd=md->getFileDef();
......@@ -4469,12 +4471,13 @@ FileDef *findFileDef(const FileNameDict *fnDict,const char *n,bool &ambig)
for (fni.toFirst();(fd=fni.current());++fni)
{
QCString fdStripPath = stripFromIncludePath(fd->getPath());
if (path.isEmpty() || fdStripPath==pathStripped)
if (path.isEmpty() || fdStripPath.right(pathStripped.length())==pathStripped)
{
count++;
lastMatch=fd;
}
}
ambig=(count>1);
cachedResult->isAmbig = ambig;
cachedResult->fileDef = lastMatch;
......@@ -6593,3 +6596,9 @@ void writeTypeConstraints(OutputList &ol,Definition *d,ArgumentList *al)
ol.endConstraintList();
}
bool usingTreeIndex()
{
QCString& TreeView=Config_getEnum("GENERATE_TREEVIEW");
return TreeView=="FRAME" || TreeView=="ALL" || TreeView=="YES";
}
src/util.h
View file @ 2ddfaa1d
......@@ -351,5 +351,7 @@ void writeTypeConstraints(OutputList &ol,Definition *d,ArgumentList *al);
QCString convertCharEntitiesToUTF8(const QCString &s);
bool usingTreeIndex();
#endif
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