--- a/secureswitools/swisistools/source/interpretsis/commandparser.cpp Tue Jun 29 16:50:12 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsis/commandparser.cpp Thu Jul 08 20:28:00 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -403,7 +403,7 @@
}
default:
{
- LERROR(Utf8ToUcs2(std::string(optPtr)));
+ LERROR(string2wstring(std::string(optPtr)));
throw CCommandParser::ECmdLineUnknownOption;
}
}
@@ -464,8 +464,7 @@
while (currentPos != end)
{
currentPos = std::find(it, end, ',');
- std::wstring x;
- Utf8ToUcs2(std::string(it,(currentPos-it)), x);
+ std::wstring x = string2wstring(std::string(it,(currentPos-it)));
//aOptionsList.push_back(x);
(aParamList.*aFilePtr)(x);
@@ -492,8 +491,7 @@
while (currentPos != end)
{
currentPos = std::find(it, end, ',');
- std::wstring x;
- Utf8ToUcs2(std::string(it,(currentPos-it)), x);
+ std::wstring x = string2wstring(std::string(it,(currentPos-it)));
InstallSISFile sisFileName(x, '$', false);
aParamList.AddSISFile(sisFileName);
@@ -511,8 +509,7 @@
// As the sisfile attributes are predetermined input, therefore we can just
// parse according to the predetermined inputs.
- std::wstring fileName;
- Utf8ToUcs2(sisFileOption, fileName);
+ std::wstring fileName = string2wstring(sisFileOption);
InstallSISFile sisFileName(fileName, '$', false);