From 3bc72a2630b1ff11589993b6477c52134070d5dc Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 6 Apr 2017 11:20:52 +0200 Subject: [PATCH] chore(submodules): update belr --- linphone-desktop/src/app/App.cpp | 2 ++ linphone-desktop/src/components/call/CallModel.cpp | 2 ++ linphone-desktop/src/components/call/CallModel.hpp | 2 +- linphone-desktop/src/components/camera/Camera.cpp | 2 ++ linphone-desktop/src/components/camera/Camera.hpp | 2 +- linphone-desktop/src/components/chat/ChatProxyModel.cpp | 2 ++ linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp | 2 -- linphone-desktop/src/components/notifier/Notifier.cpp | 2 ++ linphone-desktop/src/components/presence/OwnPresenceModel.cpp | 2 ++ .../src/components/settings/AccountSettingsModel.cpp | 2 ++ .../src/components/sip-addresses/SipAddressesModel.hpp | 2 +- submodules/belr | 2 +- 12 files changed, 18 insertions(+), 6 deletions(-) diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp index a8f419264..2eaef604c 100644 --- a/linphone-desktop/src/app/App.cpp +++ b/linphone-desktop/src/app/App.cpp @@ -60,6 +60,8 @@ #define QML_VIEW_SPLASH_SCREEN "qrc:/ui/views/App/SplashScreen/SplashScreen.qml" +using namespace std; + // ============================================================================= inline bool installLocale (App &app, QTranslator &translator, const QLocale &locale) { diff --git a/linphone-desktop/src/components/call/CallModel.cpp b/linphone-desktop/src/components/call/CallModel.cpp index ef7e408df..e3abc24b2 100644 --- a/linphone-desktop/src/components/call/CallModel.cpp +++ b/linphone-desktop/src/components/call/CallModel.cpp @@ -32,6 +32,8 @@ #define AUTO_ANSWER_OBJECT_NAME "auto-answer-timer" +using namespace std; + // ============================================================================= CallModel::CallModel (shared_ptr linphone_call) { diff --git a/linphone-desktop/src/components/call/CallModel.hpp b/linphone-desktop/src/components/call/CallModel.hpp index ef0e778e4..161e515a7 100644 --- a/linphone-desktop/src/components/call/CallModel.hpp +++ b/linphone-desktop/src/components/call/CallModel.hpp @@ -68,7 +68,7 @@ public: return m_linphone_call; } - static void setRecordFile (shared_ptr &call_params); + static void setRecordFile (std::shared_ptr &call_params); Q_INVOKABLE void accept (); Q_INVOKABLE void acceptWithVideo (); diff --git a/linphone-desktop/src/components/camera/Camera.cpp b/linphone-desktop/src/components/camera/Camera.cpp index 79ca3ea27..65028b40d 100644 --- a/linphone-desktop/src/components/camera/Camera.cpp +++ b/linphone-desktop/src/components/camera/Camera.cpp @@ -33,6 +33,8 @@ #define MAX_FPS 30 +using namespace std; + // ============================================================================= struct ContextInfo { diff --git a/linphone-desktop/src/components/camera/Camera.hpp b/linphone-desktop/src/components/camera/Camera.hpp index d26adf816..5528a1ed1 100644 --- a/linphone-desktop/src/components/camera/Camera.hpp +++ b/linphone-desktop/src/components/camera/Camera.hpp @@ -52,7 +52,7 @@ private: bool m_update_context_info = false; bool m_is_preview = false; - shared_ptr m_linphone_call; + std::shared_ptr m_linphone_call; QQuickWindow *m_window; }; diff --git a/linphone-desktop/src/components/chat/ChatProxyModel.cpp b/linphone-desktop/src/components/chat/ChatProxyModel.cpp index ebe74ba0d..9b47f6438 100644 --- a/linphone-desktop/src/components/chat/ChatProxyModel.cpp +++ b/linphone-desktop/src/components/chat/ChatProxyModel.cpp @@ -22,6 +22,8 @@ #include "ChatProxyModel.hpp" +using namespace std; + // ============================================================================= // Fetch the L last filtered chat entries. diff --git a/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp b/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp index 57d703f17..7d7a2e929 100644 --- a/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp +++ b/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp @@ -20,8 +20,6 @@ * Author: Ronan Abhamon */ -#include - #include "../../utils.hpp" #include "../core/CoreManager.hpp" diff --git a/linphone-desktop/src/components/notifier/Notifier.cpp b/linphone-desktop/src/components/notifier/Notifier.cpp index 1043fdcfa..3868a2214 100644 --- a/linphone-desktop/src/components/notifier/Notifier.cpp +++ b/linphone-desktop/src/components/notifier/Notifier.cpp @@ -53,6 +53,8 @@ #define N_MAX_NOTIFICATIONS 15 #define MAX_TIMEOUT 60000 +using namespace std; + // ============================================================================= inline int getNotificationSize (const QObject &object, const char *property) { diff --git a/linphone-desktop/src/components/presence/OwnPresenceModel.cpp b/linphone-desktop/src/components/presence/OwnPresenceModel.cpp index c7bccc71a..a3a5c269a 100644 --- a/linphone-desktop/src/components/presence/OwnPresenceModel.cpp +++ b/linphone-desktop/src/components/presence/OwnPresenceModel.cpp @@ -27,6 +27,8 @@ #include "OwnPresenceModel.hpp" +using namespace std; + // ============================================================================= Presence::PresenceLevel OwnPresenceModel::getPresenceLevel () const { diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp index 978cc4128..2d285c11b 100644 --- a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp @@ -27,6 +27,8 @@ #include "AccountSettingsModel.hpp" +using namespace std; + // ============================================================================= QVariantMap AccountSettingsModel::getProxyConfigDescription (const std::shared_ptr &proxy_config) { diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp index 7876d12b1..bcf9f7eaf 100644 --- a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp +++ b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp @@ -76,7 +76,7 @@ private: void handleMessageReceived (const std::shared_ptr &message); void handleCallStateChanged (const std::shared_ptr &call, linphone::CallState state); - void handlePresenceReceived (const QString &sip_address, const shared_ptr &presence_model); + void handlePresenceReceived (const QString &sip_address, const std::shared_ptr &presence_model); void handleAllEntriesRemoved (const QString &sip_address); void handleMessageSent (const std::shared_ptr &message); diff --git a/submodules/belr b/submodules/belr index 6fcadc1ac..0e237fca5 160000 --- a/submodules/belr +++ b/submodules/belr @@ -1 +1 @@ -Subproject commit 6fcadc1acd8ece08023e011a4ff9987fc5a14c2f +Subproject commit 0e237fca52851df28f2401702fca5d34ed56bd5b