widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/size-to-empty into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/size-to-empty/+merge/240323

(Note that the test suite for codecheck rules will currently fail. Unrelated to my changes, see bug 1388228 for details.)
-- 
https://code.launchpad.net/~hjd/widelands/size-to-empty/+merge/240323
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/size-to-empty into lp:widelands.

=== renamed file 'cmake/codecheck/rules/testing_size_greater_than_zero' => 'cmake/codecheck/rules/testing_size_compared_with_zero'
--- cmake/codecheck/rules/testing_size_greater_than_zero	2014-07-06 17:30:41 +0000
+++ cmake/codecheck/rules/testing_size_compared_with_zero	2014-10-31 19:11:49 +0000
@@ -8,7 +8,7 @@
 
 error_msg = "Do not use a.size() to check for emptiness, use a.empty() instead."
 
-regexp=r""" *[a-zA-Z_][a-zA-Z_0-9]* *(\.|->) *size *\(\) *> *0 *"""
+regexp=r""" *[a-zA-Z_][a-zA-Z_0-9]* *(\.|->) *size *\(\) *(> *0 *|== *0 *)"""
 
 forbidden = [
     '	something.size() > 0',
@@ -16,6 +16,7 @@
     '	something.size()  >  0  ',
     '	!(something.size() > 0)',
     '	something.size() > 0 && something_else',
+    '	something.size() == 0',
 ]
 
 allowed = [

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2014-10-17 09:18:58 +0000
+++ src/ai/defaultai.cc	2014-10-31 19:11:49 +0000
@@ -1769,7 +1769,7 @@
 	}
 
 	// now we rotate economies and flags to get one flag to go on with
-	if (economies.size() == 0) {
+	if (economies.empty()) {
 		return check_economies();
 	}
 
@@ -2405,7 +2405,7 @@
 	// remaining buildings without inputs and not supporting ones (fishers only left probably and
 	// huters)
 
-	if (site.bo->inputs_.size() == 0 && site.bo->production_hint_ < 0 &&
+	if (site.bo->inputs_.empty() && site.bo->production_hint_ < 0 &&
 	    site.site->can_start_working() && !site.bo->space_consumer_ &&
 	    site.site->get_statistics_percent() < 10 &&
 	    ((game().get_gametime() - site.built_time_) > 10 * 60 * 1000)) {

=== modified file 'src/network/nethost.cc'
--- src/network/nethost.cc	2014-10-28 08:16:53 +0000
+++ src/network/nethost.cc	2014-10-31 19:11:49 +0000
@@ -1273,7 +1273,7 @@
 		}
 
 	} else if (cmd == "pwd") {
-		if (m_password.size() == 0) {
+		if (m_password.empty()) {
 			c.msg = _("This server is not password protected!");
 			send(c);
 		} else if (arg1 != m_password) {
@@ -2043,7 +2043,7 @@
 	// The client gets its own initial data set.
 	client.playernum = UserSettings::none();
 	// only used at password protected dedicated server, but better initialize always
-	client.dedicated_access = m_is_dedicated ? (m_password.size() == 0) : false;
+	client.dedicated_access = m_is_dedicated ? (m_password.empty()) : false;
 
 	if (!d->game) // just in case we allow connection of spectators/players after game start
 		for (uint32_t i = 0; i < d->settings.users.size(); ++i)