Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-11-08 14:12:36 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-11-08 15:30:19 (GMT) |
| commit | 0b4e062a59613b2597b712c0106c3ed08b747637 (patch) | |
| tree | 7b062a8123d37be7226d4eb36c553b04563255c6 /Swift/Controllers/Chat/UnitTest | |
| parent | cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f (diff) | |
| download | swift-0b4e062a59613b2597b712c0106c3ed08b747637.zip swift-0b4e062a59613b2597b712c0106c3ed08b747637.tar.bz2 | |
Change unread counters to size_t
Since the counters cannot be negative, changing the type used for unread
counters to size_t seems a better fit, and it avoids the need for
numeric_casts.
Test-Information:
Unit tests pass on macOS 10.13
Change-Id: I61badcfc410f0cce7f922da90b50ef5a809c6521
Diffstat (limited to 'Swift/Controllers/Chat/UnitTest')
| -rw-r--r-- | Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp | 3 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/UnitTest/MockChatListWindow.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp b/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp index e052aff..f30e3fd 100644 --- a/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/ChattablesTest.cpp | |||
| @@ -9,6 +9,9 @@ | |||
| 9 | 9 | ||
| 10 | #include <Swift/Controllers/Chat/Chattables.h> | 10 | #include <Swift/Controllers/Chat/Chattables.h> |
| 11 | 11 | ||
| 12 | // Clang wrongly things that tests for 0 are using 0 as null. | ||
| 13 | #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" | ||
| 14 | |||
| 12 | using namespace Swift; | 15 | using namespace Swift; |
| 13 | 16 | ||
| 14 | class ChattablesTest : public ::testing::Test { | 17 | class ChattablesTest : public ::testing::Test { |
diff --git a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h index 395b050..1d980d3 100644 --- a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h +++ b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h | |||
| @@ -20,7 +20,7 @@ namespace Swift { | |||
| 20 | void removeWhiteboardSession(const JID& /*jid*/) {} | 20 | void removeWhiteboardSession(const JID& /*jid*/) {} |
| 21 | void setBookmarksEnabled(bool /*enabled*/) {} | 21 | void setBookmarksEnabled(bool /*enabled*/) {} |
| 22 | void setRecents(const std::list<ChatListWindow::Chat>& /*recents*/) {} | 22 | void setRecents(const std::list<ChatListWindow::Chat>& /*recents*/) {} |
| 23 | void setUnreadCount(int /*unread*/) {} | 23 | void setUnreadCount(size_t /*unread*/) {} |
| 24 | void clearBookmarks() {} | 24 | void clearBookmarks() {} |
| 25 | void setOnline(bool /*isOnline*/) {} | 25 | void setOnline(bool /*isOnline*/) {} |
| 26 | }; | 26 | }; |