summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-03-23 13:15:03 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-03-23 13:15:03 (GMT)
commitea436bd659e022d6375dd37f651d4bb18a1c01db (patch)
treec01e350503a95b1993821e7045bfd689e8678cc4
parent268da0c8400d52ae97d1fc673ccc7a09bb627b6a (diff)
downloadDoxygen-ea436bd659e022d6375dd37f651d4bb18a1c01db.zip
Doxygen-ea436bd659e022d6375dd37f651d4bb18a1c01db.tar.gz
Doxygen-ea436bd659e022d6375dd37f651d4bb18a1c01db.tar.bz2
Removed message, minor restructuring
-rw-r--r--src/config.l13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/config.l b/src/config.l
index 5d51acb..d20ed0b 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1591,21 +1591,22 @@ void Config::check()
checkFileName("GENERATE_TAGFILE");
- // sanity check if all depends relations are valid
+ // disable any boolean options that depend on disabled options
QListIterator<ConfigOption> it = iterator();
ConfigOption *option;
for (it.toFirst();(option=it.current());++it)
{
- QCString depName = option->dependsOn();
+ QCString depName = option->dependsOn(); // option has a dependency
if (!depName.isEmpty())
{
ConfigOption * dep = Config::instance()->get(depName);
- if (dep->kind()==ConfigOption::O_Bool
- && Config_getBool(depName)==FALSE)
+ if (dep->kind()==ConfigOption::O_Bool &&
+ Config_getBool(depName)==FALSE) // dependent option is disabled
{
- msg("disabling %s since its dependency(%s) is also disabled\n",option->name().data(),depName.data());
if (option->kind()==ConfigOption::O_Bool)
- Config_getBool(option->name())=FALSE;
+ {
+ Config_getBool(option->name())=FALSE; // also disable this option
+ }
}
}
}