summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
Diffstat (limited to 'addon')
-rw-r--r--addon/configgen/config_templ.l14
1 files changed, 7 insertions, 7 deletions
diff --git a/addon/configgen/config_templ.l b/addon/configgen/config_templ.l
index a7b1289..006bdc6 100644
--- a/addon/configgen/config_templ.l
+++ b/addon/configgen/config_templ.l
@@ -317,7 +317,7 @@ void configStrToVal()
static void substEnvVarsInString(QCString &s)
{
- QRegExp re("\\$([a-z_A-Z0-9]+)");
+ static QRegExp re("\\$\\([a-z_A-Z0-9]+\\)");
int p=0;
int i,l;
//printf("substEnvVarInString(%s) start\n",s.data());
@@ -644,19 +644,19 @@ void checkConfig()
}
// add default pattern if needed
- if (Config::filePatternList.count()==0)
+ if (Config::filePatternList.isEmpty())
{
- Config::filePatternList.append("*");
+ Config::filePatternList="*";
}
// add default pattern if needed
- if (Config::examplePatternList.count()==0)
+ if (Config::examplePatternList.isEmpty())
{
- Config::examplePatternList.append("*");
+ Config::examplePatternList="*";
}
// add default pattern if needed
- //if (Config::imagePatternList.count()==0)
+ //if (Config::imagePatternList.isEmpty())
//{
// Config::imagePatternList.append("*");
//}
@@ -685,7 +685,7 @@ void checkConfig()
// check documentation URL
if (Config::docURL.isEmpty())
{
- Config::docURL = Config::outputDir.copy().prepend("file://").append("html");
+ Config::docURL = Config::outputDir.copy().prepend("file://")+"html";
}
else if (Config::docURL.left(7)!="http://" && Config::docURL.left(7)!="file://")
{