diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-02 11:16:20 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-02 11:16:20 +0000 |
| commit | 191225371df87bc9c983d260c0bd50a59bbdd927 (patch) | |
| tree | 21c37d03fa29d64f347e3c3b80c6d275eeb6b738 /src/modules/extraicons/BaseExtraIcon.cpp | |
| parent | bea9db47cd38198c8fb0ba276f5dba3004c5e2fa (diff) | |
various garbage cleaning in extra icons
git-svn-id: http://svn.miranda-ng.org/main/trunk@7451 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/extraicons/BaseExtraIcon.cpp')
| -rw-r--r-- | src/modules/extraicons/BaseExtraIcon.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/modules/extraicons/BaseExtraIcon.cpp b/src/modules/extraicons/BaseExtraIcon.cpp index d8016f56be..5d9caf76ac 100644 --- a/src/modules/extraicons/BaseExtraIcon.cpp +++ b/src/modules/extraicons/BaseExtraIcon.cpp @@ -25,8 +25,8 @@ Boston, MA 02111-1307, USA. BaseExtraIcon::BaseExtraIcon(int id, const char *name, const TCHAR *description, const char *descIcon, MIRANDAHOOKPARAM OnClick, LPARAM param) :
ExtraIcon(name), id(id), OnClick(OnClick), onClickParam(param),
- tszDescription( mir_tstrdup(description)),
- szDescIcon( mir_strdup(descIcon))
+ tszDescription(mir_tstrdup(description)),
+ szDescIcon(mir_strdup(descIcon))
{
}
@@ -36,8 +36,8 @@ BaseExtraIcon::~BaseExtraIcon() void BaseExtraIcon::setOnClick(MIRANDAHOOKPARAM OnClick, LPARAM param)
{
- this->OnClick = OnClick;
- this->onClickParam = param;
+ OnClick = OnClick;
+ onClickParam = param;
}
int BaseExtraIcon::getID() const
@@ -55,7 +55,7 @@ void BaseExtraIcon::setDescription(const TCHAR *desc) tszDescription = mir_tstrdup(desc);
}
-const char *BaseExtraIcon::getDescIcon() const
+const char* BaseExtraIcon::getDescIcon() const
{
return szDescIcon;
}
@@ -67,10 +67,8 @@ void BaseExtraIcon::setDescIcon(const char *icon) void BaseExtraIcon::onClick(HANDLE hContact)
{
- if (OnClick == NULL)
- return;
-
- OnClick((WPARAM) hContact, (LPARAM) ConvertToClistSlot(slot), onClickParam);
+ if (OnClick != NULL)
+ OnClick((WPARAM)hContact, (LPARAM)ConvertToClistSlot(slot), onClickParam);
}
int BaseExtraIcon::ClistSetExtraIcon(HANDLE hContact, HANDLE hImage)
|