diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-12 21:05:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-12 21:05:10 +0000 |
| commit | fff85d59848d265184c80bd6276923b503df95f8 (patch) | |
| tree | cd9efd8cfd38dc8ff731624d218a3c2fbc53cffc /plugins/BasicHistory/src/RichHtmlExport.cpp | |
| parent | d4c37690295db5515f19a8b1cd221b4222f16eeb (diff) | |
naming conflics resolved
git-svn-id: http://svn.miranda-ng.org/main/trunk@14933 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/BasicHistory/src/RichHtmlExport.cpp')
| -rw-r--r-- | plugins/BasicHistory/src/RichHtmlExport.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/BasicHistory/src/RichHtmlExport.cpp b/plugins/BasicHistory/src/RichHtmlExport.cpp index 0c08f97368..5301e76b9d 100644 --- a/plugins/BasicHistory/src/RichHtmlExport.cpp +++ b/plugins/BasicHistory/src/RichHtmlExport.cpp @@ -120,16 +120,16 @@ std::wstring GetName(const std::wstring &path) return path;
}
-void ExtractFile(short int res, const std::wstring &fileName)
+void ExtractFile(short int iRes, const std::wstring &fileName)
{
- HRSRC rSrc = FindResource(hInst, MAKEINTRESOURCE(res), MAKEINTRESOURCE(CUSTOMRES));
+ HRSRC rSrc = FindResource(hInst, MAKEINTRESOURCE(iRes), MAKEINTRESOURCE(CUSTOMRES));
if (rSrc != NULL) {
HGLOBAL res = LoadResource(hInst, rSrc);
int size = SizeofResource(hInst, rSrc);
if (res != NULL) {
char* resData = (char*)LockResource(res);
if (resData != NULL) {
- std::ofstream stream (fileName.c_str(), std::ios_base::binary);
+ std::ofstream stream(fileName.c_str(), std::ios_base::binary);
if (stream.is_open()) {
stream.write(resData, size);
stream.close();
@@ -371,7 +371,7 @@ void RichHtmlExport::WriteGroup(bool isMe, const std::wstring &time, const std:: EXP_FILE << _T("</div>\n");
bool isUrl = false;
- std::wstring& mes = ReplaceSmileys(isMe, eventText, isUrl);
+ std::wstring mes = ReplaceSmileys(isMe, eventText, isUrl);
EXP_FILE << _T("<div class=mes id=session>\n");
EXP_FILE << _T("<span class=eventimg id=") << id << _T("><img src=\"") << folderName << _T("\\pnode.ico\" class=sessionimage width=\"16\" height=\"16\" onclick=\"toggleFolder('group") << groupId << _T("', this)\"/>");
EXP_FILE << _T("<img src=\"") << folderName << _T("\\event") << ev << _T(".ico\" class=sessionimage width=\"16\" height=\"16\" onclick=\"toggleFolder('group") << groupId << _T("', this)\"/></span>\n");
@@ -387,7 +387,7 @@ void RichHtmlExport::WriteMessage(bool isMe, const std::wstring &longDate, const TCHAR* ev = (isMe ? _T("1") : _T("0"));
TCHAR* ev1 = ev;
bool isUrl = false;
- std::wstring& mes = ReplaceSmileys(isMe, message, isUrl);
+ std::wstring mes = ReplaceSmileys(isMe, message, isUrl);
if (isUrl)
ev = _T("2");
EXP_FILE << _T("<div class=mes id=event") << ev << _T(">\n");
|