Merge lp:~hjd/widelands/more-empty-fixes into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 6412
Proposed branch: lp:~hjd/widelands/more-empty-fixes
Merge into: lp:widelands
Diff against target: 47 lines (+4/-4)
3 files modified
src/logic/bob.cc (+1/-1)
src/logic/player.cc (+2/-2)
src/wui/game_tips.cc (+1/-1)
To merge this branch: bzr merge lp:~hjd/widelands/more-empty-fixes
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+113828@code.launchpad.net

Description of the change

When generating a new report for bug 986611, I noticed a few new places which used size() instead of empty().

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/bob.cc'
2--- src/logic/bob.cc 2012-04-07 09:19:29 +0000
3+++ src/logic/bob.cc 2012-07-07 17:10:26 +0000
4@@ -1178,7 +1178,7 @@
5 // See bug #537392 for more information:
6 // https://bugs.launchpad.net/widelands/+bug/537392
7 Bob & bob = get<Bob>();
8- if (!bob.m_stack.size() && !egbase().get_gametime())
9+ if (bob.m_stack.empty() && !egbase().get_gametime())
10 if (upcast(Game, game, &egbase())) {
11 bob.init_auto_task(*game);
12 }
13
14=== modified file 'src/logic/player.cc'
15--- src/logic/player.cc 2012-06-06 17:34:09 +0000
16+++ src/logic/player.cc 2012-07-07 17:10:26 +0000
17@@ -1008,7 +1008,7 @@
18 // as well of this change.
19 if (!m_team_player_uptodate)
20 update_team_players();
21- if (!forward && m_team_player.size()) {
22+ if (!forward && !m_team_player.empty()) {
23 for (uint8_t j = 0; j < m_team_player.size(); ++j)
24 m_team_player[j]->see_node(map, first_map_field, f, gametime, true);
25 }
26@@ -1040,7 +1040,7 @@
27 // as well of this change.
28 if (!m_team_player_uptodate)
29 update_team_players();
30- if (!forward && m_team_player.size()) {
31+ if (!forward && !m_team_player.empty()) {
32 for (uint8_t j = 0; j < m_team_player.size(); ++j)
33 m_team_player[j]->unsee_node(i, gametime, true);
34 }
35
36=== modified file 'src/wui/game_tips.cc'
37--- src/wui/game_tips.cc 2012-02-15 21:25:34 +0000
38+++ src/wui/game_tips.cc 2012-07-07 17:10:26 +0000
39@@ -54,7 +54,7 @@
40 for (uint8_t i = 0; i < names.size(); ++i)
41 load_tips(names[i]);
42
43- if (m_tips.size() > 0) {
44+ if (!m_tips.empty()) {
45 // add visualization only if any tips are loaded
46 m_progressWindow.add_visualization(this);
47 m_registered = true;

Subscribers

People subscribed via source and target branches

to status/vote changes: