summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.coafile8
-rw-r--r--Swift/Controllers/Chat/ChatController.cpp2
-rw-r--r--Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp16
-rw-r--r--Swift/Controllers/Roster/ContactRosterItem.h2
-rw-r--r--Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp2
-rw-r--r--Swiften/Client/Client.h2
6 files changed, 20 insertions, 12 deletions
diff --git a/.coafile b/.coafile
new file mode 100644
index 0000000..0b13ec4
--- /dev/null
+++ b/.coafile
@@ -0,0 +1,8 @@
+[CppFiles]
+ files = Swiften/**/*.(cpp|h),Swift/**/*.(cpp|h),SwifTools/**/*.(cpp|h),Sluift/**/*.(cpp|h)
+ ignore = Swift/QtUI/Swift.app/**/*,Swiften/Config/swiften-config.h,Sluift/iTunes.h
+
+ bears = SpaceConsistencyBear
+ use_spaces = yes
+ allow_trailing_whitespace = no
+ enforce_newline_at_EOF = yes
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
@@ -579,7 +579,7 @@ bool ChatController::shouldIgnoreMessage(std::shared_ptr<Message> message) {
}
return false;
}
-
+
JID ChatController::messageCorrectionJID(const JID& fromJID) {
return fromJID.toBare();
}
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
@@ -1282,21 +1282,21 @@ public:
CPPUNIT_ASSERT_EQUAL(ChatWindow::ReceiptReceived, window->receiptChanges_[1].second);
}
}
-
+
void testCarbonsForwardedIncomingDuplicates() {
JID messageJID("testling@test.com/resource1");
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());
message->setFrom(messageJID);
std::string body("This is a legible message. >HEH@)oeueu");
message->setBody(body);
manager_->handleIncomingMessage(message);
CPPUNIT_ASSERT_EQUAL(body, MockChatWindow::bodyFromMessage(window->lastAddedMessage_));
-
+
// incoming carbons message from another resource and duplicate of it
{
auto originalMessage = std::make_shared<Message>();
@@ -1306,15 +1306,15 @@ public:
originalMessage->setType(Message::Chat);
std::string forwardedBody = "Some further text.";
originalMessage->setBody(forwardedBody);
-
+
auto messageWrapper = createCarbonsMessage(std::make_shared<CarbonsReceived>(), originalMessage);
-
+
manager_->handleIncomingMessage(messageWrapper);
-
+
CPPUNIT_ASSERT_EQUAL(forwardedBody, MockChatWindow::bodyFromMessage(window->lastAddedMessage_));
CPPUNIT_ASSERT_EQUAL(false, window->lastAddedMessageSenderIsSelf_);
window->resetLastMessages();
-
+
messageWrapper = createCarbonsMessage(std::make_shared<CarbonsReceived>(), originalMessage);
manager_->handleIncomingMessage(messageWrapper);
CPPUNIT_ASSERT_EQUAL(std::string(), MockChatWindow::bodyFromMessage(window->lastAddedMessage_));
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
@@ -46,7 +46,7 @@ class ContactRosterItem : public RosterItem {
/**
* @brief ContactRosterItem contains the information of a contact that is part of a XMPP Roster.
* @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.
* @param name The name or nickname of the contact
* @param parent The roster group that the contact is a member of. The same JID may be in several roster groups, in which case they will have individual ContactRosterItems with the same 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
@@ -61,7 +61,7 @@ class RosterControllerTest : public CppUnit::TestFixture {
CPPUNIT_TEST(testUnavailablePresence);
CPPUNIT_TEST(testRemoveResultsInUnavailablePresence);
CPPUNIT_TEST(testOwnContactInRosterPresence);
- CPPUNIT_TEST(testMultiResourceFileTransferFeature);
+ CPPUNIT_TEST(testMultiResourceFileTransferFeature);
CPPUNIT_TEST_SUITE_END();
public:
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 5b11688..be4881a 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -51,7 +51,7 @@ namespace Swift {
/**
* Constructs a client for the given JID with the given password.
*
- * \param jid The JID to be used for the login. If only a bare
+ * \param jid The JID to be used for the login. If only a bare
* JID is give the server will be asked to generate a resource.
* \param password The password used for login given as a \ref SafeString.
* \param networkFactories The network factories that are used