summaryrefslogtreecommitdiffstats
path: root/src/filedef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2011-10-27 18:00:16 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2011-10-27 18:00:16 (GMT)
commit8491e9fbd06ef8a8f1cc542a524c673d7781d4b6 (patch)
tree7c1bfd20df6135fa1aac607ebe1a46d31d7f4b65 /src/filedef.cpp
parent3af6ff4c3d2748b45f468695a3db9f26eef4e630 (diff)
downloadDoxygen-8491e9fbd06ef8a8f1cc542a524c673d7781d4b6.zip
Doxygen-8491e9fbd06ef8a8f1cc542a524c673d7781d4b6.tar.gz
Doxygen-8491e9fbd06ef8a8f1cc542a524c673d7781d4b6.tar.bz2
Release-1.7.5.1-20111027
Diffstat (limited to 'src/filedef.cpp')
-rw-r--r--src/filedef.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filedef.cpp b/src/filedef.cpp
index 04ec5ae..dcc2c15 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -1503,7 +1503,7 @@ bool FileDef::isDocumentationFile() const
void FileDef::acquireFileVersion()
{
QCString vercmd = Config_getString("FILE_VERSION_FILTER");
- if (!vercmd.isEmpty() && filepath!="generated")
+ if (!vercmd.isEmpty() && !filepath.isEmpty() && filepath!="generated")
{
msg("Version of %s : ",filepath.data());
QCString cmd = vercmd+" \""+filepath+"\"";
@@ -1518,9 +1518,8 @@ void FileDef::acquireFileVersion()
char buf[bufSize];
int numRead = fread(buf,1,bufSize,f);
portable_pclose(f);
- if (numRead > 0)
+ if (numRead>0 && !(fileVersion=QCString(buf,numRead).stripWhiteSpace()).isEmpty())
{
- fileVersion = QCString(buf,numRead).stripWhiteSpace();
msg("%s\n",fileVersion.data());
}
else
@@ -1650,6 +1649,7 @@ bool FileDef::isLinkableInProject() const
return hasDocumentation() && !isReference() && showFiles;
}
+#if 0
bool FileDef::includes(FileDef *incFile,QDict<FileDef> *includedFiles) const
{
//printf("%s::includes(%s)\n",name().data(),incFile->name().data());
@@ -1687,4 +1687,4 @@ bool FileDef::includesByName(const QCString &fileName) const
}
return FALSE;
}
-
+#endif