diff options
| -rw-r--r-- | src/definition.cpp | 2 | ||||
| -rw-r--r-- | src/doxygen.cpp | 1 | ||||
| -rw-r--r-- | src/index.cpp | 3 | ||||
| -rw-r--r-- | src/pre.l | 6 | ||||
| -rw-r--r-- | src/section.h | 4 | ||||
| -rw-r--r-- | src/sqlite3gen.cpp | 4 | ||||
| -rw-r--r-- | src/xmlgen.cpp | 3 |
7 files changed, 10 insertions, 13 deletions
diff --git a/src/definition.cpp b/src/definition.cpp index c67030e..00f2bc5 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -432,7 +432,7 @@ void DefinitionImpl::addSectionsToDefinition(const std::vector<const SectionInfo bool DefinitionImpl::hasSections() const { //printf("DefinitionImpl::hasSections(%s) #sections=%d\n",name().data(), - // m_impl->sectionDict ? m_impl->sectionDict->count() : 0); + // m_impl->sectionRefs.size()); if (m_impl->sectionRefs.empty()) return FALSE; for (const SectionInfo *si : m_impl->sectionRefs) { diff --git a/src/doxygen.cpp b/src/doxygen.cpp index f102273..4021332 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -5880,7 +5880,6 @@ static void findMember(const Entry *root, bool matching= md->isVariable() || md->isTypedef() || // needed for function pointers - (mdAl.empty() && root->argList.empty()) || matchArguments2( md->getClassDef(),md->getFileDef(),argList, cd,fd,root->argList, diff --git a/src/index.cpp b/src/index.cpp index 2234377..5552ff0 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -4556,8 +4556,7 @@ static void writeIndex(OutputList &ol) ol.startTextBlock(); ol.generateDoc(defFileName,defLine,Doxygen::mainPage,0, - Doxygen::mainPage->documentation(),TRUE,FALSE - /*,Doxygen::mainPage->sectionDict*/); + Doxygen::mainPage->documentation(),TRUE,FALSE); ol.endTextBlock(); ol.endPageDoc(); @@ -3435,7 +3435,7 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output { char *orgPos=output.data()+orgOffset; char *newPos=output.data()+output.curPos(); - Debug::print(Debug::Preprocessor,0,"Preprocessor output (size: %d bytes):\n",newPos-orgPos); + Debug::print(Debug::Preprocessor,0,"Preprocessor output of %s (size: %d bytes):\n",fileName,newPos-orgPos); int line=1; Debug::print(Debug::Preprocessor,0,"---------\n00001 "); while (orgPos<newPos) @@ -3447,7 +3447,7 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output Debug::print(Debug::Preprocessor,0,"\n---------\n"); if (state->defineManager.defineContext().count()>0) { - Debug::print(Debug::Preprocessor,0,"Macros accessible in this file:\n"); + Debug::print(Debug::Preprocessor,0,"Macros accessible in this file (%s):\n", fileName); Debug::print(Debug::Preprocessor,0,"---------\n"); QDictIterator<Define> di(state->defineManager.defineContext()); Define *def; @@ -3459,7 +3459,7 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output } else { - Debug::print(Debug::Preprocessor,0,"No macros accessible in this file.\n"); + Debug::print(Debug::Preprocessor,0,"No macros accessible in this file (%s).\n", fileName); } } state->defineManager.endContext(); diff --git a/src/section.h b/src/section.h index 2c24e8d..daee254 100644 --- a/src/section.h +++ b/src/section.h @@ -115,7 +115,8 @@ class SectionRefs const_iterator begin() const { return m_entries.cbegin(); } const_iterator end() const { return m_entries.cend(); } - bool empty() const { return m_lookup.empty(); } + bool empty() const { return m_entries.empty(); } + int size() const { return m_entries.size(); } private: SectionInfoVec m_entries; @@ -176,6 +177,7 @@ class SectionManager iterator begin() { return m_entries.begin(); } iterator end() { return m_entries.end(); } bool empty() const { return m_entries.empty(); } + int size() const { return m_entries.size(); } //! clears the sections void clear() diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index 14a73d8..1ab81fc 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -2486,10 +2486,10 @@ static void generateSqlite3ForPage(const PageDef *pd,bool isExample) } else { - SectionInfo *si = Doxygen::sectionDict->find(pd->name()); + SectionInfo *si = SectionManager::instance().find(pd->name()); if (si) { - title = si->title; + title = si->title(); } if(!title){title = pd->title();} diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 7a72346..d674ed8 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -1835,12 +1835,9 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample) if (pd->localToc().isXmlEnabled() && !sectionRefs.empty()) { t << " <tableofcontents>" << endl; - //SDict<SectionInfo>::Iterator li(*sectionDict); - //SectionInfo *si; int level=1,l; bool inLi[5]={ FALSE, FALSE, FALSE, FALSE, FALSE }; int maxLevel = pd->localToc().xmlLevel(); - //for (li.toFirst();(si=li.current());++li) for (const SectionInfo *si : sectionRefs) { if (isSection(si->type())) |