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 /Swiften | |
| parent | 734cdf96ee07357382914c1e38e19a5bf1f5078d (diff) | |
| download | swift-d786e1aeff062ef4f0a962d55ddce7d41c5f512e.zip swift-d786e1aeff062ef4f0a962d55ddce7d41c5f512e.tar.bz2 | |
Revert "Store avatars per profile."
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Avatars/AvatarFileStorage.cpp | 1 | ||||
| -rw-r--r-- | Swiften/Avatars/AvatarFileStorageFactory.h | 27 | ||||
| -rw-r--r-- | Swiften/Avatars/AvatarStorageFactory.cpp | 15 | ||||
| -rw-r--r-- | Swiften/Avatars/AvatarStorageFactory.h | 19 | ||||
| -rw-r--r-- | Swiften/SConscript | 1 |
5 files changed, 0 insertions, 63 deletions
diff --git a/Swiften/Avatars/AvatarFileStorage.cpp b/Swiften/Avatars/AvatarFileStorage.cpp index aeb8db5..a0ebd21 100644 --- a/Swiften/Avatars/AvatarFileStorage.cpp +++ b/Swiften/Avatars/AvatarFileStorage.cpp @@ -12,7 +12,6 @@ namespace Swift { AvatarFileStorage::AvatarFileStorage(const boost::filesystem::path& path) : path_(path) { - std::cerr << "Creating avatar file storage: " << path.string() << std::endl; try { boost::filesystem::create_directory(path_); } diff --git a/Swiften/Avatars/AvatarFileStorageFactory.h b/Swiften/Avatars/AvatarFileStorageFactory.h deleted file mode 100644 index fb5963c..0000000 --- a/Swiften/Avatars/AvatarFileStorageFactory.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include <boost/filesystem.hpp> - -#include "AvatarStorageFactory.h" -#include "AvatarFileStorage.h" - -namespace Swift { - class AvatarFileStorageFactory: public AvatarStorageFactory { - public: - AvatarFileStorageFactory(const boost::filesystem::path& basePath) : basePath(basePath) { - } - - virtual AvatarStorage* createAvatarStorage(const JID& profile) { - return new AvatarFileStorage(basePath / profile.getBare().getUTF8String()); - } - - private: - boost::filesystem::path basePath; - }; -} diff --git a/Swiften/Avatars/AvatarStorageFactory.cpp b/Swiften/Avatars/AvatarStorageFactory.cpp deleted file mode 100644 index b525909..0000000 --- a/Swiften/Avatars/AvatarStorageFactory.cpp +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#include "Swiften/Avatars/AvatarStorageFactory.h" - -namespace Swift { - -AvatarStorageFactory::~AvatarStorageFactory() { - -} - -} diff --git a/Swiften/Avatars/AvatarStorageFactory.h b/Swiften/Avatars/AvatarStorageFactory.h deleted file mode 100644 index efc26e9..0000000 --- a/Swiften/Avatars/AvatarStorageFactory.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -namespace Swift { - class AvatarStorage; - class JID; - - class AvatarStorageFactory { - public: - virtual ~AvatarStorageFactory(); - - virtual AvatarStorage* createAvatarStorage(const JID& profile) = 0; - }; -} diff --git a/Swiften/SConscript b/Swiften/SConscript index 0a4530a..3d4d5f6 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -27,7 +27,6 @@ if env["SCONS_STAGE"] == "build" : "Avatars/AvatarFileStorage.cpp", "Avatars/AvatarManager.cpp", "Avatars/AvatarStorage.cpp", - "Avatars/AvatarStorageFactory.cpp", "Chat/ChatStateTracker.cpp", "Chat/ChatStateNotifier.cpp", "Chat/ChatStateMessageSender.cpp", |