summaryrefslogtreecommitdiff
path: root/plugins/Quotes/src/ImportExport.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-08-18 11:48:46 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-08-18 11:48:46 +0000
commit563378c993b1c08a1bbe23e8f6c372c675c38e7a (patch)
tree798ec8ba61d351cd2ebe0e39737848d3b2495f46 /plugins/Quotes/src/ImportExport.cpp
parent914f4263b866f546311b4f8e3a95ff816770783f (diff)
- naming conflict;
- code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14986 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Quotes/src/ImportExport.cpp')
-rw-r--r--plugins/Quotes/src/ImportExport.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp
index b3dc6e2a9d..aea84a8573 100644
--- a/plugins/Quotes/src/ImportExport.cpp
+++ b/plugins/Quotes/src/ImportExport.cpp
@@ -336,9 +336,9 @@ namespace
tstring sName;
tstring sValue;
tstring sType;
- for (size_t i = 0; i < cSetChild; ++i)
+ for (size_t j = 0; j < cSetChild; ++j)
{
- IXMLNode::TXMLNodePtr pNode = pSetting->GetChildNode(i);
+ IXMLNode::TXMLNodePtr pNode = pSetting->GetChildNode(j);
tstring sNode = pNode->GetName();
if (0 == quotes_stricmp(g_pszXmlName, sNode.c_str()))
{
@@ -353,8 +353,8 @@ namespace
if ((false == sName.empty()) && (false == sType.empty()))
{
- std::string s = quotes_t2a(sName.c_str());
- dbs.szSetting = s.c_str();//T2CA(sName.c_str());
+ std::string s1 = quotes_t2a(sName.c_str());
+ dbs.szSetting = s1.c_str();
if (0 == quotes_stricmp(g_pszXmlTypeByte, sType.c_str()))
{
tistringstream in(sValue.c_str());