diff options
| author | albert-github <albert.tests@gmail.com> | 2019-08-13 17:23:42 (GMT) |
|---|---|---|
| committer | albert-github <albert.tests@gmail.com> | 2019-08-13 17:23:42 (GMT) |
| commit | a27369dbf3cccbe4b96bfde1aca49d96d4b396f0 (patch) | |
| tree | fef8279e2e220a5e663b00d42d8f346bce030b0e | |
| parent | 80bbd1796e410d1822e16833bcf6002692ff54df (diff) | |
| download | Doxygen-a27369dbf3cccbe4b96bfde1aca49d96d4b396f0.zip Doxygen-a27369dbf3cccbe4b96bfde1aca49d96d4b396f0.tar.gz Doxygen-a27369dbf3cccbe4b96bfde1aca49d96d4b396f0.tar.bz2 | |
issue #7190 1.8.16: Blank FILE_PATTERNS => no files processed
This is actually a regression on #7195. Due to the fact that the init() routine has moved up, the settings for `FILE_PATTERNS` have already been done and a call to init does not operate on the `FILE_PATTERNS` variable but on the structure from which the `FILE_PATTERNS` was derived. We have should here operate on the `FILE_PATTERNS` directly as well., bu getting the default values out of the underlying structure.
| -rw-r--r-- | src/configimpl.h | 1 | ||||
| -rw-r--r-- | src/configimpl.l | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/configimpl.h b/src/configimpl.h index 1594d47..55e056e 100644 --- a/src/configimpl.h +++ b/src/configimpl.h @@ -126,6 +126,7 @@ class ConfigList : public ConfigOption void setWidgetType(WidgetType w) { m_widgetType = w; } WidgetType widgetType() const { return m_widgetType; } QStrList *valueRef() { return &m_value; } + QStrList getDefault() { return m_defaultValue; } void writeTemplate(FTextStream &t,bool sl,bool); void compareDoxyfile(FTextStream &t); void substEnvVars(); diff --git a/src/configimpl.l b/src/configimpl.l index bcb5a8c..2d91e12 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -1652,11 +1652,17 @@ void Config::checkAndCorrect() QStrList &filePatternList = Config_getList(FILE_PATTERNS); if (filePatternList.isEmpty()) { - ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); - if (opt->kind()==ConfigOption::O_List) + ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); + if (opt->kind()==ConfigOption::O_List) + { + QStrList l = ((ConfigList*)opt)->getDefault(); + const char *p = l.first(); + while (p) { - ((ConfigList*)opt)->init(); + filePatternList.append(p); + p = l.next(); } + } } // add default pattern if needed |