From c04abc3fb4fe00220c2fe6d999598d4c0dd351d9 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 9 May 2011 17:34:45 +1000 Subject: [PATCH] Remove Q_ASSERT from QVariant autotest I missed one Q_ASSERT in the previous commit. Also changing to use Q_FUNC_INFO instead of hard-coded function names in the warning messages. Change-Id: I0ff5b2b2cda02597836beb5d2811fa8dd2a344ab Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 74a4aad171b39018d596b99684286b9426a091a5) --- tests/auto/qvariant/tst_qvariant.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 69855a1..492d0df 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -3241,19 +3241,22 @@ struct MyData MyData() : ptr(this) {} ~MyData() { - if (ptr != this) qWarning("MyData::~MyData(): object has moved"); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + } + MyData(const MyData& o) : ptr(this) + { + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); } - MyData(const MyData& o) : ptr(this) { Q_ASSERT(o.ptr == &o); } MyData &operator=(const MyData &o) { - if (ptr != this) qWarning("MyData::operator=(): object has moved"); - if (o.ptr != &o) qWarning("MyData::operator=(): other object has moved"); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); return *this; } bool operator==(const MyData &o) const { - if (ptr != this) qWarning("MyData::operator==(): object has moved"); - if (o.ptr != &o) qWarning("MyData::operator==(): other object has moved"); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); return true; } }; -- 2.7.4