diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2011-10-27 18:00:16 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2011-10-27 18:00:16 (GMT) |
| commit | 8491e9fbd06ef8a8f1cc542a524c673d7781d4b6 (patch) | |
| tree | 7c1bfd20df6135fa1aac607ebe1a46d31d7f4b65 /src/doxygen.cpp | |
| parent | 3af6ff4c3d2748b45f468695a3db9f26eef4e630 (diff) | |
| download | Doxygen-8491e9fbd06ef8a8f1cc542a524c673d7781d4b6.zip Doxygen-8491e9fbd06ef8a8f1cc542a524c673d7781d4b6.tar.gz Doxygen-8491e9fbd06ef8a8f1cc542a524c673d7781d4b6.tar.bz2 | |
Release-1.7.5.1-20111027
Diffstat (limited to 'src/doxygen.cpp')
| -rw-r--r-- | src/doxygen.cpp | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 85cb417..809696a 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -149,6 +149,7 @@ IndexList Doxygen::indexList; int Doxygen::subpageNestingLevel = 0; bool Doxygen::userComments = FALSE; QCString Doxygen::spaces; +bool Doxygen::generatingXmlOutput = FALSE; // locally accessible globals static QDict<EntryNav> g_classEntries(1009); @@ -252,8 +253,11 @@ static STLInfo g_stlinfo[] = { // className baseClass1 baseClass2 templType1 templName1 templType2 templName2 virtInheritance // iterators { "allocator", 0, 0, "T", "elements", 0, 0, FALSE, FALSE }, - { "auto_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, - { "ios_base", 0, 0, 0, 0, 0, 0, FALSE, FALSE }, + { "auto_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // deprecated + { "smart_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11 + { "unique_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11 + { "weak_ptr", 0, 0, "T", "ptr", 0, 0, FALSE, FALSE }, // C++11 + { "ios_base", 0, 0, 0, 0, 0, 0, FALSE, FALSE }, // C++11 { "basic_ios", "ios_base", 0, "Char", 0, 0, 0, FALSE, FALSE }, { "basic_istream", "basic_ios<Char>", 0, "Char", 0, 0, 0, TRUE, FALSE }, { "basic_ostream", "basic_ios<Char>", 0, "Char", 0, 0, 0, TRUE, FALSE }, @@ -321,7 +325,7 @@ static void addSTLMember(EntryNav *rootNav,const char *type,const char *name) Entry *memEntry = new Entry; memEntry->name = name; memEntry->type = type; - memEntry->protection = Private; + memEntry->protection = Public; memEntry->section = Entry::VARIABLE_SEC; memEntry->brief = "STL member"; memEntry->hidden = FALSE; @@ -415,6 +419,22 @@ static void addSTLClasses(EntryNav *rootNav) { addSTLMember(classEntryNav,info->templType2,info->templName2); } + if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" || + fullName=="std::unique_ptr" || fullName=="std::weak_ptr") + { + Entry *memEntry = new Entry; + memEntry->name = "operator->"; + memEntry->args = "()"; + memEntry->type = "T*"; + memEntry->protection = Public; + memEntry->section = Entry::FUNCTION_SEC; + memEntry->brief = "STL member"; + memEntry->hidden = FALSE; + memEntry->artificial = FALSE; + EntryNav *memEntryNav = new EntryNav(classEntryNav,memEntry); + memEntryNav->setEntry(memEntry); + classEntryNav->addChild(memEntryNav); + } if (info->baseClass1) { classEntry->extends->append(new BaseInfo(info->baseClass1,Public,info->virtualInheritance?Virtual:Normal)); @@ -10561,8 +10581,8 @@ void parseInput() computeDirDependencies(); } - msg("Resolving citations...\n"); - Doxygen::citeDict->resolve(); + //msg("Resolving citations...\n"); + //Doxygen::citeDict->resolve(); msg("Generating citations page...\n"); Doxygen::citeDict->generatePage(); @@ -10853,7 +10873,9 @@ void generateOutput() if (Config_getBool("GENERATE_XML")) { msg("Generating XML output...\n"); + Doxygen::generatingXmlOutput=TRUE; generateXML(); + Doxygen::generatingXmlOutput=FALSE; } if (Config_getBool("GENERATE_AUTOGEN_DEF")) { |