From d68f70654a101ba36b20f5ae726a6687b39d5034 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 19 Apr 2017 09:41:04 +0200
Subject: [PATCH] fix(src/components/call/CallModel): coding style

---
 .../src/components/call/CallModel.cpp         | 78 +++++++++++--------
 .../src/components/call/CallModel.hpp         |  2 +-
 2 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/linphone-desktop/src/components/call/CallModel.cpp b/linphone-desktop/src/components/call/CallModel.cpp
index 618ce37b8..55e73fc99 100644
--- a/linphone-desktop/src/components/call/CallModel.cpp
+++ b/linphone-desktop/src/components/call/CallModel.cpp
@@ -415,13 +415,32 @@ QVariantList CallModel::getVideoStats () const {
   return mVideoStats;
 }
 
-static QVariantMap createStat (const QString &key, const QString &value) {
+inline QVariantMap createStat (const QString &key, const QString &value) {
   QVariantMap m;
   m["key"] = key;
   m["value"] = 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();
@@ -451,50 +470,41 @@ void CallModel::updateStats (const linphone::CallStats &callStats, QVariantList
   }
 
   stats.clear();
-  stats << createStat(tr("callStatsCodec"), QString("%1 / %2kHz").arg(Utils::linphoneStringToQString(payloadType->getMimeType())).arg(payloadType->getClockRate() / 1000));
+
+  stats << createStat(tr("callStatsCodec"), QString("%1 / %2kHz")
+    .arg(Utils::linphoneStringToQString(payloadType->getMimeType())).arg(payloadType->getClockRate() / 1000));
   stats << createStat(tr("callStatsUploadBandwidth"), QString("%1 kbits/s").arg(int(callStats.getUploadBandwidth())));
   stats << createStat(tr("callStatsDownloadBandwidth"), QString("%1 kbits/s").arg(int(callStats.getDownloadBandwidth())));
   stats << createStat(tr("callStatsIceState"), iceStateToString(callStats.getIceState()));
   stats << createStat(tr("callStatsIpFamily"), family);
   stats << createStat(tr("callStatsSenderLossRate"), QString("%1 %").arg(callStats.getSenderLossRate()));
   stats << createStat(tr("callStatsReceiverLossRate"), QString("%1 %").arg(callStats.getReceiverLossRate()));
+
   switch (callStats.getType()) {
     case linphone::StreamTypeAudio:
       stats << createStat(tr("callStatsJitterBuffer"), QString("%1 ms").arg(callStats.getJitterBufferSizeMs()));
       break;
-    case linphone::StreamTypeVideo:
-      {
-        QString sentVideoDefinitionName = Utils::linphoneStringToQString(params->getSentVideoDefinition()->getName());
-        QString sentVideoDefinition = QString("%1x%2").arg(params->getSentVideoDefinition()->getWidth()).arg(params->getSentVideoDefinition()->getHeight());
-        stats << createStat(tr("callStatsSentVideoDefinition"),
-          (sentVideoDefinition == sentVideoDefinitionName) ? sentVideoDefinition : QString("%1 (%2)").arg(sentVideoDefinition).arg(sentVideoDefinitionName));
-        QString receivedVideoDefinitionName = Utils::linphoneStringToQString(params->getReceivedVideoDefinition()->getName());
-        QString receivedVideoDefinition = QString("%1x%2").arg(params->getReceivedVideoDefinition()->getWidth()).arg(params->getReceivedVideoDefinition()->getHeight());
-        stats << createStat(tr("callStatsReceivedVideoDefinition"),
-          (receivedVideoDefinition == receivedVideoDefinitionName) ? receivedVideoDefinition : QString("%1 (%2)").arg(receivedVideoDefinition).arg(receivedVideoDefinitionName));
-      }
-      break;
+    case linphone::StreamTypeVideo: {
+      QString sentVideoDefinitionName = Utils::linphoneStringToQString(params->getSentVideoDefinition()->getName());
+      QString sentVideoDefinition = QString("%1x%2")
+        .arg(params->getSentVideoDefinition()->getWidth())
+        .arg(params->getSentVideoDefinition()->getHeight());
+
+      stats << createStat(tr("callStatsSentVideoDefinition"), sentVideoDefinition == sentVideoDefinitionName
+        ? sentVideoDefinition
+        : QString("%1 (%2)").arg(sentVideoDefinition).arg(sentVideoDefinitionName));
+
+      QString receivedVideoDefinitionName = Utils::linphoneStringToQString(params->getReceivedVideoDefinition()->getName());
+      QString receivedVideoDefinition = QString("%1x%2")
+        .arg(params->getReceivedVideoDefinition()->getWidth())
+        .arg(params->getReceivedVideoDefinition()->getHeight());
+
+      stats << createStat(tr("callStatsReceivedVideoDefinition"), receivedVideoDefinition == receivedVideoDefinitionName
+        ? receivedVideoDefinition
+        : QString("%1 (%2)").arg(receivedVideoDefinition).arg(receivedVideoDefinitionName));
+    }
+    break;
     default:
       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");
-  }
-}
-
diff --git a/linphone-desktop/src/components/call/CallModel.hpp b/linphone-desktop/src/components/call/CallModel.hpp
index bc1b477a2..ab57090b1 100644
--- a/linphone-desktop/src/components/call/CallModel.hpp
+++ b/linphone-desktop/src/components/call/CallModel.hpp
@@ -127,11 +127,11 @@ private:
   QVariantList getAudioStats () const;
   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;
+
   QVariantList mAudioStats;
   QVariantList mVideoStats;