From f4ab8d1b8466efaed401a75a1d181fc45ff43d5e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 2 Jan 2014 17:24:17 +0000 Subject: minus std::string & 3 std::vectors git-svn-id: http://svn.miranda-ng.org/main/trunk@7461 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/extraicons/IcolibExtraIcon.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modules/extraicons/IcolibExtraIcon.cpp') diff --git a/src/modules/extraicons/IcolibExtraIcon.cpp b/src/modules/extraicons/IcolibExtraIcon.cpp index 8b77e29cb5..78c020ce3a 100644 --- a/src/modules/extraicons/IcolibExtraIcon.cpp +++ b/src/modules/extraicons/IcolibExtraIcon.cpp @@ -53,7 +53,7 @@ void IcolibExtraIcon::applyIcon(HANDLE hContact) HANDLE hImage = INVALID_HANDLE_VALUE; - ptrA szIconName(db_get_sa(hContact, MODULE_NAME, name.c_str())); + ptrA szIconName(db_get_sa(hContact, MODULE_NAME, szName)); if (!IsEmpty(szIconName)) hImage = GetIcon(szIconName); @@ -69,7 +69,7 @@ int IcolibExtraIcon::setIcon(int id, HANDLE hContact, HANDLE hIcoLib) hIcoLib = NULL; if (isEnabled()) { - ptrA szIconName(db_get_sa(hContact, MODULE_NAME, name.c_str())); + ptrA szIconName(db_get_sa(hContact, MODULE_NAME, szName)); if (!IsEmpty(szIconName)) RemoveIcon(szIconName); } @@ -93,7 +93,7 @@ int IcolibExtraIcon::setIconByName(int id, HANDLE hContact, const char *icon) icon = NULL; if (isEnabled()) { - ptrA szIconName(db_get_sa(hContact, MODULE_NAME, name.c_str())); + ptrA szIconName(db_get_sa(hContact, MODULE_NAME, szName)); if (!IsEmpty(szIconName)) RemoveIcon(szIconName); } @@ -113,7 +113,7 @@ void IcolibExtraIcon::storeIcon(HANDLE hContact, void *icon) const char *icolibName = (const char *)icon; if (IsEmpty(icolibName)) - db_unset(hContact, MODULE_NAME, name.c_str()); + db_unset(hContact, MODULE_NAME, szName); else - db_set_s(hContact, MODULE_NAME, name.c_str(), icolibName); + db_set_s(hContact, MODULE_NAME, szName, icolibName); } -- cgit v1.2.3