Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-04-09 07:53:12 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-04-22 21:12:21 (GMT) |
| commit | a7fb55381ab4a5c470bf891b31ac6e201611a2c1 (patch) | |
| tree | 475b3b7fc0142946863580506b00aa250ef8ca14 /Swift/Controllers/Chat/UserSearchController.h | |
| parent | 4444aeb255f8d1712b794c31166f362bb3ec335a (diff) | |
| download | swift-a7fb55381ab4a5c470bf891b31ac6e201611a2c1.zip swift-a7fb55381ab4a5c470bf891b31ac6e201611a2c1.tar.bz2 | |
Fix crash in QtUserSearchWindow.
Avoid storing pointers to items in vectors. Using shared_ptr for Contact items.
Change-Id: I3baa05fc058011b2beca14dc620ab794988a2b37
Diffstat (limited to 'Swift/Controllers/Chat/UserSearchController.h')
| -rw-r--r-- | Swift/Controllers/Chat/UserSearchController.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Swift/Controllers/Chat/UserSearchController.h b/Swift/Controllers/Chat/UserSearchController.h index fc4c8e9..d630580 100644 --- a/Swift/Controllers/Chat/UserSearchController.h +++ b/Swift/Controllers/Chat/UserSearchController.h @@ -7,18 +7,20 @@ #pragma once #include <boost/shared_ptr.hpp> + #include <map> #include <vector> -#include <Swiften/Base/boost_bsignals.h> - -#include <Swiften/Elements/SearchPayload.h> #include <string> -#include <Swiften/JID/JID.h> + +#include <Swift/Controllers/Contact.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/DiscoInfo.h> #include <Swiften/Elements/DiscoItems.h> #include <Swiften/Elements/ErrorPayload.h> -#include <Swiften/Elements/VCard.h> #include <Swiften/Elements/Presence.h> +#include <Swiften/Elements/SearchPayload.h> +#include <Swiften/Elements/VCard.h> +#include <Swiften/JID/JID.h> namespace Swift { class UIEventStream; @@ -32,7 +34,6 @@ namespace Swift { class ContactSuggester; class AvatarManager; class PresenceOracle; - class Contact; class UserSearchResult { public: @@ -68,7 +69,7 @@ namespace Swift { void handlePresenceChanged(Presence::ref presence); void handleJIDUpdateRequested(const std::vector<JID>& jids); void handleJIDAddRequested(const std::vector<JID>& jids); - Contact convertJIDtoContact(const JID& jid); + Contact::ref convertJIDtoContact(const JID& jid); void endDiscoWalker(); void initializeUserWindow(); |