summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2009-03-04 21:11:18 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2009-03-04 21:11:18 (GMT)
commitaa9c531961aea00c8d9c139de3c48844f11dc9f1 (patch)
treeade91348b3d7d8806a09659790655b697c1f4eea /src/classdef.cpp
parent27b5dd5b526154944bb1997fb7a592343d124595 (diff)
downloadDoxygen-aa9c531961aea00c8d9c139de3c48844f11dc9f1.zip
Doxygen-aa9c531961aea00c8d9c139de3c48844f11dc9f1.tar.gz
Doxygen-aa9c531961aea00c8d9c139de3c48844f11dc9f1.tar.bz2
Release-1.5.8-20090304
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp139
1 files changed, 68 insertions, 71 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index b20a222..7bd4b48 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -942,89 +942,86 @@ void ClassDef::showUsedFiles(OutputList &ol)
ol.pushGeneratorState();
ol.disable(OutputGenerator::Man);
bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
- //if (Config_getBool("SHOW_USED_FILES"))
- //{
- ol.writeRuler();
- if (fortranOpt)
- {
- ol.parseText(theTranslator->trGeneratedFromFilesFortran(
+
+ ol.writeRuler();
+ if (fortranOpt)
+ {
+ ol.parseText(theTranslator->trGeneratedFromFilesFortran(
m_impl->isObjC && m_impl->compType==Interface ? Class : m_impl->compType,
m_impl->files.count()==1));
- }
- else
- {
- ol.parseText(theTranslator->trGeneratedFromFiles(
+ }
+ else
+ {
+ ol.parseText(theTranslator->trGeneratedFromFiles(
m_impl->isObjC && m_impl->compType==Interface ? Class : m_impl->compType,
m_impl->files.count()==1));
- }
-
+ }
- bool first=TRUE;
- const char *file = m_impl->files.first();
- while (file)
+
+ bool first=TRUE;
+ const char *file = m_impl->files.first();
+ while (file)
+ {
+ bool ambig;
+ FileDef *fd=findFileDef(Doxygen::inputNameDict,file,ambig);
+ if (fd)
{
- bool ambig;
- FileDef *fd=findFileDef(Doxygen::inputNameDict,file,ambig);
- if (fd)
+ if (first)
{
- if (first)
- {
- first=FALSE;
- ol.startItemList();
- }
-
- ol.writeListItem();
- QCString path=fd->getPath();
- if (Config_getBool("FULL_PATH_NAMES"))
- {
- ol.docify(stripFromPath(path));
- }
-
- QCString fname = fd->name();
- if (!fd->getVersion().isEmpty()) // append version if available
- {
- fname += " (" + fd->getVersion() + ")";
- }
+ first=FALSE;
+ ol.startItemList();
+ }
- // for HTML
- ol.pushGeneratorState();
- ol.disableAllBut(OutputGenerator::Html);
- if (fd->generateSourceFile())
- {
- ol.writeObjectLink(0,fd->getSourceFileBase(),0,fname);
- }
- else if (fd->isLinkable())
- {
- ol.writeObjectLink(fd->getReference(),fd->getOutputFileBase(),0,
- fname);
- }
- else
- {
- ol.docify(fname);
- }
- ol.popGeneratorState();
+ ol.writeListItem();
+ QCString path=fd->getPath();
+ if (Config_getBool("FULL_PATH_NAMES"))
+ {
+ ol.docify(stripFromPath(path));
+ }
- // for other output formats
- ol.pushGeneratorState();
- ol.disable(OutputGenerator::Html);
- if (fd->isLinkable())
- {
- ol.writeObjectLink(fd->getReference(),fd->getOutputFileBase(),0,
- fname);
- }
- else
- {
- ol.docify(fname);
- }
+ QCString fname = fd->name();
+ if (!fd->getVersion().isEmpty()) // append version if available
+ {
+ fname += " (" + fd->getVersion() + ")";
+ }
- ol.popGeneratorState();
+ // for HTML
+ ol.pushGeneratorState();
+ ol.disableAllBut(OutputGenerator::Html);
+ if (fd->generateSourceFile())
+ {
+ ol.writeObjectLink(0,fd->getSourceFileBase(),0,fname);
+ }
+ else if (fd->isLinkable())
+ {
+ ol.writeObjectLink(fd->getReference(),fd->getOutputFileBase(),0,
+ fname);
+ }
+ else
+ {
+ ol.docify(fname);
+ }
+ ol.popGeneratorState();
-
+ // for other output formats
+ ol.pushGeneratorState();
+ ol.disable(OutputGenerator::Html);
+ if (fd->isLinkable())
+ {
+ ol.writeObjectLink(fd->getReference(),fd->getOutputFileBase(),0,
+ fname);
}
- file=m_impl->files.next();
+ else
+ {
+ ol.docify(fname);
+ }
+
+ ol.popGeneratorState();
}
- if (!first) ol.endItemList();
- //}
+ file=m_impl->files.next();
+ }
+ if (!first) ol.endItemList();
+
ol.popGeneratorState();
}
@@ -2752,7 +2749,7 @@ QCString ClassDef::getSourceFileBase() const
}
else
{
- return convertNameToFile(m_impl->fileName+"-source");
+ return convertNameToFile(m_impl->fileName)+"_source";
}
}