diff options
Diffstat (limited to 'Swift')
4 files changed, 11 insertions, 11 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index b6ca984..fe8e870 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -581,3 +581,3 @@ bool ChatController::shouldIgnoreMessage(std::shared_ptr<Message> message) { } - + JID ChatController::messageCorrectionJID(const JID& fromJID) { diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp index 8fc26b5..1502dc9 100644 --- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp @@ -1284,3 +1284,3 @@ public: } - + void testCarbonsForwardedIncomingDuplicates() { @@ -1288,6 +1288,6 @@ public: JID jid2 = jid_.toBare().withResource("someOtherResource"); - + MockChatWindow* window = new MockChatWindow(); mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(messageJID, uiEventStream_).Return(window); - + std::shared_ptr<Message> message(new Message()); @@ -1298,3 +1298,3 @@ public: CPPUNIT_ASSERT_EQUAL(body, MockChatWindow::bodyFromMessage(window->lastAddedMessage_)); - + // incoming carbons message from another resource and duplicate of it @@ -1308,7 +1308,7 @@ public: originalMessage->setBody(forwardedBody); - + auto messageWrapper = createCarbonsMessage(std::make_shared<CarbonsReceived>(), originalMessage); - + manager_->handleIncomingMessage(messageWrapper); - + CPPUNIT_ASSERT_EQUAL(forwardedBody, MockChatWindow::bodyFromMessage(window->lastAddedMessage_)); @@ -1316,3 +1316,3 @@ public: window->resetLastMessages(); - + messageWrapper = createCarbonsMessage(std::make_shared<CarbonsReceived>(), originalMessage); diff --git a/Swift/Controllers/Roster/ContactRosterItem.h b/Swift/Controllers/Roster/ContactRosterItem.h index 9779859..a300819 100644 --- a/Swift/Controllers/Roster/ContactRosterItem.h +++ b/Swift/Controllers/Roster/ContactRosterItem.h @@ -48,3 +48,3 @@ class ContactRosterItem : public RosterItem { * @param jid The JabberID of the contact in the Roster entry. - * @param displayJID An alternate JID that is used instead of the JID this item represents. If not available, + * @param displayJID An alternate JID that is used instead of the JID this item represents. If not available, * an empty node should be passed. This parameter will be converted to a bare JID. diff --git a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp index ddbd7d3..2f15fb5 100644 --- a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp +++ b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp @@ -63,3 +63,3 @@ class RosterControllerTest : public CppUnit::TestFixture { CPPUNIT_TEST(testOwnContactInRosterPresence); - CPPUNIT_TEST(testMultiResourceFileTransferFeature); + CPPUNIT_TEST(testMultiResourceFileTransferFeature); CPPUNIT_TEST_SUITE_END(); |