[MTX-3998] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - Quectel - GP-1111

Refactoring after review

1 files changed, 15 insertions, 15 deletions

diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp
index 3394b4e..0483dc8 100644
--- a/src/MTS_IO_ICellularRadio.cpp
+++ b/src/MTS_IO_ICellularRadio.cpp
@@ -513,30 +513,30 @@ std::string MTS::IO::ICellularRadio::getCodeAsString(CODE eCode) {
     }
 }
 
-MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(UE_MODES_OF_OPERATION mode, std::string& sMode) {
+MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(ICellularRadio::UE_MODES_OF_OPERATION mode, std::string& sMode) {
     CODE rc;
     switch (mode) {
-        case UE_MODES_OF_OPERATION::PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1:
             sMode = "ps_1";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2:
             sMode = "ps_2";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1:
             sMode = "csps_1";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2:
             sMode = "csps_2";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::CS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1:
             sMode = "cs_1";
             rc = SUCCESS;
             break;
-        case UE_MODES_OF_OPERATION::CS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2:
             sMode = "cs_2";
             rc = SUCCESS;
             break;
@@ -548,28 +548,28 @@ MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertUeModeToString(UE_
     return rc;
 }
 
-MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string& sMode, UE_MODES_OF_OPERATION& mode) {
+MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertStringToUeMode(const std::string& sMode, ICellularRadio::UE_MODES_OF_OPERATION& mode) {
     CODE rc;
     if (sMode == "ps_1") {
-        mode = UE_MODES_OF_OPERATION::PS_MODE1;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1;
         rc = SUCCESS;
     } else if (sMode == "ps_2") {
-        mode = UE_MODES_OF_OPERATION::PS_MODE2;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2;
         rc = SUCCESS;
     } else if (sMode == "csps_1") {
-        mode = UE_MODES_OF_OPERATION::CS_PS_MODE1;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1;
         rc = SUCCESS;
     } else if (sMode == "csps_2") {
-        mode = UE_MODES_OF_OPERATION::CS_PS_MODE2;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2;
         rc = SUCCESS;
     } else if (sMode == "cs_1") {
-        mode = UE_MODES_OF_OPERATION::CS_MODE1;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1;
         rc = SUCCESS;
     } else if (sMode == "cs_2") {
-        mode = UE_MODES_OF_OPERATION::CS_MODE2;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2;
         rc = SUCCESS;
     } else {
-        mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE;
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::UNKNOWN_MODE;
         rc = FAILURE;
     }
     return rc;