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/QtUI | |
| parent | 734cdf96ee07357382914c1e38e19a5bf1f5078d (diff) | |
| download | swift-d786e1aeff062ef4f0a962d55ddce7d41c5f512e.zip swift-d786e1aeff062ef4f0a962d55ddce7d41c5f512e.tar.bz2 | |
Revert "Store avatars per profile."
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 7 | ||||
| -rw-r--r-- | Swift/QtUI/QtSwift.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 897fae8..55bc112 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -23,7 +23,7 @@ #include "Swiften/Application/Application.h" #include "Swiften/Application/PlatformApplication.h" #include "Swiften/Application/PlatformApplicationPathProvider.h" -#include "Swiften/Avatars/AvatarFileStorageFactory.h" +#include "Swiften/Avatars/AvatarFileStorage.h" #include "Swiften/Base/String.h" #include "Swiften/Base/Platform.h" #include "Swiften/Elements/Presence.h" @@ -78,7 +78,7 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { settings_ = new QtSettingsProvider(); application_ = new PlatformApplication(SWIFT_APPLICATION_NAME); applicationPathProvider_ = new PlatformApplicationPathProvider(SWIFT_APPLICATION_NAME); - avatarStorageFactory_ = new AvatarFileStorageFactory(applicationPathProvider_->getAvatarDir()); + avatarStorage_ = new AvatarFileStorage(applicationPathProvider_->getAvatarDir()); chatWindowFactory_ = new QtChatWindowFactory(splitter_, settings_, tabs_); soundPlayer_ = new QtSoundPlayer(applicationPathProvider_); if (splitter_) { @@ -100,7 +100,7 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { chatListWindowFactories_.push_back(chatListWindowFactory); QtMUCSearchWindowFactory* mucSearchWindowFactory = new QtMUCSearchWindowFactory(); mucSearchWindowFactories_.push_back(mucSearchWindowFactory); - MainController* mainController = new MainController(chatWindowFactory_, rosterWindowFactory, loginWindowFactory, eventWindowFactory, settings_, systemTray, soundPlayer_, xmlConsoleWidgetFactory, chatListWindowFactory, mucSearchWindowFactory, avatarStorageFactory_, application_->getApplicationMessageDisplay(), options.count("latency-debug") > 0); + MainController* mainController = new MainController(chatWindowFactory_, rosterWindowFactory, loginWindowFactory, eventWindowFactory, settings_, systemTray, soundPlayer_, xmlConsoleWidgetFactory, chatListWindowFactory, mucSearchWindowFactory, avatarStorage_, application_->getApplicationMessageDisplay(), options.count("latency-debug") > 0); mainControllers_.push_back(mainController); } @@ -114,7 +114,6 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { QtSwift::~QtSwift() { delete autoUpdater_; - delete avatarStorageFactory_; delete chatWindowFactory_; foreach (QtMainWindowFactory* factory, rosterWindowFactories_) { delete factory; diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index d877e66..d205f9f 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -25,7 +25,7 @@ namespace Swift { class AutoUpdater; class Application; class ApplicationPathProvider; - class AvatarStorageFactory; + class AvatarStorage; class MainController; class QtChatWindowFactory; class QtMainWindowFactory; @@ -60,7 +60,7 @@ namespace Swift { QtChatTabs* tabs_; Application* application_; ApplicationPathProvider* applicationPathProvider_; - AvatarStorageFactory* avatarStorageFactory_; + AvatarStorage* avatarStorage_; AutoUpdater* autoUpdater_; }; |