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;
 	};
 }