From 2f5d90404ace8e5bf00b7976d18624e71ebebe2b Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Tue, 28 Dec 2010 15:24:11 -0200 Subject: Fix bug#495 - "Broken rich compare operators if they use an object-type as parameter" --- tests/libsample/CMakeLists.txt | 1 + tests/libsample/objecttypeoperators.cpp | 43 ++++++++++++++++++++++++++++ tests/libsample/objecttypeoperators.h | 50 +++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 tests/libsample/objecttypeoperators.cpp create mode 100644 tests/libsample/objecttypeoperators.h (limited to 'tests/libsample') diff --git a/tests/libsample/CMakeLists.txt b/tests/libsample/CMakeLists.txt index b6cd1b923..e1abe6a9b 100644 --- a/tests/libsample/CMakeLists.txt +++ b/tests/libsample/CMakeLists.txt @@ -19,6 +19,7 @@ multiple_derived.cpp objectmodel.cpp objecttype.cpp objecttypelayout.cpp +objecttypeoperators.cpp objectview.cpp overload.cpp overloadsort.cpp diff --git a/tests/libsample/objecttypeoperators.cpp b/tests/libsample/objecttypeoperators.cpp new file mode 100644 index 000000000..08c49b1a4 --- /dev/null +++ b/tests/libsample/objecttypeoperators.cpp @@ -0,0 +1,43 @@ +/* + * This file is part of the Shiboken Python Binding Generator project. + * + * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * + * Contact: PySide team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "objecttypeoperators.h" + +ObjectTypeOperators::ObjectTypeOperators(const std::string key) : m_key(key) +{ +} + +bool ObjectTypeOperators::operator==(const ObjectTypeOperators& other) const +{ + return m_key == other.m_key; +} + +bool ObjectTypeOperators::operator==(const std::string& other) const +{ + return m_key == other; +} + +const ObjectTypeOperators& ObjectTypeOperators::operator<(const ObjectTypeOperators& other) const +{ + return m_key < other.m_key ? *this : other; +} + diff --git a/tests/libsample/objecttypeoperators.h b/tests/libsample/objecttypeoperators.h new file mode 100644 index 000000000..1d65eb167 --- /dev/null +++ b/tests/libsample/objecttypeoperators.h @@ -0,0 +1,50 @@ +/* + * This file is part of the Shiboken Python Binding Generator project. + * + * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * + * Contact: PySide team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef OBJECTTYPEOPERATORS_H +#define OBJECTTYPEOPERATORS_H + +#include "libsamplemacros.h" +#include + +class LIBSAMPLE_API ObjectTypeOperators +{ +public: + ObjectTypeOperators(const std::string key); + + bool operator==(const ObjectTypeOperators& other) const; + bool operator==(const std::string& other) const; + const ObjectTypeOperators& operator<(const ObjectTypeOperators& other) const; + + // chaos! + virtual void operator>(const ObjectTypeOperators&) { m_key.append("operator>"); } + + std::string key() const { return m_key; } + +private: + std::string m_key; + + ObjectTypeOperators(ObjectTypeOperators&); + ObjectTypeOperators& operator=(ObjectTypeOperators&); +}; + +#endif // OBJECTTYPEOPERATORS_H -- cgit v1.2.3