[MTR-MTQ] Namespace-related usage improvements

Restored full qualification of the ICellularRadio::CODE object type
for all files that used full qualification before
(effectively, for all source files and only one header file).

This commit partially reverses 53efcef2e2f521135b323e194c45f1d9fa7b5d5d.

1 files changed, 20 insertions, 20 deletions

diff --git a/src/MTS_IO_ME910C1NVRadio.cpp b/src/MTS_IO_ME910C1NVRadio.cpp
index c7aae7b..0af5f24 100644
--- a/src/MTS_IO_ME910C1NVRadio.cpp
+++ b/src/MTS_IO_ME910C1NVRadio.cpp
@@ -53,13 +53,13 @@ ME910C1NVRadio::ME910C1NVRadio(const std::string& sPort)
 
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::getCarrier(std::string& sCarrier) {
+ICellularRadio::CODE ME910C1NVRadio::getCarrier(std::string& sCarrier) {
     sCarrier = "Verizon";
     return SUCCESS;
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::doGetFirmwareNumbers(std::string &sFirmware, std::string &sFirmwareBuild) {
-	CODE rc = FAILURE;
+ICellularRadio::CODE ME910C1NVRadio::doGetFirmwareNumbers(std::string &sFirmware, std::string &sFirmwareBuild) {
+	ICellularRadio::CODE rc = FAILURE;
 
 	rc = getFirmware(sFirmware);
     if (rc != SUCCESS){
@@ -74,9 +74,9 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doGetFirmwareNumbers(std::string &sFirmware
     return rc;
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::doFumoReadConfig(const Json::Value& jArgs, Json::Value &jConfig)
+ICellularRadio::CODE ME910C1NVRadio::doFumoReadConfig(const Json::Value& jArgs, Json::Value &jConfig)
 {
-    CODE rc = INVALID_ARGS;
+    ICellularRadio::CODE rc = INVALID_ARGS;
     std::string sPath;
 
     do
@@ -196,9 +196,9 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doFumoReadConfig(const Json::Value& jArgs,
     return rc;
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::doFumoSetup(const Json::Value &jConfig, UpdateCb& stepCb)
+ICellularRadio::CODE ME910C1NVRadio::doFumoSetup(const Json::Value &jConfig, UpdateCb& stepCb)
 {
-	CODE rc = FAILURE;
+	ICellularRadio::CODE rc = FAILURE;
 	std::string sCmd;
 
 	std::string sContextId = jConfig[KEY_FUMO_PDPID].asString();
@@ -292,9 +292,9 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doFumoSetup(const Json::Value &jConfig, Upd
     return rc;
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::doFumoFtp(const Json::Value &jConfig, UpdateCb& stepCb)
+ICellularRadio::CODE ME910C1NVRadio::doFumoFtp(const Json::Value &jConfig, UpdateCb& stepCb)
 {
-	CODE rc = FAILURE;
+	ICellularRadio::CODE rc = FAILURE;
 	std::string sCmd;
 	std::string sResult;
 
@@ -450,7 +450,7 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doFumoFtp(const Json::Value &jConfig, Updat
     //
     // AT#FTPCLOSE
     //
-	CODE rcclose = sendBasicCommand("AT#FTPCLOSE", 60 * 1000);
+	ICellularRadio::CODE rcclose = sendBasicCommand("AT#FTPCLOSE", 60 * 1000);
 	if (rcclose != SUCCESS && rc == SUCCESS) {
 		if(stepCb) {
 			// Only one "FUMO Error" message should be sent
@@ -468,9 +468,9 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doFumoFtp(const Json::Value &jConfig, Updat
     return rc;
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::doFumoCleanup(const Json::Value &jConfig, UpdateCb& stepCb)
+ICellularRadio::CODE ME910C1NVRadio::doFumoCleanup(const Json::Value &jConfig, UpdateCb& stepCb)
 {
-	CODE rc = FAILURE;
+	ICellularRadio::CODE rc = FAILURE;
 	std::string sCmd;
 
 	std::string sContextId = jConfig[KEY_FUMO_PDPID].asString();
@@ -488,9 +488,9 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doFumoCleanup(const Json::Value &jConfig, U
     return rc;
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::doFumoApplyFirmware(const Json::Value &jConfig, UpdateCb& stepCb)
+ICellularRadio::CODE ME910C1NVRadio::doFumoApplyFirmware(const Json::Value &jConfig, UpdateCb& stepCb)
 {
-	CODE rc = FAILURE;
+	ICellularRadio::CODE rc = FAILURE;
 
 	if (jConfig.isMember(KEY_FUMO_DRYRUN)) {
 		if(stepCb) {
@@ -514,11 +514,11 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doFumoApplyFirmware(const Json::Value &jCon
 	return rc;
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::doFumoWaitNewFirmware(const Json::Value &jConfig, UpdateCb& stepCb)
+ICellularRadio::CODE ME910C1NVRadio::doFumoWaitNewFirmware(const Json::Value &jConfig, UpdateCb& stepCb)
 {
     std::string sFirmware;
     std::string sFirmwareBuild;
-	CODE rc = FAILURE;
+	ICellularRadio::CODE rc = FAILURE;
 
 	if (jConfig.isMember(KEY_FUMO_DRYRUN)) {
 		if(stepCb) {
@@ -570,9 +570,9 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doFumoWaitNewFirmware(const Json::Value &jC
 }
 
 
-ME910C1NVRadio::CODE ME910C1NVRadio::doFumoPerform(const Json::Value &jConfig, UpdateCb& stepCb)
+ICellularRadio::CODE ME910C1NVRadio::doFumoPerform(const Json::Value &jConfig, UpdateCb& stepCb)
 {
-	CODE rc = FAILURE;
+	ICellularRadio::CODE rc = FAILURE;
 
 	UpdateCb dummyCb;
 
@@ -606,10 +606,10 @@ ME910C1NVRadio::CODE ME910C1NVRadio::doFumoPerform(const Json::Value &jConfig, U
 	return rc;
 }
 
-ME910C1NVRadio::CODE ME910C1NVRadio::updateFumo(const Json::Value& jArgs, UpdateCb& stepCb)
+ICellularRadio::CODE ME910C1NVRadio::updateFumo(const Json::Value& jArgs, UpdateCb& stepCb)
 {
 	Json::Value jConfig(Json::objectValue);
-	CODE rc = FAILURE;
+	ICellularRadio::CODE rc = FAILURE;
 
     rc = doFumoReadConfig(jArgs, jConfig);
     if (rc != SUCCESS) {