Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-10-12 10:07:39 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-10-21 07:07:35 (GMT) |
| commit | 687c1082c26ccad85d905d256f8f9d41388aa299 (patch) | |
| tree | 980bd0b28950a60170132367e528ff1131b357d0 /Swift/Controllers/Roster/Roster.h | |
| parent | 565c85194a76fae6efe548017af4b24626e2a7fa (diff) | |
| download | swift-687c1082c26ccad85d905d256f8f9d41388aa299.zip swift-687c1082c26ccad85d905d256f8f9d41388aa299.tar.bz2 | |
Use unique_ptr instead of manual delete
Changed the code to use range-based for loop were possible.
Test-Information:
Builds and unit tests pass on macOS 10.12 with Qt 5.5.1.
Change-Id: I118aa4ac5887544a1b2d8fb6ee2910b44447467a
Diffstat (limited to 'Swift/Controllers/Roster/Roster.h')
| -rw-r--r-- | Swift/Controllers/Roster/Roster.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Swift/Controllers/Roster/Roster.h b/Swift/Controllers/Roster/Roster.h index ee5a476..d22b38d 100644 --- a/Swift/Controllers/Roster/Roster.h +++ b/Swift/Controllers/Roster/Roster.h @@ -33,40 +33,42 @@ class Roster { void addContact(const JID& jid, const JID& displayJID, const std::string& name, const std::string& group, const boost::filesystem::path& avatarPath); void removeContact(const JID& jid); void removeContactFromGroup(const JID& jid, const std::string& group); void removeGroup(const std::string& group); void removeAll(); void applyOnItems(const RosterItemOperation& operation); void applyOnAllItems(const RosterItemOperation& operation); void applyOnItem(const RosterItemOperation& operation, const JID& jid); void addFilter(RosterFilter* filter); void removeFilter(RosterFilter* filter); GroupRosterItem* getRoot() const; std::set<JID> getJIDs() const; std::vector<RosterFilter*> getFilters() {return filters_;} boost::signals2::signal<void (GroupRosterItem*)> onChildrenChanged; boost::signals2::signal<void (GroupRosterItem*)> onGroupAdded; boost::signals2::signal<void (RosterItem*)> onDataChanged; boost::signals2::signal<void (JID&)> onVCardUpdateRequested; boost::signals2::signal<void (RosterFilter* filter)> onFilterAdded; boost::signals2::signal<void (RosterFilter* filter)> onFilterRemoved; GroupRosterItem* getGroup(const std::string& groupName); void setBlockingSupported(bool isSupported); private: void handleDataChanged(RosterItem* item); void handleChildrenChanged(GroupRosterItem* item); void filterGroup(GroupRosterItem* item); void filterContact(ContactRosterItem* contact, GroupRosterItem* group); void filterAll(); - GroupRosterItem* root_; + + private: std::vector<RosterFilter*> filters_; typedef std::map<JID, std::vector<ContactRosterItem*> > ItemMap; ItemMap itemMap_; bool fullJIDMapping_; bool sortByStatus_; - bool blockingSupported_; + bool blockingSupported_ = false; + const std::unique_ptr<GroupRosterItem> root_; }; } |