diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-20 15:28:39 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-20 15:28:39 (GMT) |
commit | c2f7cd247c5e712687640d88b834a54585e83425 (patch) | |
tree | de08f34f25a77a588ebb18998b4844a40773e61e /src/doxygen.cpp | |
parent | 0fc0de19ba79068ff7b6bad1e161393adcd865b8 (diff) | |
parent | b007be7c1671661f31f056b7b7b5f480279ddbd6 (diff) | |
download | Doxygen-c2f7cd247c5e712687640d88b834a54585e83425.zip Doxygen-c2f7cd247c5e712687640d88b834a54585e83425.tar.gz Doxygen-c2f7cd247c5e712687640d88b834a54585e83425.tar.bz2 |
Merge branch 'feature/bug_config' of https://github.com/albert-github/doxygen into albert-github-feature/bug_config
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 52f9ceb..c36c5ce 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -8993,6 +8993,7 @@ static void readTagFile(const std::shared_ptr<Entry> &root,const char *tl) { fileName = tagLine.left(eqPos).stripWhiteSpace(); destName = tagLine.right(tagLine.length()-eqPos-1).stripWhiteSpace(); + if (fileName.isEmpty() || destName.isEmpty()) return; QFileInfo fi(fileName); Doxygen::tagDestinationDict.insert(fi.absFilePath().utf8(),new QCString(destName)); //printf("insert tagDestination %s->%s\n",fi.fileName().data(),destName.data()); @@ -10496,11 +10497,22 @@ void adjustConfiguration() while (mapping) { QCString mapStr = mapping; - int i; - if ((i=mapStr.find('='))!=-1) + int i=mapStr.find('='); + if (i==-1) + { + mapping = extMaps.next(); + continue; + } + else { - QCString ext=mapStr.left(i).stripWhiteSpace().lower(); - QCString language=mapStr.mid(i+1).stripWhiteSpace().lower(); + QCString ext = mapStr.left(i).stripWhiteSpace().lower(); + QCString language = mapStr.mid(i+1).stripWhiteSpace().lower(); + if (ext.isEmpty() || language.isEmpty()) + { + mapping = extMaps.next(); + continue; + } + if (!updateLanguageMapping(ext,language)) { err("Failed to map file extension '%s' to unsupported language '%s'.\n" @@ -10516,7 +10528,6 @@ void adjustConfiguration() mapping = extMaps.next(); } - // add predefined macro name to a dictionary QStrList &expandAsDefinedList =Config_getList(EXPAND_AS_DEFINED); s=expandAsDefinedList.first(); |