diff -r f58d6ec98e88 -r b700e12870ca aknlayoutcompiler/src/HtmlParse.cpp --- a/aknlayoutcompiler/src/HtmlParse.cpp Thu Dec 17 09:14:18 2009 +0200 +++ b/aknlayoutcompiler/src/HtmlParse.cpp Mon Jan 18 21:13:05 2010 +0200 @@ -22,6 +22,7 @@ #include #include #include +#include using namespace std; @@ -33,7 +34,7 @@ string TrimWhiteSpace(const string& aString) { - int start = aString.find_first_not_of(WhiteSpace); + string::size_type start = aString.find_first_not_of(WhiteSpace); if (start == string::npos) return ""; else @@ -95,7 +96,7 @@ void THtmlParseLayoutTable::ExtractTitle(const string& aText) { iName = UnHtml(aText); - int pos = iName.find_first_not_of("1234567890.\t\r\n "); + string::size_type pos = iName.find_first_not_of("1234567890.\t\r\n "); if (pos == string::npos) return; iName = iName.substr(pos); @@ -209,7 +210,7 @@ int THtmlParseLayoutTable::GetVal(const string& aText, const string& aField) { - int pos = aText.find(aField+"="); + string::size_type pos = aText.find(aField+"="); if (pos == string::npos) return 0; string val = aText.substr(pos + aField.length() + 1); @@ -252,7 +253,7 @@ if (aText.length()==0) return aText; - int pos = aText.find_last_not_of(" ,"); + string::size_type pos = aText.find_last_not_of(" ,"); if (pos == string::npos) return ""; @@ -516,7 +517,7 @@ int lastSpace = -1; int lastNum = -1; - for (int i=0; i