Permalink
Browse files

Bug 742715 - Unnamed structs gives: QGDict::hashAsciiKey: Invalid nul…

…l key
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Dec 28, 2015
1 parent bacc2b2 commit 17b66265ace3418413b5cfab0335b4378e9c176b
Showing with 15 additions and 5 deletions.
  1. +9 −4 src/dot.cpp
  2. +6 −1 src/memberdef.cpp
View
@@ -2594,7 +2594,12 @@ void DotClassGraph::addClass(ClassDef *cd,DotNode *n,int prot,
int edgeStyle = (label || prot==EdgeInfo::Orange || prot==EdgeInfo::Orange2) ? EdgeInfo::Dashed : EdgeInfo::Solid;
QCString className;
if (usedName) // name is a typedef
if (cd->isAnonymous())
{
className="anonymous:";
className+=label;
}
else if (usedName) // name is a typedef
{
className=usedName;
}
@@ -2822,9 +2827,9 @@ void DotClassGraph::buildGraph(ClassDef *cd,DotNode *n,bool base,int distance)
if (m_graphType == DotNode::Collaboration)
{
// ---- Add usage relations
UsesClassDict *dict =
base ? cd->usedImplementationClasses() :
UsesClassDict *dict =
base ? cd->usedImplementationClasses() :
cd->usedByImplementationClasses()
;
if (dict)
View
@@ -1516,12 +1516,17 @@ void MemberDef::writeDeclaration(OutputList &ol,
ol.writeNonBreakableSpace(3);
}
QCString varName=ltype.right(ltype.length()-ir).stripWhiteSpace();
//printf(">>>>>> indDepth=%d ltype=`%s' varName=`%s'\n",indDepth,ltype.data(),varName.data());
//printf(">>>>>> ltype=`%s' varName=`%s'\n",ltype.data(),varName.data());
ol.docify("}");
if (varName.isEmpty() && (name().isEmpty() || name().at(0)=='@'))
{
ol.docify(";");
}
else if (!varName.isEmpty() && (varName.at(0)=='*' || varName.at(0)=='&'))
{
ol.docify(" ");
ol.docify(varName);
}
endAnonScopeNeeded=TRUE;
}
else

0 comments on commit 17b6626

Please sign in to comment.