From 001fa6fdcc415f5fbe25774e2391290440e6c21b Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Tue, 3 Aug 2010 11:58:55 -0300 Subject: Revert "Created operator != or __ne__ in Point class, to avoid tests errors with Python 2.7." This reverts commit ce4b5f535f43bd2ff800b709f88c6f9c5be68003. The unittest.assertNotEqual method has changed in Python 2.7 to use the "!=" operator. The Point class was intentionally left without a "!=" to test if Shiboken would raise a NotImplementedError exception. This commit will be reverted and the tests using Point and assertNotEqual must be changed to avoid the possible usage of "!=". --- tests/libsample/point.cpp | 6 ------ tests/libsample/point.h | 1 - 2 files changed, 7 deletions(-) (limited to 'tests') diff --git a/tests/libsample/point.cpp b/tests/libsample/point.cpp index 4c527b3a0..0b6540202 100644 --- a/tests/libsample/point.cpp +++ b/tests/libsample/point.cpp @@ -86,12 +86,6 @@ Point::operator+=(Point &other) return *this; } -bool -Point::operator!=(const Point &other) -{ - return (m_x != other.m_x) || (m_y != other.m_y); -} - Point& Point::operator-=(Point &other) { diff --git a/tests/libsample/point.h b/tests/libsample/point.h index 04eb4e195..a81750391 100644 --- a/tests/libsample/point.h +++ b/tests/libsample/point.h @@ -74,7 +74,6 @@ public: Point& operator+=(Point &other); Point& operator-=(Point &other); - bool operator!=(const Point &other); void show(); -- cgit v1.2.3