summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-04-18 13:59:11 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-04-18 13:59:11 (GMT)
commitadff8506a1c654db63ef362bbc90cddf7c156dd7 (patch)
tree5a45c08fe6f9334d87e18a8b8271d2c8cbb71e93 /src/util.cpp
parenteb1cb68e11a3b24222a49ed254f8f7aea2f73bae (diff)
downloadDoxygen-adff8506a1c654db63ef362bbc90cddf7c156dd7.zip
Doxygen-adff8506a1c654db63ef362bbc90cddf7c156dd7.tar.gz
Doxygen-adff8506a1c654db63ef362bbc90cddf7c156dd7.tar.bz2
Release-1.6.3-20100418
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 1bb85f2..f6213cd 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2255,6 +2255,16 @@ QCString fileToString(const char *name,bool filter)
QCString dateToString(bool includeTime)
{
+ QDateTime current = QDateTime::currentDateTime();
+ return theTranslator->trDateTime(current.date().year(),
+ current.date().month(),
+ current.date().day(),
+ current.date().dayOfWeek(),
+ current.time().hour(),
+ current.time().minute(),
+ current.time().second(),
+ includeTime);
+#if 0
if (includeTime)
{
return convertToQCString(QDateTime::currentDateTime().toString());
@@ -2269,6 +2279,7 @@ QCString dateToString(bool includeTime)
d.year());
return result;
}
+#endif
}
QCString yearToString()
@@ -3684,7 +3695,7 @@ bool getDefs(const QCString &scName,const QCString &memberName,
//printf("mName=%s mn=%p\n",mName.data(),mn);
if (!forceEmptyScope && mn && !(scopeName.isEmpty() && mScope.isEmpty()))
{
- //printf(" >member name found\n");
+ //printf(" >member name '%s' found\n",mName.data());
int scopeOffset=scopeName.length();
do
{
@@ -3695,13 +3706,13 @@ bool getDefs(const QCString &scName,const QCString &memberName,
}
else if (!mScope.isEmpty())
{
- className=mScope.copy();
+ className=mScope;
}
- //printf("Trying class scope %s\n",className.data());
- ClassDef *fcd=0;
+ ClassDef *fcd=getResolvedClass(Doxygen::globalScope,0,className);
+ //printf("Trying class scope %s: %p\n",className.data(),fcd);
// todo: fill in correct fileScope!
- if ((fcd=getResolvedClass(Doxygen::globalScope,0,className)) && // is it a documented class
+ if (fcd && // is it a documented class
fcd->isLinkable()
)
{