summaryrefslogtreecommitdiffstats
path: root/src/config.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2000-05-28 19:46:08 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2000-05-28 19:46:08 (GMT)
commit3e33c5094f5127c719418656fff8e47d2e19405e (patch)
tree1f7723f69aa2917d2408894c68e7150f7b7ff3d5 /src/config.l
parent745526b6e9683de926af27c4313574a514a3d7c3 (diff)
downloadDoxygen-3e33c5094f5127c719418656fff8e47d2e19405e.zip
Doxygen-3e33c5094f5127c719418656fff8e47d2e19405e.tar.gz
Doxygen-3e33c5094f5127c719418656fff8e47d2e19405e.tar.bz2
Release-1.1.3-20000528
Diffstat (limited to 'src/config.l')
-rw-r--r--src/config.l17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/config.l b/src/config.l
index 4e13bf0..4a3804d 100644
--- a/src/config.l
+++ b/src/config.l
@@ -47,6 +47,9 @@ void warn_cont(const char *fmt, ...)
vfprintf(stderr, fmt, args);
va_end(args);
}
+void initWarningFormat()
+{
+}
#else
#include "doxygen.h"
#include "message.h"
@@ -1842,7 +1845,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());
@@ -2206,19 +2209,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("*");
//}
@@ -2247,7 +2250,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://")
{