Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-09-12 16:10:50 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-09-12 16:10:50 (GMT) |
| commit | 41e89bb5ed1a9d38d1ece1310ef708daad54a9a9 (patch) | |
| tree | 729117779ef76f28bff02413ce74daac46ccc565 /Swift/Controllers | |
| parent | de0cdc61015f86a334bc4c0589bafe0bfdf89786 (diff) | |
| download | swift-41e89bb5ed1a9d38d1ece1310ef708daad54a9a9.zip swift-41e89bb5ed1a9d38d1ece1310ef708daad54a9a9.tar.bz2 | |
Moved application message display around.
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 9 | ||||
| -rw-r--r-- | Swift/Controllers/MainController.h | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index afffa59..04112ea 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -12,8 +12,6 @@ #include <stdlib.h> #include <sstream> -#include "Swiften/Application/Application.h" -#include "Swiften/Application/ApplicationMessageDisplay.h" #include "Swiften/Network/TimerFactory.h" #include "Swiften/Network/BoostIOServiceThread.h" #include "Swiften/Network/MainBoostIOServiceThread.h" @@ -40,6 +38,7 @@ #include "Swift/Controllers/XMLConsoleController.h" #include "Swift/Controllers/XMPPRosterController.h" #include "Swift/Controllers/UIEvents/UIEventStream.h" +#include "SwifTools/Dock/Dock.h" #include "Swiften/Base/foreach.h" #include "Swiften/Base/String.h" #include "Swiften/Client/Client.h" @@ -83,7 +82,7 @@ MainController::MainController( AvatarStorage* avatarStorage, CapsStorage* capsStorage, VCardStorageFactory* vcardStorageFactory, - ApplicationMessageDisplay* applicationMessageDisplay, + Dock* dock, bool useDelayForLatency) : timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), @@ -114,7 +113,7 @@ MainController::MainController( timeBeforeNextReconnect_ = -1; mucSearchWindowFactory_ = mucSearchWindowFactory; eventWindowFactory_ = eventWindowFactory; - applicationMessageDisplay_ = applicationMessageDisplay; + dock_ = dock; chatListWindowFactory_ = chatListWindowFactory; uiEventStream_ = new UIEventStream(); @@ -291,7 +290,7 @@ void MainController::handleConnected() { } void MainController::handleEventQueueLengthChange(int count) { - applicationMessageDisplay_->setMessage(count == 0 ? "" : boost::lexical_cast<std::string>(count).c_str()); + dock_->setMessage(count == 0 ? "" : boost::lexical_cast<std::string>(count).c_str()); } void MainController::reconnectAfterError() { diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h index 8596ace..7aad4a0 100644 --- a/Swift/Controllers/MainController.h +++ b/Swift/Controllers/MainController.h @@ -46,7 +46,6 @@ namespace Swift { class XMPPRosterController; class PresenceSender; class DiscoInfoResponder; - class ApplicationMessageDisplay; class AvatarManager; class CapsManager; class EntityCapsManager; @@ -70,6 +69,7 @@ namespace Swift { class StatusTracker; class VCardStorageFactory; class MUCRegistry; + class Dock; class MainController { public: @@ -87,7 +87,7 @@ namespace Swift { AvatarStorage* avatarStorage, CapsStorage* capsStorage, VCardStorageFactory* vcardStorageFactory, - ApplicationMessageDisplay* applicationMessageDisplay, + Dock* dock, bool useDelayForLatency); ~MainController(); @@ -133,7 +133,7 @@ namespace Swift { CapsStorage* capsStorage_; VCardStorageFactory* vcardStorageFactory_; VCardManager* vcardManager_; - ApplicationMessageDisplay* applicationMessageDisplay_; + Dock* dock_; ChatController* chatController_; XMPPRosterController* xmppRosterController_; RosterController* rosterController_; |