AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Q_ASSERT from QVariant autotest

Browse Source 
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)
This commit is contained in:
Jason McDonald 2011-05-09 17:34:45 +10:00 committed by Rohan McGovern
parent 77ff187b92
commit c04abc3fb4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/qvariant/tst_qvariant.cpp
View File

@ -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;
}
};