From 9abe8557f9d9c3a1bdac8521078c4feab8718ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@savoirfairelinux.com> Date: Thu, 28 Jul 2011 17:24:45 -0400 Subject: [PATCH] Account::_accountID: constify It is set by the constructor No need to unserialize it again either --- sflphone-common/src/account.h | 2 +- sflphone-common/src/iax/iaxaccount.cpp | 1 - sflphone-common/src/sip/sipaccount.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sflphone-common/src/account.h b/sflphone-common/src/account.h index de933a3a0e..a263128e37 100644 --- a/sflphone-common/src/account.h +++ b/sflphone-common/src/account.h @@ -364,7 +364,7 @@ class Account : public Serializable /** * Account ID are assign in constructor and shall not changed */ - std::string _accountID; + const std::string _accountID; /** * Account login information: username diff --git a/sflphone-common/src/iax/iaxaccount.cpp b/sflphone-common/src/iax/iaxaccount.cpp index 6c22217811..a1e8ac5530 100644 --- a/sflphone-common/src/iax/iaxaccount.cpp +++ b/sflphone-common/src/iax/iaxaccount.cpp @@ -97,7 +97,6 @@ void IAXAccount::unserialize (Conf::MappingNode *map) map->getValue(aliasKey, &_alias); map->getValue(typeKey, &_type); - map->getValue(idKey, &_accountID); map->getValue(usernameKey, &_username); map->getValue(passwordKey, &_password); map->getValue(hostnameKey, &_hostname); diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp index b90f5e4235..e64a91dd45 100644 --- a/sflphone-common/src/sip/sipaccount.cpp +++ b/sflphone-common/src/sip/sipaccount.cpp @@ -296,7 +296,6 @@ void SIPAccount::unserialize (Conf::MappingNode *map) map->getValue(aliasKey, &_alias); map->getValue(typeKey, &_type); - map->getValue(idKey, &_accountID); map->getValue(usernameKey, &_username); map->getValue(authenticationUsernameKey, &_authenticationUsername); map->getValue(passwordKey, &_password); -- GitLab