diff options
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/exceptionsafety_objects/oomsimulator.h | 6 | ||||
-rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 2 | ||||
-rw-r--r-- | tests/auto/other/qfocusevent/tst_qfocusevent.cpp | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/other/exceptionsafety_objects/oomsimulator.h b/tests/auto/other/exceptionsafety_objects/oomsimulator.h index 15500f590b..15b13a48a7 100644 --- a/tests/auto/other/exceptionsafety_objects/oomsimulator.h +++ b/tests/auto/other/exceptionsafety_objects/oomsimulator.h @@ -173,17 +173,17 @@ static int qCrtAllocHook(int allocType, void * /*userData*/, size_t /*size*/, const unsigned char * /*filename*/, int /*lineNumber*/) { if (blockType == _CRT_BLOCK) - return TRUE; // ignore allocations from the C library + return true; // ignore allocations from the C library switch (allocType) { case _HOOK_ALLOC: case _HOOK_REALLOC: ++mallocCount; if (mallocFailActive && --mallocFailIndex < 0) - return FALSE; // simulate OOM + return false; // simulate OOM } - return TRUE; + return true; } static struct QCrtDebugRegistrator diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 9b14fb9e22..dd81fba5b8 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -1060,7 +1060,7 @@ void tst_QAccessibility::buttonTest() // tristate checkbox QCheckBox tristate("Tristate!", &window); - tristate.setTristate(TRUE); + tristate.setTristate(true); // radiobutton QRadioButton radio("Radio me!", &window); diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp index a0803b029c..cf7aada811 100644 --- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp @@ -73,14 +73,14 @@ protected: QLineEdit::focusInEvent( e ); focusInEventReason = e->reason(); focusInEventGotFocus = e->gotFocus(); - focusInEventRecieved = TRUE; + focusInEventRecieved = true; } void focusOutEvent( QFocusEvent* e ) { QLineEdit::focusOutEvent( e ); focusOutEventReason = e->reason(); focusOutEventLostFocus = !e->gotFocus(); - focusOutEventRecieved = TRUE; + focusOutEventRecieved = true; } }; @@ -173,17 +173,17 @@ void tst_QFocusEvent::initWidget() // The first lineedit should have focus QVERIFY( childFocusWidgetOne->hasFocus() ); - childFocusWidgetOne->focusInEventRecieved = FALSE; - childFocusWidgetOne->focusInEventGotFocus = FALSE; + childFocusWidgetOne->focusInEventRecieved = false; + childFocusWidgetOne->focusInEventGotFocus = false; childFocusWidgetOne->focusInEventReason = -1; - childFocusWidgetOne->focusOutEventRecieved = FALSE; - childFocusWidgetOne->focusOutEventLostFocus = FALSE; + childFocusWidgetOne->focusOutEventRecieved = false; + childFocusWidgetOne->focusOutEventLostFocus = false; childFocusWidgetOne->focusOutEventReason = -1; - childFocusWidgetTwo->focusInEventRecieved = FALSE; - childFocusWidgetTwo->focusInEventGotFocus = FALSE; + childFocusWidgetTwo->focusInEventRecieved = false; + childFocusWidgetTwo->focusInEventGotFocus = false; childFocusWidgetTwo->focusInEventReason = -1; - childFocusWidgetTwo->focusOutEventRecieved = FALSE; - childFocusWidgetTwo->focusOutEventLostFocus = FALSE; + childFocusWidgetTwo->focusOutEventRecieved = false; + childFocusWidgetTwo->focusOutEventLostFocus = false; childFocusWidgetTwo->focusOutEventReason = -1; } |