summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-01-09 19:14:27 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-10 01:44:35 +0100
commitacdd5fecb7075a4857f04f655da157b5ee1088c7 (patch)
treee9032a3b6ddeb82fcf0e085e0f7a7730b9eae449 /tests/auto
parent4fe9ff1001419d3e93a842ceed827782e8c34deb (diff)
Avoid using 'check' as an identifier.
Avoids conflict with macro on Mac OS. Change-Id: I79d78283b45bc97032d6a94139ee750ec01e9c0a Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 2ac739e399..c00d42bacd 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -855,7 +855,7 @@ public:
void cleanupPage() { ++cleanup; QWizardPage::cleanupPage(); }
bool validatePage() { ++validate; return QWizardPage::validatePage(); }
- bool check(int init, int cleanup)
+ bool sanityCheck(int init, int cleanup)
{
return init == this->init
&& cleanup == this->cleanup
@@ -868,9 +868,9 @@ public:
};
#define CHECK_PAGE_INIT(i0, c0, i1, c1, i2, c2) \
- QVERIFY(page0->check((i0), (c0))); \
- QVERIFY(page1->check((i1), (c1))); \
- QVERIFY(page2->check((i2), (c2)));
+ QVERIFY(page0->sanityCheck((i0), (c0))); \
+ QVERIFY(page1->sanityCheck((i1), (c1))); \
+ QVERIFY(page2->sanityCheck((i2), (c2)));
void tst_QWizard::setOption_IndependentPages()
{