FCL/sftools/depl/doctools: comparison Orb/Doxygen/src/definition.cpp

equal deleted inserted replaced

-:d8fccb2cd802
+:468f4c8d3d5b
 /******************************************************************************
 *
 *
 *
-* Copyright (C) 1997-2008 by Dimitri van Heesch.
+* Copyright (C) 1997-2010 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.
 }
 }
 void Definition::removeFromMap(Definition *d)
 {
-QCString symbolName = d->symbolName();
+QString symbolName = d->m_symbolName;
-int index=computeQualifiedIndex(symbolName);
-if (index!=-1) symbolName=symbolName.mid(index+2);
 if (!symbolName.isEmpty())
 {
 //printf("******* removing symbol `%s' (%p)\n",symbolName.data(),d);
 DefinitionIntf *di=Doxygen::symbolMap->find(symbolName);
 if (di)
 int bl = brief.length();
 if (bl>0 && needsDot) // add punctuation if needed
 {
 switch(brief.at(bl-1))
 {
-case '.': case '!': case '?': break;
+case '.': case '!': case '?': case '>': case ':': break;
 default:
 if (uni_isupper(brief.at(0))) brief+='.';
 break;
 }
 }
 0,                // exampleName
 m_impl->body->fileDef,  // fileDef
 actualStart,      // startLine
 actualEnd,        // endLine
 TRUE,             // inlineFragment
-thisMd            // memberDef
+thisMd,           // memberDef
+FALSE             // show line numbers
 );
 ol.endCodeFragment();
 ol.endParagraph();
 }
 }
 *  definition is used.
 */
 void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName,
 const QCString &text,MemberSDict *members,bool /*funcOnly*/)
 {
 static bool latexSourceCode = Config_getBool("LATEX_SOURCE_CODE");
-ol.pushGeneratorState();
+static bool sourceBrowser   = Config_getBool("SOURCE_BROWSER");
-if (/*Config_getBool("SOURCE_BROWSER") &&*/ members)
+static bool refLinkSource   = Config_getBool("REFERENCES_LINK_SOURCE");
+ol.pushGeneratorState();
+if (members)
 {
 ol.startParagraph();
 ol.parseText(text);
 ol.docify(" ");
 }
 if (!md->isObjCMethod() &&
 (md->isFunction() || md->isSlot() ||
 md->isPrototype() || md->isSignal()
 )
-) name+="()";
+)
+{
+name+="()";
+}
 //Definition *d = md->getOutputFileBase();
 //if (d==Doxygen::globalScope) d=md->getBodyDef();
