mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 05:13:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore(submodules): update belr

Browse source
This commit is contained in:
Ronan Abhamon 2017-04-06 11:20:52 +02:00
parent 48b0fad9c3
commit 3bc72a2630
12 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/src/app/App.cpp
View file

@ -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) {

2
linphone-desktop/src/components/call/CallModel.cpp
View file

@ -32,6 +32,8 @@
#define AUTO_ANSWER_OBJECT_NAME "auto-answer-timer"
using namespace std;
// =============================================================================
CallModel::CallModel (shared_ptr<linphone::Call> linphone_call) {

2
linphone-desktop/src/components/call/CallModel.hpp
View file

@ -68,7 +68,7 @@ public:
return m_linphone_call;
}
static void setRecordFile (shared_ptr<linphone::CallParams> &call_params);
static void setRecordFile (std::shared_ptr<linphone::CallParams> &call_params);
Q_INVOKABLE void accept ();
Q_INVOKABLE void acceptWithVideo ();

2
linphone-desktop/src/components/camera/Camera.cpp
View file

@ -33,6 +33,8 @@
#define MAX_FPS 30
using namespace std;
// =============================================================================
struct ContextInfo {

2
linphone-desktop/src/components/camera/Camera.hpp
View file

@ -52,7 +52,7 @@ private:
bool m_update_context_info = false;
bool m_is_preview = false;
shared_ptr<linphone::Call> m_linphone_call;
std::shared_ptr<linphone::Call> m_linphone_call;
QQuickWindow *m_window;
};

2
linphone-desktop/src/components/chat/ChatProxyModel.cpp
View file

@ -22,6 +22,8 @@
#include "ChatProxyModel.hpp"
using namespace std;
// =============================================================================
// Fetch the L last filtered chat entries.

2
linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp
View file

@ -20,8 +20,6 @@
* Author: Ronan Abhamon
*/
#include <linphone++/linphone.hh>
#include "../../utils.hpp"
#include "../core/CoreManager.hpp"

2
linphone-desktop/src/components/notifier/Notifier.cpp
View file

@ -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) {

2
linphone-desktop/src/components/presence/OwnPresenceModel.cpp
View file

@ -27,6 +27,8 @@
#include "OwnPresenceModel.hpp"
using namespace std;
// =============================================================================
Presence::PresenceLevel OwnPresenceModel::getPresenceLevel () const {

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

@ -27,6 +27,8 @@
#include "AccountSettingsModel.hpp"
using namespace std;
// =============================================================================
QVariantMap AccountSettingsModel::getProxyConfigDescription (const std::shared_ptr<linphone::ProxyConfig> &proxy_config) {

2
linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp
View file

@ -76,7 +76,7 @@ private:
void handleMessageReceived (const std::shared_ptr<linphone::ChatMessage> &message);
void handleCallStateChanged (const std::shared_ptr<linphone::Call> &call, linphone::CallState state);
void handlePresenceReceived (const QString &sip_address, const shared_ptr<const linphone::PresenceModel> &presence_model);
void handlePresenceReceived (const QString &sip_address, const std::shared_ptr<const linphone::PresenceModel> &presence_model);
void handleAllEntriesRemoved (const QString &sip_address);
void handleMessageSent (const std::shared_ptr<linphone::ChatMessage> &message);

2
submodules/belr

@ -1 +1 @@
Subproject commit 6fcadc1acd8ece08023e011a4ff9987fc5a14c2f
Subproject commit 0e237fca52851df28f2401702fca5d34ed56bd5b