diff options
Diffstat (limited to 'src/filedef.cpp')
| -rw-r--r-- | src/filedef.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/filedef.cpp b/src/filedef.cpp index 9c04dc8..2cfe37a 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -82,8 +82,8 @@ FileDef::FileDef(const char *p,const char *nm, m_path=p; m_filePath=m_path+nm; m_fileName=nm; - setDiskName(dn?dn:nm); setReference(lref); + setDiskName(dn?dn:nm); m_classSDict = 0; m_includeList = 0; m_includeDict = 0; @@ -126,9 +126,18 @@ FileDef::~FileDef() void FileDef::setDiskName(const QCString &name) { - m_outputDiskName = convertNameToFile(name); - m_inclDepFileName = convertNameToFile(name+"_incl"); - m_inclByDepFileName = convertNameToFile(name+"_dep_incl"); + if (isReference()) + { + m_outputDiskName = name; + m_inclDepFileName = name+"_incl"; + m_inclByDepFileName = name+"_dep_incl"; + } + else + { + m_outputDiskName = convertNameToFile(name); + m_inclDepFileName = convertNameToFile(name+"_incl"); + m_inclByDepFileName = convertNameToFile(name+"_dep_incl"); + } } /*! Compute the HTML anchor names for all members in the class */ @@ -344,7 +353,7 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title) ol.disable(OutputGenerator::RTF); } - ol.startParagraph(); + ol.startParagraph("definition"); QCString refText = theTranslator->trDefinedInSourceFile(); int fileMarkerPos = refText.find("@0"); if (fileMarkerPos!=-1) // should always pass this. @@ -355,6 +364,10 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title) ol.parseText(refText.right( refText.length()-fileMarkerPos-2)); // text right from marker 2 } + else + { + err("translation error: invalid marker in trDefinedInSourceFile()\n"); + } ol.endParagraph(); //Restore settings, bug_738548 ol.popGeneratorState(); |