-if (!(md->isLinkable() && !Config_getBool("REFERENCES_LINK_SOURCE")) && md->getStartBodyLine()!=-1 && md->getBodyDef())
+if (sourceBrowser &&
+!(md->isLinkable() && !refLinkSource) &&
+md->getStartBodyLine()!=-1 &&
+md->getBodyDef()
+)
 {
 //printf("md->getBodyDef()=%p global=%p\n",md->getBodyDef(),Doxygen::globalScope);
 // for HTML write a real link
 ol.pushGeneratorState();
 //ol.disableAllBut(OutputGenerator::Html);
 ol.disable(OutputGenerator::RTF);
 ol.disable(OutputGenerator::Man);
 if (!latexSourceCode)
 {
 ol.disable(OutputGenerator::Latex);
 }
 QCString lineStr,anchorStr;
 anchorStr.sprintf("l%05d",md->getStartBodyLine());
 //printf("Write object link to %s\n",md->getBodyDef()->getSourceFileBase().data());
 ol.writeObjectLink(0,md->getBodyDef()->getSourceFileBase(),anchorStr,name);
 ol.popGeneratorState();
 // for the other output formats just mention the name
 ol.pushGeneratorState();
 ol.disable(OutputGenerator::Html);
 if (latexSourceCode)
 {
 ol.disable(OutputGenerator::Latex);
 }
 ol.docify(name);
 ol.popGeneratorState();
 }
 else if (md->isLinkable() /*&& d && d->isLinkable()*/)
 {
 ol.disable(OutputGenerator::RTF);
 ol.disable(OutputGenerator::Man);
 if (!latexSourceCode)
 {
 ol.disable(OutputGenerator::Latex);
 }
 ol.writeObjectLink(md->getReference(),
 md->getOutputFileBase(),
 md->anchor(),name);
 ol.popGeneratorState();
 // for the other output formats just mention the name
 ol.pushGeneratorState();
 ol.disable(OutputGenerator::Html);
 if (latexSourceCode)
 {
 ol.disable(OutputGenerator::Latex);
 }
 ol.docify(name);
 ol.popGeneratorState();
 }
 else
 {
 m_impl->partOfGroups->append(gd);
 }
 void Definition::setRefItems(const QList<ListItemInfo> *sli)
 {
+//printf("%s::setRefItems()\n",name().data());
 if (sli)
 {
 makeResident();
 // deep copy the list
 if (m_impl->xrefListItems==0)
 }
 }
 void Definition::mergeRefItems(Definition *d)
 {
+//printf("%s::mergeRefItems()\n",name().data());
 LockingPtr< QList<ListItemInfo> > xrefList = d->xrefListItems();
 if (xrefList!=0)
 {
 makeResident();
 // deep copy the list
 {
 return ::convertNameToFile(name,allowDots);
 }
 }
+QCString Definition::pathFragment() const
+{
+makeResident();
+QCString result;
+if (m_impl->outerScope && m_impl->outerScope!=Doxygen::globalScope)
+{
+result = m_impl->outerScope->pathFragment();
+}
+if (isLinkable())
+{
+if (!result.isEmpty()) result+="/";
+if (definitionType()==Definition::TypeGroup && ((const GroupDef*)this)->groupTitle())
+{
+result+=((const GroupDef*)this)->groupTitle();
+}
+else if (definitionType()==Definition::TypePage && !((const PageDef*)this)->title().isEmpty())
+{
+result+=((const PageDef*)this)->title();
+}
+else
+{
+result+=m_impl->localName;
+}
+}
+else
+{
+result+=m_impl->localName;
+}
+return result;
+}
 void Definition::writePathFragment(OutputList &ol) const
 {
 makeResident();
 if (m_impl->outerScope && m_impl->outerScope!=Doxygen::globalScope)
 {
 m_impl->outerScope->writePathFragment(ol);
-if (m_impl->outerScope->definitionType()==Definition::TypeClass ||
+}
-m_impl->outerScope->definitionType()==Definition::TypeNamespace)
+ol.writeString("      <li>");
-{
-if (Config_getBool("OPTIMIZE_OUTPUT_JAVA") ||
-Config_getBool("OPTIMIZE_OUTPUT_VHDL")
-)
-{
-ol.writeString(".");
-}
-else
-{
-ol.writeString("::");
-}
-}
-else
-{
-ol.writeString("&nbsp;");
-ol.writeString("&raquo;");
-ol.writeString("&nbsp;");
-}
-}
 if (isLinkable())
 {
 if (definitionType()==Definition::TypeGroup && ((const GroupDef*)this)->groupTitle())
 {
 ol.writeObjectLink(getReference(),getOutputFileBase(),0,((const GroupDef*)this)->groupTitle());
 {
 ol.startBold();
 ol.docify(m_impl->localName);
 ol.endBold();
 }
+ol.writeString("      </li>\n");
 }
 void Definition::writeNavigationPath(OutputList &ol) const
 {
 ol.pushGeneratorState();
 ol.disableAllBut(OutputGenerator::Html);
-ol.writeString("  <div class=\"navpath\">");
+ol.writeString("  <div class=\"navpath\">\n");
+ol.writeString("    <ul>\n");
 writePathFragment(ol);
-ol.writeString("\n  </div>\n");
+ol.writeString("    </ul>\n");
+ol.writeString("  </div>\n");
 ol.popGeneratorState();
 }
 QCString Definition::symbolName() const

changeset 4	468f4c8d3d5b
parent 0	42188c7ea2d9