diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2007-09-25 19:13:15 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2007-09-25 19:13:15 (GMT) |
| commit | f57b7d974fec18d1d8f325c102efd8be5930131d (patch) | |
| tree | bbe4c051e635c620ab57fcc7ca8279d0427777d8 /src/doxygen.cpp | |
| parent | 8e4a092e4d51347f8f6c61d87154ee74edb13d20 (diff) | |
| download | Doxygen-f57b7d974fec18d1d8f325c102efd8be5930131d.zip Doxygen-f57b7d974fec18d1d8f325c102efd8be5930131d.tar.gz Doxygen-f57b7d974fec18d1d8f325c102efd8be5930131d.tar.bz2 | |
Release-1.5.3-20070925
Diffstat (limited to 'src/doxygen.cpp')
| -rw-r--r-- | src/doxygen.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 756d70f..5a62e38 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -2605,7 +2605,7 @@ static void addMethodToClass(EntryNav *rootNav,ClassDef *cd, FileDef *fd=rootNav->fileDef(); int l,i; - static QRegExp re("([a-z_A-Z0-9: ]*[ &*]*[ ]*"); + static QRegExp re("([a-z_A-Z0-9: ]*[ &*]+[ ]*"); if (!root->type.isEmpty() && (i=re.match(root->type,0,&l))!=-1) // function variable { @@ -2827,7 +2827,7 @@ static void buildFunctionList(EntryNav *rootNav) } - static QRegExp re("([a-z_A-Z0-9: ]*[ &*]*[ ]*"); + static QRegExp re("([a-z_A-Z0-9: ]*[ &*]+[ ]*"); if (!rootNav->parent()->name().isEmpty() && (rootNav->parent()->section() & Entry::COMPOUND_MASK) && cd && @@ -4210,6 +4210,7 @@ static bool findClassRelation( usedName=biName; //printf("***** usedName=%s templSpec=%s\n",usedName.data(),templSpec.data()); } + if (Config_getBool("SIP_SUPPORT")) bi->prot=Public; cd->insertBaseClass(baseClass,usedName,bi->prot,bi->virt,templSpec); // add this class as super class to the base class baseClass->insertSubClass(cd,bi->prot,bi->virt,templSpec); |