projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace obsolete safe bool idiom with explicit operator bool
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ItemView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
index
da5ce83
..
e127395
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
@@
-362,7
+362,7
@@
int UtcDaliItemViewActivateLayoutAndGetActiveLayout(void)
DALI_TEST_CHECK(view.GetLayoutCount() == 3);
// Check there is no active layout at the moment
DALI_TEST_CHECK(view.GetLayoutCount() == 3);
// Check there is no active layout at the moment
- DALI_TEST_CHECK(
view.GetActiveLayout() == NULL
);
+ DALI_TEST_CHECK(
!view.GetActiveLayout()
);
// Activate the depth layout
Vector3 stageSize(application.GetScene().GetSize());
// Activate the depth layout
Vector3 stageSize(application.GetScene().GetSize());
@@
-399,7
+399,7
@@
int UtcDaliItemViewDeactivateCurrentLayout(void)
view.AddLayout(*gridLayout);
// Check there is no active layout at the moment
view.AddLayout(*gridLayout);
// Check there is no active layout at the moment
- DALI_TEST_CHECK(
view.GetActiveLayout() == NULL
);
+ DALI_TEST_CHECK(
!view.GetActiveLayout()
);
// Activate the grid layout
Vector3 stageSize(application.GetScene().GetSize());
// Activate the grid layout
Vector3 stageSize(application.GetScene().GetSize());
@@
-412,7
+412,7
@@
int UtcDaliItemViewDeactivateCurrentLayout(void)
view.DeactivateCurrentLayout();
// Check there is no active layout at the moment
view.DeactivateCurrentLayout();
// Check there is no active layout at the moment
- DALI_TEST_CHECK(
view.GetActiveLayout() == NULL
);
+ DALI_TEST_CHECK(
!view.GetActiveLayout()
);
END_TEST;
}
END_TEST;
}