From ca1f4a44fc444de161881ebacab84991a7cbcad5 Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Fri, 9 Jun 2017 16:06:59 +0200 Subject: [PATCH] feat(app): coding style and update subdmodules --- .../components/conference/ConferenceModel.cpp | 22 ++++++------------- .../components/conference/ConferenceModel.hpp | 6 ++--- submodules/bctoolbox | 2 +- submodules/belcard | 2 +- submodules/belle-sip | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- submodules/msamr | 2 +- submodules/msopenh264 | 2 +- submodules/mssilk | 2 +- submodules/msx264 | 2 +- submodules/ortp | 2 +- 12 files changed, 19 insertions(+), 29 deletions(-) diff --git a/linphone-desktop/src/components/conference/ConferenceModel.cpp b/linphone-desktop/src/components/conference/ConferenceModel.cpp index d182959cd..6984d61ff 100644 --- a/linphone-desktop/src/components/conference/ConferenceModel.cpp +++ b/linphone-desktop/src/components/conference/ConferenceModel.cpp @@ -45,7 +45,7 @@ ConferenceModel::ConferenceModel (QObject *parent) : QSortFilterProxyModel(paren QObject::connect( CoreManager::getInstance()->getHandlers().get(), &CoreHandlers::callStateChanged, - this, &ConferenceModel::handleCallStateChanged + this, [this] { emit conferenceChanged(); } ); } @@ -125,31 +125,23 @@ bool ConferenceModel::getRecording () const { // ----------------------------------------------------------------------------- float ConferenceModel::getMicroVu () const { - shared_ptr core = CoreManager::getInstance()->getCore(); - return LinphoneUtils::computeVu(core->getConferenceLocalInputVolume()); + return LinphoneUtils::computeVu( + CoreManager::getInstance()->getCore()->getConferenceLocalInputVolume() + ); } // ----------------------------------------------------------------------------- void ConferenceModel::leave () { - shared_ptr core = CoreManager::getInstance()->getCore(); - core->leaveConference(); + CoreManager::getInstance()->getCore()->leaveConference(); emit conferenceChanged(); } void ConferenceModel::join () { - shared_ptr core = CoreManager::getInstance()->getCore(); - core->enterConference(); + CoreManager::getInstance()->getCore()->enterConference(); emit conferenceChanged(); } bool ConferenceModel::isInConference () const { - shared_ptr core = CoreManager::getInstance()->getCore(); - return core->isInConference(); -} - -// ----------------------------------------------------------------------------- - -void ConferenceModel::handleCallStateChanged (const shared_ptr &call, linphone::CallState state) { - emit conferenceChanged(); + return CoreManager::getInstance()->getCore()->isInConference(); } diff --git a/linphone-desktop/src/components/conference/ConferenceModel.hpp b/linphone-desktop/src/components/conference/ConferenceModel.hpp index 4427a3cb2..739c55fcb 100644 --- a/linphone-desktop/src/components/conference/ConferenceModel.hpp +++ b/linphone-desktop/src/components/conference/ConferenceModel.hpp @@ -51,7 +51,7 @@ protected: Q_INVOKABLE void startRecording (); Q_INVOKABLE void stopRecording (); - + Q_INVOKABLE void join (); Q_INVOKABLE void leave (); @@ -60,11 +60,9 @@ signals: void microMutedChanged (bool status); void recordingChanged (bool status); - void conferenceChanged(); + void conferenceChanged (); private: - void handleCallStateChanged (const std::shared_ptr &call, linphone::CallState state); - int getCount () const { return rowCount(); } diff --git a/submodules/bctoolbox b/submodules/bctoolbox index e401c0a91..6fd63808a 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit e401c0a91f81ff2a22b713151617ba4e7994c855 +Subproject commit 6fd63808ae0be8caa52a94e065d325ba5844b3ed diff --git a/submodules/belcard b/submodules/belcard index e143d5654..38eba4c26 160000 --- a/submodules/belcard +++ b/submodules/belcard @@ -1 +1 @@ -Subproject commit e143d5654e4736fcc57bfc423ab626fea818f27c +Subproject commit 38eba4c264b5e45c8650c8ccf05f359541d8c4ae diff --git a/submodules/belle-sip b/submodules/belle-sip index 5ea997060..dfefba740 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 5ea997060204d7eb680d94c8f258ca5bfdce1d65 +Subproject commit dfefba74048a363e5bb78d0395d6087bf2646eb8 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 250a969eb..ca5c75062 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 250a969ebbe708203dc0af9f2c6f1a0f3546c9f3 +Subproject commit ca5c750626c928d2a50c113df2faf91fbdf4380a diff --git a/submodules/linphone b/submodules/linphone index f2a56412f..2b93067a7 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f2a56412ff684a52a2848856cd7aaaa5e9971e9b +Subproject commit 2b93067a78a0373f24ee868d5bd0523f6be15d14 diff --git a/submodules/msamr b/submodules/msamr index aaa046142..d86b907b3 160000 --- a/submodules/msamr +++ b/submodules/msamr @@ -1 +1 @@ -Subproject commit aaa046142033c4ec646e0e1b6f3641177490aa10 +Subproject commit d86b907b31eb7ecd6a3fd4409d5c9633d4366164 diff --git a/submodules/msopenh264 b/submodules/msopenh264 index 3a398b400..5544086f4 160000 --- a/submodules/msopenh264 +++ b/submodules/msopenh264 @@ -1 +1 @@ -Subproject commit 3a398b4000f29c67e010057f718c136ca245a9a8 +Subproject commit 5544086f478c13150eda5df683d914ecbf13ea89 diff --git a/submodules/mssilk b/submodules/mssilk index fef0c397c..3a61f5dec 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit fef0c397c1d2dfc3b8b0951e3db0b9b5cb5d34b9 +Subproject commit 3a61f5decf634f5fb311b2c5f2984525fccd81d9 diff --git a/submodules/msx264 b/submodules/msx264 index 6d9478bc5..1898b96a9 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit 6d9478bc52d91e83ee535dce47b31865e669ae39 +Subproject commit 1898b96a946c61b866c09c63e60622cf32dd2d2e diff --git a/submodules/ortp b/submodules/ortp index bd792338c..baf804e45 160000 --- a/submodules/ortp +++ b/submodules/ortp @@ -1 +1 @@ -Subproject commit bd792338c47c3849cce3661d4e693df0177873c0 +Subproject commit baf804e45f0fe9c8f156c76627083cc868fd12db