summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-10-12 10:07:39 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-10-21 07:07:35 (GMT)
commit687c1082c26ccad85d905d256f8f9d41388aa299 (patch)
tree980bd0b28950a60170132367e528ff1131b357d0 /Swift/Controllers/Roster/Roster.h
parent565c85194a76fae6efe548017af4b24626e2a7fa (diff)
downloadswift-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.h6
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
@@ -60,13 +60,15 @@ class Roster {
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_;
};
}