summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /Swiften/Avatars/CombinedAvatarProvider.h
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Avatars/CombinedAvatarProvider.h')
-rw-r--r--Swiften/Avatars/CombinedAvatarProvider.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Avatars/CombinedAvatarProvider.h b/Swiften/Avatars/CombinedAvatarProvider.h
index fbd6ce7..9c83732 100644
--- a/Swiften/Avatars/CombinedAvatarProvider.h
+++ b/Swiften/Avatars/CombinedAvatarProvider.h
@@ -15,7 +15,7 @@
namespace Swift {
class CombinedAvatarProvider : public AvatarProvider {
public:
- virtual String getAvatarHash(const JID&) const;
+ virtual std::string getAvatarHash(const JID&) const;
void addProvider(AvatarProvider*);
void removeProvider(AvatarProvider*);
@@ -25,6 +25,6 @@ namespace Swift {
private:
std::vector<AvatarProvider*> providers;
- std::map<JID, String> avatars;
+ std::map<JID, std::string> avatars;
};
}