From b80829ce593b42f4b576bd288991bf698bef6ca7 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 10 Jan 2019 13:19:43 +1000
Subject: [PATCH] Remove leftover QObject inheritance

---
 .../validity/qgsabstractvaliditycheck.sip.in           |  8 +++-----
 src/app/layout/qgslayoutvaliditychecks.cpp             |  4 ++--
 src/core/validity/qgsabstractvaliditycheck.h           | 10 +++-------
 src/core/validity/qgsvaliditycheckregistry.cpp         |  8 ++++----
 src/core/validity/qgsvaliditycheckregistry.h           |  1 -
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/python/core/auto_generated/validity/qgsabstractvaliditycheck.sip.in b/python/core/auto_generated/validity/qgsabstractvaliditycheck.sip.in
index c353f249780..8fd21487fac 100644
--- a/python/core/auto_generated/validity/qgsabstractvaliditycheck.sip.in
+++ b/python/core/auto_generated/validity/qgsabstractvaliditycheck.sip.in
@@ -41,8 +41,7 @@ result will be communicated to users, but not prevent them from proceeding.
 
 };
 
-
-class QgsAbstractValidityCheck : QObject
+class QgsAbstractValidityCheck
 {
 %Docstring
 Abstract base class for individual validity checks.
@@ -77,6 +76,8 @@ Checks must be registered in the application's :py:class:`QgsValidityCheckRegist
       TypeUserCheck,
     };
 
+    virtual ~QgsAbstractValidityCheck();
+
     virtual QgsAbstractValidityCheck *create() const = 0 /Factory/;
 %Docstring
 Creates a new instance of the check and returns it.
@@ -126,9 +127,6 @@ The ``context`` argument gives the wider in which the check is being run.
 
 };
 
-
-
-
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
diff --git a/src/app/layout/qgslayoutvaliditychecks.cpp b/src/app/layout/qgslayoutvaliditychecks.cpp
index 515b9020985..03ff99ae621 100644
--- a/src/app/layout/qgslayoutvaliditychecks.cpp
+++ b/src/app/layout/qgslayoutvaliditychecks.cpp
@@ -51,9 +51,9 @@ bool QgsLayoutScaleBarValidityCheck::prepareCheck( const QgsValidityCheckContext
     {
       QgsValidityCheckResult res;
       res.type = QgsValidityCheckResult::Warning;
-      res.title = tr( "Scalebar is not linked to a map" );
+      res.title = QObject::tr( "Scalebar is not linked to a map" );
       const QString name = bar->displayName().toHtmlEscaped();
-      res.detailedDescription = tr( "The scalebar “%1” is not linked to a map item. This scale will be misleading." ).arg( name );
+      res.detailedDescription = QObject::tr( "The scalebar “%1” is not linked to a map item. This scale will be misleading." ).arg( name );
       mResults.append( res );
     }
   }
diff --git a/src/core/validity/qgsabstractvaliditycheck.h b/src/core/validity/qgsabstractvaliditycheck.h
index 390feb6bb4f..f5ac04339a2 100644
--- a/src/core/validity/qgsabstractvaliditycheck.h
+++ b/src/core/validity/qgsabstractvaliditycheck.h
@@ -66,9 +66,6 @@ class CORE_EXPORT QgsValidityCheckResult
 
 };
 
-// note -- this is a QObject so that we can store just weak pointers to it -- avoiding crashes
-// if a Python plugin doesn't correctly remove checks on plugin unload
-
 /**
  * \class QgsAbstractValidityCheck
  * \ingroup core
@@ -92,7 +89,7 @@ class CORE_EXPORT QgsValidityCheckResult
  *
  * \since QGIS 3.6
  */
-class CORE_EXPORT QgsAbstractValidityCheck : public QObject
+class CORE_EXPORT QgsAbstractValidityCheck
 {
 
   public:
@@ -104,6 +101,8 @@ class CORE_EXPORT QgsAbstractValidityCheck : public QObject
       TypeUserCheck = 10000, //!< Starting point for custom user types
     };
 
+    virtual ~QgsAbstractValidityCheck() = default;
+
     /**
      * Creates a new instance of the check and returns it.
      */
@@ -158,7 +157,4 @@ class CORE_EXPORT QgsAbstractValidityCheck : public QObject
 
 };
 
-
-
-
 #endif // QGSABSTRACTVALIDITYCHECK_H
diff --git a/src/core/validity/qgsvaliditycheckregistry.cpp b/src/core/validity/qgsvaliditycheckregistry.cpp
index da863b107ab..7ed2ae07561 100644
--- a/src/core/validity/qgsvaliditycheckregistry.cpp
+++ b/src/core/validity/qgsvaliditycheckregistry.cpp
@@ -28,10 +28,10 @@ QgsValidityCheckRegistry::~QgsValidityCheckRegistry()
 QList<const QgsAbstractValidityCheck *> QgsValidityCheckRegistry::checks() const
 {
   QList<const QgsAbstractValidityCheck *> results;
-  for ( const QPointer< QgsAbstractValidityCheck > &check : mChecks )
+  for ( const QgsAbstractValidityCheck *check : mChecks )
   {
     if ( check )
-      results.append( check.data() );
+      results.append( check );
   }
   return results;
 }
@@ -39,10 +39,10 @@ QList<const QgsAbstractValidityCheck *> QgsValidityCheckRegistry::checks() const
 QList<const QgsAbstractValidityCheck *> QgsValidityCheckRegistry::checks( int type ) const
 {
   QList< const QgsAbstractValidityCheck * > results;
-  for ( const QPointer< QgsAbstractValidityCheck > &check : mChecks )
+  for ( const QgsAbstractValidityCheck *check : mChecks )
   {
     if ( check && check->checkType() == type )
-      results << check.data();
+      results << check;
   }
   return results;
 }
diff --git a/src/core/validity/qgsvaliditycheckregistry.h b/src/core/validity/qgsvaliditycheckregistry.h
index 9c94fc2f0bb..95b17c71a33 100644
--- a/src/core/validity/qgsvaliditycheckregistry.h
+++ b/src/core/validity/qgsvaliditycheckregistry.h
@@ -19,7 +19,6 @@
 #include "qgis_sip.h"
 #include "qgsabstractvaliditycheck.h"
 #include <QList>
-#include <QPointer>
 #include <memory>
 #include <vector>