From ca9273fc0782ee1f4d89de9e3b6bcadf2208bd10 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 2 Jan 2014 12:02:46 +0000
Subject: name conflict resolution

git-svn-id: http://svn.miranda-ng.org/main/trunk@7454 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/extraicons/BaseExtraIcon.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/modules/extraicons/BaseExtraIcon.cpp')

diff --git a/src/modules/extraicons/BaseExtraIcon.cpp b/src/modules/extraicons/BaseExtraIcon.cpp
index 5d9caf76ac..0baffeba67 100644
--- a/src/modules/extraicons/BaseExtraIcon.cpp
+++ b/src/modules/extraicons/BaseExtraIcon.cpp
@@ -34,10 +34,10 @@ BaseExtraIcon::~BaseExtraIcon()
 {
 }
 
-void BaseExtraIcon::setOnClick(MIRANDAHOOKPARAM OnClick, LPARAM param)
+void BaseExtraIcon::setOnClick(MIRANDAHOOKPARAM pFunc, LPARAM pParam)
 {
-	OnClick = OnClick;
-	onClickParam = param;
+	OnClick = pFunc;
+	onClickParam = pParam;
 }
 
 int BaseExtraIcon::getID() const
-- 
cgit v1.2.3