summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-20 20:58:10 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-20 20:58:10 (GMT)
commit1a8df7d98e58adde9bd0611b5689507780393856 (patch)
treeb542e55857a03415ff3bf56df545bd53f74535f7 /Swift/Controllers/Roster
parentf2e720cef84f8e613b8c72a4a02da1c75db7d226 (diff)
parent1fe811468562aaf9cf1583997fb0894c0f56da15 (diff)
downloadswift-contrib-1a8df7d98e58adde9bd0611b5689507780393856.zip
swift-contrib-1a8df7d98e58adde9bd0611b5689507780393856.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Return groups vector by reference. Updated Dutch and French translations.
Diffstat (limited to 'Swift/Controllers/Roster')
-rw-r--r--Swift/Controllers/Roster/ContactRosterItem.cpp2
-rw-r--r--Swift/Controllers/Roster/ContactRosterItem.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Roster/ContactRosterItem.cpp b/Swift/Controllers/Roster/ContactRosterItem.cpp
index 7146040..894f64b 100644
--- a/Swift/Controllers/Roster/ContactRosterItem.cpp
+++ b/Swift/Controllers/Roster/ContactRosterItem.cpp
@@ -101,7 +101,7 @@ void ContactRosterItem::applyPresence(const std::string& resource, boost::shared
onDataChanged();
}
-const std::vector<std::string> ContactRosterItem::getGroups() const {
+const std::vector<std::string>& ContactRosterItem::getGroups() const {
return groups_;
}
diff --git a/Swift/Controllers/Roster/ContactRosterItem.h b/Swift/Controllers/Roster/ContactRosterItem.h
index ae8d5b0..7aa948c 100644
--- a/Swift/Controllers/Roster/ContactRosterItem.h
+++ b/Swift/Controllers/Roster/ContactRosterItem.h
@@ -36,7 +36,7 @@ class ContactRosterItem : public RosterItem {
void applyPresence(const std::string& resource, boost::shared_ptr<Presence> presence);
void clearPresence();
void calculateShownPresence();
- const std::vector<std::string> getGroups() const;
+ const std::vector<std::string>& getGroups() const;
/** Only used so a contact can know about the groups it's in*/
void addGroup(const std::string& group);
void removeGroup(const std::string& group);