From 4d4bcf85584d7895a7a9bb1fabafd1bb030ffcdc Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 25 Apr 2017 15:57:04 +0200 Subject: [PATCH] fix(src/components/settings/AccountSettingsModel): use `primaryDisplayName` instead of `primaryDisplayname` --- .../src/components/settings/AccountSettingsModel.cpp | 4 ++-- .../src/components/settings/AccountSettingsModel.hpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp index cbfc40079..ff8493035 100644 --- a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp @@ -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 core = CoreManager::getInstance()->getCore(); shared_ptr primary = core->getPrimaryContactParsed(); diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.hpp b/linphone-desktop/src/components/settings/AccountSettingsModel.hpp index 31f718499..38d01c648 100644 --- a/linphone-desktop/src/components/settings/AccountSettingsModel.hpp +++ b/linphone-desktop/src/components/settings/AccountSettingsModel.hpp @@ -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;