diff options
| -rw-r--r-- | qtools/qcstring.cpp | 3 | ||||
| -rw-r--r-- | src/docparser.cpp | 6 | ||||
| -rw-r--r-- | src/filedef.cpp | 2 | ||||
| -rw-r--r-- | src/groupdef.cpp | 2 | ||||
| -rw-r--r-- | src/namespacedef.cpp | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/qtools/qcstring.cpp b/qtools/qcstring.cpp index 1eb24aa..fdd9971 100644 --- a/qtools/qcstring.cpp +++ b/qtools/qcstring.cpp @@ -32,7 +32,8 @@ QCString &QCString::sprintf( const char *format, ... ) int l = length(); if (l<minlen) { resize(minlen); l=minlen; } int n=vsnprintf( data(), l, format, ap); - resize(qstrlen(data())+1); + if (n<0) n=l; + resize(n+1); va_end( ap ); return *this; } diff --git a/src/docparser.cpp b/src/docparser.cpp index a788e13..b7e8dad 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -7122,6 +7122,12 @@ static QCString processCopyDoc(const char *data,uint &len) isBrief?"brief":"details",id.data()); } } + else + { + warn_doc_error(g_fileName,doctokenizerYYlineno, + "@copy%s or @copydoc target '%s' not found", isBrief?"brief":"details", + id.data()); + } // skip over command i=j; } diff --git a/src/filedef.cpp b/src/filedef.cpp index 42e3efc..c0be33d 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -1857,7 +1857,7 @@ void FileDef::writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCS } else { - ml->writeDeclarations(ol,0,0,this,0,title,0,definitionType()); + ml->writeDeclarations(ol,0,0,this,0,title,0); } } } diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 5993bb2..1c07113 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -1621,7 +1621,7 @@ void GroupDef::writeMemberDeclarations(OutputList &ol,MemberListType lt,const QC } if (ml) { - ml->writeDeclarations(ol,0,0,0,this,title,0,definitionType()); + ml->writeDeclarations(ol,0,0,0,this,title,0); } } diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index 6cf12b6..f7c8123 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -1088,7 +1088,7 @@ MemberList *NamespaceDef::getMemberList(MemberListType lt) const void NamespaceDef::writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title) { MemberList * ml = getMemberList(lt); - if (ml) ml->writeDeclarations(ol,0,this,0,0,title,0,DefinitionIntf::TypeNamespace); + if (ml) ml->writeDeclarations(ol,0,this,0,0,title,0); } void NamespaceDef::writeMemberDocumentation(OutputList &ol,MemberListType lt,const QCString &title) |