Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-05-23 19:02:26 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-05-23 19:02:26 (GMT) |
| commit | 0c4eba31839a8174a8d7776b0f55fcbd12899d10 (patch) | |
| tree | d12027713968332f98eee44e6671e95f0f5682ca | |
| parent | 182bdd709a57ab4d17f163ae28c5663fb3dd4287 (diff) | |
| parent | 3f72e2c3b7ce5a83287dc136c68b7ef6d2cc66bd (diff) | |
| download | swift-0c4eba31839a8174a8d7776b0f55fcbd12899d10.zip swift-0c4eba31839a8174a8d7776b0f55fcbd12899d10.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Fixed const references to vectors.
Conflicts:
Swiften/Elements/JinglePayload.h
Swiften/Jingle/JingleSession.h
| -rw-r--r-- | Swift/Controllers/Roster/RosterController.cpp | 2 | ||||
| -rw-r--r-- | Swift/Controllers/Roster/RosterController.h | 2 | ||||
| -rw-r--r-- | Swiften/Elements/DiscoInfo.h | 2 | ||||
| -rw-r--r-- | Swiften/Elements/FormField.h | 2 | ||||
| -rw-r--r-- | Swiften/Elements/JinglePayload.h | 2 | ||||
| -rw-r--r-- | Swiften/Elements/MUCUserPayload.h | 4 | ||||
| -rw-r--r-- | Swiften/Elements/SearchPayload.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/Swift/Controllers/Roster/RosterController.cpp b/Swift/Controllers/Roster/RosterController.cpp index 706f50a..5b61abf 100644 --- a/Swift/Controllers/Roster/RosterController.cpp +++ b/Swift/Controllers/Roster/RosterController.cpp @@ -142,7 +142,7 @@ void RosterController::handleOnJIDRemoved(const JID& jid) { roster_->removeContact(jid); } -void RosterController::handleOnJIDUpdated(const JID& jid, const std::string& oldName, const std::vector<std::string> passedOldGroups) { +void RosterController::handleOnJIDUpdated(const JID& jid, const std::string& oldName, const std::vector<std::string>& passedOldGroups) { if (oldName != xmppRoster_->getNameForJID(jid)) { roster_->applyOnItems(SetName(nickResolver_->jidToNick(jid), jid)); } diff --git a/Swift/Controllers/Roster/RosterController.h b/Swift/Controllers/Roster/RosterController.h index f224180..0a2b818 100644 --- a/Swift/Controllers/Roster/RosterController.h +++ b/Swift/Controllers/Roster/RosterController.h @@ -57,7 +57,7 @@ namespace Swift { void handleOnJIDAdded(const JID &jid); void handleRosterCleared(); void handleOnJIDRemoved(const JID &jid); - void handleOnJIDUpdated(const JID &jid, const std::string& oldName, const std::vector<std::string> oldGroups); + void handleOnJIDUpdated(const JID &jid, const std::string& oldName, const std::vector<std::string>& oldGroups); void handleStartChatRequest(const JID& contact); void handleChangeStatusRequest(StatusShow::Type show, const std::string &statusText); void handleShowOfflineToggled(bool state); diff --git a/Swiften/Elements/DiscoInfo.h b/Swiften/Elements/DiscoInfo.h index cb6a446..ab09d05 100644 --- a/Swiften/Elements/DiscoInfo.h +++ b/Swiften/Elements/DiscoInfo.h @@ -87,7 +87,7 @@ namespace Swift { extensions_.push_back(form); } - const std::vector<Form::ref> getExtensions() const { + const std::vector<Form::ref>& getExtensions() const { return extensions_; } diff --git a/Swiften/Elements/FormField.h b/Swiften/Elements/FormField.h index 31e179d..e8fe3a0 100644 --- a/Swiften/Elements/FormField.h +++ b/Swiften/Elements/FormField.h @@ -48,7 +48,7 @@ namespace Swift { return options; } - const std::vector<std::string> getRawValues() const { + const std::vector<std::string>& getRawValues() const { return rawValues; } diff --git a/Swiften/Elements/JinglePayload.h b/Swiften/Elements/JinglePayload.h index be02543..5c766b8 100644 --- a/Swiften/Elements/JinglePayload.h +++ b/Swiften/Elements/JinglePayload.h @@ -102,7 +102,7 @@ namespace Swift { this->contents.push_back(content); } - const std::vector<JingleContentPayload::ref> getContents() const { + const std::vector<JingleContentPayload::ref>& getContents() const { return contents; } diff --git a/Swiften/Elements/MUCUserPayload.h b/Swiften/Elements/MUCUserPayload.h index b142a8d..0276964 100644 --- a/Swiften/Elements/MUCUserPayload.h +++ b/Swiften/Elements/MUCUserPayload.h @@ -52,9 +52,9 @@ namespace Swift { void addStatusCode(StatusCode code) {statusCodes_.push_back(code);} - const std::vector<Item> getItems() const {return items_;} + const std::vector<Item>& getItems() const {return items_;} - const std::vector<StatusCode> getStatusCodes() const {return statusCodes_;} + const std::vector<StatusCode>& getStatusCodes() const {return statusCodes_;} private: std::vector<Item> items_; diff --git a/Swiften/Elements/SearchPayload.h b/Swiften/Elements/SearchPayload.h index fe5b09a..202007b 100644 --- a/Swiften/Elements/SearchPayload.h +++ b/Swiften/Elements/SearchPayload.h @@ -74,7 +74,7 @@ namespace Swift { this->email = v; } - const std::vector<Item> getItems() const { + const std::vector<Item>& getItems() const { return items; } |