Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-06-19 09:59:20 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-06-21 15:56:20 (GMT) |
| commit | 027111dcd9f5812342066d3bd3e1dbb1f46b3c95 (patch) | |
| tree | 99fcd35d79dc64cb07b2aec0c5c4113b75fcdd7e | |
| parent | 83fb5ae3da2e5e690a3eafae99f6cd0cb59a2496 (diff) | |
| download | swift-027111dcd9f5812342066d3bd3e1dbb1f46b3c95.zip swift-027111dcd9f5812342066d3bd3e1dbb1f46b3c95.tar.bz2 | |
Add Coala config for whitespace checking
Coala ( https://coala.io/ ), is a meta linting tool, that
comes with own checks and integration for external tools for
a lot languages.
This adds a configuration that enforces no trailing whitespace
and no lines with only whitespaces.
Test-Information:
Ran coala and fixes the issues it raised.
Change-Id: I30b201135bbe8888d9d1bcadb28f9ced9b5db28f
| -rw-r--r-- | .coafile | 8 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 2 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp | 16 | ||||
| -rw-r--r-- | Swift/Controllers/Roster/ContactRosterItem.h | 2 | ||||
| -rw-r--r-- | Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Client/Client.h | 2 |
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 @@ -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(); 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 @@ -53,3 +53,3 @@ namespace Swift { * - * \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. |