From 5c2da0fd5b2542d99750747fc746013b7755ddae Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 14 Jun 2013 19:41:18 +0000
Subject: callbacks removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@4947 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Skype/src/skypekit/search.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'protocols/Skype/src/skypekit/search.cpp')

diff --git a/protocols/Skype/src/skypekit/search.cpp b/protocols/Skype/src/skypekit/search.cpp
index 362e412c86..f6f035a3a1 100644
--- a/protocols/Skype/src/skypekit/search.cpp
+++ b/protocols/Skype/src/skypekit/search.cpp
@@ -1,10 +1,9 @@
+#include "..\skype.h"
 #include "search.h"
 
 CContactSearch::CContactSearch(unsigned int oid, SERootObject* root) : ContactSearch(oid, root)
 {
 	this->proto = NULL;
-	this->SearchCompletedCallback == NULL;
-	this->ContactFindedCallback == NULL;
 }
 
 void CContactSearch::OnChange(int prop)
@@ -17,7 +16,7 @@ void CContactSearch::OnChange(int prop)
 		{
 			this->isSeachFinished = true;
 			if (this->proto)
-				(proto->*SearchCompletedCallback)(this->hSearch);
+				proto->OnSearchCompleted(this->hSearch);
 		}
 	}
 }
@@ -25,7 +24,7 @@ void CContactSearch::OnChange(int prop)
 void CContactSearch::OnNewResult(const ContactRef &contact, const uint &rankValue)
 {
 	if (this->proto)
-		(proto->*ContactFindedCallback)(contact, this->hSearch);
+		proto->OnContactFinded(contact, this->hSearch);
 }
 
 void CContactSearch::BlockWhileSearch()
@@ -41,13 +40,3 @@ void CContactSearch::SetProtoInfo(CSkypeProto* proto, HANDLE hSearch)
 	this->proto = proto;
 	this->hSearch = hSearch;
 }
-
-void CContactSearch::SetOnSearchCompleatedCallback(OnSearchCompleted callback)
-{
-	this->SearchCompletedCallback = callback;
-}
-
-void CContactSearch::SetOnContactFindedCallback(OnContactFinded callback)
-{
-	this->ContactFindedCallback = callback;
-}
\ No newline at end of file
-- 
cgit v1.2.3