diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2016-05-16 15:05:25 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2016-05-16 15:05:25 (GMT) |
commit | 14b04be2af279e1093f17d6b933d1e9ab530e128 (patch) | |
tree | f61bcb5f9390dd7bf7a7620204a6a3aa7980930f /src/configimpl.l | |
parent | 2f8c5b9aef91ac42874aa06481c0fe2220503c3c (diff) | |
download | Doxygen-14b04be2af279e1093f17d6b933d1e9ab530e128.zip Doxygen-14b04be2af279e1093f17d6b933d1e9ab530e128.tar.gz Doxygen-14b04be2af279e1093f17d6b933d1e9ab530e128.tar.bz2 |
Bug 766069 - Files with incorrect extensions (.doc) are picked up by doxygen
Diffstat (limited to 'src/configimpl.l')
-rw-r--r-- | src/configimpl.l | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/configimpl.l b/src/configimpl.l index ac046a8..2cf698a 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -1193,26 +1193,6 @@ static void checkFileName(QCString &s,const char *optionName) } } -static void initFilePattern(void) -{ - // add default pattern if needed - QStrList &filePatternList = ConfigImpl_getList("FILE_PATTERNS"); - if (filePatternList.isEmpty()) - { - QDictIterator<int> it( getExtensionLookup() ); - QCString pattern; - bool caseSens = portable_fileSystemIsCaseSensitive(); - for (;it.current();++it) - { - pattern = "*"; - pattern += it.currentKey(); - filePatternList.append(pattern.data()); - if (caseSens) filePatternList.append(pattern.upper().data()); - } - } -} - - #include "config.h" void Config::init() @@ -1571,7 +1551,16 @@ void Config::checkAndCorrect() } } - initFilePattern(); + // add default file patterns if needed + QStrList &filePatternList = ConfigImpl_getList("FILE_PATTERNS"); + if (filePatternList.isEmpty()) + { + ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); + if (opt->kind()==ConfigOption::O_List) + { + ((ConfigList*)opt)->init(); + } + } // add default pattern if needed QStrList &examplePatternList = ConfigImpl_getList("EXAMPLE_PATTERNS"); |