summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-05-11 08:31:02 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-08-02 12:36:44 (GMT)
commit963e0adfd76e6a59ace5e7318f948632322b1e51 (patch)
tree273be713a69dcc98602af9d1b143de34bdcff431
parent47bc520ac8c0dde310dcb1999c622c591b373ffc (diff)
downloadDoxygen-963e0adfd76e6a59ace5e7318f948632322b1e51.zip
Doxygen-963e0adfd76e6a59ace5e7318f948632322b1e51.tar.gz
Doxygen-963e0adfd76e6a59ace5e7318f948632322b1e51.tar.bz2
Minor fixes to the template context
-rw-r--r--src/context.cpp8
-rw-r--r--src/template.cpp1
2 files changed, 4 insertions, 5 deletions
diff --git a/src/context.cpp b/src/context.cpp
index 541cb74..9bbed6a 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -4856,7 +4856,7 @@ class NamespaceTreeContext::Private : public PropertyMapper
public:
TemplateVariant tree() const
{
- return TemplateVariant(&m_namespaceTree);
+ return m_namespaceTree.get();
}
TemplateVariant fileName() const
{
@@ -5110,7 +5110,7 @@ class FileTreeContext::Private : public PropertyMapper
}
TemplateVariant tree() const
{
- return TemplateVariant(&m_dirFileTree);
+ return m_dirFileTree.get();
}
TemplateVariant fileName() const
{
@@ -5570,7 +5570,7 @@ class ModuleTreeContext::Private : public PropertyMapper
public:
TemplateVariant tree() const
{
- return TemplateVariant(&m_moduleList);
+ return m_moduleList.get();
}
TemplateVariant fileName() const
{
@@ -5706,7 +5706,7 @@ class ExampleListContext::Private : public PropertyMapper
public:
TemplateVariant items() const
{
- return TemplateVariant(&m_pageList);
+ return m_pageList.get();
}
TemplateVariant fileName() const
{
diff --git a/src/template.cpp b/src/template.cpp
index b76d8f3..4b755e3 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -3214,7 +3214,6 @@ class TemplateNodeCreate : public TemplateNodeCreator<TemplateNodeCreate>
{
QCString templateFile = m_templateExpr->resolve(c).toString();
QCString outputFile = m_fileExpr->resolve(c).toString();
- printf("TemplateNodeCreate file='%s' template='%s'\n",outputFile.data(),templateFile.data());
if (templateFile.isEmpty())
{
ci->warn(m_templateName,m_line,"empty template name parameter for create command\n");