From acdd5fecb7075a4857f04f655da157b5ee1088c7 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 9 Jan 2012 19:14:27 +0100 Subject: [PATCH] Avoid using 'check' as an identifier. Avoids conflict with macro on Mac OS. Change-Id: I79d78283b45bc97032d6a94139ee750ec01e9c0a Reviewed-by: hjk --- tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp | 8 ++++---- 1 file 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 2ac739e..c00d42b 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() { -- 2.7.4