Release-1.4.5 (c1cf420f) · Commits · Elphel / doxverilog

INSTALL

+2 −2

Original line number	Original line	Diff line number	Diff line
	DOXYGEN Version 1.4.4-20050927		DOXYGEN Version 1.4.5

	Please read the installation section of the manual		Please read the installation section of the manual
	(http://www.doxygen.org/install.html) for instructions.		(http://www.doxygen.org/install.html) for instructions.

	--------		--------
	Dimitri van Heesch (27 September 2005)		Dimitri van Heesch (04 October 2005)

README

+2 −2

Original line number	Original line	Diff line number	Diff line
	DOXYGEN Version 1.4.4_20050927		DOXYGEN Version 1.4.5

	Please read INSTALL for compilation instructions.		Please read INSTALL for compilation instructions.

	@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.

	Enjoy,		Enjoy,

	Dimitri van Heesch (dimitri@stack.nl) (27 September 2005)		Dimitri van Heesch (dimitri@stack.nl) (04 October 2005)

VERSION

+1 −1

Original line number	Original line	Diff line number	Diff line
	1.4.4-20050927		1.4.5

src/docparser.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -165,8 +165,9 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
	int i;		int i;
	if ((i=result.findRev('/'))!=-1 \|\| (i=result.findRev('\\'))!=-1)		if ((i=result.findRev('/'))!=-1 \|\| (i=result.findRev('\\'))!=-1)
	{		{
	result.right(result.length()-i-1);		result = result.right(result.length()-i-1);
	}		}
			//printf("fileName=%s result=%s\n",fileName,result.data());
	QCString outputDir;		QCString outputDir;
	switch(type)		switch(type)
	{		{

src/doxygen.cpp

+32 −25

Original line number	Original line	Diff line number	Diff line
	@@ -1736,9 +1736,10 @@ static MemberDef *addVariableToFile(

	// see if the function is inside a namespace		// see if the function is inside a namespace
	NamespaceDef *nd = 0;		NamespaceDef *nd = 0;
			QCString nscope;
	if (!scope.isEmpty())		if (!scope.isEmpty())
	{		{
	QCString nscope=removeAnonymousScopes(scope);		nscope=removeAnonymousScopes(scope);
	if (!nscope.isEmpty())		if (!nscope.isEmpty())
	{		{
	nd = getResolvedNamespace(nscope);		nd = getResolvedNamespace(nscope);
	@@ -1784,12 +1785,12 @@ static MemberDef *addVariableToFile(
	MemberName *mn=Doxygen::functionNameSDict[name];		MemberName *mn=Doxygen::functionNameSDict[name];
	if (mn)		if (mn)
	{		{
	QCString nscope=removeAnonymousScopes(scope);		//QCString nscope=removeAnonymousScopes(scope);
	NamespaceDef *nd=0;		//NamespaceDef *nd=0;
	if (!nscope.isEmpty())		//if (!nscope.isEmpty())
	{		//{
	nd = getResolvedNamespace(nscope);		// nd = getResolvedNamespace(nscope);
	}		//}
	MemberNameIterator mni(*mn);		MemberNameIterator mni(*mn);
	MemberDef *md;		MemberDef *md;
	for (mni.toFirst();(md=mni.current());++mni)		for (mni.toFirst();(md=mni.current());++mni)
	@@ -2141,7 +2142,8 @@ static void buildVarList(Entry *root)
	scope=root->relates.copy();		scope=root->relates.copy();
	}		}

	if (!scope.isEmpty() && !name.isEmpty() && (cd=getClass(scope)))		// note: changed from scope to classScope on 2-10-2005
			if (!classScope.isEmpty() && !name.isEmpty() && (cd=getClass(classScope)))
	{		{
	MemberDef *md=0;		MemberDef *md=0;

	@@ -4892,8 +4894,6 @@ static void findMember(Entry *root,
	}		}
	if (matching)		if (matching)
	{		{
	//printf("addMemberDocs root->inLine=%d md->isInline()=%d\n",
	// root->inLine,md->isInline());
	addMemberDocs(root,md,funcDecl,0,overloaded,0/* TODO */);		addMemberDocs(root,md,funcDecl,0,overloaded,0/* TODO */);
	count++;		count++;
	memFound=TRUE;		memFound=TRUE;
	@@ -5762,7 +5762,7 @@ static void findEnumDocumentation(Entry *root)
	for (mni.toFirst();(md=mni.current()) && !found;++mni)		for (mni.toFirst();(md=mni.current()) && !found;++mni)
	{		{
	ClassDef *cd=md->getClassDef();		ClassDef *cd=md->getClassDef();
	if (cd && cd->name()==className)		if (cd && cd->name()==className && md->isEnumerate())
	{		{
	// documentation outside a compound overrides the documentation inside it		// documentation outside a compound overrides the documentation inside it
	if (!md->documentation() \|\| root->parent->name.isEmpty())		if (!md->documentation() \|\| root->parent->name.isEmpty())
	@@ -5808,9 +5808,14 @@ static void findEnumDocumentation(Entry *root)
	else // enum outside class		else // enum outside class
	{		{
	//printf("Enum outside class: %s grpId=%d\n",name.data(),root->mGrpId);		//printf("Enum outside class: %s grpId=%d\n",name.data(),root->mGrpId);
	MemberDef *md;
	MemberName *mn=Doxygen::functionNameSDict[name];		MemberName *mn=Doxygen::functionNameSDict[name];
	if (mn && (md=mn->getFirst()))		if (mn)
			{
			MemberNameIterator mni(*mn);
			MemberDef *md;
			for (mni.toFirst();(md=mni.current()) && !found;++mni)
			{
			if (md->isEnumerate())
	{		{
	md->setDocumentation(root->doc,root->docFile,root->docLine);		md->setDocumentation(root->doc,root->docFile,root->docLine);
	md->setDocsForDefinition(!root->proto);		md->setDocsForDefinition(!root->proto);
	@@ -5828,6 +5833,8 @@ static void findEnumDocumentation(Entry *root)
	found=TRUE;		found=TRUE;
	}		}
	}		}
			}
			}
	if (!found)		if (!found)
	{		{
	warn(root->fileName,root->startLine,		warn(root->fileName,root->startLine,

Admin message