Remove leftover QObject inheritance

nyalldawson · nyalldawson · commit b80829ce593b · 2019-01-11T09:51:04.000+10:00
diff --git 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
@@ -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
@@ -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
@@ -28,21 +28,21 @@ 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;
 }
 
 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
@@ -19,7 +19,6 @@
 #include "qgis_sip.h"
 #include "qgsabstractvaliditycheck.h"
 #include <QList>
-#include <QPointer>
 #include <memory>
 #include <vector>
 

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ bool QgsLayoutScaleBarValidityCheck::prepareCheck( const QgsValidityCheckContext`
`51`	`51`	`{`
`52`	`52`	`QgsValidityCheckResult res;`
`53`	`53`	`res.type = QgsValidityCheckResult::Warning;`
`54`		`- res.title = tr( "Scalebar is not linked to a map" );`
	`54`	`+ res.title = QObject::tr( "Scalebar is not linked to a map" );`
`55`	`55`	`const QString name = bar->displayName().toHtmlEscaped();`
`56`		`- res.detailedDescription = tr( "The scalebar “%1” is not linked to a map item. This scale will be misleading." ).arg( name );`
	`56`	`+ res.detailedDescription = QObject::tr( "The scalebar “%1” is not linked to a map item. This scale will be misleading." ).arg( name );`
`57`	`57`	`mResults.append( res );`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,21 +28,21 @@ QgsValidityCheckRegistry::~QgsValidityCheckRegistry()`
`28`	`28`	`QList<const QgsAbstractValidityCheck *> QgsValidityCheckRegistry::checks() const`
`29`	`29`	`{`
`30`	`30`	`QList<const QgsAbstractValidityCheck *> results;`
`31`		`- for ( const QPointer< QgsAbstractValidityCheck > &check : mChecks )`
	`31`	`+ for ( const QgsAbstractValidityCheck *check : mChecks )`
`32`	`32`	`{`
`33`	`33`	`if ( check )`
`34`		`- results.append( check.data() );`
	`34`	`+ results.append( check );`
`35`	`35`	`}`
`36`	`36`	`return results;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`QList<const QgsAbstractValidityCheck *> QgsValidityCheckRegistry::checks( int type ) const`
`40`	`40`	`{`
`41`	`41`	`QList< const QgsAbstractValidityCheck * > results;`
`42`		`- for ( const QPointer< QgsAbstractValidityCheck > &check : mChecks )`
	`42`	`+ for ( const QgsAbstractValidityCheck *check : mChecks )`
`43`	`43`	`{`
`44`	`44`	`if ( check && check->checkType() == type )`
`45`		`- results << check.data();`
	`45`	`+ results << check;`
`46`	`46`	`}`
`47`	`47`	`return results;`
`48`	`48`	`}`