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/PubSub | |
| 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/PubSub')
| -rw-r--r-- | Swiften/PubSub/PubSubManager.h | 22 | ||||
| -rw-r--r-- | Swiften/PubSub/PubSubManagerImpl.cpp | 16 | ||||
| -rw-r--r-- | Swiften/PubSub/PubSubManagerImpl.h | 38 | ||||
| -rw-r--r-- | Swiften/PubSub/PubSubUtil.h | 34 |
4 files changed, 55 insertions, 55 deletions
diff --git a/Swiften/PubSub/PubSubManager.h b/Swiften/PubSub/PubSubManager.h index 572f244..daed7e5 100644 --- a/Swiften/PubSub/PubSubManager.h +++ b/Swiften/PubSub/PubSubManager.h @@ -34,19 +34,19 @@ #include <Swiften/PubSub/PubSubUtil.h> #include <Swiften/Queries/PubSubRequest.h> #define SWIFTEN_PUBSUBMANAGER_DECLARE_CREATE_REQUEST(payload, container, response) \ - virtual boost::shared_ptr< PubSubRequest<payload> > \ - createRequest(IQ::Type, const JID&, boost::shared_ptr<payload>) = 0; + virtual boost::shared_ptr< PubSubRequest<payload> > \ + createRequest(IQ::Type, const JID&, boost::shared_ptr<payload>) = 0; namespace Swift { - class JID; + class JID; - class SWIFTEN_API PubSubManager { - public: - virtual ~PubSubManager(); - - SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE( - SWIFTEN_PUBSUBMANAGER_DECLARE_CREATE_REQUEST) + class SWIFTEN_API PubSubManager { + public: + virtual ~PubSubManager(); - boost::signal<void (const JID&, const boost::shared_ptr<PubSubEventPayload>)> onEvent; - }; + SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE( + SWIFTEN_PUBSUBMANAGER_DECLARE_CREATE_REQUEST) + + boost::signal<void (const JID&, const boost::shared_ptr<PubSubEventPayload>)> onEvent; + }; } diff --git a/Swiften/PubSub/PubSubManagerImpl.cpp b/Swiften/PubSub/PubSubManagerImpl.cpp index 7e73b86..b186a08 100644 --- a/Swiften/PubSub/PubSubManagerImpl.cpp +++ b/Swiften/PubSub/PubSubManagerImpl.cpp @@ -14,18 +14,18 @@ using namespace Swift; -PubSubManagerImpl::PubSubManagerImpl(StanzaChannel* stanzaChannel, IQRouter* router) : - stanzaChannel(stanzaChannel), - router(router) { - stanzaChannel->onMessageReceived.connect(boost::bind(&PubSubManagerImpl::handleMessageRecevied, this, _1)); +PubSubManagerImpl::PubSubManagerImpl(StanzaChannel* stanzaChannel, IQRouter* router) : + stanzaChannel(stanzaChannel), + router(router) { + stanzaChannel->onMessageReceived.connect(boost::bind(&PubSubManagerImpl::handleMessageRecevied, this, _1)); } PubSubManagerImpl::~PubSubManagerImpl() { - stanzaChannel->onMessageReceived.disconnect(boost::bind(&PubSubManagerImpl::handleMessageRecevied, this, _1)); + stanzaChannel->onMessageReceived.disconnect(boost::bind(&PubSubManagerImpl::handleMessageRecevied, this, _1)); } void PubSubManagerImpl::handleMessageRecevied(boost::shared_ptr<Message> message) { - if (boost::shared_ptr<PubSubEvent> event = message->getPayload<PubSubEvent>()) { - onEvent(message->getFrom(), event->getPayload()); - } + if (boost::shared_ptr<PubSubEvent> event = message->getPayload<PubSubEvent>()) { + onEvent(message->getFrom(), event->getPayload()); + } } diff --git a/Swiften/PubSub/PubSubManagerImpl.h b/Swiften/PubSub/PubSubManagerImpl.h index dda2920..c752b84 100644 --- a/Swiften/PubSub/PubSubManagerImpl.h +++ b/Swiften/PubSub/PubSubManagerImpl.h @@ -12,29 +12,29 @@ #include <Swiften/Base/Override.h> #include <Swiften/PubSub/PubSubManager.h> #define SWIFTEN_PUBSUBMANAGERIMPL_DECLARE_CREATE_REQUEST(payload, container, response) \ - virtual boost::shared_ptr< PubSubRequest<payload> > \ - createRequest(IQ::Type type, const JID& receiver, boost::shared_ptr<payload> p) SWIFTEN_OVERRIDE { \ - return boost::make_shared< PubSubRequest<payload> >(type, receiver, p, router); \ - } + virtual boost::shared_ptr< PubSubRequest<payload> > \ + createRequest(IQ::Type type, const JID& receiver, boost::shared_ptr<payload> p) SWIFTEN_OVERRIDE { \ + return boost::make_shared< PubSubRequest<payload> >(type, receiver, p, router); \ + } namespace Swift { - class JID; - class StanzaChannel; - class Message; + class JID; + class StanzaChannel; + class Message; - class SWIFTEN_API PubSubManagerImpl : public PubSubManager { - public: - PubSubManagerImpl(StanzaChannel* stanzaChannel, IQRouter* router); - virtual ~PubSubManagerImpl(); + class SWIFTEN_API PubSubManagerImpl : public PubSubManager { + public: + PubSubManagerImpl(StanzaChannel* stanzaChannel, IQRouter* router); + virtual ~PubSubManagerImpl(); - SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE( - SWIFTEN_PUBSUBMANAGERIMPL_DECLARE_CREATE_REQUEST) + SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE( + SWIFTEN_PUBSUBMANAGERIMPL_DECLARE_CREATE_REQUEST) - private: - void handleMessageRecevied(boost::shared_ptr<Message>); + private: + void handleMessageRecevied(boost::shared_ptr<Message>); - private: - StanzaChannel* stanzaChannel; - IQRouter* router; - }; + private: + StanzaChannel* stanzaChannel; + IQRouter* router; + }; } diff --git a/Swiften/PubSub/PubSubUtil.h b/Swiften/PubSub/PubSubUtil.h index 17e426b..ac23092 100644 --- a/Swiften/PubSub/PubSubUtil.h +++ b/Swiften/PubSub/PubSubUtil.h @@ -6,21 +6,21 @@ #pragma once #define SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE(action) \ - action(PubSubCreate, PubSub, PubSubCreate) \ - action(PubSubAffiliations, PubSub, PubSubAffiliations) \ - action(PubSubDefault, PubSub, PubSubDefault) \ - action(PubSubItems, PubSub, PubSubItems) \ - action(PubSubOptions, PubSub, PubSubOptions) \ - action(PubSubPublish, PubSub, PubSubPublish) \ - action(PubSubRetract, PubSub, PubSubRetract) \ - action(PubSubSubscription, PubSub, PubSubSubscription) \ - action(PubSubSubscriptions, PubSub, PubSubSubscriptions) \ - action(PubSubSubscribe, PubSub, PubSubSubscription) \ - action(PubSubUnsubscribe, PubSub, PubSubUnsubscribe) \ - action(PubSubOwnerAffiliations, PubSubOwnerPubSub, PubSubOwnerAffiliations) \ - action(PubSubOwnerConfigure, PubSubOwnerPubSub, PubSubOwnerConfigure) \ - action(PubSubOwnerDefault, PubSubOwnerPubSub, PubSubOwnerDefault) \ - action(PubSubOwnerDelete, PubSubOwnerPubSub, PubSubOwnerDelete) \ - action(PubSubOwnerPurge, PubSubOwnerPubSub, PubSubOwnerPurge) \ - action(PubSubOwnerSubscriptions, PubSubOwnerPubSub, PubSubOwnerSubscriptions) + action(PubSubCreate, PubSub, PubSubCreate) \ + action(PubSubAffiliations, PubSub, PubSubAffiliations) \ + action(PubSubDefault, PubSub, PubSubDefault) \ + action(PubSubItems, PubSub, PubSubItems) \ + action(PubSubOptions, PubSub, PubSubOptions) \ + action(PubSubPublish, PubSub, PubSubPublish) \ + action(PubSubRetract, PubSub, PubSubRetract) \ + action(PubSubSubscription, PubSub, PubSubSubscription) \ + action(PubSubSubscriptions, PubSub, PubSubSubscriptions) \ + action(PubSubSubscribe, PubSub, PubSubSubscription) \ + action(PubSubUnsubscribe, PubSub, PubSubUnsubscribe) \ + action(PubSubOwnerAffiliations, PubSubOwnerPubSub, PubSubOwnerAffiliations) \ + action(PubSubOwnerConfigure, PubSubOwnerPubSub, PubSubOwnerConfigure) \ + action(PubSubOwnerDefault, PubSubOwnerPubSub, PubSubOwnerDefault) \ + action(PubSubOwnerDelete, PubSubOwnerPubSub, PubSubOwnerDelete) \ + action(PubSubOwnerPurge, PubSubOwnerPubSub, PubSubOwnerPurge) \ + action(PubSubOwnerSubscriptions, PubSubOwnerPubSub, PubSubOwnerSubscriptions) |