6 files changed, 23 insertions, 19 deletions
diff --git a/Swift/Controllers/XMPPEvents/ErrorEvent.h b/Swift/Controllers/XMPPEvents/ErrorEvent.h
index cbfc471..ac09de9 100644
--- a/Swift/Controllers/XMPPEvents/ErrorEvent.h
+++ b/Swift/Controllers/XMPPEvents/ErrorEvent.h
@@ -19,8 +19,8 @@ namespace Swift {
 	class ErrorEvent : public StanzaEvent {
 		public:
-			ErrorEvent(const JID& jid, const std::string& text) : jid_(jid), text_(text){};
-			virtual ~ErrorEvent(){};
-			const JID& getJID() const {return jid_;};
-			const std::string& getText() const {return text_;};
+			ErrorEvent(const JID& jid, const std::string& text) : jid_(jid), text_(text){}
+			virtual ~ErrorEvent(){}
+			const JID& getJID() const {return jid_;}
+			const std::string& getText() const {return text_;}
 
 		private:
diff --git a/Swift/Controllers/XMPPEvents/EventController.cpp b/Swift/Controllers/XMPPEvents/EventController.cpp
index 9841923..8cb259b 100644
--- a/Swift/Controllers/XMPPEvents/EventController.cpp
+++ b/Swift/Controllers/XMPPEvents/EventController.cpp
@@ -8,4 +8,5 @@
 
 #include <boost/bind.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 #include <algorithm>
 
@@ -35,5 +36,6 @@ void EventController::handleIncomingEvent(boost::shared_ptr<StanzaEvent> sourceE
 	/* If it's a duplicate subscription request, remove the previous request first */
 	if (subscriptionEvent) {
-		foreach(boost::shared_ptr<StanzaEvent> existingEvent, events_) {
+		EventList existingEvents(events_);
+		foreach(boost::shared_ptr<StanzaEvent> existingEvent, existingEvents) {
 			boost::shared_ptr<SubscriptionRequestEvent> existingSubscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(existingEvent);
 			if (existingSubscriptionEvent) {
@@ -48,5 +50,5 @@ void EventController::handleIncomingEvent(boost::shared_ptr<StanzaEvent> sourceE
 		events_.push_back(sourceEvent);
 		sourceEvent->onConclusion.connect(boost::bind(&EventController::handleEventConcluded, this, sourceEvent));
-		onEventQueueLengthChange(events_.size());
+		onEventQueueLengthChange(boost::numeric_cast<int>(events_.size()));
 		onEventQueueEventAdded(sourceEvent);
 		if (sourceEvent->getConcluded()) {
@@ -59,5 +61,5 @@ void EventController::handleEventConcluded(boost::shared_ptr<StanzaEvent> event)
 	event->onConclusion.disconnect(boost::bind(&EventController::handleEventConcluded, this, event));
 	events_.erase(std::remove(events_.begin(), events_.end(), event), events_.end());
-	onEventQueueLengthChange(events_.size());
+	onEventQueueLengthChange(boost::numeric_cast<int>(events_.size()));
 }
 
diff --git a/Swift/Controllers/XMPPEvents/MUCInviteEvent.h b/Swift/Controllers/XMPPEvents/MUCInviteEvent.h
index 0b430cd..65ecece 100644
--- a/Swift/Controllers/XMPPEvents/MUCInviteEvent.h
+++ b/Swift/Controllers/XMPPEvents/MUCInviteEvent.h
@@ -14,5 +14,5 @@ namespace Swift {
 
 	public:
-		MUCInviteEvent(const JID& inviter, const JID& roomJID, const std::string& reason, const std::string& password, bool direct) : inviter_(inviter), roomJID_(roomJID), reason_(reason), password_(password), direct_(direct) {}
+		MUCInviteEvent(const JID& inviter, const JID& roomJID, const std::string& reason, const std::string& password, bool direct, bool impromptu) : inviter_(inviter), roomJID_(roomJID), reason_(reason), password_(password), direct_(direct), impromptu_(impromptu) {}
 
 		const JID& getInviter() const { return inviter_; }
@@ -21,4 +21,5 @@ namespace Swift {
 		const std::string& getPassword() const { return password_; }
 		bool getDirect() const { return direct_; }
+		bool getImpromptu() const { return impromptu_; }
 
 	private:
@@ -28,4 +29,5 @@ namespace Swift {
 		std::string password_;
 		bool direct_;
+		bool impromptu_;
 	};
 }
diff --git a/Swift/Controllers/XMPPEvents/MessageEvent.h b/Swift/Controllers/XMPPEvents/MessageEvent.h
index 1093470..a9214f5 100644
--- a/Swift/Controllers/XMPPEvents/MessageEvent.h
+++ b/Swift/Controllers/XMPPEvents/MessageEvent.h
@@ -18,5 +18,5 @@ namespace Swift {
 			typedef boost::shared_ptr<MessageEvent> ref;
 
-			MessageEvent(boost::shared_ptr<Message> stanza) : stanza_(stanza), targetsMe_(true) {};
+			MessageEvent(boost::shared_ptr<Message> stanza) : stanza_(stanza), targetsMe_(true) {}
 
 			boost::shared_ptr<Message> getStanza() {return stanza_;}
diff --git a/Swift/Controllers/XMPPEvents/StanzaEvent.h b/Swift/Controllers/XMPPEvents/StanzaEvent.h
index 321d23d..a15afc1 100644
--- a/Swift/Controllers/XMPPEvents/StanzaEvent.h
+++ b/Swift/Controllers/XMPPEvents/StanzaEvent.h
@@ -15,11 +15,11 @@ namespace Swift {
 	class StanzaEvent {
 		public:
-			StanzaEvent() : time_(boost::posix_time::microsec_clock::universal_time()) {concluded_ = false;};
-			virtual ~StanzaEvent() {};
-			void conclude() {concluded_ = true; onConclusion();};
+			StanzaEvent() : time_(boost::posix_time::microsec_clock::universal_time()) {concluded_ = false;}
+			virtual ~StanzaEvent() {}
+			void conclude() {concluded_ = true; onConclusion();}
 			/** Do not call this directly from outside the class.
 			 * If you connect to this signal, you *must* disconnect from it manually. */
 			boost::signal<void()> onConclusion;
-			bool getConcluded() {return concluded_;};
+			bool getConcluded() {return concluded_;}
 			boost::posix_time::ptime getTime() {return time_;}
 		private:
diff --git a/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h b/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
index 1f7812e..fb7a05e 100644
--- a/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
+++ b/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
@@ -19,8 +19,8 @@ namespace Swift {
 	class SubscriptionRequestEvent : public StanzaEvent {
 		public:
-			SubscriptionRequestEvent(const JID& jid, const std::string& reason) : jid_(jid), reason_(reason){};
-			virtual ~SubscriptionRequestEvent(){};
-			const JID& getJID() const {return jid_;};
-			const std::string& getReason() const {return reason_;};
+			SubscriptionRequestEvent(const JID& jid, const std::string& reason) : jid_(jid), reason_(reason){}
+			virtual ~SubscriptionRequestEvent(){}
+			const JID& getJID() const {return jid_;}
+			const std::string& getReason() const {return reason_;}
 			boost::signal<void()> onAccept;
 			boost::signal<void()> onDecline;
@@ -28,10 +28,10 @@ namespace Swift {
 				onAccept();
 				conclude();
-			};
+			}
 
 			void decline() {
 				onDecline();
 				conclude();
-			};
+			}
 
 			void defer() {