Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-08-21 18:29:50 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-08-21 18:30:47 (GMT) |
| commit | d786e1aeff062ef4f0a962d55ddce7d41c5f512e (patch) | |
| tree | e66ed4b836096e2f9a8c43902fede6738900d6dd /Swift/Controllers/MainController.h | |
| parent | 734cdf96ee07357382914c1e38e19a5bf1f5078d (diff) | |
| download | swift-d786e1aeff062ef4f0a962d55ddce7d41c5f512e.zip swift-d786e1aeff062ef4f0a962d55ddce7d41c5f512e.tar.bz2 | |
Revert "Store avatars per profile."
Diffstat (limited to 'Swift/Controllers/MainController.h')
| -rw-r--r-- | Swift/Controllers/MainController.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h index e68e6d5..e220211 100644 --- a/Swift/Controllers/MainController.h +++ b/Swift/Controllers/MainController.h @@ -9,7 +9,6 @@ #include "Swiften/Base/boost_bsignals.h" #include <boost/shared_ptr.hpp> #include <vector> -#include <map> #include "Swiften/Network/BoostIOServiceThread.h" #include "Swiften/Network/BoostTimerFactory.h" @@ -29,7 +28,6 @@ #include "Swiften/Roster/XMPPRoster.h" namespace Swift { - class AvatarStorageFactory; class AvatarStorage; class Application; class Client; @@ -68,12 +66,11 @@ namespace Swift { class MainController { public: - MainController(ChatWindowFactory* chatWindowFactory, MainWindowFactory *mainWindowFactory, LoginWindowFactory *loginWindowFactory, EventWindowFactory* eventWindowFactory, SettingsProvider *settings, SystemTray* systemTray, SoundPlayer* soundPlayer, XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, ChatListWindowFactory* chatListWindowFactory_, MUCSearchWindowFactory* mucSearchWindowFactory, AvatarStorageFactory* avatarStorageFactory, 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, ApplicationMessageDisplay* applicationMessageDisplay, bool useDelayForLatency); ~MainController(); private: - AvatarStorage* getAvatarStorageForProfile(const JID&); void resetClient(); void handleConnected(); void handleLoginRequest(const String& username, const String& password, const String& certificateFile, bool remember, bool loginAutomatically); @@ -107,7 +104,7 @@ namespace Swift { EventWindowFactory* eventWindowFactory_; SettingsProvider *settings_; ProfileSettingsProvider* profileSettings_; - AvatarStorageFactory* avatarStorageFactory_; + AvatarStorage* avatarStorage_; ApplicationMessageDisplay* applicationMessageDisplay_; ChatController* chatController_; XMPPRosterController* xmppRosterController_; @@ -140,6 +137,5 @@ namespace Swift { int timeBeforeNextReconnect_; Timer::ref reconnectTimer_; StatusTracker* statusTracker_; - std::map<JID, AvatarStorage*> avatarStorages_; }; } |