diff options
author | Remko Tronçon <git@el-tramo.be> | 2010-10-24 13:46:12 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2010-10-24 15:56:44 (GMT) |
commit | 9dccf1e0c86b10d41dd2d5f3bf71faf1bf8d77c8 (patch) | |
tree | 4d054c17e759f5f206c67fbbef1ca3e77647ba07 /Swift/QtUI/QtSwift.cpp | |
parent | efc2bed8610f6e1b7fc29b3dd6f13137fc19bdf6 (diff) | |
download | swift-contrib-9dccf1e0c86b10d41dd2d5f3bf71faf1bf8d77c8.zip swift-contrib-9dccf1e0c86b10d41dd2d5f3bf71faf1bf8d77c8.tar.bz2 |
Created Storages interface.
Diffstat (limited to 'Swift/QtUI/QtSwift.cpp')
-rw-r--r-- | Swift/QtUI/QtSwift.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index d9879a2..d61f94c 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -26,9 +26,9 @@ #include "SwifTools/Application/PlatformApplicationPathProvider.h" #include "Swiften/Avatars/AvatarFileStorage.h" #include "Swiften/Disco/CapsFileStorage.h" -#include "Swiften/VCards/VCardFileStorageFactory.h" #include "Swiften/Base/String.h" #include "Swiften/Base/Platform.h" +#include "Swift/Controllers/FileStoragesFactory.h" #include "Swiften/Elements/Presence.h" #include "Swiften/Client/Client.h" #include "Swift/Controllers/MainController.h" @@ -95,9 +95,7 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { tabs_ = options.count("no-tabs") && !(splitter_ > 0) ? NULL : new QtChatTabs(); settings_ = new QtSettingsProvider(); applicationPathProvider_ = new PlatformApplicationPathProvider(SWIFT_APPLICATION_NAME); - avatarStorage_ = new AvatarFileStorage(applicationPathProvider_->getAvatarDir()); - vcardStorageFactory_ = new VCardFileStorageFactory(applicationPathProvider_->getDataDir()); - capsStorage_ = new CapsFileStorage(applicationPathProvider_->getDataDir() / "caps"); + storagesFactory_ = new FileStoragesFactory(applicationPathProvider_->getDataDir()); chatWindowFactory_ = new QtChatWindowFactory(splitter_, settings_, tabs_, ""); soundPlayer_ = new QtSoundPlayer(applicationPathProvider_); #if defined(HAVE_GROWL) @@ -147,9 +145,7 @@ QtSwift::QtSwift(po::variables_map options) : autoUpdater_(NULL) { xmlConsoleWidgetFactory, chatListWindowFactory, mucSearchWindowFactory, - avatarStorage_, - capsStorage_, - vcardStorageFactory_, + storagesFactory_, dock_, notifier_, options.count("latency-debug") > 0); @@ -197,9 +193,7 @@ QtSwift::~QtSwift() { foreach (QtChatListWindowFactory* factory, chatListWindowFactories_) { delete factory; } - delete capsStorage_; - delete avatarStorage_; - delete vcardStorageFactory_; + delete storagesFactory_; } } |