Swiftdiff options
Diffstat (limited to 'Swift/Controllers/Contact.h')
| -rw-r--r-- | Swift/Controllers/Contact.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/Swift/Controllers/Contact.h b/Swift/Controllers/Contact.h index b03a118..47dda43 100644 --- a/Swift/Controllers/Contact.h +++ b/Swift/Controllers/Contact.h @@ -5,14 +5,15 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <boost/enable_shared_from_this.hpp> +#include <memory> + #include <boost/filesystem/path.hpp> #include <Swiften/Elements/StatusShow.h> @@ -20,22 +21,22 @@ namespace Swift { -class Contact : public boost::enable_shared_from_this<Contact> { - public: - typedef boost::shared_ptr<Contact> ref; +class Contact : public std::enable_shared_from_this<Contact> { + public: + typedef std::shared_ptr<Contact> ref; - Contact(); - Contact(const std::string& name, const JID& jid, StatusShow::Type statusType, const boost::filesystem::path& path); + Contact(); + Contact(const std::string& name, const JID& jid, StatusShow::Type statusType, const boost::filesystem::path& path); - static bool lexicographicalSortPredicate(const Contact::ref& a, const Contact::ref& b); - static bool equalityPredicate(const Contact::ref& a, const Contact::ref& b); - static bool sortPredicate(const Contact::ref& a, const Contact::ref& b, const std::string& search); + static bool lexicographicalSortPredicate(const Contact::ref& a, const Contact::ref& b); + static bool equalityPredicate(const Contact::ref& a, const Contact::ref& b); + static bool sortPredicate(const Contact::ref& a, const Contact::ref& b, const std::string& search); - public: - std::string name; - JID jid; - StatusShow::Type statusType; - boost::filesystem::path avatarPath; + public: + std::string name; + JID jid; + StatusShow::Type statusType; + boost::filesystem::path avatarPath; }; } |