From be0f3bcaed56cef5e249ebb7cc233205578e73df Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 7 Apr 2017 14:18:59 +0200 Subject: [PATCH] feat(src/components/assistant): comment useless code for the moment --- .../components/assistant/AssistantModel.cpp | 113 ++++++++++-------- .../components/assistant/AssistantModel.hpp | 2 + .../AssistantUseLinphoneSipAccount.qml | 2 + 3 files changed, 65 insertions(+), 52 deletions(-) diff --git a/linphone-desktop/src/components/assistant/AssistantModel.cpp b/linphone-desktop/src/components/assistant/AssistantModel.cpp index bd1d33d9e..b7b6a643f 100644 --- a/linphone-desktop/src/components/assistant/AssistantModel.cpp +++ b/linphone-desktop/src/components/assistant/AssistantModel.cpp @@ -37,11 +37,11 @@ public: m_assistant = assistant; } - void onCreateAccount ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} + // void onCreateAccount ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} void onIsAccountExist ( const shared_ptr &creator, @@ -59,53 +59,53 @@ public: } } - void onActivateAccount ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} - - void onIsAccountActivated ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} - - void onLinkAccount ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} - - void onActivateAlias ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} - - void onIsAliasUsed ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} - - void onIsAccountLinked ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} - - void onRecoverAccount ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} - - void onUpdateAccount ( - const shared_ptr &creator, - linphone::AccountCreatorStatus status, - const string &resp - ) override {} + // void onActivateAccount ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} + // + // void onIsAccountActivated ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} + // + // void onLinkAccount ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} + // + // void onActivateAlias ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} + // + // void onIsAliasUsed ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} + // + // void onIsAccountLinked ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} + // + // void onRecoverAccount ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} + // + // void onUpdateAccount ( + // const shared_ptr &creator, + // linphone::AccountCreatorStatus status, + // const string &resp + // ) override {} private: AssistantModel *m_assistant; @@ -176,6 +176,15 @@ void AssistantModel::setPassword (const QString &password) { emit passwordChanged(password, error); } +void AssistantModel::setPhoneNumber (const QString &phone_number) { + // shared_ptr config = CoreManager::getInstance()->getCore()->getConfig(); + QString error; + + // TODO: use the future wrapped function: `set_phone_number`. + + emit phoneNumberChanged(phone_number, error); +} + // ----------------------------------------------------------------------------- void AssistantModel::login () { diff --git a/linphone-desktop/src/components/assistant/AssistantModel.hpp b/linphone-desktop/src/components/assistant/AssistantModel.hpp index 846e09296..b0c33ed7f 100644 --- a/linphone-desktop/src/components/assistant/AssistantModel.hpp +++ b/linphone-desktop/src/components/assistant/AssistantModel.hpp @@ -38,12 +38,14 @@ public: Q_INVOKABLE void setUsername (const QString &username); Q_INVOKABLE void setPassword (const QString &password); + Q_INVOKABLE void setPhoneNumber (const QString &phone_number); Q_INVOKABLE void login (); signals: void usernameChanged (const QString &username, const QString &error); void passwordChanged (const QString &password, const QString &error); + void phoneNumberChanged (const QString &phone_number, const QString &error); void loginStatusChanged (const QString &error); diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml index 23d343e76..77b54611c 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/AssistantUseLinphoneSipAccount.qml @@ -115,6 +115,8 @@ AssistantAbstractView { text: qsTr('useUsernameToLogin') width: AssistantUseLinphoneSipAccountStyle.checkBox.width + + onClicked: requestBlock.stop('') } RequestBlock {