diff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-06 22:19:32 (GMT) | 
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-06 22:19:32 (GMT) | 
| commit | bec14a3e051a97f543175a8bdcc2c1c6fd18ce77 (patch) | |
| tree | ada04bf48de300d6d2eab04d8165c828a62533eb /Swift/Controllers/Chat/ChatController.cpp | |
| parent | dad0795cd24ab5e0350fc96a4c8c51f97d1ab1dd (diff) | |
| download | swift-bec14a3e051a97f543175a8bdcc2c1c6fd18ce77.zip swift-bec14a3e051a97f543175a8bdcc2c1c6fd18ce77.tar.bz2 | |
Use EntityCapsProvider in Swiften.
Diffstat (limited to 'Swift/Controllers/Chat/ChatController.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index eb68abd..4247109 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -13,7 +13,7 @@  #include "Swiften/Chat/ChatStateNotifier.h"  #include "Swiften/Chat/ChatStateTracker.h"  #include "Swiften/Client/StanzaChannel.h" -#include "Swiften/Disco/EntityCapsManager.h" +#include "Swiften/Disco/EntityCapsProvider.h"  #include "Swift/Controllers/UIInterfaces/ChatWindow.h"  #include "Swift/Controllers/UIInterfaces/ChatWindowFactory.h"  #include "Swiften/Client/NickResolver.h" @@ -24,11 +24,11 @@ namespace Swift {  /**   * The controller does not gain ownership of the stanzaChannel, nor the factory.   */ -ChatController::ChatController(const JID& self, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &contact, NickResolver* nickResolver, PresenceOracle* presenceOracle, AvatarManager* avatarManager, bool isInMUC, bool useDelayForLatency, UIEventStream* eventStream, EventController* eventController, TimerFactory* timerFactory, EntityCapsManager* entityCapsManager) +ChatController::ChatController(const JID& self, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &contact, NickResolver* nickResolver, PresenceOracle* presenceOracle, AvatarManager* avatarManager, bool isInMUC, bool useDelayForLatency, UIEventStream* eventStream, EventController* eventController, TimerFactory* timerFactory, EntityCapsProvider* entityCapsProvider)  	: ChatControllerBase(self, stanzaChannel, iqRouter, chatWindowFactory, contact, presenceOracle, avatarManager, useDelayForLatency, eventStream, eventController, timerFactory) {  	isInMUC_ = isInMUC;  	lastWasPresence_ = false; -	chatStateNotifier_ = new ChatStateNotifier(stanzaChannel, contact, entityCapsManager); +	chatStateNotifier_ = new ChatStateNotifier(stanzaChannel, contact, entityCapsProvider);  	chatStateTracker_ = new ChatStateTracker();  	nickResolver_ = nickResolver;  	presenceOracle_->onPresenceChange.connect(boost::bind(&ChatController::handlePresenceChange, this, _1)); | 
 Swift
 Swift