Add comparison operators also to subclasses

Compiler would for some reason choose operator bool()
instead when comparing subclasses of QScopedPointer.

1 files changed, 32 insertions, 2 deletions

diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h
index 769ad10..344964b 100644
--- a/src/corelib/tools/qscopedpointer.h
+++ b/src/corelib/tools/qscopedpointer.h
@@ -113,12 +113,12 @@ public:
         return d;
     }
 
-    inline bool operator==(const QScopedPointer<T> &other) const
+    inline bool operator==(const QScopedPointer<T, Cleanup> &other) const
     {
         return d == other.d;
     }
 
-    inline bool operator!=(const QScopedPointer<T> &other) const
+    inline bool operator!=(const QScopedPointer<T, Cleanup> &other) const
     {
         return d != other.d;
     }
@@ -194,6 +194,16 @@ public:
         return this->d[i];
     }
 
+    inline bool operator==(const QScopedArrayPointer<T, Cleanup> &other) const
+    {
+        return this->d == other.d;
+    }
+
+    inline bool operator!=(const QScopedArrayPointer<T, Cleanup> &other) const
+    {
+        return this->d != other.d;
+    }
+
 private:
     Q_DISABLE_COPY(QScopedArrayPointer)
 };
@@ -214,6 +224,16 @@ public:
         return this->d;
     }
 
+    inline bool operator==(const QCustomScopedPointer<T, Cleanup> &other) const
+    {
+        return this->d == other.d;
+    }
+
+    inline bool operator!=(const QCustomScopedPointer<T, Cleanup> &other) const
+    {
+        return this->d != other.d;
+    }
+
 private:
     Q_DISABLE_COPY(QCustomScopedPointer)
 };
@@ -258,6 +278,16 @@ public:
         QScopedPointerSharedDeleter<T>::cleanup(oldD);
     }
 
+    inline bool operator==(const QScopedSharedPointer<T> &other) const
+    {
+        return this->d == other.d;
+    }
+
+    inline bool operator!=(const QScopedSharedPointer<T> &other) const
+    {
+        return this->d != other.d;
+    }
+
 private:
     Q_DISABLE_COPY(QScopedSharedPointer)
 };