diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2000-10-30 21:12:45 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2000-10-30 21:12:45 (GMT) |
commit | 1f15cdfe735375f781fddf5e3e483887b7f481bd (patch) | |
tree | 7d5c1ef91e61313f10266a746afd0d903d1e5f2a /addon/configgen/config_templ.l | |
parent | 00340144fa3b240a602f008e01b6283fa7f1fd4e (diff) | |
download | Doxygen-1f15cdfe735375f781fddf5e3e483887b7f481bd.zip Doxygen-1f15cdfe735375f781fddf5e3e483887b7f481bd.tar.gz Doxygen-1f15cdfe735375f781fddf5e3e483887b7f481bd.tar.bz2 |
Release-1.2.3
Diffstat (limited to 'addon/configgen/config_templ.l')
-rw-r--r-- | addon/configgen/config_templ.l | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/addon/configgen/config_templ.l b/addon/configgen/config_templ.l index 98a688f..81d4acf 100644 --- a/addon/configgen/config_templ.l +++ b/addon/configgen/config_templ.l @@ -140,8 +140,12 @@ static FILE *tryPath(const char *path,const char *fileName) return 0; } +static void substEnvVarsInStrList(QStrList &sl); +static void substEnvVarsInString(QCString &s); + static FILE *findFile(const char *fileName) { + substEnvVarsInStrList(includePathList); char *s=includePathList.first(); while (s) // try each of the include paths { @@ -162,6 +166,7 @@ static void readIncludeFile(const char *incName) } QCString inc = incName; + substEnvVarsInString(inc); inc = inc.stripWhiteSpace(); uint incLen = inc.length(); if (inc.at(0)=='"' && inc.at(incLen-1)=='"') // strip quotes @@ -430,6 +435,23 @@ void configStrToVal() } Config::colsInAlphaIndex=cols; } + + if (enumValuesPerLineString.isEmpty()) + { + Config::enumValuesPerLine=4; + } + else + { + bool ok; + int cols = enumValuesPerLineString.toInt(&ok); + if (!ok || cols<1 || cols>20) + { + warn_cont("Warning: argument of ENUM_VALUES_PER_LINE is not a valid number in the range [1..20]!\n" + "Using the default of 4!\n"); + cols = 4; + } + Config::enumValuesPerLine=cols; + } if (maxDotGraphWidthString.isEmpty()) { @@ -441,7 +463,7 @@ void configStrToVal() int width =maxDotGraphWidthString.toInt(&ok); if (!ok) { - warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [1..20]!\n" + warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [100..30000]!\n" "Using the default of 1024 pixels!\n"); width=1024; } @@ -466,7 +488,7 @@ void configStrToVal() int height =maxDotGraphHeightString.toInt(&ok); if (!ok) { - warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [1..20]!\n" + warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [100..30000]!\n" "Using the default of 1024 pixels!\n"); height=1024; } |