diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-12 13:40:27 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-12 13:40:27 +0200 |
commit | 4497f2a75480df320cd78680d26971bba42e7421 (patch) | |
tree | 9933706166751f23c75bcd7ec6915e6842dbc0eb | |
parent | c9e541d3ad9ff4b3d1847ddb48190e373e033c92 (diff) |
don't overload operator<(const QVariant& lhs, const QVariant& rhs)
it introduces ambiguity
Change-Id: I55bf26acbafbb4e582cee19f18237a927b692c4e
-rw-r--r-- | src/client/qjsondbmodelutils_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qjsondbmodelutils_p.cpp b/src/client/qjsondbmodelutils_p.cpp index 9f29e01..7ae2bc3 100644 --- a/src/client/qjsondbmodelutils_p.cpp +++ b/src/client/qjsondbmodelutils_p.cpp @@ -94,7 +94,7 @@ QVariant SortingKey::value() const return ret; } -static bool operator<(const QVariant& lhs, const QVariant& rhs) +static bool lessThan(const QVariant& lhs, const QVariant& rhs) { if ((lhs.type() == QVariant::Int) && (rhs.type() == QVariant::Int)) return lhs.toInt() < rhs.toInt(); @@ -134,7 +134,7 @@ bool SortingKey::operator <(const SortingKey &rhs) const return (dLhs->directions[i] ? (cmp < 0) : (cmp > 0)); } } else if (lhsValue != rhsValue) { - return (dLhs->directions[i] ? lhsValue < rhsValue : rhsValue < lhsValue); + return (dLhs->directions[i] ? lessThan(lhsValue, rhsValue) : lessThan(rhsValue, lhsValue)); } } int cmp = memcmp(dLhs->uuid.constData(), dRhs->uuid.constData(), qMin(dLhs->uuid.size(), dRhs->uuid.size())); |