Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-06-23 10:52:31 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-06-24 14:32:55 (GMT) |
| commit | c779e07f6d1d23cc157ab3823a00edd95f70ab3b (patch) | |
| tree | 5de546a38677ce19be1b34932144460f11197f96 /Swiften/Avatars/CombinedAvatarProvider.h | |
| parent | bd7f30aec53fc776be678577dbe4f9afec5898a6 (diff) | |
| download | swift-contrib-c779e07f6d1d23cc157ab3823a00edd95f70ab3b.zip swift-contrib-c779e07f6d1d23cc157ab3823a00edd95f70ab3b.tar.bz2 | |
Fix old avatar being displayed in QtRosterHeader when cleared.
Test-Information:
Added unit tests for AvatarManagerImpl and CombinedAvatarProvider. Updated test cases to distinguish between error case and empty avatar. Tested changing between blank and non-blank avatars while watching MUC and 1-to-1 chats.
Change-Id: I0bea89c7a22ae9c44a0b126e672a7af94b6f5049
Diffstat (limited to 'Swiften/Avatars/CombinedAvatarProvider.h')
| -rw-r--r-- | Swiften/Avatars/CombinedAvatarProvider.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Avatars/CombinedAvatarProvider.h b/Swiften/Avatars/CombinedAvatarProvider.h index 96989b2..ec06e72 100644 --- a/Swiften/Avatars/CombinedAvatarProvider.h +++ b/Swiften/Avatars/CombinedAvatarProvider.h @@ -10,23 +10,23 @@ #include <map> #include <Swiften/Base/API.h> #include <Swiften/Avatars/AvatarProvider.h> #include <Swiften/JID/JID.h> namespace Swift { class SWIFTEN_API CombinedAvatarProvider : public AvatarProvider { public: - virtual std::string getAvatarHash(const JID&) const; + virtual boost::optional<std::string> getAvatarHash(const JID&) const; void addProvider(AvatarProvider*); void removeProvider(AvatarProvider*); private: void handleAvatarChanged(const JID&); - std::string getCombinedAvatarAndCache(const JID&) const; + boost::optional<std::string> getCombinedAvatarAndCache(const JID&) const; private: std::vector<AvatarProvider*> providers; mutable std::map<JID, std::string> avatars; }; } |