fix(app): many changes

linphone-desktop/src/Utils.cpp

@@ -20,7 +20,7 @@
  *      Author: Ronan Abhamon
  */
 
- #include "utils.hpp"
+ #include "Utils.hpp"
 
 // =============================================================================
 

linphone-desktop/src/components/call/CallModel.cpp

@@ -426,25 +426,6 @@ inline QVariantMap createStat (const QString &key, const QString &value) {
   return m;
 }
 
-inline QString iceStateToString (linphone::IceState state) const {
-  switch (state) {
-    case linphone::IceStateNotActivated:
-      return tr("iceStateNotActivated");
-    case linphone::IceStateFailed:
-      return tr("iceStateFailed");
-    case linphone::IceStateInProgress:
-      return tr("iceStateInProgress");
-    case linphone::IceStateReflexiveConnection:
-      return tr("iceStateReflexiveConnection");
-    case linphone::IceStateHostConnection:
-      return tr("iceStateHostConnection");
-    case linphone::IceStateRelayConnection:
-      return tr("iceStateRelayConnection");
-    default:
-      return tr("iceStateInvalid");
-  }
-}
-
 void CallModel::updateStats (const linphone::CallStats &callStats, QVariantList &stats) {
   QString family;
   shared_ptr<const linphone::CallParams> params = mLinphoneCall->getCurrentParams();
@@ -512,3 +493,22 @@ void CallModel::updateStats (const linphone::CallStats &callStats, QVariantList
       break;
   }
 }
+
+QString CallModel::iceStateToString (linphone::IceState state) const {
+  switch (state) {
+    case linphone::IceStateNotActivated:
+      return tr("iceStateNotActivated");
+    case linphone::IceStateFailed:
+      return tr("iceStateFailed");
+    case linphone::IceStateInProgress:
+      return tr("iceStateInProgress");
+    case linphone::IceStateReflexiveConnection:
+      return tr("iceStateReflexiveConnection");
+    case linphone::IceStateHostConnection:
+      return tr("iceStateHostConnection");
+    case linphone::IceStateRelayConnection:
+      return tr("iceStateRelayConnection");
+    default:
+      return tr("iceStateInvalid");
+  }
+}

linphone-desktop/src/components/call/CallModel.hpp

@@ -128,6 +128,8 @@ private:
   QVariantList getVideoStats () const;
   void updateStats (const linphone::CallStats &callStats, QVariantList &stats);
 
+  QString iceStateToString (linphone::IceState state) const;
+
   bool mPausedByRemote = false;
   bool mPausedByUser = false;
   bool mRecording = false;

linphone-desktop/ui/modules/Linphone/Calls/Calls.js

@@ -16,10 +16,10 @@ var MAP_STATUS_TO_PARAMS = (function () {
         handler: (function () { call.pausedByUser = true }),
         name: qsTr('pauseCall')
       }, {
-        handler: (function () { call.transfer() }),
+        handler: call.transfer,
         name: qsTr('transferCall')
       }, {
-        handler: (function () { call.terminate() }),
+        handler: call.terminate,
         name: qsTr('terminateCall')
       }],
       component: callActions,

linphone-desktop/ui/views/App/Calls/Incall.qml

@@ -85,12 +85,16 @@ Rectangle {
 
         CallStatistics {
           id: callStatistics
-          relativeTo: callQuality
-          relativeY: info.height + elapsedTime.height * 2
+
           call: incall.call
-          width: container.width
+
           height: container.height
+          width: container.width
+
           launcher: callQuality
+
+          relativeTo: callQuality
+          relativeY: info.height + elapsedTime.height * 2
         }
       }