diff 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/ContactsFromXMPPRoster.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/ContactsFromXMPPRoster.h')
-rw-r--r-- | Swift/Controllers/ContactsFromXMPPRoster.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Swift/Controllers/ContactsFromXMPPRoster.h b/Swift/Controllers/ContactsFromXMPPRoster.h index 3815a99..4adc606 100644 --- a/Swift/Controllers/ContactsFromXMPPRoster.h +++ b/Swift/Controllers/ContactsFromXMPPRoster.h @@ -4,6 +4,12 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2014 Kevin Smith and Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + #pragma once #include <Swift/Controllers/ContactProvider.h> @@ -19,7 +25,7 @@ class ContactsFromXMPPRoster : public ContactProvider { ContactsFromXMPPRoster(XMPPRoster* roster, AvatarManager* avatarManager, PresenceOracle* presenceOracle); virtual ~ContactsFromXMPPRoster(); - virtual std::vector<Contact> getContacts(); + virtual std::vector<Contact::ref> getContacts(); private: XMPPRoster* roster_; AvatarManager* avatarManager_; |