summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-01-06 14:56:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-01-13 10:06:37 (GMT)
commit188fc285c6555eadd3c9d50ab8a94adcade78d89 (patch)
treef02f5e249f8b511300d55a826d3b727f9d8d844f /Slimber
parentd5cab0388f6a40db6156a993e5f00acf9e63b577 (diff)
downloadswift-188fc285c6555eadd3c9d50ab8a94adcade78d89.zip
swift-188fc285c6555eadd3c9d50ab8a94adcade78d89.tar.bz2
Fix more warnings.
Fix sign conversion warnings. Removing heavy unnecessary includes. Change-Id: I992f43065498823098a875badb020c7c84fc4797
Diffstat (limited to 'Slimber')
-rw-r--r--Slimber/UnitTest/MenuletControllerTest.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Slimber/UnitTest/MenuletControllerTest.cpp b/Slimber/UnitTest/MenuletControllerTest.cpp
index 092a886..b18a37f 100644
--- a/Slimber/UnitTest/MenuletControllerTest.cpp
+++ b/Slimber/UnitTest/MenuletControllerTest.cpp
@@ -33,7 +33,7 @@ class MenuletControllerTest : public CppUnit::TestFixture {
MenuletController testling(menulet);
CPPUNIT_ASSERT_EQUAL(8, static_cast<int>(menulet->items.size()));
- int i = 0;
+ size_t i = 0;
CPPUNIT_ASSERT_EQUAL(std::string("No online users"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("-"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("[Offline] "), menulet->items[i++]);
@@ -50,7 +50,7 @@ class MenuletControllerTest : public CppUnit::TestFixture {
testling.setXMPPStatus("You are connected", MenuletController::Online);
CPPUNIT_ASSERT_EQUAL(8, static_cast<int>(menulet->items.size()));
- int i = 0;
+ size_t i = 0;
CPPUNIT_ASSERT_EQUAL(std::string("No online users"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("-"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("[Online] You are connected"), menulet->items[i++]);
@@ -66,7 +66,7 @@ class MenuletControllerTest : public CppUnit::TestFixture {
testling.setXMPPStatus("You are connected", MenuletController::Online);
- int i = 0;
+ size_t i = 0;
CPPUNIT_ASSERT_EQUAL(std::string("No online users"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("-"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("[Online] You are connected"), menulet->items[i++]);
@@ -78,7 +78,7 @@ class MenuletControllerTest : public CppUnit::TestFixture {
testling.setXMPPStatus("You are not connected", MenuletController::Offline);
- int i = 0;
+ size_t i = 0;
CPPUNIT_ASSERT_EQUAL(std::string("No online users"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("-"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("[Offline] You are not connected"), menulet->items[i++]);
@@ -92,7 +92,7 @@ class MenuletControllerTest : public CppUnit::TestFixture {
users.push_back("The Mad Hatter");
testling.setUserNames(users);
- int i = 0;
+ size_t i = 0;
CPPUNIT_ASSERT_EQUAL(std::string("Online users:"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string(" Alice In Wonderland"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string(" The Mad Hatter"), menulet->items[i++]);
@@ -105,7 +105,7 @@ class MenuletControllerTest : public CppUnit::TestFixture {
std::vector<std::string> users;
testling.setUserNames(users);
- int i = 0;
+ size_t i = 0;
CPPUNIT_ASSERT_EQUAL(std::string("No online users"), menulet->items[i++]);
CPPUNIT_ASSERT_EQUAL(std::string("-"), menulet->items[i++]);
}