Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/Controllers/XMPPEvents
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/XMPPEvents')
-rw-r--r--Swift/Controllers/XMPPEvents/EventController.cpp6
-rw-r--r--Swift/Controllers/XMPPEvents/EventController.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/Swift/Controllers/XMPPEvents/EventController.cpp b/Swift/Controllers/XMPPEvents/EventController.cpp
index f8fb192..0e9429d 100644
--- a/Swift/Controllers/XMPPEvents/EventController.cpp
+++ b/Swift/Controllers/XMPPEvents/EventController.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2016 Isode Limited. 2 * Copyright (c) 2010-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -51,7 +51,7 @@ void EventController::handleIncomingEvent(std::shared_ptr<StanzaEvent> sourceEve
51 if ((messageEvent && messageEvent->isReadable()) || subscriptionEvent || errorEvent || mucInviteEvent || incomingFileTransferEvent) { 51 if ((messageEvent && messageEvent->isReadable()) || subscriptionEvent || errorEvent || mucInviteEvent || incomingFileTransferEvent) {
52 events_.push_back(sourceEvent); 52 events_.push_back(sourceEvent);
53 sourceEvent->onConclusion.connect(boost::bind(&EventController::handleEventConcluded, this, sourceEvent)); 53 sourceEvent->onConclusion.connect(boost::bind(&EventController::handleEventConcluded, this, sourceEvent));
54 onEventQueueLengthChange(boost::numeric_cast<int>(events_.size())); 54 onEventQueueLengthChange(events_.size());
55 onEventQueueEventAdded(sourceEvent); 55 onEventQueueEventAdded(sourceEvent);
56 if (sourceEvent->getConcluded()) { 56 if (sourceEvent->getConcluded()) {
57 handleEventConcluded(sourceEvent); 57 handleEventConcluded(sourceEvent);
@@ -62,7 +62,7 @@ void EventController::handleIncomingEvent(std::shared_ptr<StanzaEvent> sourceEve
62void EventController::handleEventConcluded(std::shared_ptr<StanzaEvent> event) { 62void EventController::handleEventConcluded(std::shared_ptr<StanzaEvent> event) {
63 event->onConclusion.disconnect(boost::bind(&EventController::handleEventConcluded, this, event)); 63 event->onConclusion.disconnect(boost::bind(&EventController::handleEventConcluded, this, event));
64 events_.erase(std::remove(events_.begin(), events_.end(), event), events_.end()); 64 events_.erase(std::remove(events_.begin(), events_.end(), event), events_.end());
65 onEventQueueLengthChange(boost::numeric_cast<int>(events_.size())); 65 onEventQueueLengthChange(events_.size());
66} 66}
67 67
68void EventController::disconnectAll() { 68void EventController::disconnectAll() {
diff --git a/Swift/Controllers/XMPPEvents/EventController.h b/Swift/Controllers/XMPPEvents/EventController.h
index 8a095d9..5b746e4 100644
--- a/Swift/Controllers/XMPPEvents/EventController.h
+++ b/Swift/Controllers/XMPPEvents/EventController.h
@@ -1,11 +1,12 @@
1/* 1/*
2 * Copyright (c) 2010-2016 Isode Limited. 2 * Copyright (c) 2010-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#pragma once 7#pragma once
8 8
9#include <cstddef>
9#include <memory> 10#include <memory>
10#include <vector> 11#include <vector>
11 12
@@ -22,7 +23,7 @@ namespace Swift {
22 ~EventController(); 23 ~EventController();
23 24
24 void handleIncomingEvent(std::shared_ptr<StanzaEvent> sourceEvent); 25 void handleIncomingEvent(std::shared_ptr<StanzaEvent> sourceEvent);
25 boost::signals2::signal<void (int)> onEventQueueLengthChange; 26 boost::signals2::signal<void (size_t)> onEventQueueLengthChange;
26 boost::signals2::signal<void (std::shared_ptr<StanzaEvent>)> onEventQueueEventAdded; 27 boost::signals2::signal<void (std::shared_ptr<StanzaEvent>)> onEventQueueEventAdded;
27 const EventList& getEvents() const {return events_;} 28 const EventList& getEvents() const {return events_;}
28 void disconnectAll(); 29 void disconnectAll();