diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:13:16 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:13:16 +0100 |
commit | 01209b22bb7cbb6a18314530e1af8088d30b6bdd (patch) | |
tree | 18da2583fbd3d530d0c714790d4a9a3bdb0905ef | |
parent | 673c93dcfe367f71b21c4a26be023487e962bc8b (diff) | |
parent | 4eb51defe10f4b97a3b6107ed4080311c0876a65 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ifd8c88ba8084f0141238d0cefcf0a3aebba43edd
-rw-r--r-- | src/androidextras/jni/qandroidjniobject.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/androidextras/jni/qandroidjniobject.h b/src/androidextras/jni/qandroidjniobject.h index c411053..e828f80 100644 --- a/src/androidextras/jni/qandroidjniobject.h +++ b/src/androidextras/jni/qandroidjniobject.h @@ -159,10 +159,8 @@ public: private: friend bool operator==(const QAndroidJniObject &, const QAndroidJniObject &); friend bool operator!=(const QAndroidJniObject &, const QAndroidJniObject &); - template <typename T> friend bool operator!=(const QAndroidJniObject &, T); - template <typename T> friend bool operator==(const QAndroidJniObject &, T); - template <typename T> friend bool operator!=(T, const QAndroidJniObject &); - template <typename T> friend bool operator==(T, const QAndroidJniObject &); + template <typename T> friend bool operator!=(const QAndroidJniObject &, const QAndroidJniObject &); + template <typename T> friend bool operator==(const QAndroidJniObject &, const QAndroidJniObject &); QAndroidJniObject(const QJNIObjectPrivate &o); @@ -184,28 +182,16 @@ inline bool operator!=(const QAndroidJniObject &obj1, const QAndroidJniObject &o return !obj1.isSameObject(obj2); } -template <typename T> -inline bool operator==(const QAndroidJniObject &obj1, T obj2) -{ - return obj1.isSameObject(static_cast<jobject>(obj2)); -} - -template <typename T> -inline bool operator==(T obj1, const QAndroidJniObject &obj2) -{ - return obj2.isSameObject(static_cast<jobject>(obj1)); -} - -template <typename T> -inline bool operator!=(const QAndroidJniObject &obj1, T obj2) +template<typename T> +inline bool operator==(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) { - return !obj1.isSameObject(static_cast<jobject>(obj2)); + return obj1.isSameObject(obj2.object()); } template <typename T> -inline bool operator!=(T obj1, const QAndroidJniObject &obj2) +inline bool operator!=(const QAndroidJniObject &obj1, const QAndroidJniObject &obj2) { - return !obj2.isSameObject(static_cast<jobject>(obj1)); + return !obj1.isSameObject(obj2.object()); } QT_END_NAMESPACE |