summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-11-28 20:38:57 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-11-28 20:38:57 (GMT)
commitf3e7209fed9703e8be668753d1083ba335121a6e (patch)
tree229ba1f0bd2e721f4cc81307b63d8c79051d1bc4 /src/util.cpp
parente952dab58265a6f21867e51f72d7d81ffe39e082 (diff)
downloadDoxygen-f3e7209fed9703e8be668753d1083ba335121a6e.zip
Doxygen-f3e7209fed9703e8be668753d1083ba335121a6e.tar.gz
Doxygen-f3e7209fed9703e8be668753d1083ba335121a6e.tar.bz2
Release-1.3-rc1-20021128
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/util.cpp b/src/util.cpp
index b445c34..8e7c45e 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -657,8 +657,9 @@ QCString removeRedundantWhiteSpace(const QCString &s)
result+=", ";
}
else if (i>0 &&
- (isId(s.at(i)) && s.at(i-1)==')') ||
- (s.at(i)=='\'' && s.at(i-1)==' ')
+ ((isId(s.at(i)) && s.at(i-1)==')') ||
+ (s.at(i)=='\'' && s.at(i-1)==' ')
+ )
)
{
result+=' ';
@@ -670,7 +671,7 @@ QCString removeRedundantWhiteSpace(const QCString &s)
csp=0;
}
else if (!isspace(c) ||
- ( i!=0 && i!=l-1 &&
+ ( i>0 && i<l-1 &&
(isId(s.at(i-1)) || s.at(i-1)==')' || s.at(i-1)==',' || s.at(i-1)=='>' || s.at(i-1)==']') &&
isId(s.at(i+1))
)
@@ -3157,7 +3158,7 @@ void addMembersToMemberGroup(MemberList *ml,
MemberGroup *mg = memberGroupSDict->find(groupId);
if (mg==0)
{
- mg = new MemberGroup(groupId,*pGrpHeader,pDocs ? pDocs->data() : 0);
+ mg = new MemberGroup(context,groupId,*pGrpHeader,pDocs ? pDocs->data() : 0);
memberGroupSDict->append(groupId,mg);
}
mg->insertMember(context,fmd); // insert in member group
@@ -3178,7 +3179,7 @@ void addMembersToMemberGroup(MemberList *ml,
MemberGroup *mg = memberGroupSDict->find(groupId);
if (mg==0)
{
- mg = new MemberGroup(groupId,*pGrpHeader,pDocs ? pDocs->data() : 0);
+ mg = new MemberGroup(context,groupId,*pGrpHeader,pDocs ? pDocs->data() : 0);
memberGroupSDict->append(groupId,mg);
}
md = ml->take(index); // remove from member list
@@ -3551,20 +3552,21 @@ PageInfo *addRelatedPage(const char *name,const QCString &ptitle,
//outputList->writeTitle(pi->name,pi->title);
// a page name is a label as well!
- SectionInfo *si=new SectionInfo(
- pi->name,pi->title,SectionInfo::Page,pi->reference);
+ QCString file;
if (gd)
{
- si->fileName=gd->getOutputFileBase();
+ file=gd->getOutputFileBase();
}
else if (pi->getGroupDef())
{
- si->fileName=pi->getGroupDef()->getOutputFileBase().copy();
+ file=pi->getGroupDef()->getOutputFileBase().copy();
}
else
{
- si->fileName=pageName;
+ file=pageName;
}
+ SectionInfo *si=new SectionInfo(
+ file,pi->name,pi->title,SectionInfo::Page,pi->reference);
//printf("si->label=`%s' si->definition=%s si->fileName=`%s'\n",
// si->label.data(),si->definition?si->definition->name().data():"<none>",
// si->fileName.data());