Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-07 19:57:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-08-24 17:10:23 (GMT) |
| commit | 6e4b357141a6d09632f1e96d0eaf54f79daf52c9 (patch) | |
| tree | 7627e6309e9b7048e0da0482fff389a6648b2aae /Swift/Controllers | |
| parent | 1586683c148825cd24863aec6ef940c8c0fec5ea (diff) | |
| download | swift-6e4b357141a6d09632f1e96d0eaf54f79daf52c9.zip swift-6e4b357141a6d09632f1e96d0eaf54f79daf52c9.tar.bz2 | |
Added VCardStorage.
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 27 | ||||
| -rw-r--r-- | Swift/Controllers/MainController.h | 18 |
2 files changed, 42 insertions, 3 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index b267dd2..6eb3a2c 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -19,6 +19,7 @@ #include "Swiften/Network/MainBoostIOServiceThread.h" #include "Swift/Controllers/BuildVersion.h" #include "Swift/Controllers/Chat/ChatController.h" +#include "Swiften/VCards/VCardStorageFactory.h" #include "Swift/Controllers/Chat/MUCSearchController.h" #include "Swift/Controllers/Chat/ChatsManager.h" #include "Swift/Controllers/EventController.h" @@ -63,8 +64,30 @@ static const String CLIENT_VERSION = "1.0-devel"; static const String CLIENT_NODE = "http://swift.im"; -MainController::MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, EventWindowFactory* eventWindowFactory, SettingsProvider *settings, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, ChatListWindowFactory* chatListWindowFactory, MUCSearchWindowFactory* mucSearchWindowFactory, AvatarStorage* avatarStorage, ApplicationMessageDisplay* applicationMessageDisplay, bool useDelayForLatency) - : timerFactory_(&boostIOServiceThread_.getIOService()), idleDetector_(&idleQuerier_, &timerFactory_, 100), chatWindowFactory_(chatWindowFactory), mainWindowFactory_(mainWindowFactory), loginWindowFactory_(loginWindowFactory), settings_(settings), loginWindow_(NULL), useDelayForLatency_(useDelayForLatency) { +MainController::MainController( + ChatWindowFactory* chatWindowFactory, + MainWindowFactory *mainWindowFactory, + LoginWindowFactory *loginWindowFactory, + EventWindowFactory* eventWindowFactory, + SettingsProvider *settings, + SystemTray* systemTray, + SoundPlayer* soundPlayer, + XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, + ChatListWindowFactory* chatListWindowFactory, + MUCSearchWindowFactory* mucSearchWindowFactory, + AvatarStorage* avatarStorage, + VCardStorageFactory* vcardStorageFactory, + ApplicationMessageDisplay* applicationMessageDisplay, + bool useDelayForLatency) : + timerFactory_(&boostIOServiceThread_.getIOService()), + idleDetector_(&idleQuerier_, &timerFactory_, 100), + chatWindowFactory_(chatWindowFactory), + mainWindowFactory_(mainWindowFactory), + loginWindowFactory_(loginWindowFactory), + settings_(settings), + loginWindow_(NULL), + vcardStorageFactory_(vcardStorageFactory), + useDelayForLatency_(useDelayForLatency) { presenceOracle_ = NULL; avatarManager_ = NULL; chatsManager_ = NULL; diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h index e220211..a612175 100644 --- a/Swift/Controllers/MainController.h +++ b/Swift/Controllers/MainController.h @@ -63,10 +63,25 @@ namespace Swift { class MUCSearchController; class MUCSearchWindowFactory; class StatusTracker; + class VCardStorageFactory; class MainController { public: - MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, EventWindowFactory* eventWindowFactory, SettingsProvider *settings, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, ChatListWindowFactory* chatListWindowFactory_, MUCSearchWindowFactory* mucSearchWindowFactory, AvatarStorage* avatarStorage, ApplicationMessageDisplay* applicationMessageDisplay, bool useDelayForLatency); + MainController( + ChatWindowFactory* chatWindowFactory, + MainWindowFactory *mainWindowFactory, + LoginWindowFactory *loginWindowFactory, + EventWindowFactory* eventWindowFactory, + SettingsProvider *settings, + SystemTray* systemTray, + SoundPlayer* soundPlayer, + XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, + ChatListWindowFactory* chatListWindowFactory_, + MUCSearchWindowFactory* mucSearchWindowFactory, + AvatarStorage* avatarStorage, + VCardStorageFactory* vcardStorageFactory, + ApplicationMessageDisplay* applicationMessageDisplay, + bool useDelayForLatency); ~MainController(); @@ -105,6 +120,7 @@ namespace Swift { SettingsProvider *settings_; ProfileSettingsProvider* profileSettings_; AvatarStorage* avatarStorage_; + VCardStorageFactory* vcardStorageFactory_; ApplicationMessageDisplay* applicationMessageDisplay_; ChatController* chatController_; XMPPRosterController* xmppRosterController_; |