Add some more explicit destructors for shared obj typeinfo critical c…

…lasses refs #13563
MythTV · Jan 30, 2020 · c894ef6 · c894ef6
1 parent f011f2a
commit c894ef6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/mythtv/libs/libmythmetadata/metadatafactory.cpp b/mythtv/libs/libmythmetadata/metadatafactory.cpp
@@ -39,15 +39,41 @@ using std::max;
 QEvent::Type MetadataFactoryNoResult::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
+MetadataFactoryNoResult::~MetadataFactoryNoResult()
+{
+    if (m_result)
+    {
+        m_result->DecrRef();
+        m_result = nullptr;
+    }
+}
+
 QEvent::Type MetadataFactorySingleResult::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
+MetadataFactorySingleResult::~MetadataFactorySingleResult()
+{
+    if (m_result)
+    {
+        m_result->DecrRef();
+        m_result = nullptr;
+    }
+}
+
 QEvent::Type MetadataFactoryMultiResult::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
+MetadataFactoryMultiResult::~MetadataFactoryMultiResult()
+{
+}
+
 QEvent::Type MetadataFactoryVideoChanges::kEventType =
     (QEvent::Type) QEvent::registerEventType();
 
+MetadataFactoryVideoChanges::~MetadataFactoryVideoChanges()
+{
+}
+
 MetadataFactory::MetadataFactory(QObject *parent) :
     QObject(parent)
 {

diff --git a/mythtv/libs/libmythmetadata/metadatafactory.h b/mythtv/libs/libmythmetadata/metadatafactory.h
@@ -22,7 +22,7 @@ class META_PUBLIC MetadataFactoryMultiResult : public QEvent
   public:
     explicit MetadataFactoryMultiResult(const MetadataLookupList& res)
         : QEvent(kEventType), m_results(res) {}
-    ~MetadataFactoryMultiResult() override = default;
+    ~MetadataFactoryMultiResult() override;
 
     MetadataLookupList m_results;
 
@@ -40,14 +40,7 @@ class META_PUBLIC MetadataFactorySingleResult : public QEvent
             m_result->IncrRef();
         }
     }
-    ~MetadataFactorySingleResult() override
-    {
-        if (m_result)
-        {
-            m_result->DecrRef();
-            m_result = nullptr;
-        }
-    }
+    ~MetadataFactorySingleResult() override;
 
     MetadataLookup *m_result {nullptr};
 
@@ -65,14 +58,7 @@ class META_PUBLIC MetadataFactoryNoResult : public QEvent
             m_result->IncrRef();
         }
     }
-    ~MetadataFactoryNoResult() override
-    {
-        if (m_result)
-        {
-            m_result->DecrRef();
-            m_result = nullptr;
-        }
-    }
+    ~MetadataFactoryNoResult() override;
 
     MetadataLookup *m_result {nullptr};
 
@@ -87,7 +73,7 @@ class META_PUBLIC MetadataFactoryVideoChanges : public QEvent
                                 m_additions(std::move(adds)),
                                 m_moved(std::move(movs)),
                                 m_deleted(std::move(dels)) {}
-    ~MetadataFactoryVideoChanges() override = default;
+    ~MetadataFactoryVideoChanges() override;
 
     QList<int> m_additions; // newly added intids
     QList<int> m_moved; // intids moved to new filename