diff options
author | Max Horn | 2006-03-28 09:42:54 +0000 |
---|---|---|
committer | Max Horn | 2006-03-28 09:42:54 +0000 |
commit | 9f93e5bb81a54a98eb7957209662f152e2962679 (patch) | |
tree | ffd439f7aa7347bd7ba806c2131be458a7112ef1 /test/common | |
parent | 950c3451a2dbadffa6437e98a20eb3a4163216e2 (diff) | |
download | scummvm-rg350-9f93e5bb81a54a98eb7957209662f152e2962679.tar.gz scummvm-rg350-9f93e5bb81a54a98eb7957209662f152e2962679.tar.bz2 scummvm-rg350-9f93e5bb81a54a98eb7957209662f152e2962679.zip |
Renamed various container isEmpty() methods to empty() to match STL conventions
svn-id: r21472
Diffstat (limited to 'test/common')
-rw-r--r-- | test/common/array.h | 8 | ||||
-rw-r--r-- | test/common/list.h | 8 | ||||
-rw-r--r-- | test/common/map.h | 8 | ||||
-rw-r--r-- | test/common/str.h | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/test/common/array.h b/test/common/array.h index 65f5bff490..f83c3bf0ea 100644 --- a/test/common/array.h +++ b/test/common/array.h @@ -6,15 +6,15 @@ class ArrayTestSuite : public CxxTest::TestSuite { public: - void test_isEmpty_clear( void ) + void test_empty_clear( void ) { Common::Array<int> array; - TS_ASSERT( array.isEmpty() ); + TS_ASSERT( array.empty() ); array.push_back(17); array.push_back(33); - TS_ASSERT( !array.isEmpty() ); + TS_ASSERT( !array.empty() ); array.clear(); - TS_ASSERT( array.isEmpty() ); + TS_ASSERT( array.empty() ); } void test_iterator( void ) diff --git a/test/common/list.h b/test/common/list.h index 3026b204c5..41600f3f29 100644 --- a/test/common/list.h +++ b/test/common/list.h @@ -6,15 +6,15 @@ class ListTestSuite : public CxxTest::TestSuite { public: - void test_isEmpty_clear( void ) + void test_empty_clear( void ) { Common::List<int> list; - TS_ASSERT( list.isEmpty() ); + TS_ASSERT( list.empty() ); list.push_back(17); list.push_back(33); - TS_ASSERT( !list.isEmpty() ); + TS_ASSERT( !list.empty() ); list.clear(); - TS_ASSERT( list.isEmpty() ); + TS_ASSERT( list.empty() ); } void test_iterator( void ) diff --git a/test/common/map.h b/test/common/map.h index c332f0931e..00e5f6c9f6 100644 --- a/test/common/map.h +++ b/test/common/map.h @@ -6,15 +6,15 @@ class MapTestSuite : public CxxTest::TestSuite { public: - void test_isEmpty_clear( void ) + void test_empty_clear( void ) { Common::Map<int, int> map; - TS_ASSERT( map.isEmpty() ); + TS_ASSERT( map.empty() ); map[0] = 17; map[1] = 33; - TS_ASSERT( !map.isEmpty() ); + TS_ASSERT( !map.empty() ); map.clear(); - TS_ASSERT( map.isEmpty() ); + TS_ASSERT( map.empty() ); } void test_contains( void ) { diff --git a/test/common/str.h b/test/common/str.h index 66d891295e..b3977576b6 100644 --- a/test/common/str.h +++ b/test/common/str.h @@ -6,12 +6,12 @@ class StringTestSuite : public CxxTest::TestSuite { public: - void test_isEmpty_clear( void ) + void test_empty_clear( void ) { Common::String str("test"); - TS_ASSERT( !str.isEmpty() ); + TS_ASSERT( !str.empty() ); str.clear(); - TS_ASSERT( str.isEmpty() ); + TS_ASSERT( str.empty() ); } void test_lastChar( void ) |