Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
doxverilog
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
doxverilog
Commits
21d9bf2b
Commit
21d9bf2b
authored
Feb 22, 2014
by
Dimitri van Heesch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:doxygen/doxygen
parents
836af2f9
a6083348
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
6 deletions
+15
-6
htmlgen.cpp
src/htmlgen.cpp
+1
-1
index.cpp
src/index.cpp
+1
-1
namespacedef.cpp
src/namespacedef.cpp
+9
-1
namespacedef.h
src/namespacedef.h
+2
-1
perlmodgen.cpp
src/perlmodgen.cpp
+1
-1
xmlgen.cpp
src/xmlgen.cpp
+1
-1
No files found.
src/htmlgen.cpp
View file @
21d9bf2b
...
@@ -1683,7 +1683,7 @@ void HtmlGenerator::startFile(const char *name,const char *,
...
@@ -1683,7 +1683,7 @@ void HtmlGenerator::startFile(const char *name,const char *,
Doxygen
::
indexList
->
addIndexFile
(
fileName
);
Doxygen
::
indexList
->
addIndexFile
(
fileName
);
lastFile
=
fileName
;
lastFile
=
fileName
;
t
<<
substituteHtmlKeywords
(
g_header
,
convertToHtml
(
title
),
relPath
);
t
<<
substituteHtmlKeywords
(
g_header
,
convertToHtml
(
filterTitle
(
title
)
),
relPath
);
t
<<
"<!-- "
<<
theTranslator
->
trGeneratedBy
()
<<
" Doxygen "
t
<<
"<!-- "
<<
theTranslator
->
trGeneratedBy
()
<<
" Doxygen "
<<
versionString
<<
" -->"
<<
endl
;
<<
versionString
<<
" -->"
<<
endl
;
...
...
src/index.cpp
View file @
21d9bf2b
...
@@ -3102,7 +3102,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
...
@@ -3102,7 +3102,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
if
(
pd
->
title
().
isEmpty
())
if
(
pd
->
title
().
isEmpty
())
pageTitle
=
pd
->
name
();
pageTitle
=
pd
->
name
();
else
else
pageTitle
=
pd
->
title
(
);
pageTitle
=
filterTitle
(
pd
->
title
()
);
if
(
ftv
)
if
(
ftv
)
{
{
...
...
src/namespacedef.cpp
View file @
21d9bf2b
...
@@ -68,6 +68,10 @@ NamespaceDef::NamespaceDef(const char *df,int dl,int dc,
...
@@ -68,6 +68,10 @@ NamespaceDef::NamespaceDef(const char *df,int dl,int dc,
{
{
m_type
=
CONSTANT_GROUP
;
m_type
=
CONSTANT_GROUP
;
}
}
else
if
(
type
&&
!
strcmp
(
"library"
,
type
))
{
m_type
=
LIBRARY
;
}
else
else
{
{
m_type
=
NAMESPACE
;
m_type
=
NAMESPACE
;
...
@@ -1117,9 +1121,13 @@ QCString NamespaceDef::compoundTypeString() const
...
@@ -1117,9 +1121,13 @@ QCString NamespaceDef::compoundTypeString() const
{
{
return
"constants"
;
return
"constants"
;
}
}
else
if
(
isLibrary
())
{
return
"library"
;
}
else
else
{
{
err
(
"Internal inconsistency: namespace in IDL not module or constant group
\n
"
);
err
(
"Internal inconsistency: namespace in IDL not module
, library
or constant group
\n
"
);
}
}
}
}
return
""
;
return
""
;
...
...
src/namespacedef.h
View file @
21d9bf2b
...
@@ -68,6 +68,7 @@ class NamespaceDef : public Definition
...
@@ -68,6 +68,7 @@ class NamespaceDef : public Definition
bool
isConstantGroup
()
const
{
return
CONSTANT_GROUP
==
m_type
;
}
bool
isConstantGroup
()
const
{
return
CONSTANT_GROUP
==
m_type
;
}
bool
isModule
()
const
{
return
MODULE
==
m_type
;
}
bool
isModule
()
const
{
return
MODULE
==
m_type
;
}
bool
isLibrary
()
const
{
return
LIBRARY
==
m_type
;
}
bool
isLinkableInProject
()
const
;
bool
isLinkableInProject
()
const
;
bool
isLinkable
()
const
;
bool
isLinkable
()
const
;
...
@@ -132,7 +133,7 @@ class NamespaceDef : public Definition
...
@@ -132,7 +133,7 @@ class NamespaceDef : public Definition
ClassSDict
*
classSDict
;
ClassSDict
*
classSDict
;
NamespaceSDict
*
namespaceSDict
;
NamespaceSDict
*
namespaceSDict
;
bool
m_subGrouping
;
bool
m_subGrouping
;
enum
{
NAMESPACE
,
MODULE
,
CONSTANT_GROUP
}
m_type
;
enum
{
NAMESPACE
,
MODULE
,
CONSTANT_GROUP
,
LIBRARY
}
m_type
;
bool
m_isPublished
;
bool
m_isPublished
;
};
};
...
...
src/perlmodgen.cpp
View file @
21d9bf2b
...
@@ -2125,7 +2125,7 @@ void PerlModGenerator::generatePerlModForPage(PageDef *pd)
...
@@ -2125,7 +2125,7 @@ void PerlModGenerator::generatePerlModForPage(PageDef *pd)
SectionInfo
*
si
=
Doxygen
::
sectionDict
->
find
(
pd
->
name
());
SectionInfo
*
si
=
Doxygen
::
sectionDict
->
find
(
pd
->
name
());
if
(
si
)
if
(
si
)
m_output
.
addFieldQuotedString
(
"title
"
,
si
->
title
);
m_output
.
addFieldQuotedString
(
"title
4"
,
filterTitle
(
si
->
title
)
);
addPerlModDocBlock
(
m_output
,
"detailed"
,
pd
->
docFile
(),
pd
->
docLine
(),
0
,
0
,
pd
->
documentation
());
addPerlModDocBlock
(
m_output
,
"detailed"
,
pd
->
docFile
(),
pd
->
docLine
(),
0
,
0
,
pd
->
documentation
());
m_output
.
closeHash
();
m_output
.
closeHash
();
...
...
src/xmlgen.cpp
View file @
21d9bf2b
...
@@ -1845,7 +1845,7 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample)
...
@@ -1845,7 +1845,7 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample)
SectionInfo
*
si
=
Doxygen
::
sectionDict
->
find
(
pd
->
name
());
SectionInfo
*
si
=
Doxygen
::
sectionDict
->
find
(
pd
->
name
());
if
(
si
)
if
(
si
)
{
{
t
<<
" <title>"
<<
convertToXML
(
convertCharEntitiesToUTF8
(
si
->
title
))
t
<<
" <title>"
<<
convertToXML
(
convertCharEntitiesToUTF8
(
filterTitle
(
si
->
title
)
))
<<
"</title>"
<<
endl
;
<<
"</title>"
<<
endl
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment