Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/Presence/PayloadAddingPresenceSender.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swiften/Presence/PayloadAddingPresenceSender.cpp')
| -rw-r--r-- | Swiften/Presence/PayloadAddingPresenceSender.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/Swiften/Presence/PayloadAddingPresenceSender.cpp b/Swiften/Presence/PayloadAddingPresenceSender.cpp index 750e364..2f55374 100644 --- a/Swiften/Presence/PayloadAddingPresenceSender.cpp +++ b/Swiften/Presence/PayloadAddingPresenceSender.cpp @@ -12,37 +12,37 @@ PayloadAddingPresenceSender::PayloadAddingPresenceSender(PresenceSender* sender) } void PayloadAddingPresenceSender::sendPresence(Presence::ref presence) { - if (presence->isAvailable()) { - if (!presence->getTo().isValid()) { - lastSentPresence = presence; - } - } - else { - lastSentPresence.reset(); - } - if (payload) { - Presence::ref sentPresence = Presence::create(presence); - sentPresence->updatePayload(payload); - sender->sendPresence(sentPresence); - } - else { - sender->sendPresence(presence); - } + if (presence->isAvailable()) { + if (!presence->getTo().isValid()) { + lastSentPresence = presence; + } + } + else { + lastSentPresence.reset(); + } + if (payload) { + Presence::ref sentPresence = Presence::create(presence); + sentPresence->updatePayload(payload); + sender->sendPresence(sentPresence); + } + else { + sender->sendPresence(presence); + } } bool PayloadAddingPresenceSender::isAvailable() const { - return sender->isAvailable(); + return sender->isAvailable(); } void PayloadAddingPresenceSender::setPayload(boost::shared_ptr<Payload> payload) { - this->payload = payload; - if (lastSentPresence) { - sendPresence(lastSentPresence); - } + this->payload = payload; + if (lastSentPresence) { + sendPresence(lastSentPresence); + } } void PayloadAddingPresenceSender::reset() { - lastSentPresence.reset(); + lastSentPresence.reset(); } } |