diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-27 17:07:04 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-27 17:07:04 +0000 |
| commit | 62e59387c15f062f16984cab024a0980a8503369 (patch) | |
| tree | dc0640bcde3dd4f4c314fa289a3245c1891b479f /src/modules/extraicons/ExtraIconGroup.cpp | |
| parent | 8a3b60207162ad0d6540531c6ede0696370b75b3 (diff) | |
attempt to wipe out STL from extra icons
git-svn-id: http://svn.miranda-ng.org/main/trunk@6252 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/extraicons/ExtraIconGroup.cpp')
| -rw-r--r-- | src/modules/extraicons/ExtraIconGroup.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/extraicons/ExtraIconGroup.cpp b/src/modules/extraicons/ExtraIconGroup.cpp index 696728e4e2..dff2601695 100644 --- a/src/modules/extraicons/ExtraIconGroup.cpp +++ b/src/modules/extraicons/ExtraIconGroup.cpp @@ -38,13 +38,15 @@ void ExtraIconGroup::addExtraIcon(BaseExtraIcon *extra) {
items.push_back(extra);
- description.clear();
+ CMString description;
for (unsigned int i = 0; i < items.size(); i++)
{
if (i > 0)
description += _T(" / ");
description += items[i]->getDescription();
}
+
+ tszDescription = mir_tstrdup(description);
}
void ExtraIconGroup::rebuildIcons()
@@ -123,7 +125,7 @@ int ExtraIconGroup::setIconByName(int id, HANDLE hContact, const char *value) int ExtraIconGroup::internalSetIcon(int id, HANDLE hContact, void *value, bool bByName)
{
if (insideApply) {
- for (unsigned int i = 0; i < items.size(); i++)
+ for (unsigned int i=0; i < items.size(); i++)
if (items[i]->getID() == id) {
if (bByName)
return items[i]->setIconByName(id, hContact, (const char*)value);
@@ -190,7 +192,7 @@ int ExtraIconGroup::internalSetIcon(int id, HANDLE hContact, void *value, bool b const TCHAR *ExtraIconGroup::getDescription() const
{
- return description.c_str();
+ return tszDescription;
}
const char *ExtraIconGroup::getDescIcon() const
|