issue #10897 Incorrect warning about Objective-C Category method not being documented

Author: doxygen

src/classdef.cpp

@@ -3793,6 +3793,7 @@ void ClassDefImpl::mergeMembers()
  */
 void ClassDefImpl::mergeCategory(ClassDef *cat)
 {
+  AUTO_TRACE();
   ClassDefMutable *category = toClassDefMutable(cat);
   if (category)
   {
@@ -3836,7 +3837,7 @@ void ClassDefImpl::mergeCategory(ClassDef *cat)
       MemberNameInfo *dstMni=dstMnd.find(srcMni->memberName());
       if (dstMni) // method is already defined in the class
       {
-        //printf("Existing member %s\n",srcMni->memberName());
+        AUTO_TRACE_ADD("Existing member {}",srcMni->memberName());
         const auto &dstMi = dstMni->front();
         const auto &srcMi = srcMni->front();
         if (srcMi && dstMi)
@@ -3854,7 +3855,7 @@ void ClassDefImpl::mergeCategory(ClassDef *cat)
       }
       else // new method name
       {
-        //printf("New member %s\n",srcMni->memberName());
+        AUTO_TRACE_ADD("New member {}",srcMni->memberName());
         // create a deep copy of the list
         MemberNameInfo *newMni = dstMnd.add(srcMni->memberName());
 
@@ -3868,7 +3869,7 @@ void ClassDefImpl::mergeCategory(ClassDef *cat)
           if (newMd)
           {
             auto mmd = toMemberDefMutable(newMd.get());
-            //printf("Copying member %s\n",qPrint(mi->memberDef->name()));
+            AUTO_TRACE_ADD("Copying member {}",mmd->name());
             mmd->moveTo(this);
 
             auto newMi=std::make_unique<MemberInfo>(newMd.get(),prot,mi->virt(),mi->inherited(),mi->virtualBaseClass());

src/definition.cpp

@@ -288,6 +288,15 @@ DefinitionImpl::DefinitionImpl(const DefinitionImpl &d)
   if (m_impl->isSymbol) addToMap(m_impl->name,m_impl->def);
 }
 
+DefinitionImpl &DefinitionImpl::operator=(const DefinitionImpl &other)
+{
+  if (this!=&other)
+  {
+    m_impl = std::make_unique<DefinitionImpl::IMPL>(*other.m_impl);
+  }
+  return *this;
+}
+
 DefinitionImpl::~DefinitionImpl()
 {
   if (m_impl->isSymbol)

src/definitionimpl.h

@@ -153,8 +153,8 @@ class DefinitionMixin : public Base
         const QCString &defFileName,int defLine,int defColumn,
         const QCString &name,const char *b=nullptr,const char *d=nullptr,
         bool isSymbol=TRUE) : m_impl(this,defFileName,defLine,defColumn,name,b,d,isSymbol) {}
-    DefinitionMixin(const DefinitionMixin &) = default;
-    DefinitionMixin &operator=(const DefinitionMixin &) = default;
+    DefinitionMixin(const DefinitionMixin &other) : Base(other), m_impl(other.m_impl) {}
+    DefinitionMixin &operator=(const DefinitionMixin &other) { if (this!=&other) { m_impl = other.m_impl; }; return *this; }
     DefinitionMixin(DefinitionMixin &&) = delete;
     DefinitionMixin &operator=(DefinitionMixin &&) = delete;
    ~DefinitionMixin() override = default;

src/doxygen.cpp

@@ -7926,6 +7926,7 @@ static void createTemplateInstanceMembers()
 
 static void mergeCategories()
 {
+  AUTO_TRACE();
   // merge members of categories into the class they extend
   for (const auto &cd : *Doxygen::classLinkedMap)
   {
@@ -7936,8 +7937,7 @@ static void mergeCategories()
       ClassDefMutable *baseClass=toClassDefMutable(Doxygen::classLinkedMap->find(baseName));
       if (baseClass)
       {
-        //printf("*** merging members of category %s into %s\n",
-        //    qPrint(cd->name()),qPrint(baseClass->name()));
+        AUTO_TRACE_ADD("merging members of category {} into {}",cd->name(),baseClass->name());
         baseClass->mergeCategory(cd.get());
       }
     }

src/memberdef.cpp

@@ -1432,7 +1432,9 @@ std::unique_ptr<MemberDef> MemberDefImpl::deepCopy() const
   std::unique_ptr<MemberDefImpl> result(new MemberDefImpl(
         getDefFileName(),getDefLine(),getDefColumn(),m_type,localName(),m_args,m_exception,
         m_prot,m_virt,m_stat,m_related,m_mtype,m_tArgList,m_defArgList,m_metaData));
-  // first copy everything by reference
+  // first copy base members
+  result->DefinitionMixin<MemberDefMutable>::operator=(*this);
+  // then copy other members
   result->m_typeConstraints                = m_typeConstraints                ;
   result->m_declArgList                    = m_declArgList                    ;
   result->m_classDef                       = m_classDef                       ;