jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

* #28351: account: use range-based for loop

Browse Source
This commit is contained in:
Tristan Matthews
2013-08-13 14:43:12 -04:00
parent 04ac126d9e
commit db21bb42a6
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/src/account.cpp
View File

@ -159,8 +159,8 @@ namespace {
}
// check that it's in the list of valid codecs and that it has all the required fields
for (vector<map<string, string> >::const_iterator i = defaults.begin(); i != defaults.end(); ++i) {
const map<string, string>::const_iterator defaultName = i->find(Account::VIDEO_CODEC_NAME);
for (const auto &i : defaults) {
const auto defaultName = i.find(Account::VIDEO_CODEC_NAME);
if (defaultName->second == name->second) {
return isFieldValid(codec, Account::VIDEO_CODEC_BITRATE, isPositiveInteger)
and isFieldValid(codec, Account::VIDEO_CODEC_ENABLED, isBoolean);
@ -172,16 +172,15 @@ namespace {
bool isCodecListValid(const vector<map<string, string> > &list)
{
const vector<map<string, string> > defaults(libav_utils::getDefaultCodecs());
const auto defaults(libav_utils::getDefaultCodecs());
if (list.size() != defaults.size()) {
ERROR("New codec list has a different length than the list of supported codecs");
return false;
}
// make sure that all codecs are present
for (vector<map<string, string> >::const_iterator i = list.begin();
i != list.end(); ++i) {
if (not isCodecValid(*i, defaults))
for (const auto &i : list) {
if (not isCodecValid(i, defaults))
return false;
}
return true;
@ -237,8 +236,8 @@ void Account::setActiveAudioCodecs(const vector<string> &list)
// list contains the ordered payload of active codecs picked by the user for this account
// we used the codec vector to save the order.
for (vector<string>::const_iterator iter = list.begin(); iter != list.end(); ++iter) {
int payload = std::atoi(iter->c_str());
for (const auto &iter : list) {
int payload = std::atoi(iter.c_str());
audioCodecList_.push_back(payload);
}