From 74e4f1edce397e9dc5db6200b56866a57b033ffe Mon Sep 17 00:00:00 2001 From: Joohyun Kim Date: Wed, 15 May 2013 15:57:32 +0900 Subject: [PATCH] Fix compatibility issues on SystemInfo Change-Id: Ice14a85ae532cb1b497653c858182e462ceccb13 Signed-off-by: Joohyun Kim --- src/system/FSys_SystemInfoImpl.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/system/FSys_SystemInfoImpl.cpp b/src/system/FSys_SystemInfoImpl.cpp index 3ecd54a..6b7542a 100644 --- a/src/system/FSys_SystemInfoImpl.cpp +++ b/src/system/FSys_SystemInfoImpl.cpp @@ -267,7 +267,7 @@ _SystemInfoImpl::GetSysInfo(const String& key, String& value) PrepareCache(); } - String* pValue = (String*)stringList.GetValue(key); + String* pValue = (String*)stringList.GetValue(tizenKey); if(pValue != null) { @@ -435,7 +435,7 @@ _SystemInfoImpl::GetSysInfo(const String& key, String& value) { r = E_OBJ_NOT_FOUND; } - else if (key == _DUID) + else if (tizenKey == _DUID) { int ret = 0; TapiHandle* handle = null; @@ -467,7 +467,7 @@ _SystemInfoImpl::GetSysInfo(const String& key, String& value) tel_deinit(handle); } _SystemClient* pSystemClient = _SystemClient::GetInstance(); - r = pSystemClient->GetValue(key, value); + r = pSystemClient->GetValue(tizenKey, value); } else { @@ -476,12 +476,12 @@ _SystemInfoImpl::GetSysInfo(const String& key, String& value) if(r != E_SUCCESS) { _SystemClient* pSystemClient = _SystemClient::GetInstance(); - r = pSystemClient->GetValue(key, value); + r = pSystemClient->GetValue(tizenKey, value); } } if( r == E_SUCCESS) { - stringList.Add(new String(key), new String(value)); + stringList.Add(new String(tizenKey), new String(value)); } return r; } @@ -497,7 +497,7 @@ _SystemInfoImpl::GetSysInfo(const String& key, int& value) PrepareCache(); } - Integer* pValue = (Integer*)integerList.GetValue(key); + Integer* pValue = (Integer*)integerList.GetValue(tizenKey); if(pValue != null) { @@ -526,13 +526,13 @@ _SystemInfoImpl::GetSysInfo(const String& key, int& value) if(r != E_SUCCESS) { _SystemClient* pSystemClient = _SystemClient::GetInstance(); - r = pSystemClient->GetValue(key, value); + r = pSystemClient->GetValue(tizenKey, value); } } if(r == E_SUCCESS) { - integerList.Add(new String(key), new Integer(value)); + integerList.Add(new String(tizenKey), new Integer(value)); } return r; @@ -561,7 +561,7 @@ _SystemInfoImpl::GetSysInfo(const String& key, bool& value) PrepareCache(); } - Boolean* pValue = (Boolean*)boolList.GetValue(key); + Boolean* pValue = (Boolean*)boolList.GetValue(tizenKey); if(pValue != null) { @@ -573,13 +573,13 @@ _SystemInfoImpl::GetSysInfo(const String& key, bool& value) if(r != E_SUCCESS) { _SystemClient* pSystemClient = _SystemClient::GetInstance(); - r = pSystemClient->GetValue(key, value); + r = pSystemClient->GetValue(tizenKey, value); } SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_OBJ_NOT_FOUND, "It is failed to get the key[%ls]", tizenKey.GetPointer()); if(r == E_SUCCESS) { - boolList.Add(new String(key), new Boolean(value)); + boolList.Add(new String(tizenKey), new Boolean(value)); } return r; -- 2.7.4