mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 19:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(src/components/settings/AccountSettingsModel): use primaryDisplayName instead of primaryDisplayname

Browse source
This commit is contained in:
Ronan Abhamon 2017-04-25 15:57:04 +02:00
parent f809c5c482
commit 4d4bcf8558
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-desktop/src/components/settings/AccountSettingsModel.cpp
View file

@ -240,13 +240,13 @@ void AccountSettingsModel::setPrimaryUsername (const QString &username) {
emit accountSettingsUpdated();
}
QString AccountSettingsModel::getPrimaryDisplayname () const {
QString AccountSettingsModel::getPrimaryDisplayName () const {
return ::Utils::linphoneStringToQString(
CoreManager::getInstance()->getCore()->getPrimaryContactParsed()->getDisplayName()
);
}
void AccountSettingsModel::setPrimaryDisplayname (const QString &displayName) {
void AccountSettingsModel::setPrimaryDisplayName (const QString &displayName) {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
shared_ptr<linphone::Address> primary = core->getPrimaryContactParsed();

6
linphone-desktop/src/components/settings/AccountSettingsModel.hpp
View file

@ -37,7 +37,7 @@ class AccountSettingsModel : public QObject {
Q_PROPERTY(RegistrationState registrationState READ getRegistrationState NOTIFY accountSettingsUpdated);
// Default info.
Q_PROPERTY(QString primaryDisplayname READ getPrimaryDisplayname WRITE setPrimaryDisplayname NOTIFY accountSettingsUpdated);
Q_PROPERTY(QString primaryDisplayName READ getPrimaryDisplayName WRITE setPrimaryDisplayName NOTIFY accountSettingsUpdated);
Q_PROPERTY(QString primaryUsername READ getPrimaryUsername WRITE setPrimaryUsername NOTIFY accountSettingsUpdated);
Q_PROPERTY(QString primarySipAddress READ getPrimarySipAddress NOTIFY accountSettingsUpdated);
@ -90,8 +90,8 @@ private:
QString getPrimaryUsername () const;
void setPrimaryUsername (const QString &username);
QString getPrimaryDisplayname () const;
void setPrimaryDisplayname (const QString &displayName);
QString getPrimaryDisplayName () const;
void setPrimaryDisplayName (const QString &displayName);
QString getPrimarySipAddress () const;