Release-1.7.1-20100728

1 files changed, 16 insertions, 3 deletions

diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index aadb796..f221dd6 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -277,7 +277,7 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd,
   ol.pushGeneratorState();
   ol.disable(OutputGenerator::Html);
   ol.disable(OutputGenerator::Latex);
-  //if (!first) ol.writeString(" ");
+  //if (!first) ol.writeString(" ");
   if (!md->isObjCMethod()) ol.docify(")"); // end argument list
   ol.enableAll();
   if (htmlOn) ol.enable(OutputGenerator::Html);
@@ -2392,7 +2392,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
           "warning: parameters of member %s are not (all) documented",
           qPrint(qualifiedName()));
     }
-    if (!hasDocumentedReturnType() && !isDefine() && hasDocumentation())
+    if (!hasDocumentedReturnType() && isFunction() && hasDocumentation())
     {
       warn_doc_error(docFile(),docLine(),
           "warning: return type of member %s is not documented",
@@ -2807,6 +2807,13 @@ void MemberDef::_computeIsConstructor()
       m_isConstructorCached = name()=="__construct" ? 2 : 1;
       return;
     }
+    else if (name()=="__init__" && m_impl->fileDef &&
+             getLanguageFromFileName(m_impl->fileDef->name())==SrcLangExt_Python) 
+               // for Python
+    {
+      m_isConstructorCached=2; // TRUE
+      return;
+    }
     else // for other languages
     {
       QCString locName = m_impl->classDef->localName();
@@ -2849,6 +2856,12 @@ void MemberDef::_computeIsDestructor()
   {                // for PHP
     isDestructor = name()=="__destruct";
   }
+  else if (name()=="__del__" && m_impl->fileDef &&
+           getLanguageFromFileName(m_impl->fileDef->name())==SrcLangExt_Python) 
+               // for Python
+  {
+    isDestructor=TRUE;
+  }
   else // other languages
   {
     isDestructor =
@@ -2943,7 +2956,7 @@ void MemberDef::writeEnumDeclaration(OutputList &typeDecl,
             typeDecl.enable(OutputGenerator::Latex);
             typeDecl.lineBreak(); 
             typeDecl.disable(OutputGenerator::Latex);
-            typeDecl.writeString("  ");
+            typeDecl.writeString("  ");
             typeDecl.popGeneratorState();
           }