diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2007-07-19 13:04:41 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2007-07-19 13:04:41 (GMT) |
| commit | 687fe7a1487c68f0c6b4ef7d169b23ff274ab9ca (patch) | |
| tree | 7c115c97f09109f537a6eb50b9baa3c0cd91d07d /src/pyscanner.l | |
| parent | 34ca582041237fd0b2c91b58afd2a39dc91cf0a8 (diff) | |
| download | Doxygen-687fe7a1487c68f0c6b4ef7d169b23ff274ab9ca.zip Doxygen-687fe7a1487c68f0c6b4ef7d169b23ff274ab9ca.tar.gz Doxygen-687fe7a1487c68f0c6b4ef7d169b23ff274ab9ca.tar.bz2 | |
Release-1.5.2-20070719
Diffstat (limited to 'src/pyscanner.l')
| -rw-r--r-- | src/pyscanner.l | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/pyscanner.l b/src/pyscanner.l index 913f88e..ed3f10b 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -1000,6 +1000,7 @@ STARTDOCSYMS ^{B}"##"/[^#] // prepend scope in case of nested classes if (current_root->section&Entry::SCOPE_MASK) { + printf("*** Prepending scope %s to class %s\n",current_root->name.data(),current->name.data()); current->name.prepend(current_root->name+"::"); } @@ -1476,11 +1477,15 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt) QFileInfo fi(fileName); g_moduleScope = findPackageScope(fileName); - if (!g_moduleScope.isEmpty()) + QString baseName=fi.baseName(); + if (baseName!="__init__") // package initializer file is not a package itself { - g_moduleScope+="::"; + if (!g_moduleScope.isEmpty()) + { + g_moduleScope+="::"; + } + g_moduleScope+=baseName; } - g_moduleScope+=fi.baseName(); current = new Entry; current->name = g_moduleScope; |